Changeset 371860

Timestamp:

04/12/2011 10:24:19 AM (15 years ago)

Author:

ostlund

Message:

uUpdated dropbox class to latest version
-This line, and those below, will be ignored--
pbo

M trunk/inc/dropbox.php
M trunk/readme.txt

Location:

dropbox-upload-form/trunk

Files:

• inc/dropbox.php (modified) (17 diffs)
• readme.txt (modified) (1 diff)

dropbox-upload-form/trunk/inc/dropbox.php

@@ -9 +9 @@
  * If you report a bug, make sure you give me enough information (include your code).
  *
+ * Changelog since 1.0.2
+ * - Added methods to enable oauth-usage.
+ *
+ * Changelog since 1.0.1
+ * - Bugfix: when doing multiple calles where GET and POST is mixed, the postfields should be reset (thx to Daniel Hüsken)
+ *
  * Changelog since 1.0.0
  * - fixed some issues with generation off the basestring
  *
  * License
- * Copyright (c) 2010, Tijs Verkoyen. All rights reserved.
+ * Copyright (c), Tijs Verkoyen. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
@@ -24 +30 @@
  *
  * @author      Tijs Verkoyen <[email protected]>
- * @version     1.0.1
- *
- * @copyright   Copyright (c) 2010, Tijs Verkoyen. All rights reserved.
+ * @version     1.0.3
+ *
+ * @copyright   Copyright (c), Tijs Verkoyen. All rights reserved.
  * @license     BSD License
  */
@@ -42 +48 @@
 
     // current version
-    const VERSION = '1.0.1';
+    const VERSION = '1.0.3';
 
 
@@ -207 +213 @@
         }
 
-        // buils base
+        $urlChunks = explode('/', $url);
+        $i = 0;
+
+        foreach($urlChunks as &$chunk)
+        {
+            if($i > 4) $chunk = self::urlencode_rfc3986($chunk);
+            else $chunk = urlencode($chunk);
+
+            $i++;
+
+        }
+
+        // build base
         $base = $method .'&';
-        $base .= urlencode($url);
+        $base .= implode('%2F', $urlChunks);
         $base .= (substr_count($url, '?')) ? '%26' : '&';
         $base .= implode('%26', $chunks);
-        $base = str_replace('%3F', '&', $base);
+        $base = str_replace(array('%3F', '%20'), array('&', '%2520'), $base);
 
         // return
@@ -258 +276 @@
      * @param   array[optional] $parameters
      */
-    private function doOAuthCall($url, array $parameters = null)
+    private function doOAuthCall($url, array $parameters = null, $method = 'POST', $expectJSON = true)
     {
         // redefine
@@ -278 +296 @@
         // calculate header
         $header = $this->calculateHeader($parameters, self::API_URL .'/'. $url);
+
+        if($method == 'POST')
+        {
+            $options[CURLOPT_POST] = true;
+            $options[CURLOPT_POSTFIELDS] = $this->buildQuery($parameters);
+        }
+
+        else
+        {
+            // reset post
+            $options[CURLOPT_POST] = 0;
+            unset($options[CURLOPT_POSTFIELDS]);
+
+            // add the parameters into the querystring
+            if(!empty($parameters)) $url .= '?'. $this->buildQuery($parameters);
+        }
 
         // set options
@@ -289 +323 @@
         $options[CURLOPT_SSL_VERIFYHOST] = false;
         $options[CURLOPT_HTTPHEADER] = array('Expect:');
-        $options[CURLOPT_POST] = true;
-        $options[CURLOPT_POSTFIELDS] = $this->buildQuery($parameters);
 
         // init
@@ -310 +342 @@
 
         // return
-        return json_decode($response, true);
+        if($expectJSON) return json_decode($response, true);
+
+        // fallback
+        return $response;
     }
 
@@ -349 +384 @@
         // set data
         $data = $oauth;
-        if(!empty($parameters)) $data = array_merge($data, $parameters);
+        if(!empty($parameters))
+        {
+            // convert to UTF-8
+            foreach($parameters as &$value) $value = utf8_encode($value);
+
+            // merge
+            $data = array_merge($data, $parameters);
+        }
 
         if($filePath != null)
@@ -402 +444 @@
         else
         {
+            // reset post
+            $options[CURLOPT_POST] = 0;
+            unset($options[CURLOPT_POSTFIELDS]);
+
             // add the parameters into the querystring
             if(!empty($parameters)) $url .= '?'. $this->buildQuery($parameters);
@@ -688 +734 @@
             $replace = array('%20', '%20', '~', '%25');
 
-            return str_replace($search, $replace, urlencode($value));
-        }
+            return str_replace($search, $replace, rawurlencode($value));
+        }
+    }
+
+
+// oauth resources
+    /**
+     * Call for obtaining an OAuth request token.
+     * Returns a request token and the corresponding request token secret. This token and secret cannot be used to sign requests for the /metadata and /file content API calls.
+     * Their only purpose is for signing a request to oauth/access_token once the user has gone through the application authorization steps provided by oauth/authorize.
+     *
+     * @return  array
+     */
+    public function oAuthRequestToken()
+    {
+        // make the call
+        $response = $this->doOAuthCall('0/oauth/request_token', null, 'POST', false);
+
+        // process response
+        $response = (array) explode('&', $response);
+        $return = array();
+
+        // loop chunks
+        foreach($response as $chunk)
+        {
+            // split again
+            $chunks = explode('=', $chunk, 2);
+
+            // store return
+            if(count($chunks) == 2) $return[$chunks[0]] = $chunks[1];
+        }
+
+        // return
+        return $return;
+    }
+
+
+    /**
+     * Redirect the user to the oauth/authorize location so that Dropbox can authenticate the user and ask whether or not the user wants to authorize the application to access
+     * file metadata and content on its behalf. oauth/authorize is not an API call per se, because it does not have a return value, but rather directs the user to a page on
+     * api.dropbox.com where they are provided means to log in to Dropbox and grant authority to the application requesting it.
+     * The page served by oauth/authorize should be presented to the user through their web browser.
+     * Please note, without directing the user to a Dropbox-provided page via oauth/authorize, it is impossible for your application to use the request token it received
+     * via oauth/request_token to obtain an access token from oauth/access_token.
+     *
+     * @return  void
+     * @param   string $oauthToken                  The request token of the application requesting authority from a user.
+     * @param   string[optional] $oauthCallback     After the user authorizes an application, the user is redirected to the application-served URL provided by this parameter.
+     */
+    public function oAuthAuthorize($oauthToken, $oauthCallback = null)
+    {
+        // build parameters
+        $parameters = array();
+        $parameters['oauth_token'] = (string) $oauthToken;
+        if($oauthCallback !== null) $parameters['oauth_callback'] = (string) $oauthCallback;
+
+        // build url
+        $url = self::API_URL .'/0/oauth/authorize?'. http_build_query($parameters);
+
+        // redirect
+        header('Location: '. $url);
+        exit;
+    }
+
+
+    /**
+     * This call returns a access token and the corresponding access token secret.
+     * Upon return, the authorization process is now complete and the access token and corresponding secret are used to sign requests for the metadata and file content API calls.
+     *
+     * @return  array
+     * @param   string $oauthToken  The token returned after authorizing
+     */
+    public function oAuthAccessToken($oauthToken)
+    {
+        // build parameters
+        $parameters = array();
+        $parameters['oauth_token'] = (string) $oauthToken;
+
+        // make the call
+        $response = $this->doOAuthCall('0/oauth/access_token', $parameters, 'POST', false);
+
+        // process response
+        $response = (array) explode('&', $response);
+        $return = array();
+
+        // loop chunks
+        foreach($response as $chunk)
+        {
+            // split again
+            $chunks = explode('=', $chunk, 2);
+
+            // store return
+            if(count($chunks) == 2) $return[$chunks[0]] = $chunks[1];
+        }
+
+        // return
+        return $return;
     }
 
@@ -776 +917 @@
         $url = '0/files/';
         $url .= ($sandbox) ? 'sandbox/' : 'dropbox/';
-        $url .= (string) $path;
+        $url .= trim((string) $path, '/');
 
         // make the call
@@ -796 +937 @@
         $url = '0/files/';
         $url .= ($sandbox) ? 'sandbox/' : 'dropbox/';
-        $url .= (string) $path;
+        $url .= trim((string) $path, '/');
 
         // make the call
@@ -819 +960 @@
         $url = '0/metadata/';
         $url .= ($sandbox) ? 'sandbox/' : 'dropbox/';
-        $url .= (string) $path;
+        $url .= trim((string) $path, '/');
 
         // build parameters
@@ -843 +984 @@
         // build url
         $url = '0/thumbnails/dropbox/';
-        $url .= (string) $path;
+        $url .= trim((string) $path, '/');
 
         // build parameters
@@ -890 +1031 @@
 
         // build parameters
-        $parameters['path'] = (string) $path;
+        $parameters['path'] = trim((string) $path, '/');
         $parameters['root'] = ($sandbox) ? 'sandbox' : 'dropbox';
 
@@ -911 +1052 @@
 
         // build parameters
-        $parameters['path'] = (string) $path;
+        $parameters['path'] = trim((string) $path, '/');
         $parameters['root'] = ($sandbox) ? 'sandbox' : 'dropbox';
 

dropbox-upload-form/trunk/readme.txt

@@ -37 +37 @@
 
 = 0.1.2 =
-*
+* Updated dropbox class to latest version
 
 = 0.1.1 =