xoops-svn

[xoops-svn] SF.net SVN: xoops-svn:[12249] XoopsCore/branches/2.5.x/2.5.7/htdocs/include /common.php

[<rgr...@us...>]

Revision: 12249
          http://sourceforge.net/p/xoops/svn/12249
Author:   rgriffith
Date:     2013-12-29 01:51:53 +0000 (Sun, 29 Dec 2013)
Log Message:
-----------
Fix issue #1225 -- Restore user theme choice during "Remember me" processing.

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php	2013-12-28 20:02:03 UTC (rev 12248)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php	2013-12-29 01:51:53 UTC (rev 12249)
@@ -251,6 +251,12 @@
         } else {
             $_SESSION['xoopsUserGroups'] = $xoopsUser->getGroups();
         }
+        if (isset($hash_login)) {   // only do during a 'remember me' login
+            $user_theme = $xoopsUser->getVar('theme');
+            if ($user_theme != $xoopsConfig['theme_set'] && in_array($user_theme, $xoopsConfig['theme_set_allowed'])) {
+                $_SESSION['xoopsUserTheme'] = $user_theme;
+            }
+        }
         $xoopsUserIsAdmin = $xoopsUser->isAdmin();
     }
 }

[xoops-svn] SF.net SVN: xoops-svn:[12369] XoopsCore/branches/2.5.x/2.5.7/htdocs/include /common.php

[<rgr...@us...>]

Revision: 12369
          http://sourceforge.net/p/xoops/svn/12369
Author:   rgriffith
Date:     2014-03-09 19:40:11 +0000 (Sun, 09 Mar 2014)
Log Message:
-----------
Address issues with custom sessions

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php	2014-03-09 09:53:17 UTC (rev 12368)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php	2014-03-09 19:40:11 UTC (rev 12369)
@@ -201,7 +201,7 @@
                          array(&$sess_handler, 'destroy'),
                          array(&$sess_handler, 'gc'));
 
-if (strlen(session_id()) == 0) {
+if (session_status() !== PHP_SESSION_ACTIVE) {
     session_start();
 }
 

[xoops-svn] SF.net SVN: xoops-svn:[12370] XoopsCore/branches/2.5.x/2.5.7/htdocs/include /common.php

[<rgr...@us...>]

Revision: 12370
          http://sourceforge.net/p/xoops/svn/12370
Author:   rgriffith
Date:     2014-03-09 20:53:49 +0000 (Sun, 09 Mar 2014)
Log Message:
-----------
Address issues with custom sessions - part 2

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php	2014-03-09 19:40:11 UTC (rev 12369)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php	2014-03-09 20:53:49 UTC (rev 12370)
@@ -186,12 +186,8 @@
 ) {
     session_id($_POST[$xoopsConfig['sslpost_name']]);
 } else if ($xoopsConfig['use_mysession'] && $xoopsConfig['session_name'] != '' && $xoopsConfig['session_expire'] > 0) {
-    if (isset($_COOKIE[$xoopsConfig['session_name']])) {
-        session_id($_COOKIE[$xoopsConfig['session_name']]);
-    }
-    if (function_exists('session_cache_expire')) {
-        session_cache_expire($xoopsConfig['session_expire']);
-    }
+    session_name($xoopsConfig['session_name']);
+    session_cache_expire($xoopsConfig['session_expire']);
     @ini_set('session.gc_maxlifetime', $xoopsConfig['session_expire'] * 60);
 }
 session_set_save_handler(array(&$sess_handler, 'open'),

[xoops-svn] SF.net SVN: xoops-svn:[12377] XoopsCore/branches/2.5.x/2.5.7/htdocs/include /common.php

[<rgr...@us...>]

Revision: 12377
          http://sourceforge.net/p/xoops/svn/12377
Author:   rgriffith
Date:     2014-03-15 15:52:18 +0000 (Sat, 15 Mar 2014)
Log Message:
-----------
Rework to remove inadvertent dependency on PHP 5.4+ feature

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php	2014-03-14 09:32:52 UTC (rev 12376)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php	2014-03-15 15:52:18 UTC (rev 12377)
@@ -197,8 +197,13 @@
                          array(&$sess_handler, 'destroy'),
                          array(&$sess_handler, 'gc'));
 
-if (session_status() !== PHP_SESSION_ACTIVE) {
-    session_start();
+if (function_exists('session_status')) {
+    if (session_status() !== PHP_SESSION_ACTIVE) {
+        session_start();
+    }
+} else {
+    // this should silently fail if session has already started (for PHP 5.3)
+    @session_start();
 }
 
 /**