Merge pull request #6964 from JeroenED/task/frio-sharestring-onchange

[friendica.git] / library / OAuth1.php

diff --git a/library/OAuth1.php b/library/OAuth1.php
index a2097be064b2c78cf698d733e9ce0cbcb3daa175..27ee090b114239499c8ac47f5bf04aeec2972ea4 100644 (file)
--- a/library/OAuth1.php
+++ b/library/OAuth1.php
@@ -3,10 +3,10 @@
 
 /* Generic exception class
  */
-if (!class_exists('OAuthException')) {
-       class OAuthException extends Exception {
-               // pass
-       }
+if (!class_exists('OAuthException', false)) {
+  class OAuthException extends Exception {
+    // pass
+  }
 }
 
 class OAuthConsumer {
@@ -91,7 +91,6 @@ abstract class OAuthSignatureMethod {
    */
   public function check_signature($request, $consumer, $token, $signature) {
     $built = $this->build_signature($request, $consumer, $token);
-    //echo "<pre>"; var_dump($signature, $built, ($built == $signature)); killme();
     return ($built == $signature);
   }
 }
@@ -296,7 +295,6 @@ class OAuthRequest {
     $http_url =  substr($http_url, 0, strpos($http_url,$parameters['pagename'])+strlen($parameters['pagename']));
     unset( $parameters['pagename'] );
     
-       //echo "<pre>".__function__."\n"; var_dump($http_method, $http_url, $parameters, $_SERVER['REQUEST_URI']); killme();
     return new OAuthRequest($http_method, $http_url, $parameters);
   }
 
@@ -561,7 +559,6 @@ class OAuthServer {
   public function verify_request(&$request) {
     $this->get_version($request);
     $consumer = $this->get_consumer($request);
-    //echo __file__.__line__.__function__."<pre>"; var_dump($consumer); die();
     $token = $this->get_token($request, $consumer, "access");
     $this->check_signature($request, $consumer, $token);
     return array($consumer, $token);