Various Horde_Session conversions in horde/Core.

diff --git a/framework/Core/lib/Horde/Core/Browser.php b/framework/Core/lib/Horde/Core/Browser.php
index 856b1e4..d96cb3d 100644 (file)
--- a/framework/Core/lib/Horde/Core/Browser.php
+++ b/framework/Core/lib/Horde/Core/Browser.php
@@ -60,9 +60,7 @@ class Horde_Core_Browser extends Horde_Browser
      */
     public function setIEVersion($ver)
     {
-        $_SESSION['horde_browser'] = array(
-            'ie_version' => $ver
-        );
+        $GLOBALS['session']['horde:ie_version'] = $ver;
     }
 
     /**
@@ -72,9 +70,7 @@ class Horde_Core_Browser extends Horde_Browser
      */
     public function getIEVersion()
     {
-        return isset($_SESSION['horde_browser']['ie_version'])
-            ? $_SESSION['horde_browser']['ie_version']
-            : null;
+        return $GLOBALS['session']['horde:ie_version'];
     }
 
 }

diff --git a/framework/Core/lib/Horde/Core/Factory/Prefs.php b/framework/Core/lib/Horde/Core/Factory/Prefs.php
index 18e26db..6668e84 100644 (file)
--- a/framework/Core/lib/Horde/Core/Factory/Prefs.php
+++ b/framework/Core/lib/Horde/Core/Factory/Prefs.php
@@ -111,8 +111,8 @@ class Horde_Core_Factory_Prefs
             try {
                 $this->_instances[$sig] = Horde_Prefs::factory($driver, $scope, $opts, $params);
             } catch (Horde_Prefs_Exception $e) {
-                if (empty($_SESSION['prefs_cache']['unavailable'])) {
-                    $_SESSION['prefs_cache']['unavailable'] = true;
+                if (!$GLOBALS['session']['horde:no_prefs']) {
+                    $GLOBALS['session']['horde:no_prefs'] = true;
                     if (isset($GLOBALS['notification'])) {
                         $GLOBALS['notification']->push(_("The preferences backend is currently unavailable and your preferences have not been loaded. You may continue to use the system with default preferences."));
                     }

diff --git a/framework/Core/lib/Horde/Core/LoginTasks/Backend/Horde.php b/framework/Core/lib/Horde/Core/LoginTasks/Backend/Horde.php
index bb180b9..cacb150 100644 (file)
--- a/framework/Core/lib/Horde/Core/LoginTasks/Backend/Horde.php
+++ b/framework/Core/lib/Horde/Core/LoginTasks/Backend/Horde.php
@@ -51,10 +51,11 @@ class Horde_Core_LoginTasks_Backend_Horde extends Horde_LoginTasks_Backend
      */
     public function getTasklistFromCache()
     {
-        if (isset($_SESSION['horde_logintasks'][$this->_app])) {
-            return @unserialize($_SESSION['horde_logintasks'][$this->_app]);
-        }
-        return false;
+        global $session;
+
+        return isset($session['horde:logintasks/' . $this->_app])
+            ? @unserialize($session['horde:logintasks/' . $this->_app])
+            : false;
     }
 
     /**
@@ -65,7 +66,7 @@ class Horde_Core_LoginTasks_Backend_Horde extends Horde_LoginTasks_Backend
      */
     public function storeTasklistInCache($tasklist)
     {
-        $_SESSION['horde_logintasks'][$this->_app] = serialize($tasklist);
+        $GLOBALS['session']['horde:logintasks/' . $this->_app] = serialize($tasklist);
     }
 
     /**
@@ -75,18 +76,20 @@ class Horde_Core_LoginTasks_Backend_Horde extends Horde_LoginTasks_Backend
      */
     public function getTasks()
     {
+        global $session;
+
         $app_list = array($this->_app);
         $tasks = array();
 
         switch ($this->_app) {
         case 'horde':
-            if (isset($_SESSION['horde_logintasks']['horde'])) {
+            if (isset($session['horde:logintasks/horde'])) {
                 return $tasks;
             }
             break;
 
         default:
-            if (!isset($_SESSION['horde_logintasks']['horde'])) {
+            if (!isset($session['horde:logintasks/horde'])) {
                 array_unshift($app_list, 'horde');
             }
             break;
@@ -134,12 +137,14 @@ class Horde_Core_LoginTasks_Backend_Horde extends Horde_LoginTasks_Backend
      */
     public function markLastRun()
     {
+        global $session;
+
         $lasttasks = $this->getLastRun();
         $lasttasks[$this->_app] = time();
         if (($this->_app != 'horde') &&
-            !isset($_SESSION['horde_logintasks']['horde'])) {
+            !isset($session['horde:logintasks/horde'])) {
             $lasttasks['horde'] = time();
-            $_SESSION['horde_logintasks']['horde'] = true;
+            $session['horde:logintasks/horde'] = true;
         }
         $this->setLastRun($lasttasks);
     }

diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index c76b09a..1b6a0f0 100644 (file)
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -461,7 +461,7 @@ class Horde_Registry
      */
     public function clearCache()
     {
-        unset($_SESSION['_registry']);
+        unset($GLOBALS['session']['horde:registry/']);
         $this->_saveCacheVar('api', true);
         $this->_saveCacheVar('appcache', true);
     }
@@ -1518,7 +1518,7 @@ class Horde_Registry
             }
         } else {
             $data = serialize($this->_cache[$name]);
-            $_SESSION['_registry']['md5'][$name] = $md5sum = hash('md5', $data);
+            $GLOBALS['session']['horde:registry/' . $name] = $md5sum = hash('md5', $data);
             $id = $this->_getCacheId($name, false) . '|' . $md5sum;
             if ($ob->set($id, $data, 86400)) {
                 Horde::logMessage('Horde_Registry: stored ' . $name . ' with cache ID ' . $id, 'DEBUG');
@@ -1570,8 +1570,8 @@ class Horde_Registry
 
         if (!$md5) {
             return $id;
-        } elseif (isset($_SESSION['_registry']['md5'][$name])) {
-            return $id . '|' . $_SESSION['_registry']['md5'][$name];
+        } elseif ($hash = $GLOBALS['session']['horde:registry/' . $name]) {
+            return $id . '|' . $hash;
         }
 
         return false;