Index: /trunk/xpressme_integration_kit/include/add_xpress_process.php
===================================================================
--- /trunk/xpressme_integration_kit/include/add_xpress_process.php	(revision 533)
+++ /trunk/xpressme_integration_kit/include/add_xpress_process.php	(revision 534)
@@ -18,7 +18,6 @@
 		$guess_url = preg_replace('|/' . $module_name . '/.*|i', '/' . $module_name, $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
 		$blog_sub_path = '';
-		if (defined('MULTISITE') && MULTISITE){
+		if(function_exists('is_multisite') && is_multisite()){
 			if ($blog_id > 1){
-				$blog_path = '/cube_mu/modules/xpress3/toy/';
 				$blog_sub_path = '/' .$blogname;
 			}
Index: /trunk/xpressme_integration_kit/include/oninstall.php
===================================================================
--- /trunk/xpressme_integration_kit/include/oninstall.php	(revision 533)
+++ /trunk/xpressme_integration_kit/include/oninstall.php	(revision 534)
@@ -121,4 +121,5 @@
 	$views_queries ="CREATE TABLE $group_role (
   		groupid smallint(5) unsigned NOT NULL default '0',
+  		blog_id bigint(20) unsigned NOT NULL default '0',
   		name varchar(50)  NOT NULL default '' ,
   		description text  NOT NULL default '',
Index: /trunk/xpressme_integration_kit/include/onupdate.php
===================================================================
--- /trunk/xpressme_integration_kit/include/onupdate.php	(revision 533)
+++ /trunk/xpressme_integration_kit/include/onupdate.php	(revision 534)
@@ -254,8 +254,9 @@
 	}
 
+	$group_role = XOOPS_DB_PREFIX . '_' . $xp_prefix .'_group_role' ;
 	if (! enhanced_table_check($mydirname,'group_role')){
-		$group_role = XOOPS_DB_PREFIX . '_' . $xp_prefix .'_group_role' ;
 		$queries ="CREATE TABLE $group_role (
 	  		groupid smallint(5) unsigned NOT NULL default '0',
+  			blog_id bigint(20) unsigned NOT NULL default '0',
 	  		name varchar(50)  NOT NULL default '' ,
 	  		description text  NOT NULL default '',
@@ -269,4 +270,13 @@
 		$db->queryF( $sql ) ;
 		$msgs[] = "$group_role table of XPressME was made.";
+	} else {
+		if (!is_found_table_column($group_role,'blog_id')){
+			$queries ="ALTER TABLE $group_role ADD blog_id bigint(20)  AFTER groupid";
+			$db->queryF( $queries ) ;
+			$msgs[] = "$group_role  ADD blog_id .";
+		}
+		// The table is repaired.
+		$update_sql = "UPDATE $group_role SET blog_id = 1 WHERE(blog_id IS NULL OR blog_id < 1)";
+		$db->queryF( $update_sql ) ;
 	}
 	
Index: /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php	(revision 533)
+++ /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php	(revision 534)
@@ -44,5 +44,5 @@
 	global $xoops_config;
 	
-	if (defined('MULTISITE')) return MULTISITE;
+	if (function_exists('is_multisite') && is_multisite()) return true;
 	return false;
 }
@@ -50,5 +50,5 @@
 function xpress_is_multiblog_root() {
 	global $blog_id;
-	if (defined('MULTISITE') && MULTISITE && $blog_id == 1){
+	if ( xpress_is_multiblog() && $blog_id == 1){
 		return true;
 	} else {
Index: /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/user_sync_xoops.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/user_sync_xoops.php	(revision 533)
+++ /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/user_sync_xoops.php	(revision 534)
@@ -26,5 +26,4 @@
 */
 function get_xoops_group_role($uid=0){
-	$ans = array();
 	if ($uid == 0){
 		return '';
@@ -32,41 +31,124 @@
 	
 	global $xoops_db;
+	
 	$db_groups_users_link = get_xoops_prefix() . 'groups_users_link';
 	$db_group_role = get_wp_prefix() . 'group_role';
 	$db_groups = get_xoops_prefix() . 'groups';
-	
-	$sql  = "SELECT * ";
-	$sql .= "FROM $db_groups_users_link ";
-	$sql .= "LEFT JOIN $db_group_role ON $db_groups_users_link.groupid = $db_group_role.groupid ";
-	$sql .= "LEFT JOIN $db_groups ON $db_groups_users_link.groupid = $db_groups.groupid ";
-	$sql .= "WHERE  uid = $uid";
-	$user_groups = $xoops_db->get_results($sql);
-	$ans['capabillities'] = '';
-	$ans['allway_update'] = 0;
-	
-	foreach($user_groups as $user_group){
-		if ($user_group->group_type == 'Admin'){
-			$ans['capabillities'] = 'administrator';
-			if ($user_group->groupid =1){
-				//It always rewrites it as WordPress adninistrator for an initial admin group of XOOPS.	
-				$ans['allway_update'] = 1;
-			} else {
-				// admin groups other than initial admin group of XOOPS 
-				// It group rewrites group_type of the data base in Admin.
-				$ans['allway_update'] = $user_group->login_all; 
-			}
-			break;
-		}
-		$before_level = get_role_level($ans['capabillities']);
+
+	$blog_id_list = array();
+	
+	if (function_exists('is_multisite') && is_multisite()){
+		$blog_id_sql = "SELECT blog_id FROM $db_group_role GROUP BY blog_id";
+		$blog_id_list = $xoops_db->get_results($blog_id_sql);
+	} else {
+		$std = new stdClass();
+		$std->blog_id = 1;
+		$blog_id_list[] = $std;
+	}
+	
+	$ans_array = array();
+	foreach($blog_id_list as $blog_id){
+		$ans = array();
+		$sql  = "SELECT * ";
+		$sql .= "FROM $db_groups_users_link ";
+		$sql .= "LEFT JOIN $db_group_role ON $db_groups_users_link.groupid = $db_group_role.groupid ";
+		$sql .= "LEFT JOIN $db_groups ON $db_groups_users_link.groupid = $db_groups.groupid ";
+		$sql .= "WHERE  uid = $uid AND $db_group_role.blog_id = $blog_id->blog_id";
+		$user_groups = $xoops_db->get_results($sql);
 		
-		$now_level = get_role_level($user_group->role);
-		if ($now_level > $before_level){
-			$ans['capabillities'] = $user_group->role;
-			$ans['allway_update'] = $user_group->login_all;
-		}
-	}
-	return $ans;
-}
-	
+		//default value set
+		$ans['blog_id'] = $blog_id->blog_id;
+		$ans['capabillities'] = '';
+		$ans['allway_update'] = 0;
+		
+		//get maximum role
+		foreach($user_groups as $user_group){
+			if ($user_group->group_type == 'Admin'){
+				$ans['capabillities'] = 'administrator';
+				if ($user_group->groupid =1){
+					//It always rewrites it as WordPress adninistrator for an initial admin group of XOOPS.	
+					$ans['allway_update'] = 1;
+				} else {
+					// admin groups other than initial admin group of XOOPS 
+					// It group rewrites group_type of the data base in Admin.
+					$ans['allway_update'] = $user_group->login_all; 
+				}
+				break;
+			}
+			$before_level = get_role_level($ans['capabillities']);
+			
+			$now_level = get_role_level($user_group->role);
+			if ($now_level > $before_level){
+				$ans['capabillities'] = $user_group->role;
+				$ans['allway_update'] = $user_group->login_all;
+			}
+		}
+		$ans_array[] = $ans;
+	}
+	return $ans_array;
+}
+
+// for Multi Blog group_role delete
+function blog_group_role_delete($blog_id,$drop = false) {
+	global $xoops_db;
+	
+	$db_group_role = get_wp_prefix() . 'group_role';
+	if ($drop){
+		$delsql = "DELETE FROM $db_group_role WHERE blog_id = $blog_id";
+		$xoops_db->query($delsql);
+	}
+}
+
+// for Multi Blog group_role add
+function blog_group_role_add($blog_id,$uid = 0) {
+	global $xoops_db,$xpress_config;
+	$xpress_config->GroupeRoleCheck($blog_id);
+}
+
+// check user has groupe role
+function has_group_role($uid = 0) {
+	if (empty($uid)) return false;
+	$user_roles = get_xoops_group_role($uid);
+	foreach ($user_roles as $user_role){
+		if (!empty($user_role['capabillities']))
+			return true;
+	}
+	return false;
+}
+
+/*
+ * WP User ID exists is checked.. 
+*/
+function set_user_role($uid=0,$new_user = false){
+	$roles = get_xoops_group_role($uid);
+	
+	foreach($roles as $role){
+		$b_id = $role['blog_id'];
+		$capabillities_name = $role['capabillities'];
+		$allway_update = $role['allway_update'];
+		if ($allway_update || $new_user ){
+			$sycc_user = new WP_User($uid);
+			if (function_exists('is_multisite') && is_multisite()){
+				$sycc_user->for_blog($b_id);	// for Multi blog
+			}
+			// check user role is admin
+			$is_blog_admin = false;
+			$user_roles = $sycc_user->roles;
+			foreach ($user_roles as $user_role){
+				if (strcmp($user_role , 'administrator') == 0){
+					$is_blog_admin = true;
+					break;
+				}
+			}
+			if (!$is_blog_admin){	// admin not change role
+				$sycc_user->set_role($capabillities_name);
+			}
+		}
+//		$message .= '...UPDATE ' . $xoops_user->uname . '(' . $capabillities_name . ')';
+//		$message .= '...INSERT ' . $user_login_name . '(' . $capabillities_name . ')';
+	}
+
+}
+
 /*
  * Get User ID of WordPress from the login name. 
@@ -118,11 +200,10 @@
 
 	foreach($xoops_users as $xoops_user){
-		$role = get_xoops_group_role($xoops_user->uid);
-		$capabillities_name = $role['capabillities'];
-		$allway_update = $role['allway_update'];
 		
 		$wp_user_id = get_wp_user_id($xoops_user->uname) ;
-		
-		if (empty($capabillities_name)){
+
+
+		$has_role = has_group_role($xoops_user->uid);
+		if (!$has_role){
 			if ($sync_uid != 0){
 				if ($wp_user_id) {
@@ -148,4 +229,5 @@
 		
 		if ($wp_user_id){
+			$add_user =  true;
 			$wu_sql  = 	"UPDATE $db_xpress_users ";
 			$wu_sql .= 	'SET ';
@@ -159,12 +241,7 @@
 
 			$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)';
-			}
+			
+			$message .= set_user_role($wp_user_id,$add_user);
+
 			if (!check_user_meta_prefix($wp_user_id)){
 				repair_user_meta_prefix();
@@ -173,4 +250,5 @@
 			$is_update = true;
 		}else{
+			$add_user =  false;
 			if (is_used_wp_user_id($xoops_user->uid) ) { // WP User ID has already been used. 
 				$wu_sql  =	"INSERT INTO $db_xpress_users ";
@@ -192,7 +270,5 @@
 				$wp_user_id = $xoops_user->uid;
 			}
-			$sycc_user = new WP_User($wp_user_id);
-			$sycc_user->set_role($capabillities_name);						
-			$message .= '...INSERT ' . $user_login_name . '(' . $capabillities_name . ')';
+			$message .= set_user_role($wp_user_id,$add_user);
 		}
 		
Index: /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php	(revision 533)
+++ /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php	(revision 534)
@@ -96,4 +96,7 @@
 add_action('profile_update', 'user_sync_to_xoops');
 add_action('user_register', 'user_sync_to_xoops');
+add_action('delete_blog', 'blog_group_role_delete',10,2);	//at multi blog delete
+add_action('wpmu_new_blog', 'blog_group_role_add',10,2);	//at multi blog delete
+
 //require_once('../include/custom_functions.php');
 
@@ -141,5 +144,4 @@
 add_action('wpmu_new_blog','my_new_blog_template',0,1);
 
-
 function redirect_xoops_admin()
 {
@@ -193,5 +195,5 @@
 function integration_option_page()
 {
-	global $xoops_config,$xpress_config;
+	global $xoops_config,$xpress_config,$blog_id;
 	
 		$xoops_admin_url = $xoops_config->module_url . '/admin/index.php';
@@ -214,5 +216,5 @@
 		} 		
 		
-		$xpress_config->GroupeRoleCheck();
+		$xpress_config->GroupeRoleCheck($blog_id);
 		echo	'<div class="wrap">'."\n";
 		echo		'<div id="icon-options-general" class="icon32"><br /></div>'."\n";
@@ -229,5 +231,6 @@
 												xpress_is_multiblog()
 												);
-		$lock = ($xoops_config->module_url != get_bloginfo('url'));
+//		$lock = ($xoops_config->module_url != get_bloginfo('url'));
+		$lock = false;
 		echo				$xpress_config->groupe_role_option($lock);	
 		echo				$xpress_config->d3forum_option($do_message);		
Index: /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme_class.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme_class.php	(revision 533)
+++ /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme_class.php	(revision 534)
@@ -156,14 +156,17 @@
 	
 	function GroupeRoleRead() {
+ 		global $xoops_db, $blog_id;
+		
+		if (empty($blog_id)) $blog_id = 1;
+		$table = get_wp_prefix() . 'group_role';
+		
+		$sql=  "SELECT * FROM $table WHERE blog_id = $blog_id ORDER BY groupid";
+		$this->groupe_role =  $xoops_db->get_results($sql);
+	}
+
+	function GroupeRoleCheck($blog_id = 1) {
  		global $xoops_db;
 		
-		$table = get_wp_prefix() . 'group_role';
-		
-		$sql=  "SELECT * FROM $table";
-		$this->groupe_role =  $xoops_db->get_results($sql);
-	}
-
-	function GroupeRoleCheck() {
- 		global $xoops_db;
+		if (empty($blog_id)) $blog_id = 1;
 		
 		$module_id = get_xpress_modid();
@@ -173,10 +176,8 @@
 		$xoops_group_permission_table = get_xoops_prefix() . 'group_permission';
 		
-
-		
 		$sql =  "SELECT *  FROM $xoops_group_permission_table WHERE gperm_itemid = $module_id";
 		$gperms = $xoops_db->get_results($sql);
 		
-		$sql =  "SELECT * FROM $xoops_group_table WHERE group_type <> 'Anonymous'";
+		$sql =  "SELECT * FROM $xoops_group_table WHERE group_type <> 'Anonymous' ORDER BY groupid";
 		$groupes = $xoops_db->get_results($sql);
 
@@ -194,5 +195,5 @@
 		}
 		
-		$sql =  "SELECT *  FROM $group_role_table";
+		$sql =  "SELECT *  FROM $group_role_table WHERE blog_id = $blog_id";
 		$groupes_role = $xoops_db->get_results($sql);
 		
@@ -214,5 +215,5 @@
 					if ($group_type == 'module_admin') $role = 'administrator';
 					if ($group_type == 'module_inhibit') $role = '';
-					$edit_sql = "UPDATE $group_role_table SET group_type='$group_type',role='$role' WHERE groupid = $groupe->groupid";
+					$edit_sql = "UPDATE $group_role_table SET group_type='$group_type',role='$role' WHERE groupid = $groupe->groupid AND blog_id = $blog_id";
 					$found = true;
 					break;
@@ -224,10 +225,11 @@
 
 				$edit_sql  = "INSERT INTO  $group_role_table ";
-				$edit_sql .= "(groupid , name , description , group_type , role , login_all) ";
+				$edit_sql .= "(groupid , blog_id , name , description , group_type , role , login_all) ";
 				$edit_sql .= "VALUES (";
 				$edit_sql .= $groupe->groupid . ', ';
+				$edit_sql .= $blog_id . ', ';
 				$edit_sql .= "'" . $groupe->name . "' , ";
 				$edit_sql .= "'" . $groupe->description . "' , ";
-				$edit_sql .= "'" . $parmission . "' , ";
+				$edit_sql .= "'" . $group_type . "' , ";
 				$edit_sql .= "'" . $role . "' , '";
 				$edit_sql .= $login_all . "')";
@@ -252,6 +254,7 @@
 	function ReadPostData($post_data = null)
 	{
-		global $xoops_db;
-		
+		global $xoops_db, $blog_id;
+		
+		if (empty($blog_id)) $blog_id = 1;
 		foreach ( (array) $post_data as $index_key => $value ){
 			if (preg_match('/^ch_/',$index_key)){  // case ch_
@@ -322,5 +325,5 @@
 				$update_sql .= "role  = '$role' , ";
 				$update_sql .= "login_all  = $login_all ";
-				$update_sql .= "WHERE (groupid = '$groupe->groupid' )";
+				$update_sql .= "WHERE (groupid = '$groupe->groupid' AND blog_id = $blog_id)";
 				$xoops_db->query($update_sql);	
 			}