[Svn-src-all:1406] [version-2_5-dev 20297] #964 リファクタリング action以外でのPOST、GET、SESSIONの利用を引数で渡す形に変更
coelacanth
admin ＠ mail.ec-cube.net
2011年 2月 21日 (月) 17:24:32 JST
Subversion committed to /home/svn/open 20297
http://svn.ec-cube.net/open_trac/changeset/20297
┌────────────────────────────┐
│更新者 : coelacanth │
│更新日時: 2011-02-21 17:24:32 +0900 (月, 21 2月 2011)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#964 リファクタリング action以外でのPOST、GET、SESSIONの利用を引数で渡す形に変更
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/basis/LC_Page_Admin_Basis_Kiyaku.php
U branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.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
変更: 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-21 08:22:21 UTC (rev 20296)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php 2011-02-21 08:24:32 UTC (rev 20297)
@@ -79,7 +79,7 @@
$mode = $this->getMode();
if (!empty($_POST)) {
- $this->arrErr = $this->lfCheckError($mode);
+ $this->arrErr = $this->lfCheckError($mode, $_POST);
if (!empty($this->arrErr['holiday_id'])) {
SC_Utils_Ex::sfDispException();
return;
@@ -95,9 +95,9 @@
if(count($this->arrErr) <= 0) {
if($_POST['holiday_id'] == "") {
- $this->lfInsertClass($this->arrForm); // 新規作成
+ $this->lfInsertClass($this->arrForm, $_SESSION['member_id']); // 新規作成
} else {
- $this->lfUpdateClass($this->arrForm); // 既存編集
+ $this->lfUpdateClass($this->arrForm, $_POST['holiday_id']); // 既存編集
}
// 再表示
$this->objDisplay->reload();
@@ -166,13 +166,13 @@
}
/* DBへの挿入 */
- function lfInsertClass($arrData) {
+ function lfInsertClass($arrData, $member_id) {
$objQuery =& SC_Query::getSingletonInstance();
// INSERTする値を作成する。
$sqlval['title'] = $arrData['title'];
$sqlval['month'] = $arrData['month'];
$sqlval['day'] = $arrData['day'];
- $sqlval['creator_id'] = $_SESSION['member_id'];
+ $sqlval['creator_id'] = $member_id;
$sqlval['rank'] = $objQuery->max("rank", "dtb_holiday") + 1;
$sqlval['update_date'] = "Now()";
$sqlval['create_date'] = "Now()";
@@ -183,7 +183,7 @@
}
/* DBへの更新 */
- function lfUpdateClass($arrData) {
+ function lfUpdateClass($arrData, $holiday_id) {
$objQuery =& SC_Query::getSingletonInstance();
// UPDATEする値を作成する。
$sqlval['title'] = $arrData['title'];
@@ -192,7 +192,7 @@
$sqlval['update_date'] = "Now()";
$where = "holiday_id = ?";
// UPDATEの実行
- $ret = $objQuery->update("dtb_holiday", $sqlval, $where, array($_POST['holiday_id']));
+ $ret = $objQuery->update("dtb_holiday", $sqlval, $where, array($holiday_id));
return $ret;
}
@@ -218,11 +218,11 @@
* @param string $mode
* @return array
*/
- function lfCheckError($mode) {
+ function lfCheckError($mode, $post) {
$arrErr = array();
switch ($mode) {
case 'edit':
- $_POST = $this->lfConvertParam($_POST);
+ $post = $this->lfConvertParam($post);
$objErr = new SC_CheckError();
$objErr->doFunc(array("タイトル", "title", SMTEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK","MAX_LENGTH_CHECK"));
@@ -231,10 +231,10 @@
if(!isset($objErr->arrErr['date'])) {
$objQuery =& SC_Query::getSingletonInstance();
$where = "del_flg = 0 AND month = ? AND day = ?";
- $arrval = array($_POST['month'], $_POST['day']);
- if (!empty($_POST['holiday_id'])) {
+ $arrval = array($post['month'], $post['day']);
+ if (!empty($post['holiday_id'])) {
$where .= " AND holiday_id <> ?";
- $arrval[] = $_POST['holiday_id'];
+ $arrval[] = $post['holiday_id'];
}
$arrRet = $objQuery->select("count(holiday_id)", "dtb_holiday", $where, $arrval);
// 編集中のレコード以外に同じ日付が存在する場合
@@ -249,7 +249,7 @@
case 'up':
$this->objFormParam = new SC_FormParam();
$this->objFormParam->addParam('定休日ID', 'holiday_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
- $this->objFormParam->setParam($_POST);
+ $this->objFormParam->setParam($post);
$this->objFormParam->convParam();
$arrErr = $this->objFormParam->checkError();
break;
変更: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php 2011-02-21 08:22:21 UTC (rev 20296)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php 2011-02-21 08:24:32 UTC (rev 20297)
@@ -75,7 +75,7 @@
$mode = $this->getMode();
if (!empty($_POST)) {
- $this->arrErr = $this->lfCheckError($mode);
+ $this->arrErr = $this->lfCheckError($mode, $_POST);
if (!empty($this->arrErr['kiyaku_id'])) {
SC_Utils_Ex::sfDispException();
return;
@@ -91,9 +91,9 @@
if(count($this->arrErr) <= 0) {
if($_POST['kiyaku_id'] == "") {
- $this->lfInsertClass($this->arrForm); // 新規作成
+ $this->lfInsertClass($this->arrForm, $_SESSION['member_id']); // 新規作成
} else {
- $this->lfUpdateClass($this->arrForm); // 既存編集
+ $this->lfUpdateClass($this->arrForm, $_POST['kiyaku_id']); // 既存編集
}
// 再表示
$this->objDisplay->reload();
@@ -146,12 +146,12 @@
}
/* DBへの挿入 */
- function lfInsertClass($arrData) {
+ function lfInsertClass($arrData, $member_id) {
$objQuery =& SC_Query::getSingletonInstance();
// INSERTする値を作成する。
$sqlval['kiyaku_title'] = $arrData['kiyaku_title'];
$sqlval['kiyaku_text'] = $arrData['kiyaku_text'];
- $sqlval['creator_id'] = $_SESSION['member_id'];
+ $sqlval['creator_id'] = $member_id;
$sqlval['rank'] = $objQuery->max("rank", "dtb_kiyaku") + 1;
$sqlval['update_date'] = "Now()";
$sqlval['create_date'] = "Now()";
@@ -177,7 +177,7 @@
}
/* DBへの更新 */
- function lfUpdateClass($arrData) {
+ function lfUpdateClass($arrData, $kiyaku_id) {
$objQuery =& SC_Query::getSingletonInstance();
// UPDATEする値を作成する。
$sqlval['kiyaku_title'] = $arrData['kiyaku_title'];
@@ -185,7 +185,7 @@
$sqlval['update_date'] = "Now()";
$where = "kiyaku_id = ?";
// UPDATEの実行
- $ret = $objQuery->update("dtb_kiyaku", $sqlval, $where, array($_POST['kiyaku_id']));
+ $ret = $objQuery->update("dtb_kiyaku", $sqlval, $where, array($kiyaku_id));
return $ret;
}
@@ -210,21 +210,21 @@
* @param string $mode
* @return array
*/
- function lfCheckError($mode) {
+ function lfCheckError($mode, $post) {
$arrErr = array();
switch ($mode) {
case 'edit':
- $_POST = $this->lfConvertParam($_POST);
+ $_POST = $this->lfConvertParam($post);
$objErr = new SC_CheckError();
$objErr->doFunc(array("規約タイトル", "kiyaku_title", SMTEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK","MAX_LENGTH_CHECK"));
$objErr->doFunc(array("規約内容", "kiyaku_text", MLTEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK","MAX_LENGTH_CHECK"));
if(!isset($objErr->arrErr['name'])) {
$objQuery =& SC_Query::getSingletonInstance();
- $arrRet = $objQuery->select("kiyaku_id, kiyaku_title", "dtb_kiyaku", "del_flg = 0 AND kiyaku_title = ?", array($_POST['kiyaku_title']));
+ $arrRet = $objQuery->select("kiyaku_id, kiyaku_title", "dtb_kiyaku", "del_flg = 0 AND kiyaku_title = ?", array($post['kiyaku_title']));
// 編集中のレコード以外に同じ名称が存在する場合
- if ($arrRet[0]['kiyaku_id'] != $_POST['kiyaku_id'] && $arrRet[0]['kiyaku_title'] == $_POST['kiyaku_title']) {
+ if ($arrRet[0]['kiyaku_id'] != $post['kiyaku_id'] && $arrRet[0]['kiyaku_title'] == $post['kiyaku_title']) {
$objErr->arrErr['name'] = "※ 既に同じ内容の登録が存在します。<br>";
}
}
@@ -234,7 +234,7 @@
case 'up':
$this->objFormParam = new SC_FormParam();
$this->objFormParam->addParam('規約ID', 'kiyaku_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
- $this->objFormParam->setParam($_POST);
+ $this->objFormParam->setParam($post);
$this->objFormParam->convParam();
$arrErr = $this->objFormParam->checkError();
変更: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php 2011-02-21 08:22:21 UTC (rev 20296)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php 2011-02-21 08:24:32 UTC (rev 20297)
@@ -73,7 +73,6 @@
// 認証可否の判定
SC_Utils_Ex::sfIsSuccess($objSess);
-
$this->arrMailTEMPLATE = $masterData->getMasterData("mtb_mail_template");
switch ($this->getMode()) {
case 'id_set':
@@ -101,7 +100,7 @@
} else {
// 正常
- $this->lfRegist($this->arrForm);
+ $this->lfRegist($this->arrForm, $_POST['template_id'], $_SESSION['member_id']);
// 完了メッセージ
$this->tpl_onload = "window.alert('メール設定が完了しました。テンプレートを選択して内容をご確認ください。');";
@@ -130,16 +129,16 @@
return $objQuery->getAll($sql, array($template_id) );
}
- function lfRegist($data ){
+ function lfRegist($data, $template_id, $member_id){
$objQuery =& SC_Query::getSingletonInstance();
- $data['creator_id'] = $_SESSION['member_id'];
+ $data['creator_id'] = $member_id;
$sql = "SELECT * FROM dtb_mailtemplate WHERE template_id = ?";
- $result = $objQuery->getAll($sql, array($_POST['template_id']) );
+ $result = $objQuery->getAll($sql, array($template_id));
if ( $result ){
$sql_where = "template_id = ?";
- $objQuery->update("dtb_mailtemplate", $data, $sql_where, array(addslashes($_POST['template_id'])));
+ $objQuery->update("dtb_mailtemplate", $data, $sql_where, array(addslashes($template_id)));
}else{
$objQuery->insert("dtb_mailtemplate", $data);
}
変更: 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-21 08:22:21 UTC (rev 20296)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php 2011-02-21 08:24:32 UTC (rev 20297)
@@ -75,7 +75,7 @@
$mode = $this->getMode();
if (!empty($_POST)) {
- $this->arrErr = $this->lfCheckError($mode);
+ $this->arrErr = $this->lfCheckError($mode, $_POST);
if (!empty($this->arrErr['payment_id'])) {
SC_Utils_Ex::sfDispException();
return;
@@ -133,7 +133,7 @@
* @param string $mode
* @return array
*/
- function lfCheckError($mode) {
+ function lfCheckError($mode, $post) {
$arrErr = array();
switch($mode) {
case 'delete':
@@ -141,7 +141,7 @@
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->setParam($post);
$this->objFormParam->convParam();
$arrErr = $this->objFormParam->checkError();
変更: 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-21 08:22:21 UTC (rev 20296)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment_Input.php 2011-02-21 08:24:32 UTC (rev 20297)
@@ -97,10 +97,10 @@
$this->objFormParam->convParam();
// エラーチェック
- $this->arrErr = $this->lfCheckError();
+ $this->arrErr = $this->lfCheckError($_POST);
$this->charge_flg = $_POST["charge_flg"];
if(count($this->arrErr) == 0) {
- $this->lfRegistData($_POST['payment_id']);
+ $this->lfRegistData($_POST['payment_id'], $_SESSION['member_id']);
// 一時ファイルを本番ディレクトリに移動する
$this->objUpFile->moveTempFile();
// 親ウィンドウを更新するようにセットする。
@@ -180,7 +180,7 @@
}
/* DBへデータを登録する */
- function lfRegistData($payment_id = "") {
+ function lfRegistData($payment_id = "", $member_id) {
$objQuery =& SC_Query::getSingletonInstance();
$sqlval = $this->objFormParam->getHashArray();
@@ -195,7 +195,7 @@
// 新規登録
if($payment_id == "") {
// INSERTの実行
- $sqlval['creator_id'] = $_SESSION['member_id'];
+ $sqlval['creator_id'] = $member_id;
$sqlval['rank'] = $objQuery->max("rank", "dtb_payment") + 1;
$sqlval['create_date'] = 'Now()';
$sqlval['payment_id'] = $objQuery->nextVal('dtb_payment_payment_id');
@@ -210,10 +210,10 @@
/* 利用条件の数値チェック */
/* 入力内容のチェック */
- function lfCheckError() {
+ function lfCheckError($post) {
// DBのデータを取得
- $arrPaymentData = $this->lfGetData($_POST['payment_id']);
+ $arrPaymentData = $this->lfGetData($post['payment_id']);
// 手数料を設定できない場合には、手数料を0にする
if($arrPaymentData["charge_flg"] == 2) $this->objFormParam->setValue("charge", "0");
変更: 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-21 08:22:21 UTC (rev 20296)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php 2011-02-21 08:24:32 UTC (rev 20297)
@@ -100,10 +100,10 @@
if(count($this->arrErr) == 0) {
switch($this->getMode()) {
case 'update':
- $this->lfUpdateData(); // 既存編集
+ $this->lfUpdateData($this->objFormParam->getHashArray()); // 既存編集
break;
case 'insert':
- $this->lfInsertData(); // 新規作成
+ $this->lfInsertData($this->objFormParam->getHashArray()); // 新規作成
break;
default:
break;
@@ -137,18 +137,18 @@
$this->objFormParam->addParam("会員登録時付与ポイント", "welcome_point", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
}
- function lfUpdateData() {
+ function lfUpdateData($post) {
// 入力データを渡す。
- $sqlval = $this->objFormParam->getHashArray();
+ $sqlval = $post;
$sqlval['update_date'] = 'Now()';
$objQuery =& SC_Query::getSingletonInstance();
// UPDATEの実行
$ret = $objQuery->update("dtb_baseinfo", $sqlval);
}
- function lfInsertData() {
+ function lfInsertData($post) {
// 入力データを渡す。
- $sqlval = $this->objFormParam->getHashArray();
+ $sqlval = $post;
$sqlval['update_date'] = 'Now()';
$objQuery =& SC_Query::getSingletonInstance();
// INSERTの実行
Svn-src-all メーリングリストの案内