Changeset 3255

Timestamp:

12/01/2005 10:51:40 PM (19 years ago)

Author:

ryan

Message:

Add wp_upload_bits(). Attempt to fix mw_newMediaObject().

Location:

trunk

Files:

• wp-includes/functions-post.php (modified) (1 diff)
• xmlrpc.php (modified) (1 diff)

trunk/wp-includes/functions-post.php

@@ -779 +779 @@
     return get_post_meta($attachment_id, '_wp_attached_file', true);
 }
+
+function wp_upload_bits($name, $type, $bits) {
+    if ( empty($name) )
+        return array('error' => "Empty filename");
+
+    $upload = wp_upload_dir();
+    
+    if ( $upload['error'] !== false )
+        return $upload;
+
+    $number = '';
+    $filename = $name;
+    while ( file_exists($upload['path'] . "/$filename") )
+        $filename = str_replace("$number.$ext", ++$number . ".$ext", $filename);
+
+    $new_file = $uploads['path'] . "/$filename";
+    $ifp = @ fopen($new_file, 'wb');
+    if ( ! $ifp )
+        return array('error' => "Could not write file $new_file.");
+        
+    $success = @ fwrite($ifp, $bits);
+    fclose($ifp);
+    // Set correct file permissions
+    $stat = @ stat(dirname($new_file));
+    $perms = $stat['mode'] & 0000777;
+    @ chmod($new_file, $perms);
+
+    // Compute the URL
+    $url = $upload['url'] . "/$filename";
+
+    return array('file' => $new_file, 'url' => $url);
+}
+
 ?>

trunk/xmlrpc.php

@@ -826 +826 @@
     /* metaweblog.newMediaObject uploads a file, following your settings */
     function mw_newMediaObject($args) {
-      // adapted from a patch by Johann Richard
-      // http://mycvs.org/archives/2004/06/30/file-upload-to-wordpress-in-ecto/
+        // adapted from a patch by Johann Richard
+        // http://mycvs.org/archives/2004/06/30/file-upload-to-wordpress-in-ecto/
 
         global $wpdb;
 
-      $blog_ID     = $wpdb->escape($args[0]);
-      $user_login  = $wpdb->escape($args[1]);
+        $blog_ID     = $wpdb->escape($args[0]);
+        $user_login  = $wpdb->escape($args[1]);
         $user_pass   = $wpdb->escape($args[2]);
-      $data        = $args[3];
-
-      $name = $data['name'];
-      $type = $data['type'];
-      $bits = $data['bits'];
-
-      $file_realpath = get_settings('fileupload_realpath'); 
-      $file_url = get_settings('fileupload_url');
-
-      logIO('O', '(MW) Received '.strlen($bits).' bytes');
-
-      if (!$this->login_pass_ok($user_login, $user_pass)) {
-        return $this->error;
-      }
-
-      $user_data = get_userdatabylogin($user_login);
-
-      if(!get_settings('use_fileupload')) {
-        // Uploads not allowed
-        logIO('O', '(MW) Uploads not allowed');
-        $this->error = new IXR_Error(405, 'No uploads allowed for this site.');
-        return $this->error;
-      } 
-
-      $user = new WP_User($user_login);
-      if ( !$user->has_cap('upload_files') ) {
-        logIO('O', '(MW) User does not have upload_files capability');
-        $this->error = new IXR_Error(401, 'You are not allowed to upload files to this site.');
-        return $this->error;
-      }
-
-      if(trim($file_realpath) == '' || trim($file_url) == '' ) {
-        // WordPress is not correctly configured
-        logIO('O', '(MW) Bad configuration. Real/URL path not defined');
-        $this->error = new IXR_Error(500, 'Please configure WordPress with valid paths for file upload.');
-        return $this->error;
-      }
-
-      $prefix = '/';
-
-      if(!empty($name)) {
-        // Create the path
-        $localpath = $file_realpath.$prefix.$name;
-        $url = $file_url.$prefix.$name;
-
-        if (mkdir_p(dirname($localpath))) {
-
-          /* encode & write data (binary) */
-          $ifp = fopen($localpath, 'wb');
-          $success = fwrite($ifp, $bits);
-          fclose($ifp);
-          @chmod($localpath, 0666);
-
-          if($success) {
-            $resp = array('url' => $url);
-            return $resp;
-          } else {
-            logIO('O', '(MW) Could not write file '.$name.' to '.$localpath);
-            return new IXR_Error(500, 'Could not write file '.$name);
-          }
-
-        } else {
-          return new IXR_Error(500, 'Could not create directories for '.$name);
-        }
-      }
-    }
-
+        $data        = $args[3];
+
+        $name = $data['name'];
+        $type = $data['type'];
+        $bits = $data['bits'];
+
+        logIO('O', '(MW) Received '.strlen($bits).' bytes');
+
+        if ( !$this->login_pass_ok($user_login, $user_pass) )
+            return $this->error;
+
+        $user = new WP_User($user_login);
+
+        if ( !$user->has_cap('upload_files') ) {
+            logIO('O', '(MW) User does not have upload_files capability');
+            $this->error = new IXR_Error(401, 'You are not allowed to upload files to this site.');
+            return $this->error;
+        }
+
+        $upload = wp_upload_bits($name, $type, $bits);
+        if ( $upload['error'] !== false ) {
+            logIO('O', '(MW) Could not write file '.$name);
+            return new IXR_Error(500, 'Could not write file '.$name);
+        }
+        
+        return array('url' => $upload['url']);
+    }