@@ -180,13 +180,13 @@ discard block |
||
180 | 180 | $this->log(self::DEBUG, $message); |
181 | 181 | } |
182 | 182 | |
183 | - /** |
|
184 | - * Logs with an arbitrary level. |
|
185 | - * |
|
186 | - * @param integer|string $level the log level in integer or string format, |
|
187 | - * if is string will convert into integer. |
|
188 | - * @param string $message the log message to be saved |
|
189 | - */ |
|
183 | + /** |
|
184 | + * Logs with an arbitrary level. |
|
185 | + * |
|
186 | + * @param integer|string $level the log level in integer or string format, |
|
187 | + * if is string will convert into integer. |
|
188 | + * @param string $message the log message to be saved |
|
189 | + */ |
|
190 | 190 | public function log($level, $message) { |
191 | 191 | $configLogLevel = get_config('log_level'); |
192 | 192 | if (!$configLogLevel) { |
@@ -198,11 +198,11 @@ discard block |
||
198 | 198 | //NOTE: here need put the show_error() "logging" to false |
199 | 199 | //to prevent self function loop call |
200 | 200 | show_error('Invalid config log level [' . $configLogLevel . '], ' |
201 | - . 'the value must be one of the following: ' |
|
202 | - . implode(', ', array_map('strtoupper', self::$validConfigLevel)) |
|
203 | - , 'Log Config Error', |
|
204 | - $logging = false |
|
205 | - ); |
|
201 | + . 'the value must be one of the following: ' |
|
202 | + . implode(', ', array_map('strtoupper', self::$validConfigLevel)) |
|
203 | + , 'Log Config Error', |
|
204 | + $logging = false |
|
205 | + ); |
|
206 | 206 | return; |
207 | 207 | } |
208 | 208 | |
@@ -271,7 +271,7 @@ discard block |
||
271 | 271 | protected function levelCanSaveLog($level) { |
272 | 272 | $result = true; |
273 | 273 | $configLogLevel = get_config('log_level'); |
274 | - //check if can save log regarding the log level configuration |
|
274 | + //check if can save log regarding the log level configuration |
|
275 | 275 | $configLevel = self::getLevelValue($configLogLevel); |
276 | 276 | if ($configLevel > $level) { |
277 | 277 | //can't log |
@@ -351,7 +351,7 @@ discard block |
||
351 | 351 | //NOTE: here need put the show_error() "logging" to false |
352 | 352 | //to prevent self function loop call |
353 | 353 | show_error('Error : the log dir does not exist or is not writable', |
354 | - 'Log directory error', $logging = false); |
|
354 | + 'Log directory error', $logging = false); |
|
355 | 355 | } |
356 | 356 | return $logSavePath . 'logs-' . date('Y-m-d') . '.log'; |
357 | 357 | } |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | //reset instance |
101 | 101 | $this->reset(); |
102 | 102 | |
103 | - $this->logger->debug('Begin execution of SQL query [' . $this->query .']'); |
|
103 | + $this->logger->debug('Begin execution of SQL query [' . $this->query . ']'); |
|
104 | 104 | |
105 | 105 | //for database query execution time |
106 | 106 | $benchmarkMarkerKey = $this->getBenchmarkKey(); |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | if ((double) $responseTime >= 1.000000) { |
118 | 118 | $this->logger->warning( |
119 | 119 | 'High response time while processing database query [' . $this->query . '].' |
120 | - . ' The response time is [' .$responseTime . '] sec.' |
|
120 | + . ' The response time is [' . $responseTime . '] sec.' |
|
121 | 121 | ); |
122 | 122 | } |
123 | 123 |
@@ -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(); |
@@ -161,11 +161,11 @@ discard block |
||
161 | 161 | return $this; |
162 | 162 | } |
163 | 163 | |
164 | - /** |
|
165 | - * Return the validation data |
|
166 | - * |
|
167 | - * @return array the validation data |
|
168 | - */ |
|
164 | + /** |
|
165 | + * Return the validation data |
|
166 | + * |
|
167 | + * @return array the validation data |
|
168 | + */ |
|
169 | 169 | public function getData() { |
170 | 170 | return $this->data; |
171 | 171 | } |
@@ -214,11 +214,11 @@ discard block |
||
214 | 214 | return $this->rules; |
215 | 215 | } |
216 | 216 | |
217 | - /** |
|
218 | - * Return the list of the validations rules for the given field |
|
219 | - * |
|
220 | - * @return array |
|
221 | - */ |
|
217 | + /** |
|
218 | + * Return the list of the validations rules for the given field |
|
219 | + * |
|
220 | + * @return array |
|
221 | + */ |
|
222 | 222 | public function getFieldRules($field) { |
223 | 223 | $rules = array(); |
224 | 224 | if (array_key_exists($field, $this->rules)) { |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | * @return string|null |
235 | 235 | */ |
236 | 236 | public function getFieldValue($field) { |
237 | - $value = null; |
|
237 | + $value = null; |
|
238 | 238 | if (array_key_exists($field, $this->data)) { |
239 | 239 | $value = $this->data[$field]; |
240 | 240 | } |
@@ -256,15 +256,15 @@ discard block |
||
256 | 256 | } |
257 | 257 | |
258 | 258 | |
259 | - /** |
|
260 | - * Return the list of validation errors |
|
261 | - * |
|
262 | - * @return array the errors list. |
|
263 | - * Format: |
|
264 | - * [field1] => 'error message 1', |
|
265 | - * [field2] => 'error message 2' |
|
266 | - */ |
|
267 | - public function getErrors() { |
|
259 | + /** |
|
260 | + * Return the list of validation errors |
|
261 | + * |
|
262 | + * @return array the errors list. |
|
263 | + * Format: |
|
264 | + * [field1] => 'error message 1', |
|
265 | + * [field2] => 'error message 2' |
|
266 | + */ |
|
267 | + public function getErrors() { |
|
268 | 268 | return $this->errors; |
269 | 269 | } |
270 | 270 | |
@@ -347,11 +347,11 @@ discard block |
||
347 | 347 | return $this; |
348 | 348 | } |
349 | 349 | |
350 | - /** |
|
351 | - * Set the database instance using get_instance() if is null |
|
352 | - * |
|
353 | - * @return object the current instance |
|
354 | - */ |
|
350 | + /** |
|
351 | + * Set the database instance using get_instance() if is null |
|
352 | + * |
|
353 | + * @return object the current instance |
|
354 | + */ |
|
355 | 355 | protected function setDatabaseFromSuperInstanceIfNotSet() { |
356 | 356 | if (!is_object($this->database)) { |
357 | 357 | $this->database = get_instance()->database; |
@@ -388,7 +388,7 @@ discard block |
||
388 | 388 | * @param string|null $field2 the second field used in some validation rule like "matches", "not_equal" |
389 | 389 | * |
390 | 390 | */ |
391 | - protected function setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue = null, $field2 = null) { |
|
391 | + protected function setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue = null, $field2 = null) { |
|
392 | 392 | //if the field is not required and his value is not set don't set error |
393 | 393 | //but in case the field have value validate it |
394 | 394 | if (!$this->fieldIsRequired($field) && strlen($value) <= 0) { |
@@ -432,9 +432,9 @@ discard block |
||
432 | 432 | * @return string the name of the validation method |
433 | 433 | */ |
434 | 434 | protected function getRuleValidationMethod($rule) { |
435 | - $parts = explode('_', $rule); |
|
436 | - $parts = array_map('ucfirst', $parts); |
|
437 | - return 'checkRule' . implode('', $parts); |
|
435 | + $parts = explode('_', $rule); |
|
436 | + $parts = array_map('ucfirst', $parts); |
|
437 | + return 'checkRule' . implode('', $parts); |
|
438 | 438 | } |
439 | 439 | |
440 | 440 | /** |
@@ -445,7 +445,7 @@ discard block |
||
445 | 445 | protected function filterValidationData() { |
446 | 446 | foreach ($this->data as $key => $value ) { |
447 | 447 | if (is_string($value)) { |
448 | - $this->data[$key] = trim($value); |
|
448 | + $this->data[$key] = trim($value); |
|
449 | 449 | } else if(is_array($value)) { |
450 | 450 | $this->data[$key] = array_map('trim', $value); |
451 | 451 | } |
@@ -492,7 +492,7 @@ discard block |
||
492 | 492 | $template['field2}'] = $field2; |
493 | 493 | $template['{value2}'] = $this->getFieldValue($field2); |
494 | 494 | $template['{label2}'] = $this->getFieldLabel($field2); |
495 | - } |
|
495 | + } |
|
496 | 496 | $message = $this->messages[$rule]; |
497 | 497 | //Check for custom message |
498 | 498 | if (isset($this->customErrors[$field][$rule])) { |
@@ -523,7 +523,7 @@ discard block |
||
523 | 523 | //Get the name of the method to validate this rule |
524 | 524 | $method = $this->getRuleValidationMethod($realRuleName); |
525 | 525 | if (method_exists($this, $method)) { |
526 | - call_user_func_array(array($this, $method), array($field, $realRuleName, $paramValue)); |
|
526 | + call_user_func_array(array($this, $method), array($field, $realRuleName, $paramValue)); |
|
527 | 527 | } else { |
528 | 528 | $this->forceError = true; |
529 | 529 | show_error('Invalid validaton rule "' . $realRuleName . '"'); |
@@ -615,14 +615,14 @@ discard block |
||
615 | 615 | * @param string|null $paramValue the rule parameter |
616 | 616 | */ |
617 | 617 | protected function checkRuleMinLength($field, $rule, $paramValue) { |
618 | - $value = $this->getFieldValue($field); |
|
619 | - $this->setSimpleFieldError( |
|
620 | - strlen($value) < $paramValue, |
|
621 | - $field, |
|
622 | - $value, |
|
623 | - $rule, |
|
624 | - $paramValue |
|
625 | - ); |
|
618 | + $value = $this->getFieldValue($field); |
|
619 | + $this->setSimpleFieldError( |
|
620 | + strlen($value) < $paramValue, |
|
621 | + $field, |
|
622 | + $value, |
|
623 | + $rule, |
|
624 | + $paramValue |
|
625 | + ); |
|
626 | 626 | } |
627 | 627 | |
628 | 628 | /** |
@@ -633,14 +633,14 @@ discard block |
||
633 | 633 | * @param string|null $paramValue the rule parameter |
634 | 634 | */ |
635 | 635 | protected function checkRuleMaxLength($field, $rule, $paramValue) { |
636 | - $value = $this->getFieldValue($field); |
|
637 | - $this->setSimpleFieldError( |
|
638 | - strlen($value) > $paramValue, |
|
639 | - $field, |
|
640 | - $value, |
|
641 | - $rule, |
|
642 | - $paramValue |
|
643 | - ); |
|
636 | + $value = $this->getFieldValue($field); |
|
637 | + $this->setSimpleFieldError( |
|
638 | + strlen($value) > $paramValue, |
|
639 | + $field, |
|
640 | + $value, |
|
641 | + $rule, |
|
642 | + $paramValue |
|
643 | + ); |
|
644 | 644 | } |
645 | 645 | |
646 | 646 | /** |
@@ -651,14 +651,14 @@ discard block |
||
651 | 651 | * @param string|null $paramValue the rule parameter |
652 | 652 | */ |
653 | 653 | protected function checkRuleExactLength($field, $rule, $paramValue) { |
654 | - $value = $this->getFieldValue($field); |
|
655 | - $this->setSimpleFieldError( |
|
656 | - strlen($value) != $paramValue, |
|
657 | - $field, |
|
658 | - $value, |
|
659 | - $rule, |
|
660 | - $paramValue |
|
661 | - ); |
|
654 | + $value = $this->getFieldValue($field); |
|
655 | + $this->setSimpleFieldError( |
|
656 | + strlen($value) != $paramValue, |
|
657 | + $field, |
|
658 | + $value, |
|
659 | + $rule, |
|
660 | + $paramValue |
|
661 | + ); |
|
662 | 662 | } |
663 | 663 | |
664 | 664 | /** |
@@ -671,13 +671,13 @@ discard block |
||
671 | 671 | protected function checkRuleMatches($field, $rule, $paramValue) { |
672 | 672 | $value = $this->getFieldValue($field); |
673 | 673 | $this->setSimpleFieldError( |
674 | - $value != $this->getFieldValue($paramValue), |
|
675 | - $field, |
|
676 | - $value, |
|
677 | - $rule, |
|
678 | - $paramValue, |
|
679 | - $paramValue //field2 |
|
680 | - ); |
|
674 | + $value != $this->getFieldValue($paramValue), |
|
675 | + $field, |
|
676 | + $value, |
|
677 | + $rule, |
|
678 | + $paramValue, |
|
679 | + $paramValue //field2 |
|
680 | + ); |
|
681 | 681 | } |
682 | 682 | |
683 | 683 | /** |
@@ -690,13 +690,13 @@ discard block |
||
690 | 690 | protected function checkRuleNotEqual($field, $rule, $paramValue) { |
691 | 691 | $value = $this->getFieldValue($field); |
692 | 692 | $this->setSimpleFieldError( |
693 | - $value == $this->getFieldValue($paramValue), |
|
694 | - $field, |
|
695 | - $value, |
|
696 | - $rule, |
|
697 | - $paramValue, |
|
698 | - $paramValue //field2 |
|
699 | - ); |
|
693 | + $value == $this->getFieldValue($paramValue), |
|
694 | + $field, |
|
695 | + $value, |
|
696 | + $rule, |
|
697 | + $paramValue, |
|
698 | + $paramValue //field2 |
|
699 | + ); |
|
700 | 700 | } |
701 | 701 | |
702 | 702 | /** |
@@ -709,12 +709,12 @@ discard block |
||
709 | 709 | protected function checkRuleMin($field, $rule, $paramValue) { |
710 | 710 | $value = $this->getFieldValue($field); |
711 | 711 | $this->setSimpleFieldError( |
712 | - $value < $paramValue, |
|
713 | - $field, |
|
714 | - $value, |
|
715 | - $rule, |
|
716 | - $paramValue |
|
717 | - ); |
|
712 | + $value < $paramValue, |
|
713 | + $field, |
|
714 | + $value, |
|
715 | + $rule, |
|
716 | + $paramValue |
|
717 | + ); |
|
718 | 718 | } |
719 | 719 | |
720 | 720 | /** |
@@ -727,12 +727,12 @@ discard block |
||
727 | 727 | protected function checkRuleMax($field, $rule, $paramValue) { |
728 | 728 | $value = $this->getFieldValue($field); |
729 | 729 | $this->setSimpleFieldError( |
730 | - $value > $paramValue, |
|
731 | - $field, |
|
732 | - $value, |
|
733 | - $rule, |
|
734 | - $paramValue |
|
735 | - ); |
|
730 | + $value > $paramValue, |
|
731 | + $field, |
|
732 | + $value, |
|
733 | + $rule, |
|
734 | + $paramValue |
|
735 | + ); |
|
736 | 736 | } |
737 | 737 | |
738 | 738 | /** |
@@ -748,12 +748,12 @@ discard block |
||
748 | 748 | $betweens = explode(',', $paramValue, 2); |
749 | 749 | $betweens = array_map('trim', $betweens); |
750 | 750 | $this->setSimpleFieldError( |
751 | - ($value < $betweens[0]) || ($value > $betweens[1]), |
|
752 | - $field, |
|
753 | - $value, |
|
754 | - $rule, |
|
755 | - $paramValue |
|
756 | - ); |
|
751 | + ($value < $betweens[0]) || ($value > $betweens[1]), |
|
752 | + $field, |
|
753 | + $value, |
|
754 | + $rule, |
|
755 | + $paramValue |
|
756 | + ); |
|
757 | 757 | } |
758 | 758 | |
759 | 759 | /** |
@@ -770,12 +770,12 @@ discard block |
||
770 | 770 | $list = array_map('trim', $list); |
771 | 771 | $paramValue = implode(',', $list); |
772 | 772 | $this->setSimpleFieldError( |
773 | - !in_array($value, $list), |
|
774 | - $field, |
|
775 | - $value, |
|
776 | - $rule, |
|
777 | - $paramValue |
|
778 | - ); |
|
773 | + !in_array($value, $list), |
|
774 | + $field, |
|
775 | + $value, |
|
776 | + $rule, |
|
777 | + $paramValue |
|
778 | + ); |
|
779 | 779 | } |
780 | 780 | |
781 | 781 | /** |
@@ -788,12 +788,12 @@ discard block |
||
788 | 788 | protected function checkRuleNumeric($field, $rule, $paramValue) { |
789 | 789 | $value = $this->getFieldValue($field); |
790 | 790 | $this->setSimpleFieldError( |
791 | - !is_numeric($value), |
|
792 | - $field, |
|
793 | - $value, |
|
794 | - $rule, |
|
795 | - $paramValue |
|
796 | - ); |
|
791 | + !is_numeric($value), |
|
792 | + $field, |
|
793 | + $value, |
|
794 | + $rule, |
|
795 | + $paramValue |
|
796 | + ); |
|
797 | 797 | } |
798 | 798 | |
799 | 799 | /** |
@@ -805,13 +805,13 @@ discard block |
||
805 | 805 | */ |
806 | 806 | protected function checkRuleInteger($field, $rule, $paramValue) { |
807 | 807 | $value = $this->getFieldValue($field); |
808 | - $this->setSimpleFieldError( |
|
809 | - filter_var($value, FILTER_VALIDATE_INT) === false, |
|
810 | - $field, |
|
811 | - $value, |
|
812 | - $rule, |
|
813 | - $paramValue |
|
814 | - ); |
|
808 | + $this->setSimpleFieldError( |
|
809 | + filter_var($value, FILTER_VALIDATE_INT) === false, |
|
810 | + $field, |
|
811 | + $value, |
|
812 | + $rule, |
|
813 | + $paramValue |
|
814 | + ); |
|
815 | 815 | } |
816 | 816 | |
817 | 817 | /** |
@@ -824,12 +824,12 @@ discard block |
||
824 | 824 | protected function checkRuleIntegerNatural($field, $rule, $paramValue) { |
825 | 825 | $value = $this->getFieldValue($field); |
826 | 826 | $this->setSimpleFieldError( |
827 | - filter_var($value, FILTER_VALIDATE_INT) === false || $value < 0, |
|
828 | - $field, |
|
829 | - $value, |
|
830 | - $rule, |
|
831 | - $paramValue |
|
832 | - ); |
|
827 | + filter_var($value, FILTER_VALIDATE_INT) === false || $value < 0, |
|
828 | + $field, |
|
829 | + $value, |
|
830 | + $rule, |
|
831 | + $paramValue |
|
832 | + ); |
|
833 | 833 | } |
834 | 834 | |
835 | 835 | /** |
@@ -842,12 +842,12 @@ discard block |
||
842 | 842 | protected function checkRuleAlpha($field, $rule, $paramValue) { |
843 | 843 | $value = $this->getFieldValue($field); |
844 | 844 | $this->setSimpleFieldError( |
845 | - !preg_match('/^[\pL\pM\s]+$/u', $value), |
|
846 | - $field, |
|
847 | - $value, |
|
848 | - $rule, |
|
849 | - $paramValue |
|
850 | - ); |
|
845 | + !preg_match('/^[\pL\pM\s]+$/u', $value), |
|
846 | + $field, |
|
847 | + $value, |
|
848 | + $rule, |
|
849 | + $paramValue |
|
850 | + ); |
|
851 | 851 | } |
852 | 852 | |
853 | 853 | /** |
@@ -860,12 +860,12 @@ discard block |
||
860 | 860 | protected function checkRuleAlphaDash($field, $rule, $paramValue) { |
861 | 861 | $value = $this->getFieldValue($field); |
862 | 862 | $this->setSimpleFieldError( |
863 | - !preg_match('/^[\pL\pM_-]+$/u', $value), |
|
864 | - $field, |
|
865 | - $value, |
|
866 | - $rule, |
|
867 | - $paramValue |
|
868 | - ); |
|
863 | + !preg_match('/^[\pL\pM_-]+$/u', $value), |
|
864 | + $field, |
|
865 | + $value, |
|
866 | + $rule, |
|
867 | + $paramValue |
|
868 | + ); |
|
869 | 869 | } |
870 | 870 | |
871 | 871 | /** |
@@ -878,12 +878,12 @@ discard block |
||
878 | 878 | protected function checkRuleAlnum($field, $rule, $paramValue) { |
879 | 879 | $value = $this->getFieldValue($field); |
880 | 880 | $this->setSimpleFieldError( |
881 | - !preg_match('/^[\pL\pM\pN\s]+$/u', $value), |
|
882 | - $field, |
|
883 | - $value, |
|
884 | - $rule, |
|
885 | - $paramValue |
|
886 | - ); |
|
881 | + !preg_match('/^[\pL\pM\pN\s]+$/u', $value), |
|
882 | + $field, |
|
883 | + $value, |
|
884 | + $rule, |
|
885 | + $paramValue |
|
886 | + ); |
|
887 | 887 | } |
888 | 888 | |
889 | 889 | /** |
@@ -896,12 +896,12 @@ discard block |
||
896 | 896 | protected function checkRuleAlnumDash($field, $rule, $paramValue) { |
897 | 897 | $value = $this->getFieldValue($field); |
898 | 898 | $this->setSimpleFieldError( |
899 | - !preg_match('/^[\pL\pM\pN_-]+$/u', $value), |
|
900 | - $field, |
|
901 | - $value, |
|
902 | - $rule, |
|
903 | - $paramValue |
|
904 | - ); |
|
899 | + !preg_match('/^[\pL\pM\pN_-]+$/u', $value), |
|
900 | + $field, |
|
901 | + $value, |
|
902 | + $rule, |
|
903 | + $paramValue |
|
904 | + ); |
|
905 | 905 | } |
906 | 906 | |
907 | 907 | /** |
@@ -914,12 +914,12 @@ discard block |
||
914 | 914 | protected function checkRuleEmail($field, $rule, $paramValue) { |
915 | 915 | $value = $this->getFieldValue($field); |
916 | 916 | $this->setSimpleFieldError( |
917 | - filter_var($value, FILTER_VALIDATE_EMAIL) === false, |
|
918 | - $field, |
|
919 | - $value, |
|
920 | - $rule, |
|
921 | - $paramValue |
|
922 | - ); |
|
917 | + filter_var($value, FILTER_VALIDATE_EMAIL) === false, |
|
918 | + $field, |
|
919 | + $value, |
|
920 | + $rule, |
|
921 | + $paramValue |
|
922 | + ); |
|
923 | 923 | } |
924 | 924 | |
925 | 925 | /** |
@@ -935,12 +935,12 @@ discard block |
||
935 | 935 | $format = $paramValue; |
936 | 936 | $dateValue = date_create_from_format($format, $value); |
937 | 937 | $this->setSimpleFieldError( |
938 | - $dateValue === false || $dateValue->format($format) !== $value, |
|
939 | - $field, |
|
940 | - $value, |
|
941 | - $rule, |
|
942 | - $paramValue |
|
943 | - ); |
|
938 | + $dateValue === false || $dateValue->format($format) !== $value, |
|
939 | + $field, |
|
940 | + $value, |
|
941 | + $rule, |
|
942 | + $paramValue |
|
943 | + ); |
|
944 | 944 | } |
945 | 945 | |
946 | 946 | /** |
@@ -953,13 +953,13 @@ discard block |
||
953 | 953 | */ |
954 | 954 | protected function checkRuleDateBefore($field, $rule, $paramValue) { |
955 | 955 | $value = $this->getFieldValue($field); |
956 | - $this->setSimpleFieldError( |
|
957 | - strtotime($value) >= strtotime($paramValue), |
|
958 | - $field, |
|
959 | - $value, |
|
960 | - $rule, |
|
961 | - $paramValue |
|
962 | - ); |
|
956 | + $this->setSimpleFieldError( |
|
957 | + strtotime($value) >= strtotime($paramValue), |
|
958 | + $field, |
|
959 | + $value, |
|
960 | + $rule, |
|
961 | + $paramValue |
|
962 | + ); |
|
963 | 963 | } |
964 | 964 | |
965 | 965 | /** |
@@ -973,12 +973,12 @@ discard block |
||
973 | 973 | protected function checkRuleDateAfter($field, $rule, $paramValue) { |
974 | 974 | $value = $this->getFieldValue($field); |
975 | 975 | $this->setSimpleFieldError( |
976 | - strtotime($value) <= strtotime($paramValue), |
|
977 | - $field, |
|
978 | - $value, |
|
979 | - $rule, |
|
980 | - $paramValue |
|
981 | - ); |
|
976 | + strtotime($value) <= strtotime($paramValue), |
|
977 | + $field, |
|
978 | + $value, |
|
979 | + $rule, |
|
980 | + $paramValue |
|
981 | + ); |
|
982 | 982 | } |
983 | 983 | |
984 | 984 | /** |
@@ -991,12 +991,12 @@ discard block |
||
991 | 991 | protected function checkRuleUrl($field, $rule, $paramValue) { |
992 | 992 | $value = $this->getFieldValue($field); |
993 | 993 | $this->setSimpleFieldError( |
994 | - filter_var($value, FILTER_VALIDATE_URL) === false, |
|
995 | - $field, |
|
996 | - $value, |
|
997 | - $rule, |
|
998 | - $paramValue |
|
999 | - ); |
|
994 | + filter_var($value, FILTER_VALIDATE_URL) === false, |
|
995 | + $field, |
|
996 | + $value, |
|
997 | + $rule, |
|
998 | + $paramValue |
|
999 | + ); |
|
1000 | 1000 | } |
1001 | 1001 | |
1002 | 1002 | /** |
@@ -1010,12 +1010,12 @@ discard block |
||
1010 | 1010 | protected function checkRuleIp($field, $rule, $paramValue) { |
1011 | 1011 | $value = $this->getFieldValue($field); |
1012 | 1012 | $this->setSimpleFieldError( |
1013 | - filter_var($value, FILTER_VALIDATE_IP) === false, |
|
1014 | - $field, |
|
1015 | - $value, |
|
1016 | - $rule, |
|
1017 | - $paramValue |
|
1018 | - ); |
|
1013 | + filter_var($value, FILTER_VALIDATE_IP) === false, |
|
1014 | + $field, |
|
1015 | + $value, |
|
1016 | + $rule, |
|
1017 | + $paramValue |
|
1018 | + ); |
|
1019 | 1019 | } |
1020 | 1020 | |
1021 | 1021 | /** |
@@ -1028,12 +1028,12 @@ discard block |
||
1028 | 1028 | protected function checkRuleIpv4($field, $rule, $paramValue) { |
1029 | 1029 | $value = $this->getFieldValue($field); |
1030 | 1030 | $this->setSimpleFieldError( |
1031 | - filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) === false, |
|
1032 | - $field, |
|
1033 | - $value, |
|
1034 | - $rule, |
|
1035 | - $paramValue |
|
1036 | - ); |
|
1031 | + filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) === false, |
|
1032 | + $field, |
|
1033 | + $value, |
|
1034 | + $rule, |
|
1035 | + $paramValue |
|
1036 | + ); |
|
1037 | 1037 | } |
1038 | 1038 | |
1039 | 1039 | /** |
@@ -1046,12 +1046,12 @@ discard block |
||
1046 | 1046 | protected function checkRuleIpv6($field, $rule, $paramValue) { |
1047 | 1047 | $value = $this->getFieldValue($field); |
1048 | 1048 | $this->setSimpleFieldError( |
1049 | - filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === false, |
|
1050 | - $field, |
|
1051 | - $value, |
|
1052 | - $rule, |
|
1053 | - $paramValue |
|
1054 | - ); |
|
1049 | + filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === false, |
|
1050 | + $field, |
|
1051 | + $value, |
|
1052 | + $rule, |
|
1053 | + $paramValue |
|
1054 | + ); |
|
1055 | 1055 | } |
1056 | 1056 | |
1057 | 1057 | /** |
@@ -1067,7 +1067,7 @@ discard block |
||
1067 | 1067 | $value = $this->getFieldValue($field); |
1068 | 1068 | list($table, $column) = explode('.', $paramValue); |
1069 | 1069 | $this->database->getQueryBuilder()->from($table) |
1070 | - ->where($column, $value); |
|
1070 | + ->where($column, $value); |
|
1071 | 1071 | $this->database->get(); |
1072 | 1072 | if ($this->database->numRows() > 0) { |
1073 | 1073 | $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
@@ -1089,8 +1089,8 @@ discard block |
||
1089 | 1089 | list($table, $column) = explode('.', $data[0]); |
1090 | 1090 | list($columnKey, $valueKey) = explode('=', $data[1]); |
1091 | 1091 | $this->database->getQueryBuilder()->from($table) |
1092 | - ->where($column, $value) |
|
1093 | - ->where($columnKey, '!=', trim($valueKey)); |
|
1092 | + ->where($column, $value) |
|
1093 | + ->where($columnKey, '!=', trim($valueKey)); |
|
1094 | 1094 | $this->database->get(); |
1095 | 1095 | if ($this->database->numRows() > 0) { |
1096 | 1096 | $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
@@ -1110,7 +1110,7 @@ discard block |
||
1110 | 1110 | $value = $this->getFieldValue($field); |
1111 | 1111 | list($table, $column) = explode('.', $paramValue); |
1112 | 1112 | $this->database->getQueryBuilder()->from($table) |
1113 | - ->where($column, $value); |
|
1113 | + ->where($column, $value); |
|
1114 | 1114 | $this->database->get(); |
1115 | 1115 | if ($this->database->numRows() <= 0) { |
1116 | 1116 | $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
@@ -1127,13 +1127,13 @@ discard block |
||
1127 | 1127 | */ |
1128 | 1128 | protected function checkRuleRegex($field, $rule, $paramValue) { |
1129 | 1129 | $value = $this->getFieldValue($field); |
1130 | - $this->setSimpleFieldError( |
|
1131 | - !preg_match($paramValue, $value), |
|
1132 | - $field, |
|
1133 | - $value, |
|
1134 | - $rule, |
|
1135 | - $paramValue |
|
1136 | - ); |
|
1130 | + $this->setSimpleFieldError( |
|
1131 | + !preg_match($paramValue, $value), |
|
1132 | + $field, |
|
1133 | + $value, |
|
1134 | + $rule, |
|
1135 | + $paramValue |
|
1136 | + ); |
|
1137 | 1137 | } |
1138 | 1138 | |
1139 | 1139 | /** |
@@ -1155,12 +1155,12 @@ discard block |
||
1155 | 1155 | $value = $this->getFieldValue($field); |
1156 | 1156 | if (is_callable($paramValue)) { |
1157 | 1157 | $this->setSimpleFieldError( |
1158 | - call_user_func_array($paramValue, array($value)) === false, |
|
1159 | - $field, |
|
1160 | - $value, |
|
1161 | - $rule, |
|
1162 | - $paramValue |
|
1163 | - ); |
|
1158 | + call_user_func_array($paramValue, array($value)) === false, |
|
1159 | + $field, |
|
1160 | + $value, |
|
1161 | + $rule, |
|
1162 | + $paramValue |
|
1163 | + ); |
|
1164 | 1164 | } else{ |
1165 | 1165 | $this->forceError = true; |
1166 | 1166 | show_error('The callback validation function/method "' . $paramValue . '" does not exist'); |
@@ -1,32 +1,32 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | defined('ROOT_PATH') || exit('Access denied'); |
3 | - /** |
|
4 | - * TNH Framework |
|
5 | - * |
|
6 | - * A simple PHP framework using HMVC architecture |
|
7 | - * |
|
8 | - * This content is released under the MIT License (MIT) |
|
9 | - * |
|
10 | - * Copyright (c) 2017 TNH Framework |
|
11 | - * |
|
12 | - * Permission is hereby granted, free of charge, to any person obtaining a copy |
|
13 | - * of this software and associated documentation files (the "Software"), to deal |
|
14 | - * in the Software without restriction, including without limitation the rights |
|
15 | - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
16 | - * copies of the Software, and to permit persons to whom the Software is |
|
17 | - * furnished to do so, subject to the following conditions: |
|
18 | - * |
|
19 | - * The above copyright notice and this permission notice shall be included in all |
|
20 | - * copies or substantial portions of the Software. |
|
21 | - * |
|
22 | - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
|
23 | - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
|
24 | - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
|
25 | - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
|
26 | - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
|
27 | - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
|
28 | - * SOFTWARE. |
|
29 | - */ |
|
3 | + /** |
|
4 | + * TNH Framework |
|
5 | + * |
|
6 | + * A simple PHP framework using HMVC architecture |
|
7 | + * |
|
8 | + * This content is released under the MIT License (MIT) |
|
9 | + * |
|
10 | + * Copyright (c) 2017 TNH Framework |
|
11 | + * |
|
12 | + * Permission is hereby granted, free of charge, to any person obtaining a copy |
|
13 | + * of this software and associated documentation files (the "Software"), to deal |
|
14 | + * in the Software without restriction, including without limitation the rights |
|
15 | + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
16 | + * copies of the Software, and to permit persons to whom the Software is |
|
17 | + * furnished to do so, subject to the following conditions: |
|
18 | + * |
|
19 | + * The above copyright notice and this permission notice shall be included in all |
|
20 | + * copies or substantial portions of the Software. |
|
21 | + * |
|
22 | + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
|
23 | + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
|
24 | + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
|
25 | + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
|
26 | + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
|
27 | + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
|
28 | + * SOFTWARE. |
|
29 | + */ |
|
30 | 30 | |
31 | 31 | /** |
32 | 32 | * @file bootstrap.php |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | . '] please install a PHP version that is compatible.', 'PHP Error environment'); |
94 | 94 | } |
95 | 95 | $LOGGER->info('PHP version [' . phpversion() . '] is OK [REQUIRED MINIMUM: ' . TNH_MIN_PHP_VERSION |
96 | - . 'REQUIRED MAXIMUM: ' . TNH_MAX_PHP_VERSION . '], application can work without any issue'); |
|
96 | + . 'REQUIRED MAXIMUM: ' . TNH_MAX_PHP_VERSION . '], application can work without any issue'); |
|
97 | 97 | |
98 | 98 | /** |
99 | 99 | * Setting of the PHP error message handling function |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | /** |
156 | 156 | * Register controllers autoload function |
157 | 157 | */ |
158 | - spl_autoload_register('autoload_controller'); |
|
158 | + spl_autoload_register('autoload_controller'); |
|
159 | 159 | |
160 | 160 | /** |
161 | 161 | * Loading Security class |
@@ -137,7 +137,7 @@ |
||
137 | 137 | */ |
138 | 138 | $TIMEZONE = get_config('server_timezone', 'UTC'); |
139 | 139 | if (!date_default_timezone_set($TIMEZONE)) { |
140 | - show_error('Invalid server timezone configuration "' .$TIMEZONE. '"'); |
|
140 | + show_error('Invalid server timezone configuration "' . $TIMEZONE . '"'); |
|
141 | 141 | } |
142 | 142 | |
143 | 143 | /** |