csrf protection in userauthorization

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

diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index 1fbf88ecb8e2252363764347bacfca721974c61e..33fec0f1dc3d45b3995f9f4a6cd12982766e2517 100644 (file)
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -24,7 +24,7 @@ class SettingsAction extends Action {
     function handle($args) {
         parent::handle($args);
         if (!common_logged_in()) {
-            common_user_error(_t('Not logged in.'));
+            common_user_error(_('Not logged in.'));
             return;
         } else if (!common_is_real_login()) {
                # Cookie theft means that automatic logins can't
@@ -79,22 +79,37 @@ class SettingsAction extends Action {
 
     function settings_menu() {
         # action => array('prompt', 'title')
-        static $menu =
+               $menu =
                  array('profilesettings' =>
-                               array('Profile',
-                                         'Change your profile settings'),
+                               array(_('Profile'),
+                                         _('Change your profile settings')),
+                               'emailsettings' =>
+                               array(_('Email'),
+                                         _('Change email handling')),
                                'avatar' =>
-                               array('Avatar',
-                                         'Upload a new profile image'),
+                               array(_('Avatar'),
+                                         _('Upload a new profile image')),
                                'password' =>
-                               array('Password',
-                                         'Change your password'),
+                               array(_('Password'),
+                                         _('Change your password')),
                                'openidsettings' =>
-                               array('OpenID',
-                                         'Add or remove OpenIDs'),
+                               array(_('OpenID'),
+                                         _('Add or remove OpenIDs')),
+                               'smssettings' =>
+                               array(_('SMS'),
+                                         _('Updates by SMS')),
                                'imsettings' =>
-                               array('IM',
-                                         'Updates by instant messenger (IM)'));
-               $this->nav_menu($menu);
+                               array(_('IM'),
+                                         _('Updates by instant messenger (IM)')));
+               
+        $action = $this->trimmed('action');
+        common_element_start('ul', array('id' => 'nav_views'));
+        foreach ($menu as $menuaction => $menudesc) {
+            common_menu_item(common_local_url($menuaction),
+                    $menudesc[0],
+                    $menudesc[1],
+                    $action == $menuaction);
+        }
+        common_element_end('ul');
     }
 }