Changeset 21516 for branches/version-2_12-dev
- Timestamp:
- 2012/02/15 20:52:51 (12 years ago)
- Location:
- branches/version-2_12-dev/data/class
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_12-dev/data/class/SC_CartSession.php
r21515 r21516 538 538 $arrDeliv = SC_Helper_Purchase_Ex::getDeliv($productTypeId); 539 539 if (SC_Utils_Ex::isBlank($arrDeliv)) { 540 $tpl_message .= '※「' . $product['name'] . "」はまだ配送の準備ができておりません。恐れ入りますがお問い合わせページよりお問い合わせください。\n"; 540 $tpl_message .= '※「' . $product['name'] . '」はまだ配送の準備ができておりません。'; 541 $tpl_message .= '恐れ入りますがお問い合わせページよりお問い合わせください。' . "\n"; 541 542 $this->delProduct($item['cart_no'], $productTypeId); 542 543 } … … 549 550 if ($limit > 0) { 550 551 $this->setProductValue($item['id'], 'quantity', $limit, $productTypeId); 551 $this->setProductValue($item['id'], 'total_inctax', SC_Helper_DB_Ex::sfCalcIncTax($item['price']) * $limit, $productTypeId); 552 $tpl_message .= '※「' . $product['name'] . "」は販売制限(または在庫が不足)しております。一度に数量{$limit}を超える購入はできません。\n"; 552 $total_inctax = SC_Helper_DB_Ex::sfCalcIncTax($item['price']) * $limit; 553 $this->setProductValue($item['id'], 'total_inctax', $total_inctax, $productTypeId); 554 $tpl_message .= '※「' . $product['name'] . '」は販売制限(または在庫が不足)しております。'; 555 $tpl_message .= '一度に数量{$limit}を超える購入はできません。' . "\n"; 553 556 } else { 554 557 $this->delProduct($item['cart_no'], $productTypeId); -
branches/version-2_12-dev/data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php
r21515 r21516 123 123 $downloadable_days = $baseinfo['downloadable_days']; 124 124 if($downloadable_days ==null || $downloadable_days == '')$downloadable_days=0; 125 return '(SELECT CASE WHEN (SELECT d1.downloadable_days_unlimited FROM dtb_baseinfo d1) = 1 AND ' . $dtb_order_alias . '.payment_date IS NOT NULL THEN 1 WHEN DATE(CURRENT_TIMESTAMP) <= DATE(' . $dtb_order_alias . ".payment_date + '". $downloadable_days ." days') THEN 1 ELSE 0 END)"; 125 $sql = <<< __EOS__ 126 ( 127 SELECT 128 CASE 129 WHEN (SELECT d1.downloadable_days_unlimited FROM dtb_baseinfo d1) = 1 AND $dtb_order_alias.payment_date IS NOT NULL THEN 1 130 WHEN DATE(CURRENT_TIMESTAMP) <= DATE($dtb_order_alias.payment_date + '$downloadable_days days') THEN 1 131 ELSE 0 132 END 133 ) 134 __EOS__; 135 return $sql; 126 136 } 127 137 -
branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CsvSql.php
r21515 r21516 160 160 // 拡張エラーチェック 161 161 $objErr = new SC_CheckError_Ex($objFormParam->getHashArray()); 162 $objErr->doFunc( 163 $objErr->doFunc( 164 $objErr->doFunc( 162 $objErr->doFunc(array('名称', 'sql_name'), array('EXIST_CHECK')); 163 $objErr->doFunc(array('SQL文', 'csv_sql', '30000'), array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); 164 $objErr->doFunc(array('SQL文には読み込み関係以外のSQLコマンドおよび";"記号', 'csv_sql', $this->lfGetSqlDenyList()), array('PROHIBITED_STR_CHECK')); 165 165 if (!SC_Utils_Ex::isBlank($objErr->arrErr)) { 166 166 $arrErr = array_merge($arrErr, $objErr->arrErr); -
branches/version-2_12-dev/data/class/util/GC_Utils.php
r21515 r21516 231 231 $fp = fopen($path, 'a+'); 232 232 if ($fp) { 233 fwrite($fp, $today.' ['.$_SERVER['PHP_SELF'].'] '.$mess.' from '. $_SERVER['REMOTE_ADDR']. "\n"); 233 $string = "$today [{$_SERVER['PHP_SELF']}] $mess from {$_SERVER['REMOTE_ADDR']}\n"; 234 fwrite($fp, $string); 234 235 fclose($fp); 235 236 }
Note: See TracChangeset
for help on using the changeset viewer.