X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fsettingsaction.php;h=14e89c2e4d2b7056963b04ea9e3ef169a01fd897;hb=f50bc7044552955af29b2a7426bdd72bfdf9ca8f;hp=0255fc6426ba245a9cf83f3af063e20f08848ecd;hpb=83e303fe270fa86fc0a289cf141a103f5bfd3787;p=quix0rs-gnu-social.git

diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index 0255fc6426..14e89c2e4d 100644
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -21,63 +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() {
-		$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('Upload a new profile image'),
-						 $action == 'avatar');
-		common_menu_item(common_local_url('password'),
-						 _t('Password'), 
-						 _t('Change your password'),
-						 $action == 'password');
-		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');
-	}
+    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');
+    }
 }