Changeset 17576


Ignore:
Timestamp:
2008/08/28 15:08:09 (16 years ago)
Author:
Seasoft
Message:

merge 17345,17374,17382,17383,17384,17385

Location:
branches/comu-ver2/data
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • branches/comu-ver2/data/Smarty/templates/default/products/review.tpl

    r17336 r17576  
    4444          <tr> 
    4545            <th>ホームページアドレス</th> 
    46             <td><span class="attention"><!--{$arrErr.reviewer_url}--></span><input type="text" name="reviewer_url" value="<!--{$arrForm.reviewer_url}-->" maxlength="<!--{$smarty.const.MTEXT_LEN}-->" style="<!--{$arrErr.reviewer_url|sfGetErrorColor}-->" size="40" class="box350" /></td> 
     46            <td><span class="attention"><!--{$arrErr.reviewer_url}--></span><input type="text" name="reviewer_url" value="<!--{$arrForm.reviewer_url|escape}-->" maxlength="<!--{$smarty.const.MTEXT_LEN}-->" style="<!--{$arrErr.reviewer_url|sfGetErrorColor}-->" size="40" class="box350" /></td> 
    4747          </tr> 
    4848          <tr> 

  • branches/comu-ver2/data/class/SC_DbConn.php

    r17559 r17576  
    7171        $this->error_mail_title = DB_ERROR_MAIL_SUBJECT; 
    7272        $this->err_disp = $err_disp; 
    73         $this->dbFactory = SC_DB_DBFactory::getInstance(); 
     73        $this->dbFactory = SC_DB_DBFactory_Ex::getInstance(); 
    7474    } 
    7575 

  • branches/comu-ver2/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php

    r17521 r17576  
    458458            if($_POST["copy_product_id"] != "" and SC_Utils_Ex::sfIsInt($_POST["copy_product_id"])){ 
    459459                // dtb_products_class のカラムを取得 
    460                 $dbFactory = SC_DB_DBFactory::getInstance(); 
     460                $dbFactory = SC_DB_DBFactory_Ex::getInstance(); 
    461461                $arrColList = $dbFactory->sfGetColumnList("dtb_products_class", $objQuery); 
    462462                $arrColList_tmp = array_flip($arrColList); 

  • branches/comu-ver2/data/class/pages/admin/system/LC_Page_Admin_System_Masterdata.php

    r17571 r17576  
    146146     */ 
    147147    function getMasterDataNames($ignores = array()) { 
    148         $dbFactory = SC_DB_DBFactory::getInstance(); 
     148        $dbFactory = SC_DB_DBFactory_Ex::getInstance(); 
    149149        $arrMasterDataName = $dbFactory->findTableNames("mtb_"); 
    150150 

  • branches/comu-ver2/data/class/pages/admin/system/LC_Page_Admin_System_System.php

    r17573 r17576  
    107107     */ 
    108108    function getSystemInfo() { 
    109         $objDB = SC_DB_DBFactory::getInstance(); 
     109        $objDB = SC_DB_DBFactory_Ex::getInstance(); 
    110110 
    111111        $arrSystemInfo = array( 

  • branches/comu-ver2/data/class/pages/products/LC_Page_Products_List.php

    r17573 r17576  
    627627        $classcategory_id_2 = $classcategory_id . "_2"; 
    628628        if (!isset($classcategory_id_2)) $classcategory_id_2 = ""; 
    629         if (!isset($_POST[$classcategory_id_2])) $_POST[$classcategory_id_2] = ""; 
     629        if (!isset($_POST[$classcategory_id_2]) || !is_numeric($_POST[$classcategory_id_2])) $_POST[$classcategory_id_2] = ""; 
    630630 
    631631        $this->tpl_onload .= "lnSetSelect('" . $classcategory_id ."_1', " 

  • branches/comu-ver2/data/class/pages/products/LC_Page_Products_Review.php

    r16741 r17576  
    187187        $objErr->doFunc(array("商品ID", "product_id", INT_LEN), array("EXIST_CHECK", "MAX_LENGTH_CHECK")); 
    188188        $objErr->doFunc(array("投稿者名", "reviewer_name", STEXT_LEN), array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK")); 
    189         $objErr->doFunc(array("URL", "reviewer_url", MTEXT_LEN), array("MAX_LENGTH_CHECK", "URL_CHECK")); 
     189        $objErr->doFunc(array("URL", "reviewer_url", MTEXT_LEN), array("NO_SPTAB", "SPTAB_CHECK", "MAX_LENGTH_CHECK", "URL_CHECK")); 
    190190        $objErr->doFunc(array("おすすめレベル", "recommend_level"), array("SELECT_CHECK")); 
    191191        $objErr->doFunc(array("タイトル", "title", STEXT_LEN), array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK")); 

  • branches/comu-ver2/data/class_extends/db_extends/SC_DB_DBFactory_Ex.php

    r16741 r17576  
    5757 
    5858        default: 
     59            return new SC_DB_DBFactory_Ex(); 
    5960        } 
    6061    } 

  • branches/comu-ver2/data/include/module.inc

    r17193 r17576  
    3131require_once CLASS_PATH . 'SC_DbConn.php'; 
    3232require_once CLASS_PATH . 'SC_Query.php'; 
    33 require_once CLASS_PATH . 'db/SC_DB_DBFactory.php'; 
     33require_once CLASS_EX_PATH . 'db_extends/SC_DB_DBFactory_Ex.php'; 
    3434 
    3535/** 
Note: See TracChangeset for help on using the changeset viewer.