Changeset 4961

Timestamp:

03/03/2007 04:56:46 PM (20 years ago)

Author:

ryan

Message:

xmlrpc updates from Joseph Scott.

Location:

trunk

Files:

• wp-includes/functions.php (modified) (3 diffs)
• xmlrpc.php (modified) (5 diffs)

trunk/wp-includes/functions.php

@@ -1116 +1116 @@
         else
                 $ext = ".$ext";
-        while ( file_exists($upload['path'] . "/$filename") && !$overwrite ) {
+        while ( file_exists($upload['path'] . "/$filename") ) {
                 if ( '' == "$number$ext" )
                         $filename = $filename . ++$number . $ext;
@@ -1123 +1123 @@
         }
 
-        $new_file = $upload['path'] . "/$filename";
-        if ( ! wp_mkdir_p( dirname($new_file) ) ) {
-                $message = sprintf(__('Unable to create directory %s. Is its parent directory writable by the server?'), dirname($new_file));
-                return array('error' => $message);
+        // If we are asked to over write the file then make sure
+        // the $name has the complete path and is writable.
+        if($overwrite) {
+                if(!is_writable($name)) {
+                        return(array("error" => __("Can not over write file.")));
+                }
+                $new_file = $name;
+                $filename = basename($name);
+        }
+        else {
+                $new_file = $upload['path'] . "/$filename";
+                if ( ! wp_mkdir_p( dirname($new_file) ) ) {
+                        $message = sprintf(__('Unable to create directory %s. Is its parent directory writable by the server?'), dirname($new_file));
+                        return array('error' => $message);
+                }
         }
 
@@ -1141 +1152 @@
         @ chmod($new_file, $perms);
 
-        // Compute the URL
+        // Compute the URL if this is a new file.
         $url = $upload['url'] . "/$filename";
+        if($overwrite) {
+                $url = $name;
+        }
 
         return array('file' => $new_file, 'url' => $url, 'error' => false);

trunk/xmlrpc.php

@@ -150 +150 @@
                 global $wpdb;
 
-                if(is_string($array)) {
+                if(!is_array($array)) {
                         return($wpdb->escape($array));
                 }
@@ -1101 +1101 @@
 
                 // Only set a post parent if one was given.
-                if(!empty($content_struct["wp_page_parent_id"])) {
+                if(isset($content_struct["wp_page_parent_id"])) {
                         $post_parent = $content_struct["wp_page_parent_id"];
                 }
@@ -1167 +1167 @@
           if ( is_array($to_ping) )
                 $to_ping = implode(' ', $to_ping);
+
+      if(isset($content_struct["mt_allow_comments"])) {
+                $comment_status = $content_struct["mt_allow_comments"];
+      }
           
-          $comment_status = (!isset($content_struct['mt_allow_comments'])) ?
-            get_option('default_comment_status')
-            : $content_struct['mt_allow_comments'];
-
           // Do some timestamp voodoo
           $dateCreatedd = $content_struct['dateCreated'];
@@ -1388 +1388 @@
                 if(!empty($data["overwrite"]) && ($data["overwrite"] == true)) {
                         $overwrite = true;
+
+                        // If the file isn't writable then error out now.
+                        if(!is_writable($data["name"])) {
+                                return(new IXR_Error(500, "File is not writable, over write failed."));
+                        }
+
+                        // We now know the file is good so don't use the sanitized name.
+                        $name = $data["name"];
+
+                        // Get postmeta info on the object.
+                        $old_meta = $wpdb->get_row("
+                                SELECT *
+                                FROM {$wpdb->postmeta}
+                                WHERE meta_key = '_wp_attached_file'
+                                        AND meta_value = '{$name}'
+                        ");
+
+                        // Get post info on the object.
+                        $old_post = get_post($old_meta->post_id);
                 }
 
@@ -1422 +1441 @@
                 );
 
-                // Only make a database entry if this is a new file.
-                if(!$overwrite) {
-                        // Save the data
-                        $id = wp_insert_attachment( $attachment, $upload[ 'file' ], $post_id );
-                        wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $upload['file'] ) );
-                }
+                // If we are over writing then set the correct post_id and URL
+                // instead of getting new ones.
+                if($overwrite) {
+                        $post_id                                        = $old_meta->post_id;
+                        $attachment["post_parent"]      = $old_meta->post_id;
+                        $attachment["ID"]                       = $old_meta->post_id;
+
+                        $upload["url"]                          = $old_post->guid;
+                        $attachment["guid"]                     = $old_post->guid;
+                }
+
+                // Save the data
+                $id = wp_insert_attachment( $attachment, $upload[ 'file' ], $post_id );
+                wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $upload['file'] ) );
 
                 return apply_filters( 'wp_handle_upload', array( 'file' => $upload[ 'file' ], 'url' => $upload[ 'url' ], 'type' => $type ) );