Changeset 252 for trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/pluggable-override.php

Timestamp:

Jun 4, 2009, 2:02:54 PM (15 years ago)

Author:

toemon

Message:

WordPressME2.0.11への対応,(ブロック周りは未完)

File:

• trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/pluggable-override.php (modified) (4 diffs)

trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/pluggable-override.php

@@ -51 +51 @@
 
         } else {
-                // WP2.7 original
+                // WP original
                 if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST )
                         return false;
@@ -58 +58 @@
                         return;
 
-                if ( ! $user = wp_validate_auth_cookie() ) {
-                         if ( empty($_COOKIE[LOGGED_IN_COOKIE]) || !$user = wp_validate_auth_cookie($_COOKIE[LOGGED_IN_COOKIE], 'logged_in') ) {
-                                wp_set_current_user(0);
-                                return false;
-                         }
-                }
-
-                wp_set_current_user($user);
+                if (function_exists('wp_validate_auth_cookie')){
+                        if ( ! $user = wp_validate_auth_cookie() ) {
+                                 if ( empty($_COOKIE[LOGGED_IN_COOKIE]) || !$user = wp_validate_auth_cookie($_COOKIE[LOGGED_IN_COOKIE], 'logged_in') ) {
+                                        wp_set_current_user(0);
+                                        return false;
+                                 }
+                        }
+                        wp_set_current_user($user);
+                } else { // for WP2.0
+                        if ( empty($_COOKIE[USER_COOKIE]) || empty($_COOKIE[PASS_COOKIE]) || 
+                                !wp_login($_COOKIE[USER_COOKIE], $_COOKIE[PASS_COOKIE], true) ) {
+                                wp_set_current_user(0);
+                                return false;
+                        }
+                        $user_login = $_COOKIE[USER_COOKIE];
+                        wp_set_current_user(0, $user_login);
+                }
         }
 }
@@ -77 +86 @@
         if(is_object($xoopsUser)){
                 $u_name = $xoopsUser->getVar("uname");
-                $u_pass_md5 = $xoopsUser->getVar("pass");       
+                $u_pass_md5 = $xoopsUser->getVar("pass");
                 if ( ! empty($u_name) && ! empty($u_pass_md5) ) {
                         include_once dirname( __FILE__ ).'/user_sync_xoops.php';
@@ -96 +105 @@
         wp_set_current_user(0);
         wp_clearcookie();
-        return 0;       
+        return 0;
 }
 endif;