Changeset 20127

Timestamp:

2011/02/09 21:10:45 (12 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:20126

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/class/SC_FormParam.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_FormParam.php

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110209120452-qxfqsod0i0huzsp3

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

ohkouchi@loop-az.jp-20110209121032-f87kx2nv801gwnto

bzr:revno:

2855

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/class/SC_FormParam.php ohkouchi@loop-az.jp-20110209120452-qxfqsod0i0huzsp3

bzr:timestamp:

2011-02-09 21:10:32.371000051 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-02-09T12:10:32.371000Z

Message:

#975([管理画面]受注管理（受注一覧、登録編集）)

• 配送商品のチェックを多次元配列で行うため, SC_FormParam::checkError() を多次元配列に対応

File:

• branches/version-2_5-dev/data/class/SC_FormParam.php (modified) (3 diffs)

branches/version-2_5-dev/data/class/SC_FormParam.php

@@ -176 +176 @@
         // 連想配列の取得
         $arrRet = $this->getHashArray($keyname);
-        $objErr = new SC_CheckError($arrRet);
+        $objErr->arrErr = array();
 
         $cnt = 0;
@@ -202 +202 @@
                 case 'FILE_NAME_CHECK':
                 case 'MOBILE_EMAIL_CHECK':
-
-                    if(!is_array($this->param[$cnt])) {
-                        $objErr->doFunc(array($this->disp_name[$cnt], $val), array($func));
-                    } else {
-                        $max = count($this->param[$cnt]);
-                        for($i = 0; $i < $max; $i++) {
-                            $objSubErr = new SC_CheckError($this->param[$cnt]);
-                            $objSubErr->doFunc(array($this->disp_name[$cnt], $i), array($func));
-                            if(count($objSubErr->arrErr) > 0) {
-                                foreach($objSubErr->arrErr as $mess) {
-                                    if($mess != "") {
-                                        $objErr->arrErr[$val] = $mess;
-                                    }
-                                }
-                            }
-                        }
-                    }
+                    $this->recursionCheck($this->disp_name[$cnt], $func,
+                                          $this->param[$cnt], $objErr->arrErr,
+                                          $val, $this->length[$cnt]);
                     break;
                 case 'MAX_LENGTH_CHECK':
                 case 'MIN_LENGTH_CHECK':
                 case 'NUM_COUNT_CHECK':
-                    if(!is_array($this->param[$cnt])) {
-                        $objErr->doFunc(array($this->disp_name[$cnt], $val, $this->length[$cnt]), array($func));
-                    } else {
-                        $max = count($this->param[$cnt]);
-                        for($i = 0; $i < $max; $i++) {
-                            $objSubErr = new SC_CheckError($this->param[$cnt]);
-                            $objSubErr->doFunc(array($this->disp_name[$cnt], $i, $this->length[$cnt]), array($func));
-                            if(count($objSubErr->arrErr) > 0) {
-                                foreach($objSubErr->arrErr as $mess) {
-                                    if($mess != "") {
-                                        $objErr->arrErr[$val] = $mess;
-                                    }
-                                }
-                            }
-                        }
-                    }
+                    $this->recursionCheck($this->disp_name[$cnt], $func,
+                                          $this->param[$cnt], $objErr->arrErr,
+                                          $val, $this->length[$cnt]);
                     break;
                 // 小文字に変換
@@ -268 +241 @@
         }
         return $objErr->arrErr;
+    }
+
+    /**
+     * SC_CheckError::doFunc() を再帰的に実行する.
+     *
+     * @param string $disp_name 表示名
+     * @param string $func チェック種別
+     * @param mixed $value チェック対象の値. 配列の場合は再帰的にチェックする.
+     * @param array $arrErr エラーメッセージを格納する配列
+     * @param string $error_key エラーメッセージを格納する配列のキー
+     * @param integer $length チェック対象の値の長さ
+     * @return void
+     */
+    function recursionCheck($disp_name, $func, $value, &$arrErr, $error_key,
+                            $length = 0) {
+        if (is_array($value)) {
+            foreach ($value as $in) {
+                $this->recursionCheck($disp_name, $func, $in, $arrErr, $error_key,
+                                      $length);
+            }
+        } else {
+            $objSubErr = new SC_CheckError(array(0 => $value));
+            $objSubErr->doFunc(array($disp_name, 0, $length), array($func));
+            if(count($objSubErr->arrErr) > 0) {
+                foreach($objSubErr->arrErr as $mess) {
+                    if($mess != "") {
+                        $arrErr[$error_key] .= $mess;
+                    }
+                }
+            }
+        }
     }