Changes from trunk/wp-app.php at r8267 to branches/2.6/wp-app.php at r8399

File:

• branches/2.6/wp-app.php (modified) (5 diffs)

branches/2.6/wp-app.php

@@ -207 +207 @@
                                 // authenticate regardless of the operation and set the current
                                 // user. each handler will decide if auth is required or not.
-                                $this->authenticate();
-                                $u = wp_get_current_user();
-                                if(!isset($u) || $u->ID == 0) {
+                                if(!$this->authenticate()) {
                                         if ($always_authenticate) {
                                                 $this->auth_required('Credentials required.');
@@ -395 +393 @@
 
                 $publish = (isset($parsed->draft) && trim($parsed->draft) == 'yes') ? false : true;
+                $post_status = ($publish) ? 'publish' : 'draft';
 
                 extract($entry);
@@ -407 +406 @@
                 $post_modified = $pubtimes[0];
                 $post_modified_gmt = $pubtimes[1];
-
-                // let's not go backwards and make something draft again.
-                if(!$publish && $post_status == 'draft') {
-                        $post_status = ($publish) ? 'publish' : 'draft';
-                } elseif($publish) {
-                        $post_status = 'publish';
-                }
 
                 $postdata = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'post_date', 'post_date_gmt', 'post_modified', 'post_modified_gmt');
@@ -1071 +1063 @@
          */
         function authenticate() {
-                $login_data = array();
-                $already_md5 = false;
-
                 log_app("authenticate()",print_r($_ENV, true));
 
@@ -1085 +1074 @@
                 // If Basic Auth is working...
                 if(isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
-                        $login_data = array('login' => $_SERVER['PHP_AUTH_USER'],       'password' => $_SERVER['PHP_AUTH_PW']);
-                        log_app("Basic Auth",$login_data['login']);
-                } else {
-                        // else, do cookie-based authentication
-                        if (function_exists('wp_get_cookie_login')) {
-                                $login_data = wp_get_cookie_login();
-                                $already_md5 = true;
+                        log_app("Basic Auth",$_SERVER['PHP_AUTH_USER']);
+                        $user = wp_authenticate($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']);
+                        if ( $user && !is_wp_error($user) ) {
+                                wp_set_current_user($user->ID);
+                                log_app("authenticate()", $_SERVER['PHP_AUTH_USER']);
+                                return true;
                         }
                 }
 
-                // call wp_login and set current user
-                if (!empty($login_data) && wp_login($login_data['login'], $login_data['password'], $already_md5)) {
-                         $current_user = new WP_User(0, $login_data['login']);
-                         wp_set_current_user($current_user->ID);
-                        log_app("authenticate()",$login_data['login']);
-                }
+                return false;
         }