Merge branch '0.9.x' into 1.0.x

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

diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index 353717bebfd76faf6761c7b98b7d2d2ab5f5f248..8200659278c3f408da71b744e5886988fd82999c 100644 (file)
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -5,14 +5,14 @@
  * PHP version 5
  *
  * @category Action
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, Control Yourself, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -28,9 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-if (!defined('LACONICA')) {
-    exit(1);
-}
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/lib/omb.php';
 require_once INSTALLDIR.'/extlib/libomb/service_consumer.php';
@@ -40,13 +38,12 @@ require_once INSTALLDIR.'/extlib/libomb/profile.php';
  * Handler for remote subscription
  *
  * @category Action
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
-
 class RemotesubscribeAction extends Action
 {
     var $nickname;
@@ -129,11 +126,11 @@ class RemotesubscribeAction extends Action
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
         $this->input('nickname', _('User nickname'), $this->nickname,
-                     _('Nickname of the user you want to follow'));
+                     _('Nickname of the user you want to follow.'));
         $this->elementEnd('li');
         $this->elementStart('li');
         $this->input('profile_url', _('Profile URL'), $this->profile_url,
-                     _('URL of your profile on another compatible microblogging service'));
+                     _('URL of your profile on another compatible microblogging service.'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
         $this->submit('submit', _('Subscribe'));
@@ -153,12 +150,12 @@ class RemotesubscribeAction extends Action
         $this->profile_url = $this->trimmed('profile_url');
 
         if (!$this->profile_url) {
-            $this->showForm(_('No such user'));
+            $this->showForm(_('No such user.'));
             return;
         }
 
         if (!common_valid_http_url($this->profile_url)) {
-            $this->showForm(_('Invalid profile URL (bad format)'));
+            $this->showForm(_('Invalid profile URL (bad format).'));
             return;
         }
 
@@ -168,21 +165,21 @@ class RemotesubscribeAction extends Action
                                                 omb_oauth_datastore());
         } catch (OMB_InvalidYadisException $e) {
             $this->showForm(_('Not a valid profile URL (no YADIS document or ' .
-                              'no or invalid XRDS defined).'));
+                              'invalid XRDS defined).'));
             return;
         }
 
         if ($service->getServiceURI(OAUTH_ENDPOINT_REQUEST) ==
             common_local_url('requesttoken') ||
             User::staticGet('uri', $service->getRemoteUserURI())) {
-            $this->showForm(_('That’s a local profile! Login to subscribe.'));
+            $this->showForm(_('That is a local profile! Login to subscribe.'));
             return;
         }
 
         try {
             $service->requestToken();
         } catch (OMB_RemoteServiceException $e) {
-            $this->showForm(_('Couldn’t get a request token.'));
+            $this->showForm(_('Could not get a request token.'));
             return;
         }
 
@@ -190,7 +187,7 @@ class RemotesubscribeAction extends Action
         $profile = $user->getProfile();
         if (!$profile) {
             common_log_db_error($user, 'SELECT', __FILE__);
-            $this->serverError(_('User without matching profile'));
+            $this->serverError(_('User without matching profile.'));
             return;
         }
 
@@ -206,4 +203,3 @@ class RemotesubscribeAction extends Action
         common_redirect($target_url, 303);
     }
 }
-?>