X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FOpenID%2Ffinishaddopenid.php;h=991e6584ee7ce07ac3402f93f1170fbaaaaf1adf;hb=9498a164805892a8af17311f7e7697b132524990;hp=7753158d5d458dde42988307a10bd1164e9e17e3;hpb=000e21be1917b190a2aaca2e864bbf79de4796bb;p=quix0rs-gnu-social.git

diff --git a/plugins/OpenID/finishaddopenid.php b/plugins/OpenID/finishaddopenid.php
index 7753158d5d..991e6584ee 100644
--- a/plugins/OpenID/finishaddopenid.php
+++ b/plugins/OpenID/finishaddopenid.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Complete adding an OpenID
  *
@@ -20,14 +20,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Settings
- * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @copyright 2008-2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -39,10 +39,10 @@ require_once INSTALLDIR.'/plugins/OpenID/openid.php';
  * Handle the return from an OpenID verification
  *
  * @category Settings
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class FinishaddopenidAction extends Action
@@ -64,7 +64,7 @@ class FinishaddopenidAction extends Action
     {
         parent::handle($args);
         if (!common_logged_in()) {
-            $this->clientError(_('Not logged in.'));
+            $this->clientError(_m('Not logged in.'));
         } else {
             $this->tryLogin();
         }
@@ -80,16 +80,16 @@ class FinishaddopenidAction extends Action
 
     function tryLogin()
     {
-        $consumer =& oid_consumer();
+        $consumer = oid_consumer();
 
         $response = $consumer->complete(common_local_url('finishaddopenid'));
 
         if ($response->status == Auth_OpenID_CANCEL) {
-            $this->message(_('OpenID authentication cancelled.'));
+            $this->message(_m('OpenID authentication cancelled.'));
             return;
         } else if ($response->status == Auth_OpenID_FAILURE) {
             // Authentication failed; display the error message.
-            $this->message(sprintf(_('OpenID authentication failed: %s'),
+            $this->message(sprintf(_m('OpenID authentication failed: %s'),
                                    $response->message));
         } else if ($response->status == Auth_OpenID_SUCCESS) {
 
@@ -103,15 +103,15 @@ class FinishaddopenidAction extends Action
                 $sreg = $sreg_resp->contents();
             }
 
-            $cur =& common_current_user();
+            $cur = common_current_user();
 
             $other = oid_get_user($canonical);
 
             if ($other) {
                 if ($other->id == $cur->id) {
-                    $this->message(_('You already have this OpenID!'));
+                    $this->message(_m('You already have this OpenID!'));
                 } else {
-                    $this->message(_('Someone else already has this OpenID.'));
+                    $this->message(_m('Someone else already has this OpenID.'));
                 }
                 return;
             }
@@ -123,12 +123,12 @@ class FinishaddopenidAction extends Action
             $result = oid_link_user($cur->id, $canonical, $display);
 
             if (!$result) {
-                $this->message(_('Error connecting user.'));
+                $this->message(_m('Error connecting user.'));
                 return;
             }
             if ($sreg) {
                 if (!oid_update_user($cur, $sreg)) {
-                    $this->message(_('Error updating profile'));
+                    $this->message(_m('Error updating profile'));
                     return;
                 }
             }
@@ -167,7 +167,7 @@ class FinishaddopenidAction extends Action
 
     function title()
     {
-        return _('OpenID Login');
+        return _m('OpenID Login');
     }
 
     /**