Index: trunk/wp-content/plugins/xpressme/include/pluggable-override.php
===================================================================
--- trunk/wp-content/plugins/xpressme/include/pluggable-override.php	(revision 225)
+++ trunk/wp-content/plugins/xpressme/include/pluggable-override.php	(revision 230)
@@ -91,8 +91,9 @@
 					return  true;
 				}
-			}
+			}			
 		}
 	}
 	wp_set_current_user(0);
+	wp_clearcookie();
 	return 0;	
 }
Index: trunk/wp-content/plugins/xpressme/include/user_sync_xoops.php
===================================================================
--- trunk/wp-content/plugins/xpressme/include/user_sync_xoops.php	(revision 225)
+++ trunk/wp-content/plugins/xpressme/include/user_sync_xoops.php	(revision 230)
@@ -100,4 +100,5 @@
 
 	$xoops_users = $xoops_db->get_results($xu_sql);
+	
 	if (empty($xoops_users)){
 		$message .= '...ERR ('. $xu_sql . ')';
@@ -109,77 +110,88 @@
 		$capabillities_name = $role['capabillities'];
 		$allway_update = $role['allway_update'];
+		
+		$wp_user_id = get_wp_user_id($xoops_user->uname) ;
+		
 		if (empty($capabillities_name)){
+			if ($sync_uid != 0){
+				if ($wp_user_id) {
+					if ($allway_update){
+						$message .= '...NOT XPRESS USER ' . $xoops_user->uname;
+						return false;
+					}
+				} else {
+					$message .= '...NOT XPRESS USER ' . $xoops_user->uname;
+					return false;
+				}
+			} else {
 				$message .= "...PASS '" . $xoops_user->uname ."'[uid=".$xoops_user->uid ."](not xpress user)";
-			if ($sync_uid != 0){
-				$message .= '...NOT XPRESS USER ' . $xoops_user->uname;
-				return false;
-			}
-		} else {
-			$user_regist_time = date('Y-m-d H:i:s' , $xoops_user->user_regdate);
-			$user_status = 0;
-			$user_display_name =empty($xoops_user->name) ? $xoops_user->uname :$xoops_user->name ;
-
-			$is_update = false;
-			
-			$wp_user_id = get_wp_user_id($xoops_user->uname) ;
-			if ($wp_user_id){
-				$wu_sql  = 	"UPDATE $db_xpress_users ";
-				$wu_sql .= 	'SET ';
-				$wu_sql .=		"user_pass  = '$xoops_user->pass', ";
-				$wu_sql .=		"user_email = '$xoops_user->email', ";
-				$wu_sql .=		"user_url = '$xoops_user->url', ";
-				$wu_sql .=		"user_nicename = '$xoops_user->uname', ";
-				$wu_sql .=		"user_registered = '$user_regist_time', ";
-				$wu_sql .=		"user_status = 0 ";
-				$wu_sql .=	"WHERE (user_login = '$xoops_user->uname' )";
-
-				$xoops_db->query($wu_sql);
-				if ($allway_update){
-					$sycc_user = new WP_User($wp_user_id);
-					$sycc_user->set_role($capabillities_name);
-					$message .= '...UPDATE ' . $xoops_user->uname . '(' . $capabillities_name . ')';
-
-				} else {
-					$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 ";
-				$wu_sql .=  	"(user_login , user_pass ,user_email , user_url , user_nicename " ;
-				$wu_sql .=		" , user_registered , user_status , display_name) ";
-				$wu_sql .=	"VALUES ";
-				$wu_sql .=		"('$xoops_user->uname', '$xoops_user->pass', '$xoops_user->email', '$xoops_user->url', '$xoops_user->uname' ";
-				$wu_sql .=		" , '$user_regist_time', $user_status, '$user_display_name')";
-				$xoops_db->query($wu_sql);
+				continue;
+			}
+		}
+
+		$user_regist_time = date('Y-m-d H:i:s' , $xoops_user->user_regdate);
+		$user_status = 0;
+		$user_display_name =empty($xoops_user->name) ? $xoops_user->uname :$xoops_user->name ;
+
+		$is_update = false;
+		
+		if ($wp_user_id){
+			$wu_sql  = 	"UPDATE $db_xpress_users ";
+			$wu_sql .= 	'SET ';
+			$wu_sql .=		"user_pass  = '$xoops_user->pass', ";
+			$wu_sql .=		"user_email = '$xoops_user->email', ";
+			$wu_sql .=		"user_url = '$xoops_user->url', ";
+			$wu_sql .=		"user_nicename = '$xoops_user->uname', ";
+			$wu_sql .=		"user_registered = '$user_regist_time', ";
+			$wu_sql .=		"user_status = 0 ";
+			$wu_sql .=	"WHERE (user_login = '$xoops_user->uname' )";
+
+			$xoops_db->query($wu_sql);
+			if ($allway_update){
+				$sycc_user = new WP_User($wp_user_id);
+				$sycc_user->set_role($capabillities_name);
+				$message .= '...UPDATE ' . $xoops_user->uname . '(' . $capabillities_name . ')';
+
+			} else {
+				$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 ";
+			$wu_sql .=  	"(user_login , user_pass ,user_email , user_url , user_nicename " ;
+			$wu_sql .=		" , user_registered , user_status , display_name) ";
+			$wu_sql .=	"VALUES ";
+			$wu_sql .=		"('$xoops_user->uname', '$xoops_user->pass', '$xoops_user->email', '$xoops_user->url', '$xoops_user->uname' ";
+			$wu_sql .=		" , '$user_regist_time', $user_status, '$user_display_name')";
+			$xoops_db->query($wu_sql);
 //					$wp_user_id = get_wp_user_id($user_login_name) ;					
-				$wp_user_id = mysql_insert_id();
-				$sycc_user = new WP_User($wp_user_id);
-				$sycc_user->set_role($capabillities_name);						
-				$message .= '...INSERT ' . $user_login_name . '(' . $capabillities_name . ')';
-			}
-			
-			$user_nickname =	empty($xoops_user->name) ? $xoops_user->uname :$xoops_user->name ;
-			$user_rich_editing = 'true';
-			$user_first_name = 	$xoops_user->uname;
-			$user_last_name = 	'';
-			$user_description = '';
-			$user_jabber = 		'';
-
-			update_usermeta( $wp_user_id,'nickname',$user_nickname);
-			update_usermeta( $wp_user_id,'first_name',$user_first_name);
-			update_usermeta( $wp_user_id,'last_name',$user_last_name);
-			update_usermeta( $wp_user_id,'description',$user_description);
-			update_usermeta( $wp_user_id,'jabber',$user_jabber);
-			update_usermeta( $wp_user_id,'aim',$xoops_user->user_aim);
-			update_usermeta( $wp_user_id,'yim',$xoops_user->user_yim);
-			if ($is_update === false ) {
-				update_usermeta( $wp_user_id,'rich_editing',$user_rich_editing);
-			} 
+			$wp_user_id = mysql_insert_id();
+			$sycc_user = new WP_User($wp_user_id);
+			$sycc_user->set_role($capabillities_name);						
+			$message .= '...INSERT ' . $user_login_name . '(' . $capabillities_name . ')';
+		}
+		
+		$user_nickname =	empty($xoops_user->name) ? $xoops_user->uname :$xoops_user->name ;
+		$user_rich_editing = 'true';
+		$user_first_name = 	$xoops_user->uname;
+		$user_last_name = 	'';
+		$user_description = '';
+		$user_jabber = 		'';
+
+		update_usermeta( $wp_user_id,'nickname',$user_nickname);
+		update_usermeta( $wp_user_id,'first_name',$user_first_name);
+		update_usermeta( $wp_user_id,'last_name',$user_last_name);
+		update_usermeta( $wp_user_id,'description',$user_description);
+		update_usermeta( $wp_user_id,'jabber',$user_jabber);
+		update_usermeta( $wp_user_id,'aim',$xoops_user->user_aim);
+		update_usermeta( $wp_user_id,'yim',$xoops_user->user_yim);
+		if ($is_update === false ) {
+			update_usermeta( $wp_user_id,'rich_editing',$user_rich_editing);
+		} 
 					
-		}
 	}
 	$message .= "...END";