Changeset 4908

Timestamp:

02/22/2007 01:42:21 AM (19 years ago)

Author:

ryan

Message:

xmlrpc updates from Joseph Scott.

Location:

trunk

Files:

• wp-includes/functions.php (modified) (2 diffs)
• xmlrpc.php (modified) (9 diffs)

trunk/wp-includes/functions.php

@@ -1095 +1095 @@
 }
 
-function wp_upload_bits($name, $type, $bits) {
+function wp_upload_bits($name, $type, $bits, $overwrite = false) {
         if ( empty($name) )
                 return array('error' => __("Empty filename"));
@@ -1116 +1116 @@
         else
                 $ext = ".$ext";
-        while ( file_exists($upload['path'] . "/$filename") ) {
+        while ( file_exists($upload['path'] . "/$filename") && !$overwrite ) {
                 if ( '' == "$number$ext" )
                         $filename = $filename . ++$number . $ext;

trunk/xmlrpc.php

@@ -80 +80 @@
                         'wp.newCategory'                => 'this:wp_newCategory',
                         'wp.suggestCategories'  => 'this:wp_suggestCategories',
+                        'wp.uploadFile'                 => 'this:mw_newMediaObject',    // Alias
 
                         // Blogger API
@@ -423 +424 @@
                         SELECT ID page_id,
                                 post_title page_title,
-                                post_parent page_parent_id
+                                post_parent page_parent_id,
+                                post_date
                         FROM {$wpdb->posts}
                         WHERE post_type = 'page'
                         ORDER BY ID
                 ");
+
+                // The date needs to be formated properly.
+                $num_pages = count($page_list);
+                for($i = 0; $i < $num_pages; $i++) {
+                        $post_date = mysql2date("Ymd\TH:i:s", $page_list[$i]->post_date);
+                        $page_list[$i]->dateCreated = new IXR_Date($post_date);
+
+                        unset($page_list[$i]->post_date);
+                }
 
                 return($page_list);
@@ -487 +498 @@
                 // If no parent_id was provided make it empty
                 // so that it will be a top level page (no parent).
-                if(empty($category["parent_id"])) {
+                if(isset($category["parent_id"])) {
                         $category["parent_id"] = "";
                 }
@@ -938 +949 @@
 
                 // Only set a post parent if one was provided.
-                if(!empty($content_struct["wp_page_parent_id"])) {
+                if(isset($content_struct["wp_page_parent_id"])) {
                         $post_parent = $content_struct["wp_page_parent_id"];
                 }
@@ -978 +989 @@
           $post_more = $content_struct['mt_text_more'];
 
-          $comment_status = (empty($content_struct['mt_allow_comments'])) ?
+          $comment_status = (!isset($content_struct['mt_allow_comments'])) ?
             get_option('default_comment_status')
             : $content_struct['mt_allow_comments'];
 
-          $ping_status = (empty($content_struct['mt_allow_pings'])) ?
+          $ping_status = (!isset($content_struct['mt_allow_pings'])) ?
             get_option('default_ping_status')
             : $content_struct['mt_allow_pings'];
@@ -1158 +1169 @@
                 $to_ping = implode(' ', $to_ping);
           
-          $comment_status = (empty($content_struct['mt_allow_comments'])) ?
+          $comment_status = (!isset($content_struct['mt_allow_comments'])) ?
             get_option('default_comment_status')
             : $content_struct['mt_allow_comments'];
@@ -1374 +1385 @@
                 $bits = $data['bits'];
 
+                // Default to new file, not over write.
+                $overwrite = false;
+                if(!empty($data["overwrite"]) && ($data["overwrite"] == true)) {
+                        $overwrite = true;
+                }
+
                 logIO('O', '(MW) Received '.strlen($bits).' bytes');
 
@@ -1389 +1406 @@
                         return new IXR_Error(500, $upload_err);
 
-                $upload = wp_upload_bits($name, $type, $bits);
+                $upload = wp_upload_bits($name, $type, $bits, $overwrite);
                 if ( ! empty($upload['error']) ) {
                         logIO('O', '(MW) Could not write file '.$name);
@@ -1405 +1422 @@
                         'guid' => $upload[ 'url' ]
                 );
-                // Save the data
-                $id = wp_insert_attachment( $attachment, $upload[ 'file' ], $post_id );
-                wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $upload['file'] ) );
+
+                // 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'] ) );
+                }
 
                 return apply_filters( 'wp_handle_upload', array( 'file' => $upload[ 'file' ], 'url' => $upload[ 'url' ], 'type' => $type ) );