@@ -277,14 +277,14 @@ discard block |
||
| 277 | 277 | } |
| 278 | 278 | |
| 279 | 279 | /** |
| 280 | - * Setting the route configuration using the configuration file |
|
| 281 | - * and additional configuration from param |
|
| 282 | - * @param array $overwriteConfig the additional configuration |
|
| 283 | - * to overwrite with the existing one |
|
| 284 | - * @param boolean $useConfigFile whether to use route configuration file |
|
| 285 | - * |
|
| 286 | - * @return object |
|
| 287 | - */ |
|
| 280 | + * Setting the route configuration using the configuration file |
|
| 281 | + * and additional configuration from param |
|
| 282 | + * @param array $overwriteConfig the additional configuration |
|
| 283 | + * to overwrite with the existing one |
|
| 284 | + * @param boolean $useConfigFile whether to use route configuration file |
|
| 285 | + * |
|
| 286 | + * @return object |
|
| 287 | + */ |
|
| 288 | 288 | public function setRouteConfiguration(array $overwriteConfig = array(), $useConfigFile = true) { |
| 289 | 289 | $route = array(); |
| 290 | 290 | if ($useConfigFile && file_exists(CONFIG_PATH . 'routes.php')) { |
@@ -365,7 +365,7 @@ discard block |
||
| 365 | 365 | //the URL like http://domain.com/module/controller/method/arg1/arg2 |
| 366 | 366 | if (!$this->controller) { |
| 367 | 367 | $this->logger->info('Cannot determine the routing information ' |
| 368 | - . 'using the predefined routes configuration, will use the request URI parameters'); |
|
| 368 | + . 'using the predefined routes configuration, will use the request URI parameters'); |
|
| 369 | 369 | //determine route parameters using the route URI param |
| 370 | 370 | $this->determineRouteParamsFromRequestUri(); |
| 371 | 371 | } |
@@ -478,11 +478,11 @@ discard block |
||
| 478 | 478 | } |
| 479 | 479 | } |
| 480 | 480 | |
| 481 | - /** |
|
| 482 | - * Remove the URL suffix and query string values if exists |
|
| 483 | - * @param string $uri the route URI to process |
|
| 484 | - * @return string the final route uri after processed |
|
| 485 | - */ |
|
| 481 | + /** |
|
| 482 | + * Remove the URL suffix and query string values if exists |
|
| 483 | + * @param string $uri the route URI to process |
|
| 484 | + * @return string the final route uri after processed |
|
| 485 | + */ |
|
| 486 | 486 | protected function removeSuffixAndQueryStringFromUri($uri) { |
| 487 | 487 | $this->logger->debug('Check if URL suffix is enabled in the configuration'); |
| 488 | 488 | //remove url suffix from the request URI |
@@ -596,7 +596,7 @@ discard block |
||
| 596 | 596 | $this->logger->info( |
| 597 | 597 | 'After loop in predefined routes configuration,' |
| 598 | 598 | . 'the module name is set but the controller is not set,' |
| 599 | - . 'so we will use module as the controller' |
|
| 599 | + . 'so we will use module as the controller' |
|
| 600 | 600 | ); |
| 601 | 601 | $this->controller = $this->module; |
| 602 | 602 | } |
@@ -134,26 +134,26 @@ discard block |
||
| 134 | 134 | */ |
| 135 | 135 | |
| 136 | 136 | /** |
| 137 | - * The log level |
|
| 138 | - * |
|
| 139 | - * The valid log level are: OFF, NONE, DEBUG, INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY |
|
| 140 | - * |
|
| 141 | - * 'OFF' or 'NONE' = do not save log |
|
| 142 | - * 'EMERGENCY' = enable log for emergency level and above (EMERGENCY) |
|
| 143 | - * 'ALERT' = enable log for alert level and above (ALERT, EMERGENCY) |
|
| 144 | - * 'CRITICAL' = enable log for critical level and above (CRITICAL, ALERT, EMERGENCY) |
|
| 145 | - * 'ERROR' = enable log for error level and above (ERROR, CRITICAL, ALERT, EMERGENCY) |
|
| 146 | - * 'WARNING' = enable log for warning level and above (WARNING, ERROR, CRITICAL, ALERT, EMERGENCY) |
|
| 147 | - * 'NOTICE' = enable log for notice level and above (NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY) |
|
| 148 | - * 'INFO' = enable log for info level and above (INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY) |
|
| 149 | - * 'DEBUG' = enable log for debug level and above (DEBUG, INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY) |
|
| 150 | - * |
|
| 151 | - * The default value is NONE if the config value is: null, '', 0, false |
|
| 152 | - * |
|
| 153 | - * Note: in production environment it's recommand to set the log level to 'WARNING' or 'ERROR' if not, in small |
|
| 154 | - * time the log file size will increase very fast and will cost the application performance |
|
| 155 | - * and also the filesystem usage of your server. |
|
| 156 | - */ |
|
| 137 | + * The log level |
|
| 138 | + * |
|
| 139 | + * The valid log level are: OFF, NONE, DEBUG, INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY |
|
| 140 | + * |
|
| 141 | + * 'OFF' or 'NONE' = do not save log |
|
| 142 | + * 'EMERGENCY' = enable log for emergency level and above (EMERGENCY) |
|
| 143 | + * 'ALERT' = enable log for alert level and above (ALERT, EMERGENCY) |
|
| 144 | + * 'CRITICAL' = enable log for critical level and above (CRITICAL, ALERT, EMERGENCY) |
|
| 145 | + * 'ERROR' = enable log for error level and above (ERROR, CRITICAL, ALERT, EMERGENCY) |
|
| 146 | + * 'WARNING' = enable log for warning level and above (WARNING, ERROR, CRITICAL, ALERT, EMERGENCY) |
|
| 147 | + * 'NOTICE' = enable log for notice level and above (NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY) |
|
| 148 | + * 'INFO' = enable log for info level and above (INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY) |
|
| 149 | + * 'DEBUG' = enable log for debug level and above (DEBUG, INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY) |
|
| 150 | + * |
|
| 151 | + * The default value is NONE if the config value is: null, '', 0, false |
|
| 152 | + * |
|
| 153 | + * Note: in production environment it's recommand to set the log level to 'WARNING' or 'ERROR' if not, in small |
|
| 154 | + * time the log file size will increase very fast and will cost the application performance |
|
| 155 | + * and also the filesystem usage of your server. |
|
| 156 | + */ |
|
| 157 | 157 | $config['log_level'] = 'NONE'; |
| 158 | 158 | |
| 159 | 159 | |
@@ -180,20 +180,20 @@ discard block |
||
| 180 | 180 | $config['log_logger_name'] = array(); |
| 181 | 181 | |
| 182 | 182 | /** |
| 183 | - * The logger name custom level to use for the log |
|
| 184 | - * |
|
| 185 | - * If this config is set so means the logger level will be used to overwrite |
|
| 186 | - * the default log level configuration above. |
|
| 187 | - * |
|
| 188 | - * Example: |
|
| 189 | - * $config['log_logger_name_level'] = array('MY_LOGGER1' => 'WARNING'); |
|
| 190 | - * So if $config['log_level'] = 'ERROR' but all log messages with "MY_LOGGER1" as logger name |
|
| 191 | - * will be saved for WARNING message and above |
|
| 192 | - * Note: You can also use an regular expression for the logger name. |
|
| 193 | - * Example: |
|
| 194 | - * $config['log_logger_name_level'] = array('^Class::Con(.*)' => 'info'); |
|
| 195 | - * So all logger name like "Class::Config", "Class::Cookie", etc. will be match |
|
| 196 | - */ |
|
| 183 | + * The logger name custom level to use for the log |
|
| 184 | + * |
|
| 185 | + * If this config is set so means the logger level will be used to overwrite |
|
| 186 | + * the default log level configuration above. |
|
| 187 | + * |
|
| 188 | + * Example: |
|
| 189 | + * $config['log_logger_name_level'] = array('MY_LOGGER1' => 'WARNING'); |
|
| 190 | + * So if $config['log_level'] = 'ERROR' but all log messages with "MY_LOGGER1" as logger name |
|
| 191 | + * will be saved for WARNING message and above |
|
| 192 | + * Note: You can also use an regular expression for the logger name. |
|
| 193 | + * Example: |
|
| 194 | + * $config['log_logger_name_level'] = array('^Class::Con(.*)' => 'info'); |
|
| 195 | + * So all logger name like "Class::Config", "Class::Cookie", etc. will be match |
|
| 196 | + */ |
|
| 197 | 197 | $config['log_logger_name_level'] = array(); |
| 198 | 198 | |
| 199 | 199 | |
@@ -46,9 +46,9 @@ discard block |
||
| 46 | 46 | if ($init) { |
| 47 | 47 | $this->init(); |
| 48 | 48 | //@codeCoverageIgnoreStart |
| 49 | - if (ENVIRONMENT == 'production' && in_array(strtolower($this->config['log_level']), array('debug', 'info', 'all'))) { |
|
| 49 | + if (ENVIRONMENT == 'production' && in_array(strtolower($this->config['log_level']), array('debug', 'info', 'all'))) { |
|
| 50 | 50 | $this->logger->warning('You are in production environment, please set ' |
| 51 | - . 'log level to WARNING, ERROR, CRITICAL, ALERT, EMERGENCY to increase the application performance'); |
|
| 51 | + . 'log level to WARNING, ERROR, CRITICAL, ALERT, EMERGENCY to increase the application performance'); |
|
| 52 | 52 | } |
| 53 | 53 | //@codeCoverageIgnoreEnd |
| 54 | 54 | } |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | if (empty($this->config['base_url'])) { |
| 147 | 147 | if (ENVIRONMENT == 'production') { |
| 148 | 148 | $this->logger->warning('Application base URL is not set or invalid, please' |
| 149 | - . ' set application base URL to increase the application loading time'); |
|
| 149 | + . ' set application base URL to increase the application loading time'); |
|
| 150 | 150 | } |
| 151 | 151 | $baseUrl = null; |
| 152 | 152 | $protocol = 'http'; |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | ); |
| 174 | 174 | } else { |
| 175 | 175 | $this->logger->warning('Can not determine the application ' |
| 176 | - . 'base URL automatically, use http://localhost as default'); |
|
| 176 | + . 'base URL automatically, use http://localhost as default'); |
|
| 177 | 177 | $baseUrl = 'http://localhost/'; |
| 178 | 178 | } |
| 179 | 179 | $this->config['base_url'] = $baseUrl; |
@@ -182,11 +182,11 @@ discard block |
||
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | /** |
| 185 | - * Return the server port using variable |
|
| 186 | - * |
|
| 187 | - * @codeCoverageIgnore |
|
| 188 | - * @return string |
|
| 189 | - */ |
|
| 185 | + * Return the server port using variable |
|
| 186 | + * |
|
| 187 | + * @codeCoverageIgnore |
|
| 188 | + * @return string |
|
| 189 | + */ |
|
| 190 | 190 | protected function getServerPort() { |
| 191 | 191 | $globals = & class_loader('GlobalVar', 'classes'); |
| 192 | 192 | $serverPort = $globals->server('SERVER_PORT'); |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | $this->log(self::DEBUG, $message); |
| 170 | 170 | } |
| 171 | 171 | |
| 172 | - /** |
|
| 172 | + /** |
|
| 173 | 173 | * Logs with an arbitrary level. |
| 174 | 174 | * |
| 175 | 175 | * @param integer|string $level the log level in integer or string format, |
@@ -187,11 +187,11 @@ discard block |
||
| 187 | 187 | //NOTE: here need put the show_error() "logging" to false |
| 188 | 188 | //to prevent self function loop call |
| 189 | 189 | show_error('Invalid config log level [' . $configLogLevel . '], ' |
| 190 | - . 'the value must be one of the following: ' |
|
| 191 | - . implode(', ', array_map('strtoupper', self::$validConfigLevel)) |
|
| 192 | - , 'Log Config Error', |
|
| 193 | - $logging = false |
|
| 194 | - ); |
|
| 190 | + . 'the value must be one of the following: ' |
|
| 191 | + . implode(', ', array_map('strtoupper', self::$validConfigLevel)) |
|
| 192 | + , 'Log Config Error', |
|
| 193 | + $logging = false |
|
| 194 | + ); |
|
| 195 | 195 | return; |
| 196 | 196 | } |
| 197 | 197 | |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | protected function levelCanSaveLog($level) { |
| 262 | 262 | $result = true; |
| 263 | 263 | $configLogLevel = get_config('log_level'); |
| 264 | - //check if can save log regarding the log level configuration |
|
| 264 | + //check if can save log regarding the log level configuration |
|
| 265 | 265 | $configLevel = self::getLevelValue($configLogLevel); |
| 266 | 266 | if ($configLevel > $level) { |
| 267 | 267 | //can't log |
@@ -341,7 +341,7 @@ discard block |
||
| 341 | 341 | //NOTE: here need put the show_error() "logging" to false |
| 342 | 342 | //to prevent self function loop call |
| 343 | 343 | show_error('Error : the log dir does not exist or is not writable', |
| 344 | - 'Log directory error', $logging = false); |
|
| 344 | + 'Log directory error', $logging = false); |
|
| 345 | 345 | } |
| 346 | 346 | |
| 347 | 347 | $path = $logSavePath . 'logs-' . date('Y-m-d') . '.log'; |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | /** |
| 34 | 34 | * Construct new ApcCache instance |
| 35 | 35 | */ |
| 36 | - public function __construct() { |
|
| 36 | + public function __construct() { |
|
| 37 | 37 | parent::__construct(); |
| 38 | 38 | if (!$this->isSupported()) { |
| 39 | 39 | show_error('The cache for APC[u] driver is not available. Check if APC[u] extension is loaded and enabled.'); |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | public function set($key, $data, $ttl = 0) { |
| 80 | 80 | $expire = time() + $ttl; |
| 81 | 81 | $this->logger->debug('Setting cache data for key [' . $key . '], time to live [' . $ttl . '], ' |
| 82 | - . 'expire at [' . date('Y-m-d H:i:s', $expire) . ']'); |
|
| 82 | + . 'expire at [' . date('Y-m-d H:i:s', $expire) . ']'); |
|
| 83 | 83 | $result = apc_store($key, $data, $ttl); |
| 84 | 84 | if ($result === false) { |
| 85 | 85 | $this->logger->error('Can not save cache data for the key [' . $key . '], return false'); |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | 'mtime' => $cacheInfos['creation_time'], |
| 128 | 128 | 'expire' => $cacheInfos['creation_time'] + $cacheInfos['ttl'], |
| 129 | 129 | 'ttl' => $cacheInfos['ttl'] |
| 130 | - ); |
|
| 130 | + ); |
|
| 131 | 131 | } |
| 132 | 132 | $this->logger->info('This cache does not exists skipping'); |
| 133 | 133 | return false; |
@@ -108,13 +108,13 @@ discard block |
||
| 108 | 108 | public function set($key, $data, $ttl = 0) { |
| 109 | 109 | $expire = time() + $ttl; |
| 110 | 110 | $this->logger->debug('Setting cache data for key [' . $key . '], ' |
| 111 | - . 'time to live [' . $ttl . '], ' |
|
| 112 | - . 'expire at [' . date('Y-m-d H:i:s', $expire) . ']'); |
|
| 111 | + . 'time to live [' . $ttl . '], ' |
|
| 112 | + . 'expire at [' . date('Y-m-d H:i:s', $expire) . ']'); |
|
| 113 | 113 | $filePath = $this->getFilePath($key); |
| 114 | 114 | $handle = fopen($filePath, 'w'); |
| 115 | 115 | if (!is_resource($handle)) { |
| 116 | 116 | $this->logger->error('Can not open the file cache ' |
| 117 | - . '[' . $filePath . '] for the key [' . $key . '], return false'); |
|
| 117 | + . '[' . $filePath . '] for the key [' . $key . '], return false'); |
|
| 118 | 118 | return false; |
| 119 | 119 | } |
| 120 | 120 | flock($handle, LOCK_EX); // exclusive lock, will get released when the file is closed |
@@ -191,10 +191,10 @@ discard block |
||
| 191 | 191 | if ($data['expire'] > time()) { |
| 192 | 192 | $this->logger->info('This cache not yet expired return cache informations'); |
| 193 | 193 | return array( |
| 194 | - 'mtime' => $data['mtime'], |
|
| 195 | - 'expire' => $data['expire'], |
|
| 196 | - 'ttl' => $data['ttl'] |
|
| 197 | - ); |
|
| 194 | + 'mtime' => $data['mtime'], |
|
| 195 | + 'expire' => $data['expire'], |
|
| 196 | + 'ttl' => $data['ttl'] |
|
| 197 | + ); |
|
| 198 | 198 | } |
| 199 | 199 | $this->logger->info('This cache already expired return false'); |
| 200 | 200 | return false; |
@@ -44,9 +44,9 @@ discard block |
||
| 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 | } |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | * @see Assets:link |
| 96 | 96 | */ |
| 97 | 97 | public function css($path) { |
| 98 | - return $this->link($path, 'css'); |
|
| 98 | + return $this->link($path, 'css'); |
|
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | /** |
@@ -90,10 +90,10 @@ discard block |
||
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | /** |
| 93 | - * Set the value of the pagination query string |
|
| 94 | - * @param string $pQueryString the new value |
|
| 95 | - * @return object |
|
| 96 | - */ |
|
| 93 | + * Set the value of the pagination query string |
|
| 94 | + * @param string $pQueryString the new value |
|
| 95 | + * @return object |
|
| 96 | + */ |
|
| 97 | 97 | public function setPaginationQueryString($pQueryString) { |
| 98 | 98 | $this->paginationQueryString = $pQueryString; |
| 99 | 99 | return $this; |
@@ -244,15 +244,15 @@ discard block |
||
| 244 | 244 | } |
| 245 | 245 | } |
| 246 | 246 | $navbar .= $this->config['next_open'] . '<a href="' . $query . ($currentPageNumber + 1) . '">' |
| 247 | - . $this->config['next_text'] . '</a>' . $this->config['next_close']; |
|
| 247 | + . $this->config['next_text'] . '</a>' . $this->config['next_close']; |
|
| 248 | 248 | return $navbar; |
| 249 | 249 | } |
| 250 | 250 | |
| 251 | 251 | |
| 252 | - /** |
|
| 253 | - * Build the pagination link for the first page |
|
| 254 | - * @see Pagination::buildPaginationLinkForFirstAndLastPage |
|
| 255 | - */ |
|
| 252 | + /** |
|
| 253 | + * Build the pagination link for the first page |
|
| 254 | + * @see Pagination::buildPaginationLinkForFirstAndLastPage |
|
| 255 | + */ |
|
| 256 | 256 | protected function buildPaginationLinkForFirstPage($begin, $end, $currentPageNumber) { |
| 257 | 257 | return $this->buildPaginationLinkForFirstAndLastPage($begin, $end, $currentPageNumber, 'first'); |
| 258 | 258 | } |
@@ -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->setSmpleFieldError( |
|
| 620 | - strlen($value) < $paramValue, |
|
| 621 | - $field, |
|
| 622 | - $value, |
|
| 623 | - $rule, |
|
| 624 | - $paramValue |
|
| 625 | - ); |
|
| 618 | + $value = $this->getFieldValue($field); |
|
| 619 | + $this->setSmpleFieldError( |
|
| 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->setSmpleFieldError( |
|
| 638 | - strlen($value) > $paramValue, |
|
| 639 | - $field, |
|
| 640 | - $value, |
|
| 641 | - $rule, |
|
| 642 | - $paramValue |
|
| 643 | - ); |
|
| 636 | + $value = $this->getFieldValue($field); |
|
| 637 | + $this->setSmpleFieldError( |
|
| 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->setSmpleFieldError( |
|
| 656 | - strlen($value) != $paramValue, |
|
| 657 | - $field, |
|
| 658 | - $value, |
|
| 659 | - $rule, |
|
| 660 | - $paramValue |
|
| 661 | - ); |
|
| 654 | + $value = $this->getFieldValue($field); |
|
| 655 | + $this->setSmpleFieldError( |
|
| 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->setSmpleFieldError( |
| 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->setSmpleFieldError( |
| 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->setSmpleFieldError( |
| 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->setSmpleFieldError( |
| 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->setSmpleFieldError( |
| 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->setSmpleFieldError( |
| 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->setSmpleFieldError( |
| 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->setSmpleFieldError( |
|
| 809 | - filter_var($value, FILTER_VALIDATE_INT) === false, |
|
| 810 | - $field, |
|
| 811 | - $value, |
|
| 812 | - $rule, |
|
| 813 | - $paramValue |
|
| 814 | - ); |
|
| 808 | + $this->setSmpleFieldError( |
|
| 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->setSmpleFieldError( |
| 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->setSmpleFieldError( |
| 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->setSmpleFieldError( |
| 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->setSmpleFieldError( |
| 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->setSmpleFieldError( |
| 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->setSmpleFieldError( |
| 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->setSmpleFieldError( |
| 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->setSmpleFieldError( |
|
| 957 | - strtotime($value) >= strtotime($paramValue), |
|
| 958 | - $field, |
|
| 959 | - $value, |
|
| 960 | - $rule, |
|
| 961 | - $paramValue |
|
| 962 | - ); |
|
| 956 | + $this->setSmpleFieldError( |
|
| 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->setSmpleFieldError( |
| 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->setSmpleFieldError( |
| 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->setSmpleFieldError( |
| 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->setSmpleFieldError( |
| 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->setSmpleFieldError( |
| 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->setSmpleFieldError( |
|
| 1131 | - !preg_match($paramValue, $value), |
|
| 1132 | - $field, |
|
| 1133 | - $value, |
|
| 1134 | - $rule, |
|
| 1135 | - $paramValue |
|
| 1136 | - ); |
|
| 1130 | + $this->setSmpleFieldError( |
|
| 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->setSmpleFieldError( |
| 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'); |