Convert horde_language session variable to Horde_Session usage

diff --git a/framework/Core/lib/Horde/Core/Ui/Language.php b/framework/Core/lib/Horde/Core/Ui/Language.php
index 1467f70..6a00353 100644 (file)
--- a/framework/Core/lib/Horde/Core/Ui/Language.php
+++ b/framework/Core/lib/Horde/Core/Ui/Language.php
@@ -25,16 +25,18 @@ class Horde_Core_Ui_Language {
      */
     static public function render()
     {
+        global $prefs, $registry, $session;
+
         $html = '';
 
-        if (!$GLOBALS['prefs']->isLocked('language')) {
-            $_SESSION['horde_language'] = $GLOBALS['registry']->preferredLang();
+        if (!$prefs->isLocked('language')) {
+            $session['horde:language'] = $registry->preferredLang();
             $html = sprintf('<form name="language" action="%s">',
-                            Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/language.php', false, -1));
+                            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 ($GLOBALS['registry']->nlsconfig['languages'] as $key => $val) {
-                $sel = ($key == $_SESSION['horde_language']) ? ' selected="selected"' : '';
+            foreach ($registry->nlsconfig['languages'] as $key => $val) {
+                $sel = ($key == $session['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 b761c0b..5f991e5 100644 (file)
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -2112,8 +2112,8 @@ class Horde_Registry
         } elseif (!empty($lang) && $this->isValidLang($lang)) {
             $language = $lang;
         /* Check if we have a language set in the session */
-        } elseif (isset($_SESSION['horde_language'])) {
-            $language = $_SESSION['horde_language'];
+        } elseif (isset($GLOBALS['session']['horde:language'])) {
+            $language = $GLOBALS['session']['horde:language'];
         /* Use site-wide default, if one is defined */
         } elseif (!empty($this->nlsconfig['defaults']['language'])) {
             $language = $this->nlsconfig['defaults']['language'];
@@ -2184,7 +2184,7 @@ class Horde_Registry
             $lang = $this->preferredLang();
         }
 
-        $_SESSION['horde_language'] = $lang;
+        $GLOBALS['session']['horde:language'] = $lang;
 
         if (isset($GLOBALS['language'])) {
             if ($GLOBALS['language'] == $lang) {

diff --git a/horde/login.php b/horde/login.php
index 3788de6..2c3e38e 100644 (file)
--- a/horde/login.php
+++ b/horde/login.php
@@ -245,12 +245,12 @@ if (!empty($conf['auth']['alternate_login'])) {
 
 /* Build the <select> widget containing the available languages. */
 if (!$is_auth && !$prefs->isLocked('language')) {
-    $_SESSION['horde_language'] = $registry->preferredLang($vars->new_lang);
+    $session['horde:language'] = $registry->preferredLang($vars->new_lang);
     $langs = array();
 
     foreach ($registry->nlsconfig['languages'] as $key => $val) {
         $langs[] = array(
-            'sel' => ($key == $_SESSION['horde_language']),
+            'sel' => ($key == $session['horde:language']),
             'val' => $key,
             // Language names are already encoded.
             'name' => $val

diff --git a/horde/services/language.php b/horde/services/language.php
index 5b15f96..32b46bc 100644 (file)
--- a/horde/services/language.php
+++ b/horde/services/language.php
@@ -14,8 +14,8 @@ require_once dirname(__FILE__) . '/../lib/Application.php';
 Horde_Registry::appInit('horde');
 
 /* Set the language. */
-$_SESSION['horde_language'] = $registry->preferredLanguage(Horde_Util::getForm('new_lang'));
-$prefs->setValue('language', $_SESSION['horde_language']);
+$session['horde:language'] = $registry->preferredLanguage(Horde_Util::getForm('new_lang'));
+$prefs->setValue('language', $sessoin['horde:language']);
 
 /* Update apps language */
 foreach ($registry->listApps() as $app) {