Changeset 20636

Timestamp:

04/28/2012 09:25:25 PM (12 years ago)

Author:

nacin

Message:

Introduce minimum_args() method in XML-RPC and leverage it to return errors for insufficient arguments for methods that are new in 3.4.

props maxcutler, markoheijnen.
fixes #20394.

File:

• trunk/wp-includes/class-wp-xmlrpc-server.php (modified) (15 diffs)

trunk/wp-includes/class-wp-xmlrpc-server.php

@@ -491 +491 @@
     }
 
+    /**
+     * Checks if the method received at least the minimum number of arguments.
+     *
+     * @since 3.4
+     *
+     * @param string|array $args Sanitize single string or array of strings.
+     * @param int $count Minimum number of arguments.
+     * @return boolean if $args contains at least $count arguments.
+     */
+    protected function minimum_args( $args, $count ) {
+        if ( count( $args ) < $count ) {
+            $this->error = new IXR_Error( 400, __( 'Insufficient arguments passed to this XML-RPC method.' ) );
+            return false;
+        }
+
+        return true;
+    }
+
     /**
      * Prepares taxonomy data for return in an XML-RPC object.
@@ -767 +785 @@
      */
     function wp_newPost( $args ) {
+        if ( ! $this->minimum_args( $args, 4 ) )
+            return $this->error;
+
         $this->escape( $args );
 
@@ -1039 +1060 @@
      */
     function wp_editPost( $args ) {
+        if ( ! $this->minimum_args( $args, 5 ) )
+            return $this->error;
+
         $this->escape( $args );
 
@@ -1091 +1115 @@
      */
     function wp_deletePost( $args ) {
+        if ( ! $this->minimum_args( $args, 4 ) )
+            return $this->error;
+
         $this->escape( $args );
 
@@ -1164 +1191 @@
      */
     function wp_getPost( $args ) {
+        if ( ! $this->minimum_args( $args, 4 ) )
+            return $this->error;
+
         $this->escape( $args );
 
@@ -1218 +1248 @@
      */
     function wp_getPosts( $args ) {
+        if ( ! $this->minimum_args( $args, 3 ) )
+            return $this->error;
+
         $this->escape( $args );
 
@@ -1304 +1337 @@
      */
     function wp_newTerm( $args ) {
+        if ( ! $this->minimum_args( $args, 4 ) )
+            return $this->error;
+
         $this->escape( $args );
 
@@ -1388 +1424 @@
      */
     function wp_editTerm( $args ) {
+        if ( ! $this->minimum_args( $args, 5 ) )
+            return $this->error;
+
         $this->escape( $args );
 
@@ -1477 +1516 @@
      */
     function wp_deleteTerm( $args ) {
+        if ( ! $this->minimum_args( $args, 5 ) )
+            return $this->error;
+
         $this->escape( $args );
 
@@ -1541 +1583 @@
      */
     function wp_getTerm( $args ) {
+        if ( ! $this->minimum_args( $args, 5 ) )
+            return $this->error;
+
         $this->escape( $args );
 
@@ -1591 +1636 @@
      */
     function wp_getTerms( $args ) {
+        if ( ! $this->minimum_args( $args, 4 ) )
+            return $this->error;
+
         $this->escape( $args );
 
@@ -1663 +1711 @@
      */
     function wp_getTaxonomy( $args ) {
+        if ( ! $this->minimum_args( $args, 4 ) )
+            return $this->error;
+
         $this->escape( $args );
 
@@ -1704 +1755 @@
      */
     function wp_getTaxonomies( $args ) {
+        if ( ! $this->minimum_args( $args, 3 ) )
+            return $this->error;
+
         $this->escape( $args );
 
@@ -3010 +3064 @@
      */
     function wp_getPostType( $args ) {
+        if ( ! $this->minimum_args( $args, 4 ) )
+            return $this->error;
+
         $this->escape( $args );
 
@@ -3053 +3110 @@
      */
     function wp_getPostTypes( $args ) {
+        if ( ! $this->minimum_args( $args, 3 ) )
+            return $this->error;
+
         $this->escape( $args );