X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fopenidsettings.php;h=f539d111f9e302abef5daf1f98c6e5b355839879;hb=85b9e58e535d44f5973fe14f888dc19f25bcaddd;hp=377b59f89617696e5baa32369b0444a93f228e90;hpb=912947c690f26f4b1a20b35fbc74288b031cd0c9;p=quix0rs-gnu-social.git

diff --git a/actions/openidsettings.php b/actions/openidsettings.php
index 377b59f896..f539d111f9 100644
--- a/actions/openidsettings.php
+++ b/actions/openidsettings.php
@@ -24,38 +24,30 @@ require_once(INSTALLDIR.'/lib/openid.php');
 
 class OpenidsettingsAction extends SettingsAction {
 
-	function show_top($arr) {
-		$msg = $arr[0];
-		$success = $arr[1];
-		
-		if ($msg) {
-			$this->message($msg, $success);
-		} else {
-			common_element('div', 'instructions',
-						   _t('Manage your associated OpenIDs from here.'));
-		}
-		
-		$this->settings_menu();
+	function get_instructions() {
+		return _('[OpenID](%%doc.openid%%) lets you log into many sites ' .
+		          ' with the same user account. '.
+		          ' Manage your associated OpenIDs from here.');
 	}
-	
+
 	function show_form($msg=NULL, $success=false) {
-		
+
 		$user = common_current_user();
-		
-		common_show_header(_t('OpenID settings'), NULL, array($msg, $success),
-						   array($this, 'show_top'));
 
-		common_element_start('form', array('method' => 'POST',
+		$this->form_header(_('OpenID settings'), $msg, $success);
+
+		common_element_start('form', array('method' => 'post',
 										   'id' => 'openidadd',
 										   'action' =>
 										   common_local_url('openidsettings')));
-		common_element('h2', NULL, _t('Add OpenID'));
+		common_hidden('token', common_session_token());
+		common_element('h2', NULL, _('Add OpenID'));
 		common_element('p', NULL,
-					   _t('If you want to add an OpenID to your account, ' .
+					   _('If you want to add an OpenID to your account, ' .
 						  'enter it in the box below and click "Add".'));
 		common_element_start('p');
 		common_element('label', array('for' => 'openid_url'),
-					   _t('OpenID URL'));
+					   _('OpenID URL'));
 		common_element('input', array('name' => 'openid_url',
 									  'type' => 'text',
 									  'id' => 'openid_url'));
@@ -63,7 +55,7 @@ class OpenidsettingsAction extends SettingsAction {
 									  'id' => 'add',
 									  'name' => 'add',
 									  'class' => 'submit',
-									  'value' => _t('Add')));
+									  'value' => _('Add')));
 		common_element_end('p');
 		common_element_end('form');
 
@@ -73,35 +65,36 @@ class OpenidsettingsAction extends SettingsAction {
 		$cnt = $oid->find();
 
 		if ($cnt > 0) {
-			
-			common_element('h2', NULL, _t('Remove OpenID'));
-			
+
+			common_element('h2', NULL, _('Remove OpenID'));
+
 			if ($cnt == 1 && !$user->password) {
 
 				common_element('p', NULL,
-							   _t('Removing your only OpenID would make it impossible to log in! ' .
+							   _('Removing your only OpenID would make it impossible to log in! ' .
 								  'If you need to remove it, add another OpenID first.'));
-				
+
 				if ($oid->fetch()) {
 					common_element_start('p');
 					common_element('a', array('href' => $oid->canonical),
 								   $oid->display);
 					common_element_end('p');
 				}
-				
+
 			} else {
-			
+
 				common_element('p', NULL,
-							   _t('You can remove an OpenID from your account '.
+							   _('You can remove an OpenID from your account '.
 								  'by clicking the button marked "Remove".'));
 				$idx = 0;
-				
+
 				while ($oid->fetch()) {
 					common_element_start('form', array('method' => 'POST',
 													   'id' => 'openiddelete' . $idx,
-												   'action' =>
+													   'action' =>
 													   common_local_url('openidsettings')));
 					common_element_start('p');
+					common_hidden('token', common_session_token());
 					common_element('a', array('href' => $oid->canonical),
 								   $oid->display);
 					common_element('input', array('type' => 'hidden',
@@ -112,18 +105,25 @@ class OpenidsettingsAction extends SettingsAction {
 												  'id' => 'remove'.$idx,
 												  'name' => 'remove',
 												  'class' => 'submit',
-												  'value' => _t('Remove')));
+												  'value' => _('Remove')));
 					common_element_end('p');
 					common_element_end('form');
 					$idx++;
 				}
 			}
-			
-			common_show_footer();
 		}
+
+		common_show_footer();
 	}
-	
+
 	function handle_post() {
+		# CSRF protection
+		$token = $this->trimmed('token');
+		if (!$token || $token != common_session_token()) {
+			$this->show_form(_('There was a problem with your session token. Try again, please.'));
+			return;
+		}
+
 		if ($this->arg('add')) {
 			$result = oid_authenticate($this->trimmed('openid_url'), 'finishaddopenid');
 			if (is_string($result)) { # error message
@@ -132,25 +132,25 @@ class OpenidsettingsAction extends SettingsAction {
 		} else if ($this->arg('remove')) {
 			$this->remove_openid();
 		} else {
-			$this->show_form(_t('Something weird happened.'));
+			$this->show_form(_('Something weird happened.'));
 		}
 	}
 
 	function remove_openid() {
-		
+
 		$openid_url = $this->trimmed('openid_url');
 		$oid = User_openid::staticGet('canonical', $openid_url);
 		if (!$oid) {
-			$this->show_form(_t('No such OpenID.'));
+			$this->show_form(_('No such OpenID.'));
 			return;
 		}
 		$cur = common_current_user();
 		if (!$cur || $oid->user_id != $cur->id) {
-			$this->show_form(_t('That OpenID does not belong to you.'));
+			$this->show_form(_('That OpenID does not belong to you.'));
 			return;
 		}
 		$oid->delete();
-		$this->show_form(_t('OpenID removed.'), true);
+		$this->show_form(_('OpenID removed.'), true);
 		return;
 	}
-}
\ No newline at end of file
+}