Changeset 20297

Timestamp:

2011/02/21 17:24:32 (13 years ago)

Author:

coelacanth

Message:

#964 リファクタリング action以外でのPOST、GET、SESSIONの利用を引数で渡す形に変更

Location:

branches/version-2_5-dev/data/class/pages/admin/basis

Files:

• LC_Page_Admin_Basis_Holiday.php (modified) (9 diffs)
• LC_Page_Admin_Basis_Kiyaku.php (modified) (8 diffs)
• LC_Page_Admin_Basis_Mail.php (modified) (3 diffs)
• LC_Page_Admin_Basis_Payment.php (modified) (3 diffs)
• LC_Page_Admin_Basis_Payment_Input.php (modified) (4 diffs)
• LC_Page_Admin_Basis_Point.php (modified) (3 diffs)

branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php

@@ -80 +80 @@
 
         if (!empty($_POST)) {
-            $this->arrErr = $this->lfCheckError($mode);
+            $this->arrErr = $this->lfCheckError($mode, $_POST);
             if (!empty($this->arrErr['holiday_id'])) {
                 SC_Utils_Ex::sfDispException();
@@ -96 +96 @@
             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']); // 既存編集
                 }
                 // 再表示
@@ -167 +167 @@
 
     /* DBへの挿入 */
-    function lfInsertClass($arrData) {
+    function lfInsertClass($arrData, $member_id) {
         $objQuery =& SC_Query::getSingletonInstance();
         // INSERTする値を作成する。
@@ -173 +173 @@
         $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()";
@@ -184 +184 @@
 
     /* DBへの更新 */
-    function lfUpdateClass($arrData) {
+    function lfUpdateClass($arrData, $holiday_id) {
         $objQuery =& SC_Query::getSingletonInstance();
         // UPDATEする値を作成する。
@@ -193 +193 @@
         $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;
     }
@@ -219 +219 @@
      * @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();
@@ -232 +232 @@
                     $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);
@@ -250 +250 @@
                 $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();

branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php

@@ -76 +76 @@
 
         if (!empty($_POST)) {
-            $this->arrErr = $this->lfCheckError($mode);
+            $this->arrErr = $this->lfCheckError($mode, $_POST);
             if (!empty($this->arrErr['kiyaku_id'])) {
                 SC_Utils_Ex::sfDispException();
@@ -92 +92 @@
             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']);    // 既存編集
                 }
                 // 再表示
@@ -147 +147 @@
 
     /* 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()";
@@ -178 +178 @@
 
     /* DBへの更新 */
-    function lfUpdateClass($arrData) {
+    function lfUpdateClass($arrData, $kiyaku_id) {
         $objQuery =& SC_Query::getSingletonInstance();
         // UPDATEする値を作成する。
@@ -186 +186 @@
         $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;
     }
@@ -211 +211 @@
      * @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();
@@ -223 +223 @@
                 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>";
                     }
@@ -235 +235 @@
                 $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

@@ -74 +74 @@
         SC_Utils_Ex::sfIsSuccess($objSess);
 
-
         $this->arrMailTEMPLATE = $masterData->getMasterData("mtb_mail_template");
         switch ($this->getMode()) {
@@ -102 +101 @@
                 } else {
                     // 正常
-                    $this->lfRegist($this->arrForm);
+                    $this->lfRegist($this->arrForm, $_POST['template_id'], $_SESSION['member_id']);
 
                     // 完了メッセージ
@@ -131 +130 @@
     }
 
-    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

@@ -76 +76 @@
 
         if (!empty($_POST)) {
-            $this->arrErr = $this->lfCheckError($mode);
+            $this->arrErr = $this->lfCheckError($mode, $_POST);
             if (!empty($this->arrErr['payment_id'])) {
                 SC_Utils_Ex::sfDispException();
@@ -134 +134 @@
      * @return array
      */
-    function lfCheckError($mode) {
+    function lfCheckError($mode, $post) {
         $arrErr = array();
         switch($mode) {
@@ -142 +142 @@
                 $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

@@ -98 +98 @@
 
             // エラーチェック
-            $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();
@@ -181 +181 @@
 
     /* DBへデータを登録する */
-    function lfRegistData($payment_id = "") {
+    function lfRegistData($payment_id = "", $member_id) {
 
         $objQuery =& SC_Query::getSingletonInstance();
@@ -196 +196 @@
         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()';
@@ -211 +211 @@
 
     /* 入力内容のチェック */
-    function lfCheckError() {
+    function lfCheckError($post) {
 
         // DBのデータを取得
-        $arrPaymentData = $this->lfGetData($_POST['payment_id']);
+        $arrPaymentData = $this->lfGetData($post['payment_id']);
 
         // 手数料を設定できない場合には、手数料を0にする

branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php

@@ -101 +101 @@
                 switch($this->getMode()) {
                 case 'update':
-                    $this->lfUpdateData(); // 既存編集
+                    $this->lfUpdateData($this->objFormParam->getHashArray()); // 既存編集
                     break;
                 case 'insert':
-                    $this->lfInsertData(); // 新規作成
+                    $this->lfInsertData($this->objFormParam->getHashArray()); // 新規作成
                     break;
                 default:
@@ -138 +138 @@
     }
 
-    function lfUpdateData() {
+    function lfUpdateData($post) {
         // 入力データを渡す。
-        $sqlval = $this->objFormParam->getHashArray();
+        $sqlval = $post;
         $sqlval['update_date'] = 'Now()';
         $objQuery =& SC_Query::getSingletonInstance();
@@ -147 +147 @@
     }
 
-    function lfInsertData() {
+    function lfInsertData($post) {
         // 入力データを渡す。
-        $sqlval = $this->objFormParam->getHashArray();
+        $sqlval = $post;
         $sqlval['update_date'] = 'Now()';
         $objQuery =& SC_Query::getSingletonInstance();