Changeset 130 for trunk/wp-content

Timestamp:

Mar 21, 2009, 4:42:39 PM (16 years ago)

Author:

toemon

Message:

ImpressCMSのパスワードがMD5ではなくicms_encryptPass()で生成された64bitのデータの場合ログインできなくなるバグ修正
ユーザ同期時のメッセージでワーニングとなるバグ修正

Location:

trunk/wp-content/plugins/xpressme/include

Files:

• pluggable-override.php (modified) (2 diffs)
• user_sync_xoops.php (modified) (1 diff)

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

@@ -67 +67 @@
 function xpress_login(){
         global $current_user;
+        global $xoopsModule,$xoopsUser,$xoopsUserIsAdmin;
         
-        if(is_object($GLOBALS["xoopsUser"])){
-                $u_name = $GLOBALS["xoopsUser"]->getVar("uname");
-                $u_pass_md5 = $GLOBALS["xoopsUser"]->getVar("pass");    
+        if(is_object($xoopsUser)){
+                $u_name = $xoopsUser->getVar("uname");
+                $u_pass_md5 = $xoopsUser->getVar("pass");       
                 if ( ! empty($u_name) && ! empty($u_pass_md5) ) {
                         include_once dirname( __FILE__ ).'/user_sync_xoops.php';
                         repair_user_meta_prefix();  //Repair when data base prefix is changed on XOOPS side
                         $messege = '';
-                        $ret = user_sync_to_wordpress($GLOBALS["xoopsUser"]->getVar("uid"),$messege);
+                        $ret = user_sync_to_wordpress($xoopsUser->getVar("uid"),$messege);
                         if ($ret){
                                 $user = new WP_User(0, $u_name);
@@ -130 +131 @@
         global $wp_hasher;
 
+        if ($hash == $password){ // The password taken out of XOOPS is hash value.
+                return apply_filters('check_password', true, $password, $hash, $user_id);
+        }
         // If the hash is still md5...
         if ( strlen($hash) <= 32 ) {
-                if (( $hash == md5($password)) || ($hash == $password)) {  // The password taken out of XOOPS is hash value.
-                        $check = true;
-                } else {
-                        $check = false;
-                }
-
+                $check = ( $hash == md5($password) );   
 /* A new hash is not used because it differs from the hash on the XOOPS password. 
  *              if ( $check && $user_id ) {

trunk/wp-content/plugins/xpressme/include/user_sync_xoops.php

@@ -138 +138 @@
                                         $sycc_user = new WP_User($wp_user_id);
                                         $sycc_user->set_role($capabillities_name);
-                                        $message .= '...UPDATE ' . $user_login_name . '(' . $capabillities_name . ')';
+                                        $message .= '...UPDATE ' . $xoops_user->uname . '(' . $capabillities_name . ')';
 
                                 } else {
-                                        $message .= '...UPDATE ' . $user_login_name . '(Level Not Change)';
+                                        $message .= '...UPDATE ' . $xoops_user->uname . '(Level Not Change)';
                                 }
                         }else{