Ignore:
Timestamp:
2012/02/11 04:51:32 (14 years ago)
Author:
Seasoft
Message:

#1613 (ソース整形・ソースコメントの改善)

  • Zend Framework PHP 標準コーディング規約への準拠を高めた
File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/version-2_12-dev/html/install/index.php

    r21474 r21480  
    2727require_once HTML_REALDIR . 'define.php'; 
    2828define('INSTALL_FUNCTION', true); 
    29 define("INSTALL_INFO_URL", "http://www.ec-cube.net/install_info/index.php"); 
     29define('INSTALL_INFO_URL', "http://www.ec-cube.net/install_info/index.php"); 
    3030while (ob_get_level() >= 1) { 
    3131    ob_end_clean(); 
    … …  
    3838require_once DATA_REALDIR . 'module/HTTP/Request.php'; 
    3939 
    40 if (!defined("ADMIN_DIR")) { 
    41     define("ADMIN_DIR","admin/"); 
    42 } 
    43  
    44 define("INSTALL_LOG", "./temp/install.log"); 
     40if (!defined('ADMIN_DIR')) { 
     41    define('ADMIN_DIR',"admin/"); 
     42} 
     43 
     44define('INSTALL_LOG', "./temp/install.log"); 
    4545ini_set("max_execution_time", 300); 
    4646 
    … …  
    133133    // 入力データを渡す。 
    134134    $arrRet =  $objDBParam->getHashArray(); 
    135     define("DB_TYPE", $arrRet['db_type']); 
     135    define('DB_TYPE', $arrRet['db_type']); 
    136136    $dsn = $arrRet['db_type']."://".$arrRet['db_user'].":".$arrRet['db_password']."@".$arrRet['db_server'].":".$arrRet['db_port']."/".$arrRet['db_name']; 
    137137 
    … …  
    188188    // 入力データを渡す。 
    189189    $arrRet =  $objDBParam->getHashArray(); 
    190     if (!defined("DB_TYPE")) { 
    191         define("DB_TYPE", $arrRet['db_type']); 
     190    if (!defined('DB_TYPE')) { 
     191        define('DB_TYPE', $arrRet['db_type']); 
    192192    } 
    193193    $dsn = $arrRet['db_type']."://".$arrRet['db_user'].":".$arrRet['db_password']."@".$arrRet['db_server'].":".$arrRet['db_port']."/".$arrRet['db_name']; 
    … …  
    514514 
    515515    $arrDbParam = $objDBParam->getHashArray(); 
    516     if (!defined("DB_TYPE")) { 
    517         define("DB_TYPE", $arrDbParam['db_type']); 
     516    if (!defined('DB_TYPE')) { 
     517        define('DB_TYPE', $arrDbParam['db_type']); 
    518518    } 
    519519    $dsn = $arrDbParam['db_type']."://".$arrDbParam['db_user'].":".$arrDbParam['db_password']."@".$arrDbParam['db_server'].":".$arrDbParam['db_port']."/".$arrDbParam['db_name']; 
    … …  
    659659    } 
    660660 
    661     $objWebParam->addParam("店名", "shop_name", MTEXT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK"), $shop_name); 
    662     $objWebParam->addParam("管理者：メールアドレス", "admin_mail", null, "", array("EXIST_CHECK","EMAIL_CHECK","EMAIL_CHAR_CHECK"), $admin_mail); 
    663     $objWebParam->addParam("管理者：ログインID", "login_id", ID_MAX_LEN, "", array("EXIST_CHECK","SPTAB_CHECK", "ALNUM_CHECK")); 
    664     $objWebParam->addParam("管理者：パスワード", "login_pass", ID_MAX_LEN, "", array("EXIST_CHECK","SPTAB_CHECK", "ALNUM_CHECK")); 
    665     $objWebParam->addParam("管理機能：ディレクトリ", "admin_dir", ID_MAX_LEN, "a", array("EXIST_CHECK","SPTAB_CHECK", "ALNUM_CHECK"), $oldAdminDir); 
    666     $objWebParam->addParam("管理機能：SSL制限", "admin_force_ssl", 1, "n", array("SPTAB_CHECK", "NUM_CHECK","MAX_LENGTH_CHECK"), $admin_force_ssl); 
    667     $objWebParam->addParam("管理機能：IP制限", "admin_allow_hosts", LTEXT_LEN, "an", array("IP_CHECK","MAX_LENGTH_CHECK"), $admin_allow_hosts); 
    668     $objWebParam->addParam("URL(通常)", "normal_url", MTEXT_LEN, "", array("EXIST_CHECK","URL_CHECK","MAX_LENGTH_CHECK"), $normal_url); 
    669     $objWebParam->addParam("URL(セキュア)", "secure_url", MTEXT_LEN, "", array("EXIST_CHECK","URL_CHECK","MAX_LENGTH_CHECK"), $secure_url); 
    670     $objWebParam->addParam("ドメイン", "domain", MTEXT_LEN, "", array("MAX_LENGTH_CHECK")); 
     661    $objWebParam->addParam("店名", "shop_name", MTEXT_LEN, "", array('EXIST_CHECK','MAX_LENGTH_CHECK'), $shop_name); 
     662    $objWebParam->addParam("管理者：メールアドレス", "admin_mail", null, "", array('EXIST_CHECK','EMAIL_CHECK','EMAIL_CHAR_CHECK'), $admin_mail); 
     663    $objWebParam->addParam("管理者：ログインID", "login_id", ID_MAX_LEN, "", array('EXIST_CHECK','SPTAB_CHECK', 'ALNUM_CHECK')); 
     664    $objWebParam->addParam("管理者：パスワード", "login_pass", ID_MAX_LEN, "", array('EXIST_CHECK','SPTAB_CHECK', 'ALNUM_CHECK')); 
     665    $objWebParam->addParam("管理機能：ディレクトリ", "admin_dir", ID_MAX_LEN, "a", array('EXIST_CHECK','SPTAB_CHECK', 'ALNUM_CHECK'), $oldAdminDir); 
     666    $objWebParam->addParam("管理機能：SSL制限", "admin_force_ssl", 1, "n", array('SPTAB_CHECK', 'NUM_CHECK','MAX_LENGTH_CHECK'), $admin_force_ssl); 
     667    $objWebParam->addParam("管理機能：IP制限", "admin_allow_hosts", LTEXT_LEN, "an", array('IP_CHECK','MAX_LENGTH_CHECK'), $admin_allow_hosts); 
     668    $objWebParam->addParam("URL(通常)", "normal_url", MTEXT_LEN, "", array('EXIST_CHECK','URL_CHECK','MAX_LENGTH_CHECK'), $normal_url); 
     669    $objWebParam->addParam("URL(セキュア)", "secure_url", MTEXT_LEN, "", array('EXIST_CHECK','URL_CHECK','MAX_LENGTH_CHECK'), $secure_url); 
     670    $objWebParam->addParam("ドメイン", "domain", MTEXT_LEN, "", array('MAX_LENGTH_CHECK')); 
    671671 
    672672    return $objWebParam; 
    … …  
    706706    } 
    707707 
    708     $objDBParam->addParam("DBの種類", "db_type", INT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK"), $db_type); 
    709     $objDBParam->addParam("DBサーバー", "db_server", MTEXT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK"), $db_server); 
    710     $objDBParam->addParam("DBポート", "db_port", INT_LEN, "", array("MAX_LENGTH_CHECK"), $db_port); 
    711     $objDBParam->addParam("DB名", "db_name", MTEXT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK"), $db_name); 
    712     $objDBParam->addParam("DBユーザ", "db_user", MTEXT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK"), $db_user); 
    713     $objDBParam->addParam("DBパスワード", "db_password", MTEXT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK")); 
     708    $objDBParam->addParam("DBの種類", "db_type", INT_LEN, "", array('EXIST_CHECK','MAX_LENGTH_CHECK'), $db_type); 
     709    $objDBParam->addParam("DBサーバー", "db_server", MTEXT_LEN, "", array('EXIST_CHECK','MAX_LENGTH_CHECK'), $db_server); 
     710    $objDBParam->addParam("DBポート", "db_port", INT_LEN, "", array('MAX_LENGTH_CHECK'), $db_port); 
     711    $objDBParam->addParam("DB名", "db_name", MTEXT_LEN, "", array('EXIST_CHECK','MAX_LENGTH_CHECK'), $db_name); 
     712    $objDBParam->addParam("DBユーザ", "db_user", MTEXT_LEN, "", array('EXIST_CHECK','MAX_LENGTH_CHECK'), $db_user); 
     713    $objDBParam->addParam("DBパスワード", "db_password", MTEXT_LEN, "", array('EXIST_CHECK','MAX_LENGTH_CHECK')); 
    714714 
    715715    return $objDBParam; 
    … …  
    733733 
    734734    // ログインIDチェック 
    735     $objErr->doFunc(array("管理者：ログインID",'login_id',ID_MIN_LEN , ID_MAX_LEN) ,array("SPTAB_CHECK" ,"NUM_RANGE_CHECK")); 
     735    $objErr->doFunc(array("管理者：ログインID",'login_id',ID_MIN_LEN , ID_MAX_LEN) ,array('SPTAB_CHECK' ,'NUM_RANGE_CHECK')); 
    736736 
    737737    // パスワードのチェック 
    738     $objErr->doFunc( array("管理者：パスワード",'login_pass',ID_MIN_LEN , ID_MAX_LEN) ,array("SPTAB_CHECK" ,"NUM_RANGE_CHECK")); 
     738    $objErr->doFunc( array("管理者：パスワード",'login_pass',ID_MIN_LEN , ID_MAX_LEN) ,array('SPTAB_CHECK' ,'NUM_RANGE_CHECK')); 
    739739 
    740740    // 管理機能ディレクトリのチェック 
    741     $objErr->doFunc( array("管理機能：ディレクトリ", 'admin_dir', ID_MIN_LEN, ID_MAX_LEN), array("SPTAB_CHECK" ,"NUM_RANGE_CHECK")); 
     741    $objErr->doFunc( array("管理機能：ディレクトリ", 'admin_dir', ID_MIN_LEN, ID_MAX_LEN), array('SPTAB_CHECK' ,'NUM_RANGE_CHECK')); 
    742742 
    743743    $oldAdminDir = SC_Utils_Ex::sfTrimURL(ADMIN_DIR); 
    … …  
    761761 
    762762    if (count($objErr->arrErr) == 0) { 
    763         if (!defined("DB_TYPE")) { 
    764             define("DB_TYPE", $arrRet['db_type']); 
     763        if (!defined('DB_TYPE')) { 
     764            define('DB_TYPE', $arrRet['db_type']); 
    765765        } 
    766766        // 接続確認 
    … …  
    849849        foreach ($arrSequences as $seq) { 
    850850            SC_Utils::sfFlush(true); 
    851             $seq_name = $seq[0] . "_" . $seq[1]; 
     851            $seq_name = $seq[0] . '_' . $seq[1]; 
    852852            if (in_array($seq_name, $exists)) { 
    853853                $result = $objManager->dropSequence($seq_name); 
    … …  
    896896            $max = $res->fetchOne(); 
    897897 
    898             $seq_name = $seq[0] . "_" . $seq[1]; 
     898            $seq_name = $seq[0] . '_' . $seq[1]; 
    899899            $result = $objManager->createSequence($seq_name, $max + 1); 
    900900            if (PEAR::isError($result)) { 
    … …  
    934934    //管理機能SSL制限 
    935935    if ($objWebParam->getValue('admin_force_ssl') == 1 and strpos($secure_url,"https://") !== FALSE) { 
    936         $force_ssl = "TRUE"; 
    937     } else { 
    938         $force_ssl = "FALSE"; 
     936        $force_ssl = 'TRUE'; 
     937    } else { 
     938        $force_ssl = 'FALSE'; 
    939939    } 
    940940    //管理機能IP制限 
Note: See TracChangeset for help on using the changeset viewer.