Changeset 5427 for temp/trunk

Timestamp:

2006/09/22 13:28:42 (20 years ago)

Author:

kakinaka

Message:

blank

File:

• temp/trunk/html/install/index.php (modified) (4 diffs)

temp/trunk/html/install/index.php

@@ -25 +25 @@
 $objView = new SC_InstallView($INSTALL_DIR . '/templates', $INSTALL_DIR . '/temp');
 
+if ($_POST['db_type'] == 'pgsql') {
+    $port = "";
+}else{
+    $port = ":".$_POST['db_port'];
+}
+
+$skip = $_POST["db_skip"];
+
 // ¥Ñ¥é¥á¡¼¥¿´ÉÍý¥¯¥é¥¹
 $objWebParam = new SC_FormParam();
 $objDBParam = new SC_FormParam();
 // ¥Ñ¥é¥á¡¼¥¿¾ðÊó¤Î½é´ü²½
-$objWebParam = lfInitWebParam($objWebParam);
+$objWebParam = lfInitWebParam($objWebParam, $skip);
 $objDBParam = lfInitDBParam($objDBParam);
 
-if ($_POST['db_type'] == 'pgsql') {
-    $port = "";
-}else{
-    $port = ":".$_POST['db_port'];
-}
 
 //¥Õ¥©¡¼¥àÇÛÎó¤Î¼èÆÀ
@@ -57 +60 @@
 // WEB¥µ¥¤¥È¤ÎÀßÄê
 case 'step1':
-    $skip = $_POST["db_skip"];
-    
     //ÆþÎÏÃͤΥ¨¥é¡¼¥Á¥§¥Ã¥¯
     $objPage->arrErr = lfCheckWEBError($objWebParam, $skip);
@@ -401 +402 @@
 
 // WEB¥Ñ¥é¥á¡¼¥¿¾ðÊó¤Î½é´ü²½
-function lfInitWebParam($objWebParam) {
+function lfInitWebParam($objWebParam, $skip="") {
     
     $install_dir = realpath(dirname( __FILE__) . "/../../") . "/";
@@ -407 +408 @@
     $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;