X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FOStatus%2Factions%2Fostatusinit.php;h=5666c898af4e91938e91c2c412174579089865f0;hb=a39f51c0441b22951412b2c00d88c34f39cb39c9;hp=3f2f6368f6038b94092e8fc0090fd8cfa4c5e18f;hpb=3194a86caa02f5796f468a7d2ebc8e54139fb1cb;p=quix0rs-gnu-social.git

diff --git a/plugins/OStatus/actions/ostatusinit.php b/plugins/OStatus/actions/ostatusinit.php
index 3f2f6368f6..5666c898af 100644
--- a/plugins/OStatus/actions/ostatusinit.php
+++ b/plugins/OStatus/actions/ostatusinit.php
@@ -22,42 +22,49 @@
  * @maintainer James Walker <james@status.net>
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
-
+if (!defined('STATUSNET')) {
+    exit(1);
+}
 
 class OStatusInitAction extends Action
 {
-
     var $nickname;
+    var $tagger;
+    var $peopletag;
+    var $group;
     var $profile;
     var $err;
 
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
         if (common_logged_in()) {
+            // TRANS: Client error.
             $this->clientError(_m('You can use the local subscription!'));
-            return false;
         }
 
-        // Local user the remote wants to subscribe to
+        // Local user or group the remote wants to subscribe to
         $this->nickname = $this->trimmed('nickname');
-        
+        $this->tagger = $this->trimmed('tagger');
+        $this->peopletag = $this->trimmed('peopletag');
+        $this->group = $this->trimmed('group');
+
         // Webfinger or profile URL of the remote user
         $this->profile = $this->trimmed('profile');
 
         return true;
     }
-    
-    function handle($args)
+
+    protected function handle()
     {
-        parent::handle($args);
+        parent::handle();
 
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             /* Use a session token for CSRF protection. */
             $token = $this->trimmed('token');
             if (!$token || $token != common_session_token()) {
+                // TRANS: Client error displayed when the session token does not match or is not given.
                 $this->showForm(_m('There was a problem with your session token. '.
                                   'Try again, please.'));
                 return;
@@ -67,21 +74,20 @@ class OStatusInitAction extends Action
             $this->showForm();
         }
     }
-    
+
     function showForm($err = null)
     {
         $this->err = $err;
         if ($this->boolean('ajax')) {
-            header('Content-Type: text/xml;charset=utf-8');
-            $this->xw->startDocument('1.0', 'UTF-8');
-            $this->elementStart('html');
+            $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
-            $this->element('title', null, _m('Subscribe to user'));
+            // TRANS: Form title.
+            $this->element('title', null, _m('TITLE','Subscribe to user'));
             $this->elementEnd('head');
             $this->elementStart('body');
             $this->showContent();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             $this->showPage();
         }
@@ -89,25 +95,58 @@ class OStatusInitAction extends Action
 
     function showContent()
     {
+    
+        if ($this->group) {
+            // TRANS: Form legend. %s is a group name.
+            $header = sprintf(_m('Join group %s'), $this->group);
+            // TRANS: Button text to join a group.
+            $submit = _m('BUTTON','Join');
+        } else if ($this->peopletag && $this->tagger) {
+            // TRANS: Form legend. %1$s is a list, %2$s is a lister's name.
+            $header = sprintf(_m('Subscribe to list %1$s by %2$s'), $this->peopletag, $this->tagger);
+            // TRANS: Button text to subscribe to a list.
+            $submit = _m('BUTTON','Subscribe');
+            // TRANS: Button text.
+        } else {
+            // TRANS: Form legend. %s is a nickname.
+            $header = sprintf(_m('Subscribe to %s'), $this->nickname);
+            // TRANS: Button text to subscribe to a profile.
+            $submit = _m('BUTTON','Subscribe');
+        }
         $this->elementStart('form', array('id' => 'form_ostatus_connect',
                                           'method' => 'post',
                                           'class' => 'form_settings',
                                           'action' => common_local_url('ostatusinit')));
         $this->elementStart('fieldset');
-        $this->element('legend', null,  sprintf(_m('Subscribe to %s'), $this->nickname));
+        $this->element('legend', null,  $header);
         $this->hidden('token', common_session_token());
 
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li', array('id' => 'ostatus_nickname'));
-        $this->input('nickname', _m('User nickname'), $this->nickname,
-                     _m('Nickname of the user you want to follow'));
+
+        if ($this->group) {
+            // TRANS: Field label.
+            $this->input('group', _m('Group nickname'), $this->group,
+                         // TRANS: Field title.
+                         _m('Nickname of the group you want to join.'));
+        } else {
+            // TRANS: Field label.
+            $this->input('nickname', _m('User nickname'), $this->nickname,
+                         // TRANS: Field title.
+                         _m('Nickname of the user you want to follow.'));
+            $this->hidden('tagger', $this->tagger);
+            $this->hidden('peopletag', $this->peopletag);
+        }
+
         $this->elementEnd('li');
         $this->elementStart('li', array('id' => 'ostatus_profile'));
+        // TRANS: Field label.
         $this->input('profile', _m('Profile Account'), $this->profile,
-                     _m('Your account id (i.e. user@identi.ca)'));
+                      // TRANS: Tooltip for field label "Profile Account".
+                     _m('Your account ID (e.g. user@example.com).'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
-        $this->submit('submit', _m('Subscribe'));
+        $this->submit('submit', $submit);
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
@@ -125,38 +164,36 @@ class OStatusInitAction extends Action
         } elseif (strpos($this->profile, '@') !== false) {
             $this->connectWebfinger($this->profile);
         } else {
-            $this->clientError(_m("Must provide a remote profile."));
+            // TRANS: Client error.
+            $this->clientError(_m('Must provide a remote profile.'));
         }
     }
 
     function connectWebfinger($acct)
     {
-        $w = new Webfinger;
+        $target_profile = $this->targetProfile();
 
-        $result = $w->lookup($acct);
-        if (!$result) {
-            $this->clientError(_m("Couldn't look up OStatus account profile."));
-        }
-        foreach ($result->links as $link) {
-            if ($link['rel'] == 'http://ostatus.org/schema/1.0/subscribe') {
-                // We found a URL - let's redirect!
+        $disco = new Discovery;
+        $xrd = $disco->lookup($acct);
 
-                $user = User::staticGet('nickname', $this->nickname);
-                $target_profile = common_local_url('userbyid', array('id' => $user->id));
-
-                $url = $w->applyTemplate($link['template'], $target_profile);
-                common_log(LOG_INFO, "Sending remote subscriber $acct to $url");
-                common_redirect($url, 303);
+        $link = $xrd->get('http://ostatus.org/schema/1.0/subscribe');
+        if (!is_null($link)) {
+            // We found a URL - let's redirect!
+            if (!empty($link->template)) {
+                $url = Discovery::applyTemplate($link->template, $target_profile);
+            } else {
+                $url = $link->href;
             }
-
+            common_log(LOG_INFO, "Sending remote subscriber $acct to $url");
+            common_redirect($url, 303);
         }
-        $this->clientError(_m("Couldn't confirm remote profile address."));
+        // TRANS: Client error.
+        $this->clientError(_m('Could not confirm remote profile address.'));
     }
 
     function connectProfile($subscriber_profile)
     {
-        $user = User::staticGet('nickname', $this->nickname);
-        $target_profile = common_local_url('userbyid', array('id' => $user->id));
+        $target_profile = $this->targetProfile();
 
         // @fixme hack hack! We should look up the remote sub URL from XRDS
         $suburl = preg_replace('!^(.*)/(.*?)$!', '$1/main/ostatussub', $subscriber_profile);
@@ -166,9 +203,50 @@ class OStatusInitAction extends Action
         common_redirect($suburl, 303);
     }
 
+    /**
+     * Build the canonical profile URI+URL of the requested user or group
+     */
+    function targetProfile()
+    {
+        if ($this->nickname) {
+            $user = User::getKV('nickname', $this->nickname);
+            if ($user) {
+                return common_local_url('userbyid', array('id' => $user->id));
+            } else {
+                // TRANS: Client error.
+                $this->clientError(_m('No such user.'));
+            }
+        } else if ($this->group) {
+            $group = Local_group::getKV('nickname', $this->group);
+            if ($group instanceof Local_group) {
+                return common_local_url('groupbyid', array('id' => $group->group_id));
+            } else {
+                // TRANS: Client error.
+                $this->clientError(_m('No such group.'));
+            }
+        } else if ($this->peopletag && $this->tagger) {
+            $user = User::getKV('nickname', $this->tagger);
+            if (empty($user)) {
+                // TRANS: Client error.
+                $this->clientError(_m('No such user.'));
+            }
+
+            $peopletag = Profile_list::getByTaggerAndTag($user->id, $this->peopletag);
+            if ($peopletag) {
+                return common_local_url('profiletagbyid',
+                    array('tagger_id' => $user->id, 'id' => $peopletag->id));
+            }
+            // TRANS: Client error.
+            $this->clientError(_m('No such list.'));
+        } else {
+            // TRANS: Client error.
+            $this->clientError(_m('No local user or group nickname provided.'));
+        }
+    }
+
     function title()
     {
-      return _m('OStatus Connect');  
+      // TRANS: Page title.
+      return _m('OStatus Connect');
     }
-  
 }