Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

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

diff --git a/actions/apioauthrequesttoken.php b/actions/apioauthrequesttoken.php
index 478d2dbfc433c4e152b9f0f6626c5dabcd0b384e..31e638746228d2a1722bee14d4682df6222cdee8 100644 (file)
--- a/actions/apioauthrequesttoken.php
+++ b/actions/apioauthrequesttoken.php
@@ -42,7 +42,6 @@ require_once INSTALLDIR . '/lib/apioauth.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class ApiOauthRequestTokenAction extends ApiOauthAction
 {
     /**
@@ -51,9 +50,7 @@ class ApiOauthRequestTokenAction extends ApiOauthAction
      * @param array $args $_REQUEST args
      *
      * @return boolean success flag
-     *
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -74,7 +71,6 @@ class ApiOauthRequestTokenAction extends ApiOauthAction
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
@@ -127,7 +123,6 @@ class ApiOauthRequestTokenAction extends ApiOauthAction
     /*
      * Display temporary OAuth credentials
      */
-
     function showRequestToken($token)
     {
         header('Content-Type: application/x-www-form-urlencoded');
@@ -142,11 +137,10 @@ class ApiOauthRequestTokenAction extends ApiOauthAction
      *
      * @return boolean true or false
      */
-
     function verifyCallback($callback)
     {
         if ($callback == "oob") {
-            common_debug("OAuth request token requested for out of bounds client.");
+            common_debug("OAuth request token requested for out of band client.");
 
             // XXX: Should we throw an error if a client is registered as a
             // web application but requests the pin based workflow? For now I'm
@@ -154,11 +148,7 @@ class ApiOauthRequestTokenAction extends ApiOauthAction
 
             return true;
         } else {
-            return Validate::uri(
-                $callback,
-                array('allowed_schemes' => array('http', 'https'))
-            );
+            return Validate::uri($callback);
         }
     }
-
 }