Changeset 22891
- Timestamp:
- 2013/06/25 15:11:17 (11 years ago)
- Location:
- branches/version-2_12-dev/data/class
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_12-dev/data/class/SC_CheckError.php
r22876 r22891 104 104 return; 105 105 } 106 $this->createParam($value);106 // $this->createParam($value); 107 107 if (strlen($this->arrParam[$value[0]]) == 0) { 108 108 $this->arrErr[$value[0]] = '※ ' . $value[0] . 'が入力されていません。<br />'; … … 183 183 return; 184 184 } 185 $this->createParam($value);185 // $this->createParam($value); 186 186 // 文字数の取得 187 187 if ($this->arrParam[$value[2]] !== $this->arrParam[$value[3]]) { … … 201 201 return; 202 202 } 203 $this->createParam($value);203 // $this->createParam($value); 204 204 // 文字数の取得 205 205 if ($this->arrParam[$value[2]] == $this->arrParam[$value[3]]) { … … 219 219 return; 220 220 } 221 $this->createParam($value);221 // $this->createParam($value); 222 222 // 文字数の取得 223 223 if ($this->arrParam[$value[2]] != '' && $this->arrParam[$value[3]] != '' && ($this->arrParam[$value[2]] > $this->arrParam[$value[3]])) { … … 930 930 return; 931 931 } 932 $this->createParam($value);932 // $this->createParam($value); 933 933 if ((strlen($this->arrParam[$value[2]]) > 0 || strlen($this->arrParam[$value[3]]) > 0 || strlen($this->arrParam[$value[4]]) > 0) && ! checkdate($this->arrParam[$value[3]], $this->arrParam[$value[4]], $this->arrParam[$value[2]])) { 934 934 $this->arrErr[$value[2]] = '※ ' . $value[0] . 'を正しく指定してください。<br />'; … … 980 980 return; 981 981 } 982 $this->createParam($value);982 // $this->createParam($value); 983 983 if ((strlen($this->arrParam[$value[2]]) > 0 || strlen($this->arrParam[$value[3]]) > 0 || strlen($this->arrParam[$value[4]]) > 0 || strlen($this->arrParam[$value[5]]) > 0) && ! checkdate($this->arrParam[$value[3]], $this->arrParam[$value[4]], $this->arrParam[$value[2]])) { 984 984 $this->arrErr[$value[2]] = '※ ' . $value[0] . 'を正しく指定してください。<br />'; … … 1023 1023 return; 1024 1024 } 1025 $this->createParam($value);1025 // $this->createParam($value); 1026 1026 if ((strlen($this->arrParam[$value[2]]) > 0 || strlen($this->arrParam[$value[3]]) > 0) && ! checkdate($this->arrParam[$value[3]], 1, $this->arrParam[$value[2]])) { 1027 1027 $this->arrErr[$value[2]] = '※ ' . $value[0] . 'を正しく指定してください。<br />'; … … 1135 1135 return; 1136 1136 } 1137 $this->createParam($value);1137 // $this->createParam($value); 1138 1138 if ($this->evalCheck($value[1]) === false) { 1139 1139 $this->arrErr[$value[0]] = '※ ' . $value[0] . ' の形式が不正です。<br />'; … … 1164 1164 */ 1165 1165 function createParam($value) { 1166 foreach ($value as $key) { 1167 if (is_string($key) || is_int($key)) { 1168 if (!isset($this->arrParam[$key])) $this->arrParam[$key] = ''; 1169 } 1170 } 1166 foreach ($value as $val_key => $key) { 1167 if ($val_key != 0 && (is_string($key) || is_int($key))) { 1168 if (!is_numeric($key) && preg_match('/^[a-z0-9_]+$/i', $key)) { 1169 if (!isset($this->arrParam[$key])) $this->arrParam[$key] = ''; 1170 if (strlen($this->arrParam[$key]) > 0 1171 && (preg_match('/^[[:alnum:]\-\_]*[\.\/\\\\]*\.\.(\/|\\\\)/',$this->arrParam[$key]) || !preg_match('/\A[^\x00-\x08\x0b\x0c\x0e-\x1f\x7f]+\z/u', $this->arrParam[$key]))) 1172 ) { 1173 $this->arrErr[$value[1]] = '※ ' . $value[0] . 'に禁止された記号の並びまたは制御文字が入っています。<br />'; 1174 } 1175 } else if (preg_match('/[^a-z0-9_]/i', $key)) { 1176 trigger_error('', E_USER_ERROR); 1177 } 1178 } 1179 } 1171 1180 } 1172 1181 -
branches/version-2_12-dev/data/class/SC_FormParam.php
r22796 r22891 277 277 } 278 278 } else { 279 $objErr = new SC_CheckError_Ex(array( 0=> $value));280 $objErr->doFunc(array($disp_name, 0, $length), array($func));279 $objErr = new SC_CheckError_Ex(array(($error_last_key ? $error_last_key : $error_key) => $value)); 280 $objErr->doFunc(array($disp_name, ($error_last_key ? $error_last_key : $error_key), $length), array($func)); 281 281 if (!SC_Utils_Ex::isBlank($objErr->arrErr)) { 282 282 foreach ($objErr->arrErr as $message) {
Note: See TracChangeset
for help on using the changeset viewer.