Index: trunk/extras/wp_plugin/xpressme-backup/xpressme-backup.php
===================================================================
--- trunk/extras/wp_plugin/xpressme-backup/xpressme-backup.php	(revision 666)
+++ trunk/extras/wp_plugin/xpressme-backup/xpressme-backup.php	(revision 673)
@@ -6,5 +6,5 @@
 Author: toemon 
 Author URI: http://ja.xpressme.info
-Version: 1.0
+Version: 1.2
 
 Originally modified from Austin Matzko's WordPress Database Backup(http://www.ilfilosofo.com/blog/wp-db-backup) plugin.
@@ -161,5 +161,7 @@
 			$before_uri = $_POST['before_uri'];
 			$after_uri = $_POST['after_uri'];
-
+			$set_default_role = $_POST['set_default_role'];
+			$del_active_plugin = $_POST['del_active_plugin'];
+			
 			update_option('xpressme_backup_extras_option', 
 				array('do_euc_to_utf8' => $do_euc_to_utf8, 
@@ -169,5 +171,7 @@
 					'do_change_uri' => $do_change_uri, 
 					'before_uri' => $before_uri, 
-					'after_uri' => $after_uri
+					'after_uri' => $after_uri,
+					'set_default_role' => $set_default_role,
+					'del_active_plugin' => $del_active_plugin
 				)
 			);
@@ -1274,5 +1278,5 @@
 			</label></li>
 			</ul>
-			<p><?php  _e('Backup Ditaile Options','xpressme-backup'); ?></p>
+			<p><?php  _e('Data conversion option.','xpressme-backup'); ?></p>
 			<ul>
 			<?php
@@ -1309,5 +1313,14 @@
 				</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>
+
 			<?php if ( ! $whoops ) : ?>
 			<input type="hidden" name="do_backup" id="do_backup" value="backup" /> 
@@ -1543,5 +1556,5 @@
 						$src = '/' . $org . '/';
 //						$dist = '*************************************s:' . $num . '->' . $volm . '"' . $str . '"';
-						$dist = 's:'. $volm . '"' . $str . '"';
+						$dist = 's:'. $volm . ':"' . $str . '"';
 						if(preg_match($src,$query_line)){
 							$query_line = preg_replace($src,$dist,$query_line);
@@ -1549,4 +1562,10 @@
 					}
 				}
+			}
+			$seach = "/'blog_charset'.*'EUC-JP'/";
+			$src = "/'EUC-JP'/";
+			$dist = "'UTF-8'";
+			if(preg_match($seach,$query_line)){
+				$query_line = preg_replace($src,$dist,$query_line);
 			}
 		}
@@ -1571,16 +1590,30 @@
 			}
 		}
-		$seach = "/'blog_charset'.*'EUC-JP'/";
-		$src = "/'EUC-JP'/";
-		$dist = "'UTF-8'";
-		if(preg_match($seach,$query_line)){
-			$query_line = preg_replace($src,$dist,$query_line);
+		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,$matches)){	
+					$query_line = "\n" . $matches[1] . $this->get_default_usr_role() . $matches[3];
+				}			
+		}
+		if ($extras_option['del_active_plugin']){
+				$src = '/' . "(INSERT INTO `.+_options` VALUES \([0-9]+, [0-9]+, 'active_plugins', 'Y', [0-9]+, ')(a:.+})('.+\);)" . '/';
+				if(preg_match($src,$query_line,$matches)){
+					if(preg_match('/xpressme\/xpressme.php/',$matches[2])){
+						$query_line = "\n" . $matches[1] . 'a:1:{i:0;s:21:"xpressme/xpressme.php";}' . $matches[3];
+					} else {
+						$query_line = "\n" . $matches[1] . 'a:0:{}' . $matches[3];
+					}
+				}			
 		}
 		return $query_line;
+		
 	}
 	function is_mbstring(){
 		return function_exists('mb_convert_encoding');
 	}
-		
+	function get_default_usr_role(){
+		$role = 'a:5:{s:13:"administrator";a:2:{s:4:"name";s:13:"Administrator";s:12:"capabilities";a:62:{s:13:"switch_themes";b:1;s:11:"edit_themes";b:1;s:16:"activate_plugins";b:1;s:12:"edit_plugins";b:1;s:10:"edit_users";b:1;s:10:"edit_files";b:1;s:14:"manage_options";b:1;s:17:"moderate_comments";b:1;s:17:"manage_categories";b:1;s:12:"manage_links";b:1;s:12:"upload_files";b:1;s:6:"import";b:1;s:15:"unfiltered_html";b:1;s:10:"edit_posts";b:1;s:17:"edit_others_posts";b:1;s:20:"edit_published_posts";b:1;s:13:"publish_posts";b:1;s:10:"edit_pages";b:1;s:4:"read";b:1;s:8:"level_10";b:1;s:7:"level_9";b:1;s:7:"level_8";b:1;s:7:"level_7";b:1;s:7:"level_6";b:1;s:7:"level_5";b:1;s:7:"level_4";b:1;s:7:"level_3";b:1;s:7:"level_2";b:1;s:7:"level_1";b:1;s:7:"level_0";b:1;s:17:"edit_others_pages";b:1;s:20:"edit_published_pages";b:1;s:13:"publish_pages";b:1;s:12:"delete_pages";b:1;s:19:"delete_others_pages";b:1;s:22:"delete_published_pages";b:1;s:12:"delete_posts";b:1;s:19:"delete_others_posts";b:1;s:22:"delete_published_posts";b:1;s:20:"delete_private_posts";b:1;s:18:"edit_private_posts";b:1;s:18:"read_private_posts";b:1;s:20:"delete_private_pages";b:1;s:18:"edit_private_pages";b:1;s:18:"read_private_pages";b:1;s:12:"delete_users";b:1;s:12:"create_users";b:1;s:17:"unfiltered_upload";b:1;s:14:"edit_dashboard";b:1;s:14:"update_plugins";b:1;s:14:"delete_plugins";b:1;s:15:"install_plugins";b:1;s:13:"update_themes";b:1;s:14:"install_themes";b:1;s:11:"update_core";b:1;s:10:"list_users";b:1;s:12:"remove_users";b:1;s:9:"add_users";b:1;s:13:"promote_users";b:1;s:18:"edit_theme_options";b:1;s:13:"delete_themes";b:1;s:6:"export";b:1;}}s:6:"editor";a:2:{s:4:"name";s:6:"Editor";s:12:"capabilities";a:34:{s:17:"moderate_comments";b:1;s:17:"manage_categories";b:1;s:12:"manage_links";b:1;s:12:"upload_files";b:1;s:15:"unfiltered_html";b:1;s:10:"edit_posts";b:1;s:17:"edit_others_posts";b:1;s:20:"edit_published_posts";b:1;s:13:"publish_posts";b:1;s:10:"edit_pages";b:1;s:4:"read";b:1;s:7:"level_7";b:1;s:7:"level_6";b:1;s:7:"level_5";b:1;s:7:"level_4";b:1;s:7:"level_3";b:1;s:7:"level_2";b:1;s:7:"level_1";b:1;s:7:"level_0";b:1;s:17:"edit_others_pages";b:1;s:20:"edit_published_pages";b:1;s:13:"publish_pages";b:1;s:12:"delete_pages";b:1;s:19:"delete_others_pages";b:1;s:22:"delete_published_pages";b:1;s:12:"delete_posts";b:1;s:19:"delete_others_posts";b:1;s:22:"delete_published_posts";b:1;s:20:"delete_private_posts";b:1;s:18:"edit_private_posts";b:1;s:18:"read_private_posts";b:1;s:20:"delete_private_pages";b:1;s:18:"edit_private_pages";b:1;s:18:"read_private_pages";b:1;}}s:6:"author";a:2:{s:4:"name";s:6:"Author";s:12:"capabilities";a:10:{s:12:"upload_files";b:1;s:10:"edit_posts";b:1;s:20:"edit_published_posts";b:1;s:13:"publish_posts";b:1;s:4:"read";b:1;s:7:"level_2";b:1;s:7:"level_1";b:1;s:7:"level_0";b:1;s:12:"delete_posts";b:1;s:22:"delete_published_posts";b:1;}}s:11:"contributor";a:2:{s:4:"name";s:11:"Contributor";s:12:"capabilities";a:5:{s:10:"edit_posts";b:1;s:4:"read";b:1;s:7:"level_1";b:1;s:7:"level_0";b:1;s:12:"delete_posts";b:1;}}s:10:"subscriber";a:2:{s:4:"name";s:10:"Subscriber";s:12:"capabilities";a:2:{s:4:"read";b:1;s:7:"level_0";b:1;}}}';
+		return $role;
+	}
 
 }
