From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 3 Nov 2010 07:11:14 +0000 (-0600)
Subject: Framework: Convert to new Horde_Session API
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=7988b797380b30f8ac00a4febbe59aec44a1795b;p=horde.git

Framework: Convert to new Horde_Session API
---

diff --git a/framework/Alarm/lib/Horde/Alarm.php b/framework/Alarm/lib/Horde/Alarm.php
index bf1463134..6bc156e28 100644
--- a/framework/Alarm/lib/Horde/Alarm.php
+++ b/framework/Alarm/lib/Horde/Alarm.php
@@ -112,8 +112,8 @@ abstract class Horde_Alarm
         // TODO: This must be moved to horde/Core.
         global $session;
 
-        if (isset($session['horde:alarm_loaded']) &&
-            (time() - $session['horde:alarm_loaded']) < $this->_params['ttl']) {
+        if ($session->exists('horde', 'alarm_loaded') &&
+            (time() - $session->get('horde', 'alarm_loaded')) < $this->_params['ttl']) {
             return;
         }
 
@@ -135,7 +135,7 @@ abstract class Horde_Alarm
 
             /* Load current alarms if no preloading requested or if this
              * is the first call in this session. */
-            if (!$preload || !$session['horde:alarm_loaded']) {
+            if (!$preload || !$session->get('horde', 'alarm_loaded')) {
                 try {
                     $app_alarms = $GLOBALS['registry']->callByPackage($app, 'listAlarms', array(time(), $user), array('noperms' => true));
                 } catch (Horde_Exception $e) {
@@ -152,7 +152,7 @@ abstract class Horde_Alarm
             }
         }
 
-        $session['horde:alarm_loaded'] = time();
+        $session->set('horde', 'alarm_loaded', time());
     }
 
     /**
diff --git a/framework/Block/lib/Horde/Block/Collection.php b/framework/Block/lib/Horde/Block/Collection.php
index c5d29ec14..ae8d4e5c4 100644
--- a/framework/Block/lib/Horde/Block/Collection.php
+++ b/framework/Block/lib/Horde/Block/Collection.php
@@ -66,7 +66,7 @@ class Horde_Block_Collection
         global $session;
 
         $signature = serialize($apps);
-        if ($this->_blocks = $session['horde:blocks/' . $signature]) {
+        if ($this->_blocks = $session->get('horde', 'blocks/' . $signature)) {
             return;
         }
 
@@ -108,7 +108,7 @@ class Horde_Block_Collection
         }
 
         uksort($this->_blocks, array($this, 'sortBlockCollection'));
-        $session['horde:blocks/' . $signature] = $this->_blocks;
+        $session->set('horde', 'blocks/' . $signature, $this->_blocks);
     }
 
     /**
diff --git a/framework/Core/lib/Horde.php b/framework/Core/lib/Horde.php
index 7b32547ea..f2bf7f883 100644
--- a/framework/Core/lib/Horde.php
+++ b/framework/Core/lib/Horde.php
@@ -356,7 +356,7 @@ HTML;
     static public function getRequestToken($slug)
     {
         $token = Horde_Token::generateId($slug);
-        $GLOBALS['session']['horde:form_secrets/' . $token] = time();
+        $GLOBALS['session']->set('horde', 'form_secrets/' . $token, time());
 
         return $token;
     }
@@ -373,11 +373,11 @@ HTML;
     {
         global $conf, $session;
 
-        if (!isset($session['horde:form_secrets/' . $token])) {
+        if (!$session->exists('horde', 'form_secrets/' . $token)) {
             throw new Horde_Exception(Horde_Core_Translation::t("We cannot verify that this request was really sent by you. It could be a malicious request. If you intended to perform this action, you can retry it now."));
         }
 
-        if (($session['horde:form_secrets/' . $token] + $GLOBALS['conf']['urls']['token_lifetime'] * 60) < time()) {
+        if (($session->get('horde', 'form_secrets/' . $token) + $GLOBALS['conf']['urls']['token_lifetime'] * 60) < time()) {
             throw new Horde_Exception(sprintf(Horde_Core_Translation::t("This request cannot be completed because the link you followed or the form you submitted was only valid for %s minutes. Please try again now."), $GLOBALS['conf']['urls']['token_lifetime']));
         }
     }
diff --git a/framework/Core/lib/Horde/Core/Browser.php b/framework/Core/lib/Horde/Core/Browser.php
index 5601a0806..62218e8e6 100644
--- a/framework/Core/lib/Horde/Core/Browser.php
+++ b/framework/Core/lib/Horde/Core/Browser.php
@@ -60,7 +60,7 @@ class Horde_Core_Browser extends Horde_Browser
      */
     public function setIEVersion($ver)
     {
-        $GLOBALS['session']['horde:ie_version'] = $ver;
+        $GLOBALS['session']->set('horde', 'ie_version', $ver);
     }
 
     /**
@@ -70,10 +70,8 @@ class Horde_Core_Browser extends Horde_Browser
      */
     public function getIEVersion()
     {
-        if (isset($GLOBALS['session']['horde:ie_version'])) {
-            return $GLOBALS['session']['horde:ie_version'];
-        } else {
-            return null;
-        }
+        return isset($GLOBALS['session'])
+            ? $GLOBALS['session']->get('horde', 'ie_version')
+            : null;
     }
 }
diff --git a/framework/Core/lib/Horde/Core/Factory/Prefs.php b/framework/Core/lib/Horde/Core/Factory/Prefs.php
index de73e57e4..e5403df7d 100644
--- a/framework/Core/lib/Horde/Core/Factory/Prefs.php
+++ b/framework/Core/lib/Horde/Core/Factory/Prefs.php
@@ -121,8 +121,8 @@ class Horde_Core_Factory_Prefs
             try {
                 $this->_instances[$sig] = new Horde_Core_Prefs($driver, $scope, $opts, $params);
             } catch (Horde_Prefs_Exception $e) {
-                if (!$GLOBALS['session']['horde:no_prefs']) {
-                    $GLOBALS['session']['horde:no_prefs'] = true;
+                if (!$GLOBALS['session']->get('horde', 'no_prefs')) {
+                    $GLOBALS['session']->set('horde', 'no_prefs', true);
                     if (isset($GLOBALS['notification'])) {
                         $GLOBALS['notification']->push(Horde_Core_Translation::t("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/Factory/Tree.php b/framework/Core/lib/Horde/Core/Factory/Tree.php
index aaeebaf6b..6129767b2 100644
--- a/framework/Core/lib/Horde/Core/Factory/Tree.php
+++ b/framework/Core/lib/Horde/Core/Factory/Tree.php
@@ -103,14 +103,14 @@ class Horde_Core_Factory_Tree
      */
     public function getSession($instance, $id)
     {
-        return $GLOBALS['session']['horde:tree-' . $instance . '/' . $id];
+        return $GLOBALS['session']->get('horde', 'tree-' . $instance . '/' . $id);
     }
 
     /**
      */
     public function setSession($instance, $id, $val)
     {
-        $GLOBALS['session']['horde:tree-' . $instance . '/' . $id] = $val;
+        $GLOBALS['session']->set('horde', 'tree-' . $instance . '/' . $id, $val);
     }
 
 }
diff --git a/framework/Core/lib/Horde/Core/LoginTasks/Backend/Horde.php b/framework/Core/lib/Horde/Core/LoginTasks/Backend/Horde.php
index aa31eb6f0..5abfdb01e 100644
--- a/framework/Core/lib/Horde/Core/LoginTasks/Backend/Horde.php
+++ b/framework/Core/lib/Horde/Core/LoginTasks/Backend/Horde.php
@@ -51,7 +51,7 @@ class Horde_Core_LoginTasks_Backend_Horde extends Horde_LoginTasks_Backend
      */
     public function getTasklistFromCache()
     {
-        return $GLOBALS['session']['horde:logintasks/' . $this->_app];
+        return $GLOBALS['session']->get('horde', 'logintasks/' . $this->_app);
     }
 
     /**
@@ -62,7 +62,7 @@ class Horde_Core_LoginTasks_Backend_Horde extends Horde_LoginTasks_Backend
      */
     public function storeTasklistInCache($tasklist)
     {
-        $GLOBALS['session']['horde:logintasks/' . $this->_app] = $tasklist;
+        $GLOBALS['session']->set('horde', 'logintasks/' . $this->_app, $tasklist);
     }
 
     /**
@@ -79,13 +79,13 @@ class Horde_Core_LoginTasks_Backend_Horde extends Horde_LoginTasks_Backend
 
         switch ($this->_app) {
         case 'horde':
-            if (isset($session['horde:logintasks/horde'])) {
+            if ($session->exists('horde', 'logintasks/horde')) {
                 return $tasks;
             }
             break;
 
         default:
-            if (!isset($session['horde:logintasks/horde'])) {
+            if (!$session->exists('horde', 'logintasks/horde')) {
                 array_unshift($app_list, 'horde');
             }
             break;
@@ -138,9 +138,9 @@ class Horde_Core_LoginTasks_Backend_Horde extends Horde_LoginTasks_Backend
         $lasttasks = $this->getLastRun();
         $lasttasks[$this->_app] = time();
         if (($this->_app != 'horde') &&
-            !isset($session['horde:logintasks/horde'])) {
+            !$session->exists('horde', 'logintasks/horde')) {
             $lasttasks['horde'] = time();
-            $session['horde:logintasks/horde'] = true;
+            $session->set('horde', 'logintasks/horde', true);
         }
         $this->setLastRun($lasttasks);
     }
diff --git a/framework/Core/lib/Horde/Core/Notification/Storage/Session.php b/framework/Core/lib/Horde/Core/Notification/Storage/Session.php
index 1af241f6c..41e0a9d2c 100644
--- a/framework/Core/lib/Horde/Core/Notification/Storage/Session.php
+++ b/framework/Core/lib/Horde/Core/Notification/Storage/Session.php
@@ -30,28 +30,28 @@ implements Horde_Notification_Storage_Interface
      */
     public function get($key)
     {
-        return $GLOBALS['session']['horde:notify/' . $key];
+        return $GLOBALS['session']->get('horde', 'notify/' . $key);
     }
 
     /**
      */
     public function set($key, $value)
     {
-        $GLOBALS['session']['horde:notify/' . $key] = $value;
+        $GLOBALS['session']->set('horde', 'notify/' . $key, $value);
     }
 
     /**
      */
     public function exists($key)
     {
-        return isset($GLOBALS['session']['horde:notify/' . $key]);
+        return $GLOBALS['session']->exists('horde', 'notify/' . $key);
     }
 
     /**
      */
     public function clear($key)
     {
-        unset($GLOBALS['session']['horde:notify/' . $key]);
+        $GLOBALS['session']->remove('horde', 'notify/' . $key);
     }
 
     /**
@@ -60,9 +60,9 @@ implements Horde_Notification_Storage_Interface
     {
         global $session;
 
-        $events = $session['horde:notify/' . $listener . ';array'];
+        $events = $session->get('horde', 'notify/' . $listener, Horde_Session::TYPE_ARRAY);
         $events[] = $event;
-        $session['horde:notify/' . $listener . ';object'] = $events;
+        $session->set('horde', 'notify/' . $listener, $events, Horde_Session::TYPE_OBJECT);
     }
 
 }
diff --git a/framework/Core/lib/Horde/Core/Prefs/Storage/Session.php b/framework/Core/lib/Horde/Core/Prefs/Storage/Session.php
index 406053bd1..47040a675 100644
--- a/framework/Core/lib/Horde/Core/Prefs/Storage/Session.php
+++ b/framework/Core/lib/Horde/Core/Prefs/Storage/Session.php
@@ -14,7 +14,7 @@
  */
 class Horde_Core_Prefs_Storage_Session extends Horde_Prefs_Storage
 {
-    const SESS_KEY = 'horde:prefs_session/';
+    const SESS_KEY = 'prefs_session/';
 
     /**
      */
@@ -22,8 +22,8 @@ class Horde_Core_Prefs_Storage_Session extends Horde_Prefs_Storage
     {
         global $session;
 
-        return isset($session[self::SESS_KEY . $scope])
-            ? $session[self::SESS_KEY . $scope]
+        return $session->exists('horde', self::SESS_KEY . $scope)
+            ? $session->get('horde', self::SESS_KEY . $scope)
             : false;
     }
 
@@ -35,7 +35,7 @@ class Horde_Core_Prefs_Storage_Session extends Horde_Prefs_Storage
             if (($old_vals = $this->get($scope)) === false) {
                 $old_vals = array();
             }
-            $GLOBALS['session'][self::SESS_KEY . $scope] = array_merge($old_vals, $vals);
+            $GLOBALS['session']->set('horde', self::SESS_KEY . $scope, array_merge($old_vals, $vals));
         }
     }
 
@@ -46,13 +46,13 @@ class Horde_Core_Prefs_Storage_Session extends Horde_Prefs_Storage
         global $session;
 
         if (is_null($scope)) {
-            unset($session[self::SESS_KEY]);
+            $session->remove('horde', self::SESS_KEY);
         } elseif (is_null($pref)) {
-            unset($session[self::SESS_KEY . $this->_scope]);
+            $session->remove('horde', self::SESS_KEY . $this->_scope);
         } elseif ((($vals = $this->get($scope)) !== false) &&
                   isset($vals[$pref])) {
             unset($vals[$pref]);
-            $session[self::SESS_KEY . $scope] = $vals;
+            $session->set('horde', self::SESS_KEY . $scope, $vals);
         }
     }
 
diff --git a/framework/Core/lib/Horde/Core/Prefs/Ui.php b/framework/Core/lib/Horde/Core/Prefs/Ui.php
index a0b3a0b1f..ad2a700b6 100644
--- a/framework/Core/lib/Horde/Core/Prefs/Ui.php
+++ b/framework/Core/lib/Horde/Core/Prefs/Ui.php
@@ -157,7 +157,7 @@ class Horde_Core_Prefs_Ui
                 if (!$GLOBALS['prefs']->isLocked($pref) &&
                     !in_array($pref, $this->suppress) &&
                     (empty($this->prefs[$pref]['advanced']) ||
-                     $GLOBALS['session']['horde:prefs_advanced']) &&
+                     $GLOBALS['session']->get('horde', 'prefs_advanced')) &&
                     ((!empty($this->prefs[$pref]['type']) &&
                      ($this->prefs[$pref]['type'] != 'implicit')))) {
                     $prefs[] = $pref;
@@ -177,7 +177,7 @@ class Horde_Core_Prefs_Ui
         /* Toggle Advanced/Basic mode. */
         if (!empty($this->vars->show_advanced) ||
             !empty($this->vars->show_basic)) {
-            $GLOBALS['session']['horde:prefs_advanced'] = !empty($this->vars->show_advanced);
+            $GLOBALS['session']->set('horde', 'prefs_advanced', !empty($this->vars->show_advanced));
         }
 
         if (!$this->group || !$this->groupIsEditable($this->group)) {
@@ -587,7 +587,7 @@ class Horde_Core_Prefs_Ui
         $t->set('apps', $tmp);
         $t->set('header', htmlspecialchars(($this->app == 'horde') ? Horde_Core_Translation::t("Global Preferences") : sprintf(Horde_Core_Translation::t("Preferences for %s"), $registry->get('name', $this->app))));
 
-        if ($GLOBALS['session']['horde:prefs_advanced']) {
+        if ($GLOBALS['session']->get('horde', 'prefs_advanced')) {
             $t->set('advanced', $this->selfUrl()->add('show_advanced', 1));
         } else {
             $t->set('basic', $this->selfUrl()->add('show_basic', 1));
diff --git a/framework/Core/lib/Horde/Core/Ui/Language.php b/framework/Core/lib/Horde/Core/Ui/Language.php
index 6a00353e5..b7c0dae4c 100644
--- a/framework/Core/lib/Horde/Core/Ui/Language.php
+++ b/framework/Core/lib/Horde/Core/Ui/Language.php
@@ -30,13 +30,13 @@ class Horde_Core_Ui_Language {
         $html = '';
 
         if (!$prefs->isLocked('language')) {
-            $session['horde:language'] = $registry->preferredLang();
+            $session->set('horde', 'language', $registry->preferredLang());
             $html = sprintf('<form name="language" action="%s">',
                             Horde::url($registry->get('webroot', 'horde') . '/services/language.php', false, -1));
             $html .= '<input type="hidden" name="url" value="' . @htmlspecialchars(Horde::selfUrl(false, false, true)) . '" />';
             $html .= '<select name="new_lang" onchange="document.language.submit()">';
             foreach ($registry->nlsconfig['languages'] as $key => $val) {
-                $sel = ($key == $session['horde:language']) ? ' selected="selected"' : '';
+                $sel = ($key == $session->get('horde', 'language')) ? ' selected="selected"' : '';
                 $html .= "<option value=\"$key\"$sel>$val</option>";
             }
             $html .= '</select></form>';
diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index d84341039..b8df1a7e0 100644
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -396,7 +396,7 @@ class Horde_Registry
          * 'notification_override' session variable. */
         $GLOBALS['notification'] = $injector->getInstance('Horde_Notification');
         if (Horde_Util::getFormData('ajaxui') &&
-            ($override = $session['horde:notification_override'])) {
+            ($override = $session->get('horde', 'notification_override'))) {
             require_once $override[0];
             $GLOBALS['notification']->attach('status', null, $override[1]);
         } else {
@@ -457,7 +457,7 @@ class Horde_Registry
      */
     public function clearCache()
     {
-        unset($GLOBALS['session']['horde:registry/']);
+        $GLOBALS['session']->remove('horde', 'registry/');
         $this->_saveCacheVar('api', true);
         $this->_saveCacheVar('appcache', true);
     }
@@ -1513,7 +1513,8 @@ class Horde_Registry
             }
         } else {
             $data = serialize($this->_cache[$name]);
-            $GLOBALS['session']['horde:registry/' . $name] = $md5sum = hash('md5', $data);
+            $md5sum = hash('md5', $data);
+            $GLOBALS['session']->set('horde', 'registry/' . $name, $md5sum);
             $id = $this->_getCacheId($name, false) . '|' . $md5sum;
             if ($ob->set($id, $data, 86400)) {
                 Horde::logMessage('Horde_Registry: stored ' . $name . ' with cache ID ' . $id, 'DEBUG');
@@ -1565,7 +1566,7 @@ class Horde_Registry
 
         if (!$md5) {
             return $id;
-        } elseif ($hash = $GLOBALS['session']['horde:registry/' . $name]) {
+        } elseif ($hash = $GLOBALS['session']->get('horde', 'registry/' . $name)) {
             return $id . '|' . $hash;
         }
 
@@ -1601,13 +1602,14 @@ class Horde_Registry
         global $session;
 
         /* Do logout tasks. */
-        foreach (array_keys($session['horde:auth_app/;array']) as $app) {
+        foreach (array_keys($session->get('horde', 'auth_app/', Horde_Session::TYPE_ARRAY)) as $app) {
             try {
                 $this->callAppMethod($app, 'logout');
             } catch (Horde_Exception $e) {}
         }
 
-        unset($session['horde:auth'], $session['horde:auth_app/']);
+        $session->remove('horde', 'auth');
+        $session->remove('horde', 'auth_app/');
 
         /* Remove the user's cached preferences if they are present. */
         $GLOBALS['injector']->getInstance('Horde_Core_Factory_Prefs')->clearCache();
@@ -1673,7 +1675,7 @@ class Horde_Registry
         /* Check for cached authentication results. */
         if ($this->getAuth() &&
             (($app == 'horde') ||
-             isset($GLOBALS['session']['horde:auth_app/' . $app]))) {
+             $GLOBALS['session']->exists('horde', 'auth_app/' . $app))) {
             return $this->checkExistingAuth();
         }
 
@@ -1823,12 +1825,12 @@ class Horde_Registry
         global $session;
 
         if ($format == 'original') {
-            return isset($session['horde:auth/authId'])
-                ? $session['horde:auth/authId']
+            return $session->exists('horde', 'auth/authId')
+                ? $session->get('horde', 'auth/authId')
                 : false;
         }
 
-        $user = $session['horde:auth/userId'];
+        $user = $session->get('horde', 'auth/userId');
         if (is_null($user)) {
             return false;
         }
@@ -1856,7 +1858,7 @@ class Horde_Registry
      */
     public function passwordChangeRequested()
     {
-        return (bool)$GLOBALS['session']['horde:auth/change'];
+        return (bool)$GLOBALS['session']->get('horde', 'auth/change');
     }
 
     /**
@@ -1919,12 +1921,12 @@ class Horde_Registry
         $secret = $GLOBALS['injector']->getInstance('Horde_Secret');
         $entry = $secret->write($secret->getKey('auth'), serialize($credentials));
 
-        if (($base_app = $session['horde:auth/credentials']) &&
-            ($session['horde:auth_app/' . $base_app] == $entry)) {
+        if (($base_app = $session->get('horde', 'auth/credentials')) &&
+            ($session->get('horde', 'auth_app/' . $base_app) == $entry)) {
             $entry = null;
         }
 
-        $session['horde:auth_app/' . $app] = $entry;
+        $session->set('horde', 'auth_app/' . $app, $entry);
     }
 
     /**
@@ -1938,7 +1940,7 @@ class Horde_Registry
     {
         global $session;
 
-        $base_app = $session['horde:auth/credentials'];
+        $base_app = $session->get('horde', 'auth/credentials');
         if (is_null($base_app)) {
             return false;
         }
@@ -1947,14 +1949,14 @@ class Horde_Registry
             $app = $base_app;
         }
 
-        if (!isset($session['horde:auth_app/' . $app])) {
+        if (!$session->exists('horde', 'auth_app/' . $app)) {
             return ($base_app != $app)
                 ? $this->_getAuthCredentials($app)
                 : false;
         }
 
         $secret = $GLOBALS['injector']->getInstance('Horde_Secret');
-        return @unserialize($secret->read($secret->getKey('auth'), $session['horde:auth_app/' . $app]));
+        return @unserialize($secret->read($secret->getKey('auth'), $session->get('horde', 'auth_app/' . $app)));
     }
 
     /**
@@ -2007,17 +2009,17 @@ class Horde_Registry
             return;
         }
 
-        $session['horde:auth/authId'] = $authId;
-        $session['horde:auth/browser'] = $GLOBALS['browser']->getAgentString();
+        $session->set('horde', 'auth/authId', $authId);
+        $session->set('horde', 'auth/browser', $GLOBALS['browser']->getAgentString());
         if (!empty($options['change'])) {
-            $session['horde:auth/change'] = 1;
+            $session->set('horde', 'auth/change', 1);
         }
-        $session['horde:auth/credentials'] = $app;
+        $session->set('horde', 'auth/credentials', $app);
         if (isset($_SERVER['REMOTE_ADDR'])) {
-            $session['horde:auth/remoteAddr'] = $_SERVER['REMOTE_ADDR'];
+            $session->set('horde', 'auth/remoteAddr', $_SERVER['REMOTE_ADDR']);
         }
-        $session['horde:auth/timestamp'] = time();
-        $session['horde:auth/userId'] = $this->convertUsername(trim($authId), true);
+        $session->set('horde', 'auth/timestamp', time());
+        $session->set('horde', 'auth/userId', $this->convertUsername(trim($authId), true));
 
         $this->setAuthCredential($credentials, null, $app);
 
@@ -2041,14 +2043,14 @@ class Horde_Registry
         $auth = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Auth')->create();
 
         if (!empty($GLOBALS['conf']['auth']['checkip']) &&
-            ($remoteaddr = $session['horde:auth/remoteAddr']) &&
+            ($remoteaddr = $session->get('horde', 'auth/remoteAddr')) &&
             ($remoteaddr != $_SERVER['REMOTE_ADDR'])) {
             $auth->setError(Horde_Core_Auth_Application::REASON_SESSIONIP);
             return false;
         }
 
         if (!empty($GLOBALS['conf']['auth']['checkbrowser']) &&
-            ($session['horde:auth/browser'] != $GLOBALS['browser']->getAgentString())) {
+            ($session->get('horde', 'auth/browser') != $GLOBALS['browser']->getAgentString())) {
             $auth->setError(Horde_Core_Auth_Application::REASON_BROWSER);
             return false;
         }
@@ -2107,8 +2109,8 @@ class Horde_Registry
         } elseif (!empty($lang) && $this->isValidLang($lang)) {
             $language = $lang;
         /* Check if we have a language set in the session */
-        } elseif (isset($GLOBALS['session']['horde:language'])) {
-            $language = $GLOBALS['session']['horde:language'];
+        } elseif ($GLOBALS['session']->exists('horde', 'language')) {
+            $language = $GLOBALS['session']->get('horde', 'language');
         /* Use site-wide default, if one is defined */
         } elseif (!empty($this->nlsconfig['defaults']['language'])) {
             $language = $this->nlsconfig['defaults']['language'];
@@ -2179,7 +2181,7 @@ class Horde_Registry
             $lang = $this->preferredLang();
         }
 
-        $GLOBALS['session']['horde:language'] = $lang;
+        $GLOBALS['session']->set('horde', 'language', $lang);
 
         if (isset($GLOBALS['language'])) {
             if ($GLOBALS['language'] == $lang) {
diff --git a/framework/Form/Form.php b/framework/Form/Form.php
index 1ae31536c..acab2917c 100644
--- a/framework/Form/Form.php
+++ b/framework/Form/Form.php
@@ -416,7 +416,7 @@ class Horde_Form {
 
         if ($this->_useFormToken) {
             $token = Horde_Token::generateId($this->_name);
-            $GLOBALS['session']['horde:form_secrets/' . $token] = true;
+            $GLOBALS['session']->set('horde', 'form_secrets/' . $token, true);
             $this->_preserveVarByPost($this->_name . '_formToken', $token);
         }
 
@@ -476,7 +476,7 @@ class Horde_Form {
 
         if ($this->_useFormToken) {
             $token = Horde_Token::generateId($this->_name);
-            $GLOBALS['session']['horde:form_secrets/' . $token] = true;
+            $GLOBALS['session']->set('horde', 'form_secrets/' . $token, true);
             $this->_preserveVarByPost($this->_name . '_formToken', $token);
         }
 
@@ -533,7 +533,7 @@ class Horde_Form {
     {
         if ($this->_useFormToken) {
             $token = Horde_Token::generateId($this->_name);
-            $GLOBALS['session']['horde:form_secrets/' . $token] = true;
+            $GLOBALS['session']->set('horde', 'form_secrets/' . $token, true);
             $this->_preserveVarByPost($this->_name . '_formToken', $token);
         }
 
@@ -617,7 +617,7 @@ class Horde_Form {
             if (!empty($passedToken) && !$tokenSource->verify($passedToken)) {
                 $this->_errors['_formToken'] = Horde_Form_Translation::t("This form has already been processed.");
             }
-            if (!$GLOBALS['session']['horde:form_secrets/' . $passedToken]) {
+            if (!$GLOBALS['session']->get('horde', 'form_secrets/' . $passedToken)) {
                 $this->_errors['_formSecret'] = Horde_Form_Translation::t("Required secret is invalid - potentially malicious request.");
             }
         }
diff --git a/framework/Group/lib/Horde/Group/Contactlists.php b/framework/Group/lib/Horde/Group/Contactlists.php
index 862bd3f33..b1a4fdbdc 100644
--- a/framework/Group/lib/Horde/Group/Contactlists.php
+++ b/framework/Group/lib/Horde/Group/Contactlists.php
@@ -563,8 +563,8 @@ class Horde_Group_Contactlists extends Horde_Group
     public function userIsInGroup($user, $gid, $subgroups = true)
     {
         $id = implode('-', array($user, $subgroups, $gid));
-        if (isset($GLOBALS['session']['horde:groups_i/' . $id])) {
-            return $GLOBALS['session']['horde:groups_i/' . $id];
+        if ($GLOBALS['session']->exists('horde', 'groups_i/' . $id)) {
+            return $GLOBALS['session']->get('horde', 'groups_i/' . $id);
         }
 
         try {
@@ -574,7 +574,7 @@ class Horde_Group_Contactlists extends Horde_Group
             return false;
         }
 
-        $GLOBALS['session']['horde:groups_i/' . $id] = $result = (bool)!empty($users[$user]);
+        $GLOBALS['session']->set('horde', 'groups_i/' . $id, $result = (bool)!empty($users[$user]));
 
         return $result;
     }
diff --git a/framework/Group/lib/Horde/Group/Sql.php b/framework/Group/lib/Horde/Group/Sql.php
index 859daeadc..4e9928578 100644
--- a/framework/Group/lib/Horde/Group/Sql.php
+++ b/framework/Group/lib/Horde/Group/Sql.php
@@ -641,8 +641,8 @@ class Horde_Group_Sql extends Horde_Group
     public function getGroupMemberships($user, $parentGroups = false)
     {
         $id = implode('|', array($user, $parentGroups));
-        if (isset($GLOBALS['session']['horde:groups_m/' . $id])) {
-            return $GLOBALS['session']['horde:groups_m/' . $id];
+        if ($GLOBALS['session']->exists('horde', 'groups_m/' . $id)) {
+            return $GLOBALS['session']->get('horde', 'groups_m/' . $id);
         }
 
         $sql = 'SELECT g.group_uid AS group_uid, g.group_name AS group_name FROM horde_groups g, horde_groups_members m '
@@ -664,7 +664,7 @@ class Horde_Group_Sql extends Horde_Group
             }
         }
 
-        $GLOBALS['session']['horde:groups_m/' . $id] = $groups;
+        $GLOBALS['session']->set('horde', 'groups_m/' . $id, $groups);
 
         return $groups;
     }
@@ -682,8 +682,8 @@ class Horde_Group_Sql extends Horde_Group
     public function userIsInGroup($user, $gid, $subgroups = true)
     {
         $id = implode('|', array($user, $subgroups, $gid));
-        if (isset($GLOBALS['session']['horde:groups_i/' . $id])) {
-            return $GLOBALS['session']['horde:groups_i/' . $id];
+        if ($GLOBALS['session']->exists('horde', 'groups_i/' . $id)) {
+            return $GLOBALS['session']->get('horde', 'groups_i/' . $id);
         }
 
         if ($subgroups) {
@@ -705,7 +705,7 @@ class Horde_Group_Sql extends Horde_Group
 
         }
 
-        $GLOBALS['session']['horde:groups_i/' . $id] = (bool)$result;
+        $GLOBALS['session']->set('horde', 'groups_i/' . $id, (bool)$result);
 
         return (bool)$result;
     }