Index: branches/version-2_12-dev/html/install/index.php
===================================================================
--- branches/version-2_12-dev/html/install/index.php	(revision 21474)
+++ branches/version-2_12-dev/html/install/index.php	(revision 21480)
@@ -27,5 +27,5 @@
 require_once HTML_REALDIR . 'define.php';
 define('INSTALL_FUNCTION', true);
-define("INSTALL_INFO_URL", "http://www.ec-cube.net/install_info/index.php");
+define('INSTALL_INFO_URL', "http://www.ec-cube.net/install_info/index.php");
 while (ob_get_level() >= 1) {
     ob_end_clean();
@@ -38,9 +38,9 @@
 require_once DATA_REALDIR . 'module/HTTP/Request.php';
 
-if (!defined("ADMIN_DIR")) {
-    define("ADMIN_DIR","admin/");
-}
-
-define("INSTALL_LOG", "./temp/install.log");
+if (!defined('ADMIN_DIR')) {
+    define('ADMIN_DIR',"admin/");
+}
+
+define('INSTALL_LOG', "./temp/install.log");
 ini_set("max_execution_time", 300);
 
@@ -133,5 +133,5 @@
     // 入力データを渡す。
     $arrRet =  $objDBParam->getHashArray();
-    define("DB_TYPE", $arrRet['db_type']);
+    define('DB_TYPE', $arrRet['db_type']);
     $dsn = $arrRet['db_type']."://".$arrRet['db_user'].":".$arrRet['db_password']."@".$arrRet['db_server'].":".$arrRet['db_port']."/".$arrRet['db_name'];
 
@@ -188,6 +188,6 @@
     // 入力データを渡す。
     $arrRet =  $objDBParam->getHashArray();
-    if (!defined("DB_TYPE")) {
-        define("DB_TYPE", $arrRet['db_type']);
+    if (!defined('DB_TYPE')) {
+        define('DB_TYPE', $arrRet['db_type']);
     }
     $dsn = $arrRet['db_type']."://".$arrRet['db_user'].":".$arrRet['db_password']."@".$arrRet['db_server'].":".$arrRet['db_port']."/".$arrRet['db_name'];
@@ -514,6 +514,6 @@
 
     $arrDbParam = $objDBParam->getHashArray();
-    if (!defined("DB_TYPE")) {
-        define("DB_TYPE", $arrDbParam['db_type']);
+    if (!defined('DB_TYPE')) {
+        define('DB_TYPE', $arrDbParam['db_type']);
     }
     $dsn = $arrDbParam['db_type']."://".$arrDbParam['db_user'].":".$arrDbParam['db_password']."@".$arrDbParam['db_server'].":".$arrDbParam['db_port']."/".$arrDbParam['db_name'];
@@ -659,14 +659,14 @@
     }
 
-    $objWebParam->addParam("店名", "shop_name", MTEXT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK"), $shop_name);
-    $objWebParam->addParam("管理者：メールアドレス", "admin_mail", null, "", array("EXIST_CHECK","EMAIL_CHECK","EMAIL_CHAR_CHECK"), $admin_mail);
-    $objWebParam->addParam("管理者：ログインID", "login_id", ID_MAX_LEN, "", array("EXIST_CHECK","SPTAB_CHECK", "ALNUM_CHECK"));
-    $objWebParam->addParam("管理者：パスワード", "login_pass", ID_MAX_LEN, "", array("EXIST_CHECK","SPTAB_CHECK", "ALNUM_CHECK"));
-    $objWebParam->addParam("管理機能：ディレクトリ", "admin_dir", ID_MAX_LEN, "a", array("EXIST_CHECK","SPTAB_CHECK", "ALNUM_CHECK"), $oldAdminDir);
-    $objWebParam->addParam("管理機能：SSL制限", "admin_force_ssl", 1, "n", array("SPTAB_CHECK", "NUM_CHECK","MAX_LENGTH_CHECK"), $admin_force_ssl);
-    $objWebParam->addParam("管理機能：IP制限", "admin_allow_hosts", LTEXT_LEN, "an", array("IP_CHECK","MAX_LENGTH_CHECK"), $admin_allow_hosts);
-    $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"));
+    $objWebParam->addParam("店名", "shop_name", MTEXT_LEN, "", array('EXIST_CHECK','MAX_LENGTH_CHECK'), $shop_name);
+    $objWebParam->addParam("管理者：メールアドレス", "admin_mail", null, "", array('EXIST_CHECK','EMAIL_CHECK','EMAIL_CHAR_CHECK'), $admin_mail);
+    $objWebParam->addParam("管理者：ログインID", "login_id", ID_MAX_LEN, "", array('EXIST_CHECK','SPTAB_CHECK', 'ALNUM_CHECK'));
+    $objWebParam->addParam("管理者：パスワード", "login_pass", ID_MAX_LEN, "", array('EXIST_CHECK','SPTAB_CHECK', 'ALNUM_CHECK'));
+    $objWebParam->addParam("管理機能：ディレクトリ", "admin_dir", ID_MAX_LEN, "a", array('EXIST_CHECK','SPTAB_CHECK', 'ALNUM_CHECK'), $oldAdminDir);
+    $objWebParam->addParam("管理機能：SSL制限", "admin_force_ssl", 1, "n", array('SPTAB_CHECK', 'NUM_CHECK','MAX_LENGTH_CHECK'), $admin_force_ssl);
+    $objWebParam->addParam("管理機能：IP制限", "admin_allow_hosts", LTEXT_LEN, "an", array('IP_CHECK','MAX_LENGTH_CHECK'), $admin_allow_hosts);
+    $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;
@@ -706,10 +706,10 @@
     }
 
-    $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"));
+    $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;
@@ -733,11 +733,11 @@
 
     // ログインIDチェック
-    $objErr->doFunc(array("管理者：ログインID",'login_id',ID_MIN_LEN , ID_MAX_LEN) ,array("SPTAB_CHECK" ,"NUM_RANGE_CHECK"));
+    $objErr->doFunc(array("管理者：ログインID",'login_id',ID_MIN_LEN , ID_MAX_LEN) ,array('SPTAB_CHECK' ,'NUM_RANGE_CHECK'));
 
     // パスワードのチェック
-    $objErr->doFunc( array("管理者：パスワード",'login_pass',ID_MIN_LEN , ID_MAX_LEN) ,array("SPTAB_CHECK" ,"NUM_RANGE_CHECK"));
+    $objErr->doFunc( array("管理者：パスワード",'login_pass',ID_MIN_LEN , ID_MAX_LEN) ,array('SPTAB_CHECK' ,'NUM_RANGE_CHECK'));
 
     // 管理機能ディレクトリのチェック
-    $objErr->doFunc( array("管理機能：ディレクトリ", 'admin_dir', ID_MIN_LEN, ID_MAX_LEN), array("SPTAB_CHECK" ,"NUM_RANGE_CHECK"));
+    $objErr->doFunc( array("管理機能：ディレクトリ", 'admin_dir', ID_MIN_LEN, ID_MAX_LEN), array('SPTAB_CHECK' ,'NUM_RANGE_CHECK'));
 
     $oldAdminDir = SC_Utils_Ex::sfTrimURL(ADMIN_DIR);
@@ -761,6 +761,6 @@
 
     if (count($objErr->arrErr) == 0) {
-        if (!defined("DB_TYPE")) {
-            define("DB_TYPE", $arrRet['db_type']);
+        if (!defined('DB_TYPE')) {
+            define('DB_TYPE', $arrRet['db_type']);
         }
         // 接続確認
@@ -849,5 +849,5 @@
         foreach ($arrSequences as $seq) {
             SC_Utils::sfFlush(true);
-            $seq_name = $seq[0] . "_" . $seq[1];
+            $seq_name = $seq[0] . '_' . $seq[1];
             if (in_array($seq_name, $exists)) {
                 $result = $objManager->dropSequence($seq_name);
@@ -896,5 +896,5 @@
             $max = $res->fetchOne();
 
-            $seq_name = $seq[0] . "_" . $seq[1];
+            $seq_name = $seq[0] . '_' . $seq[1];
             $result = $objManager->createSequence($seq_name, $max + 1);
             if (PEAR::isError($result)) {
@@ -934,7 +934,7 @@
     //管理機能SSL制限
     if ($objWebParam->getValue('admin_force_ssl') == 1 and strpos($secure_url,"https://") !== FALSE) {
-        $force_ssl = "TRUE";
-    } else {
-        $force_ssl = "FALSE";
+        $force_ssl = 'TRUE';
+    } else {
+        $force_ssl = 'FALSE';
     }
     //管理機能IP制限