Index: /branches/dev/html/mobile/mypage/change.php
===================================================================
--- /branches/dev/html/mobile/mypage/change.php	(revision 11894)
+++ /branches/dev/html/mobile/mypage/change.php	(revision 11902)
@@ -85,4 +85,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") {
@@ -100,5 +115,5 @@
 	}
 
-	if ($objPage->arrErr || $_POST["mode"] == "return") {		// ÆþÎÏ¥¨¥é¡¼¤Î¥Á¥§¥Ã¥¯
+	if ($objPage->arrErr || !empty($_POST["return"])) {		// ÆþÎÏ¥¨¥é¡¼¤Î¥Á¥§¥Ã¥¯
 		foreach($objPage->arrForm as $key => $val) {
 			$objPage->$key = $val;
@@ -108,20 +123,15 @@
 		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 != "return" && $key != "mode" && $key != "confirm" && $key != session_name() && !in_array($key, $checkVal)) {
+				$objPage->list_data[ $key ] = $val;
+			}
+		}
 
 	} else {
@@ -153,6 +163,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($_POST as $key => $val) {
-			if ($key != "mode" && $key != "subm") $objPage->list_data[ $key ] = $val;
+			if ($key != "return" && $key != "mode" && $key != "confirm" && $key != session_name() && !in_array($key, $checkVal)) {
+				$objPage->list_data[ $key ] = $val;
+			}
 		}
 
@@ -193,4 +213,9 @@
 		}
 	}
+}
+
+$arrPrivateVariables = array('secret_key', 'first_buy_date', 'last_buy_date', 'buy_times', 'buy_total', 'point', 'note', 'status', 'create_date', 'update_date', 'del_flg', 'cell01', 'cell02', 'cell03', 'mobile_phone_id');
+foreach ($arrPrivateVariables as $key) {
+	unset($objPage->list_data[$key]);
 }
 
Index: /branches/dev/html/mobile/shopping/deliv_addr.php
===================================================================
--- /branches/dev/html/mobile/shopping/deliv_addr.php	(revision 11894)
+++ /branches/dev/html/mobile/shopping/deliv_addr.php	(revision 11902)
@@ -34,7 +34,8 @@
 //-- ¥Ç¡¼¥¿ÀßÄê
 foreach($_POST as $key => $val) {
-	if ($key != "mode") $objPage->list_data[ $key ] = $val;
-}
-
+	if ($key != "mode" && $key != "return" && $key != "submit" && $key != session_name()) {
+		$objPage->list_data[ $key ] = $val;
+	}
+}
 // ¥æ¡¼¥¶¥æ¥Ë¡¼¥¯ID¤Î¼èÆÀ¤È¹ØÆþ¾õÂÖ¤ÎÀµÅöÀ­¤ò¥Á¥§¥Ã¥¯
 $uniqid = sfCheckNormalAccess($objSiteSess, $objCartSess);
@@ -56,20 +57,47 @@
 						);
 
+// Ìá¤ë¥Ü¥¿¥óÍѽèÍý
+if (!empty($_POST["return"])) {
+	switch ($_POST["mode"]) {
+	case 'complete':
+		$_POST["mode"] = "set2";
+		break;
+	case 'set2':
+		$_POST["mode"] = "set1";
+		break;
+	default:
+		header("Location: " . gfAddSessionId('deliv.php'));
+		exit;
+	}
+}
+
 switch ($_POST['mode']){
 	case 'set1':
 		$objPage->arrErr = lfErrorCheck1($objPage->arrForm);
-		if (count($objPage->arrErr) == 0) {
+		if (count($objPage->arrErr) == 0 && empty($_POST["return"])) {
 			$objPage->tpl_mainpage = 'shopping/set1.tpl';
 
+			$checkVal = array("pref", "addr01", "addr02", "addr03", "tel01", "tel02", "tel03");
+			foreach($checkVal as $key) {
+				unset($objPage->list_data[$key]);
+			}
+
 			// ͹ÊØÈֹ椫¤é½»½ê¤Î¼èÆÀ
-			$address = lfGetAddress($_REQUEST['zip01'].$_REQUEST['zip02']);
-
-			$objPage->arrForm['pref'] = @$address[0]['state'];
-			$objPage->arrForm['addr01'] = @$address[0]['city'] . @$address[0]['town'];
+			if (@$objPage->arrForm['pref'] == "" && @$objPage->arrForm['addr01'] == "" && @$objPage->arrForm['addr02'] == "") {
+				$address = lfGetAddress($_REQUEST['zip01'].$_REQUEST['zip02']);
+
+				$objPage->arrForm['pref'] = @$address[0]['state'];
+				$objPage->arrForm['addr01'] = @$address[0]['city'] . @$address[0]['town'];
+			}
+		} else {
+			$checkVal = array("name01", "name02", "kana01", "kana02", "zip01", "zip02");
+			foreach($checkVal as $key) {
+				unset($objPage->list_data[$key]);
+			}
 		}
 		break;
 	case 'set2':
 		$objPage->arrErr = lfErrorCheck2($objPage->arrForm);
-		if (count($objPage->arrErr) == 0) {
+		if (count($objPage->arrErr) == 0 && empty($_POST["return"])) {
 			$objPage->tpl_mainpage = 'shopping/set2.tpl';
 		} else {
@@ -77,8 +105,6 @@
 
 			$checkVal = array("pref", "addr01", "addr02", "addr03", "tel01", "tel02", "tel03");
-			//-- ¥Ç¡¼¥¿ÀßÄê
-			unset($objPage->list_data);
-			foreach($_POST as $key => $val) {
-				if ($key != "mode" && !in_array($key, $checkVal)) $objPage->list_data[ $key ] = $val;
+			foreach($checkVal as $key) {
+				unset($objPage->list_data[$key]);
 			}
 		}
Index: /branches/dev/html/mobile/shopping/payment.php
===================================================================
--- /branches/dev/html/mobile/shopping/payment.php	(revision 11851)
+++ /branches/dev/html/mobile/shopping/payment.php	(revision 11902)
@@ -59,4 +59,18 @@
 // ¥«¡¼ÅÔÆâ¤Î¾¦ÉʤÎÇä¤êÀÚ¤ì¥Á¥§¥Ã¥¯
 $objCartSess->chkSoldOut($objCartSess->getCartList());
+
+// Ìá¤ë¥Ü¥¿¥ó¤Î½èÍý
+if (!empty($_POST['return'])) {
+	switch ($_POST['mode']) {
+	case 'confirm':
+		$_POST['mode'] = 'payment';
+		break;
+	default:
+		// Àµ¾ï¤Ê¿ä°Ü¤Ç¤¢¤ë¤³¤È¤òµ­Ï¿¤·¤Æ¤ª¤¯
+		$objSiteSess->setRegistFlag();
+		header("Location: " . gfAddSessionId(URL_SHOP_TOP));
+		exit;
+	}
+}
 
 switch($_POST['mode']) {
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;
+			}
 		}