Fixes for non-multipart media uploads, see #141

Author: mynetx

CHANGELOG

@@ -14,6 +14,7 @@ codebird-php - changelog
 + #145 Support TON API
 + #120 Support Ads API
 + Support WebP media format
++ Fixes for non-multipart media uploads, see #141
 
 2.7.2 (2015-09-23)
 - #135 Invalid HTTP request headers in non-cURL mode

src/codebird.php

@@ -102,6 +102,19 @@ class Codebird
    */
   protected static $_endpoint_oauth = 'https://api.twitter.com/';
 
+  /**
+   * Possible file name parameters
+   */
+  protected static $_possible_files = [
+    // Tweets
+    'statuses/update_with_media' => ['media[]'],
+    'media/upload' => ['media'],
+    // Accounts
+    'account/update_profile_background_image' => ['image'],
+    'account/update_profile_image' => ['image'],
+    'account/update_profile_banner' => ['banner']
+  ];
+
   /**
    * The Request or access token. Used to sign requests
    */
@@ -1639,23 +1652,24 @@ protected function _detectMultipart($method)
       'media/upload',
 
       // Users
-      'account/update_profile_background_image',
-      'account/update_profile_image',
-      'account/update_profile_banner'
+      // no multipart for these, for now:
+      //'account/update_profile_background_image',
+      //'account/update_profile_image',
+      //'account/update_profile_banner'
     ];
     return in_array($method, $multiparts);
   }
 
   /**
    * Merge multipart string from parameters array
    *
-   * @param array  $possible_files List of possible filename parameters
-   * @param string $border         The multipart border
-   * @param array  $params         The parameters to send along
+   * @param string $method_template The method template to call
+   * @param string $border          The multipart border
+   * @param array  $params          The parameters to send along
    *
    * @return string request
    */
-  protected function _getMultipartRequestFromParams($possible_files, $border, $params)
+  protected function _getMultipartRequestFromParams($method_template, $border, $params)
   {
     $request = '';
     foreach ($params as $key => $value) {
@@ -1668,32 +1682,9 @@ protected function _getMultipartRequestFromParams($possible_files, $border, $par
         . 'Content-Disposition: form-data; name="' . $key . '"';
 
       // check for filenames
-      if (in_array($key, $possible_files)) {
-        if (// is it a file, a readable one?
-          @file_exists($value)
-          && @is_readable($value)
-        ) {
-          // is it a supported image format?
-          $data = @getimagesize($value);
-          if ((is_array($data) && in_array($data[2], $this->_supported_media_files))
-            || imagecreatefromwebp($data) // A WebP image! :-) —why won’t getimagesize support this?
-          ) {
-            // try to read the file
-            $data = @file_get_contents($value);
-            if ($data === false || strlen($data) === 0) {
-              continue;
-            }
-            $value = $data;
-          }
-        } elseif (// is it a remote file?
-          filter_var($value, FILTER_VALIDATE_URL)
-          && preg_match('/^https?:\/\//', $value)
-        ) {
-          $data = $this->_fetchRemoteFile($value);
-          if ($data !== false) {
-            $value = $data;
-          }
-        }
+      $data = $this->_checkForFiles($method_template, $key, $value);
+      if ($data !== false) {
+        $value = $data;
       }
 
       $request .= "\r\n\r\n" . $value . "\r\n";
@@ -1702,6 +1693,46 @@ protected function _getMultipartRequestFromParams($possible_files, $border, $par
     return $request;
   }
 
+  /**
+   * Check for files
+   *
+   * @param string $method_template The method template to call
+   * @param string $key             The parameter name
+   * @param array  $value           The possible file name or URL
+   *
+   * @return mixed
+   */
+  protected function _checkForFiles($method_template, $key, $value) {
+    if (!in_array($key, self::$_possible_files[$method_template])) {
+      return false;
+    }
+    if (// is it a file, a readable one?
+      @file_exists($value)
+      && @is_readable($value)
+    ) {
+      // is it a supported image format?
+      $data = @getimagesize($value);
+      if ((is_array($data) && in_array($data[2], $this->_supported_media_files))
+        || imagecreatefromwebp($data) // A WebP image! :-) —why won’t getimagesize support this?
+      ) {
+        // try to read the file
+        $data = @file_get_contents($value);
+        if ($data !== false && strlen($data) !== 0) {
+          return $data;
+        }
+      }
+    } elseif (// is it a remote file?
+      filter_var($value, FILTER_VALIDATE_URL)
+      && preg_match('/^https?:\/\//', $value)
+    ) {
+      $data = $this->_fetchRemoteFile($value);
+      if ($data !== false) {
+        return $data;
+      }
+    }
+    return false;
+  }
+
 
   /**
    * Detect filenames in upload parameters,
@@ -1720,25 +1751,14 @@ protected function _buildMultipart($method, $params)
     }
 
     // only check specific parameters
-    $possible_files = [
-      // Tweets
-      'statuses/update_with_media' => 'media[]',
-      'media/upload' => 'media',
-      // Accounts
-      'account/update_profile_background_image' => 'image',
-      'account/update_profile_image' => 'image',
-      'account/update_profile_banner' => 'banner'
-    ];
     // method might have files?
-    if (! in_array($method, array_keys($possible_files))) {
+    if (! in_array($method, array_keys(self::$_possible_files))) {
       return;
     }
 
-    $possible_files = explode(' ', $possible_files[$method]);
-
     $multipart_border = '--------------------' . $this->_nonce();
     $multipart_request =
-      $this->_getMultipartRequestFromParams($possible_files, $multipart_border, $params)
+      $this->_getMultipartRequestFromParams($method, $multipart_border, $params)
       . '--' . $multipart_border . '--';
 
     return $multipart_request;
@@ -2178,6 +2198,13 @@ protected function _callApiPreparationsPost(
         $params = [];
       }
     } else {
+      // check for possible files in non-multipart methods
+      foreach ($params as $key => $value) {
+        $data = $this->_checkForFiles($method_template, $key, $value);
+        if ($data !== false) {
+          $params[$key] = base64_encode($data);
+        }
+      }
       if (! $app_only_auth) {
         $authorization = $this->_sign($httpmethod, $url, $params);
       }
@@ -2494,8 +2521,9 @@ protected function _parseApiReplyPrefillHeaders($headers, $reply)
       if (isset($headers['Range'])) {
         $reply['Range'] = $headers['Range'];
       }
+      $reply = json_encode($reply);
     }
-    return json_encode($reply);
+    return $reply;
   }
 
   /**