immediate mode for openid

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

diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index d74e226d8510cf7a6b35043bc463a8b03319dfda..dafa0e4bc983db9291fc84a770f0fe46b5daf27b 100644 (file)
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -1,22 +1,22 @@
 <?php
-/* 
+/*
  * Laconica - a distributed open-source microblogging tool
  * Copyright (C) 2008, Controlez-Vous, Inc.
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-  
+
 if (!defined('LACONICA')) { exit(1); }
 
 class SettingsAction extends Action {
@@ -26,8 +26,7 @@ class SettingsAction extends Action {
                if (!common_logged_in()) {
                        common_user_error(_t('Not logged in.'));
                        return;
-               }
-               if ($this->arg('METHOD') == 'POST') {
+               } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
                        $this->handle_post();
                } else {
                        $this->show_form();
@@ -38,26 +37,51 @@ class SettingsAction extends Action {
        function handle_post() {
                return false;
        }
-       
+
        function show_form($msg=NULL, $success=false) {
                return false;
        }
 
-       function show_message($msg, $success) {
+       function message($msg, $success) {
                if ($msg) {
                        common_element('div', ($success) ? 'success' : 'error',
                                                   $msg);
                }
        }
-       
+
        function settings_menu() {
-               common_element_start('ul', 'headmenu');
-               common_menu_item(common_local_url('editprofile'),
-                                                _t('Profile'));
+               $action = $this->trimmed('action');
+               common_element_start('ul', array('id' => 'nav_views'));
+               common_menu_item(common_local_url('profilesettings'),
+                                                _t('Profile'), 
+                                                _t('Change your profile settings'),
+                                                $action == 'profilesettings');
                common_menu_item(common_local_url('avatar'),
-                                                _t('Avatar'));
+                                                _t('Avatar'), 
+                                                _t('Upload a new profile image'),
+                                                $action == 'avatar');
                common_menu_item(common_local_url('password'),
-                                                _t('Password'));
+                                                _t('Password'), 
+                                                _t('Change your password'),
+                                                $action == 'password');
+               common_menu_item(common_local_url('openidsettings'),
+                                                _t('OpenID'), 
+                                                _t('Add or remove OpenIDs'),
+                                                $action == 'openidsettings');
+               if (false) {
+                       common_menu_item(common_local_url('emailsettings'),
+                                                        _t('Email'),
+                                                        _t('Address and preferences'),
+                                                        $action == 'emailsettings');
+                       common_menu_item(common_local_url('imsettings'),
+                                                        _t('IM'), 
+                                                        _t('Notifications by instant messenger'),
+                                                        $action == 'imsettings');
+                       common_menu_item(common_local_url('phonesettings'),
+                                                        _t('Phone'), 
+                                                        _t('Notifications by phone'),
+                                                        $action == 'phonesettings');
+               }
                common_element_end('ul');
        }
 }