Index: trunk/extras/wp_plugin/xpressme-backup/xpressme-backup.php
===================================================================
--- trunk/extras/wp_plugin/xpressme-backup/xpressme-backup.php	(revision 675)
+++ trunk/extras/wp_plugin/xpressme-backup/xpressme-backup.php	(revision 677)
@@ -154,5 +154,5 @@
 			update_option('xpressme_backup_excs', array('revisions' => $exc_revisions, 'spam' => $exc_spam));
 			
-			$do_euc_to_utf8 = $_POST['euc_to_utf8'];
+			$do_euc_to_utf8 = $_POST['do_euc_to_utf8'];
 			$do_rename_prefix = $_POST['do_rename_prefix'];
 			$before_prefix = $_POST['before_prefix'];
@@ -162,4 +162,5 @@
 			$after_uri = $_POST['after_uri'];
 			$del_active_plugin = $_POST['del_active_plugin'];
+			$set_default_role = $_POST['set_default_role'];
 			
 			update_option('xpressme_backup_extras_option', 
@@ -171,5 +172,6 @@
 					'before_uri' => $before_uri, 
 					'after_uri' => $after_uri,
-					'del_active_plugin' => $del_active_plugin
+					'del_active_plugin' => $del_active_plugin,
+					'set_default_role' => $set_default_role
 				)
 			);
@@ -1079,5 +1081,5 @@
 	
 	function backup_menu() {
-		global $table_prefix, $wpdb;
+		global $table_prefix, $wpdb,$wp_version;
 		$feedback = '';
 		$whoops = false;
@@ -1279,11 +1281,13 @@
 			<ul>
 			<?php
+			$extras_option = (array) get_option('xpressme_backup_extras_option');
 			if(WPLANG == 'ja_EUC'){
 				echo '<li><label for="do_euc_to_utf8">';
 				if($this->is_mbstring()){
-					echo	'<input type="checkbox" name="euc_to_utf8" id="euc_to_utf8" value="1" />';
+					if ($extras_option['do_euc_to_utf8']) $checked = 'checked'; else $checked = '';
+					echo	'<input type="checkbox" name="do_euc_to_utf8" id="do_euc_to_utf8" value="1" ' .$checked .' />';
 					echo __('Converte EUC-JP to UTF-8','xpressme-backup');
 				} else {
-					echo	'<input type="checkbox" name="euc_to_utf8" id="euc_to_utf8" value="1" disabled="1"/>';
+					echo	'<input type="checkbox" name="do_euc_to_utf8" id="do_euc_to_utf8" value="0" disabled="1"/>';
 					echo __('Converte EUC-JP to UTF-8','xpressme-backup');
 					echo ' (<span style="color:#ff0000">' . __('The server used does not support the mb_convert_encoding() function.','xpressme-backup') . '</span>)';
@@ -1291,32 +1295,46 @@
 				echo '</label></li>';
 			} else {
-				echo '<input type="hidden" name="euc_to_utf8" id="euc_to_utf8" value="0" />';
-			}
+				echo '<input type="hidden" name="do_euc_to_utf8" id="do_euc_to_utf8" value="0" />';
+			}
+			if($wp_version =='2.0.11-ME'){
+				echo '<li><label for="set_default_role">';
+				if ($extras_option['set_default_role']) $checked = 'checked'; else $checked = '';
+				echo '<input type="checkbox" name="set_default_role" id="set_default_role" value="1" '.$checked . ' />';
+				echo __('Changes from the user roles name of WordPressME to the user roles name of Wordpress.','xpressme-backup');
+				echo '</label></li>';
+			} else {
+				echo '<input type="hidden" name="set_default_role" id="set_default_role" value="0" />';
+			}
+			
+			echo '<li><label for="rename_prefix">';
+				if ($extras_option['do_rename_prefix']) $checked = 'checked'; else $checked = '';
+				echo '<input type="checkbox" name="do_rename_prefix" id="do_rename_prefix" value="1" '. $checked . ' />';
+				echo __('Rename DB Prefix','xpressme-backup');
+				echo '<input type="text" name="before_prefix" size="20" value="'.$table_prefix . '" readonly />';
+				echo __('to','xpressme-backup');
+				if (empty($extras_option['after_prefix'])){
+					echo '<input type="text" name="after_prefix" size="20" value="'. $table_prefix . '" />';
+				} else {
+					echo '<input type="text" name="after_prefix" size="20" value="'. $extras_option['after_prefix'] . '" />';
+				}
+			echo '</label></li>';
+			echo '<li><label for="change_uri">';
+				if ($extras_option['do_change_uri']) $checked = 'checked'; else $checked = '';
+				echo '<input type="checkbox" name="do_change_uri" id="do_change_uri" value="1" '. $checked . ' />';
+				$site_uri = get_option('siteurl');
+				echo __('Change URL','xpressme-backup');
+				echo '<div style="padding-left: 20px;">';
+				echo '<input type="text" name="before_uri" size="50" value="' . $site_uri . '" readonly /><br />';
+				echo __('to','xpressme-backup') . '<br />';
+				echo '<input type="text" name="after_uri" size="50" value="'. $extras_option['after_uri'] . '" />';
+				echo '</div>';
+			echo '</label></li>';
+			echo '<li><label for="del_active_plugin">';
+				if ($extras_option['del_active_plugin']) $checked = 'checked'; else $checked = '';
+
+				echo '<input type="checkbox" name="del_active_plugin" id="del_active_plugin" value="1" '. $checked . ' />';
+				echo __('In the backup data,all plug-ins are Deactivate state.','xpressme-backup');
+			echo '</label></li>';
 			?>
-			<li><label for="rename_prefix">
-				<input type="checkbox" name="do_rename_prefix" id="do_rename_prefix" value="1" />
-				<?php _e('Rename DB Prefix','xpressme-backup'); ?> 
-				<input type="text" name="before_prefix" size="20" value="<?php echo $table_prefix; ?>" />
-				<?php _e('to','xpressme-backup'); ?>
-				<input type="text" name="after_prefix" size="20" value="<?php echo $table_prefix; ?>" />
-			</label></li>
-			<li><label for="change_uri">
-				<input type="checkbox" name="do_change_uri" id="do_change_uri" value="1" />
-				<?php $site_uri = get_option('siteurl');?>
-				<?php _e('Change URL','xpressme-backup'); ?> 
-				<div style="padding-left: 20px;">
-				<input type="text" name="before_uri" size="50" value="<?php echo $site_uri; ?>" /><br />
-				<?php _e('to','xpressme-backup'); ?><br />
-				<input type="text" name="after_uri" size="50" value="<?php echo $site_uri; ?>" />
-				</div>
-			</label></li>
-			<li><label for="set_default_role">
-				<input type="checkbox" name="set_default_role" id="set_default_role" value="1" />
-				<?php _e('user_role is corrected to upgrade.','xpressme-backup'); ?> 
-			</label></li>
-			<li><label for="del_active_plugin">
-				<input type="checkbox" name="del_active_plugin" id="del_active_plugin" value="1" />
-				<?php _e('In the backup data,all plug-ins are Deactivate state.','xpressme-backup'); ?> 
-			</label></li>
 			</ul>
 
@@ -1522,4 +1540,6 @@
 	function extras_filter($query_line){
 		$extras_option = get_option('xpressme_backup_extras_option');
+		
+		// Change EUC to UTF-8
 		if ($extras_option['do_euc_to_utf8'] && $this->is_mbstring()){
 			$query_line = mb_convert_encoding(mb_convert_encoding($query_line,"sjis-win","EUC-JP"),"UTF-8","sjis-win");
@@ -1553,5 +1573,4 @@
 				
 						$src = '/' . $org . '/';
-//						$dist = '*************************************s:' . $num . '->' . $volm . '"' . $str . '"';
 						$dist = 's:'. $volm . ':"' . $str . '";';
 						if(preg_match($src,$query_line)){
@@ -1568,4 +1587,6 @@
 			}
 		}
+		
+		// Change Data Prefix
 		if ($extras_option['do_rename_prefix']){
 			if (!empty($extras_option['before_prefix']) && !empty($extras_option['after_prefix'])){
@@ -1577,4 +1598,27 @@
 			}
 		}
+		
+		// Change User_Role_Name(WordPressME to Wordpress)
+		if ($extras_option['set_default_role']){
+			$src = '/' . "(INSERT INTO `.+_options` VALUES \([0-9]+, [0-9]+, '.+_user_roles', 'Y', [0-9]+, ')(a:.+}}})('.+\);)" . '/';
+			if(preg_match($src,$query_line)){
+				$patterns = array();
+				$patterns[0] = '/s:[0-9]+:"[^"]+ - \(Administrator\)"/';
+				$patterns[1] = '/s:[0-9]+:"[^"]+ - \(Editor\)"/';
+				$patterns[2] = '/s:[0-9]+:"[^"]+ - \(Author\)"/';
+				$patterns[3] = '/s:[0-9]+:"[^"]+ - \(Contributor\)"/';
+				$patterns[4] = '/s:[0-9]+:"[^"]+ - \(Subscriber\)"/';
+				$replacements = array();
+				$replacements[0] = 's:13:"Administrator"';
+				$replacements[1] = 's:6:"Editor"';
+				$replacements[2] = 's:6:"Author"';
+				$replacements[3] = 's:11:"Contributor"';
+				$replacements[4] = 's:10:"Subscriber"';
+				$ans = preg_replace($patterns,$replacements,$query_line);
+				if (!empty($ans)) $query_line = $ans;
+			}
+		}
+		
+		// Change URI Clear
 		if ($extras_option['do_change_uri']){
 			if (!empty($extras_option['before_uri']) && !empty($extras_option['after_uri'])){
@@ -1585,8 +1629,10 @@
 				if(preg_match($src,$query_line)){
 					$query_line = preg_replace($src,$dist,$query_line);
-				}
-			}
-		}
-		
+					
+				}
+			}
+		}
+		
+		// Active Plugin Clear
 		if ($extras_option['del_active_plugin']){
 				$src = '/' . "(INSERT INTO `.+_options` VALUES \([0-9]+, [0-9]+, 'active_plugins', 'Y', [0-9]+, ')(a:.+})('.+\);)" . '/';
@@ -1599,4 +1645,15 @@
 				}			
 		}
+		
+		// XPressME Buckup Option Data Clear
+		$src = '/' . "INSERT INTO `.+_options` VALUES \([0-9]+, [0-9]+, 'xpressme_backup_excs'" . '/';
+		if(preg_match($src,$query_line)){
+			$query_line = "\n# Skip XPressME Buckup 'xpressme_backup_excs' Option Data\n";
+		}
+		$src = '/' . "INSERT INTO `.+_options` VALUES \([0-9]+, [0-9]+, 'xpressme_backup_extras_option'" . '/';
+		if(preg_match($src,$query_line)){
+			$query_line = "\n# Skip XPressME Buckup 'xpressme_backup_extras_option' Option Data\n";
+		}
+
 		return $query_line;