session: Move cookie routines to session class

Author: Jared Hancock

include/class.ostsession.php

@@ -69,6 +69,23 @@ function regenerate_id(){
         $this->destroy($oldId);
     }
 
+    static function destroyCookie() {
+        setcookie(session_name(), 'deleted', 1,
+            ini_get('session.cookie_path'),
+            ini_get('session.cookie_domain'),
+            ini_get('session.cookie_secure'),
+            ini_get('session.cookie_httponly'));
+    }
+
+    static function renewCookie($baseTime=false, $window=false) {
+        setcookie(session_name(), session_id(),
+            ($baseTime ?: time()) + ($window ?: SESSION_TTL),
+            ini_get('session.cookie_path'),
+            ini_get('session.cookie_domain'),
+            ini_get('session.cookie_secure'),
+            ini_get('session.cookie_httponly'));
+    }
+
     function open($save_path, $session_name){
         return (true);
     }

include/class.usersession.php

@@ -143,12 +143,7 @@ function refreshSession($force=false){
         $this->token = $this->getSessionToken();
         //TODO: separate expire time from hash??
 
-        setcookie(session_name(), session_id(),
-            ($time ?: time()) + ($cfg->getClientTimeout() ?: 604800),
-            ini_get('session.cookie_path'),
-            ini_get('session.cookie_domain'),
-            ini_get('session.cookie_secure'),
-            ini_get('session.cookie_httponly'));
+        osTicketSession::renewCookie($time, $cfg->getClientSessionTimeout());
     }
 
     function getSession() {
@@ -195,12 +190,7 @@ function refreshSession($force=false){
 
         $this->token=$this->getSessionToken();
 
-        setcookie(session_name(), session_id(),
-            ($time ?: time()) + ($cfg->getStaffTimeout() ?: 604800),
-            ini_get('session.cookie_path'),
-            ini_get('session.cookie_domain'),
-            ini_get('session.cookie_secure'),
-            ini_get('session.cookie_httponly'));
+        osTicketSession::renewCookie($time, $cfg->getStaffSessionTimeout());
     }
 
     function getSession() {

logout.php

@@ -19,11 +19,7 @@
 if ($thisclient && $_GET['auth'] && $ost->validateLinkToken($_GET['auth']))
    $thisclient->logOut();
 
-setcookie(session_name(), 'deleted', 1,
-    ini_get('session.cookie_path'),
-    ini_get('session.cookie_domain'),
-    ini_get('session.cookie_secure'),
-    ini_get('session.cookie_httponly'));
+osTicketSession::destroyCookie();
 
 Http::redirect('index.php');
 ?>

scp/logout.php

@@ -31,11 +31,7 @@
 session_unset();
 session_destroy();
 
-setcookie(session_name(), 'deleted', 1,
-    ini_get('session.cookie_path'),
-    ini_get('session.cookie_domain'),
-    ini_get('session.cookie_secure'),
-    ini_get('session.cookie_httponly'));
+osTicketSession::destroyCookie();
 
 @header('Location: login.php');
 require('login.php');