Changeset 15812

Timestamp:

2007/09/20 22:57:50 (16 years ago)

Author:

adachi

Message:

細かな修正

Location:

branches/feature-templates

Files:

• data/Smarty/templates/admin/design/template.tpl (modified) (1 diff)
• data/Smarty/templates/admin/design/up_down.tpl (modified) (1 diff)
• data/class/SC_View.php (modified) (2 diffs)
• html/admin/design/template.php (modified) (2 diffs)
• html/install/index.php (modified) (6 diffs)

branches/feature-templates/data/Smarty/templates/admin/design/template.tpl

@@ -88 +88 @@
                                                 <td width="50">ºï½ü</td>
                                             </tr>
+                                            <tr bgcolor="#ffffff" align="center" class="fs12n">
+                                                <td width=""><input type="radio" name="template_code" value="default" <!--{if !$tplcode}-->checked<!--{/if}-->></td>
+                                                <td width="" colspan="3">¥Æ¥ó¥×¥ì¡¼¥È¤ò»ÈÍѤ·¤Ê¤¤</td>
+                                            </tr>
                                             <!--{foreach from=$templates item=tpl}-->
                                             <!--{assign var=tplcode value=$tpl.template_code}-->

branches/feature-templates/data/Smarty/templates/admin/design/up_down.tpl

@@ -155 +155 @@
                                             ¥Ç¥¶¥¤¥ó´ÉÍý¤ÇºîÀ®¤·¤¿¥Õ¥¡¥¤¥ë¤Î¥À¥¦¥ó¥í¡¼¥É¤ò¹Ô¤¤¤Þ¤¹¡£<br/>
                                             ¥À¥¦¥ó¥í¡¼¥É¥Õ¥¡¥¤¥ë¤Ë¤Ï²¼µ­¤ÎÆâÍƤ¬´Þ¤Þ¤ì¤Þ¤¹¡£
+                                            <!--{if $now_template}-->
                                             <ul>
                                                 <li>user_data/tpl_packages/<!--{$now_template}-->/*</li>
                                             </ul>
+                                            <!--{/if}-->
                                             <ul>
                                                 <li>user_data/css/contents.css</li>

branches/feature-templates/data/class/SC_View.php

@@ -268 +268 @@
             if (file_exists($template_dir . $tpl_mainpage)
                 && file_exists($template_dir . $template)) {
-
+echo '<font color="#ffffff">ok</font>';
                 $this->_smarty->template_dir = $template_dir;
-                $this->_smarty->compile_dir .= "/$template_name";
+                $this->_smarty->compile_dir  = COMPILE_DIR . "/$template_name";
             }
         }
@@ -308 +308 @@
                 (file_exists($template_dir . $tpl_mainpage) || file_exists($tpl_mainpage))
                 && file_exists($template_dir . $template)) {
-
+echo 'ok';
                 $this->_smarty->template_dir = $template_dir;
-                $this->_smarty->compile_dir .= "/$template_name";
+                $this->_smarty->compile_dir  = COMPILE_DIR . "/$template_name";
             }
         }

branches/feature-templates/html/admin/design/template.php

@@ -49 +49 @@
 
     if ($template_code == 'default') {
-        $objPage->tpl_onload="alert('½é´ü¥Ç¥¶¥¤¥ó¤ØÌᤷ¤Þ¤·¤¿¡£');";
+        lfRegisterTemplate('');
+        $objPage->tpl_onload="alert('ÅÐÏ¿¤¬´°Î»¤·¤Þ¤·¤¿¡£');";
         break;
     }
@@ -59 +60 @@
     lfChangeTemplate($template_code);
 
+    // XXX ¥³¥ó¥Ñ¥¤¥ë¥Õ¥¡¥¤¥ë¤Î¥¯¥ê¥¢½èÍý¤ò¹Ô¤¦
     $objView->_smarty->clear_compiled_tpl();
 

branches/feature-templates/html/install/index.php

@@ -11 +11 @@
 
 class LC_Page {
-    function LC_Page() {
-        $this->arrDB_TYPE = array(
-            'pgsql' => 'PostgreSQL',
-            'mysql' => 'MySQL'  
-        );
-        $this->arrDB_PORT = array(
-            'pgsql' => '',
-            'mysql' => ''   
-        );
-    }
+    function LC_Page() {
+        $this->arrDB_TYPE = array(
+            'pgsql' => 'PostgreSQL',
+            'mysql' => 'MySQL'
+        );
+        $this->arrDB_PORT = array(
+            'pgsql' => '',
+            'mysql' => ''
+        );
+    }
 }
 
@@ -30 +30 @@
 
 if($mode != '777') {
-    sfErrorHeader($temp_dir . "¤Ë¥æ¡¼¥¶½ñ¹þ¤ß¸¢¸Â(777)¤òÉÕÍ¿¤·¤Æ²¼¤µ¤¤¡£", true);
-    exit;
+    sfErrorHeader($temp_dir . "¤Ë¥æ¡¼¥¶½ñ¹þ¤ß¸¢¸Â(777)¤òÉÕÍ¿¤·¤Æ²¼¤µ¤¤¡£", true);
+    exit;
 }
 
@@ -50 +50 @@
 // ¤è¤¦¤³¤½
 case 'welcome':
-    //$objPage = lfDispAgreement($objPage);
-    $objPage = lfDispStep0($objPage);
-    //$objPage->tpl_onload .= "fnChangeVisible('agreement_yes', 'next');";
-    break;
+    //$objPage = lfDispAgreement($objPage);
+    $objPage = lfDispStep0($objPage);
+    //$objPage->tpl_onload .= "fnChangeVisible('agreement_yes', 'next');";
+    break;
 
 /* ¸½ºßÊÝαÃæ
@@ -59 +59 @@
 // »ÈÍѵöÂú·ÀÌó½ñ¤ÎƱ°Õ
 case 'agreement':
-    $objPage = lfDispStep0($objPage);
-    break;
-*/  
-    
+    $objPage = lfDispStep0($objPage);
+    break;
+*/
+
 // ¥¢¥¯¥»¥¹¸¢¸Â¤Î¥Á¥§¥Ã¥¯
 case 'step0':
-    $objPage = lfDispStep0_1($objPage);
-    break;  
+    $objPage = lfDispStep0_1($objPage);
+    break;
 // ¥Õ¥¡¥¤¥ë¤Î¥³¥Ô¡¼
 case 'step0_1':
-    $objPage = lfDispStep1($objPage);
-    break;  
+    $objPage = lfDispStep1($objPage);
+    break;
 // WEB¥µ¥¤¥È¤ÎÀßÄê
 case 'step1':
-    //ÆþÎÏÃͤΥ¨¥é¡¼¥Á¥§¥Ã¥¯
-    $objPage->arrErr = lfCheckWEBError($objWebParam);
-    if(count($objPage->arrErr) == 0) {
-        $objPage = lfDispStep2($objPage);
-    } else {
-        $objPage = lfDispStep1($objPage);
-    }
-    break;
+    //ÆþÎÏÃͤΥ¨¥é¡¼¥Á¥§¥Ã¥¯
+    $objPage->arrErr = lfCheckWEBError($objWebParam);
+    if(count($objPage->arrErr) == 0) {
+        $objPage = lfDispStep2($objPage);
+    } else {
+        $objPage = lfDispStep1($objPage);
+    }
+    break;
 // ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÀßÄê
 case 'step2':
-    //ÆþÎÏÃͤΥ¨¥é¡¼¥Á¥§¥Ã¥¯
-    $objPage->arrErr = lfCheckDBError($objDBParam);
-    if(count($objPage->arrErr) == 0) {
-        $objPage = lfDispStep3($objPage);
-    } else {
-        $objPage = lfDispStep2($objPage);
-    }
-    break;
+    //ÆþÎÏÃͤΥ¨¥é¡¼¥Á¥§¥Ã¥¯
+    $objPage->arrErr = lfCheckDBError($objDBParam);
+    if(count($objPage->arrErr) == 0) {
+        $objPage = lfDispStep3($objPage);
+    } else {
+        $objPage = lfDispStep2($objPage);
+    }
+    break;
 // ¥Æ¡¼¥Ö¥ë¤ÎºîÀ®
 case 'step3':
-    // ÆþÎϥǡ¼¥¿¤òÅϤ¹¡£
-    $arrRet =  $objDBParam->getHashArray();
-    $dsn = $arrRet['db_type']."://".$arrRet['db_user'].":".$arrRet['db_password']."@".$arrRet['db_server'].":".$arrRet['db_port']."/".$arrRet['db_name'];
-    
-    /*
-        lfAddTable¤Ï¡¢¥Ð¡¼¥¸¥ç¥ó¥¢¥Ã¥×Åù¤ÇÄɲåơ¼¥Ö¥ë¤¬È¯À¸¤·¤¿¾ì¹ç¤Ë¼Â¹Ô¤¹¤ë¡£
-        ¡Ê£Ä£Â¹½À®¤Î²¼°Ì¸ß´¹¤Î¤¿¤á¥¹¥­¥Ã¥×»þ¤â¶¯À©¡Ë
-    */
-    // ¥Æ¡¼¥Ö¥ë¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç¤ËÄɲ䵤ì¤ë¡£
-    $objPage->arrErr = lfAddTable("dtb_session", $dsn);         // ¥»¥Ã¥·¥ç¥ó´ÉÍý¥Æ¡¼¥Ö¥ë
-    $objPage->arrErr = lfAddTable("dtb_module", $dsn);          // ¥â¥¸¥å¡¼¥ë´ÉÍý¥Æ¡¼¥Ö¥ë
-    $objPage->arrErr = lfAddTable("dtb_campaign_order", $dsn);  // ¥­¥ã¥ó¥Ú¡¼¥ó¼õÃí¥Æ¡¼¥Ö¥ë
-    $objPage->arrErr = lfAddTable("dtb_mobile_kara_mail", $dsn);    // ¶õ¥á¡¼¥ë´ÉÍý¥Æ¡¼¥Ö¥ë
-    $objPage->arrErr = lfAddTable("dtb_mobile_ext_session_id", $dsn);   // ¥»¥Ã¥·¥ç¥óID´ÉÍý¥Æ¡¼¥Ö¥ë
-    $objPage->arrErr = lfAddTable("dtb_site_control", $dsn);    // ¥µ¥¤¥È¾ðÊó´ÉÍý¥Æ¡¼¥Ö¥ë
-    $objPage->arrErr = lfAddTable("dtb_trackback", $dsn);   // ¥È¥é¥Ã¥¯¥Ð¥Ã¥¯´ÉÍý¥Æ¡¼¥Ö¥ë
-    $objPage->arrErr = lfAddTable("dtb_blayn", $dsn);   // ¥Ö¥ì¥¤¥óIP´ÉÍý¥Æ¡¼¥Ö¥ë   
-    
-    // ¥«¥é¥à¤òÄɲÃ
-    lfAddColumn($dsn);
-
-    // ¥Ç¡¼¥¿¤òÄɲÃ
-    lfAddData($dsn);
-    
-    if(count($objPage->arrErr) == 0) {
-        // ¥¹¥­¥Ã¥×¤¹¤ë¾ì¹ç¤Ë¤Ï¼¡²èÌ̤ØÁ«°Ü
-        $skip = $_POST["db_skip"];
-        if ($skip == "on") {
-            // ÀßÄê¥Õ¥¡¥¤¥ë¤ÎÀ¸À®
-            lfMakeConfigFile();
-            $objPage = lfDispComplete($objPage);
-            //$objPage = lfDispStep4($objPage);
-            break;
-        }
-    }
-    
-    // ¥Æ¡¼¥Ö¥ë¤ÎºîÀ®
-    $objPage->arrErr = lfExecuteSQL("./sql/create_table_".$arrRet['db_type'].".sql", $dsn); 
-    if(count($objPage->arrErr) == 0) {
-        $objPage->tpl_message.="¡û¡§¥Æ¡¼¥Ö¥ë¤ÎºîÀ®¤ËÀ®¸ù¤·¤Þ¤·¤¿¡£<br>";
-    } else {
-        $objPage->tpl_message.="¡ß¡§¥Æ¡¼¥Ö¥ë¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£<br>";        
-    }
-
-    // ¥Ó¥å¡¼¤ÎºîÀ®
-    if(count($objPage->arrErr) == 0 and $arrRet['db_type'] == 'pgsql') {
-        // ¥Ó¥å¡¼¤ÎºîÀ®
-        $objPage->arrErr = lfExecuteSQL("./sql/create_view.sql", $dsn); 
-        if(count($objPage->arrErr) == 0) {
-            $objPage->tpl_message.="¡û¡§¥Ó¥å¡¼¤ÎºîÀ®¤ËÀ®¸ù¤·¤Þ¤·¤¿¡£<br>";
-        } else {
-            $objPage->tpl_message.="¡ß¡§¥Ó¥å¡¼¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£<br>";      
-        }
-    }   
-    
-    // ½é´ü¥Ç¡¼¥¿¤ÎºîÀ®
-    if(count($objPage->arrErr) == 0) {
-        $objPage->arrErr = lfExecuteSQL("./sql/insert_data.sql", $dsn); 
-        
-        if(count($objPage->arrErr) == 0) {
-            $objPage->tpl_message.="¡û¡§½é´ü¥Ç¡¼¥¿¤ÎºîÀ®¤ËÀ®¸ù¤·¤Þ¤·¤¿¡£<br>";
-        } else {
-            $objPage->tpl_message.="¡ß¡§½é´ü¥Ç¡¼¥¿¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£<br>";      
-        }
-    }   
-    
-    // ¥«¥é¥à¥³¥á¥ó¥È¤Î½ñ¹þ¤ß
-    if(count($objPage->arrErr) == 0) {
-        $objPage->arrErr = lfExecuteSQL("./sql/column_comment.sql", $dsn); 
-        if(count($objPage->arrErr) == 0) {
-            $objPage->tpl_message.="¡û¡§¥«¥é¥à¥³¥á¥ó¥È¤Î½ñ¹þ¤ß¤ËÀ®¸ù¤·¤Þ¤·¤¿¡£<br>";
-        } else {
-            $objPage->tpl_message.="¡ß¡§¥«¥é¥à¥³¥á¥ó¥È¤Î½ñ¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£<br>";        
-        }
-    }   
-    
-    // ¥Æ¡¼¥Ö¥ë¥³¥á¥ó¥È¤Î½ñ¹þ¤ß
-    if(count($objPage->arrErr) == 0) {
-        $objPage->arrErr = lfExecuteSQL("./sql/table_comment.sql", $dsn); 
-        if(count($objPage->arrErr) == 0) {
-            $objPage->tpl_message.="¡û¡§¥Æ¡¼¥Ö¥ë¥³¥á¥ó¥È¤Î½ñ¹þ¤ß¤ËÀ®¸ù¤·¤Þ¤·¤¿¡£<br>";
-        } else {
-            $objPage->tpl_message.="¡ß¡§¥Æ¡¼¥Ö¥ë¥³¥á¥ó¥È¤Î½ñ¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£<br>";      
-        }
-    }
-
-    if(count($objPage->arrErr) == 0) {
-        // ÀßÄê¥Õ¥¡¥¤¥ë¤ÎÀ¸À®
-        lfMakeConfigFile();
-        $objPage = lfDispStep3($objPage);
-        $objPage->tpl_mode = 'step4';
-    } else {
-        $objPage = lfDispStep3($objPage);
-    }
-    break;
+    // ÆþÎϥǡ¼¥¿¤òÅϤ¹¡£
+    $arrRet =  $objDBParam->getHashArray();
+    $dsn = $arrRet['db_type']."://".$arrRet['db_user'].":".$arrRet['db_password']."@".$arrRet['db_server'].":".$arrRet['db_port']."/".$arrRet['db_name'];
+
+    /*
+        lfAddTable¤Ï¡¢¥Ð¡¼¥¸¥ç¥ó¥¢¥Ã¥×Åù¤ÇÄɲåơ¼¥Ö¥ë¤¬È¯À¸¤·¤¿¾ì¹ç¤Ë¼Â¹Ô¤¹¤ë¡£
+        ¡Ê£Ä£Â¹½À®¤Î²¼°Ì¸ß´¹¤Î¤¿¤á¥¹¥­¥Ã¥×»þ¤â¶¯À©¡Ë
+    */
+    // ¥Æ¡¼¥Ö¥ë¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç¤ËÄɲ䵤ì¤ë¡£
+    $objPage->arrErr = lfAddTable("dtb_session", $dsn);         // ¥»¥Ã¥·¥ç¥ó´ÉÍý¥Æ¡¼¥Ö¥ë
+    $objPage->arrErr = lfAddTable("dtb_module", $dsn);          // ¥â¥¸¥å¡¼¥ë´ÉÍý¥Æ¡¼¥Ö¥ë
+    $objPage->arrErr = lfAddTable("dtb_campaign_order", $dsn);  // ¥­¥ã¥ó¥Ú¡¼¥ó¼õÃí¥Æ¡¼¥Ö¥ë
+    $objPage->arrErr = lfAddTable("dtb_mobile_kara_mail", $dsn);    // ¶õ¥á¡¼¥ë´ÉÍý¥Æ¡¼¥Ö¥ë
+    $objPage->arrErr = lfAddTable("dtb_mobile_ext_session_id", $dsn);   // ¥»¥Ã¥·¥ç¥óID´ÉÍý¥Æ¡¼¥Ö¥ë
+    $objPage->arrErr = lfAddTable("dtb_site_control", $dsn);    // ¥µ¥¤¥È¾ðÊó´ÉÍý¥Æ¡¼¥Ö¥ë
+    $objPage->arrErr = lfAddTable("dtb_trackback", $dsn);   // ¥È¥é¥Ã¥¯¥Ð¥Ã¥¯´ÉÍý¥Æ¡¼¥Ö¥ë
+    $objPage->arrErr = lfAddTable("dtb_blayn", $dsn);   // ¥Ö¥ì¥¤¥óIP´ÉÍý¥Æ¡¼¥Ö¥ë
+
+    // ¥«¥é¥à¤òÄɲÃ
+    lfAddColumn($dsn);
+
+    // ¥Ç¡¼¥¿¤òÄɲÃ
+    lfAddData($dsn);
+
+    if(count($objPage->arrErr) == 0) {
+        // ¥¹¥­¥Ã¥×¤¹¤ë¾ì¹ç¤Ë¤Ï¼¡²èÌ̤ØÁ«°Ü
+        $skip = $_POST["db_skip"];
+        if ($skip == "on") {
+            // ÀßÄê¥Õ¥¡¥¤¥ë¤ÎÀ¸À®
+            lfMakeConfigFile();
+            $objPage = lfDispComplete($objPage);
+            //$objPage = lfDispStep4($objPage);
+            break;
+        }
+    }
+
+    // ¥Æ¡¼¥Ö¥ë¤ÎºîÀ®
+    $objPage->arrErr = lfExecuteSQL("./sql/create_table_".$arrRet['db_type'].".sql", $dsn);
+    if(count($objPage->arrErr) == 0) {
+        $objPage->tpl_message.="¡û¡§¥Æ¡¼¥Ö¥ë¤ÎºîÀ®¤ËÀ®¸ù¤·¤Þ¤·¤¿¡£<br>";
+    } else {
+        $objPage->tpl_message.="¡ß¡§¥Æ¡¼¥Ö¥ë¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£<br>";
+    }
+
+    // ¥Ó¥å¡¼¤ÎºîÀ®
+    if(count($objPage->arrErr) == 0 and $arrRet['db_type'] == 'pgsql') {
+        // ¥Ó¥å¡¼¤ÎºîÀ®
+        $objPage->arrErr = lfExecuteSQL("./sql/create_view.sql", $dsn);
+        if(count($objPage->arrErr) == 0) {
+            $objPage->tpl_message.="¡û¡§¥Ó¥å¡¼¤ÎºîÀ®¤ËÀ®¸ù¤·¤Þ¤·¤¿¡£<br>";
+        } else {
+            $objPage->tpl_message.="¡ß¡§¥Ó¥å¡¼¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£<br>";
+        }
+    }
+
+    // ½é´ü¥Ç¡¼¥¿¤ÎºîÀ®
+    if(count($objPage->arrErr) == 0) {
+        $objPage->arrErr = lfExecuteSQL("./sql/insert_data.sql", $dsn);
+
+        if(count($objPage->arrErr) == 0) {
+            $objPage->tpl_message.="¡û¡§½é´ü¥Ç¡¼¥¿¤ÎºîÀ®¤ËÀ®¸ù¤·¤Þ¤·¤¿¡£<br>";
+        } else {
+            $objPage->tpl_message.="¡ß¡§½é´ü¥Ç¡¼¥¿¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£<br>";
+        }
+    }
+
+    // ¥«¥é¥à¥³¥á¥ó¥È¤Î½ñ¹þ¤ß
+    if(count($objPage->arrErr) == 0) {
+        $objPage->arrErr = lfExecuteSQL("./sql/column_comment.sql", $dsn);
+        if(count($objPage->arrErr) == 0) {
+            $objPage->tpl_message.="¡û¡§¥«¥é¥à¥³¥á¥ó¥È¤Î½ñ¹þ¤ß¤ËÀ®¸ù¤·¤Þ¤·¤¿¡£<br>";
+        } else {
+            $objPage->tpl_message.="¡ß¡§¥«¥é¥à¥³¥á¥ó¥È¤Î½ñ¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£<br>";
+        }
+    }
+
+    // ¥Æ¡¼¥Ö¥ë¥³¥á¥ó¥È¤Î½ñ¹þ¤ß
+    if(count($objPage->arrErr) == 0) {
+        $objPage->arrErr = lfExecuteSQL("./sql/table_comment.sql", $dsn);
+        if(count($objPage->arrErr) == 0) {
+            $objPage->tpl_message.="¡û¡§¥Æ¡¼¥Ö¥ë¥³¥á¥ó¥È¤Î½ñ¹þ¤ß¤ËÀ®¸ù¤·¤Þ¤·¤¿¡£<br>";
+        } else {
+            $objPage->tpl_message.="¡ß¡§¥Æ¡¼¥Ö¥ë¥³¥á¥ó¥È¤Î½ñ¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£<br>";
+        }
+    }
+
+    if(count($objPage->arrErr) == 0) {
+        // ÀßÄê¥Õ¥¡¥¤¥ë¤ÎÀ¸À®
+        lfMakeConfigFile();
+        $objPage = lfDispStep3($objPage);
+        $objPage->tpl_mode = 'step4';
+    } else {
+        $objPage = lfDispStep3($objPage);
+    }
+    break;
 case 'step4':
-    $objPage = lfDispStep4($objPage);
-    break;
-    
+    $objPage = lfDispStep4($objPage);
+    break;
+
 // ¥Æ¡¼¥Ö¥ëÎàºï½ü
 case 'drop':
-    // ÆþÎϥǡ¼¥¿¤òÅϤ¹¡£
-    $arrRet =  $objDBParam->getHashArray();
-    $dsn = $arrRet['db_type']."://".$arrRet['db_user'].":".$arrRet['db_password']."@".$arrRet['db_server'].":".$arrRet['db_port']."/".$arrRet['db_name'];
-    
-    // Äɲåơ¼¥Ö¥ë¤¬¤¢¤ì¤Ðºï½ü¤¹¤ë¡£
-    lfDropTable("dtb_module", $dsn);
-    lfDropTable("dtb_session", $dsn);
-    lfDropTable("dtb_campaign_order", $dsn);
-    lfDropTable("dtb_mobile_ext_session_id", $dsn);
-    lfDropTable("dtb_mobile_kara_mail", $dsn);
-    lfDropTable("dtb_site_control", $dsn);
-    lfDropTable("dtb_trackback", $dsn);
+    // ÆþÎϥǡ¼¥¿¤òÅϤ¹¡£
+    $arrRet =  $objDBParam->getHashArray();
+    $dsn = $arrRet['db_type']."://".$arrRet['db_user'].":".$arrRet['db_password']."@".$arrRet['db_server'].":".$arrRet['db_port']."/".$arrRet['db_name'];
+
+    // Äɲåơ¼¥Ö¥ë¤¬¤¢¤ì¤Ðºï½ü¤¹¤ë¡£
+    lfDropTable("dtb_module", $dsn);
+    lfDropTable("dtb_session", $dsn);
+    lfDropTable("dtb_campaign_order", $dsn);
+    lfDropTable("dtb_mobile_ext_session_id", $dsn);
+    lfDropTable("dtb_mobile_kara_mail", $dsn);
+    lfDropTable("dtb_site_control", $dsn);
+    lfDropTable("dtb_trackback", $dsn);
     lfDropTable("dtb_blayn", $dsn);
-            
-    if ($arrRet['db_type'] == 'pgsql'){
-        // ¥Ó¥å¡¼¤Îºï½ü
-        $objPage->arrErr = lfExecuteSQL("./sql/drop_view.sql", $dsn, false); 
-        if(count($objPage->arrErr) == 0) {
-            $objPage->tpl_message.="¡û¡§¥Ó¥å¡¼¤Îºï½ü¤ËÀ®¸ù¤·¤Þ¤·¤¿¡£<br>";
-        } else {
-            $objPage->tpl_message.="¡ß¡§¥Ó¥å¡¼¤Îºï½ü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£<br>";      
-        }
-    }
-
-    // ¥Æ¡¼¥Ö¥ë¤Îºï½ü
-    if(count($objPage->arrErr) == 0) {
-        $objPage->arrErr = lfExecuteSQL("./sql/drop_table.sql", $dsn, false); 
-        if(count($objPage->arrErr) == 0) {
-            $objPage->tpl_message.="¡û¡§¥Æ¡¼¥Ö¥ë¤Îºï½ü¤ËÀ®¸ù¤·¤Þ¤·¤¿¡£<br>";
-        } else {
-            $objPage->tpl_message.="¡ß¡§¥Æ¡¼¥Ö¥ë¤Îºï½ü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£<br>";        
-        }
-    }
-    $objPage = lfDispStep3($objPage);
-    break;
+
+    if ($arrRet['db_type'] == 'pgsql'){
+        // ¥Ó¥å¡¼¤Îºï½ü
+        $objPage->arrErr = lfExecuteSQL("./sql/drop_view.sql", $dsn, false);
+        if(count($objPage->arrErr) == 0) {
+            $objPage->tpl_message.="¡û¡§¥Ó¥å¡¼¤Îºï½ü¤ËÀ®¸ù¤·¤Þ¤·¤¿¡£<br>";
+        } else {
+            $objPage->tpl_message.="¡ß¡§¥Ó¥å¡¼¤Îºï½ü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£<br>";
+        }
+    }
+
+    // ¥Æ¡¼¥Ö¥ë¤Îºï½ü
+    if(count($objPage->arrErr) == 0) {
+        $objPage->arrErr = lfExecuteSQL("./sql/drop_table.sql", $dsn, false);
+        if(count($objPage->arrErr) == 0) {
+            $objPage->tpl_message.="¡û¡§¥Æ¡¼¥Ö¥ë¤Îºï½ü¤ËÀ®¸ù¤·¤Þ¤·¤¿¡£<br>";
+        } else {
+            $objPage->tpl_message.="¡ß¡§¥Æ¡¼¥Ö¥ë¤Îºï½ü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£<br>";
+        }
+    }
+    $objPage = lfDispStep3($objPage);
+    break;
 // ´°Î»²èÌÌ
 case 'complete':
-    // ¥·¥ç¥Ã¥×¥Þ¥¹¥¿¾ðÊó¤Î½ñ¤­¹þ¤ß
-    $arrRet =  $objDBParam->getHashArray();
-    
-    $dsn = $arrRet['db_type']."://".$arrRet['db_user'].":".$arrRet['db_password']."@".$arrRet['db_server'].":".$arrRet['db_port']."/".$arrRet['db_name'];
-    $sqlval['shop_name'] = $objWebParam->getValue('shop_name');
-    $sqlval['email01'] = $objWebParam->getValue('admin_mail');
-    $sqlval['email02'] = $objWebParam->getValue('admin_mail');
-    $sqlval['email03'] = $objWebParam->getValue('admin_mail');
-    $sqlval['email04'] = $objWebParam->getValue('admin_mail');
-    $sqlval['email05'] = $objWebParam->getValue('admin_mail');
-    $sqlval['top_tpl'] = "default1";
-    $sqlval['product_tpl'] = "default1";
-    $sqlval['detail_tpl'] = "default1";
-    $sqlval['mypage_tpl'] = "default1";
-    $objQuery = new SC_Query($dsn);
-    $cnt = $objQuery->count("dtb_baseinfo");
-    if($cnt > 0) {
-        $objQuery->update("dtb_baseinfo", $sqlval);
-    } else {        
-        $objQuery->insert("dtb_baseinfo", $sqlval);     
-    }
-
-    // ´ÉÍý¼ÔÅÐÏ¿
-    $login_id = $objWebParam->getValue('login_id');
-    $login_pass = sha1($objWebParam->getValue('login_pass') . ":" . AUTH_MAGIC);
-    
-    $sql = "DELETE FROM dtb_member WHERE login_id = ?";
-    $objQuery->query($sql, array($login_id));   
-
-    $sql = "INSERT INTO dtb_member (name, login_id, password, creator_id, authority, work, del_flg, rank, create_date, update_date)
-            VALUES ('´ÉÍý¼Ô',?,?,0,0,1,0,1, now(), now());";
-    
-    $objQuery->query($sql, array($login_id, $login_pass));      
-    
-    global $GLOBAL_ERR;
-    $GLOBAL_ERR = "";
-    $objPage = lfDispComplete($objPage);
-    
-    // ¥µ¥¤¥È¾ðÊó¤òÁ÷¿®
-    $req = new HTTP_Request("http://www.ec-cube.net/mall/use_site.php");
-    $req->setMethod(HTTP_REQUEST_METHOD_POST);
-    
-    $arrSendData = array();
-    foreach($_POST as $key => $val){
-        if (ereg("^senddata_*", $key)){
-            $arrSendDataTmp = array(str_replace("senddata_", "", $key) => $val);
-            $arrSendData = array_merge($arrSendData, $arrSendDataTmp);
-        }
-    }
-    
-    $req->addPostDataArray($arrSendData);
-    
-    if (!PEAR::isError($req->sendRequest())) {
-        $response1 = $req->getResponseBody();
-    } else {
-        $response1 = "";
-    }
-    $req->clearPostData();
-    
-    break;
+    // ¥·¥ç¥Ã¥×¥Þ¥¹¥¿¾ðÊó¤Î½ñ¤­¹þ¤ß
+    $arrRet =  $objDBParam->getHashArray();
+
+    $dsn = $arrRet['db_type']."://".$arrRet['db_user'].":".$arrRet['db_password']."@".$arrRet['db_server'].":".$arrRet['db_port']."/".$arrRet['db_name'];
+    $sqlval['shop_name'] = $objWebParam->getValue('shop_name');
+    $sqlval['email01'] = $objWebParam->getValue('admin_mail');
+    $sqlval['email02'] = $objWebParam->getValue('admin_mail');
+    $sqlval['email03'] = $objWebParam->getValue('admin_mail');
+    $sqlval['email04'] = $objWebParam->getValue('admin_mail');
+    $sqlval['email05'] = $objWebParam->getValue('admin_mail');
+    $sqlval['top_tpl'] = "default1";
+    $sqlval['product_tpl'] = "default1";
+    $sqlval['detail_tpl'] = "default1";
+    $sqlval['mypage_tpl'] = "default1";
+    $objQuery = new SC_Query($dsn);
+    $cnt = $objQuery->count("dtb_baseinfo");
+    if($cnt > 0) {
+        $objQuery->update("dtb_baseinfo", $sqlval);
+    } else {
+        $objQuery->insert("dtb_baseinfo", $sqlval);
+    }
+
+    // ´ÉÍý¼ÔÅÐÏ¿
+    $login_id = $objWebParam->getValue('login_id');
+    $login_pass = sha1($objWebParam->getValue('login_pass') . ":" . AUTH_MAGIC);
+
+    $sql = "DELETE FROM dtb_member WHERE login_id = ?";
+    $objQuery->query($sql, array($login_id));
+
+    $sql = "INSERT INTO dtb_member (name, login_id, password, creator_id, authority, work, del_flg, rank, create_date, update_date)
+            VALUES ('´ÉÍý¼Ô',?,?,0,0,1,0,1, now(), now());";
+
+    $objQuery->query($sql, array($login_id, $login_pass));
+
+    global $GLOBAL_ERR;
+    $GLOBAL_ERR = "";
+    $objPage = lfDispComplete($objPage);
+
+    // ¥µ¥¤¥È¾ðÊó¤òÁ÷¿®
+    $req = new HTTP_Request("http://www.ec-cube.net/mall/use_site.php");
+    $req->setMethod(HTTP_REQUEST_METHOD_POST);
+
+    $arrSendData = array();
+    foreach($_POST as $key => $val){
+        if (ereg("^senddata_*", $key)){
+            $arrSendDataTmp = array(str_replace("senddata_", "", $key) => $val);
+            $arrSendData = array_merge($arrSendData, $arrSendDataTmp);
+        }
+    }
+
+    $req->addPostDataArray($arrSendData);
+
+    if (!PEAR::isError($req->sendRequest())) {
+        $response1 = $req->getResponseBody();
+    } else {
+        $response1 = "";
+    }
+    $req->clearPostData();
+
+    break;
 case 'return_step0':
-    $objPage = lfDispStep0($objPage);
-    break;  
+    $objPage = lfDispStep0($objPage);
+    break;
 case 'return_step1':
-    $objPage = lfDispStep1($objPage);
-    break;
+    $objPage = lfDispStep1($objPage);
+    break;
 case 'return_step2':
-    $objPage = lfDispStep2($objPage);
-    break;
+    $objPage = lfDispStep2($objPage);
+    break;
 case 'return_step3':
-    $objPage = lfDispStep3($objPage);
-    break;
+    $objPage = lfDispStep3($objPage);
+    break;
 case 'return_agreement':
-    $objPage = lfDispAgreement($objPage);
-    $objPage->tpl_onload .= "fnChangeVisible('agreement_yes', 'next');";
-    break;
+    $objPage = lfDispAgreement($objPage);
+    $objPage->tpl_onload .= "fnChangeVisible('agreement_yes', 'next');";
+    break;
 case 'return_welcome':
 default:
-    $objPage = lfDispWelcome($objPage);
-    break;
+    $objPage = lfDispWelcome($objPage);
+    break;
 }
 
@@ -323 +323 @@
 // ¤è¤¦¤³¤½²èÌ̤Îɽ¼¨
 function lfDispWelcome($objPage) {
-    global $objWebParam;
-    global $objDBParam;
-    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
-    $objPage->arrHidden = $objWebParam->getHashArray();
-    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
-    $objPage->arrHidden = array_merge($objPage->arrHidden, $objDBParam->getHashArray());
-    $objPage->arrHidden['db_skip'] = $_POST['db_skip'];
-    $objPage->arrHidden['agreement'] = $_POST['agreement'];
-    $objPage->tpl_mainpage = 'welcome.tpl';
-    $objPage->tpl_mode = 'welcome';
-    return $objPage;
+    global $objWebParam;
+    global $objDBParam;
+    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
+    $objPage->arrHidden = $objWebParam->getHashArray();
+    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
+    $objPage->arrHidden = array_merge($objPage->arrHidden, $objDBParam->getHashArray());
+    $objPage->arrHidden['db_skip'] = $_POST['db_skip'];
+    $objPage->arrHidden['agreement'] = $_POST['agreement'];
+    $objPage->tpl_mainpage = 'welcome.tpl';
+    $objPage->tpl_mode = 'welcome';
+    return $objPage;
 }
 
 // »ÈÍѵöÂú·ÀÌó½ñ¤Îɽ¼¨
 function lfDispAgreement($objPage) {
-    global $objWebParam;
-    global $objDBParam;
-    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
-    $objPage->arrHidden = $objWebParam->getHashArray();
-    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
-    $objPage->arrHidden = array_merge($objPage->arrHidden, $objDBParam->getHashArray());
-    $objPage->arrHidden['db_skip'] = $_POST['db_skip'];
-    $objPage->arrHidden['agreement'] = $_POST['agreement']; 
-    $objPage->tpl_mainpage = 'agreement.tpl';
-    $objPage->tpl_mode = 'agreement';
-    return $objPage;
-}
-
-// STEP0²èÌ̤Îɽ¼¨(¥Õ¥¡¥¤¥ë¸¢¸Â¥Á¥§¥Ã¥¯) 
+    global $objWebParam;
+    global $objDBParam;
+    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
+    $objPage->arrHidden = $objWebParam->getHashArray();
+    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
+    $objPage->arrHidden = array_merge($objPage->arrHidden, $objDBParam->getHashArray());
+    $objPage->arrHidden['db_skip'] = $_POST['db_skip'];
+    $objPage->arrHidden['agreement'] = $_POST['agreement'];
+    $objPage->tpl_mainpage = 'agreement.tpl';
+    $objPage->tpl_mode = 'agreement';
+    return $objPage;
+}
+
+// STEP0²èÌ̤Îɽ¼¨(¥Õ¥¡¥¤¥ë¸¢¸Â¥Á¥§¥Ã¥¯)
 function lfDispStep0($objPage) {
-    global $objWebParam;
-    global $objDBParam;
-    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
-    $objPage->arrHidden = $objWebParam->getHashArray();
-    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
-    $objPage->arrHidden = array_merge($objPage->arrHidden, $objDBParam->getHashArray());
-    $objPage->arrHidden['db_skip'] = $_POST['db_skip'];
-    $objPage->arrHidden['agreement'] = $_POST['agreement'];
-    $objPage->tpl_mainpage = 'step0.tpl';
-    $objPage->tpl_mode = 'step0';
-    
-    // ¥×¥í¥°¥é¥à¤Ç½ñ¹þ¤ß¤µ¤ì¤ë¥Õ¥¡¥¤¥ë¡¦¥Ç¥£¥ì¥¯¥È¥ê
-    $arrWriteFile = array(
-        ".." . HTML2DATA_DIR . "install.php",
-        "../user_data",
-        "../cp",
-        "../upload",
-        ".." . HTML2DATA_DIR . "Smarty/templates_c",
-        ".." . HTML2DATA_DIR . "downloads",
-        ".." . HTML2DATA_DIR . "logs"
-    );
-    
-    $mess = "";
-    $err_file = false;
-    foreach($arrWriteFile as $val) {
-        if(file_exists($val)) {
-            $mode = lfGetFileMode($val);
-            $real_path = realpath($val);
-                        
-            // ¥Ç¥£¥ì¥¯¥È¥ê¤Î¾ì¹ç
-            if(is_dir($val)) {
-                if($mode == "777") {
-                    $mess.= ">> ¡û¡§$real_path($mode) <br>¥¢¥¯¥»¥¹¸¢¸Â¤ÏÀµ¾ï¤Ç¤¹¡£<br>";                    
-                } else {
-                    $mess.= ">> ¡ß¡§$real_path($mode) <br>¥æ¡¼¥¶½ñ¹þ¤ß¸¢¸Â(777)¤òÉÕÍ¿¤·¤Æ²¼¤µ¤¤¡£<br>";
-                    $err_file = true;                                       
-                }
-            } else {
-                if($mode == "666") {
-                    $mess.= ">> ¡û¡§$real_path($mode) <br>¥¢¥¯¥»¥¹¸¢¸Â¤ÏÀµ¾ï¤Ç¤¹¡£<br>";                    
-                } else {
-                    $mess.= ">> ¡ß¡§$real_path($mode) <br>¥æ¡¼¥¶½ñ¹þ¤ß¸¢¸Â(666)¤òÉÕÍ¿¤·¤Æ²¼¤µ¤¤¡£<br>";
-                    $err_file = true;                           
-                }
-            }           
-        } else {
-            $mess.= ">> ¡ß¡§$val ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£<br>";
-            $err_file = true;
-        }
-    }
-    
-    // ¸¢¸Â¥¨¥é¡¼Åù¤¬È¯À¸¤·¤Æ¤¤¤Ê¤¤¾ì¹ç
-    if(!$err_file) {
-        $path = ".." . HTML2DATA_DIR . "Smarty/templates_c/admin";
-        if(!file_exists($path)) {
-            mkdir($path);
-        }
-        $path = ".." . HTML2DATA_DIR . "Smarty/templates_c/mobile";
-        if(!file_exists($path)) {
-            mkdir($path); 
-        }
-        $path = "../upload/temp_template";
-        if(!file_exists($path)) {
-            mkdir($path);
-        }       
-        $path = "../upload/save_image";
-        if(!file_exists($path)) {
-            mkdir($path);
-        }
-        $path = "../upload/temp_image";
-        if(!file_exists($path)) {
-            mkdir($path);
-        }
-        $path = "../upload/graph_image";
-        if(!file_exists($path)) {
-            mkdir($path);
-        }
+    global $objWebParam;
+    global $objDBParam;
+    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
+    $objPage->arrHidden = $objWebParam->getHashArray();
+    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
+    $objPage->arrHidden = array_merge($objPage->arrHidden, $objDBParam->getHashArray());
+    $objPage->arrHidden['db_skip'] = $_POST['db_skip'];
+    $objPage->arrHidden['agreement'] = $_POST['agreement'];
+    $objPage->tpl_mainpage = 'step0.tpl';
+    $objPage->tpl_mode = 'step0';
+
+    // ¥×¥í¥°¥é¥à¤Ç½ñ¹þ¤ß¤µ¤ì¤ë¥Õ¥¡¥¤¥ë¡¦¥Ç¥£¥ì¥¯¥È¥ê
+    $arrWriteFile = array(
+        ".." . HTML2DATA_DIR . "install.php",
+        "../user_data",
+        "../cp",
+        "../upload",
+        ".." . HTML2DATA_DIR . "Smarty/templates_c",
+        ".." . HTML2DATA_DIR . "downloads",
+        ".." . HTML2DATA_DIR . "logs"
+    );
+
+    $mess = "";
+    $err_file = false;
+    foreach($arrWriteFile as $val) {
+        if(file_exists($val)) {
+            $mode = lfGetFileMode($val);
+            $real_path = realpath($val);
+
+            // ¥Ç¥£¥ì¥¯¥È¥ê¤Î¾ì¹ç
+            if(is_dir($val)) {
+                if($mode == "777") {
+                    $mess.= ">> ¡û¡§$real_path($mode) <br>¥¢¥¯¥»¥¹¸¢¸Â¤ÏÀµ¾ï¤Ç¤¹¡£<br>";
+                } else {
+                    $mess.= ">> ¡ß¡§$real_path($mode) <br>¥æ¡¼¥¶½ñ¹þ¤ß¸¢¸Â(777)¤òÉÕÍ¿¤·¤Æ²¼¤µ¤¤¡£<br>";
+                    $err_file = true;
+                }
+            } else {
+                if($mode == "666") {
+                    $mess.= ">> ¡û¡§$real_path($mode) <br>¥¢¥¯¥»¥¹¸¢¸Â¤ÏÀµ¾ï¤Ç¤¹¡£<br>";
+                } else {
+                    $mess.= ">> ¡ß¡§$real_path($mode) <br>¥æ¡¼¥¶½ñ¹þ¤ß¸¢¸Â(666)¤òÉÕÍ¿¤·¤Æ²¼¤µ¤¤¡£<br>";
+                    $err_file = true;
+                }
+            }
+        } else {
+            $mess.= ">> ¡ß¡§$val ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£<br>";
+            $err_file = true;
+        }
+    }
+
+    // ¸¢¸Â¥¨¥é¡¼Åù¤¬È¯À¸¤·¤Æ¤¤¤Ê¤¤¾ì¹ç
+    if(!$err_file) {
+        $path = ".." . HTML2DATA_DIR . "Smarty/templates_c/admin";
+        if(!file_exists($path)) {
+            mkdir($path);
+        }
+        $path = ".." . HTML2DATA_DIR . "Smarty/templates_c/mobile";
+        if(!file_exists($path)) {
+            mkdir($path);
+        }
+        $path = ".." . HTML2DATA_DIR . "Smarty/templates_c/default1";
+        if(!file_exists($path)) {
+            mkdir($path);
+        }
+        $path = "../upload/temp_template";
+        if(!file_exists($path)) {
+            mkdir($path);
+        }
+        $path = "../upload/save_image";
+        if(!file_exists($path)) {
+            mkdir($path);
+        }
+        $path = "../upload/temp_image";
+        if(!file_exists($path)) {
+            mkdir($path);
+        }
+        $path = "../upload/graph_image";
+        if(!file_exists($path)) {
+            mkdir($path);
+        }
         $path = "../upload/mobile_image";
-        if(!file_exists($path)) {
-            mkdir($path);
-        }
-        $path = "../upload/csv";
-        if(!file_exists($path)) {
-            mkdir($path);
-        }
-        $path = ".." . HTML2DATA_DIR . "downloads/module";
-        if(!file_exists($path)) {
-            mkdir($path);
-        }
-        $path = ".." . HTML2DATA_DIR . "downloads/update";
-        if(!file_exists($path)) {
-            mkdir($path);
-        }       
-    }
-    
-    $objPage->mess = $mess;
-    $objPage->err_file = $err_file;
-
-    return $objPage;
-}
-
-// STEP0_1²èÌ̤Îɽ¼¨(¥Õ¥¡¥¤¥ë¤Î¥³¥Ô¡¼) 
+        if(!file_exists($path)) {
+            mkdir($path);
+        }
+        $path = "../upload/csv";
+        if(!file_exists($path)) {
+            mkdir($path);
+        }
+        $path = ".." . HTML2DATA_DIR . "downloads/module";
+        if(!file_exists($path)) {
+            mkdir($path);
+        }
+        $path = ".." . HTML2DATA_DIR . "downloads/update";
+        if(!file_exists($path)) {
+            mkdir($path);
+        }
+    }
+
+    $objPage->mess = $mess;
+    $objPage->err_file = $err_file;
+
+    return $objPage;
+}
+
+// STEP0_1²èÌ̤Îɽ¼¨(¥Õ¥¡¥¤¥ë¤Î¥³¥Ô¡¼)
 function lfDispStep0_1($objPage) {
-    global $objWebParam;
-    global $objDBParam;
-    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
-    $objPage->arrHidden = $objWebParam->getHashArray();
-    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
-    $objPage->arrHidden = array_merge($objPage->arrHidden, $objDBParam->getHashArray());
-    $objPage->arrHidden['db_skip'] = $_POST['db_skip'];
-    $objPage->arrHidden['agreement'] = $_POST['agreement'];
-    $objPage->tpl_mainpage = 'step0_1.tpl';
-    $objPage->tpl_mode = 'step0_1';
-    // ¥Õ¥¡¥¤¥ë¥³¥Ô¡¼
-    $objPage->copy_mess = sfCopyDir("./user_data/", "../user_data/", $objPage->copy_mess);
-    $objPage->copy_mess = sfCopyDir("./save_image/", "../upload/save_image/", $objPage->copy_mess); 
-    return $objPage;
-}
-
-// STEP0_2²èÌ̤Îɽ¼¨(¥Õ¥¡¥¤¥ë¤Î¥³¥Ô¡¼) 
+    global $objWebParam;
+    global $objDBParam;
+    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
+    $objPage->arrHidden = $objWebParam->getHashArray();
+    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
+    $objPage->arrHidden = array_merge($objPage->arrHidden, $objDBParam->getHashArray());
+    $objPage->arrHidden['db_skip'] = $_POST['db_skip'];
+    $objPage->arrHidden['agreement'] = $_POST['agreement'];
+    $objPage->tpl_mainpage = 'step0_1.tpl';
+    $objPage->tpl_mode = 'step0_1';
+    // ¥Õ¥¡¥¤¥ë¥³¥Ô¡¼
+    $objPage->copy_mess = sfCopyDir("./user_data/", "../user_data/", $objPage->copy_mess);
+    $objPage->copy_mess = sfCopyDir("./save_image/", "../upload/save_image/", $objPage->copy_mess);
+    return $objPage;
+}
+
+// STEP0_2²èÌ̤Îɽ¼¨(¥Õ¥¡¥¤¥ë¤Î¥³¥Ô¡¼)
 function lfDispStep0_2($objPage) {
-    global $objWebParam;
-    global $objDBParam;
-    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
-    $objPage->arrHidden = $objWebParam->getHashArray();
-    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
-    $objPage->arrHidden = array_merge($objPage->arrHidden, $objDBParam->getHashArray());
-    $objPage->arrHidden['db_skip'] = $_POST['db_skip'];
-    $objPage->arrHidden['agreement'] = $_POST['agreement'];
-    $objPage->tpl_mainpage = 'step0_1.tpl';
-    $objPage->tpl_mode = 'step0_1';
-    // ¥Õ¥¡¥¤¥ë¥³¥Ô¡¼
-    $objPage->copy_mess = sfCopyDir("./user_data/", "../user_data/", $objPage->copy_mess);
-    $objPage->copy_mess = sfCopyDir("./save_image/", "../upload/save_image/", $objPage->copy_mess); 
-    return $objPage;
+    global $objWebParam;
+    global $objDBParam;
+    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
+    $objPage->arrHidden = $objWebParam->getHashArray();
+    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
+    $objPage->arrHidden = array_merge($objPage->arrHidden, $objDBParam->getHashArray());
+    $objPage->arrHidden['db_skip'] = $_POST['db_skip'];
+    $objPage->arrHidden['agreement'] = $_POST['agreement'];
+    $objPage->tpl_mainpage = 'step0_1.tpl';
+    $objPage->tpl_mode = 'step0_1';
+    // ¥Õ¥¡¥¤¥ë¥³¥Ô¡¼
+    $objPage->copy_mess = sfCopyDir("./user_data/", "../user_data/", $objPage->copy_mess);
+    $objPage->copy_mess = sfCopyDir("./save_image/", "../upload/save_image/", $objPage->copy_mess);
+    return $objPage;
 }
 
 function lfGetFileMode($path) {
-    $mode = substr(sprintf('%o', fileperms($path)), -3);
-    return $mode;
+    $mode = substr(sprintf('%o', fileperms($path)), -3);
+    return $mode;
 }
 
 // STEP1²èÌ̤Îɽ¼¨
 function lfDispStep1($objPage) {
-    global $objDBParam;
-    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
-    $objPage->arrHidden = $objDBParam->getHashArray();
-    $objPage->arrHidden['db_skip'] = $_POST['db_skip'];
-    $objPage->arrHidden['agreement'] = $_POST['agreement'];
-    $objPage->tpl_mainpage = 'step1.tpl';
-    $objPage->tpl_mode = 'step1';
-    return $objPage;
+    global $objDBParam;
+    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
+    $objPage->arrHidden = $objDBParam->getHashArray();
+    $objPage->arrHidden['db_skip'] = $_POST['db_skip'];
+    $objPage->arrHidden['agreement'] = $_POST['agreement'];
+    $objPage->tpl_mainpage = 'step1.tpl';
+    $objPage->tpl_mode = 'step1';
+    return $objPage;
 }
 
 // STEP2²èÌ̤Îɽ¼¨
 function lfDispStep2($objPage) {
-    global $objWebParam;
-    global $objDBParam;
-    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
-    $objPage->arrHidden = $objWebParam->getHashArray();
-    $objPage->arrHidden['db_skip'] = $_POST['db_skip'];
-    $objPage->arrHidden['agreement'] = $_POST['agreement'];
-    $objPage->tpl_mainpage = 'step2.tpl';
-    $objPage->tpl_mode = 'step2';
-    return $objPage;
+    global $objWebParam;
+    global $objDBParam;
+    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
+    $objPage->arrHidden = $objWebParam->getHashArray();
+    $objPage->arrHidden['db_skip'] = $_POST['db_skip'];
+    $objPage->arrHidden['agreement'] = $_POST['agreement'];
+    $objPage->tpl_mainpage = 'step2.tpl';
+    $objPage->tpl_mode = 'step2';
+    return $objPage;
 }
 
 // STEP3²èÌ̤Îɽ¼¨
 function lfDispStep3($objPage) {
-    global $objWebParam;
-    global $objDBParam;
-    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
-    $objPage->arrHidden = $objWebParam->getHashArray();
-    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
-    $objPage->arrHidden = array_merge($objPage->arrHidden, $objDBParam->getHashArray());
-    $objPage->arrHidden['agreement'] = $_POST['agreement'];
-    $objPage->tpl_db_skip = $_POST['db_skip'];
-    $objPage->tpl_mainpage = 'step3.tpl';
-    $objPage->tpl_mode = 'step3';
-    return $objPage;
+    global $objWebParam;
+    global $objDBParam;
+    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
+    $objPage->arrHidden = $objWebParam->getHashArray();
+    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
+    $objPage->arrHidden = array_merge($objPage->arrHidden, $objDBParam->getHashArray());
+    $objPage->arrHidden['agreement'] = $_POST['agreement'];
+    $objPage->tpl_db_skip = $_POST['db_skip'];
+    $objPage->tpl_mainpage = 'step3.tpl';
+    $objPage->tpl_mode = 'step3';
+    return $objPage;
 }
 
 // STEP4²èÌ̤Îɽ¼¨
 function lfDispStep4($objPage) {
-    global $objWebParam;
-    global $objDBParam;
-    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
-    $objPage->arrHidden = $objWebParam->getHashArray();
-    $objPage->arrHidden = array_merge($objPage->arrHidden, $objDBParam->getHashArray());
-    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
-    $objPage->arrHidden['agreement'] = $_POST['agreement'];
-    
-    $normal_url = $objWebParam->getValue('normal_url');
-    // ¸ìÈø¤Ë'/'¤ò¤Ä¤±¤ë
-    if (!ereg("/$", $normal_url)) $normal_url = $normal_url . "/";
-
-    $arrDbParam = $objDBParam->getHashArray();
-    $dsn = $arrDbParam['db_type']."://".$arrDbParam['db_user'].":".$arrDbParam['db_password']."@".$arrDbParam['db_server'].":".$arrDbParam['db_port']."/".$arrDbParam['db_name'];
-
-    $objPage->tpl_site_url = $normal_url;
-    $objPage->tpl_shop_name = $objWebParam->getValue('shop_name');
-    $objPage->tpl_cube_ver = ECCUBE_VERSION;
-    $objPage->tpl_php_ver = phpversion();
-    $objPage->tpl_db_ver = sfGetDBVersion($dsn);
-    $objPage->tpl_db_skip = $_POST['db_skip'];
-    $objPage->tpl_mainpage = 'step4.tpl';
-    $objPage->tpl_mode = 'complete';
-    return $objPage;
+    global $objWebParam;
+    global $objDBParam;
+    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
+    $objPage->arrHidden = $objWebParam->getHashArray();
+    $objPage->arrHidden = array_merge($objPage->arrHidden, $objDBParam->getHashArray());
+    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
+    $objPage->arrHidden['agreement'] = $_POST['agreement'];
+
+    $normal_url = $objWebParam->getValue('normal_url');
+    // ¸ìÈø¤Ë'/'¤ò¤Ä¤±¤ë
+    if (!ereg("/$", $normal_url)) $normal_url = $normal_url . "/";
+
+    $arrDbParam = $objDBParam->getHashArray();
+    $dsn = $arrDbParam['db_type']."://".$arrDbParam['db_user'].":".$arrDbParam['db_password']."@".$arrDbParam['db_server'].":".$arrDbParam['db_port']."/".$arrDbParam['db_name'];
+
+    $objPage->tpl_site_url = $normal_url;
+    $objPage->tpl_shop_name = $objWebParam->getValue('shop_name');
+    $objPage->tpl_cube_ver = ECCUBE_VERSION;
+    $objPage->tpl_php_ver = phpversion();
+    $objPage->tpl_db_ver = sfGetDBVersion($dsn);
+    $objPage->tpl_db_skip = $_POST['db_skip'];
+    $objPage->tpl_mainpage = 'step4.tpl';
+    $objPage->tpl_mode = 'complete';
+    return $objPage;
 }
 
 // ´°Î»²èÌ̤Îɽ¼¨
 function lfDispComplete($objPage) {
-    global $objWebParam;
-    global $objDBParam;
-    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
-    $objPage->arrHidden = $objWebParam->getHashArray();
-    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
-    $objPage->arrHidden = array_merge($objPage->arrHidden, $objDBParam->getHashArray());
-    $objPage->arrHidden['db_skip'] = $_POST['db_skip'];
-    $objPage->tpl_mainpage = 'complete.tpl';
-    $objPage->tpl_mode = 'complete';
-    
-    $secure_url = $objWebParam->getValue('secure_url');
-    // ¸ìÈø¤Ë'/'¤ò¤Ä¤±¤ë
-    if (!ereg("/$", $secure_url)) {
-        $secure_url = $secure_url . "/";
-    }
-    $objPage->tpl_sslurl = $secure_url;     
-    return $objPage;
+    global $objWebParam;
+    global $objDBParam;
+    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
+    $objPage->arrHidden = $objWebParam->getHashArray();
+    // hidden¤ËÆþÎÏÃͤòÊÝ»ý
+    $objPage->arrHidden = array_merge($objPage->arrHidden, $objDBParam->getHashArray());
+    $objPage->arrHidden['db_skip'] = $_POST['db_skip'];
+    $objPage->tpl_mainpage = 'complete.tpl';
+    $objPage->tpl_mode = 'complete';
+
+    $secure_url = $objWebParam->getValue('secure_url');
+    // ¸ìÈø¤Ë'/'¤ò¤Ä¤±¤ë
+    if (!ereg("/$", $secure_url)) {
+        $secure_url = $secure_url . "/";
+    }
+    $objPage->tpl_sslurl = $secure_url;
+    return $objPage;
 }
 
 // WEB¥Ñ¥é¥á¡¼¥¿¾ðÊó¤Î½é´ü²½
 function lfInitWebParam($objWebParam) {
-    
-    if(defined('HTML_PATH')) {
-        $install_dir = HTML_PATH;
-    } else {
-        $install_dir = realpath(dirname( __FILE__) . "/../") . "/";
-    }
-    
-    if(defined('SITE_URL')) {
-        $normal_url = SITE_URL;
-    } else {
-        $dir = ereg_replace("install/.*$", "", $_SERVER['REQUEST_URI']);
-        $normal_url = "http://" . $_SERVER['HTTP_HOST'] . $dir;
-    }
-    
-    if(defined('SSL_URL')) {
-        $secure_url = SSL_URL;
-    } else {
-        $dir = ereg_replace("install/.*$", "", $_SERVER['REQUEST_URI']);
-        $secure_url = "http://" . $_SERVER['HTTP_HOST'] . $dir;
-    }
-
-    // Ź̾¡¢´ÉÍý¼Ô¥á¡¼¥ë¥¢¥É¥ì¥¹¤ò¼èÆÀ¤¹¤ë¡£(ºÆ¥¤¥ó¥¹¥È¡¼¥ë»þ)
-    if(defined('DEFAULT_DSN')) {
-        $ret = sfTabaleExists("dtb_baseinfo", DEFAULT_DSN);
-        if($ret) {
-            $objQuery = new SC_Query();
-            $arrRet = $objQuery->select("shop_name, email01", "dtb_baseinfo");
-            $shop_name = $arrRet[0]['shop_name'];
-            $admin_mail = $arrRet[0]['email01'];
-        }
-    }
-
-    $objWebParam->addParam("Ź̾", "shop_name", MTEXT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK"), $shop_name);
-    $objWebParam->addParam("´ÉÍý¼Ô¡§¥á¡¼¥ë¥¢¥É¥ì¥¹", "admin_mail", MTEXT_LEN, "", array("EXIST_CHECK","EMAIL_CHECK","EMAIL_CHAR_CHECK","MAX_LENGTH_CHECK"), $admin_mail);
-    $objWebParam->addParam("´ÉÍý¼Ô¡§¥í¥°¥¤¥óID", "login_id", MTEXT_LEN, "", array("EXIST_CHECK","EXIST_CHECK", "ALNUM_CHECK"));
-    $objWebParam->addParam("´ÉÍý¼Ô¡§¥Ñ¥¹¥ï¡¼¥É", "login_pass", MTEXT_LEN, "", array("EXIST_CHECK","EXIST_CHECK", "ALNUM_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("MAX_LENGTH_CHECK")); 
-    
-    return $objWebParam;
+
+    if(defined('HTML_PATH')) {
+        $install_dir = HTML_PATH;
+    } else {
+        $install_dir = realpath(dirname( __FILE__) . "/../") . "/";
+    }
+
+    if(defined('SITE_URL')) {
+        $normal_url = SITE_URL;
+    } else {
+        $dir = ereg_replace("install/.*$", "", $_SERVER['REQUEST_URI']);
+        $normal_url = "http://" . $_SERVER['HTTP_HOST'] . $dir;
+    }
+
+    if(defined('SSL_URL')) {
+        $secure_url = SSL_URL;
+    } else {
+        $dir = ereg_replace("install/.*$", "", $_SERVER['REQUEST_URI']);
+        $secure_url = "http://" . $_SERVER['HTTP_HOST'] . $dir;
+    }
+
+    // Ź̾¡¢´ÉÍý¼Ô¥á¡¼¥ë¥¢¥É¥ì¥¹¤ò¼èÆÀ¤¹¤ë¡£(ºÆ¥¤¥ó¥¹¥È¡¼¥ë»þ)
+    if(defined('DEFAULT_DSN')) {
+        $ret = sfTabaleExists("dtb_baseinfo", DEFAULT_DSN);
+        if($ret) {
+            $objQuery = new SC_Query();
+            $arrRet = $objQuery->select("shop_name, email01", "dtb_baseinfo");
+            $shop_name = $arrRet[0]['shop_name'];
+            $admin_mail = $arrRet[0]['email01'];
+        }
+    }
+
+    $objWebParam->addParam("Ź̾", "shop_name", MTEXT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK"), $shop_name);
+    $objWebParam->addParam("´ÉÍý¼Ô¡§¥á¡¼¥ë¥¢¥É¥ì¥¹", "admin_mail", MTEXT_LEN, "", array("EXIST_CHECK","EMAIL_CHECK","EMAIL_CHAR_CHECK","MAX_LENGTH_CHECK"), $admin_mail);
+    $objWebParam->addParam("´ÉÍý¼Ô¡§¥í¥°¥¤¥óID", "login_id", MTEXT_LEN, "", array("EXIST_CHECK","EXIST_CHECK", "ALNUM_CHECK"));
+    $objWebParam->addParam("´ÉÍý¼Ô¡§¥Ñ¥¹¥ï¡¼¥É", "login_pass", MTEXT_LEN, "", array("EXIST_CHECK","EXIST_CHECK", "ALNUM_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("MAX_LENGTH_CHECK"));
+
+    return $objWebParam;
 }
 
 // DB¥Ñ¥é¥á¡¼¥¿¾ðÊó¤Î½é´ü²½
 function lfInitDBParam($objDBParam) {
-        
-    if(defined('DB_SERVER')) {
-        $db_server = DB_SERVER;
-    } else {
-        $db_server = "127.0.0.1";
-    }
-    
-    if(defined('DB_TYPE')) {
-        $db_type = DB_TYPE;
-    } else {
-        $db_type = "";
-    }
-    
-    if(defined('DB_PORT')) {
-        $db_port = DB_PORT;
-    } else {
-        $db_port = "";
-    }
-        
-    if(defined('DB_NAME')) {
-        $db_name = DB_NAME;
-    } else {
-        $db_name = "eccube_db";
-    }
-        
-    if(defined('DB_USER')) {
-        $db_user = DB_USER;
-    } else {
-        $db_user = "eccube_db_user";                
-    }
-            
-    $objDBParam->addParam("DB¤Î¼ïÎà", "db_type", INT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK"), $db_type);
-    $objDBParam->addParam("DB¥µ¡¼¥Ð", "db_server", MTEXT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK"), $db_server);
-    $objDBParam->addParam("DB¥Ý¡¼¥È", "db_port", INT_LEN, "", array("MAX_LENGTH_CHECK"), $db_port);
-    $objDBParam->addParam("DB̾", "db_name", MTEXT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK"), $db_name);
-    $objDBParam->addParam("DB¥æ¡¼¥¶", "db_user", MTEXT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK"), $db_user);
-    $objDBParam->addParam("DB¥Ñ¥¹¥ï¡¼¥É", "db_password", MTEXT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK"));   
-        
-    return $objDBParam;
+
+    if(defined('DB_SERVER')) {
+        $db_server = DB_SERVER;
+    } else {
+        $db_server = "127.0.0.1";
+    }
+
+    if(defined('DB_TYPE')) {
+        $db_type = DB_TYPE;
+    } else {
+        $db_type = "";
+    }
+
+    if(defined('DB_PORT')) {
+        $db_port = DB_PORT;
+    } else {
+        $db_port = "";
+    }
+
+    if(defined('DB_NAME')) {
+        $db_name = DB_NAME;
+    } else {
+        $db_name = "eccube_db";
+    }
+
+    if(defined('DB_USER')) {
+        $db_user = DB_USER;
+    } else {
+        $db_user = "eccube_db_user";
+    }
+
+    $objDBParam->addParam("DB¤Î¼ïÎà", "db_type", INT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK"), $db_type);
+    $objDBParam->addParam("DB¥µ¡¼¥Ð", "db_server", MTEXT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK"), $db_server);
+    $objDBParam->addParam("DB¥Ý¡¼¥È", "db_port", INT_LEN, "", array("MAX_LENGTH_CHECK"), $db_port);
+    $objDBParam->addParam("DB̾", "db_name", MTEXT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK"), $db_name);
+    $objDBParam->addParam("DB¥æ¡¼¥¶", "db_user", MTEXT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK"), $db_user);
+    $objDBParam->addParam("DB¥Ñ¥¹¥ï¡¼¥É", "db_password", MTEXT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK"));
+
+    return $objDBParam;
 }
 
 // ÆþÎÏÆâÍƤΥÁ¥§¥Ã¥¯
 function lfCheckWebError($objFormParam) {
-    // ÆþÎϥǡ¼¥¿¤òÅϤ¹¡£
-    $arrRet =  $objFormParam->getHashArray();
-    $objErr = new SC_CheckError($arrRet);
-    $objErr->arrErr = $objFormParam->checkError();
-    
-    // ¥Ç¥£¥ì¥¯¥È¥ê̾¤Î¤ß¼èÆÀ¤¹¤ë
-    $normal_dir = ereg_replace("^https?://[a-zA-Z0-9_~=&\?\.\-]+", "", $arrRet['normal_url']);
-    $secure_dir = ereg_replace("^https?://[a-zA-Z0-9_~=&\?\.\-]+", "", $arrRet['secure_url']);
-    
-    if($normal_dir != $secure_dir) {
-        $objErr->arrErr['normal_url'] = "URL¤Ë°Û¤Ê¤ë³¬Áؤò»ØÄꤹ¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£";
-        $objErr->arrErr['secure_url'] = "URL¤Ë°Û¤Ê¤ë³¬Áؤò»ØÄꤹ¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£";      
-    }
-    
-    // ¥í¥°¥¤¥óID¥Á¥§¥Ã¥¯
-    $objErr->doFunc(array("´ÉÍý¼Ô¡§¥í¥°¥¤¥óID",'login_id',ID_MIN_LEN , ID_MAX_LEN) ,array("NUM_RANGE_CHECK"));
-    
-    // ¥Ñ¥¹¥ï¡¼¥É¤Î¥Á¥§¥Ã¥¯
-    $objErr->doFunc( array("´ÉÍý¼Ô¡§¥Ñ¥¹¥ï¡¼¥É",'login_pass',4 ,15 ) ,array( "NUM_RANGE_CHECK" ) ); 
-    
-    return $objErr->arrErr;
+    // ÆþÎϥǡ¼¥¿¤òÅϤ¹¡£
+    $arrRet =  $objFormParam->getHashArray();
+    $objErr = new SC_CheckError($arrRet);
+    $objErr->arrErr = $objFormParam->checkError();
+
+    // ¥Ç¥£¥ì¥¯¥È¥ê̾¤Î¤ß¼èÆÀ¤¹¤ë
+    $normal_dir = ereg_replace("^https?://[a-zA-Z0-9_~=&\?\.\-]+", "", $arrRet['normal_url']);
+    $secure_dir = ereg_replace("^https?://[a-zA-Z0-9_~=&\?\.\-]+", "", $arrRet['secure_url']);
+
+    if($normal_dir != $secure_dir) {
+        $objErr->arrErr['normal_url'] = "URL¤Ë°Û¤Ê¤ë³¬Áؤò»ØÄꤹ¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£";
+        $objErr->arrErr['secure_url'] = "URL¤Ë°Û¤Ê¤ë³¬Áؤò»ØÄꤹ¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£";
+    }
+
+    // ¥í¥°¥¤¥óID¥Á¥§¥Ã¥¯
+    $objErr->doFunc(array("´ÉÍý¼Ô¡§¥í¥°¥¤¥óID",'login_id',ID_MIN_LEN , ID_MAX_LEN) ,array("NUM_RANGE_CHECK"));
+
+    // ¥Ñ¥¹¥ï¡¼¥É¤Î¥Á¥§¥Ã¥¯
+    $objErr->doFunc( array("´ÉÍý¼Ô¡§¥Ñ¥¹¥ï¡¼¥É",'login_pass',4 ,15 ) ,array( "NUM_RANGE_CHECK" ) );
+
+    return $objErr->arrErr;
 }
 
 // ÆþÎÏÆâÍƤΥÁ¥§¥Ã¥¯
 function lfCheckDBError($objFormParam) {
-    global $objPage;
-    
-    // ÆþÎϥǡ¼¥¿¤òÅϤ¹¡£
-    $arrRet =  $objFormParam->getHashArray();
-    
-    $objErr = new SC_CheckError($arrRet);
-    $objErr->arrErr = $objFormParam->checkError();
-    
-    if(count($objErr->arrErr) == 0) {
-        // Àܳ³Îǧ
-        $dsn = $arrRet['db_type']."://".$arrRet['db_user'].":".$arrRet['db_password']."@".$arrRet['db_server'].":".$arrRet['db_port']."/".$arrRet['db_name'];
-        // Debug¥â¡¼¥É»ØÄê
-        $options['debug'] = PEAR_DB_DEBUG;
-        $objDB = DB::connect($dsn, $options);
-        // ÀܳÀ®¸ù
-        if(!PEAR::isError($objDB)) {
-            // ¥Ç¡¼¥¿¥Ù¡¼¥¹¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤Î¼èÆÀ
-            $objPage->tpl_db_version = sfGetDBVersion($dsn);            
-        } else {
-            $objErr->arrErr['all'] = ">> " . $objDB->message . "<br>";
-            // ¥¨¥é¡¼Ê¸¤ò¼èÆÀ¤¹¤ë
-            ereg("\[(.*)\]", $objDB->userinfo, $arrKey);
-            $objErr->arrErr['all'].= $arrKey[0] . "<br>";
-            gfPrintLog($objDB->userinfo, INSTALL_LOG);
-        }
-    }
-    return $objErr->arrErr;
+    global $objPage;
+
+    // ÆþÎϥǡ¼¥¿¤òÅϤ¹¡£
+    $arrRet =  $objFormParam->getHashArray();
+
+    $objErr = new SC_CheckError($arrRet);
+    $objErr->arrErr = $objFormParam->checkError();
+
+    if(count($objErr->arrErr) == 0) {
+        // Àܳ³Îǧ
+        $dsn = $arrRet['db_type']."://".$arrRet['db_user'].":".$arrRet['db_password']."@".$arrRet['db_server'].":".$arrRet['db_port']."/".$arrRet['db_name'];
+        // Debug¥â¡¼¥É»ØÄê
+        $options['debug'] = PEAR_DB_DEBUG;
+        $objDB = DB::connect($dsn, $options);
+        // ÀܳÀ®¸ù
+        if(!PEAR::isError($objDB)) {
+            // ¥Ç¡¼¥¿¥Ù¡¼¥¹¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤Î¼èÆÀ
+            $objPage->tpl_db_version = sfGetDBVersion($dsn);
+        } else {
+            $objErr->arrErr['all'] = ">> " . $objDB->message . "<br>";
+            // ¥¨¥é¡¼Ê¸¤ò¼èÆÀ¤¹¤ë
+            ereg("\[(.*)\]", $objDB->userinfo, $arrKey);
+            $objErr->arrErr['all'].= $arrKey[0] . "<br>";
+            gfPrintLog($objDB->userinfo, INSTALL_LOG);
+        }
+    }
+    return $objErr->arrErr;
 }
 
 // SQLʸ¤Î¼Â¹Ô
 function lfExecuteSQL($filepath, $dsn, $disp_err = true) {
-    $arrErr = array();
-    
-    if(!file_exists($filepath)) {
-        $arrErr['all'] = ">> ¥¹¥¯¥ê¥×¥È¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó";
-    } else {
-        if($fp = fopen($filepath,"r")) {
-            $sql = fread($fp, filesize($filepath));
-            fclose($fp);
-        }
-        // Debug¥â¡¼¥É»ØÄê
-        $options['debug'] = PEAR_DB_DEBUG;
-        $objDB = DB::connect($dsn, $options);
-        // Àܳ¥¨¥é¡¼
-        if(!PEAR::isError($objDB)) {
-            // ²þ¹Ô¡¢¥¿¥Ö¤ò1¥¹¥Ú¡¼¥¹¤ËÊÑ´¹
-            $sql = preg_replace("/[\r\n\t]/"," ",$sql);
-            $sql_split = split(";",$sql);
-            foreach($sql_split as $key => $val){
-                if (trim($val) != "") {
-                    $ret = $objDB->query($val);
-                    if(PEAR::isError($ret) && $disp_err) {
-                        $arrErr['all'] = ">> " . $ret->message . "<br>";
-                        // ¥¨¥é¡¼Ê¸¤ò¼èÆÀ¤¹¤ë
-                        ereg("\[(.*)\]", $ret->userinfo, $arrKey);
-                        $arrErr['all'].= $arrKey[0] . "<br>";
-                        $objPage->update_mess.=">> ¥Æ¡¼¥Ö¥ë¹½À®¤ÎÊѹ¹¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£<br>";
-                        gfPrintLog($ret->userinfo, INSTALL_LOG);
-                    }
-                }
-            }           
-        } else {
-            $arrErr['all'] = ">> " . $objDB->message;
-            gfPrintLog($objDB->userinfo, INSTALL_LOG);
-        }
-    }
-    return $arrErr;
+    $arrErr = array();
+
+    if(!file_exists($filepath)) {
+        $arrErr['all'] = ">> ¥¹¥¯¥ê¥×¥È¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó";
+    } else {
+          if($fp = fopen($filepath,"r")) {
+            $sql = fread($fp, filesize($filepath));
+            fclose($fp);
+        }
+        // Debug¥â¡¼¥É»ØÄê
+        $options['debug'] = PEAR_DB_DEBUG;
+        $objDB = DB::connect($dsn, $options);
+        // Àܳ¥¨¥é¡¼
+        if(!PEAR::isError($objDB)) {
+            // ²þ¹Ô¡¢¥¿¥Ö¤ò1¥¹¥Ú¡¼¥¹¤ËÊÑ´¹
+            $sql = preg_replace("/[\r\n\t]/"," ",$sql);
+            $sql_split = split(";",$sql);
+            foreach($sql_split as $key => $val){
+                if (trim($val) != "") {
+                    $ret = $objDB->query($val);
+                    if(PEAR::isError($ret) && $disp_err) {
+                        $arrErr['all'] = ">> " . $ret->message . "<br>";
+                        // ¥¨¥é¡¼Ê¸¤ò¼èÆÀ¤¹¤ë
+                        ereg("\[(.*)\]", $ret->userinfo, $arrKey);
+                        $arrErr['all'].= $arrKey[0] . "<br>";
+                        $objPage->update_mess.=">> ¥Æ¡¼¥Ö¥ë¹½À®¤ÎÊѹ¹¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£<br>";
+                        gfPrintLog($ret->userinfo, INSTALL_LOG);
+                    }
+                }
+            }
+        } else {
+            $arrErr['all'] = ">> " . $objDB->message;
+            gfPrintLog($objDB->userinfo, INSTALL_LOG);
+        }
+    }
+    return $arrErr;
 }
 
 // ÀßÄê¥Õ¥¡¥¤¥ë¤ÎºîÀ®
 function lfMakeConfigFile() {
-    global $objWebParam;
-    global $objDBParam;
-    
-    $root_dir = $objWebParam->getValue('install_dir');
-    // ¸ìÈø¤Ë'/'¤ò¤Ä¤±¤ë
-    if (!ereg("/$", $root_dir)) {
-        $root_dir = $root_dir . "/";
-    }
-    
-    $normal_url = $objWebParam->getValue('normal_url');
-    // ¸ìÈø¤Ë'/'¤ò¤Ä¤±¤ë
-    if (!ereg("/$", $normal_url)) {
-        $normal_url = $normal_url . "/";
-    }
-    
-    $secure_url = $objWebParam->getValue('secure_url');
-    // ¸ìÈø¤Ë'/'¤ò¤Ä¤±¤ë
-    if (!ereg("/$", $secure_url)) {
-        $secure_url = $secure_url . "/";
-    }
-    
-    // ¥Ç¥£¥ì¥¯¥È¥ê¤Î¼èÆÀ
-    $url_dir = ereg_replace("^https?://[a-zA-Z0-9_~=&\?\.\-]+", "", $normal_url);
-    
-    $data_path = sfRmDupSlash($root_dir . HTML2DATA_DIR);
+    global $objWebParam;
+    global $objDBParam;
+
+    $root_dir = $objWebParam->getValue('install_dir');
+    // ¸ìÈø¤Ë'/'¤ò¤Ä¤±¤ë
+    if (!ereg("/$", $root_dir)) {
+        $root_dir = $root_dir . "/";
+    }
+
+    $normal_url = $objWebParam->getValue('normal_url');
+    // ¸ìÈø¤Ë'/'¤ò¤Ä¤±¤ë
+    if (!ereg("/$", $normal_url)) {
+        $normal_url = $normal_url . "/";
+    }
+
+    $secure_url = $objWebParam->getValue('secure_url');
+    // ¸ìÈø¤Ë'/'¤ò¤Ä¤±¤ë
+    if (!ereg("/$", $secure_url)) {
+        $secure_url = $secure_url . "/";
+    }
+
+    // ¥Ç¥£¥ì¥¯¥È¥ê¤Î¼èÆÀ
+    $url_dir = ereg_replace("^https?://[a-zA-Z0-9_~=&\?\.\-]+", "", $normal_url);
+
+    $data_path = sfRmDupSlash($root_dir . HTML2DATA_DIR);
     $data_path = realpath($data_path);
     // ¸ìÈø¤Ë'/'¤ò¤Ä¤±¤ë
-    if (!ereg("/$", $data_path)) {
-        $data_path = $data_path . "/";
-    }
-    $filepath = $data_path . "install.php";
-    
-    $config_data = 
-    "<?php\n".
-    "    define ('ECCUBE_INSTALL', 'ON');\n" .
-    "    define ('HTML_PATH', '" . $root_dir . "');\n" .     
-    "    define ('SITE_URL', '" . $normal_url . "');\n" .
-    "    define ('SSL_URL', '" . $secure_url . "');\n" .
-    "    define ('URL_DIR', '" . $url_dir . "');\n" .   
-    "    define ('DOMAIN_NAME', '" . $objWebParam->getValue('domain') . "');\n" .
-    "    define ('DB_TYPE', '" . $objDBParam->getValue('db_type') . "');\n" .
-    "    define ('DB_USER', '" . $objDBParam->getValue('db_user') . "');\n" . 
-    "    define ('DB_PASSWORD', '" . $objDBParam->getValue('db_password') . "');\n" .
-    "    define ('DB_SERVER', '" . $objDBParam->getValue('db_server') . "');\n" .
-    "    define ('DB_NAME', '" . $objDBParam->getValue('db_name') . "');\n" .
-    "    define ('DB_PORT', '" . $objDBParam->getValue('db_port') .  "');\n" .
-    "    define ('DATA_PATH', '".$data_path."');\n" .
+    if (!ereg("/$", $data_path)) {
+        $data_path = $data_path . "/";
+    }
+    $filepath = $data_path . "install.php";
+
+    $config_data =
+    "<?php\n".
+    "    define ('ECCUBE_INSTALL', 'ON');\n" .
+    "    define ('HTML_PATH', '" . $root_dir . "');\n" .
+    "    define ('SITE_URL', '" . $normal_url . "');\n" .
+    "    define ('SSL_URL', '" . $secure_url . "');\n" .
+    "    define ('URL_DIR', '" . $url_dir . "');\n" .
+    "    define ('DOMAIN_NAME', '" . $objWebParam->getValue('domain') . "');\n" .
+    "    define ('DB_TYPE', '" . $objDBParam->getValue('db_type') . "');\n" .
+    "    define ('DB_USER', '" . $objDBParam->getValue('db_user') . "');\n" .
+    "    define ('DB_PASSWORD', '" . $objDBParam->getValue('db_password') . "');\n" .
+    "    define ('DB_SERVER', '" . $objDBParam->getValue('db_server') . "');\n" .
+    "    define ('DB_NAME', '" . $objDBParam->getValue('db_name') . "');\n" .
+    "    define ('DB_PORT', '" . $objDBParam->getValue('db_port') .  "');\n" .
+    "    define ('DATA_PATH', '".$data_path."');\n" .
     "    define ('MOBILE_HTML_PATH', HTML_PATH . 'mobile/');\n" .
     "    define ('MOBILE_SITE_URL', SITE_URL . 'mobile/');\n" .
     "    define ('MOBILE_SSL_URL', SSL_URL . 'mobile/');\n" .
     "    define ('MOBILE_URL_DIR', URL_DIR . 'mobile/');\n" .
-    "?>";
-    
-    if($fp = fopen($filepath,"w")) {
-        fwrite($fp, $config_data);
-        fclose($fp);
-    }
+    "?>";
+
+    if($fp = fopen($filepath,"w")) {
+        fwrite($fp, $config_data);
+        fclose($fp);
+    }
 }
 
@@ -833 +837 @@
 function lfAddTable($table_name, $dsn) {
     global $objPage;
-    $arrErr = array();
-    if(!sfTabaleExists($table_name, $dsn)) {
-        list($db_type) = split(":", $dsn);
-        $sql_path = "./sql/add/". $table_name . "_" .$db_type .".sql";
-        $arrErr = lfExecuteSQL($sql_path, $dsn);
-        if(count($arrErr) == 0) {
-            $objPage->tpl_message.="¡û¡§Äɲåơ¼¥Ö¥ë($table_name)¤ÎºîÀ®¤ËÀ®¸ù¤·¤Þ¤·¤¿¡£<br>";
-        } else {
-            $objPage->tpl_message.="¡ß¡§Äɲåơ¼¥Ö¥ë($table_name)¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£<br>";       
-        }
-    } else {
-        $objPage->tpl_message.="¡û¡§Äɲåơ¼¥Ö¥ë($table_name)¤¬³Îǧ¤µ¤ì¤Þ¤·¤¿¡£<br>";        
-    }
-    
-    return $arrErr;
+    $arrErr = array();
+    if(!sfTabaleExists($table_name, $dsn)) {
+        list($db_type) = split(":", $dsn);
+        $sql_path = "./sql/add/". $table_name . "_" .$db_type .".sql";
+        $arrErr = lfExecuteSQL($sql_path, $dsn);
+        if(count($arrErr) == 0) {
+            $objPage->tpl_message.="¡û¡§Äɲåơ¼¥Ö¥ë($table_name)¤ÎºîÀ®¤ËÀ®¸ù¤·¤Þ¤·¤¿¡£<br>";
+        } else {
+            $objPage->tpl_message.="¡ß¡§Äɲåơ¼¥Ö¥ë($table_name)¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£<br>";
+        }
+    } else {
+        $objPage->tpl_message.="¡û¡§Äɲåơ¼¥Ö¥ë($table_name)¤¬³Îǧ¤µ¤ì¤Þ¤·¤¿¡£<br>";
+    }
+
+    return $arrErr;
 }
 
 // ¥Æ¡¼¥Ö¥ë¤Îºï½ü¡Ê´û¤Ë¥Æ¡¼¥Ö¥ë¤¬Â¸ºß¤¹¤ë¾ì¹ç¤Î¤ßºï½ü¤¹¤ë¡Ë
 function lfDropTable($table_name, $dsn) {
-    $arrErr = array();
-    if(sfTabaleExists($table_name, $dsn)) {
-        // Debug¥â¡¼¥É»ØÄê
-        $options['debug'] = PEAR_DB_DEBUG;
-        $objDB = DB::connect($dsn, $options);
-        // ÀܳÀ®¸ù
-        if(!PEAR::isError($objDB)) {
-            $objDB->query("DROP TABLE " . $table_name);
-        } else {
-            $arrErr['all'] = ">> " . $objDB->message . "<br>";
-            // ¥¨¥é¡¼Ê¸¤ò¼èÆÀ¤¹¤ë
-            ereg("\[(.*)\]", $objDB->userinfo, $arrKey);
-            $arrErr['all'].= $arrKey[0] . "<br>";
-            gfPrintLog($objDB->userinfo, INSTALL_LOG);
-        }
-    }
-    return $arrErr;
+    $arrErr = array();
+    if(sfTabaleExists($table_name, $dsn)) {
+        // Debug¥â¡¼¥É»ØÄê
+        $options['debug'] = PEAR_DB_DEBUG;
+        $objDB = DB::connect($dsn, $options);
+        // ÀܳÀ®¸ù
+        if(!PEAR::isError($objDB)) {
+            $objDB->query("DROP TABLE " . $table_name);
+        } else {
+            $arrErr['all'] = ">> " . $objDB->message . "<br>";
+            // ¥¨¥é¡¼Ê¸¤ò¼èÆÀ¤¹¤ë
+            ereg("\[(.*)\]", $objDB->userinfo, $arrKey);
+            $arrErr['all'].= $arrKey[0] . "<br>";
+            gfPrintLog($objDB->userinfo, INSTALL_LOG);
+        }
+    }
+    return $arrErr;
 }
 
 // ¥«¥é¥à¤ÎÄɲáʴû¤Ë¥«¥é¥à¤¬Â¸ºß¤¹¤ë¾ì¹ç¤ÏºîÀ®¤·¤Ê¤¤¡Ë
 function lfAddColumn($dsn) {
-    global $objDBParam;
-
-    // ¼õÃí¥Æ¡¼¥Ö¥ë 
-    sfColumnExists("dtb_order", "memo01", "text", $dsn, true);  
-    sfColumnExists("dtb_order", "memo02", "text", $dsn, true);
-    sfColumnExists("dtb_order", "memo03", "text", $dsn, true);
-    sfColumnExists("dtb_order", "memo04", "text", $dsn, true);
-    sfColumnExists("dtb_order", "memo05", "text", $dsn, true);
-    sfColumnExists("dtb_order", "memo06", "text", $dsn, true);
-    sfColumnExists("dtb_order", "memo07", "text", $dsn, true);
-    sfColumnExists("dtb_order", "memo08", "text", $dsn, true);
-    sfColumnExists("dtb_order", "memo09", "text", $dsn, true);
-    sfColumnExists("dtb_order", "memo10", "text", $dsn, true);
-    sfColumnExists("dtb_order", "campaign_id", "int4", $dsn, true);
-
-    // ¼õÃí°ì»þ¥Æ¡¼¥Ö¥ë 
-    sfColumnExists("dtb_order_temp", "order_id", "text", $dsn, true);   
-    sfColumnExists("dtb_order_temp", "memo01", "text", $dsn, true); 
-    sfColumnExists("dtb_order_temp", "memo02", "text", $dsn, true);
-    sfColumnExists("dtb_order_temp", "memo03", "text", $dsn, true);
-    sfColumnExists("dtb_order_temp", "memo04", "text", $dsn, true);
-    sfColumnExists("dtb_order_temp", "memo05", "text", $dsn, true);
-    sfColumnExists("dtb_order_temp", "memo06", "text", $dsn, true);
-    sfColumnExists("dtb_order_temp", "memo07", "text", $dsn, true);
-    sfColumnExists("dtb_order_temp", "memo08", "text", $dsn, true);
-    sfColumnExists("dtb_order_temp", "memo09", "text", $dsn, true);
-    sfColumnExists("dtb_order_temp", "memo10", "text", $dsn, true);
-
-    // »Ùʧ¾ðÊó¥Æ¡¼¥Ö¥ë
-    sfColumnExists("dtb_payment", "charge_flg", "int2 default 1", $dsn, true);  
-    sfColumnExists("dtb_payment", "rule_min", "numeric", $dsn, true);   
-    sfColumnExists("dtb_payment", "upper_rule_max", "numeric", $dsn, true); 
-    sfColumnExists("dtb_payment", "module_id", "int4", $dsn, true); 
-    sfColumnExists("dtb_payment", "module_path", "text", $dsn, true);
-    sfColumnExists("dtb_payment", "memo01", "text", $dsn, true);    
-    sfColumnExists("dtb_payment", "memo02", "text", $dsn, true);
-    sfColumnExists("dtb_payment", "memo03", "text", $dsn, true);
-    sfColumnExists("dtb_payment", "memo04", "text", $dsn, true);
-    sfColumnExists("dtb_payment", "memo05", "text", $dsn, true);
-    sfColumnExists("dtb_payment", "memo06", "text", $dsn, true);
-    sfColumnExists("dtb_payment", "memo07", "text", $dsn, true);
-    sfColumnExists("dtb_payment", "memo08", "text", $dsn, true);
-    sfColumnExists("dtb_payment", "memo09", "text", $dsn, true);
-    sfColumnExists("dtb_payment", "memo10", "text", $dsn, true);
-    
-    // ¥­¥ã¥ó¥Ú¡¼¥ó¥Æ¡¼¥Ö¥ë
-    sfColumnExists("dtb_campaign", "directory_name", "text NOT NULL", $dsn, true);
-    sfColumnExists("dtb_campaign", "limit_count", "int4 NOT NULL DEFAULT 0", $dsn, true);
-    sfColumnExists("dtb_campaign", "total_count", "int4 NOT NULL DEFAULT 0", $dsn, true);
-    sfColumnExists("dtb_campaign", "orverlapping_flg", "int2 NOT NULL DEFAULT 0", $dsn, true);
-    sfColumnExists("dtb_campaign", "cart_flg", "int2 NOT NULL DEFAULT 0", $dsn, true);
-    sfColumnExists("dtb_campaign", "deliv_free_flg", "int2 NOT NULL DEFAULT 0", $dsn, true);    
-
-    // ¸ÜµÒ
-    sfColumnExists("dtb_customer", "mailmaga_flg", "int2", $dsn, true);
-    
+    global $objDBParam;
+
+    // ¼õÃí¥Æ¡¼¥Ö¥ë
+    sfColumnExists("dtb_order", "memo01", "text", $dsn, true);
+    sfColumnExists("dtb_order", "memo02", "text", $dsn, true);
+    sfColumnExists("dtb_order", "memo03", "text", $dsn, true);
+    sfColumnExists("dtb_order", "memo04", "text", $dsn, true);
+    sfColumnExists("dtb_order", "memo05", "text", $dsn, true);
+    sfColumnExists("dtb_order", "memo06", "text", $dsn, true);
+    sfColumnExists("dtb_order", "memo07", "text", $dsn, true);
+    sfColumnExists("dtb_order", "memo08", "text", $dsn, true);
+    sfColumnExists("dtb_order", "memo09", "text", $dsn, true);
+    sfColumnExists("dtb_order", "memo10", "text", $dsn, true);
+    sfColumnExists("dtb_order", "campaign_id", "int4", $dsn, true);
+
+    // ¼õÃí°ì»þ¥Æ¡¼¥Ö¥ë
+    sfColumnExists("dtb_order_temp", "order_id", "text", $dsn, true);
+    sfColumnExists("dtb_order_temp", "memo01", "text", $dsn, true);
+    sfColumnExists("dtb_order_temp", "memo02", "text", $dsn, true);
+    sfColumnExists("dtb_order_temp", "memo03", "text", $dsn, true);
+    sfColumnExists("dtb_order_temp", "memo04", "text", $dsn, true);
+    sfColumnExists("dtb_order_temp", "memo05", "text", $dsn, true);
+    sfColumnExists("dtb_order_temp", "memo06", "text", $dsn, true);
+    sfColumnExists("dtb_order_temp", "memo07", "text", $dsn, true);
+    sfColumnExists("dtb_order_temp", "memo08", "text", $dsn, true);
+    sfColumnExists("dtb_order_temp", "memo09", "text", $dsn, true);
+    sfColumnExists("dtb_order_temp", "memo10", "text", $dsn, true);
+
+    // »Ùʧ¾ðÊó¥Æ¡¼¥Ö¥ë
+    sfColumnExists("dtb_payment", "charge_flg", "int2 default 1", $dsn, true);
+    sfColumnExists("dtb_payment", "rule_min", "numeric", $dsn, true);
+    sfColumnExists("dtb_payment", "upper_rule_max", "numeric", $dsn, true);
+    sfColumnExists("dtb_payment", "module_id", "int4", $dsn, true);
+    sfColumnExists("dtb_payment", "module_path", "text", $dsn, true);
+    sfColumnExists("dtb_payment", "memo01", "text", $dsn, true);
+    sfColumnExists("dtb_payment", "memo02", "text", $dsn, true);
+    sfColumnExists("dtb_payment", "memo03", "text", $dsn, true);
+    sfColumnExists("dtb_payment", "memo04", "text", $dsn, true);
+    sfColumnExists("dtb_payment", "memo05", "text", $dsn, true);
+    sfColumnExists("dtb_payment", "memo06", "text", $dsn, true);
+    sfColumnExists("dtb_payment", "memo07", "text", $dsn, true);
+    sfColumnExists("dtb_payment", "memo08", "text", $dsn, true);
+    sfColumnExists("dtb_payment", "memo09", "text", $dsn, true);
+    sfColumnExists("dtb_payment", "memo10", "text", $dsn, true);
+
+    // ¥­¥ã¥ó¥Ú¡¼¥ó¥Æ¡¼¥Ö¥ë
+    sfColumnExists("dtb_campaign", "directory_name", "text NOT NULL", $dsn, true);
+    sfColumnExists("dtb_campaign", "limit_count", "int4 NOT NULL DEFAULT 0", $dsn, true);
+    sfColumnExists("dtb_campaign", "total_count", "int4 NOT NULL DEFAULT 0", $dsn, true);
+    sfColumnExists("dtb_campaign", "orverlapping_flg", "int2 NOT NULL DEFAULT 0", $dsn, true);
+    sfColumnExists("dtb_campaign", "cart_flg", "int2 NOT NULL DEFAULT 0", $dsn, true);
+    sfColumnExists("dtb_campaign", "deliv_free_flg", "int2 NOT NULL DEFAULT 0", $dsn, true);
+
+    // ¸ÜµÒ
+    sfColumnExists("dtb_customer", "mailmaga_flg", "int2", $dsn, true);
+
     // ¥¤¥ó¥Ç¥Ã¥¯¥¹¤Î³Îǧ
-    if (!sfColumnExists("dtb_customer", "mobile_phone_id", "text", $dsn, true)) {
-        // ¥¤¥ó¥Ç¥Ã¥¯¥¹¤ÎÄɲÃ
-        sfIndexExists("dtb_customer", "mobile_phone_id", "dtb_customer_mobile_phone_id_key", 64, $dsn, true);
-    }
-
-    // ¸ÜµÒ¥á¡¼¥ë
-    if ($objDBParam->getValue('db_type') == 'mysql') {
-        sfColumnExists("dtb_customer_mail", "secret_key", "varchar(50) unique", $dsn, true);
-    } else {
-        sfColumnExists("dtb_customer_mail", "secret_key", "text unique", $dsn, true);
-    }
+    if (!sfColumnExists("dtb_customer", "mobile_phone_id", "text", $dsn, true)) {
+        // ¥¤¥ó¥Ç¥Ã¥¯¥¹¤ÎÄɲÃ
+        sfIndexExists("dtb_customer", "mobile_phone_id", "dtb_customer_mobile_phone_id_key", 64, $dsn, true);
+    }
+
+    // ¸ÜµÒ¥á¡¼¥ë
+    if ($objDBParam->getValue('db_type') == 'mysql') {
+        sfColumnExists("dtb_customer_mail", "secret_key", "varchar(50) unique", $dsn, true);
+    } else {
+        sfColumnExists("dtb_customer_mail", "secret_key", "text unique", $dsn, true);
+    }
 }
 
 // ¥Ç¡¼¥¿¤ÎÄɲáʴû¤Ë¥Ç¡¼¥¿¤¬Â¸ºß¤¹¤ë¾ì¹ç¤ÏºîÀ®¤·¤Ê¤¤¡Ë
 function lfAddData($dsn) {
-    // CSV¥Æ¡¼¥Ö¥ë
-    if(sfTabaleExists('dtb_csv', $dsn)) {
-        lfInsertCSVData(1,'category_id','¥«¥Æ¥´¥êID',53,'now()','now()', $dsn);     
-        lfInsertCSVData(4,'order_id','ÃíʸID',1,'now()','now()', $dsn);
-        lfInsertCSVData(4,'campaign_id','¥­¥ã¥ó¥Ú¡¼¥óID',2,'now()','now()', $dsn);
-        lfInsertCSVData(4,'customer_id','¸ÜµÒID',3,'now()','now()', $dsn);
-        lfInsertCSVData(4,'message','Í×˾Åù',4,'now()','now()', $dsn);
-        lfInsertCSVData(4,'order_name01','¸ÜµÒ̾1',5,'now()','now()', $dsn);
-        lfInsertCSVData(4,'order_name02','¸ÜµÒ̾2',6,'now()','now()', $dsn);
-        lfInsertCSVData(4,'order_kana01','¸ÜµÒ̾¥«¥Ê1',7,'now()','now()', $dsn);
-        lfInsertCSVData(4,'order_kana02','¸ÜµÒ̾¥«¥Ê2',8,'now()','now()', $dsn);
-        lfInsertCSVData(4,'order_email','¥á¡¼¥ë¥¢¥É¥ì¥¹',9,'now()','now()', $dsn);
-        lfInsertCSVData(4,'order_tel01','ÅÅÏÃÈÖ¹æ1',10,'now()','now()', $dsn);
-        lfInsertCSVData(4,'order_tel02','ÅÅÏÃÈÖ¹æ2',11,'now()','now()', $dsn);
-        lfInsertCSVData(4,'order_tel03','ÅÅÏÃÈÖ¹æ3',12,'now()','now()', $dsn);
-        lfInsertCSVData(4,'order_fax01','FAX1',13,'now()','now()', $dsn);
-        lfInsertCSVData(4,'order_fax02','FAX2',14,'now()','now()', $dsn);
-        lfInsertCSVData(4,'order_fax03','FAX3',15,'now()','now()', $dsn);
-        lfInsertCSVData(4,'order_zip01','͹ÊØÈÖ¹æ1',16,'now()','now()', $dsn);
-        lfInsertCSVData(4,'order_zip02','͹ÊØÈÖ¹æ2',17,'now()','now()', $dsn);
-        lfInsertCSVData(4,'order_pref','ÅÔÆ»Éܸ©',18,'now()','now()', $dsn);
-        lfInsertCSVData(4,'order_addr01','½»½ê1',19,'now()','now()', $dsn);
-        lfInsertCSVData(4,'order_addr02','½»½ê2',20,'now()','now()', $dsn);
-        lfInsertCSVData(4,'order_sex','À­ÊÌ',21,'now()','now()', $dsn);
-        lfInsertCSVData(4,'order_birth','À¸Ç¯·îÆü',22,'now()','now()', $dsn);
-        lfInsertCSVData(4,'order_job','¿¦¼ï',23,'now()','now()', $dsn);
-        lfInsertCSVData(4,'deliv_name01','ÇÛÁ÷Àè̾Á°',24,'now()','now()', $dsn);
-        lfInsertCSVData(4,'deliv_name02','ÇÛÁ÷Àè̾Á°',25,'now()','now()', $dsn);
-        lfInsertCSVData(4,'deliv_kana01','ÇÛÁ÷À襫¥Ê',26,'now()','now()', $dsn);
-        lfInsertCSVData(4,'deliv_kana02','ÇÛÁ÷À襫¥Ê',27,'now()','now()', $dsn);
-        lfInsertCSVData(4,'deliv_tel01','ÅÅÏÃÈÖ¹æ1',28,'now()','now()', $dsn);
-        lfInsertCSVData(4,'deliv_tel02','ÅÅÏÃÈÖ¹æ2',29,'now()','now()', $dsn);
-        lfInsertCSVData(4,'deliv_tel03','ÅÅÏÃÈÖ¹æ3',30,'now()','now()', $dsn);
-        lfInsertCSVData(4,'deliv_fax01','FAX1',31,'now()','now()', $dsn);
-        lfInsertCSVData(4,'deliv_fax02','FAX2',32,'now()','now()', $dsn);
-        lfInsertCSVData(4,'deliv_fax03','FAX3',33,'now()','now()', $dsn);
-        lfInsertCSVData(4,'deliv_zip01','͹ÊØÈÖ¹æ1',34,'now()','now()', $dsn);
-        lfInsertCSVData(4,'deliv_zip02','͹ÊØÈÖ¹æ2',35,'now()','now()', $dsn);
-        lfInsertCSVData(4,'deliv_pref','ÅÔÆ»Éܸ©',36,'now()','now()', $dsn);
-        lfInsertCSVData(4,'deliv_addr01','½»½ê1',37,'now()','now()', $dsn);
-        lfInsertCSVData(4,'deliv_addr02','½»½ê2',38,'now()','now()', $dsn);
-        lfInsertCSVData(4,'payment_total','¤ª»Ùʧ¤¤¹ç·×',39,'now()','now()', $dsn);
-    }
+    // CSV¥Æ¡¼¥Ö¥ë
+    if(sfTabaleExists('dtb_csv', $dsn)) {
+        lfInsertCSVData(1,'category_id','¥«¥Æ¥´¥êID',53,'now()','now()', $dsn);
+        lfInsertCSVData(4,'order_id','ÃíʸID',1,'now()','now()', $dsn);
+        lfInsertCSVData(4,'campaign_id','¥­¥ã¥ó¥Ú¡¼¥óID',2,'now()','now()', $dsn);
+        lfInsertCSVData(4,'customer_id','¸ÜµÒID',3,'now()','now()', $dsn);
+        lfInsertCSVData(4,'message','Í×˾Åù',4,'now()','now()', $dsn);
+        lfInsertCSVData(4,'order_name01','¸ÜµÒ̾1',5,'now()','now()', $dsn);
+        lfInsertCSVData(4,'order_name02','¸ÜµÒ̾2',6,'now()','now()', $dsn);
+        lfInsertCSVData(4,'order_kana01','¸ÜµÒ̾¥«¥Ê1',7,'now()','now()', $dsn);
+        lfInsertCSVData(4,'order_kana02','¸ÜµÒ̾¥«¥Ê2',8,'now()','now()', $dsn);
+        lfInsertCSVData(4,'order_email','¥á¡¼¥ë¥¢¥É¥ì¥¹',9,'now()','now()', $dsn);
+        lfInsertCSVData(4,'order_tel01','ÅÅÏÃÈÖ¹æ1',10,'now()','now()', $dsn);
+        lfInsertCSVData(4,'order_tel02','ÅÅÏÃÈÖ¹æ2',11,'now()','now()', $dsn);
+        lfInsertCSVData(4,'order_tel03','ÅÅÏÃÈÖ¹æ3',12,'now()','now()', $dsn);
+        lfInsertCSVData(4,'order_fax01','FAX1',13,'now()','now()', $dsn);
+        lfInsertCSVData(4,'order_fax02','FAX2',14,'now()','now()', $dsn);
+        lfInsertCSVData(4,'order_fax03','FAX3',15,'now()','now()', $dsn);
+        lfInsertCSVData(4,'order_zip01','͹ÊØÈÖ¹æ1',16,'now()','now()', $dsn);
+        lfInsertCSVData(4,'order_zip02','͹ÊØÈÖ¹æ2',17,'now()','now()', $dsn);
+        lfInsertCSVData(4,'order_pref','ÅÔÆ»Éܸ©',18,'now()','now()', $dsn);
+        lfInsertCSVData(4,'order_addr01','½»½ê1',19,'now()','now()', $dsn);
+        lfInsertCSVData(4,'order_addr02','½»½ê2',20,'now()','now()', $dsn);
+        lfInsertCSVData(4,'order_sex','À­ÊÌ',21,'now()','now()', $dsn);
+        lfInsertCSVData(4,'order_birth','À¸Ç¯·îÆü',22,'now()','now()', $dsn);
+        lfInsertCSVData(4,'order_job','¿¦¼ï',23,'now()','now()', $dsn);
+        lfInsertCSVData(4,'deliv_name01','ÇÛÁ÷Àè̾Á°',24,'now()','now()', $dsn);
+        lfInsertCSVData(4,'deliv_name02','ÇÛÁ÷Àè̾Á°',25,'now()','now()', $dsn);
+        lfInsertCSVData(4,'deliv_kana01','ÇÛÁ÷À襫¥Ê',26,'now()','now()', $dsn);
+        lfInsertCSVData(4,'deliv_kana02','ÇÛÁ÷À襫¥Ê',27,'now()','now()', $dsn);
+        lfInsertCSVData(4,'deliv_tel01','ÅÅÏÃÈÖ¹æ1',28,'now()','now()', $dsn);
+        lfInsertCSVData(4,'deliv_tel02','ÅÅÏÃÈÖ¹æ2',29,'now()','now()', $dsn);
+        lfInsertCSVData(4,'deliv_tel03','ÅÅÏÃÈÖ¹æ3',30,'now()','now()', $dsn);
+        lfInsertCSVData(4,'deliv_fax01','FAX1',31,'now()','now()', $dsn);
+        lfInsertCSVData(4,'deliv_fax02','FAX2',32,'now()','now()', $dsn);
+        lfInsertCSVData(4,'deliv_fax03','FAX3',33,'now()','now()', $dsn);
+        lfInsertCSVData(4,'deliv_zip01','͹ÊØÈÖ¹æ1',34,'now()','now()', $dsn);
+        lfInsertCSVData(4,'deliv_zip02','͹ÊØÈÖ¹æ2',35,'now()','now()', $dsn);
+        lfInsertCSVData(4,'deliv_pref','ÅÔÆ»Éܸ©',36,'now()','now()', $dsn);
+        lfInsertCSVData(4,'deliv_addr01','½»½ê1',37,'now()','now()', $dsn);
+        lfInsertCSVData(4,'deliv_addr02','½»½ê2',38,'now()','now()', $dsn);
+        lfInsertCSVData(4,'payment_total','¤ª»Ùʧ¤¤¹ç·×',39,'now()','now()', $dsn);
+    }
 }
 
 // CSV¥Æ¡¼¥Ö¥ë¤Ø¤Î¥Ç¡¼¥¿¤ÎÄɲÃ
 function lfInsertCSVData($csv_id,$col,$disp_name,$rank,$create_date,$update_date, $dsn) {
-    $sql = "insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) values($csv_id,'$col','$disp_name',$rank,$create_date,$update_date);";
-    sfDataExists("dtb_csv", "csv_id = ? AND col = ?", array($csv_id, $col), $dsn, $sql, true);
+    $sql = "insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) values($csv_id,'$col','$disp_name',$rank,$create_date,$update_date);";
+    sfDataExists("dtb_csv", "csv_id = ? AND col = ?", array($csv_id, $col), $dsn, $sql, true);
 }
 ?>