Publish MicroIDs for email and mpp on profile and notice pages.

[quix0rs-gnu-social.git] / actions / remotesubscribe.php

diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index 214bd863a60ff75d935fe0d7563fea5584fb0c80..d1baa4152f6c1a82db8c9ffbbd5c122473d0cea8 100644 (file)
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -20,7 +20,6 @@
 if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
-require_once('Auth/Yadis/Yadis.php');
 
 class RemotesubscribeAction extends Action {
 
@@ -29,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;
                }
 
@@ -40,17 +39,40 @@ class RemotesubscribeAction extends Action {
                }
        }
 
-       function show_form($err=NULL) {
-               $nickname = $this->trimmed('nickname');
-               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);
-               common_input('profile', _t('Profile URL'));
-               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();
        }
@@ -59,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;
                }
 
@@ -79,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;
                }
 
@@ -240,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());
 
@@ -299,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
@@ -309,6 +331,7 @@ class RemotesubscribeAction extends Action {
                # store all our info here
 
                $omb['listenee'] = $user->nickname;
+               $omb['listener'] = omb_local_id($omb[OAUTH_ENDPOINT_REQUEST]);
                $omb['token'] = $token;
                $omb['secret'] = $secret;
                # call doesn't work after bounce back so we cache; maybe serialization issue...?
@@ -316,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
@@ -323,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
+}