Added checked type-hints

[quix0rs-gnu-social.git] / plugins / TwitterBridge / actions / twitterauthorization.php

diff --git a/plugins/TwitterBridge/actions/twitterauthorization.php b/plugins/TwitterBridge/actions/twitterauthorization.php
index 3c95d243c40c5cdc658cf3015e4fe98c5f45d5b7..8fa4df44726074adad35fd2a83597882415ad003 100644 (file)
--- a/plugins/TwitterBridge/actions/twitterauthorization.php
+++ b/plugins/TwitterBridge/actions/twitterauthorization.php
@@ -28,11 +28,9 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
+if (!defined('GNUSOCIAL') && !defined('STATUSNET')) { exit(1); }
 
-require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
+require_once dirname(__DIR__) . '/twitter.php';
 
 /**
  * Class for doing OAuth authentication against Twitter
@@ -65,7 +63,7 @@ class TwitterauthorizationAction extends Action
      *
      * @return boolean true
      */
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -83,7 +81,7 @@ class TwitterauthorizationAction extends Action
      *
      * @return nothing
      */
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
 
@@ -496,7 +494,6 @@ class TwitterauthorizationAction extends Action
         if (common_config('site', 'closed')) {
             // TRANS: Client error displayed when trying to create a new user while creating new users is not allowed.
             $this->clientError(_m('Registration not allowed.'));
-            return;
         }
 
         $invite = null;
@@ -506,7 +503,6 @@ class TwitterauthorizationAction extends Action
             if (empty($code)) {
                 // TRANS: Client error displayed when trying to create a new user while creating new users is not allowed.
                 $this->clientError(_m('Registration not allowed.'));
-                return;
             }
 
             $invite = Invitation::getKV($code);
@@ -514,7 +510,6 @@ class TwitterauthorizationAction extends Action
             if (empty($invite)) {
                 // TRANS: Client error displayed when trying to create a new user with an invalid invitation code.
                 $this->clientError(_m('Not a valid invitation code.'));
-                return;
             }
         }
 
@@ -538,12 +533,10 @@ class TwitterauthorizationAction extends Action
             $args['email'] = $email;
         }
 
-        $user = User::register($args);
-
-        if (empty($user)) {
-            // TRANS: Server error displayed when creating a new user has failed.
-            $this->serverError(_m('Error registering user.'));
-            return;
+        try {
+            $user = User::register($args);
+        } catch (Exception $e) {
+            $this->serverError($e->getMessage());
         }
 
         $result = $this->saveForeignLink($user->id,
@@ -555,7 +548,6 @@ class TwitterauthorizationAction extends Action
         if (!$result) {
             // TRANS: Server error displayed when connecting a user to a Twitter user has failed.
             $this->serverError(_m('Error connecting user to Twitter.'));
-            return;
         }
 
         common_set_user($user);
@@ -566,8 +558,7 @@ class TwitterauthorizationAction extends Action
 
         Event::handle('EndRegistrationTry', array($this));
 
-        common_redirect(common_local_url('showstream', array('nickname' => $user->nickname)),
-                        303);
+        common_redirect(common_local_url('showstream', array('nickname' => $user->nickname)), 303);
     }
 
     function connectNewUser()
@@ -598,7 +589,6 @@ class TwitterauthorizationAction extends Action
         if (!$result) {
             // TRANS: Server error displayed connecting a user to a Twitter user has failed.
             $this->serverError(_m('Error connecting user to Twitter.'));
-            return;
         }
 
         common_debug('TwitterBridge Plugin - ' .
@@ -619,7 +609,6 @@ class TwitterauthorizationAction extends Action
         if (empty($result)) {
             // TRANS: Server error displayed connecting a user to a Twitter user has failed.
             $this->serverError(_m('Error connecting user to Twitter.'));
-            return;
         }
 
         common_debug('TwitterBridge Plugin - ' .