move email settings to its own tab

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

diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index 615a5cbae0e86116cc21b1bc73da2c5c85d9f881..14e89c2e4d2b7056963b04ea9e3ef169a01fd897 100644 (file)
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -21,42 +21,92 @@ if (!defined('LACONICA')) { exit(1); }
 
 class SettingsAction extends Action {
 
-       function handle($args) {
-               parent::handle($args);
-               if (!common_logged_in()) {
-                       common_user_error(_t('Not logged in.'));
-                       return;
-               } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-                       $this->handle_post();
-               } else {
-                       $this->show_form();
-               }
-       }
+    function handle($args) {
+        parent::handle($args);
+        if (!common_logged_in()) {
+            common_user_error(_('Not logged in.'));
+            return;
+        } else if (!common_is_real_login()) {
+               # Cookie theft means that automatic logins can't
+               # change important settings or see private info, and
+               # _all_ our settings are important
+            common_set_returnto($this->self_url());
+            common_redirect(common_local_url('login'));
+        } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+            $this->handle_post();
+        } else {
+            $this->show_form();
+        }
+    }
 
-       # override!
-       function handle_post() {
-               return false;
-       }
+    # override!
+    function handle_post() {
+        return false;
+    }
+
+    function show_form($msg=NULL, $success=false) {
+        return false;
+    }
 
-       function show_form($msg=NULL, $success=false) {
-               return false;
+    function message($msg, $success) {
+        if ($msg) {
+            common_element('div', ($success) ? 'success' : 'error',
+                           $msg);
+        }
+    }
+
+       function form_header($title, $msg=NULL, $success=false) {
+               common_show_header($title,
+                                  NULL,
+                                  array($msg, $success),
+                                                  array($this, 'show_top'));
        }
 
-       function message($msg, $success) {
+       function show_top($arr) {
+               $msg = $arr[0];
+               $success = $arr[1];
                if ($msg) {
-                       common_element('div', ($success) ? 'success' : 'error',
-                                                  $msg);
+                       $this->message($msg, $success);
+               } else {
+                       $inst = $this->get_instructions();
+                       $output = common_markup_to_html($inst);
+                       common_element_start('div', 'instructions');
+                       common_raw($output);
+                       common_element_end('div');
                }
+               $this->settings_menu();
        }
 
-       function settings_menu() {
-               common_element_start('ul', 'settingsmenu menuish');
-               common_menu_item(common_local_url('profilesettings'),
-                                                _t('Profile'));
-               common_menu_item(common_local_url('avatar'),
-                                                _t('Avatar'));
-               common_menu_item(common_local_url('password'),
-                                                _t('Password'));
-               common_element_end('ul');
-       }
+    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'),
+            'imsettings' =>
+            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');
+    }
 }