@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | $this->logger->info('Cannot find view [' . $view . '] in module [' . $module . '] ' |
| 186 | 186 | . 'using the default location'); |
| 187 | 187 | } |
| 188 | - if (!$path) { |
|
| 188 | + if (!$path) { |
|
| 189 | 189 | $path = $this->getDefaultFilePathForView($viewFile); |
| 190 | 190 | } |
| 191 | 191 | $this->logger->info('The view file path to be loaded is [' . $path . ']'); |
@@ -261,12 +261,12 @@ discard block |
||
| 261 | 261 | return $this->finalPageContent; |
| 262 | 262 | } |
| 263 | 263 | |
| 264 | - /** |
|
| 265 | - * Set the final page to be rendered |
|
| 266 | - * @param string $finalPage the content of the final page |
|
| 267 | - * |
|
| 268 | - * @return object |
|
| 269 | - */ |
|
| 264 | + /** |
|
| 265 | + * Set the final page to be rendered |
|
| 266 | + * @param string $finalPage the content of the final page |
|
| 267 | + * |
|
| 268 | + * @return object |
|
| 269 | + */ |
|
| 270 | 270 | public function setFinalPageContent($finalPage) { |
| 271 | 271 | $this->finalPageContent = $finalPage; |
| 272 | 272 | return $this; |
@@ -340,11 +340,11 @@ discard block |
||
| 340 | 340 | } |
| 341 | 341 | |
| 342 | 342 | /** |
| 343 | - * Dispatch the FINAL_VIEW_READY event |
|
| 344 | - * |
|
| 345 | - * @return string|null the final view content after processing by each listener |
|
| 346 | - * if they exists otherwise the same content will be returned |
|
| 347 | - */ |
|
| 343 | + * Dispatch the FINAL_VIEW_READY event |
|
| 344 | + * |
|
| 345 | + * @return string|null the final view content after processing by each listener |
|
| 346 | + * if they exists otherwise the same content will be returned |
|
| 347 | + */ |
|
| 348 | 348 | protected function dispatchFinalViewEvent() { |
| 349 | 349 | //dispatch |
| 350 | 350 | $event = get_instance()->eventdispatcher->dispatch( |
@@ -389,12 +389,12 @@ discard block |
||
| 389 | 389 | && (bool) ini_get('zlib.output_compression') === false; |
| 390 | 390 | } |
| 391 | 391 | |
| 392 | - /** |
|
| 393 | - * Return the default full file path for view |
|
| 394 | - * @param string $file the filename |
|
| 395 | - * |
|
| 396 | - * @return string|null the full file path |
|
| 397 | - */ |
|
| 392 | + /** |
|
| 393 | + * Return the default full file path for view |
|
| 394 | + * @param string $file the filename |
|
| 395 | + * |
|
| 396 | + * @return string|null the full file path |
|
| 397 | + */ |
|
| 398 | 398 | protected function getDefaultFilePathForView($file){ |
| 399 | 399 | $searchDir = array(APPS_VIEWS_PATH, CORE_VIEWS_PATH); |
| 400 | 400 | $fullFilePath = null; |
@@ -427,7 +427,7 @@ discard block |
||
| 427 | 427 | $headerModifiedSince = $globals->server('HTTP_IF_MODIFIED_SINCE'); |
| 428 | 428 | if (!empty($headerModifiedSince) && $lastModified <= strtotime($headerModifiedSince)) { |
| 429 | 429 | $this->logger->info('The cache page content is not yet expire for the ' |
| 430 | - . 'URL [' . $this->currentUrl . '] send 304 header to browser'); |
|
| 430 | + . 'URL [' . $this->currentUrl . '] send 304 header to browser'); |
|
| 431 | 431 | $this->sendHeaders(304); |
| 432 | 432 | return true; |
| 433 | 433 | } |
@@ -442,8 +442,8 @@ discard block |
||
| 442 | 442 | */ |
| 443 | 443 | protected function sendCachePageContentToBrowser(&$cache) { |
| 444 | 444 | $this->logger->info('The cache page content is expired or the browser does ' |
| 445 | - . 'not send the HTTP_IF_MODIFIED_SINCE header for the URL [' . $this->currentUrl . '] ' |
|
| 446 | - . 'send cache headers to tell the browser'); |
|
| 445 | + . 'not send the HTTP_IF_MODIFIED_SINCE header for the URL [' . $this->currentUrl . '] ' |
|
| 446 | + . 'send cache headers to tell the browser'); |
|
| 447 | 447 | $this->sendHeaders(200); |
| 448 | 448 | //current page cache key |
| 449 | 449 | $pageCacheKey = $this->currentUrlCacheKey; |
@@ -582,18 +582,18 @@ discard block |
||
| 582 | 582 | } |
| 583 | 583 | } |
| 584 | 584 | |
| 585 | - /** |
|
| 586 | - * Set the mandory headers, like security, etc. |
|
| 587 | - */ |
|
| 585 | + /** |
|
| 586 | + * Set the mandory headers, like security, etc. |
|
| 587 | + */ |
|
| 588 | 588 | protected function setRequiredHeaders() { |
| 589 | 589 | $requiredHeaders = array( |
| 590 | 590 | 'X-XSS-Protection' => '1; mode=block', |
| 591 | 591 | 'X-Frame-Options' => 'SAMEORIGIN' |
| 592 | 592 | ); |
| 593 | 593 | foreach ($requiredHeaders as $key => $value) { |
| 594 | - if (!isset($this->headers[$key])) { |
|
| 594 | + if (!isset($this->headers[$key])) { |
|
| 595 | 595 | $this->headers[$key] = $value; |
| 596 | - } |
|
| 596 | + } |
|
| 597 | 597 | } |
| 598 | 598 | } |
| 599 | 599 | } |
@@ -219,7 +219,7 @@ discard block |
||
| 219 | 219 | $moduleConfigPath = get_instance()->module->findConfigFullPath($filename, $module); |
| 220 | 220 | if ($moduleConfigPath) { |
| 221 | 221 | $this->logger->info('Found config [' . $filename . '] from module [' . $module . '], ' |
| 222 | - . 'the file path is [' . $moduleConfigPath . '] we will used it'); |
|
| 222 | + . 'the file path is [' . $moduleConfigPath . '] we will used it'); |
|
| 223 | 223 | $configFilePath = $moduleConfigPath; |
| 224 | 224 | } else { |
| 225 | 225 | $this->logger->info('Cannot find config [' . $filename . '] from modules using the default location'); |
@@ -479,7 +479,7 @@ discard block |
||
| 479 | 479 | $moduleLibraryPath = get_instance()->module->findLibraryFullPath($class, $module); |
| 480 | 480 | if ($moduleLibraryPath) { |
| 481 | 481 | $this->logger->info('Found library [' . $class . '] from module [' . $module . '], the ' |
| 482 | - . 'file path is [' . $moduleLibraryPath . '] we will used it'); |
|
| 482 | + . 'file path is [' . $moduleLibraryPath . '] we will used it'); |
|
| 483 | 483 | $libraryFilePath = $moduleLibraryPath; |
| 484 | 484 | } else { |
| 485 | 485 | $this->logger->info('Cannot find library [' . $class . '] from modules using the default location'); |
@@ -335,7 +335,7 @@ discard block |
||
| 335 | 335 | * @param string $appLang the application language, only if type = "language" |
| 336 | 336 | * @return string|null the full file path |
| 337 | 337 | */ |
| 338 | - protected function getDefaultFilePathForFunctionLanguage($file, $type, $appLang = null){ |
|
| 338 | + protected function getDefaultFilePathForFunctionLanguage($file, $type, $appLang = null) { |
|
| 339 | 339 | //Default to "function" |
| 340 | 340 | $searchDir = array(FUNCTIONS_PATH, CORE_FUNCTIONS_PATH); |
| 341 | 341 | if ($type == 'language') { |
@@ -359,7 +359,7 @@ discard block |
||
| 359 | 359 | * @param string|null $module the module if is not null will return it |
| 360 | 360 | * @return string|null |
| 361 | 361 | */ |
| 362 | - protected function getModuleFromSuperController($module){ |
|
| 362 | + protected function getModuleFromSuperController($module) { |
|
| 363 | 363 | $obj = & get_instance(); |
| 364 | 364 | if (!$module && !empty($obj->moduleName)) { |
| 365 | 365 | $module = $obj->moduleName; |