X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fremotesubscribe.php;h=d1baa4152f6c1a82db8c9ffbbd5c122473d0cea8;hb=575f70545171f6f5c94214ce88e5b07a1f517810;hp=739c92eea51821540f61c18b86e0bc5e62a3f558;hpb=2354faf7ac87f191b7d4906e40e82172199accb9;p=quix0rs-gnu-social.git

diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index 739c92eea5..d1baa4152f 100644
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -28,7 +28,7 @@ class RemotesubscribeAction extends Action {
 		parent::handle($args);
 
 		if (common_logged_in()) {
-			common_user_error(_t('You can use the local subscription!'));
+			common_user_error(_('You can use the local subscription!'));
 		    return;
 		}
 
@@ -39,20 +39,40 @@ class RemotesubscribeAction extends Action {
 		}
 	}
 
-	function show_form($err=NULL) {
-		$nickname = $this->trimmed('nickname');
-		$profile = $this->trimmed('profile');
-		common_show_header(_t('Remote subscribe'));
+	function get_instructions() {
+		return _('To subscribe, you can [login](%%action.login%%),' .
+		          ' or [register](%%action.register%%) a new ' .
+		          ' account. If you already have an account ' .
+		          ' on a [compatible microblogging site](%%doc.openmublog%%), ' .
+		          ' enter your profile URL below.');
+	}
+
+	function show_top($err=NULL) {
 		if ($err) {
 			common_element('div', 'error', $err);
+		} else {
+			$instructions = $this->get_instructions();
+			$output = common_markup_to_html($instructions);
+			common_element_start('div', 'instructions');
+			common_raw($output);
+			common_element_end('p');
 		}
-		common_element_start('form', array('id' => 'remotesubscribe', 'method' => 'POST',
+	}
+
+	function show_form($err=NULL) {
+		$nickname = $this->trimmed('nickname');
+		$profile = $this->trimmed('profile_url');
+		common_show_header(_('Remote subscribe'), NULL, $err,
+						   array($this, 'show_top'));
+		# id = remotesubscribe conflicts with the
+		# button on profile page
+		common_element_start('form', array('id' => 'remsub', 'method' => 'post',
 										   'action' => common_local_url('remotesubscribe')));
-		common_input('nickname', _t('User nickname'), $nickname,
-					 _t('Nickname of the user you want to follow'));
-		common_input('profile', _t('Profile URL'), $profile,
-					 _t('URL of your profile on another compatible microblogging service'));
-		common_submit('submit', _t('Subscribe'));
+		common_input('nickname', _('User nickname'), $nickname,
+					 _('Nickname of the user you want to follow'));
+		common_input('profile_url', _('Profile URL'), $profile,
+					 _('URL of your profile on another compatible microblogging service'));
+		common_submit('submit', _('Subscribe'));
 		common_element_end('form');
 		common_show_footer();
 	}
@@ -61,19 +81,19 @@ class RemotesubscribeAction extends Action {
 		$user = $this->get_user();
 
 		if (!$user) {
-			$this->show_form(_t('No such user!'));
+			$this->show_form(_('No such user.'));
 			return;
 		}
 
-		$profile = $this->trimmed('profile');
+		$profile = $this->trimmed('profile_url');
 
 		if (!$profile) {
-			$this->show_form(_t('No such user!'));
+			$this->show_form(_('No such user.'));
 			return;
 		}
 
 		if (!Validate::uri($profile, array('allowed_schemes' => array('http', 'https')))) {
-			$this->show_form(_t('Invalid profile URL (bad format)'));
+			$this->show_form(_('Invalid profile URL (bad format)'));
 			return;
 		}
 
@@ -81,28 +101,28 @@ class RemotesubscribeAction extends Action {
 		$yadis = Auth_Yadis_Yadis::discover($profile, $fetcher);
 
 		if (!$yadis || $yadis->failed) {
-			$this->show_form(_t('Not a valid profile URL (no YADIS document).'));
+			$this->show_form(_('Not a valid profile URL (no YADIS document).'));
 			return;
 		}
 
         $xrds =& Auth_Yadis_XRDS::parseXRDS($yadis->response_text);
 
 		if (!$xrds) {
-			$this->show_form(_t('Not a valid profile URL (no XRDS defined).'));
+			$this->show_form(_('Not a valid profile URL (no XRDS defined).'));
 			return;
 		}
 
 		$omb = $this->getOmb($xrds);
 
 		if (!$omb) {
-			$this->show_form(_t('Not a valid profile URL (incorrect services).'));
+			$this->show_form(_('Not a valid profile URL (incorrect services).'));
 			return;
 		}
 
 		list($token, $secret) = $this->request_token($omb);
 
 		if (!$token || !$secret) {
-			$this->show_form(_t('Couldn\'t get a request token.'));
+			$this->show_form(_('Couldn\'t get a request token.'));
 			return;
 		}
 
@@ -242,7 +262,7 @@ class RemotesubscribeAction extends Action {
 		# We re-use this tool's fetcher, since it's pretty good
 
 		$fetcher = Auth_Yadis_Yadis::getHTTPFetcher();
-		
+
 		$result = $fetcher->post($req->get_normalized_http_url(),
 								 $req->to_postdata());
 
@@ -301,7 +321,7 @@ class RemotesubscribeAction extends Action {
 		}
 
 		# XXX: add a nonce to prevent replay attacks
-		
+
 		$req->set_parameter('oauth_callback', common_local_url('finishremotesubscribe'));
 
 		# XXX: test to see if endpoint accepts this signature method
@@ -319,6 +339,8 @@ class RemotesubscribeAction extends Action {
 		$omb['post_notice_url'] = omb_service_uri($omb[OMB_ENDPOINT_POSTNOTICE]);
 		$omb['update_profile_url'] = omb_service_uri($omb[OMB_ENDPOINT_UPDATEPROFILE]);
 
+		common_ensure_session();
+		
 		$_SESSION['oauth_authorization_request'] = $omb;
 
 		# Redirect to authorization service
@@ -326,8 +348,8 @@ class RemotesubscribeAction extends Action {
 		common_redirect($req->to_url());
 		return;
 	}
-	
+
 	function make_nonce() {
 		return common_good_rand(16);
 	}
-}
\ No newline at end of file
+}