Changeset 417 for trunk

Timestamp:

Oct 22, 2009, 9:54:26 PM (15 years ago)

Author:

toemon

Message:

user_sync_xoops.phpの WPMU対応 Fixed #233
wp-content/plugins/xpressme/include/user_sync_xoops.phpにおいて
get_default_capabillities()　
repair_user_meta_prefix()
ブログ毎にoptionsテーブルをもつWPMUに対応していないバグ修正

Location:

trunk/xpressme_integration_kit

Files:

• include/general_functions.php (modified) (1 diff)
• wp-content/plugins/xpressme/include/user_sync_xoops.php (modified) (3 diffs)

trunk/xpressme_integration_kit/include/general_functions.php

@@ -136 +136 @@
                                 }
                         } else { // load XPressME or not Load XOOPS
-                                $table_list = $xoops_db->get_results($sql);
+                                $rows = $xoops_db->get_results($sql, ARRAY_N);
+                                foreach ($rows as $row){
+                                        $table_list[] = $row[0];
+                                }
                         }                       
                 }

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

@@ -1 +1 @@
 <?php
-/*      
- * The default authority setting value given by a new user of WordPress
-*/
-function get_default_capabillities(){
-        global $xoops_db;
-        $db_option = get_wp_prefix() . 'options';
-        return $xoops_db->get_var("SELECT option_value FROM $db_option WHERE option_name = 'default_role'");
-}
-
 /*
  * Get The level from the capabillities name.
  */
 function get_role_level($capabillities){
-        if ($capabillities == 'default') $capabillities = get_default_capabillities();
+        if ($capabillities == 'default') $capabillities = get_option('default_role');;
         switch($capabillities) {
                 case 'administrator':
@@ -309 +300 @@
 function repair_user_meta_prefix(){
         global $xoops_db;
-
         // repair usermeta db
         $db_xpress_usermeta = get_wp_prefix() . 'usermeta';
@@ -342 +332 @@
         
         // repair option db user_roles
-        $db_wp_option = get_wp_prefix() . 'options';
-        $new_option_name = get_wp_prefix() . 'user_roles';
-        $sql = "SELECT option_id , option_name FROM $db_wp_option WHERE option_name LIKE '%_" . $wp_prefix_only . "user_roles'" ;
-        $option= $xoops_db->get_row($sql);
-        if ($option->option_name != $new_option_name){
-                $repair_sql  =  "UPDATE $db_wp_option ";
-                $repair_sql .=  'SET ';
-                $repair_sql .=  "option_name = '$new_option_name' ";
-                $repair_sql .=  "WHERE (option_id = $option->option_id )";
-                $xoops_db->query($repair_sql);
+        include_once (ABSPATH . '/include/general_functions.php');
+
+        $prefix = get_wp_prefix();
+        $option_tables = get_table_list($prefix,'options');
+        foreach( $option_tables as $option_table){
+                $mid_prefix = get_multi_mid_prefix($prefix,'options' , $option_table);
+
+                $new_option_name = $prefix .$mid_prefix . 'user_roles';
+                $sql = "SELECT option_id , option_name FROM $option_table WHERE option_name LIKE '%_user_roles'" ;
+                $option= $xoops_db->get_row($sql);
+                if ($option->option_name != $new_option_name){
+                        $repair_sql  =  "UPDATE $db_wp_option ";
+                        $repair_sql .=  'SET ';
+                        $repair_sql .=  "option_name = '$new_option_name' ";
+                        $repair_sql .=  "WHERE (option_id = $option->option_id )";
+                        $xoops_db->query($repair_sql);
+                }
         }
 }