Index: branches/dev/html/mobile/entry/index.php
===================================================================
--- branches/dev/html/mobile/entry/index.php	(revision 11894)
+++ branches/dev/html/mobile/entry/index.php	(revision 11902)
@@ -100,4 +100,19 @@
 	$objPage->arrForm = lfConvertParam($objPage->arrForm, $arrRegistColumn);
 
+	// Ìá¤ë¥Ü¥¿¥óÍѽèÍý
+	if (!empty($_POST["return"])) {
+		switch ($_POST["mode"]) {
+		case "complete":
+			$_POST["mode"] = "set3";
+			break;
+		case "confirm":
+			$_POST["mode"] = "set2";
+			break;
+		default:
+			$_POST["mode"] = "set1";
+			break;
+		}
+	}
+
 	//--¡¡ÆþÎÏ¥¨¥é¡¼¥Á¥§¥Ã¥¯
 	if ($_POST["mode"] == "set1") {
@@ -115,27 +130,24 @@
 	}
 
-	if ($objPage->arrErr || $_POST["mode"] == "return") {		// ÆþÎÏ¥¨¥é¡¼¤Î¥Á¥§¥Ã¥¯
-		foreach($objPage->arrForm as $key => $val) {
-			$objPage->$key = $val;
-		}
+	foreach($objPage->arrForm as $key => $val) {
+		$objPage->$key = $val;
+	}
+
+	if ($objPage->arrErr || !empty($_POST["return"])) {		// ÆþÎÏ¥¨¥é¡¼¤Î¥Á¥§¥Ã¥¯
 
 		//-- ¥Ç¡¼¥¿¤ÎÀßÄê
 		if ($_POST["mode"] == "set1") {
 			$checkVal = array("email", "password", "reminder", "reminder_answer", "name01", "name02", "kana01", "kana02");
-			foreach($objPage->arrForm as $key => $val) {
-				if ($key != "mode" && $key != "subm" & !in_array($key, $checkVal)) $objPage->list_data[ $key ] = $val;
-			}
-
 		} elseif ($_POST["mode"] == "set2") {
 			$checkVal = array("sex", "year", "month", "day", "zip01", "zip02");
-			foreach($objPage->arrForm as $key => $val) {
-				if ($key != "mode" && $key != "subm" & !in_array($key, $checkVal)) $objPage->list_data[ $key ] = $val;
-			}
 		} else {
-			$checkVal = array("pref", "addr01", "addr02", "tel01", "tel02", "tel03");
-			foreach($objPage->arrForm as $key => $val) {
-				if ($key != "mode" && $key != "subm" & !in_array($key, $checkVal)) $objPage->list_data[ $key ] = $val;
-			}
-		}
+			$checkVal = array("pref", "addr01", "addr02", "tel01", "tel02", "tel03", "mail_flag");
+		}
+
+		foreach($objPage->arrForm as $key => $val) {
+			if ($key != "mode" && $key != "submit" && $key != "return" && $key != session_name() && !in_array($key, $checkVal))
+				$objPage->list_data[ $key ] = $val;
+		}
+
 
 
@@ -150,7 +162,9 @@
 			$objPage->tpl_title = '²ñ°÷ÅÐÏ¿(3/3)';
 
-			$address = lfGetAddress($_REQUEST['zip01'].$_REQUEST['zip02']);
-			$objView->assign("pref", @$address[0]['state']);
-			$objView->assign("addr01", @$address[0]['city'] . @$address[0]['town']);
+			if (@$objPage->arrForm['pref'] == "" && @$objPage->arrForm['addr01'] == "" && @$objPage->arrForm['addr02'] == "") {
+				$address = lfGetAddress($_REQUEST['zip01'].$_REQUEST['zip02']);
+				$objPage->pref = @$address[0]['state'];
+				$objPage->addr01 = @$address[0]['city'] . @$address[0]['town'];
+			}
 		} elseif ($_POST["mode"] == "confirm") {
 			//¥Ñ¥¹¥ï¡¼¥Éɽ¼¨
@@ -172,6 +186,16 @@
 		//-- ¥Ç¡¼¥¿ÀßÄê
 		unset($objPage->list_data);
+		if ($_POST["mode"] == "set1") {
+			$checkVal = array("sex", "year", "month", "day", "zip01", "zip02");
+		} elseif ($_POST["mode"] == "set2") {
+			$checkVal = array("pref", "addr01", "addr02", "tel01", "tel02", "tel03", "mail_flag");
+		} else {
+			$checkVal = array();
+		}
+
 		foreach($objPage->arrForm as $key => $val) {
-			if ($key != "mode" && $key != "subm") $objPage->list_data[ $key ] = $val;
+			if ($key != "mode" && $key != "submit" && $key != "confirm" && $key != "return" && $key != session_name() && !in_array($key, $checkVal)) {
+				$objPage->list_data[ $key ] = $val;
+			}
 		}