Index: temp/trunk/html/install/index.php
===================================================================
--- temp/trunk/html/install/index.php	(revision 5433)
+++ temp/trunk/html/install/index.php	(revision 5434)
@@ -25,4 +25,11 @@
 $objView = new SC_InstallView($INSTALL_DIR . '/templates', $INSTALL_DIR . '/temp');
 
+// ¥Ñ¥é¥á¡¼¥¿´ÉÍý¥¯¥é¥¹
+$objWebParam = new SC_FormParam();
+$objDBParam = new SC_FormParam();
+// ¥Ñ¥é¥á¡¼¥¿¾ðÊó¤Î½é´ü²½
+$objWebParam = lfInitWebParam($objWebParam);
+$objDBParam = lfInitDBParam($objDBParam);
+
 if ($_POST['db_type'] == 'pgsql') {
 	$port = "";
@@ -30,14 +37,4 @@
 	$port = ":".$_POST['db_port'];
 }
-
-$skip = $_POST["db_skip"];
-
-// ¥Ñ¥é¥á¡¼¥¿´ÉÍý¥¯¥é¥¹
-$objWebParam = new SC_FormParam();
-$objDBParam = new SC_FormParam();
-// ¥Ñ¥é¥á¡¼¥¿¾ðÊó¤Î½é´ü²½
-$objWebParam = lfInitWebParam($objWebParam, $skip);
-$objDBParam = lfInitDBParam($objDBParam);
-
 
 //¥Õ¥©¡¼¥àÇÛÎó¤Î¼èÆÀ
@@ -62,7 +59,19 @@
 	//ÆþÎÏÃͤΥ¨¥é¡¼¥Á¥§¥Ã¥¯
 	$objPage->arrErr = lfCheckWEBError($objWebParam);
-	
-	if(count($objPage->arrErr) == 0) {
+	if(count($objPage->arrErr) == 0) {
+		$objPage = lfDispStep2($objPage);
+	} else {
+		$objPage = lfDispStep1($objPage);
+	}
+	break;
+// ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÀßÄê
+case 'step2':
+
+	//ÆþÎÏÃͤΥ¨¥é¡¼¥Á¥§¥Ã¥¯
+	$objPage->arrErr = lfCheckDBError($objDBParam);
+	if(count($objPage->arrErr) == 0) {
+		
 		// ŹÊÞ¤òÊѹ¹¤·¤Ê¤¤¾ì¹ç¤Ë¤Ï´°Î»²èÌ̤ØÁ«°Ü
+		$skip = $_POST["db_skip"];
 		if ($skip == "on") {
 			// ÀßÄê¥Õ¥¡¥¤¥ë¤ÎÀ¸À®
@@ -71,15 +80,5 @@
 			break;
 		}
-		$objPage = lfDispStep2($objPage);
-	} else {
-		$objPage = lfDispStep1($objPage);
-	}
-	break;
-// ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÀßÄê
-case 'step2':
-
-	//ÆþÎÏÃͤΥ¨¥é¡¼¥Á¥§¥Ã¥¯
-	$objPage->arrErr = lfCheckDBError($objDBParam);
-	if(count($objPage->arrErr) == 0) {
+		
 		$objPage = lfDispStep3($objPage);
 
@@ -352,5 +351,5 @@
 	// hidden¤ËÆþÎÏÃͤòÊÝ»ý
 	$objPage->arrHidden = $objDBParam->getHashArray();
-	$objPage->tpl_db_skip = $_POST['db_skip'];
+	$objPage->arrHidden['db_skip'] = $_POST['db_skip'];
 	$objPage->tpl_mainpage = 'step1.tpl';
 	$objPage->tpl_mode = 'step1';
@@ -378,5 +377,5 @@
 	// hidden¤ËÆþÎÏÃͤòÊÝ»ý
 	$objPage->arrHidden = array_merge($objPage->arrHidden, $objDBParam->getHashArray());
-	$objPage->arrHidden['db_skip'] = $_POST['db_skip'];
+	$objPage->tpl_db_skip = $_POST['db_skip'];
 	$objPage->tpl_mainpage = 'step3.tpl';
 	$objPage->tpl_mode = 'step3';
@@ -399,5 +398,5 @@
 
 // WEB¥Ñ¥é¥á¡¼¥¿¾ðÊó¤Î½é´ü²½
-function lfInitWebParam($objWebParam, $skip="") {
+function lfInitWebParam($objWebParam) {
 	
 	$install_dir = realpath(dirname( __FILE__) . "/../../") . "/";
@@ -405,17 +404,10 @@
 	$secure_url = "http://" . $_SERVER['HTTP_HOST'] . "/";
 	$domain = ereg_replace("^[a-zA-Z0-9_~=&\?\/-]+\.", "", $_SERVER['HTTP_HOST']);
+	$objWebParam->addParam("Ź̾", "shop_name", MTEXT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK"));
+	$objWebParam->addParam("´ÉÍý¼Ô¥á¡¼¥ë¥¢¥É¥ì¥¹", "admin_mail", MTEXT_LEN, "", array("EXIST_CHECK","EMAIL_CHECK","EMAIL_CHAR_CHECK","MAX_LENGTH_CHECK"));
 	$objWebParam->addParam("¥¤¥ó¥¹¥È¡¼¥ë¥Ç¥£¥ì¥¯¥È¥ê", "install_dir", MTEXT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK"), $install_dir);
 	$objWebParam->addParam("URL(Ä̾ï)", "normal_url", MTEXT_LEN, "", array("EXIST_CHECK","URL_CHECK","MAX_LENGTH_CHECK"), $normal_url);
 	$objWebParam->addParam("URL(¥»¥­¥å¥¢)", "secure_url", MTEXT_LEN, "", array("EXIST_CHECK","URL_CHECK","MAX_LENGTH_CHECK"), $secure_url);
 	$objWebParam->addParam("¥É¥á¥¤¥ó", "domain", MTEXT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK"), $domain);	
-
-	if ($skip == "on") {
-		$objWebParam->addParam("Ź̾", "shop_name");
-		$objWebParam->addParam("´ÉÍý¼Ô¥á¡¼¥ë¥¢¥É¥ì¥¹", "admin_mail");
-	}else{
-		$objWebParam->addParam("Ź̾", "shop_name", MTEXT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK"));
-		$objWebParam->addParam("´ÉÍý¼Ô¥á¡¼¥ë¥¢¥É¥ì¥¹", "admin_mail", MTEXT_LEN, "", array("EXIST_CHECK","EMAIL_CHECK","EMAIL_CHAR_CHECK","MAX_LENGTH_CHECK"));
-	}
-	
 
 	return $objWebParam;
@@ -444,5 +436,4 @@
 	// ÆþÎϥǡ¼¥¿¤òÅϤ¹¡£
 	$arrRet =  $objFormParam->getHashArray();
-	
 	$objErr = new SC_CheckError($arrRet);
 	$objErr->arrErr = $objFormParam->checkError();
@@ -456,4 +447,6 @@
 	$arrRet =  $objFormParam->getHashArray();
 	
+	sfprintr($arrRet);
+	exit();
 	$objErr = new SC_CheckError($arrRet);
 	$objErr->arrErr = $objFormParam->checkError();