[Svn-src-all:1447] [version-2_5-dev 20339] #964 リファクタリング 宣言を除き, 引数や返り値が無く, すべて内部のメンバ変数で処理するような関数は極力作成しない
coelacanth
admin ＠ mail.ec-cube.net
2011年 2月 23日 (水) 14:06:50 JST
Subversion committed to /home/svn/open 20339
http://svn.ec-cube.net/open_trac/changeset/20339
┌────────────────────────────┐
│更新者 : coelacanth │
│更新日時: 2011-02-23 14:06:50 +0900 (水, 23 2月 2011)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#964 リファクタリング 宣言を除き, 引数や返り値が無く, すべて内部のメンバ変数で処理するような関数は極力作成しない
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php
U branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php
U branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment_Input.php
U branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php
U branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Seo.php
U branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php
U branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php
変更: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php 2011-02-23 03:30:10 UTC (rev 20338)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php 2011-02-23 05:06:50 UTC (rev 20339)
@@ -89,15 +89,17 @@
}
if(!empty($_POST)) {
- // POSTデータの引き継ぎ
- $this->arrForm = $_POST;
- // 入力データの変換
- $this->arrForm = $this->lfConvertParam($this->arrForm);
- $this->arrForm['regular_holiday_ids'] = $_POST['regular_holiday_ids']; // 定休日情報を付加
- // 入力データのエラーチェック
- $this->arrErr = $this->lfErrorCheck($this->arrForm);
+ $objFormParam = new SC_FormParam();
+ $this->lfInitParam($objFormParam, $_POST);
+ $objFormParam->setParam($_POST);
+ $objFormParam->convParam();
+ $this->arrErr = $this->lfErrorCheck($objFormParam);
+ $post = $objFormParam->getHashArray();
+
+ $this->arrForm = $post;
+
if(count($this->arrErr) == 0) {
switch($this->getMode()) {
case 'update':
@@ -202,89 +204,72 @@
$ret = $objQuery->insert("dtb_baseinfo", $sqlval);
}
+ function lfInitParam(&$objFormParam, $post) {
+ $objFormParam->addParam('会社名', 'company_name', STEXT_LEN, 'KVa', array("MAX_LENGTH_CHECK"));
+ $objFormParam->addParam('会社名(カナ)', 'company_kana', STEXT_LEN, 'KVC', array("KANA_CHECK","MAX_LENGTH_CHECK"));
- /* 取得文字列の変換 */
- function lfConvertParam($array) {
- /*
- * 文字列の変換
- * K : 「半角(ハンカク)片仮名」を「全角片仮名」に変換
- * C : 「全角ひら仮名」を「全角かた仮名」に変換
- * V : 濁点付きの文字を一文字に変換。"K","H"と共に使用します
- * n : 「全角」数字を「半角(ハンカク)」に変換
- * a : 全角英数字を半角英数字に変換する
- */
- // 人物基本情報
+ $objFormParam->addParam("店名", "shop_name", STEXT_LEN, 'KVa', array("EXIST_CHECK","MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("店名(カナ)", "shop_kana", STEXT_LEN, 'KVC', array("KANA_CHECK","MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("店名(英語表記)", "shop_name_eng",MTEXT_LEN, 'a', array("GRAPH_CHECK","MAX_LENGTH_CHECK"));
+ // 郵便番号チェック
+ $objFormParam->addParam("郵便番号1", "zip01", ZIP01_LEN, 'n', array("EXIST_CHECK", "NUM_CHECK","NUM_COUNT_CHECK"));
+ $objFormParam->addParam("郵便番号2", "zip02", ZIP02_LEN, 'n', array("EXIST_CHECK", "NUM_CHECK","NUM_COUNT_CHECK"));
+ // 住所チェック
+ $objFormParam->addParam("都道府県", "pref", array("EXIST_CHECK"));
+ $objFormParam->addParam("住所1", "addr01", MTEXT_LEN, 'KVa', array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("住所2", "addr02", MTEXT_LEN, 'KVa', array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+ // メールチェック
+ $objFormParam->addParam('商品注文受付メールアドレス', "email01", STEXT_LEN, 'a', array("EXIST_CHECK", "EMAIL_CHECK", "EMAIL_CHAR_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam('問い合わせ受付メールアドレス', "email02", STEXT_LEN, 'a', array("EXIST_CHECK", "EMAIL_CHECK", "EMAIL_CHAR_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam('メール送信元メールアドレス', "email03", STEXT_LEN, 'a', array("EXIST_CHECK", "EMAIL_CHECK", "EMAIL_CHAR_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam('送信エラー受付メールアドレス', "email04", STEXT_LEN, 'a', array("EXIST_CHECK", "EMAIL_CHECK", "EMAIL_CHAR_CHECK","MAX_LENGTH_CHECK"));
- // スポット商品
- $arrConvList['company_name'] = "KVa";
- $arrConvList['company_kana'] = "KVC";
- $arrConvList['shop_name'] = "KVa";
- $arrConvList['shop_kana'] = "KVC";
- $arrConvList['shop_name_eng'] = "a";
- $arrConvList['addr01'] = "KVa";
- $arrConvList['addr02'] = "KVa";
- $arrConvList['zip01'] = "n";
- $arrConvList['zip02'] = "n";
- $arrConvList['tel01'] = "n";
- $arrConvList['tel02'] = "n";
- $arrConvList['tel03'] = "n";
- $arrConvList['fax01'] = "n";
- $arrConvList['fax02'] = "n";
- $arrConvList['fax03'] = "n";
- $arrConvList['email01'] = "a";
- $arrConvList['email02'] = "a";
- $arrConvList['email03'] = "a";
- $arrConvList['email04'] = "a";
- $arrConvList['tax'] = "n";
- $arrConvList['free_rule'] = "n";
- $arrConvList['business_hour'] = "KVa";
- $arrConvList['good_traded'] = "";
- $arrConvList['message'] = "";
- $arrConvList['downloadable_days'] = "n";
- $arrConvList['downloadable_days_unlimited'] = "n";
+ // 電話番号
+ $objFormParam->addParam("電話番号1", "tel01", TEL_ITEM_LEN, 'n', array("NUM_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("電話番号2", "tel02", TEL_ITEM_LEN, 'n', array("NUM_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("電話番号3", "tel03", TEL_ITEM_LEN, 'n', array("NUM_CHECK", "MAX_LENGTH_CHECK"));
- return SC_Utils_Ex::mbConvertKanaWithArray($array, $arrConvList);
+ // FAX番号
+ $objFormParam->addParam("FAX番号1", "fax01", TEL_ITEM_LEN, 'n', array("NUM_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("FAX番号2", "fax02", TEL_ITEM_LEN, 'n', array("NUM_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("FAX番号3", "fax03", TEL_ITEM_LEN, 'n', array("NUM_CHECK", "MAX_LENGTH_CHECK"));
+
+ // その他
+ $objFormParam->addParam("消費税率", "tax", PERCENTAGE_LEN, 'n', array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("課税規則 ", "tax_rule", PERCENTAGE_LEN, 'n', array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("送料無料条件", "free_rule", PRICE_LEN, 'n', array("NUM_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("店舗営業時間", "business_hour", STEXT_LEN, 'KVa', array("MAX_LENGTH_CHECK"));
+
+ $objFormParam->addParam("取扱商品", "good_traded", LLTEXT_LEN, '', array("MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("メッセージ", "message", LLTEXT_LEN, '', array("MAX_LENGTH_CHECK"));
+
+ if(!isset($post['downloadable_days_unlimited']) && $post['downloadable_days_unlimited'] != "1") {
+ $objFormParam->addParam("ダウンロード可能日数", "downloadable_days", DOWNLOAD_DAYS_LEN, 'n', array("EXIST_CHECK", "ZERO_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
+ } else {
+ $objFormParam->addParam("ダウンロード無制限", "downloadable_days_unlimited", array("EXIST_CHECK"));
+ }
+ $objFormParam->addParam('緯度', 'latitude', STEXT_LEN, '', array("MAX_LENGTH_CHECK"));
+ $objFormParam->addParam('軽度', 'longitude', STEXT_LEN, '', array("MAX_LENGTH_CHECK"));
+
+ $objFormParam->addParam("定休日", "regular_holiday_ids", INT_LEN, "n", array("MAX_LENGTH_CHECK"));
}
// 入力エラーチェック
- function lfErrorCheck($array) {
- $objErr = new SC_CheckError($array);
+ function lfErrorCheck(&$objFormParam) {
+ $arrErr = $objFormParam->checkError();
+ $post = $objFormParam->getHashArray();
- $objErr->doFunc(array("会社名", "company_name", STEXT_LEN), array("MAX_LENGTH_CHECK"));
- $objErr->doFunc(array("会社名(カナ)", "company_kana", STEXT_LEN), array("KANA_CHECK","MAX_LENGTH_CHECK"));
- $objErr->doFunc(array("店名", "shop_name", STEXT_LEN), array("EXIST_CHECK","MAX_LENGTH_CHECK"));
- $objErr->doFunc(array("店名(カナ)", "shop_kana", STEXT_LEN), array("KANA_CHECK","MAX_LENGTH_CHECK"));
- $objErr->doFunc(array("店名(英語表記)", "shop_name_eng", MTEXT_LEN), array("GRAPH_CHECK","MAX_LENGTH_CHECK"));
- // 郵便番号チェック
- $objErr->doFunc(array("郵便番号1","zip01",ZIP01_LEN ) ,array("EXIST_CHECK", "NUM_CHECK","NUM_COUNT_CHECK"));
- $objErr->doFunc(array("郵便番号2","zip02",ZIP02_LEN ) ,array("EXIST_CHECK", "NUM_CHECK","NUM_COUNT_CHECK"));
+ $objErr = new SC_CheckError($post);
$objErr->doFunc(array("郵便番号", "zip01", "zip02"), array("ALL_EXIST_CHECK"));
- // 住所チェック
- $objErr->doFunc(array("都道府県", "pref"), array("EXIST_CHECK"));
- $objErr->doFunc(array("住所1", "addr01", MTEXT_LEN), array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
- $objErr->doFunc(array("住所2", "addr02", MTEXT_LEN), array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
- // メールチェック
- $objErr->doFunc(array('商品注文受付メールアドレス', "email01", STEXT_LEN) ,array("EXIST_CHECK", "EMAIL_CHECK", "EMAIL_CHAR_CHECK", "MAX_LENGTH_CHECK"));
- $objErr->doFunc(array('問い合わせ受付メールアドレス', "email02", STEXT_LEN) ,array("EXIST_CHECK", "EMAIL_CHECK", "EMAIL_CHAR_CHECK", "MAX_LENGTH_CHECK"));
- $objErr->doFunc(array('メール送信元メールアドレス', "email03", STEXT_LEN) ,array("EXIST_CHECK", "EMAIL_CHECK", "EMAIL_CHAR_CHECK", "MAX_LENGTH_CHECK"));
- $objErr->doFunc(array('送信エラー受付メールアドレス', "email04", STEXT_LEN) ,array("EXIST_CHECK", "EMAIL_CHECK", "EMAIL_CHAR_CHECK","MAX_LENGTH_CHECK"));
// 電話番号チェック
$objErr->doFunc(array("TEL", "tel01", "tel02", "tel03"), array("TEL_CHECK"));
$objErr->doFunc(array("FAX", "fax01", "fax02", "fax03"), array("TEL_CHECK"));
- // その他
- $objErr->doFunc(array("消費税率", "tax", PERCENTAGE_LEN), array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
- $objErr->doFunc(array("送料無料条件", "free_rule", PRICE_LEN), array("NUM_CHECK", "MAX_LENGTH_CHECK"));
- $objErr->doFunc(array("店舗営業時間", "business_hour", STEXT_LEN), array("MAX_LENGTH_CHECK"));
- $objErr->doFunc(array("取扱商品", "good_traded", LLTEXT_LEN), array("MAX_LENGTH_CHECK"));
- $objErr->doFunc(array("メッセージ", "message", LLTEXT_LEN), array("MAX_LENGTH_CHECK"));
- if(!isset($array['downloadable_days_unlimited']) && $array['downloadable_days_unlimited'] != "1") {
- $objErr->doFunc(array("ダウンロード可能日数", "downloadable_days", DOWNLOAD_DAYS_LEN), array("EXIST_CHECK", "ZERO_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
- }
$objErr->doFunc(array("緯度", "latitude", STEXT_LEN), array("NUM_POINT_CHECK", "MAX_LENGTH_CHECK"));
$objErr->doFunc(array("経度", "longitude", STEXT_LEN), array("NUM_POINT_CHECK", "MAX_LENGTH_CHECK"));
- return $objErr->arrErr;
+
+ return array_merge((array)$arrErr, (array)$objErr->arrErr);
}
}
?>
変更: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php 2011-02-23 03:30:10 UTC (rev 20338)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php 2011-02-23 05:06:50 UTC (rev 20339)
@@ -71,32 +71,37 @@
$mode = $this->getMode();
if (!empty($_POST)) {
- $this->arrErr = $this->lfCheckError($mode, $_POST);
+ $objFormParam = new SC_FormParam();
+ $objFormParam->addParam('配送業者ID', 'payment_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
+ $objFormParam->setParam($_POST);
+ $objFormParam->convParam();
+
+ $arrErr = $objFormParam->checkError();
if (!empty($this->arrErr['payment_id'])) {
SC_Utils_Ex::sfDispException();
return;
}
+ $post = $objFormParam->getHashArray();
}
switch($this->getMode()) {
case 'delete':
// ランク付きレコードの削除
- $objDb->sfDeleteRankRecord("dtb_payment", "payment_id", $_POST['payment_id']);
+ $objDb->sfDeleteRankRecord("dtb_payment", "payment_id", $post['payment_id']);
// 再表示
$this->objDisplay->reload();
break;
case 'up':
- $objDb->sfRankUp("dtb_payment", "payment_id", $_POST['payment_id']);
+ $objDb->sfRankUp("dtb_payment", "payment_id", $post['payment_id']);
// 再表示
$this->objDisplay->reload();
break;
case 'down':
- $objDb->sfRankDown("dtb_payment", "payment_id", $_POST['payment_id']);
+ $objDb->sfRankDown("dtb_payment", "payment_id", $post['payment_id']);
// 再表示
$this->objDisplay->reload();
break;
}
-
$this->arrDelivList = $objDb->sfGetIDValueList("dtb_deliv", "deliv_id", "service_name");
$this->arrPaymentListFree = $this->lfGetPaymentList();
}
@@ -122,28 +127,5 @@
$arrRet = $objQuery->select($col, $table, $where);
return $arrRet;
}
-
- /**
- * 入力エラーチェック
- *
- * @param string $mode
- * @return array
- */
- function lfCheckError($mode, $post) {
- $arrErr = array();
- switch($mode) {
- case 'delete':
- case 'up':
- case 'down':
- $this->objFormParam = new SC_FormParam();
- $this->objFormParam->addParam('配送業者ID', 'payment_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
- $this->objFormParam->setParam($post);
- $this->objFormParam->convParam();
- $arrErr = $this->objFormParam->checkError();
-
- break;
- }
- return $arrErr;
- }
}
?>
変更: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment_Input.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment_Input.php 2011-02-23 03:30:10 UTC (rev 20338)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment_Input.php 2011-02-23 05:06:50 UTC (rev 20339)
@@ -35,9 +35,6 @@
// {{{ properties
- /** フォームパラメータの配列 */
- var $objFormParam;
-
/** SC_UploadFile インスタンス */
var $objUpFile;
@@ -73,6 +70,21 @@
function action() {
$objDb = new SC_Helper_DB_Ex();
+ $mode = $this->getMode();
+
+ if (!empty($_POST) || !empty($_GET)) {
+ $objFormParam = new SC_FormParam();
+ $this->lfInitParam($mode, $objFormParam);
+
+ $param = (empty($_POST))? $_GET : $_POST;
+
+ $objFormParam->setParam($param);
+ $objFormParam->convParam();
+
+ $this->arrErr = $objFormParam->checkError();
+ $post = $objFormParam->getHashArray();
+ }
+
// ファイル管理クラス
$this->objUpFile = new SC_UploadFile(IMAGE_TEMP_REALDIR, IMAGE_SAVE_REALDIR);
// ファイル情報の初期化
@@ -80,26 +92,12 @@
// Hiddenからのデータを引き継ぐ
$this->objUpFile->setHiddenFileList($_POST);
- // パラメータ管理クラス
- $this->objFormParam = new SC_FormParam();
- // パラメータ情報の初期化
- $this->lfInitParam();
- // POST値の取得
- $this->objFormParam->setParam($_POST);
-
- switch($this->getMode()) {
+ switch($mode) {
case 'edit':
- // 入力値の変換
- $this->objFormParam->convParam();
-
- // エラーチェック
- $this->arrErr = $this->lfCheckError($_POST);
- $this->charge_flg = $_POST["charge_flg"];
+ $this->charge_flg = $post["charge_flg"];
if(count($this->arrErr) == 0) {
- $this->lfRegistData($_POST['payment_id'], $_SESSION['member_id']);
- // 一時ファイルを本番ディレクトリに移動する
+ $this->lfRegistData($post['payment_id'], $_SESSION['member_id'], $objFormParam);
$this->objUpFile->moveTempFile();
- // 親ウィンドウを更新するようにセットする。
$this->tpl_onload="fnUpdateParent('".ADMIN_PAYMENT_URLPATH."'); window.close();";
}
@@ -107,24 +105,29 @@
// 画像のアップロード
case 'upload_image':
// ファイル存在チェック
- $this->arrErr = $this->objUpFile->checkEXISTS($_POST['image_key']);
+ $this->arrErr = $this->objUpFile->checkEXISTS($post['image_key']);
// 画像保存処理
- $this->arrErr[$_POST['image_key']] = $this->objUpFile->makeTempFile($_POST['image_key']);
+ $this->arrErr[$post['image_key']] = $this->objUpFile->makeTempFile($post['image_key']);
break;
// 画像の削除
case 'delete_image':
- $this->objUpFile->deleteFile($_POST['image_key']);
+
+ $this->objUpFile->deleteFile($post['image_key']);
break;
case 'pre_edit':
- if ($_SERVER['REQUEST_METHOD'] == 'GET' && SC_Utils_Ex::sfIsInt($_GET['payment_id'])) {
- $arrRet = $this->lfGetData($_GET['payment_id']);
- $this->objFormParam->setParam($arrRet);
+ $arrRet = $this->lfGetData($post['payment_id']);
+
+ $objFormParam->addParam("支払方法", "payment_method", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("手数料", "charge", PRICE_LEN, "n", array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("利用条件(〜円以上)", "rule", PRICE_LEN, "n", array("NUM_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("利用条件(〜円以下)", "upper_rule", PRICE_LEN, "n", array("NUM_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("固定", "fix");
+ $objFormParam->setParam($arrRet);
+
$this->charge_flg = $arrRet["charge_flg"];
- // DBデータから画像ファイル名の読込
$this->objUpFile->setDBFileList($arrRet);
- $this->tpl_payment_id = $_GET['payment_id'];
- }
+ $this->tpl_payment_id = $post['payment_id'];
break;
default:
break;
@@ -134,7 +137,7 @@
$this->tpl_payment_id = $_POST['payment_id'];
}
- $this->arrForm = $this->objFormParam->getFormParamList();
+ $this->arrForm = $objFormParam->getFormParamList();
// FORM表示用配列を渡す。
$this->arrFile = $this->objUpFile->getFormFileList(IMAGE_TEMP_URLPATH, IMAGE_SAVE_URLPATH);
@@ -159,12 +162,37 @@
}
/* パラメータ情報の初期化 */
- function lfInitParam() {
- $this->objFormParam->addParam("支払方法", "payment_method", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
- $this->objFormParam->addParam("手数料", "charge", PRICE_LEN, "n", array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
- $this->objFormParam->addParam("利用条件(〜円以上)", "rule", PRICE_LEN, "n", array("NUM_CHECK", "MAX_LENGTH_CHECK"));
- $this->objFormParam->addParam("利用条件(〜円以下)", "upper_rule", PRICE_LEN, "n", array("NUM_CHECK", "MAX_LENGTH_CHECK"));
- $this->objFormParam->addParam("固定", "fix");
+ function lfInitParam($mode, &$objFormParam) {
+
+ switch ($mode) {
+ case "edit":
+ $objFormParam->addParam("支払方法", "payment_method", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("手数料", "charge", PRICE_LEN, "n", array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("利用条件(〜円以上)", "rule", PRICE_LEN, "n", array("NUM_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("利用条件(〜円以下)", "upper_rule", PRICE_LEN, "n", array("NUM_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("固定", "fix");
+ $objFormParam->addParam('支払いID', 'payment_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
+ $objFormParam->addParam('課金フラグ', 'charge_flg', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
+
+ break;
+ case "upload_image":
+ case "delete_image":
+ $objFormParam->addParam("支払方法", "payment_method", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("手数料", "charge", PRICE_LEN, "n", array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("利用条件(〜円以上)", "rule", PRICE_LEN, "n", array("NUM_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("利用条件(〜円以下)", "upper_rule", PRICE_LEN, "n", array("NUM_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("固定", "fix");
+ $objFormParam->addParam("画像キー", "image_key", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+
+ break;
+ case "pre_edit":
+ $objFormParam->addParam('支払いID', 'payment_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
+ $objFormParam->addParam('課金フラグ', 'charge_flg', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
+ break;
+
+ default:
+ break;
+ }
}
/* DBからデータを読み込む */
@@ -176,10 +204,10 @@
}
/* DBへデータを登録する */
- function lfRegistData($payment_id = "", $member_id) {
+ function lfRegistData($payment_id = "", $member_id, &$objFormParam) {
$objQuery =& SC_Query::getSingletonInstance();
- $sqlval = $this->objFormParam->getHashArray();
+ $sqlval = $objFormParam->getHashArray();
$arrRet = $this->objUpFile->getDBFileList(); // ファイル名の取得
$sqlval = array_merge($sqlval, $arrRet);
$sqlval['update_date'] = 'Now()';
変更: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php 2011-02-23 03:30:10 UTC (rev 20338)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php 2011-02-23 05:06:50 UTC (rev 20339)
@@ -33,11 +33,6 @@
*/
class LC_Page_Admin_Basis_Point extends LC_Page_Admin {
- // {{{ properties
-
- /** フォームパラメータの配列 */
- var $objFormParam;
-
// }}}
// {{{ functions
@@ -74,11 +69,11 @@
$objDb = new SC_Helper_DB_Ex();
// パラメータ管理クラス
- $this->objFormParam = new SC_FormParam();
+ $objFormParam = new SC_FormParam();
// パラメータ情報の初期化
- $this->lfInitParam();
+ $this->lfInitParam($objFormParam);
// POST値の取得
- $this->objFormParam->setParam($_POST);
+ $objFormParam->setParam($_POST);
$cnt = $objDb->sfGetBasisCount();
if ($cnt > 0) {
@@ -89,16 +84,16 @@
if(!empty($_POST)) {
// 入力値の変換
- $this->objFormParam->convParam();
- $this->arrErr = $this->objFormParam->checkError();
+ $objFormParam->convParam();
+ $this->arrErr = $objFormParam->checkError();
if(count($this->arrErr) == 0) {
switch($this->getMode()) {
case 'update':
- $this->lfUpdateData($this->objFormParam->getHashArray()); // 既存編集
+ $this->lfUpdateData($objFormParam->getHashArray()); // 既存編集
break;
case 'insert':
- $this->lfInsertData($this->objFormParam->getHashArray()); // 新規作成
+ $this->lfInsertData($objFormParam->getHashArray()); // 新規作成
break;
default:
break;
@@ -108,13 +103,12 @@
$this->tpl_onload = "window.alert('ポイント設定が完了しました。');";
}
} else {
- $arrCol = $this->objFormParam->getKeyList(); // キー名一覧を取得
+ $arrCol = $objFormParam->getKeyList(); // キー名一覧を取得
$col = SC_Utils_Ex::sfGetCommaList($arrCol);
$arrRet = $objDb->sfGetBasisData(true, $col);
- $this->objFormParam->setParam($arrRet);
+ $objFormParam->setParam($arrRet);
}
-
- $this->arrForm = $this->objFormParam->getFormParamList();
+ $this->arrForm = $objFormParam->getFormParamList();
}
/**
@@ -127,9 +121,9 @@
}
/* パラメータ情報の初期化 */
- function lfInitParam() {
- $this->objFormParam->addParam("ポイント付与率", "point_rate", PERCENTAGE_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
- $this->objFormParam->addParam("会員登録時付与ポイント", "welcome_point", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
+ function lfInitParam(&$objFormParam) {
+ $objFormParam->addParam("ポイント付与率", "point_rate", PERCENTAGE_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
+ $objFormParam->addParam("会員登録時付与ポイント", "welcome_point", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
}
function lfUpdateData($post) {
変更: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Seo.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Seo.php 2011-02-23 03:30:10 UTC (rev 20338)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Seo.php 2011-02-23 05:06:50 UTC (rev 20339)
@@ -80,20 +80,29 @@
// データの取得
$this->arrPageData = $this->lfGetSeoPageData();
- $device_type_id = (isset($_POST['device_type_id'])) ? $_POST['device_type_id'] : '';
- $page_id = (isset($_POST['page_id'])) ? $_POST['page_id'] : '';
+ $mode = $this->getMode();
- switch ($this->getMode()) {
+ if (!empty($_POST)) {
+ $objFormParam = new SC_FormParam();
+ $this->lfInitParam($mode, $objFormParam);
+ $objFormParam->setParam($_POST);
+ $objFormParam->convParam();
+
+ $this->arrErr = $objFormParam->checkError();
+ $post = $objFormParam->getHashArray();
+ }
+ $device_type_id = (isset($post['device_type_id'])) ? $post['device_type_id'] : '';
+ $page_id = (isset($post['page_id'])) ? $post['page_id'] : '';
+
+ switch ($mode) {
case 'confirm':
- // エラーチェック
- $this->arrErr[$device_type_id][$page_id] = $this->lfErrorCheck($_POST['meta'][$device_type_id][$page_id]);
+ $objFormParam->setParam($_POST['meta'][$device_type_id][$page_id]);
+ $this->arrErr[$device_type_id][$page_id] = $objFormParam->checkError();
// エラーがなければデータを更新
if(count($this->arrErr[$device_type_id][$page_id]) == 0) {
+ $arrMETA = $objFormParam->getHashArray();
- // 更新データの変換
- $arrMETA = $this->lfConvertParam($_POST['meta'][$device_type_id][$page_id]);
-
// 更新データ配列生成
$arrUpdData = array($arrMETA['author'], $arrMETA['description'], $arrMETA['keyword'], $device_type_id, $page_id);
// データ更新
@@ -152,20 +161,13 @@
return $ret;
}
- /**
- * 入力項目のエラーチェックを行う.
- *
- * @param array $array エラーチェック対象データ
- * @return array エラー内容
- */
- function lfErrorCheck($array) {
- $objErr = new SC_CheckError($array);
- $objErr->doFunc(array("メタタグ:Author", "author", STEXT_LEN), array("MAX_LENGTH_CHECK"));
- $objErr->doFunc(array("メタタグ:Description", "description", STEXT_LEN), array("MAX_LENGTH_CHECK"));
- $objErr->doFunc(array("メタタグ:Keywords", "keyword", STEXT_LEN), array("MAX_LENGTH_CHECK"));
-
- return $objErr->arrErr;
+ function lfInitParam($mode, &$objFormParam) {
+ $objFormParam->addParam('デバイスID', 'device_type_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
+ $objFormParam->addParam('ページID', 'page_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
+ $objFormParam->addParam('メタタグ:Author', 'author', STEXT_LEN, 'KVa', array("MAX_LENGTH_CHECK"));
+ $objFormParam->addParam('メタタグ:Description', 'description', STEXT_LEN, 'KVa', array("MAX_LENGTH_CHECK"));
+ $objFormParam->addParam('メタタグ:Keywords', 'keyword', STEXT_LEN, 'KVa', array("MAX_LENGTH_CHECK"));
}
/**
@@ -190,33 +192,6 @@
return $arrPageData;
}
- /* 取得文字列の変換 */
- function lfConvertParam($array) {
- /*
- * 文字列の変換
- * K : 「半角(ハンカク)片仮名」を「全角片仮名」に変換
- * C : 「全角ひら仮名」を「全角かた仮名」に変換
- * V : 濁点付きの文字を一文字に変換。"K","H"と共に使用します
- * n : 「全角」数字を「半角(ハンカク)」に変換
- * a : 全角英数字を半角英数字に変換する
- */
- // 人物基本情報
-
- // スポット商品
- $arrConvList['author'] = "KVa";
- $arrConvList['description'] = "KVa";
- $arrConvList['keyword'] = "KVa";
-
- // 文字変換
- foreach ($arrConvList as $key => $val) {
- // POSTされてきた値のみ変換する。
- if(isset($array[$key])) {
- $array[$key] = mb_convert_kana($array[$key] ,$val);
- }
- }
- return $array;
- }
-
/**
* SEO管理で設定するページのデータを取得する
*
変更: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php 2011-02-23 03:30:10 UTC (rev 20338)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php 2011-02-23 05:06:50 UTC (rev 20339)
@@ -33,11 +33,6 @@
*/
class LC_Page_Admin_Basis_Tradelaw extends LC_Page_Admin {
- // {{{ properties
-
- /** フォームパラメータの配列 */
- var $objFormParam;
-
// }}}
// {{{ functions
@@ -76,12 +71,9 @@
function action() {
$objDb = new SC_Helper_DB_Ex();
- // パラメータ管理クラス
- $this->objFormParam = new SC_FormParam();
- // パラメータ情報の初期化
- $this->lfInitParam();
- // POST値の取得
- $this->objFormParam->setParam($_POST);
+ $objFormParam = new SC_FormParam();
+ $this->lfInitParam($objFormParam);
+ $objFormParam->setParam($_POST);
$cnt = $objDb->sfGetBasisCount();
if ($cnt > 0) {
@@ -92,16 +84,16 @@
if(!empty($_POST)) {
// 入力値の変換
- $this->objFormParam->convParam();
- $this->arrErr = $this->lfCheckError();
+ $objFormParam->convParam();
+ $this->arrErr = $this->lfCheckError($objFormParam);
if(count($this->arrErr) == 0) {
switch($this->getMode()) {
case 'update':
- $this->lfUpdateData(); // 既存編集
+ $this->lfUpdateData($objFormParam->getHashArray()); // 既存編集
break;
case 'insert':
- $this->lfInsertData(); // 新規作成
+ $this->lfInsertData($objFormParam->getHashArray()); // 新規作成
break;
default:
break;
@@ -111,13 +103,12 @@
$this->tpl_onload = "window.alert('特定商取引法の登録が完了しました。');";
}
} else {
- $arrCol = $this->objFormParam->getKeyList(); // キー名一覧を取得
+ $arrCol = $objFormParam->getKeyList(); // キー名一覧を取得
$col = SC_Utils_Ex::sfGetCommaList($arrCol);
$arrRet = $objDb->sfGetBasisData(true, $col);
- $this->objFormParam->setParam($arrRet);
+ $objFormParam->setParam($arrRet);
}
-
- $this->arrForm = $this->objFormParam->getFormParamList();
+ $this->arrForm = $objFormParam->getFormParamList();
}
/**
@@ -130,42 +121,38 @@
}
/* パラメータ情報の初期化 */
- function lfInitParam() {
- $this->objFormParam->addParam("販売業者", "law_company", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
- $this->objFormParam->addParam("運営責任者", "law_manager", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
- $this->objFormParam->addParam("郵便番号1", "law_zip01", ZIP01_LEN, "n", array("EXIST_CHECK", "NUM_CHECK", "NUM_COUNT_CHECK"));
- $this->objFormParam->addParam("郵便番号2", "law_zip02", ZIP02_LEN, "n", array("EXIST_CHECK", "NUM_CHECK", "NUM_COUNT_CHECK"));
- $this->objFormParam->addParam("都道府県", "law_pref", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
- $this->objFormParam->addParam("住所1", "law_addr01", MTEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
- $this->objFormParam->addParam("住所2", "law_addr02", MTEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
- $this->objFormParam->addParam("電話番号1", "law_tel01", TEL_ITEM_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK" ,"NUM_CHECK"));
- $this->objFormParam->addParam("電話番号2", "law_tel02", TEL_ITEM_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK" ,"NUM_CHECK"));
- $this->objFormParam->addParam("電話番号3", "law_tel03", TEL_ITEM_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK" ,"NUM_CHECK"));
- $this->objFormParam->addParam("FAX番号1", "law_fax01", TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK" ,"NUM_CHECK"));
- $this->objFormParam->addParam("FAX番号2", "law_fax02", TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK" ,"NUM_CHECK"));
- $this->objFormParam->addParam("FAX番号3", "law_fax03", TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK" ,"NUM_CHECK"));
- $this->objFormParam->addParam("メールアドレス", "law_email", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "EMAIL_CHECK", "EMAIL_CHAR_CHECK"));
- $this->objFormParam->addParam("URL", "law_url", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "URL_CHECK"));
- $this->objFormParam->addParam("必要料金", "law_term01", MTEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
- $this->objFormParam->addParam("注文方法", "law_term02", MTEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
- $this->objFormParam->addParam("支払方法", "law_term03", MTEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
- $this->objFormParam->addParam("支払期限", "law_term04", MTEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
- $this->objFormParam->addParam("引き渡し時期", "law_term05", MTEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
- $this->objFormParam->addParam("返品・交換について", "law_term06", MTEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+ function lfInitParam(&$objFormParam) {
+ $objFormParam->addParam("販売業者", "law_company", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("運営責任者", "law_manager", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("郵便番号1", "law_zip01", ZIP01_LEN, "n", array("EXIST_CHECK", "NUM_CHECK", "NUM_COUNT_CHECK"));
+ $objFormParam->addParam("郵便番号2", "law_zip02", ZIP02_LEN, "n", array("EXIST_CHECK", "NUM_CHECK", "NUM_COUNT_CHECK"));
+ $objFormParam->addParam("都道府県", "law_pref", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
+ $objFormParam->addParam("住所1", "law_addr01", MTEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("住所2", "law_addr02", MTEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("電話番号1", "law_tel01", TEL_ITEM_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK" ,"NUM_CHECK"));
+ $objFormParam->addParam("電話番号2", "law_tel02", TEL_ITEM_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK" ,"NUM_CHECK"));
+ $objFormParam->addParam("電話番号3", "law_tel03", TEL_ITEM_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK" ,"NUM_CHECK"));
+ $objFormParam->addParam("FAX番号1", "law_fax01", TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK" ,"NUM_CHECK"));
+ $objFormParam->addParam("FAX番号2", "law_fax02", TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK" ,"NUM_CHECK"));
+ $objFormParam->addParam("FAX番号3", "law_fax03", TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK" ,"NUM_CHECK"));
+ $objFormParam->addParam("メールアドレス", "law_email", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "EMAIL_CHECK", "EMAIL_CHAR_CHECK"));
+ $objFormParam->addParam("URL", "law_url", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "URL_CHECK"));
+ $objFormParam->addParam("必要料金", "law_term01", MTEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("注文方法", "law_term02", MTEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("支払方法", "law_term03", MTEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("支払期限", "law_term04", MTEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("引き渡し時期", "law_term05", MTEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("返品・交換について", "law_term06", MTEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
}
- function lfUpdateData() {
- // 入力データを渡す。
- $sqlval = $this->objFormParam->getHashArray();
+ function lfUpdateData($sqlval) {
$sqlval['update_date'] = 'Now()';
$objQuery =& SC_Query::getSingletonInstance();
// UPDATEの実行
$ret = $objQuery->update("dtb_baseinfo", $sqlval);
}
- function lfInsertData() {
- // 入力データを渡す。
- $sqlval = $this->objFormParam->getHashArray();
+ function lfInsertData($sqlval) {
$sqlval['update_date'] = 'Now()';
$objQuery =& SC_Query::getSingletonInstance();
// INSERTの実行
@@ -173,11 +160,11 @@
}
/* 入力内容のチェック */
- function lfCheckError() {
+ function lfCheckError(&$objFormParam) {
// 入力データを渡す。
- $arrRet = $this->objFormParam->getHashArray();
+ $arrRet = $objFormParam->getHashArray();
$objErr = new SC_CheckError($arrRet);
- $objErr->arrErr = $this->objFormParam->checkError();
+ $objErr->arrErr = $objFormParam->checkError();
// 電話番号チェック
$objErr->doFunc(array("TEL", "law_tel01", "law_tel02", "law_tel03"), array("TEL_CHECK"));
変更: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php 2011-02-23 03:30:10 UTC (rev 20338)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php 2011-02-23 05:06:50 UTC (rev 20339)
@@ -50,8 +50,6 @@
var $tpl_mode;
var $exec;
var $tpl_count_mtb_zip;
- /** フォームパラメータの配列 */
- var $objFormParam;
// }}}
// {{{ functions
@@ -90,13 +88,12 @@
*/
function action() {
// パラメータ管理クラス
- $this->objFormParam = new SC_FormParam();
+ $objFormParam = new SC_FormParam();
// パラメータ情報の初期化
- $this->lfInitParam();
- // POST値の取得
- $this->objFormParam->setParam($_GET);
- $this->arrErr = $this->objFormParam->checkError();
- $this->arrForm = $this->objFormParam->getHashArray();
+ $this->lfInitParam($this->tpl_mode, $objFormParam);
+ $objFormParam->setParam($_GET);
+ $this->arrErr = $objFormParam->checkError();
+ $this->arrForm = $objFormParam->getHashArray();
if ($this->exec) {
if (!empty($this->arrErr)) {
@@ -159,9 +156,9 @@
*
* @return void
*/
- function lfInitParam() {
- if ($this->tpl_mode == 'manual') {
- $this->objFormParam->addParam("開始行", "startRowNum", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
+ function lfInitParam($tpl_mode, &$objFormParam) {
+ if ($tpl_mode == 'manual') {
+ $objFormParam->addParam("開始行", "startRowNum", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
}
}
Svn-src-all メーリングリストの案内