@@ -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 | } |
@@ -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 | } |
@@ -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'); |