Changeset 8242 for branches/crazyhorse/xmlrpc.php

Timestamp:

07/02/2008 11:07:56 PM (18 years ago)

Author:

mdawaffe

Message:

crazyhorse: merge with log:trunk@8151:8240

File:

• branches/crazyhorse/xmlrpc.php (modified) (11 diffs)

branches/crazyhorse/xmlrpc.php

@@ -40 +40 @@
     <homePageLink><?php bloginfo_rss('url') ?></homePageLink>
     <apis>
-    <?php if ( get_option('enable_xmlrpc') ) :?>
       <api name="WordPress" blogID="1" preferred="true" apiLink="<?php bloginfo_rss('wpurl') ?>/xmlrpc.php" />
       <api name="Movable Type" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('wpurl') ?>/xmlrpc.php" />
       <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" />
-    <?php endif; if ( get_option('enable_app') ) :?>
       <api name="Atom" blogID="" preferred="false" apiLink="<?php echo apply_filters('atom_service_url', (get_bloginfo('url')."/wp-app.php/service"))?>" />
-    <?php endif; ?>
     </apis>
   </service>
@@ -112 +109 @@
 
         function wp_xmlrpc_server() {
-                $xmlrpc_methods = array(
+                $this->methods = array(
                         // WordPress API
                         'wp.getUsersBlogs'              => 'this:wp_getUsersBlogs',
@@ -168 +165 @@
                         'mt.supportedTextFilters' => 'this:mt_supportedTextFilters',
                         'mt.getTrackbackPings' => 'this:mt_getTrackbackPings',
-                        'mt.publishPost' => 'this:mt_publishPost'
-                );
-                
-                $xmlrpc_functions = array (
+                        'mt.publishPost' => 'this:mt_publishPost',
+
                         // PingBack
                         'pingback.ping' => 'this:pingback_ping',
@@ -180 +175 @@
                 );
 
-                if ( get_option('enable_xmlrpc') )
-                {
-                        $this->methods = array_merge($xmlrpc_methods,$xmlrpc_functions);
-                } else {
-                        $this->methods = $xmlrpc_functions;
-                }
-                
                 $this->initialise_blog_option_info( );
                 $this->methods = apply_filters('xmlrpc_methods', $this->methods);
@@ -203 +191 @@
 
         function login_pass_ok($user_login, $user_pass) {
+                if ( !get_option( 'enable_xmlrpc' ) ) {
+                        $this->error = new IXR_Error( 405, sprintf( __( 'XML-RPC services are disabled on this blog.  An admin user can enable them at %s'),  admin_url('options-writing.php') ) );
+                        return false;
+                }
+
                 if (!user_pass_ok($user_login, $user_pass)) {
                         $this->error = new IXR_Error(403, __('Bad login/pass combination.'));
@@ -846 +839 @@
 
                 if( !$this->login_pass_ok( $username, $password ) ) {
-                        return new IXR_Error( 403, __( 'Bad login/pass combination.' ) );
+                        return $this->error;
                 }
 
@@ -874 +867 @@
 
                 if( !$this->login_pass_ok( $username, $password ) ) {
-                        return new IXR_Error( 403, __( 'Bad login/pass combination.' ) );
+                        return $this->error;
                 }
 
@@ -896 +889 @@
 
                 if( !$this->login_pass_ok( $username, $password ) ) {
-                        return new IXR_Error( 403, __( 'Bad login/pass combination.' ) );
+                        return $this->error;
                 }
 
@@ -917 +910 @@
 
                 if( !$this->login_pass_ok( $username, $password ) ) {
-                        return new IXR_Error( 403, __( 'Bad login/pass combination.' ) );
+                        return $this->error;
                 }
 
@@ -940 +933 @@
 
                 if( !$this->login_pass_ok( $username, $password ) )
-                        return new IXR_Error( 403, __( 'Bad login/pass combination.' ) );
+                        return $this->error;
 
                 $user = set_current_user( 0, $username );
@@ -979 +972 @@
 
                 if( !$this->login_pass_ok( $username, $password ) )
-                        return new IXR_Error( 403, __( 'Bad login/pass combination.' ) );
+                        return $this->error;
 
                 $user = set_current_user( 0, $username );