@@ -163,17 +163,17 @@ |
||
163 | 163 | } |
164 | 164 | |
165 | 165 | /** |
166 | - * Return the server port using variable |
|
167 | - * |
|
168 | - * @codeCoverageIgnore |
|
169 | - * @return string |
|
170 | - */ |
|
166 | + * Return the server port using variable |
|
167 | + * |
|
168 | + * @codeCoverageIgnore |
|
169 | + * @return string |
|
170 | + */ |
|
171 | 171 | protected function getServerPort() { |
172 | 172 | $globals = & class_loader('GlobalVar', 'classes'); |
173 | 173 | $serverPortValue = $globals->server('SERVER_PORT'); |
174 | 174 | $serverPort = 80; |
175 | 175 | if ($serverPortValue) { |
176 | - $serverPort = $serverPortValue; |
|
176 | + $serverPort = $serverPortValue; |
|
177 | 177 | } |
178 | 178 | $port = ''; |
179 | 179 | if ((is_https() && $serverPort != 443) || (!is_https() && $serverPort != 80)) { |
@@ -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 | } |
@@ -61,7 +61,7 @@ |
||
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.'); |
|
64 | + $this->logger->info('The module [' . $name . '] already added skipping.'); |
|
65 | 65 | return $this; |
66 | 66 | } |
67 | 67 | $this->list[] = $name; |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | * |
94 | 94 | * @codeCoverageIgnore |
95 | 95 | */ |
96 | - protected function startAppSession() { |
|
96 | + protected function startAppSession() { |
|
97 | 97 | //$_SESSION is not available on cli mode |
98 | 98 | if (!IS_CLI) { |
99 | 99 | //set session params |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | * @codeCoverageIgnore |
144 | 144 | */ |
145 | 145 | protected function setAppSessionConfig() { |
146 | - //the default is to store in the files |
|
146 | + //the default is to store in the files |
|
147 | 147 | $sessionHandler = $this->config->get('session_handler', 'files'); |
148 | 148 | $this->logger->info('Session handler: ' . $sessionHandler); |
149 | 149 | if ($sessionHandler == 'files') { |
@@ -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 ...'); |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | } else { |
188 | 188 | $this->logger->info('Cannot find view [' . $view . '] in module [' . $module . '] using the default location'); |
189 | 189 | } |
190 | - if (!$path) { |
|
190 | + if (!$path) { |
|
191 | 191 | $path = $this->getDefaultFilePathForView($viewFile); |
192 | 192 | } |
193 | 193 | $this->logger->info('The view file path to be loaded is [' . $path . ']'); |
@@ -290,12 +290,12 @@ discard block |
||
290 | 290 | return $this->_pageRender; |
291 | 291 | } |
292 | 292 | |
293 | - /** |
|
294 | - * Set the final page to be rendered |
|
295 | - * @param string $finalPage the content of the final page |
|
296 | - * |
|
297 | - * @return object |
|
298 | - */ |
|
293 | + /** |
|
294 | + * Set the final page to be rendered |
|
295 | + * @param string $finalPage the content of the final page |
|
296 | + * |
|
297 | + * @return object |
|
298 | + */ |
|
299 | 299 | public function setFinalPageContent($finalPage) { |
300 | 300 | $this->_pageRender = $finalPage; |
301 | 301 | return $this; |
@@ -363,12 +363,12 @@ discard block |
||
363 | 363 | ob_end_flush(); |
364 | 364 | } |
365 | 365 | |
366 | - /** |
|
367 | - * Return the default full file path for view |
|
368 | - * @param string $file the filename |
|
369 | - * |
|
370 | - * @return string|null the full file path |
|
371 | - */ |
|
366 | + /** |
|
367 | + * Return the default full file path for view |
|
368 | + * @param string $file the filename |
|
369 | + * |
|
370 | + * @return string|null the full file path |
|
371 | + */ |
|
372 | 372 | protected function getDefaultFilePathForView($file){ |
373 | 373 | $searchDir = array(APPS_VIEWS_PATH, CORE_VIEWS_PATH); |
374 | 374 | $fullFilePath = null; |
@@ -401,7 +401,7 @@ discard block |
||
401 | 401 | $headerModifiedSince = $globals->server('HTTP_IF_MODIFIED_SINCE'); |
402 | 402 | if (!empty($headerModifiedSince) && $lastModified <= strtotime($headerModifiedSince)) { |
403 | 403 | $this->logger->info('The cache page content is not yet expire for the ' |
404 | - . 'URL [' . $this->_currentUrl . '] send 304 header to browser'); |
|
404 | + . 'URL [' . $this->_currentUrl . '] send 304 header to browser'); |
|
405 | 405 | $this->sendHeaders(304); |
406 | 406 | return true; |
407 | 407 | } |
@@ -416,8 +416,8 @@ discard block |
||
416 | 416 | */ |
417 | 417 | protected function sendCachePageContentToBrowser(&$cache) { |
418 | 418 | $this->logger->info('The cache page content is expired or the browser does ' |
419 | - . 'not send the HTTP_IF_MODIFIED_SINCE header for the URL [' . $this->_currentUrl . '] ' |
|
420 | - . 'send cache headers to tell the browser'); |
|
419 | + . 'not send the HTTP_IF_MODIFIED_SINCE header for the URL [' . $this->_currentUrl . '] ' |
|
420 | + . 'send cache headers to tell the browser'); |
|
421 | 421 | |
422 | 422 | $this->sendHeaders(200); |
423 | 423 | //current page cache key |
@@ -559,18 +559,18 @@ discard block |
||
559 | 559 | } |
560 | 560 | } |
561 | 561 | |
562 | - /** |
|
563 | - * Set the mandory headers, like security, etc. |
|
564 | - */ |
|
562 | + /** |
|
563 | + * Set the mandory headers, like security, etc. |
|
564 | + */ |
|
565 | 565 | protected function setRequiredHeaders() { |
566 | 566 | $requiredHeaders = array( |
567 | 567 | 'X-XSS-Protection' => '1; mode=block', |
568 | 568 | 'X-Frame-Options' => 'SAMEORIGIN' |
569 | 569 | ); |
570 | 570 | foreach ($requiredHeaders as $key => $value) { |
571 | - if (!isset($this->headers[$key])) { |
|
571 | + if (!isset($this->headers[$key])) { |
|
572 | 572 | $this->headers[$key] = $value; |
573 | - } |
|
573 | + } |
|
574 | 574 | } |
575 | 575 | } |
576 | 576 | } |
@@ -369,7 +369,7 @@ |
||
369 | 369 | * |
370 | 370 | * @return string|null the full file path |
371 | 371 | */ |
372 | - protected function getDefaultFilePathForView($file){ |
|
372 | + protected function getDefaultFilePathForView($file) { |
|
373 | 373 | $searchDir = array(APPS_VIEWS_PATH, CORE_VIEWS_PATH); |
374 | 374 | $fullFilePath = null; |
375 | 375 | foreach ($searchDir as $dir) { |
@@ -32,8 +32,8 @@ |
||
32 | 32 | <p>Required PHP version : <b>PHP >= <?php echo TNH_MIN_PHP_VERSION; ?>, PHP < <?php echo TNH_MAX_PHP_VERSION; ?></b></p> |
33 | 33 | <p>Release date : <b><?php echo TNH_RELEASE_DATE; ?></b></p> |
34 | 34 | <hr /> |
35 | - <p>Current controller: <b class = "text-muted label-danger"><?php echo APPS_CONTROLLER_PATH . 'Home.php';?></b> |
|
36 | - <p>Current view: <b class = "text-muted label-danger"><?php echo APPS_VIEWS_PATH . 'home.php';?></b> |
|
35 | + <p>Current controller: <b class = "text-muted label-danger"><?php echo APPS_CONTROLLER_PATH . 'Home.php'; ?></b> |
|
36 | + <p>Current view: <b class = "text-muted label-danger"><?php echo APPS_VIEWS_PATH . 'home.php'; ?></b> |
|
37 | 37 | </div> |
38 | 38 | </div> |
39 | 39 | </div> |
@@ -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 | } |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | * SOFTWARE. |
29 | 29 | */ |
30 | 30 | |
31 | - class Url extends BaseClass{ |
|
31 | + class Url extends BaseClass { |
|
32 | 32 | |
33 | 33 | /** |
34 | 34 | * Construct new instance |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | * @return string the final path after add suffix if configured |
152 | 152 | * otherwise the same value will be returned |
153 | 153 | */ |
154 | - protected function addSuffixInPath($path){ |
|
154 | + protected function addSuffixInPath($path) { |
|
155 | 155 | $suffix = get_config('url_suffix'); |
156 | 156 | if ($suffix && $path) { |
157 | 157 | if (strpos($path, '?') !== false) { |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | |
40 | 40 | class Model { |
41 | 41 | |
42 | - /** |
|
42 | + /** |
|
43 | 43 | * This model's default database table. |
44 | 44 | * @var string the name of table |
45 | 45 | */ |
@@ -628,7 +628,7 @@ discard block |
||
628 | 628 | * Only get deleted rows on the next call |
629 | 629 | * |
630 | 630 | * @return object the current instance |
631 | - */ |
|
631 | + */ |
|
632 | 632 | public function onlyRecordDeleted() { |
633 | 633 | $this->returnOnlyRecordDeleted = true; |
634 | 634 | return $this; |
@@ -833,23 +833,23 @@ discard block |
||
833 | 833 | return false; |
834 | 834 | } |
835 | 835 | |
836 | - /** |
|
837 | - * Get the record return type array or object |
|
838 | - * |
|
839 | - * @return string|boolean |
|
840 | - */ |
|
836 | + /** |
|
837 | + * Get the record return type array or object |
|
838 | + * |
|
839 | + * @return string|boolean |
|
840 | + */ |
|
841 | 841 | protected function getReturnType(){ |
842 | 842 | $type = false; |
843 | 843 | if ($this->temporaryReturnRecordType == 'array') { |
844 | - $type = 'array'; |
|
844 | + $type = 'array'; |
|
845 | 845 | } |
846 | 846 | return $type; |
847 | 847 | } |
848 | 848 | |
849 | - /** |
|
850 | - * Check if soft delete is enable setting the condition |
|
851 | - * @return object the current instance |
|
852 | - */ |
|
849 | + /** |
|
850 | + * Check if soft delete is enable setting the condition |
|
851 | + * @return object the current instance |
|
852 | + */ |
|
853 | 853 | protected function checkForSoftDelete(){ |
854 | 854 | if ($this->softDeleteStatus && $this->returnRecordWithDeleted !== true) { |
855 | 855 | $this->getQueryBuilder()->where( |
@@ -860,16 +860,16 @@ discard block |
||
860 | 860 | return $this; |
861 | 861 | } |
862 | 862 | |
863 | - /** |
|
864 | - * Relate for "manyToOne" and "oneToMany" |
|
865 | - * |
|
866 | - * @param string $relationship the name of relation |
|
867 | - * @param string|array $options the model and primary key values |
|
868 | - * @param object|array $row the row to update |
|
869 | - * @param string $type the type can be "manyToOne", "oneToMany" |
|
870 | - * |
|
871 | - * @return array|object the final row values |
|
872 | - */ |
|
863 | + /** |
|
864 | + * Relate for "manyToOne" and "oneToMany" |
|
865 | + * |
|
866 | + * @param string $relationship the name of relation |
|
867 | + * @param string|array $options the model and primary key values |
|
868 | + * @param object|array $row the row to update |
|
869 | + * @param string $type the type can be "manyToOne", "oneToMany" |
|
870 | + * |
|
871 | + * @return array|object the final row values |
|
872 | + */ |
|
873 | 873 | protected function relateOneToManyAndManyToOne($relationship, $options, $row, $type){ |
874 | 874 | if (in_array($relationship, $this->withs)) { |
875 | 875 | get_instance()->loader->model($options['model'], $relationship . '_model'); |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | $instance = $db; |
185 | 185 | } else { |
186 | 186 | $obj = & get_instance(); |
187 | - if (isset($obj->database)){ |
|
187 | + if (isset($obj->database)) { |
|
188 | 188 | /** |
189 | 189 | * NOTE: Need use "clone" because some Model need have the personal instance of the database library |
190 | 190 | * to prevent duplication |
@@ -838,7 +838,7 @@ discard block |
||
838 | 838 | * |
839 | 839 | * @return string|boolean |
840 | 840 | */ |
841 | - protected function getReturnType(){ |
|
841 | + protected function getReturnType() { |
|
842 | 842 | $type = false; |
843 | 843 | if ($this->temporaryReturnRecordType == 'array') { |
844 | 844 | $type = 'array'; |
@@ -850,7 +850,7 @@ discard block |
||
850 | 850 | * Check if soft delete is enable setting the condition |
851 | 851 | * @return object the current instance |
852 | 852 | */ |
853 | - protected function checkForSoftDelete(){ |
|
853 | + protected function checkForSoftDelete() { |
|
854 | 854 | if ($this->softDeleteStatus && $this->returnRecordWithDeleted !== true) { |
855 | 855 | $this->getQueryBuilder()->where( |
856 | 856 | $this->softDeleteTableColumn, |
@@ -870,11 +870,11 @@ discard block |
||
870 | 870 | * |
871 | 871 | * @return array|object the final row values |
872 | 872 | */ |
873 | - protected function relateOneToManyAndManyToOne($relationship, $options, $row, $type){ |
|
873 | + protected function relateOneToManyAndManyToOne($relationship, $options, $row, $type) { |
|
874 | 874 | if (in_array($relationship, $this->withs)) { |
875 | 875 | get_instance()->loader->model($options['model'], $relationship . '_model'); |
876 | 876 | $model = get_instance()->{$relationship . '_model'}; |
877 | - if($type == 'manyToOne'){ |
|
877 | + if ($type == 'manyToOne') { |
|
878 | 878 | if (is_object($row)) { |
879 | 879 | $row->{$relationship} = $model->getSingleRecord($row->{$options['primary_key']}); |
880 | 880 | } else { |