Changeset 757 for branches/Ver3.0/xpressme_integration_kit/wp-content/plugins/xpressme/include/pluggable-override.php

Timestamp:

May 23, 2011, 3:03:57 PM (14 years ago)

Author:

toemon

Message:

ConfigFromXoopsクラスを廃止し、modInfoクラスを使用するように変更
WP2.2以下で使用するテンプレートold_templateの廃止

File:

• branches/Ver3.0/xpressme_integration_kit/wp-content/plugins/xpressme/include/pluggable-override.php (modified) (3 diffs)

branches/Ver3.0/xpressme_integration_kit/wp-content/plugins/xpressme/include/pluggable-override.php

@@ -160 +160 @@
 function wp_check_password($password, $hash, $user_id = '') {
         global $wp_hasher;
-        global $xoops_config,$xoops_db;
+        global $modInfo,$wpConfigInfo,$xoops_db;
 
         // For attestation when password has been sent as hash value. (When having logged it in from Xoops and ImpressCMS)
@@ -174 +174 @@
         
         // Password authentication for ImpressCMS 
-        if($xoops_config->is_impress && function_exists('hash')){
-                $mainSalt = $xoops_config->xoops_db_salt;
+        if($modInfo->is_impress_cms() && function_exists('hash')){
+                $mainSalt = $wpConfigInfo->get_db_salt();
                 // get user salt
-                $xpress_user_db = $xoops_config->module_db_prefix . 'users';
-                $xoops_user_db = $xoops_config->xoops_db_prefix . '_users';
+                $xpress_user_db = $wpConfigInfo->get_db_prefix() . 'users';
+                $xoops_user_db = $wpConfigInfo->get_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'");
@@ -236 +236 @@
 if ( !function_exists('wp_redirect') ) :
 function wp_redirect($location, $status = 302) {
-        global $is_IIS,$xoops_config,$action;
+        global $is_IIS,$modInfo,$action;
         
-        if ($location == 'wp-login.php?loggedout=true') $location = $xoops_config->xoops_url.'/user.php?op=logout'; //xoops logout at wp logout
-        if ($location == 'wp-login.php?action=register') $location = $xoops_config->xoops_url."/register.php";  //wp-register to xoops register
-        if ($action == 'logout') $location = $xoops_config->xoops_url.'/user.php?op=logout'; //xoops logout at comment logout
+        if ($location == 'wp-login.php?loggedout=true') $location = $modInfo->get_xoops_url().'/user.php?op=logout'; //xoops logout at wp logout
+        if ($location == 'wp-login.php?action=register') $location = $modInfo->get_xoops_url()."/register.php";  //wp-register to xoops register
+        if ($action == 'logout') $location = $modInfo->get_xoops_url().'/user.php?op=logout'; //xoops logout at comment logout
 
         $location = apply_filters('wp_redirect', $location, $status);