@@ -142,7 +142,7 @@ |
||
| 142 | 142 | * @return string the final path after add suffix if configured |
| 143 | 143 | * otherwise the same value will be returned |
| 144 | 144 | */ |
| 145 | - protected static function addSuffixInPath($path){ |
|
| 145 | + protected static function addSuffixInPath($path) { |
|
| 146 | 146 | $suffix = get_config('url_suffix'); |
| 147 | 147 | if ($suffix && $path) { |
| 148 | 148 | if (strpos($path, '?') !== false) { |
@@ -346,7 +346,7 @@ discard block |
||
| 346 | 346 | * |
| 347 | 347 | * @return string|null the full file path |
| 348 | 348 | */ |
| 349 | - protected static function getDefaultFilePathForView($file){ |
|
| 349 | + protected static function getDefaultFilePathForView($file) { |
|
| 350 | 350 | $searchDir = array(APPS_VIEWS_PATH, CORE_VIEWS_PATH); |
| 351 | 351 | $fullFilePath = null; |
| 352 | 352 | foreach ($searchDir as $dir) { |
@@ -465,7 +465,7 @@ discard block |
||
| 465 | 465 | // Parse out the elapsed time and memory usage, |
| 466 | 466 | // then swap the pseudo-variables with the data |
| 467 | 467 | $elapsedTime = $benchmark->elapsedTime('APP_EXECUTION_START', 'APP_EXECUTION_END'); |
| 468 | - $memoryUsage = round($benchmark->memoryUsage('APP_EXECUTION_START', 'APP_EXECUTION_END') / 1024 / 1024, 6) . 'MB'; |
|
| 468 | + $memoryUsage = round($benchmark->memoryUsage('APP_EXECUTION_START', 'APP_EXECUTION_END') / 1024 / 1024, 6) . 'MB'; |
|
| 469 | 469 | return str_replace(array('{elapsed_time}', '{memory_usage}'), array($elapsedTime, $memoryUsage), $content); |
| 470 | 470 | } |
| 471 | 471 | |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | } else { |
| 186 | 186 | $logger->info('Cannot find view [' . $view . '] in module [' . $module . '] using the default location'); |
| 187 | 187 | } |
| 188 | - if (!$path) { |
|
| 188 | + if (!$path) { |
|
| 189 | 189 | $path = $this->getDefaultFilePathForView($viewFile); |
| 190 | 190 | } |
| 191 | 191 | $logger->info('The view file path to be loaded is [' . $path . ']'); |
@@ -273,12 +273,12 @@ discard block |
||
| 273 | 273 | return $this->_pageRender; |
| 274 | 274 | } |
| 275 | 275 | |
| 276 | - /** |
|
| 277 | - * Set the final page to be rendered |
|
| 278 | - * @param string $finalPage the content of the final page |
|
| 279 | - * |
|
| 280 | - * @return object |
|
| 281 | - */ |
|
| 276 | + /** |
|
| 277 | + * Set the final page to be rendered |
|
| 278 | + * @param string $finalPage the content of the final page |
|
| 279 | + * |
|
| 280 | + * @return object |
|
| 281 | + */ |
|
| 282 | 282 | public function setFinalPageContent($finalPage) { |
| 283 | 283 | $this->_pageRender = $finalPage; |
| 284 | 284 | return $this; |
@@ -351,12 +351,12 @@ discard block |
||
| 351 | 351 | ob_end_flush(); |
| 352 | 352 | } |
| 353 | 353 | |
| 354 | - /** |
|
| 355 | - * Return the default full file path for view |
|
| 356 | - * @param string $file the filename |
|
| 357 | - * |
|
| 358 | - * @return string|null the full file path |
|
| 359 | - */ |
|
| 354 | + /** |
|
| 355 | + * Return the default full file path for view |
|
| 356 | + * @param string $file the filename |
|
| 357 | + * |
|
| 358 | + * @return string|null the full file path |
|
| 359 | + */ |
|
| 360 | 360 | protected static function getDefaultFilePathForView($file){ |
| 361 | 361 | $searchDir = array(APPS_VIEWS_PATH, CORE_VIEWS_PATH); |
| 362 | 362 | $fullFilePath = null; |
@@ -548,18 +548,18 @@ discard block |
||
| 548 | 548 | } |
| 549 | 549 | } |
| 550 | 550 | |
| 551 | - /** |
|
| 552 | - * Set the mandory headers, like security, etc. |
|
| 553 | - */ |
|
| 551 | + /** |
|
| 552 | + * Set the mandory headers, like security, etc. |
|
| 553 | + */ |
|
| 554 | 554 | protected static function setRequiredHeaders() { |
| 555 | 555 | $requiredHeaders = array( |
| 556 | 556 | 'X-XSS-Protection' => '1; mode=block', |
| 557 | 557 | 'X-Frame-Options' => 'SAMEORIGIN' |
| 558 | 558 | ); |
| 559 | 559 | foreach ($requiredHeaders as $key => $value) { |
| 560 | - if (!isset(self::$headers[$key])) { |
|
| 560 | + if (!isset(self::$headers[$key])) { |
|
| 561 | 561 | self::$headers[$key] = $value; |
| 562 | - } |
|
| 562 | + } |
|
| 563 | 563 | } |
| 564 | 564 | } |
| 565 | 565 | } |
@@ -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 ...'); |
@@ -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 .= '>'; |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | * Set the file array data generally in constructor this is already set using $_FILES |
| 277 | 277 | * @param array $fileArray the new value |
| 278 | 278 | */ |
| 279 | - public function setFileArray($fileArray){ |
|
| 279 | + public function setFileArray($fileArray) { |
|
| 280 | 280 | $this->file_array = $fileArray; |
| 281 | 281 | } |
| 282 | 282 | |
@@ -594,7 +594,7 @@ discard block |
||
| 594 | 594 | * @return string |
| 595 | 595 | */ |
| 596 | 596 | public function getDestinationDirectory() { |
| 597 | - return $this->destination_directory ; |
|
| 597 | + return $this->destination_directory; |
|
| 598 | 598 | } |
| 599 | 599 | |
| 600 | 600 | /** |
@@ -602,7 +602,7 @@ discard block |
||
| 602 | 602 | * @return boolean |
| 603 | 603 | */ |
| 604 | 604 | public function isAllowOverwriting() { |
| 605 | - return $this->overwrite_file ; |
|
| 605 | + return $this->overwrite_file; |
|
| 606 | 606 | } |
| 607 | 607 | |
| 608 | 608 | /** |
@@ -1,32 +1,32 @@ |
||
| 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 |
@@ -29,8 +29,8 @@ |
||
| 29 | 29 | */ |
| 30 | 30 | |
| 31 | 31 | /** |
| 32 | - * DB session handler model class |
|
| 33 | - */ |
|
| 32 | + * DB session handler model class |
|
| 33 | + */ |
|
| 34 | 34 | abstract class DBSessionHandlerModel extends Model { |
| 35 | 35 | |
| 36 | 36 | /** |
@@ -30,10 +30,10 @@ discard block |
||
| 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 | /** |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | //by default count() return 1 if the parameter is not an array |
| 187 | 187 | //object or object implements Countable. |
| 188 | 188 | if (is_array($result) || is_object($result) || $result instanceof Countable) { |
| 189 | - $numRows = count($result); |
|
| 189 | + $numRows = count($result); |
|
| 190 | 190 | } |
| 191 | 191 | } else { |
| 192 | 192 | $numRows = $this->pdoStatment->rowCount(); |
@@ -121,7 +121,7 @@ |
||
| 121 | 121 | if ((double) $responseTime >= 1.000000) { |
| 122 | 122 | $this->logger->warning( |
| 123 | 123 | 'High response time while processing database query [' . $this->query . '].' |
| 124 | - . 'The response time is [' .$responseTime . '] sec.' |
|
| 124 | + . 'The response time is [' . $responseTime . '] sec.' |
|
| 125 | 125 | ); |
| 126 | 126 | } |
| 127 | 127 | |