HTML output in RSS 2.0 and Atom

[quix0rs-gnu-social.git] / lib / settingsaction.php

diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index a71c9e9bc3e8384f9cb0db98e120eb6a2096d928..9e783431f23586073429c867546e3cddbc7b3a89 100644 (file)
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -79,35 +79,39 @@ class SettingsAction extends Action {
 
     function settings_menu() {
         # action => array('prompt', 'title')
-        static $menu =
-        array('profilesettings' =>
-              array('Profile',
-                       'Change your profile settings'),
-            'emailsettings' =>
-            array('Email',
-                  'Change email handling'),
-            'avatar' =>
-            array('Avatar',
-                  'Upload a new profile image'),
-            'password' =>
-            array('Password',
-                  'Change your password'),
-            'openidsettings' =>
-            array('OpenID',
-                  'Add or remove OpenIDs'),
-            'smssettings' =>
-            array('SMS',
-                  'Updates by SMS'),
-            'imsettings' =>
-            array('IM',
-                  'Updates by instant messenger (IM)'));
-
+               $menu =
+                 array('profilesettings' =>
+                               array(_('Profile'),
+                                         _('Change your profile settings')),
+                               'emailsettings' =>
+                               array(_('Email'),
+                                         _('Change email handling')),
+                               'openidsettings' =>
+                               array(_('OpenID'),
+                                         _('Add or remove OpenIDs')),
+                               'smssettings' =>
+                               array(_('SMS'),
+                                         _('Updates by SMS')),
+                               'imsettings' =>
+                               array(_('IM'),
+                                         _('Updates by instant messenger (IM)')),
+                               'twittersettings' =>
+                               array(_('Twitter'),
+                                         _('Twitter integration options')),
+                               'othersettings' =>
+                               array(_('Other'),
+                                         _('Other options')));
+               
         $action = $this->trimmed('action');
         common_element_start('ul', array('id' => 'nav_views'));
         foreach ($menu as $menuaction => $menudesc) {
+                       if ($menuaction == 'imsettings' &&
+                               !common_config('xmpp', 'enabled')) {
+                               continue;
+                       }
             common_menu_item(common_local_url($menuaction),
-                    _($menudesc[0]),
-                    _($menudesc[1]),
+                    $menudesc[0],
+                    $menudesc[1],
                     $action == $menuaction);
         }
         common_element_end('ul');