Changeset 1063 in subversion

Timestamp:

Feb 13, 2008 12:26:47 AM (5 years ago)

Author:

till

Message:

• implemented feature from #1484476

Location:

trunk/roundcubemail/program/include

Files:

• main.inc (modified) (1 diff)
• session.inc (modified) (1 diff)

trunk/roundcubemail/program/include/main.inc

@@ -57 +57 @@
   // load configuration
   $CONFIG = rcmail_load_config();
+
+  // set session domain
+  if (isset($CONFIG['session_domain']) && !empty($CONFIG['session_domain'])) {
+    ini_set('session.cookie_domain', $CONFIG['session_domain']);
+  }
 
   // set session garbage collecting time according to session_lifetime

trunk/roundcubemail/program/include/session.inc

@@ -173 +173 @@
 
   session_id($random);
-  $cookie = session_get_cookie_params();
-  setcookie(session_name(), "", time() - 3600);
-  setcookie(session_name(), $random, $cookie['lifetime'] ? time() + $cookie['lifetime'] : 0, $cookie['path']);
+
+  $cookie    = session_get_cookie_params();
+  $_lifetime = $cookie['lifetime'] ? time() + $cookie['lifetime'] : 0;
+
+  setcookie(session_name(), '', time() - 3600);
+  setcookie(session_name(), $random, $_lifetime, $cookie['path'],
+    $cookie['domain']);
 
   return true;