@@ -241,12 +241,12 @@ discard block |
||
| 241 | 241 | } |
| 242 | 242 | |
| 243 | 243 | /** |
| 244 | - * Setting the route configuration using the configuration file and additional configuration from param |
|
| 245 | - * @param array $overwriteConfig the additional configuration to overwrite with the existing one |
|
| 246 | - * @param boolean $useConfigFile whether to use route configuration file |
|
| 247 | - * |
|
| 248 | - * @return object |
|
| 249 | - */ |
|
| 244 | + * Setting the route configuration using the configuration file and additional configuration from param |
|
| 245 | + * @param array $overwriteConfig the additional configuration to overwrite with the existing one |
|
| 246 | + * @param boolean $useConfigFile whether to use route configuration file |
|
| 247 | + * |
|
| 248 | + * @return object |
|
| 249 | + */ |
|
| 250 | 250 | public function setRouteConfiguration(array $overwriteConfig = array(), $useConfigFile = true) { |
| 251 | 251 | $route = array(); |
| 252 | 252 | if ($useConfigFile && file_exists(CONFIG_PATH . 'routes.php')) { |
@@ -423,11 +423,11 @@ discard block |
||
| 423 | 423 | } |
| 424 | 424 | } |
| 425 | 425 | |
| 426 | - /** |
|
| 427 | - * Remove the URL suffix and query string values if exists |
|
| 428 | - * @param string $uri the route URI to process |
|
| 429 | - * @return string the final route uri after processed |
|
| 430 | - */ |
|
| 426 | + /** |
|
| 427 | + * Remove the URL suffix and query string values if exists |
|
| 428 | + * @param string $uri the route URI to process |
|
| 429 | + * @return string the final route uri after processed |
|
| 430 | + */ |
|
| 431 | 431 | protected function removeSuffixAndQueryStringFromUri($uri) { |
| 432 | 432 | $this->logger->debug('Check if URL suffix is enabled in the configuration'); |
| 433 | 433 | //remove url suffix from the request URI |
@@ -540,7 +540,7 @@ discard block |
||
| 540 | 540 | $this->logger->info( |
| 541 | 541 | 'After loop in predefined routes configuration,' |
| 542 | 542 | . 'the module name is set but the controller is not set,' |
| 543 | - . 'so we will use module as the controller' |
|
| 543 | + . 'so we will use module as the controller' |
|
| 544 | 544 | ); |
| 545 | 545 | $this->controller = $this->module; |
| 546 | 546 | } |
@@ -407,7 +407,7 @@ discard block |
||
| 407 | 407 | * Remove the DOCUMENT_ROOT and front controller from segments if exists |
| 408 | 408 | * @return void |
| 409 | 409 | */ |
| 410 | - protected function removeDocumentRootFrontControllerFromSegments(){ |
|
| 410 | + protected function removeDocumentRootFrontControllerFromSegments() { |
|
| 411 | 411 | $segment = $this->segments; |
| 412 | 412 | $baseUrl = get_config('base_url'); |
| 413 | 413 | //check if the app is not in DOCUMENT_ROOT |
@@ -525,7 +525,7 @@ discard block |
||
| 525 | 525 | break; |
| 526 | 526 | } |
| 527 | 527 | } |
| 528 | - if($findIndex !== -1){ |
|
| 528 | + if ($findIndex !== -1) { |
|
| 529 | 529 | //$args[0] => full string captured by preg_match |
| 530 | 530 | //$args[1], $args[2], $args[n] => contains the value of |
| 531 | 531 | //(:num), (:alpha), (:alnum), (:any) |
@@ -550,7 +550,7 @@ discard block |
||
| 550 | 550 | * Find file path of the current controller using the current module |
| 551 | 551 | * @return boolean true if the file path is found otherwise false. |
| 552 | 552 | */ |
| 553 | - protected function findControllerFullPathUsingCurrentModule(){ |
|
| 553 | + protected function findControllerFullPathUsingCurrentModule() { |
|
| 554 | 554 | $path = Module::findControllerFullPath(ucfirst($this->controller), $this->module); |
| 555 | 555 | if (!$path) { |
| 556 | 556 | $this->logger->info('The controller [' . $this->controller . '] not found in the module, may be will use the module [' . $this->module . '] as controller'); |
@@ -566,7 +566,7 @@ discard block |
||
| 566 | 566 | * or the current request does not use module |
| 567 | 567 | * @return void |
| 568 | 568 | */ |
| 569 | - protected function setRouteParamsIfNoModuleOrNotFound(){ |
|
| 569 | + protected function setRouteParamsIfNoModuleOrNotFound() { |
|
| 570 | 570 | $segment = $this->segments; |
| 571 | 571 | //controller |
| 572 | 572 | if (isset($segment[0])) { |
@@ -587,7 +587,7 @@ discard block |
||
| 587 | 587 | * or the current request use module |
| 588 | 588 | * @return void |
| 589 | 589 | */ |
| 590 | - protected function setRouteParamsIfAppHasModuleOrFound(){ |
|
| 590 | + protected function setRouteParamsIfAppHasModuleOrFound() { |
|
| 591 | 591 | //get the module list |
| 592 | 592 | $modules = Module::getModuleList(); |
| 593 | 593 | $segment = $this->segments; |
@@ -600,7 +600,7 @@ discard block |
||
| 600 | 600 | $this->controller = $segment[0]; |
| 601 | 601 | |
| 602 | 602 | //check if the request use the same module name and controller |
| 603 | - if($this->findControllerFullPathUsingCurrentModule()){ |
|
| 603 | + if ($this->findControllerFullPathUsingCurrentModule()) { |
|
| 604 | 604 | array_shift($segment); |
| 605 | 605 | } |
| 606 | 606 | } |
@@ -84,10 +84,10 @@ |
||
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | /** |
| 87 | - * This method is used to check the whitelist IP address access |
|
| 88 | - * |
|
| 89 | - * @return boolean |
|
| 90 | - */ |
|
| 87 | + * This method is used to check the whitelist IP address access |
|
| 88 | + * |
|
| 89 | + * @return boolean |
|
| 90 | + */ |
|
| 91 | 91 | public static function checkWhiteListIpAccess() { |
| 92 | 92 | $logger = self::getLogger(); |
| 93 | 93 | $logger->debug('Validation of the IP address access ...'); |
@@ -170,7 +170,7 @@ |
||
| 170 | 170 | //by default count() return 1 if the parameter is not an array |
| 171 | 171 | //object or object implements Countable. |
| 172 | 172 | if (is_array($result) || is_object($result) || $result instanceof Countable) { |
| 173 | - $numRows = count($result); |
|
| 173 | + $numRows = count($result); |
|
| 174 | 174 | } |
| 175 | 175 | } else { |
| 176 | 176 | $numRows = $this->pdoStatment->rowCount(); |
@@ -45,7 +45,7 @@ |
||
| 45 | 45 | $attributes['accept-charset'] = get_config('charset', 'UTF-8'); |
| 46 | 46 | } |
| 47 | 47 | if (!empty($enctype)) { |
| 48 | - $attributes['enctype'] = $enctype; |
|
| 48 | + $attributes['enctype'] = $enctype; |
|
| 49 | 49 | } |
| 50 | 50 | $str .= attributes_to_string($attributes); |
| 51 | 51 | $str .= '>'; |