Changeset 131

Timestamp:

Mar 21, 2009, 8:11:42 PM (16 years ago)

Author:

toemon

Message:

ImpressCMSのパスワードHash対応　#75 bump Ver0.13

Location:

trunk

Files:

• wp-content/plugins/xpressme/include/pluggable-override.php (modified) (1 diff)
• xoops_version.php (modified) (2 diffs)

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

@@ -130 +130 @@
 function wp_check_password($password, $hash, $user_id = '') {
         global $wp_hasher;
-
-        if ($hash == $password){ // The password taken out of XOOPS is hash value.
+        global $xoops_config,$xoops_db;
+
+        // For attestation when password has been sent as hash value. (When having logged it in from Xoops and ImpressCMS)
+        if ($hash == $password){ 
                 return apply_filters('check_password', true, $password, $hash, $user_id);
         }
+        
+        // Password authentication for Xoops 
+        if ( strlen($hash) <= 32 ) {
+                $check = ( $hash == md5($password) );
+                return apply_filters('check_password', $check, $password, $hash, $user_id);     
+        }
+        
+        // Password authentication for ImpressCMS 
+        if($xoops_config->is_impress && function_exists('hash')){
+                $mainSalt = $xoops_config->xoops_db_salt;
+                // get user salt
+                $xpress_user_db = $xoops_config->module_db_prefix . 'users';
+                $xoops_user_db = $xoops_config->xoops_db_prefix . '_users';
+                $login_name = $xoops_db->get_var("SELECT user_login FROM $xpress_user_db WHERE ID = $user_id");
+                $user_salt = $xoops_db->get_var("SELECT salt FROM $xoops_user_db WHERE uname = '$login_name'");
+                // Make Impress hash 
+                $impress_hash = hash('sha256', $user_salt.md5($password).$mainSalt);
+                if ($hash == $impress_hash){
+                        return apply_filters('check_password', true, $password, $hash, $user_id);
+                }
+        }       
+
         // If the hash is still md5...
         if ( strlen($hash) <= 32 ) {

trunk/xoops_version.php

@@ -31 +31 @@
 $modversion['name'] = ucfirst($mydirname) . ' ' . constant('_MI_XPRESS_NAME') ;
 $modversion['description'] = constant( '_MI_XPRESS_DESC');
-$modversion['version'] = "0.12";
+$modversion['version'] = "0.13";
 $modversion['credits'] = "Wordpress DEV (http://wordpress.org/) XPressME DEV Toemon) (http://www.toemon.com) ;";
 $modversion['author'] = "toemon (http://www.toemon.com)";
@@ -40 +40 @@
 
 // status
-$modversion['codename'] = "r128";
+$modversion['codename'] = "r131";
 
 // onInstall, onUpdate, onUninstall