Merge pull request #4852 from tobiasd/20180417-fi

[friendica.git] / library / OAuth1.php

diff --git a/library/OAuth1.php b/library/OAuth1.php
index 53b905e7714a5cbdc3d8effc40157d554958ddb5..c537f2b252f7db0c8f69967859702bbbb4f30093 100644 (file)
--- a/library/OAuth1.php
+++ b/library/OAuth1.php
@@ -3,10 +3,8 @@
 
 /* Generic exception class
  */
-if (!class_exists('OAuthException')) {
-       class OAuthException extends Exception {
-               // pass
-       }
+class OAuthException extends Exception {
+  // pass
 }
 
 class OAuthConsumer {
@@ -293,8 +291,8 @@ class OAuthRequest {
     }
     // fix for friendica redirect system
     
-    $http_url =  substr($http_url, 0, strpos($http_url,$parameters['q'])+strlen($parameters['q']));
-    unset( $parameters['q'] );
+    $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);
@@ -423,8 +421,11 @@ class OAuthRequest {
   /**
    * builds the data one would send in a POST request
    */
-  public function to_postdata() {
-    return OAuthUtil::build_http_query($this->parameters);
+  public function to_postdata($raw = false) {
+    if ($raw)
+      return($this->parameters);
+    else
+      return OAuthUtil::build_http_query($this->parameters);
   }
 
   /**