Index: trunk/extras/wp_plugin/xpressme-backup/xpressme-backup.php
===================================================================
--- trunk/extras/wp_plugin/xpressme-backup/xpressme-backup.php	(revision 608)
+++ trunk/extras/wp_plugin/xpressme-backup/xpressme-backup.php	(revision 610)
@@ -158,6 +158,18 @@
 			$before_prefix = $_POST['before_prefix'];
 			$after_prefix = $_POST['after_prefix'];
-
-			update_option('xpressme_backup_extras_option', array('do_euc_to_utf8' => $do_euc_to_utf8, 'do_rename_prefix' => $do_rename_prefix, 'before_prefix' => $before_prefix, 'after_prefix' => $after_prefix));
+			$do_change_uri = $_POST['do_change_uri'];
+			$before_uri = $_POST['before_uri'];
+			$after_uri = $_POST['after_uri'];
+
+			update_option('xpressme_backup_extras_option', 
+				array('do_euc_to_utf8' => $do_euc_to_utf8, 
+					'do_rename_prefix' => $do_rename_prefix, 
+					'before_prefix' => $before_prefix, 
+					'after_prefix' => $after_prefix, 
+					'do_change_uri' => $do_change_uri, 
+					'before_uri' => $before_uri, 
+					'after_uri' => $after_uri
+				)
+			);
 				
 			switch($_POST['do_backup']) {
@@ -1287,4 +1299,14 @@
 				<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>
 			</ul>
 			<?php if ( ! $whoops ) : ?>
@@ -1491,5 +1513,5 @@
 		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");
-			$tmp = preg_replace('/DEFAULT\s*CHARSET\s*=\s*ujis/','DEFAULT CHARSET=utf-8',$query_line);
+			$tmp = preg_replace('/DEFAULT\s*CHARSET\s*=\s*ujis/','DEFAULT CHARSET=utf8',$query_line);
 			if (empty($buf)) $query_line = $tmp;
 			if (preg_match_all('/s:([0-9]+):"(.*?)";/',$query_line,$matchs)){
@@ -1538,4 +1560,15 @@
 			}
 		}
+		if ($extras_option['do_change_uri']){
+			if (!empty($extras_option['before_uri']) && !empty($extras_option['after_uri'])){
+				$org =  $extras_option['before_uri'];
+				$org =  str_replace('/','\\/',$org);
+				$src = '/' . $org . '/';
+				$dist = $extras_option['after_uri'];
+				if(preg_match($src,$query_line)){
+					$query_line = preg_replace($src,$dist,$query_line);
+				}
+			}
+		}
 		return $query_line;
 	}