Changeset 175 for trunk

Timestamp:

Apr 11, 2009, 1:17:59 PM (16 years ago)

Author:

toemon

Message:

Bump Ver 0.32 #104 Prefix変更時のメタ情報自動修正の実装　
備考　
Prefixが変更されると、メタ情報からユーザレベルが取得できなくなるので、ユーザー権限がなくなってしまいます。
メタ情報自動修正は最初のアクセスで修正されるので、最初のアクセス時はまだ修正済みメタ情報が有効にならない場合がありますが
2回目のアクセス（ページ更新など）以降から、修正済みメタ情報が有効になります。

Location:

trunk

Files:

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

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

@@ -38 +38 @@
                 if (check_xpress_auth_cookie()){        //The cookie is login user's or it checks it
                         if ( $user = wp_validate_auth_cookie() ) {
+                                if (!check_user_meta_prefix($user)){
+                                        repair_user_meta_prefix();
+                                }
+
                                 wp_set_current_user($user);
                                 return ;

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

@@ -143 +143 @@
                                         $message .= '...UPDATE ' . $xoops_user->uname . '(Level Not Change)';
                                 }
+                                if (!check_user_meta_prefix($wp_user_id)){
+                                        repair_user_meta_prefix();
+                                }
+
+                                $is_update = true;
                         }else{
                                 $wu_sql  =      "INSERT INTO $db_xpress_users ";
@@ -174 +179 @@
                         if ($is_update === false ) {
                                 update_usermeta( $wp_user_id,'rich_editing',$user_rich_editing);
-                        }                       
+                        } 
+                                        
                 }
         }
@@ -242 +248 @@
  * and  user_roles option_name pre-fix of the option table of WordPress is not changed.
 */
+function check_user_meta_prefix($uid){
+        global $xoops_db;
+        $db_xpress_usermeta = get_wp_prefix() . 'usermeta';
+        $user_meta_prefix = get_wp_prefix();
+
+        $sql = "SELECT * FROM $db_xpress_usermeta WHERE user_id = $uid AND meta_key = '" . $user_meta_prefix ."user_level'" ;
+
+        $user_level = $xoops_db->get_results($sql);
+        if (empty($user_level)) return false ;
+
+        $sql = "SELECT * FROM $db_xpress_usermeta WHERE user_id = $uid AND meta_key = '" . $user_meta_prefix ."capabilities'" ;
+        $capabilities = $xoops_db->get_results($sql);
+        if (empty($capabilities)) return false ;
+        
+        return true;    
+}
+
 function repair_user_meta_prefix(){
         global $xoops_db;

trunk/xoops_version.php

@@ -31 +31 @@
 $modversion['name'] = ucfirst($mydirname) . ' ' . constant('_MI_XPRESS_NAME') ;
 $modversion['description'] = constant( '_MI_XPRESS_DESC');
-$modversion['version'] = "0.31";
+$modversion['version'] = "0.32";
 $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'] = "r172";
+$modversion['codename'] = "r175";
 
 // onInstall, onUpdate, onUninstall