Changeset 16070

Timestamp:

04/11/08 15:42:59 (6 months ago)

Author:

rambo

Message:

forward porting r16068 & r16069

Files:

• trunk/midcom/midcom.core/midcom/config/midcom_config.php (modified) (1 diff)
• trunk/midcom/midcom.core/midcom/services/_sessioning.php (modified) (4 diffs)
• trunk/midcom/midcom.helper.datamanager2/schema.php (modified) (1 diff)

trunk/midcom/midcom.core/midcom/config/midcom_config.php

@@ -527 +527 @@
-$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 ----- */

trunk/midcom/midcom.core/midcom/services/_sessioning.php

@@ -70 +70 @@
-        $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();
-
@@ -80 +106 @@
-            $_SESSION["midcom_session_data"]["midcom.service.sessioning"]["startup"] = serialize(time());
-        }
+        $initialized = true;
+        return true;
-    }
-
@@ -93 +121 @@
-    function exists ($domain, $key)
-    {
+        if (!$this->_initialize())
+        {
+            return false;
+        }
-        if (! array_key_exists($domain, $_SESSION["midcom_session_data"]))
-        {
@@ -194 +226 @@
-    function set ($domain, $key, $value)
-    {
+        if (!$this->_initialize(true))
+        {
+            return false;
+        }
-        static $no_cache = false;
-        if (!$no_cache)

trunk/midcom/midcom.helper.datamanager2/schema.php

@@ -576 +576 @@
-     function register_to_session($guid)
-     {
+        $key = $this->name .  $guid;
+        // Seems we do not need this anymore, but return key still
+        return $key;
+
-        $session =& $_MIDCOM->get_service('session');
-        $key = $this->name .  $guid;
-
-        $session->set('midcom.helper.datamanager2', $key, $this->_raw_schema);
-        return $key;