Changeset 16068

Timestamp:

04/11/08 15:34:07 (6 months ago)

Author:

rambo

Message:

be less liberal about spewing session cookies around

Files:

• branches/MidCOM_2_8/midcom.core/midcom/config/midcom_config.php (modified) (1 diff)
• branches/MidCOM_2_8/midcom.core/midcom/services/_sessioning.php (modified) (4 diffs)

branches/MidCOM_2_8/midcom.core/midcom/config/midcom_config.php

@@ -507 +507 @@
-$GLOBALS['midcom_config_default']['auto_formatter'] = array();
-
+/**
+ * Sessioning service, disabling the service will help with external caches.
+ * The second option is to allow logged in users to benefit from the service
+ */
+$GLOBALS['midcom_config_default']['sessioning_service_enable'] = true;
+$GLOBALS['midcom_config_default']['sessioning_service_always_enable_for_users'] = true;
+
-/* ----- Include the site config ----- */
-/* This should be replaced by $_MIDGARD constructs */

branches/MidCOM_2_8/midcom.core/midcom/services/_sessioning.php

@@ -71 +71 @@
-        $started = true;
-
+    }
+
+    function _initialize($unconditional_start = false)
+    {
+        static $initialized = false;
+        if ($initialized)
+        {
+            return true;
+        }
+
+        if (   !$GLOBALS['midcom_config']['sessioning_service_enable']
+            && !(   $GLOBALS['midcom_config']['sessioning_service_always_enable_for_users']
+                 && $_MIDGARD['user']
+                 )
+            )
+        {
+            return false;
+        }
+
+        // Try to start session only if the client sends the id OR we need to set data
+        if (   !isset($_REQUEST[session_name()])
+            && !$unconditional_start)
+        {
+            return false;
+        }
+
-        @session_start();
-
@@ -81 +107 @@
-            $_SESSION["midcom_session_data"]["midcom.service.sessioning"]["startup"] = serialize(time());
-        }
+        $initialized = true;
+        return true;
-    }
-
@@ -94 +122 @@
-    function exists ($domain, $key)
-    {
+        if (!$this->_initialize())
+        {
+            return false;
+        }
-        if (! array_key_exists($domain, $_SESSION["midcom_session_data"]))
-        {
@@ -195 +227 @@
-    function set ($domain, $key, $value)
-    {
+        if (!$this->_initialize(true))
+        {
+            return false;
+        }
-        static $no_cache = false;
-        if (!$no_cache)