@@ -208,7 +208,7 @@ |
||
208 | 208 | //If is the SELECT query |
209 | 209 | $this->isSelectQuery = stristr($this->query, 'SELECT') !== false; |
210 | 210 | |
211 | - //if can use cache feature for this query |
|
211 | + //if can use cache feature for this query |
|
212 | 212 | $this->dbCacheStatus = get_config('cache_enable', false) && $this->cacheTtl > 0; |
213 | 213 | } |
214 | 214 |
@@ -133,11 +133,11 @@ discard block |
||
133 | 133 | } |
134 | 134 | } |
135 | 135 | |
136 | - /** |
|
137 | - * Reset the form validation instance |
|
138 | - * |
|
139 | - * @return object the current instance |
|
140 | - */ |
|
136 | + /** |
|
137 | + * Reset the form validation instance |
|
138 | + * |
|
139 | + * @return object the current instance |
|
140 | + */ |
|
141 | 141 | public function reset() { |
142 | 142 | $this->rules = array(); |
143 | 143 | $this->labels = array(); |
@@ -160,11 +160,11 @@ discard block |
||
160 | 160 | return $this; |
161 | 161 | } |
162 | 162 | |
163 | - /** |
|
164 | - * Return the validation data |
|
165 | - * |
|
166 | - * @return array the validation data |
|
167 | - */ |
|
163 | + /** |
|
164 | + * Return the validation data |
|
165 | + * |
|
166 | + * @return array the validation data |
|
167 | + */ |
|
168 | 168 | public function getData() { |
169 | 169 | return $this->data; |
170 | 170 | } |
@@ -213,11 +213,11 @@ discard block |
||
213 | 213 | return $this->rules; |
214 | 214 | } |
215 | 215 | |
216 | - /** |
|
217 | - * Return the list of the validations rules for the given field |
|
218 | - * |
|
219 | - * @return array |
|
220 | - */ |
|
216 | + /** |
|
217 | + * Return the list of the validations rules for the given field |
|
218 | + * |
|
219 | + * @return array |
|
220 | + */ |
|
221 | 221 | public function getFieldRules($field) { |
222 | 222 | $rules = array(); |
223 | 223 | if (array_key_exists($field, $this->rules)) { |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | * @return string|null |
234 | 234 | */ |
235 | 235 | public function getFieldValue($field) { |
236 | - $value = null; |
|
236 | + $value = null; |
|
237 | 237 | if (array_key_exists($field, $this->data)) { |
238 | 238 | $value = $this->data[$field]; |
239 | 239 | } |
@@ -255,15 +255,15 @@ discard block |
||
255 | 255 | } |
256 | 256 | |
257 | 257 | |
258 | - /** |
|
259 | - * Return the list of validation errors |
|
260 | - * |
|
261 | - * @return array the errors list. |
|
262 | - * Format: |
|
263 | - * [field1] => 'error message 1', |
|
264 | - * [field2] => 'error message 2' |
|
265 | - */ |
|
266 | - public function getErrors() { |
|
258 | + /** |
|
259 | + * Return the list of validation errors |
|
260 | + * |
|
261 | + * @return array the errors list. |
|
262 | + * Format: |
|
263 | + * [field1] => 'error message 1', |
|
264 | + * [field2] => 'error message 2' |
|
265 | + */ |
|
266 | + public function getErrors() { |
|
267 | 267 | return $this->errors; |
268 | 268 | } |
269 | 269 | |
@@ -346,11 +346,11 @@ discard block |
||
346 | 346 | return $this; |
347 | 347 | } |
348 | 348 | |
349 | - /** |
|
350 | - * Set the database instance using get_instance() if is null |
|
351 | - * |
|
352 | - * @return object the current instance |
|
353 | - */ |
|
349 | + /** |
|
350 | + * Set the database instance using get_instance() if is null |
|
351 | + * |
|
352 | + * @return object the current instance |
|
353 | + */ |
|
354 | 354 | protected function setDatabaseFromSuperInstanceIfNotSet(){ |
355 | 355 | if (!is_object($this->database)) { |
356 | 356 | $this->database = get_instance()->database; |
@@ -387,7 +387,7 @@ discard block |
||
387 | 387 | * @param string|null $field2 the second field used in some validation rule like "matches", "not_equal" |
388 | 388 | * |
389 | 389 | */ |
390 | - protected function setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue = null, $field2 = null) { |
|
390 | + protected function setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue = null, $field2 = null) { |
|
391 | 391 | //if the field is not required and his value is not set don't set error |
392 | 392 | //but in case the field have value validate it |
393 | 393 | if (!$this->fieldIsRequired($field) && strlen($value) <= 0) { |
@@ -413,9 +413,9 @@ discard block |
||
413 | 413 | * @return string the name of the validation method |
414 | 414 | */ |
415 | 415 | protected function getRuleValidationMethod($rule) { |
416 | - $parts = explode('_', $rule); |
|
417 | - $parts = array_map('ucfirst', $parts); |
|
418 | - return 'checkRule' . implode('', $parts); |
|
416 | + $parts = explode('_', $rule); |
|
417 | + $parts = array_map('ucfirst', $parts); |
|
418 | + return 'checkRule' . implode('', $parts); |
|
419 | 419 | } |
420 | 420 | |
421 | 421 | /** |
@@ -469,7 +469,7 @@ discard block |
||
469 | 469 | $template['field2}'] = $field2; |
470 | 470 | $template['{value2}'] = $this->getFieldValue($field2); |
471 | 471 | $template['{label2}'] = $this->getFieldLabel($field2); |
472 | - } |
|
472 | + } |
|
473 | 473 | $message = $this->messages[$rule]; |
474 | 474 | //Check for custom message |
475 | 475 | if (isset($this->customErrors[$field][$rule])) { |
@@ -500,7 +500,7 @@ discard block |
||
500 | 500 | //Get the name of the method to validate this rule |
501 | 501 | $method = $this->getRuleValidationMethod($realRuleName); |
502 | 502 | if (method_exists($this, $method)) { |
503 | - call_user_func_array(array($this, $method), array($field, $realRuleName, $paramValue)); |
|
503 | + call_user_func_array(array($this, $method), array($field, $realRuleName, $paramValue)); |
|
504 | 504 | } |
505 | 505 | else{ |
506 | 506 | $this->forceError = true; |
@@ -594,7 +594,7 @@ discard block |
||
594 | 594 | * @param string|null $paramValue the rule parameter |
595 | 595 | */ |
596 | 596 | protected function checkRuleMinLength($field, $rule, $paramValue) { |
597 | - $value = $this->getFieldValue($field); |
|
597 | + $value = $this->getFieldValue($field); |
|
598 | 598 | if (strlen($value) < $paramValue) { |
599 | 599 | $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
600 | 600 | } |
@@ -608,7 +608,7 @@ discard block |
||
608 | 608 | * @param string|null $paramValue the rule parameter |
609 | 609 | */ |
610 | 610 | protected function checkRuleMaxLength($field, $rule, $paramValue) { |
611 | - $value = $this->getFieldValue($field); |
|
611 | + $value = $this->getFieldValue($field); |
|
612 | 612 | if (strlen($value) > $paramValue) { |
613 | 613 | $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
614 | 614 | } |
@@ -622,7 +622,7 @@ discard block |
||
622 | 622 | * @param string|null $paramValue the rule parameter |
623 | 623 | */ |
624 | 624 | protected function checkRuleExactLength($field, $rule, $paramValue) { |
625 | - $value = $this->getFieldValue($field); |
|
625 | + $value = $this->getFieldValue($field); |
|
626 | 626 | if (strlen($value) != $paramValue) { |
627 | 627 | $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
628 | 628 | } |
@@ -729,7 +729,7 @@ discard block |
||
729 | 729 | protected function checkRuleNumeric($field, $rule, $paramValue) { |
730 | 730 | $value = $this->getFieldValue($field); |
731 | 731 | if (!is_numeric($value)) { |
732 | - $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
732 | + $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
733 | 733 | } |
734 | 734 | } |
735 | 735 | |
@@ -743,7 +743,7 @@ discard block |
||
743 | 743 | protected function checkRuleInteger($field, $rule, $paramValue) { |
744 | 744 | $value = $this->getFieldValue($field); |
745 | 745 | if (filter_var($value, FILTER_VALIDATE_INT) === false) { |
746 | - $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
746 | + $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
747 | 747 | } |
748 | 748 | } |
749 | 749 | |
@@ -757,7 +757,7 @@ discard block |
||
757 | 757 | protected function checkRuleIntegerNatural($field, $rule, $paramValue) { |
758 | 758 | $value = $this->getFieldValue($field); |
759 | 759 | if (filter_var($value, FILTER_VALIDATE_INT) === false || $value < 0) { |
760 | - $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
760 | + $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
761 | 761 | } |
762 | 762 | } |
763 | 763 | |
@@ -844,7 +844,7 @@ discard block |
||
844 | 844 | $format = $paramValue; |
845 | 845 | $dateValue = date_create_from_format($format, $value); |
846 | 846 | if ($dateValue === false || $dateValue->format($format) !== $value) { |
847 | - $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
847 | + $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
848 | 848 | } |
849 | 849 | } |
850 | 850 | |
@@ -888,7 +888,7 @@ discard block |
||
888 | 888 | protected function checkRuleUrl($field, $rule, $paramValue) { |
889 | 889 | $value = $this->getFieldValue($field); |
890 | 890 | if (filter_var($value, FILTER_VALIDATE_URL) === false) { |
891 | - $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
891 | + $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
892 | 892 | } |
893 | 893 | } |
894 | 894 | |
@@ -903,7 +903,7 @@ discard block |
||
903 | 903 | protected function checkRuleIp($field, $rule, $paramValue) { |
904 | 904 | $value = $this->getFieldValue($field); |
905 | 905 | if (filter_var($value, FILTER_VALIDATE_IP) === false) { |
906 | - $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
906 | + $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
907 | 907 | } |
908 | 908 | } |
909 | 909 | |
@@ -948,7 +948,7 @@ discard block |
||
948 | 948 | $value = $this->getFieldValue($field); |
949 | 949 | list($table, $column) = explode('.', $paramValue); |
950 | 950 | $this->database->getQueryBuilder()->from($table) |
951 | - ->where($column, $value); |
|
951 | + ->where($column, $value); |
|
952 | 952 | $this->database->get(); |
953 | 953 | if ($this->database->numRows() > 0) { |
954 | 954 | $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
@@ -970,8 +970,8 @@ discard block |
||
970 | 970 | list($table, $column) = explode('.', $data[0]); |
971 | 971 | list($columnKey, $valueKey) = explode('=', $data[1]); |
972 | 972 | $this->database->getQueryBuilder()->from($table) |
973 | - ->where($column, $value) |
|
974 | - ->where($columnKey, '!=', trim($valueKey)); |
|
973 | + ->where($column, $value) |
|
974 | + ->where($columnKey, '!=', trim($valueKey)); |
|
975 | 975 | $this->database->get(); |
976 | 976 | if ($this->database->numRows() > 0) { |
977 | 977 | $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
@@ -991,7 +991,7 @@ discard block |
||
991 | 991 | $value = $this->getFieldValue($field); |
992 | 992 | list($table, $column) = explode('.', $paramValue); |
993 | 993 | $this->database->getQueryBuilder()->from($table) |
994 | - ->where($column, $value); |
|
994 | + ->where($column, $value); |
|
995 | 995 | $this->database->get(); |
996 | 996 | if ($this->database->numRows() <= 0) { |
997 | 997 | $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |