Fix location of nls configuration data.

$GLOBALS['nls'] hasn't been used for awhile.  Regardless, the correct
location is now $registry->nlsconfig.

diff --git a/framework/Core/lib/Horde/Core/Prefs/Ui/Widgets.php b/framework/Core/lib/Horde/Core/Prefs/Ui/Widgets.php
index cb1d9fa..1dc7305 100644 (file)
--- a/framework/Core/lib/Horde/Core/Prefs/Ui/Widgets.php
+++ b/framework/Core/lib/Horde/Core/Prefs/Ui/Widgets.php
@@ -87,8 +87,8 @@ class Horde_Core_Prefs_Ui_Widgets
             ));
         }
 
-        $t->set('addimg', Horde::img(isset($GLOBALS['nls']['rtl'][$GLOBALS['language']]) ? 'lhand.png' : 'rhand.png', _("Add source")));
-        $t->set('removeimg', Horde::img(isset($GLOBALS['nls']['rtl'][$GLOBALS['language']]) ? 'rhand.png' : 'lhand.png', _("Remove source")));
+        $t->set('addimg', Horde::img(isset($GLOBALS['registry']->nlsconfig['rtl'][$GLOBALS['language']]) ? 'lhand.png' : 'rhand.png', _("Add source")));
+        $t->set('removeimg', Horde::img(isset($GLOBALS['registry']->nlsconfig['rtl'][$GLOBALS['language']]) ? 'rhand.png' : 'lhand.png', _("Remove source")));
 
         $t->set('upimg', Horde::img('nav/up.png', _("Move up")));
         $t->set('downimg', Horde::img('nav/down.png', _("Move down")));

diff --git a/framework/Core/lib/Horde/Core/Tree/Html.php b/framework/Core/lib/Horde/Core/Tree/Html.php
index b0ab4ae..e1888f0 100644 (file)
--- a/framework/Core/lib/Horde/Core/Tree/Html.php
+++ b/framework/Core/lib/Horde/Core/Tree/Html.php
@@ -47,7 +47,7 @@ class Horde_Core_Tree_Html extends Horde_Tree_Html
     {
         parent::__construct($name, $params);
 
-        if (!empty($GLOBALS['nls']['rtl'][$GLOBALS['language']])) {
+        if (!empty($GLOBALS['registry']->nlsconfig['rtl'][$GLOBALS['language']])) {
             $no_rev = array('blank', 'folder', 'folder_open');
             foreach (array_diff(array_keys($this->_images), $no_rev) as $key) {
                 $this->_images[$key] = 'rev-' . $this->_images[$key];

diff --git a/framework/Core/lib/Horde/Core/Tree/Javascript.php b/framework/Core/lib/Horde/Core/Tree/Javascript.php
index 7dfbfba..0407e04 100644 (file)
--- a/framework/Core/lib/Horde/Core/Tree/Javascript.php
+++ b/framework/Core/lib/Horde/Core/Tree/Javascript.php
@@ -92,7 +92,7 @@ class Horde_Core_Tree_Javascript extends Horde_Core_Tree_Html
             'imgNullOnly' => $this->_images['null_only'],
             'imgLeaf' => $this->_images['leaf'],
 
-            'floatDir' => (empty($GLOBALS['nls']['rtl'][$GLOBALS['language']]) ? 'float:left;' : 'float:right')
+            'floatDir' => (empty($GLOBALS['registry']->nlsconfig['rtl'][$GLOBALS['language']]) ? 'float:left;' : 'float:right')
         );
 
         Horde::addInlineScript(array(

diff --git a/framework/Core/lib/Horde/Help.php b/framework/Core/lib/Horde/Help.php
index fb006a5..7aa4ece 100644 (file)
--- a/framework/Core/lib/Horde/Help.php
+++ b/framework/Core/lib/Horde/Help.php
@@ -48,8 +48,8 @@ class Horde_Help
             throw new Horde_Exception('SimpleXML not available.');
         }
 
-        if (isset($GLOBALS['nls']['charsets'][$GLOBALS['language']])) {
-            $this->_charset = $GLOBALS['nls']['charsets'][$GLOBALS['language']];
+        if (isset($GLOBALS['registry']->nlsconfig['charsets'][$GLOBALS['language']])) {
+            $this->_charset = $GLOBALS['registry']->nlsconfig['charsets'][$GLOBALS['language']];
         }
 
         switch ($source) {

diff --git a/framework/Core/lib/Horde/Menu.php b/framework/Core/lib/Horde/Menu.php
index cb02f27..1182100 100644 (file)
--- a/framework/Core/lib/Horde/Menu.php
+++ b/framework/Core/lib/Horde/Menu.php
@@ -191,7 +191,7 @@ class Horde_Menu
                 $auth_target = '_parent';
             }
 
-            if ($GLOBALS['registry']->getAuth()) {
+            if ($registry->getAuth()) {
                 if ((!$prefs->getValue('show_sidebar') || $this->showService('logout')) &&
                     ($logout_link = Horde::getServiceLink('logout', $app))) {
                     $this->add($logout_link, _("_Log out"), 'logout.png', null, $auth_target, null, '__noselection');
@@ -212,7 +212,7 @@ class Horde_Menu
 
         /* Sort to match explicitly set positions. */
         ksort($this->_menu);
-        if (!empty($GLOBALS['nls']['rtl'][$GLOBALS['language']])) {
+        if (!empty($registry->nlsconfig['rtl'][$GLOBALS['language']])) {
             $this->_menu = array_reverse($this->_menu);
         }
 

diff --git a/framework/Core/lib/Horde/Themes.php b/framework/Core/lib/Horde/Themes.php
index 46f0d03..910d968 100644 (file)
--- a/framework/Core/lib/Horde/Themes.php
+++ b/framework/Core/lib/Horde/Themes.php
@@ -151,7 +151,7 @@ class Horde_Themes
         $css = array();
 
         $css_list = array('screen');
-        if (isset($GLOBALS['nls']['rtl'][$GLOBALS['language']])) {
+        if (isset($GLOBALS['registry']->nlsconfig['rtl'][$GLOBALS['language']])) {
             $css_list[] = 'rtl';
         }
 

diff --git a/framework/Ui/lib/Horde/Ui/Language.php b/framework/Ui/lib/Horde/Ui/Language.php
index d4552fe..e75a211 100644 (file)
--- a/framework/Ui/lib/Horde/Ui/Language.php
+++ b/framework/Ui/lib/Horde/Ui/Language.php
@@ -31,7 +31,7 @@ class Horde_Ui_Language {
                             Horde::url($GLOBALS['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['nls']['languages'] as $key => $val) {
+            foreach ($GLOBALS['registry']->nlsconfig['languages'] as $key => $val) {
                 $sel = ($key == $_SESSION['horde_language']) ? ' selected="selected"' : '';
                 $html .= "<option value=\"$key\"$sel>$val</option>";
             }

diff --git a/imp/lib/Imap/Thread.php b/imp/lib/Imap/Thread.php
index c4118e3..66db745 100644 (file)
--- a/imp/lib/Imap/Thread.php
+++ b/imp/lib/Imap/Thread.php
@@ -56,7 +56,7 @@ class IMP_Imap_Thread
     public function getThreadTreeOb($indices, $sortdir)
     {
         $container = $last_level = $last_thread = null;
-        $rtl = !empty($GLOBALS['nls']['rtl'][$GLOBALS['language']]);
+        $rtl = !empty($GLOBALS['registry']->nlsconfig['rtl'][$GLOBALS['language']]);
         $thread_level = $tree = array();
         $t = &$this->_thread;
 

diff --git a/imp/lib/Ui/Folder.php b/imp/lib/Ui/Folder.php
index dd68b22..5ef3d40 100644 (file)
--- a/imp/lib/Ui/Folder.php
+++ b/imp/lib/Ui/Folder.php
@@ -56,6 +56,8 @@ class IMP_Ui_Folder
      */
     protected function _getTreeImage($elt, $options = array())
     {
+        global $registry;
+
         $alt = $dir = null;
         $dir2 = $elt['user_icon']
             ? Horde::img($elt['icon'], $elt['alt'], null, $elt['icondir'])
@@ -70,7 +72,7 @@ class IMP_Ui_Folder
                     $alt = _("Collapse Folder");
                 }
 
-                if (empty($GLOBALS['nls']['rtl'][$GLOBALS['language']])) {
+                if (empty($registry->nlsconfig['rtl'][$GLOBALS['language']])) {
                     $tree_img = ($elt['value'] == 'INBOX')
                         ? 9
                         : ($elt['peek'] ? 10 : 11);
@@ -85,7 +87,7 @@ class IMP_Ui_Folder
                     $alt = _("Expand Folder");
                 }
 
-                if (empty($GLOBALS['nls']['rtl'][$GLOBALS['language']])) {
+                if (empty($registry->nlsconfig['rtl'][$GLOBALS['language']])) {
                     $tree_img = ($elt['value'] == 'INBOX')
                         ? 15
                         : ($elt['peek'] ? 16 : 17);
@@ -103,7 +105,7 @@ class IMP_Ui_Folder
             if (($elt['value'] == 'INBOX') && !$elt['peek']) {
                 $dir = '<span class="treeImg"></span>' . $dir2;
             } else {
-                if (empty($GLOBALS['nls']['rtl'][$GLOBALS['language']])) {
+                if (empty($registry->nlsconfig['rtl'][$GLOBALS['language']])) {
                     $tree_img = ($elt['value'] == 'INBOX')
                         ? 3
                         : ($elt['peek'] ? 2 : 4);
@@ -120,7 +122,7 @@ class IMP_Ui_Folder
         $this->_moreMbox[$elt['level']] = $elt['peek'];
         for ($i = 0; $i < $elt['level']; $i++) {
             if ($this->_moreMbox[$i]) {
-                $line .= '<span class="treeImg treeImg' . (empty($GLOBALS['nls']['rtl'][$GLOBALS['language']]) ? 1 : 5) . '"></span>';
+                $line .= '<span class="treeImg treeImg' . (empty($registry->nlsconfig['rtl'][$GLOBALS['language']]) ? 1 : 5) . '"></span>';
             } else {
                 $line .= '<span class="treeImg"></span>';
             }

diff --git a/nag/lib/Task.php b/nag/lib/Task.php
index cc81591..598d3b7 100644 (file)
--- a/nag/lib/Task.php
+++ b/nag/lib/Task.php
@@ -553,9 +553,9 @@ class Nag_Task {
         }
         if ($this->indent) {
             if ($this->lastChild) {
-                $html .= Horde::img(empty($GLOBALS['nls']['rtl'][$GLOBALS['language']]) ? 'tree/joinbottom.png' : 'tree/rev-joinbottom.png', '\\', '', $treedir);
+                $html .= Horde::img(empty($GLOBALS['registry']->nlsconfig['rtl'][$GLOBALS['language']]) ? 'tree/joinbottom.png' : 'tree/rev-joinbottom.png', '\\', '', $treedir);
             } else {
-                $html .= Horde::img(empty($GLOBALS['nls']['rtl'][$GLOBALS['language']]) ? 'tree/join.png' : 'tree/rev-join.png', '+', '', $treedir);
+                $html .= Horde::img(empty($GLOBALS['registry']->nlsconfig['rtl'][$GLOBALS['language']]) ? 'tree/join.png' : 'tree/rev-join.png', '+', '', $treedir);
             }
         }
 

diff --git a/skoli/list.php b/skoli/list.php
index fa27b2c..2c8680d 100644 (file)
--- a/skoli/list.php
+++ b/skoli/list.php
@@ -138,9 +138,9 @@ if (count($list) > 0) {
             $counter = 0;
             foreach ($class['_students'] as $student) {
                 if (++$counter < count($class['_students'])) {
-                    $treeIcon = Horde::img(empty($GLOBALS['nls']['rtl'][$GLOBALS['language']]) ? 'tree/join.png' : 'tree/rev-join.png', '+', '', $treedir);
+                    $treeIcon = Horde::img(empty($GLOBALS['registry']->nlsconfig['rtl'][$GLOBALS['language']]) ? 'tree/join.png' : 'tree/rev-join.png', '+', '', $treedir);
                 } else {
-                    $treeIcon = Horde::img(empty($GLOBALS['nls']['rtl'][$GLOBALS['language']]) ? 'tree/joinbottom.png' : 'tree/rev-joinbottom.png', '\\', '', $treedir);
+                    $treeIcon = Horde::img(empty($GLOBALS['registry']->nlsconfig['rtl'][$GLOBALS['language']]) ? 'tree/joinbottom.png' : 'tree/rev-joinbottom.png', '\\', '', $treedir);
                 }
                 require SKOLI_TEMPLATES . '/list/students.inc';
             }