Changeset 6726 for trunk/xmlrpc.php

Timestamp:

02/05/2008 06:47:27 AM (17 years ago)

Author:

ryan

Message:

Trailing whitespace cleanup

File:

• trunk/xmlrpc.php (modified) (31 diffs)

trunk/xmlrpc.php

@@ -32 +32 @@
       <api name="MetaWeblog" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('wpurl') ?>/xmlrpc.php" />
       <api name="Blogger" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('wpurl') ?>/xmlrpc.php" />
-      <api name="Atom" blogID="" preferred="false" apiLink="<?php echo apply_filters('atom_service_url', (get_bloginfo('url')."/wp-app.php/service"))?>" /> 
+      <api name="Atom" blogID="" preferred="false" apiLink="<?php echo apply_filters('atom_service_url', (get_bloginfo('url')."/wp-app.php/service"))?>" />
     </apis>
   </service>
@@ -175 +175 @@
     }
 
-    function get_custom_fields($post_id) { 
-        $post_id = (int) $post_id; 
-
-        $custom_fields = array(); 
-
-        foreach ( (array) has_meta($post_id) as $meta ) { 
-            // Don't expose protected fields. 
-            if ( strpos($meta['meta_key'], '_wp_') === 0 ) { 
-                continue; 
-            } 
-
-            $custom_fields[] = array( 
-                "id"    => $meta['meta_id'], 
-                "key"   => $meta['meta_key'], 
-                "value" => $meta['meta_value'] 
-            ); 
-        } 
-
-        return $custom_fields; 
-    } 
-
-    function set_custom_fields($post_id, $fields) { 
-        $post_id = (int) $post_id; 
-
-        foreach ( (array) $fields as $meta ) { 
-            if ( isset($meta['id']) ) { 
-                $meta['id'] = (int) $meta['id']; 
-
-                if ( isset($meta['key']) ) { 
-                    update_meta($meta['id'], $meta['key'], $meta['value']); 
-                } 
-                else { 
-                    delete_meta($meta['id']); 
-                } 
-            } 
-            else { 
-                $_POST['metakeyinput'] = $meta['key']; 
-                $_POST['metavalue'] = $meta['value']; 
-                add_meta($post_id); 
-            } 
-        } 
-    } 
+    function get_custom_fields($post_id) {
+        $post_id = (int) $post_id;
+
+        $custom_fields = array();
+
+        foreach ( (array) has_meta($post_id) as $meta ) {
+            // Don't expose protected fields.
+            if ( strpos($meta['meta_key'], '_wp_') === 0 ) {
+                continue;
+            }
+
+            $custom_fields[] = array(
+                "id"    => $meta['meta_id'],
+                "key"   => $meta['meta_key'],
+                "value" => $meta['meta_value']
+            );
+        }
+
+        return $custom_fields;
+    }
+
+    function set_custom_fields($post_id, $fields) {
+        $post_id = (int) $post_id;
+
+        foreach ( (array) $fields as $meta ) {
+            if ( isset($meta['id']) ) {
+                $meta['id'] = (int) $meta['id'];
+
+                if ( isset($meta['key']) ) {
+                    update_meta($meta['id'], $meta['key'], $meta['value']);
+                }
+                else {
+                    delete_meta($meta['id']);
+                }
+            }
+            else {
+                $_POST['metakeyinput'] = $meta['key'];
+                $_POST['metavalue'] = $meta['value'];
+                add_meta($post_id);
+            }
+        }
+    }
 
     /**
@@ -662 +662 @@
 
         set_current_user(0, $username);
-        if( !current_user_can( 'edit_posts' ) ) 
+        if( !current_user_can( 'edit_posts' ) )
             return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts to this blog in order to view categories.' ) );
 
@@ -680 +680 @@
 
     function wp_getCommentCount( $args ) {
-        $this->escape($args); 
-
-        $blog_id    = (int) $args[0]; 
-        $username   = $args[1]; 
-        $password   = $args[2]; 
-        $post_id    = (int) $args[3];  
-
-        if( !$this->login_pass_ok( $username, $password ) ) {  
-            return new IXR_Error( 403, __( 'Bad login/pass combination.' ) ); 
-        }  
-
-        set_current_user( 0, $username );  
-        if( !current_user_can( 'edit_posts' ) ) {  
-            return new IXR_Error( 403, __( 'You are not allowed details about comments.' ) );  
-        } 
+        $this->escape($args);
+
+        $blog_id    = (int) $args[0];
+        $username   = $args[1];
+        $password   = $args[2];
+        $post_id    = (int) $args[3];
+
+        if( !$this->login_pass_ok( $username, $password ) ) {
+            return new IXR_Error( 403, __( 'Bad login/pass combination.' ) );
+        }
+
+        set_current_user( 0, $username );
+        if( !current_user_can( 'edit_posts' ) ) {
+            return new IXR_Error( 403, __( 'You are not allowed details about comments.' ) );
+        }
 
         do_action('xmlrpc_call', 'wp.getCommentCount');
@@ -792 +792 @@
 
         set_current_user( 0, $user_login );
-        if( !current_user_can( 'edit_posts' ) ) 
+        if( !current_user_can( 'edit_posts' ) )
             return new IXR_Error( 401, __( 'Sorry, you do not have access to user data on this blog.' ) );
 
@@ -825 +825 @@
 
         set_current_user( 0, $user_login );
-        if( !current_user_can( 'edit_post', $post_ID ) ) 
+        if( !current_user_can( 'edit_post', $post_ID ) )
             return new IXR_Error( 401, __( 'Sorry, you can not edit this post.' ) );
 
@@ -986 +986 @@
         $content    = $args[4];
         $publish    = $args[5];
-        
+
         if (!$this->login_pass_ok($user_login, $user_pass)) {
             return $this->error;
@@ -997 +997 @@
         if ( !current_user_can($cap) )
             return new IXR_Error(401, __('Sorry, you are not allowed to post on this blog.'));
-        
+
         $post_status = ($publish) ? 'publish' : 'draft';
-        
+
         $post_author = $user->ID;
-        
+
         $post_title = xmlrpc_getposttitle($content);
         $post_category = xmlrpc_getpostcategory($content);
         $post_content = xmlrpc_removepostdata($content);
-        
+
         $post_date = current_time('mysql');
         $post_date_gmt = current_time('mysql', 1);
-        
+
         $post_data = compact('blog_ID', 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status');
-        
+
         $post_ID = wp_insert_post($post_data);
         if ( is_wp_error( $post_ID ) )
@@ -1029 +1029 @@
 
         $this->escape($args);
-        
+
         $post_ID     = (int) $args[1];
         $user_login  = $args[2];
@@ -1035 +1035 @@
         $content     = $args[4];
         $publish     = $args[5];
-        
+
         if (!$this->login_pass_ok($user_login, $user_pass)) {
             return $this->error;
@@ -1043 +1043 @@
 
         $actual_post = wp_get_single_post($post_ID,ARRAY_A);
-        
+
         if (!$actual_post) {
             return new IXR_Error(404, __('Sorry, no such post.'));
         }
-        
+
         $this->escape($actual_post);
-        
+
         set_current_user(0, $user_login);
         if ( !current_user_can('edit_post', $post_ID) )
             return new IXR_Error(401, __('Sorry, you do not have the right to edit this post.'));
-        
+
         extract($actual_post, EXTR_SKIP);
-        
+
         if ( ('publish' == $post_status) && !current_user_can('publish_posts') )
             return new IXR_Error(401, __('Sorry, you do not have the right to publish this post.'));
-        
+
         $post_title = xmlrpc_getposttitle($content);
         $post_category = xmlrpc_getpostcategory($content);
         $post_content = xmlrpc_removepostdata($content);
-        
+
         $postdata = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt');
-        
+
         $result = wp_update_post($postdata);
-        
+
         if (!$result) {
             return new IXR_Error(500, __('For some strange yet very annoying reason, this post could not be edited.'));
         }
         $this->attach_uploads( $ID, $post_content );
-        
+
         return true;
     }
@@ -1079 +1079 @@
     function blogger_deletePost($args) {
         $this->escape($args);
-        
+
         $post_ID     = (int) $args[1];
         $user_login  = $args[2];
         $user_pass   = $args[3];
         $publish     = $args[4];
-        
+
         if (!$this->login_pass_ok($user_login, $user_pass)) {
             return $this->error;
@@ -1092 +1092 @@
 
         $actual_post = wp_get_single_post($post_ID,ARRAY_A);
-        
+
         if (!$actual_post) {
             return new IXR_Error(404, __('Sorry, no such post.'));
         }
-        
+
         set_current_user(0, $user_login);
         if ( !current_user_can('edit_post', $post_ID) )
             return new IXR_Error(401, __('Sorry, you do not have the right to delete this post.'));
-        
+
         $result = wp_delete_post($post_ID);
-        
+
         if (!$result) {
             return new IXR_Error(500, __('For some strange yet very annoying reason, this post could not be deleted.'));
         }
-        
+
         return true;
     }
@@ -1125 +1125 @@
         $content_struct = $args[3];
         $publish     = $args[4];
-        
+
         if (!$this->login_pass_ok($user_login, $user_pass)) {
             return $this->error;
@@ -1225 +1225 @@
             }
         }
-        
+
         $post_excerpt = $content_struct['mt_excerpt'];
         $post_more = $content_struct['mt_text_more'];
@@ -1299 +1299 @@
             $post_content = $post_content . "\n<!--more-->\n" . $post_more;
         }
-        
+
         $to_ping = $content_struct['mt_tb_ping_urls'];
         if ( is_array($to_ping) )
@@ -1321 +1321 @@
         logIO('O', 'Post cats: ' . var_export($catnames,true));
         $post_category = array();
-        
+
         if (is_array($catnames)) {
             foreach ($catnames as $cat) {
@@ -1330 +1330 @@
         // We've got all the data -- post it:
         $postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'to_ping', 'post_type', 'post_name', 'post_password', 'post_parent', 'menu_order', 'tags_input');
-        
+
         $post_ID = wp_insert_post($postdata);
         if ( is_wp_error( $post_ID ) )
             return new IXR_Error(500, $post_ID->get_error_message());
-        
+
         if (!$post_ID) {
             return new IXR_Error(500, __('Sorry, your entry could not be posted. Something wrong happened.'));
         }
 
-        if ( isset($content_struct['custom_fields']) ) { 
-            $this->set_custom_fields($post_ID, $content_struct['custom_fields']); 
-        } 
-        
+        if ( isset($content_struct['custom_fields']) ) {
+            $this->set_custom_fields($post_ID, $content_struct['custom_fields']);
+        }
+
         $this->attach_uploads( $post_ID, $post_content );
-        
+
         logIO('O', "Posted ! ID: $post_ID");
-        
+
         return strval($post_ID);
     }
@@ -1374 +1374 @@
         $content_struct = $args[3];
         $publish     = $args[4];
-        
+
         if (!$this->login_pass_ok($user_login, $user_pass)) {
             return $this->error;
@@ -1524 +1524 @@
         $post_content = apply_filters( 'content_save_pre', $content_struct['description'] );
         $catnames = $content_struct['categories'];
-        
+
         $post_category = array();
-        
+
         if (is_array($catnames)) {
             foreach ($catnames as $cat) {
@@ -1532 +1532 @@
             }
         }
-        
+
         $post_excerpt = $content_struct['mt_excerpt'];
         $post_more = $content_struct['mt_text_more'];
@@ -1555 +1555 @@
             }
         }
-        
+
         $tags_input = $content_struct['mt_keywords'];
 
@@ -1564 +1564 @@
                 return new IXR_Error(401, __('Sorry, you do not have the right to publish this post.'));
         }
-        
+
         if ($post_more) {
             $post_content = $post_content . "\n<!--more-->\n" . $post_more;
@@ -1589 +1589 @@
         // We've got all the data -- post it:
         $newpost = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'post_date', 'post_date_gmt', 'to_ping', 'post_name', 'post_password', 'post_parent', 'menu_order', 'post_author', 'tags_input');
-        
+
         $result = wp_update_post($newpost);
         if (!$result) {
@@ -1595 +1595 @@
         }
 
-        if ( isset($content_struct['custom_fields']) ) { 
-            $this->set_custom_fields($post_ID, $content_struct['custom_fields']); 
-        } 
+        if ( isset($content_struct['custom_fields']) ) {
+            $this->set_custom_fields($post_ID, $content_struct['custom_fields']);
+        }
 
         $this->attach_uploads( $ID, $post_content );
-        
+
         logIO('O',"(MW) Edited ! ID: $post_ID");
-        
+
         return true;
     }
@@ -1611 +1611 @@
 
         $this->escape($args);
-        
+
         $post_ID     = (int) $args[0];
         $user_login  = $args[1];
         $user_pass   = $args[2];
-        
+
         if (!$this->login_pass_ok($user_login, $user_pass)) {
             return $this->error;
@@ -1627 +1627 @@
 
         $postdata = wp_get_single_post($post_ID, ARRAY_A);
-        
+
         if ($postdata['post_date'] != '') {
             $post_date = mysql2date('Ymd\TH:i:s', $postdata['post_date']);
             $post_date_gmt = mysql2date('Ymd\TH:i:s', $postdata['post_date_gmt']);
-        
+
             $categories = array();
             $catids = wp_get_post_categories($post_ID);
             foreach($catids as $catid)
                 $categories[] = get_cat_name($catid);
-            
+
             $tagnames = array();
             $tags = wp_get_post_tags( $post_ID );
@@ -1646 +1646 @@
                 $tagnames = '';
             }
-            
+
             $post = get_extended($postdata['post_content']);
             $link = post_permalink($postdata['ID']);
-            
+
             // Get the author info.
             $author = get_userdata($postdata['post_author']);
-            
+
             $allow_comments = ('open' == $postdata['comment_status']) ? 1 : 0;
             $allow_pings = ('open' == $postdata['ping_status']) ? 1 : 0;
@@ -1660 +1660 @@
                 $postdata['post_status'] = 'publish';
             }
-            
+
             $resp = array(
                 'dateCreated' => new IXR_Date($post_date),
@@ -1685 +1685 @@
                 'custom_fields' => $this->get_custom_fields($post_ID)
             );
-            
+
             return $resp;
         } else {
@@ -1937 +1937 @@
 
         foreach ($posts_list as $entry) {
-            if( !current_user_can( 'edit_post', $entry['ID'] ) ) 
+            if( !current_user_can( 'edit_post', $entry['ID'] ) )
                 continue;