[Svn-src-all:1531] [version-2_5-dev 20427] refs #1007
shutta
admin ＠ mail.ec-cube.net
2011年 2月 27日 (日) 00:33:19 JST
Subversion committed to /home/svn/open 20427
http://svn.ec-cube.net/open_trac/changeset/20427
┌────────────────────────────┐
│更新者 : shutta │
│更新日時: 2011-02-27 00:33:19 +0900 (日, 27 2月 2011)│
└────────────────────────────┘
Log:
--------------------------------------------------------
refs #1007
lfConvertParamの削除。
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php
U branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php
U branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php
変更: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php 2011-02-26 15:30:27 UTC (rev 20426)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php 2011-02-26 15:33:19 UTC (rev 20427)
@@ -200,21 +200,6 @@
return $ret;
}
- /* 取得文字列の変換 */
- function lfConvertParam($array) {
- // 文字変換
- $arrConvList['title'] = "KVa";
- $arrConvList['month'] = "n";
- $arrConvList['day'] = "n";
-
- foreach ($arrConvList as $key => $val) {
- // POSTされてきた値のみ変換する。
- if(isset($array[$key])) {
- $array[$key] = mb_convert_kana($array[$key] ,$val);
- }
- }
- return $array;
- }
function lfInitParam($mode, &$objFormParam)
{
switch ($mode) {
変更: branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php 2011-02-26 15:30:27 UTC (rev 20426)
+++ branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php 2011-02-26 15:33:19 UTC (rev 20427)
@@ -81,8 +81,6 @@
switch ($this->getMode()) {
case 'search':
$objProduct = new SC_Product();
- // 入力文字の強制変換とPOST値の引き継ぎ
- // $this->arrForm = $this->lfConvertParam($_POST,$this->getConvertRule());
$this->arrForm = $objFormParam->getHashArray();
$wheres = $this->createWhere($objFormParam,$objDb);
$this->tpl_linemax = $this->getLineCount($wheres,$objProduct);
@@ -284,23 +282,6 @@
}
/**
- * 文字列の変換ルールを返す
- */
- function getConvertRule(){
- /*
- * 文字列の変換
- * K : 「半角(ハンカク)片仮名」を「全角片仮名」に変換
- * C : 「全角ひら仮名」を「全角かた仮名」に変換
- * V : 濁点付きの文字を一文字に変換。"K","H"と共に使用します
- * n : 「全角」数字を「半角(ハンカク)」に変換
- */
- $arrConvList = array();
- $arrConvList['search_name'] = "KVa";
- $arrConvList['search_product_code'] = "KVa";
- return $arrConvList;
- }
-
- /**
* パラメータ情報の初期化
* @param SC_FormParam $objFormParam
*/
@@ -311,22 +292,5 @@
$objFormParam->addParam("商品コード", "search_product_code", LTEXT_LEN, "KVa", array("MAX_LENGTH_CHECK", "SPTAB_CHECK"));
$objFormParam->addParam("フッター", "footer", LTEXT_LEN, "KVa", array("MAX_LENGTH_CHECK", "SPTAB_CHECK"));
}
-
- /**
- * 取得文字列の変換
- * @param Array $param 取得文字列
- * @param Array $convList 変換ルール
- */
- function lfConvertParam($param,$convList){
- $convedParam = array();
- foreach ($convList as $key => $value){
- if(isset($param[$key])) {
- $convedParam[$key] = mb_convert_kana($param[$key],$value);
- }else{
- $convedParam[$key] = $param[$key];
- }
- }
- return $convedParam;
- }
}
?>
変更: branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php 2011-02-26 15:30:27 UTC (rev 20426)
+++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php 2011-02-26 15:33:19 UTC (rev 20427)
@@ -272,11 +272,11 @@
$objFormParam->addParam("規格名", "name1:$i", null, null, array());
$objFormParam->addParam("企画名", "name2:$i", null, null, array());
$objFormParam->addParam("product_class_id", "product_class_id:$i", null, null, array());
- $objFormParam->addParam("商品コード", "product_code:$i", STEXT_LEN, null, array("MAX_LENGTH_CHECK"));
- $objFormParam->addParam("在庫数", "stock:$i", AMOUNT_LEN, null, array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("商品コード", "product_code:$i", STEXT_LEN, "KVa", array("MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("在庫数", "stock:$i", AMOUNT_LEN, "n", array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
$objFormParam->addParam("在庫数", "stock_unlimited:$i", null, null, array());
- $objFormParam->addParam(NORMAL_PRICE_TITLE, "price01:$i", PRICE_LEN, null, array("NUM_CHECK", "MAX_LENGTH_CHECK"));
- $objFormParam->addParam(SALE_PRICE_TITLE, "price02:$i", PRICE_LEN, null, array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam(NORMAL_PRICE_TITLE, "price01:$i", PRICE_LEN, "n", array("NUM_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam(SALE_PRICE_TITLE, "price02:$i", PRICE_LEN, "n", array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
$objFormParam->addParam("商品種別", "product_type_id:$i", null, null, array());
$objFormParam->addParam("DLファイル名", "down_filename:$i", null, null, array());
$objFormParam->addParam("DLファイル名", "down_realfilename:$i", null, null, array());
@@ -438,35 +438,6 @@
return $objErr->arrErr;
}
- /* 取得文字列の変換 */
- function lfConvertParam($array) {
- /*
- * 文字列の変換
- * K : 「半角(ハンカク)片仮名」を「全角片仮名」に変換
- * C : 「全角ひら仮名」を「全角かた仮名」に変換
- * V : 濁点付きの文字を一文字に変換。"K","H"と共に使用します
- * n : 「全角」数字を「半角(ハンカク)」に変換
- */
-
- $no = 1; // FIXME 未定義変数の修正
- while($array["classcategory_id1:".$no] != "") {
- $arrConvList["product_code:".$no] = "KVa";
- $arrConvList["price01:".$no] = "n";
- $arrConvList["price02:".$no] = "n";
- $arrConvList["stock:".$no] = "n";
- $no++;
- }
-
- // 文字変換
- foreach ($arrConvList as $key => $val) {
- // POSTされてきた値のみ変換する。
- if(isset($array[$key])) {
- $array[$key] = mb_convert_kana($array[$key] ,$val);
- }
- }
- return $array;
- }
-
// 商品規格エラーチェック
function lfProductClassError($array) {
$objErr = new SC_CheckError($array);
Svn-src-all メーリングリストの案内