@@ -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 | /** |
@@ -426,7 +426,7 @@ discard block |
||
| 426 | 426 | protected function filterValidationData() { |
| 427 | 427 | foreach ($this->data as $key => $value ) { |
| 428 | 428 | if (is_array($value)) { |
| 429 | - $this->data[$key] = array_map('trim', $value); |
|
| 429 | + $this->data[$key] = array_map('trim', $value); |
|
| 430 | 430 | } else { |
| 431 | 431 | $this->data[$key] = trim($value); |
| 432 | 432 | } |
@@ -473,7 +473,7 @@ discard block |
||
| 473 | 473 | $template['field2}'] = $field2; |
| 474 | 474 | $template['{value2}'] = $this->getFieldValue($field2); |
| 475 | 475 | $template['{label2}'] = $this->getFieldLabel($field2); |
| 476 | - } |
|
| 476 | + } |
|
| 477 | 477 | $message = $this->messages[$rule]; |
| 478 | 478 | //Check for custom message |
| 479 | 479 | if (isset($this->customErrors[$field][$rule])) { |
@@ -504,7 +504,7 @@ discard block |
||
| 504 | 504 | //Get the name of the method to validate this rule |
| 505 | 505 | $method = $this->getRuleValidationMethod($realRuleName); |
| 506 | 506 | if (method_exists($this, $method)) { |
| 507 | - call_user_func_array(array($this, $method), array($field, $realRuleName, $paramValue)); |
|
| 507 | + call_user_func_array(array($this, $method), array($field, $realRuleName, $paramValue)); |
|
| 508 | 508 | } else { |
| 509 | 509 | $this->forceError = true; |
| 510 | 510 | show_error('Invalid validaton rule "' . $realRuleName . '"'); |
@@ -597,7 +597,7 @@ discard block |
||
| 597 | 597 | * @param string|null $paramValue the rule parameter |
| 598 | 598 | */ |
| 599 | 599 | protected function checkRuleMinLength($field, $rule, $paramValue) { |
| 600 | - $value = $this->getFieldValue($field); |
|
| 600 | + $value = $this->getFieldValue($field); |
|
| 601 | 601 | if (strlen($value) < $paramValue) { |
| 602 | 602 | $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
| 603 | 603 | } |
@@ -611,7 +611,7 @@ discard block |
||
| 611 | 611 | * @param string|null $paramValue the rule parameter |
| 612 | 612 | */ |
| 613 | 613 | protected function checkRuleMaxLength($field, $rule, $paramValue) { |
| 614 | - $value = $this->getFieldValue($field); |
|
| 614 | + $value = $this->getFieldValue($field); |
|
| 615 | 615 | if (strlen($value) > $paramValue) { |
| 616 | 616 | $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
| 617 | 617 | } |
@@ -625,7 +625,7 @@ discard block |
||
| 625 | 625 | * @param string|null $paramValue the rule parameter |
| 626 | 626 | */ |
| 627 | 627 | protected function checkRuleExactLength($field, $rule, $paramValue) { |
| 628 | - $value = $this->getFieldValue($field); |
|
| 628 | + $value = $this->getFieldValue($field); |
|
| 629 | 629 | if (strlen($value) != $paramValue) { |
| 630 | 630 | $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
| 631 | 631 | } |
@@ -732,7 +732,7 @@ discard block |
||
| 732 | 732 | protected function checkRuleNumeric($field, $rule, $paramValue) { |
| 733 | 733 | $value = $this->getFieldValue($field); |
| 734 | 734 | if (!is_numeric($value)) { |
| 735 | - $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
| 735 | + $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
| 736 | 736 | } |
| 737 | 737 | } |
| 738 | 738 | |
@@ -746,7 +746,7 @@ discard block |
||
| 746 | 746 | protected function checkRuleInteger($field, $rule, $paramValue) { |
| 747 | 747 | $value = $this->getFieldValue($field); |
| 748 | 748 | if (filter_var($value, FILTER_VALIDATE_INT) === false) { |
| 749 | - $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
| 749 | + $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
| 750 | 750 | } |
| 751 | 751 | } |
| 752 | 752 | |
@@ -760,7 +760,7 @@ discard block |
||
| 760 | 760 | protected function checkRuleIntegerNatural($field, $rule, $paramValue) { |
| 761 | 761 | $value = $this->getFieldValue($field); |
| 762 | 762 | if (filter_var($value, FILTER_VALIDATE_INT) === false || $value < 0) { |
| 763 | - $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
| 763 | + $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
| 764 | 764 | } |
| 765 | 765 | } |
| 766 | 766 | |
@@ -847,7 +847,7 @@ discard block |
||
| 847 | 847 | $format = $paramValue; |
| 848 | 848 | $dateValue = date_create_from_format($format, $value); |
| 849 | 849 | if ($dateValue === false || $dateValue->format($format) !== $value) { |
| 850 | - $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
| 850 | + $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
| 851 | 851 | } |
| 852 | 852 | } |
| 853 | 853 | |
@@ -891,7 +891,7 @@ discard block |
||
| 891 | 891 | protected function checkRuleUrl($field, $rule, $paramValue) { |
| 892 | 892 | $value = $this->getFieldValue($field); |
| 893 | 893 | if (filter_var($value, FILTER_VALIDATE_URL) === false) { |
| 894 | - $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
| 894 | + $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
| 895 | 895 | } |
| 896 | 896 | } |
| 897 | 897 | |
@@ -906,7 +906,7 @@ discard block |
||
| 906 | 906 | protected function checkRuleIp($field, $rule, $paramValue) { |
| 907 | 907 | $value = $this->getFieldValue($field); |
| 908 | 908 | if (filter_var($value, FILTER_VALIDATE_IP) === false) { |
| 909 | - $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
| 909 | + $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
|
| 910 | 910 | } |
| 911 | 911 | } |
| 912 | 912 | |
@@ -951,7 +951,7 @@ discard block |
||
| 951 | 951 | $value = $this->getFieldValue($field); |
| 952 | 952 | list($table, $column) = explode('.', $paramValue); |
| 953 | 953 | $this->database->getQueryBuilder()->from($table) |
| 954 | - ->where($column, $value); |
|
| 954 | + ->where($column, $value); |
|
| 955 | 955 | $this->database->get(); |
| 956 | 956 | if ($this->database->numRows() > 0) { |
| 957 | 957 | $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
@@ -973,8 +973,8 @@ discard block |
||
| 973 | 973 | list($table, $column) = explode('.', $data[0]); |
| 974 | 974 | list($columnKey, $valueKey) = explode('=', $data[1]); |
| 975 | 975 | $this->database->getQueryBuilder()->from($table) |
| 976 | - ->where($column, $value) |
|
| 977 | - ->where($columnKey, '!=', trim($valueKey)); |
|
| 976 | + ->where($column, $value) |
|
| 977 | + ->where($columnKey, '!=', trim($valueKey)); |
|
| 978 | 978 | $this->database->get(); |
| 979 | 979 | if ($this->database->numRows() > 0) { |
| 980 | 980 | $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
@@ -994,7 +994,7 @@ discard block |
||
| 994 | 994 | $value = $this->getFieldValue($field); |
| 995 | 995 | list($table, $column) = explode('.', $paramValue); |
| 996 | 996 | $this->database->getQueryBuilder()->from($table) |
| 997 | - ->where($column, $value); |
|
| 997 | + ->where($column, $value); |
|
| 998 | 998 | $this->database->get(); |
| 999 | 999 | if ($this->database->numRows() <= 0) { |
| 1000 | 1000 | $this->setFieldErrorWithRequiredCheck($field, $value, $rule, $paramValue); |
@@ -234,10 +234,10 @@ discard block |
||
| 234 | 234 | return $this->removeVars($_ENV, $key); |
| 235 | 235 | } |
| 236 | 236 | |
| 237 | - /** |
|
| 238 | - * Get the value from $GLOBALS for given key. if the key is empty will return all values |
|
| 239 | - * @see GlobalVar::getVars |
|
| 240 | - */ |
|
| 237 | + /** |
|
| 238 | + * Get the value from $GLOBALS for given key. if the key is empty will return all values |
|
| 239 | + * @see GlobalVar::getVars |
|
| 240 | + */ |
|
| 241 | 241 | public function globals($key = null, $xss = true) { |
| 242 | 242 | return $this->getVars($GLOBALS, $key, $xss); |
| 243 | 243 | } |
@@ -259,16 +259,16 @@ discard block |
||
| 259 | 259 | } |
| 260 | 260 | |
| 261 | 261 | |
| 262 | - /** |
|
| 263 | - * Set the value for $_GET, $_POST, $_SERVER etc. if the key is an array will |
|
| 264 | - * set the current super variable value by this. |
|
| 265 | - * @param array $var the super global variable to use, can be "$_POST", "$_GET", etc. |
|
| 266 | - * @param string|array $key the item key to be set or array if need set the current global variable |
|
| 267 | - * by this value |
|
| 268 | - * @param mixed $value the value to set if $key is not an array |
|
| 269 | - * |
|
| 270 | - * @return object the current instance |
|
| 271 | - */ |
|
| 262 | + /** |
|
| 263 | + * Set the value for $_GET, $_POST, $_SERVER etc. if the key is an array will |
|
| 264 | + * set the current super variable value by this. |
|
| 265 | + * @param array $var the super global variable to use, can be "$_POST", "$_GET", etc. |
|
| 266 | + * @param string|array $key the item key to be set or array if need set the current global variable |
|
| 267 | + * by this value |
|
| 268 | + * @param mixed $value the value to set if $key is not an array |
|
| 269 | + * |
|
| 270 | + * @return object the current instance |
|
| 271 | + */ |
|
| 272 | 272 | protected function setVars(&$var, $key, $value = null) { |
| 273 | 273 | if (is_array($key)) { |
| 274 | 274 | //set all |
@@ -207,10 +207,10 @@ |
||
| 207 | 207 | return $this; |
| 208 | 208 | } |
| 209 | 209 | |
| 210 | - /** |
|
| 211 | - * Return the instance of session. |
|
| 212 | - * @return object the session instance |
|
| 213 | - */ |
|
| 210 | + /** |
|
| 211 | + * Return the instance of session. |
|
| 212 | + * @return object the session instance |
|
| 213 | + */ |
|
| 214 | 214 | public function getSession() { |
| 215 | 215 | return $this->session; |
| 216 | 216 | } |
@@ -311,7 +311,7 @@ |
||
| 311 | 311 | protected function getDefaultFilePathForFunctionLanguage($file, $type, $appLang = null){ |
| 312 | 312 | $searchDir = null; |
| 313 | 313 | if ($type == 'function') { |
| 314 | - $searchDir = array(FUNCTIONS_PATH, CORE_FUNCTIONS_PATH); |
|
| 314 | + $searchDir = array(FUNCTIONS_PATH, CORE_FUNCTIONS_PATH); |
|
| 315 | 315 | } |
| 316 | 316 | else if ($type == 'language') { |
| 317 | 317 | $searchDir = array(APP_LANG_PATH, CORE_LANG_PATH); |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | $this->logger->debug('Check if the application contains the modules ...'); |
| 47 | 47 | $dirList = glob(MODULE_PATH . '*', GLOB_ONLYDIR); |
| 48 | 48 | if ($dirList !== false) { |
| 49 | - $this->list = array_map('basename', $dirList); |
|
| 49 | + $this->list = array_map('basename', $dirList); |
|
| 50 | 50 | } |
| 51 | 51 | if (!empty($this->list)) { |
| 52 | 52 | $this->logger->info('The application contains the module below [' . implode(', ', $this->list) . ']'); |
@@ -61,8 +61,8 @@ discard block |
||
| 61 | 61 | */ |
| 62 | 62 | public function add($name) { |
| 63 | 63 | if (in_array($name, $this->list)) { |
| 64 | - $this->logger->info('The module [' .$name. '] already added skipping.'); |
|
| 65 | - return $this; |
|
| 64 | + $this->logger->info('The module [' .$name. '] already added skipping.'); |
|
| 65 | + return $this; |
|
| 66 | 66 | } |
| 67 | 67 | $this->list[] = $name; |
| 68 | 68 | return $this; |
@@ -93,10 +93,10 @@ discard block |
||
| 93 | 93 | $this->list = array(); |
| 94 | 94 | } |
| 95 | 95 | |
| 96 | - /** |
|
| 97 | - * Get the list of module loaded |
|
| 98 | - * @return array the module list |
|
| 99 | - */ |
|
| 96 | + /** |
|
| 97 | + * Get the list of module loaded |
|
| 98 | + * @return array the module list |
|
| 99 | + */ |
|
| 100 | 100 | public function getModuleList() { |
| 101 | 101 | return $this->list; |
| 102 | 102 | } |
@@ -30,10 +30,10 @@ |
||
| 30 | 30 | |
| 31 | 31 | class DatabaseQueryRunner extends BaseClass { |
| 32 | 32 | |
| 33 | - /** |
|
| 34 | - * The DatabaseConnection instance |
|
| 35 | - * @var object |
|
| 36 | - */ |
|
| 33 | + /** |
|
| 34 | + * The DatabaseConnection instance |
|
| 35 | + * @var object |
|
| 36 | + */ |
|
| 37 | 37 | private $connection = null; |
| 38 | 38 | |
| 39 | 39 | /** |
@@ -98,10 +98,10 @@ |
||
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | /** |
| 101 | - * This method is used to check the whitelist IP address access |
|
| 102 | - * |
|
| 103 | - * @return boolean |
|
| 104 | - */ |
|
| 101 | + * This method is used to check the whitelist IP address access |
|
| 102 | + * |
|
| 103 | + * @return boolean |
|
| 104 | + */ |
|
| 105 | 105 | public function checkWhiteListIpAccess() { |
| 106 | 106 | $this->logger->debug('Validation of the IP address access ...'); |
| 107 | 107 | $this->logger->debug('Check if whitelist IP access is enabled in the configuration ...'); |
@@ -44,9 +44,9 @@ |
||
| 44 | 44 | */ |
| 45 | 45 | class Assets extends BaseClass { |
| 46 | 46 | |
| 47 | - /** |
|
| 48 | - * Construct new instance |
|
| 49 | - */ |
|
| 47 | + /** |
|
| 48 | + * Construct new instance |
|
| 49 | + */ |
|
| 50 | 50 | public function __construct() { |
| 51 | 51 | parent::__construct(); |
| 52 | 52 | } |
@@ -286,7 +286,7 @@ discard block |
||
| 286 | 286 | } |
| 287 | 287 | $filename = $this->encodeUtf8($this->filterOther((string) $filename)); |
| 288 | 288 | if (empty($data)) { |
| 289 | - $data = $this->getAttachmentData($path); |
|
| 289 | + $data = $this->getAttachmentData($path); |
|
| 290 | 290 | } |
| 291 | 291 | $this->attachments[] = array( |
| 292 | 292 | 'path' => $path, |
@@ -349,7 +349,7 @@ discard block |
||
| 349 | 349 | $addresses = array(); |
| 350 | 350 | foreach ($pairs as $name => $email) { |
| 351 | 351 | if (is_numeric($name)) { |
| 352 | - $name = null; |
|
| 352 | + $name = null; |
|
| 353 | 353 | } |
| 354 | 354 | $addresses[] = $this->formatHeader($email, $name); |
| 355 | 355 | } |