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

diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index 2a80c0e31b..14e89c2e4d 100644
--- 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
@@ -55,12 +55,37 @@ class SettingsAction extends Action {
         }
     }
 
+	function form_header($title, $msg=NULL, $success=false) {
+		common_show_header($title,
+		                   NULL,
+		                   array($msg, $success),
+						   array($this, 'show_top'));
+	}
+
+	function show_top($arr) {
+		$msg = $arr[0];
+		$success = $arr[1];
+		if ($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 => 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'),
@@ -78,8 +103,9 @@ class SettingsAction extends Action {
         common_element_start('ul', array('id' => 'nav_views'));
         foreach ($menu as $menuaction => $menudesc) {
             common_menu_item(common_local_url($menuaction),
-                    _t($menudesc[0]),
-                    _t($menudesc[1]));
+                    _($menudesc[0]),
+                    _($menudesc[1]),
+                    $action == $menuaction);
         }
         common_element_end('ul');
     }