Compare commits
No commits in common. "master" and "1.2.3" have entirely different histories.
21
LICENSE
21
LICENSE
@ -1,21 +0,0 @@
|
|||||||
MIT License
|
|
||||||
|
|
||||||
Copyright (c) 2013-2021 TechFuze
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
@ -4,19 +4,21 @@
|
|||||||
"license": ["MIT"],
|
"license": ["MIT"],
|
||||||
"authors": [
|
"authors": [
|
||||||
{
|
{
|
||||||
"name": "Abel Hoogeveen",
|
"name": "TechFuze",
|
||||||
"homepage": "https://i15.nl"
|
"homepage": "https://techfuze.net"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "FuzeWorks Community",
|
||||||
|
"homepage": "https://techfuze.net/fuzeworks/contributors"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=8.1.0",
|
"php": ">=7.1.0",
|
||||||
"fuzeworks/core": "~1.3.0",
|
"fuzeworks/mvcr": "~1.2.0",
|
||||||
"fuzeworks/mvcr": "~1.3.0",
|
"fuzeworks/core": "~1.2.0"
|
||||||
"fuzeworks/objectstorage": "~1.3.0"
|
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"fuzeworks/layout": "~1.3.0",
|
"phpunit/phpunit": "^7"
|
||||||
"fuzeworks/tracycomponent": "~1.3.0"
|
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
|
@ -50,12 +50,12 @@ return [
|
|||||||
| 'csrf_exclude_uris' = Array of URIs which ignore CSRF checks
|
| 'csrf_exclude_uris' = Array of URIs which ignore CSRF checks
|
||||||
*/
|
*/
|
||||||
'csrf_protection' => true,
|
'csrf_protection' => true,
|
||||||
'csrf_token_name' => 'csrf_token',
|
'csrf_token_name' => 'fw_csrf_token',
|
||||||
'csrf_expire' => 7200,
|
'csrf_expire' => 7200,
|
||||||
'csrf_exclude_uris' => array(),
|
'csrf_exclude_uris' => array(),
|
||||||
|
|
||||||
// CSRF Cookie information
|
// CSRF Cookie information
|
||||||
'csrf_cookie_name' => 'csrf_cookie',
|
'csrf_cookie_name' => 'fw_csrf_cookie',
|
||||||
'csrf_cookie_prefix' => '',
|
'csrf_cookie_prefix' => '',
|
||||||
'csrf_cookie_domain' => '',
|
'csrf_cookie_domain' => '',
|
||||||
'csrf_cookie_path' => '/',
|
'csrf_cookie_path' => '/',
|
||||||
|
@ -47,17 +47,17 @@ class ResourceServeEvent extends Event
|
|||||||
/**
|
/**
|
||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
public $requestURL;
|
public $resourceUrlSegments;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var string
|
* @var string
|
||||||
*/
|
*/
|
||||||
public $resourceFilePath;
|
public $resourceFilePath;
|
||||||
|
|
||||||
public function init(string $resourceName, string $requestURL, string $resourceFilePath)
|
public function init(string $resourceName, array $resourceUrlSegments, string $resourceFilePath)
|
||||||
{
|
{
|
||||||
$this->resourceName = $resourceName;
|
$this->resourceName = $resourceName;
|
||||||
$this->requestURL = $requestURL;
|
$this->resourceUrlSegments = $resourceUrlSegments;
|
||||||
$this->resourceFilePath = $resourceFilePath;
|
$this->resourceFilePath = $resourceFilePath;
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -327,6 +327,7 @@ class Input
|
|||||||
/**
|
/**
|
||||||
* Fetch the HTTP_USER_AGENT variable from the $_SERVER array
|
* Fetch the HTTP_USER_AGENT variable from the $_SERVER array
|
||||||
*
|
*
|
||||||
|
* @param string|array|null $index
|
||||||
* @param bool $xssClean
|
* @param bool $xssClean
|
||||||
* @return mixed
|
* @return mixed
|
||||||
*/
|
*/
|
||||||
@ -338,6 +339,7 @@ class Input
|
|||||||
/**
|
/**
|
||||||
* Fetch the REQUEST_METHOD variable from the $_SERVER array
|
* Fetch the REQUEST_METHOD variable from the $_SERVER array
|
||||||
*
|
*
|
||||||
|
* @param string|array|null $index
|
||||||
* @param bool $xssClean
|
* @param bool $xssClean
|
||||||
* @return mixed
|
* @return mixed
|
||||||
*/
|
*/
|
||||||
|
@ -289,13 +289,13 @@ class Output
|
|||||||
$getParams = $this->input->get();
|
$getParams = $this->input->get();
|
||||||
|
|
||||||
// Determine the identifier
|
// Determine the identifier
|
||||||
$identifier = md5($uri . '|' . serialize($getParams));
|
$identier = md5($uri . '|' . serialize($getParams));
|
||||||
|
|
||||||
// Determine the file that holds the cache
|
// Determine the file that holds the cache
|
||||||
if ($this->compressOutput)
|
if ($this->compressOutput)
|
||||||
$file = $cachePath . DS . $identifier . '_gzip.fwcache';
|
$file = $cachePath . DS . $identier . '_gzip.fwcache';
|
||||||
else
|
else
|
||||||
$file = $cachePath . DS . $identifier . '.fwcache';
|
$file = $cachePath . DS . $identier . '.fwcache';
|
||||||
|
|
||||||
|
|
||||||
// If compression is enabled, compress the output
|
// If compression is enabled, compress the output
|
||||||
@ -326,6 +326,9 @@ class Output
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Lowering permissions to read only
|
||||||
|
chmod($cachePath, 0640);
|
||||||
|
|
||||||
// And report back
|
// And report back
|
||||||
Logger::logInfo("Output cache has been saved.");
|
Logger::logInfo("Output cache has been saved.");
|
||||||
|
|
||||||
@ -522,25 +525,4 @@ class Output
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set the location to redirect the user to.
|
|
||||||
*
|
|
||||||
* @param string $locationUrl Should be prepended with /
|
|
||||||
* @param bool $permanent True for 301, false for 302 redirect.
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
public function setLocation(string $locationUrl, bool $permanent = false)
|
|
||||||
{
|
|
||||||
// Set the status header
|
|
||||||
if ($permanent)
|
|
||||||
$this->setStatusHeader(301);
|
|
||||||
else
|
|
||||||
$this->setStatusHeader(302);
|
|
||||||
|
|
||||||
// And the location itself
|
|
||||||
$header = 'Location: ' . $locationUrl;
|
|
||||||
$this->headers[] = [$header, true];
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
@ -61,10 +61,10 @@ class Resources
|
|||||||
$this->output = Factory::getInstance()->output;
|
$this->output = Factory::getInstance()->output;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function resourceExists(string $requestURL): bool
|
public function resourceExists(array $resourceUrlSegments): bool
|
||||||
{
|
{
|
||||||
// First find the resource
|
// First find the resource
|
||||||
$file = $this->findResource($requestURL);
|
$file = $this->findResource($resourceUrlSegments);
|
||||||
|
|
||||||
// If not found, return false;
|
// If not found, return false;
|
||||||
if (is_null($file))
|
if (is_null($file))
|
||||||
@ -77,17 +77,17 @@ class Resources
|
|||||||
/**
|
/**
|
||||||
* Serves a static file if found.
|
* Serves a static file if found.
|
||||||
*
|
*
|
||||||
* @param string $requestURL
|
* @param array $resourceUrlSegments
|
||||||
* @return bool
|
* @return bool
|
||||||
* @throws WebException
|
* @throws WebException
|
||||||
*
|
*
|
||||||
* @todo Bypass the Output system and use the readFile() method.
|
* @todo Bypass the Output system and use the readFile() method.
|
||||||
* @todo Run as FuzeWorks pre-code, before creating the container
|
* @todo Run as FuzeWorks pre-code, before creating the container
|
||||||
*/
|
*/
|
||||||
public function serveResource(string $requestURL): bool
|
public function serveResource(array $resourceUrlSegments): bool
|
||||||
{
|
{
|
||||||
// First find the resource
|
// First find the resource
|
||||||
$file = $this->findResource($requestURL);
|
$file = $this->findResource($resourceUrlSegments);
|
||||||
|
|
||||||
// If not found return false
|
// If not found return false
|
||||||
if (is_null($file))
|
if (is_null($file))
|
||||||
@ -96,7 +96,7 @@ class Resources
|
|||||||
// If a file is found, fire a serveResourceEvent
|
// If a file is found, fire a serveResourceEvent
|
||||||
/** @var ResourceServeEvent $event */
|
/** @var ResourceServeEvent $event */
|
||||||
try {
|
try {
|
||||||
$event = Events::fireEvent('resourceServeEvent', $file['resourceName'], $file['requestURL'], $file['file']);
|
$event = Events::fireEvent('resourceServeEvent', $file['resourceName'], $file['segments'], $file['file']);
|
||||||
} catch (Exception\EventException $e) {
|
} catch (Exception\EventException $e) {
|
||||||
throw new WebException("Could not serve resource. resourceServeEvent threw exception: '" . $e->getMessage() . "'");
|
throw new WebException("Could not serve resource. resourceServeEvent threw exception: '" . $e->getMessage() . "'");
|
||||||
}
|
}
|
||||||
@ -106,7 +106,7 @@ class Resources
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
// Log the resource serving
|
// Log the resource serving
|
||||||
Logger::log("Serving static resource '/" . $file['resourceName'] . '/' . $file['requestURL'] . "'");
|
Logger::log("Serving static resource '/" . $file['resourceName'] . '/' . implode('/', $file['segments']) . "'");
|
||||||
|
|
||||||
// Serve file in accordance with event
|
// Serve file in accordance with event
|
||||||
$fileExtension = pathinfo($event->resourceFilePath, PATHINFO_EXTENSION);
|
$fileExtension = pathinfo($event->resourceFilePath, PATHINFO_EXTENSION);
|
||||||
@ -118,22 +118,25 @@ class Resources
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function findResource(string $requestURL): ?array
|
protected function findResource(array $resourceUrlSegments): ?array
|
||||||
{
|
{
|
||||||
|
// If too few segments provided, don't even bother
|
||||||
|
if (count($resourceUrlSegments) < 2)
|
||||||
|
return null;
|
||||||
|
|
||||||
// First segment should be the resourceName, check if it exists
|
// First segment should be the resourceName, check if it exists
|
||||||
foreach ($this->resources as $resourceName => $resourceDir)
|
$resourceName = urldecode($resourceUrlSegments[1]);
|
||||||
{
|
if (!isset($this->resources[$resourceName]))
|
||||||
if (substr($requestURL, 0, strlen($resourceName)) === $resourceName)
|
return null;
|
||||||
{
|
|
||||||
$fileURL = ltrim(substr($requestURL, strlen($resourceName)), '/');
|
// If resource is found, generate file path
|
||||||
$fileURL = str_replace('/', DS, $fileURL);
|
$resourceUrlSegmentsBck = $resourceUrlSegments;
|
||||||
$file = $this->resources[$resourceName] . DS . $fileURL;
|
array_shift($resourceUrlSegments);
|
||||||
|
$file = $this->resources[$resourceName] . DS . implode(DS, $resourceUrlSegments);
|
||||||
|
|
||||||
// Test if file exists, if it does, return the string
|
// Test if file exists, if it does, return the string
|
||||||
if (file_exists($file) && is_file($file))
|
if (file_exists($file) && is_file($file))
|
||||||
return ['file' => $file, 'resourceName' => $resourceName, 'requestURL' => $fileURL];
|
return ['file' => $file, 'resourceName' => $resourceName, 'segments' => $resourceUrlSegments];
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
@ -188,7 +188,7 @@ class Security {
|
|||||||
$this->input = Factory::getInstance()->input;
|
$this->input = Factory::getInstance()->input;
|
||||||
|
|
||||||
// Is CSRF protection enabled?
|
// Is CSRF protection enabled?
|
||||||
if ($this->config->get('csrf_protection'))
|
if ($this->config->csrf_protection)
|
||||||
{
|
{
|
||||||
// CSRF config
|
// CSRF config
|
||||||
foreach (array('csrf_expire', 'csrf_token_name', 'csrf_cookie_name') as $key)
|
foreach (array('csrf_expire', 'csrf_token_name', 'csrf_cookie_name') as $key)
|
||||||
@ -222,10 +222,6 @@ class Security {
|
|||||||
*/
|
*/
|
||||||
public function csrf_verify(): self
|
public function csrf_verify(): self
|
||||||
{
|
{
|
||||||
// If not enabled, do not run
|
|
||||||
if (!$this->config->get('csrf_protection'))
|
|
||||||
return $this;
|
|
||||||
|
|
||||||
// If it's not a POST request we will set the CSRF cookie
|
// If it's not a POST request we will set the CSRF cookie
|
||||||
if (strtoupper($this->input->server('REQUEST_METHOD')) !== 'POST')
|
if (strtoupper($this->input->server('REQUEST_METHOD')) !== 'POST')
|
||||||
return $this->csrf_set_cookie();
|
return $this->csrf_set_cookie();
|
||||||
@ -324,7 +320,7 @@ class Security {
|
|||||||
* @see Security::$_csrf_hash
|
* @see Security::$_csrf_hash
|
||||||
* @return string CSRF hash
|
* @return string CSRF hash
|
||||||
*/
|
*/
|
||||||
public function get_csrf_hash(): ?string
|
public function get_csrf_hash(): string
|
||||||
{
|
{
|
||||||
return $this->_csrf_hash;
|
return $this->_csrf_hash;
|
||||||
}
|
}
|
||||||
@ -375,8 +371,10 @@ class Security {
|
|||||||
// Is the string an array?
|
// Is the string an array?
|
||||||
if (is_array($str))
|
if (is_array($str))
|
||||||
{
|
{
|
||||||
foreach ($str as $key => $value)
|
while (list($key) = each($str))
|
||||||
$str[$key] = $this->xss_clean($value);
|
{
|
||||||
|
$str[$key] = $this->xss_clean($str[$key]);
|
||||||
|
}
|
||||||
|
|
||||||
return $str;
|
return $str;
|
||||||
}
|
}
|
||||||
|
@ -60,7 +60,7 @@ class WebComponent implements iComponent
|
|||||||
*
|
*
|
||||||
* @var bool
|
* @var bool
|
||||||
*/
|
*/
|
||||||
public static bool $willHandleRequest = false;
|
public static $willHandleRequest = false;
|
||||||
|
|
||||||
public function getName(): string
|
public function getName(): string
|
||||||
{
|
{
|
||||||
@ -93,9 +93,11 @@ class WebComponent implements iComponent
|
|||||||
|
|
||||||
// If WebComponent will handle a request, add some calls to the configurator
|
// If WebComponent will handle a request, add some calls to the configurator
|
||||||
if (self::$willHandleRequest)
|
if (self::$willHandleRequest)
|
||||||
|
{
|
||||||
// Invoke methods to prepare system for HTTP calls
|
// Invoke methods to prepare system for HTTP calls
|
||||||
$configurator->call('logger', 'setLoggerTemplate', null, 'logger_http');
|
$configurator->call('logger', 'setLoggerTemplate', null, 'logger_http');
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public function onCreateContainer(Factory $container)
|
public function onCreateContainer(Factory $container)
|
||||||
{
|
{
|
||||||
@ -122,44 +124,13 @@ class WebComponent implements iComponent
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Disable the WebComponent, so it won't prepare for handling requests
|
* Disable the WebComponent so it won't prepare for handling requests
|
||||||
*/
|
*/
|
||||||
public function disableComponent()
|
public function disableComponent()
|
||||||
{
|
{
|
||||||
self::$willHandleRequest = false;
|
self::$willHandleRequest = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function shutdownEventListener(Event $event): Event
|
|
||||||
{
|
|
||||||
/** @var Output $output */
|
|
||||||
Logger::logInfo("Parsing output...");
|
|
||||||
$output = Factory::getInstance()->output;
|
|
||||||
$output->display();
|
|
||||||
return $event;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function layoutDisplayEventListener(Event $event)
|
|
||||||
{
|
|
||||||
/** @var $event LayoutDisplayEvent */
|
|
||||||
/** @var Output $output */
|
|
||||||
$output = Factory::getInstance('output');
|
|
||||||
$output->appendOutput($event->contents);
|
|
||||||
$event->setCancelled(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function routerLoadViewAndControllerEventListener(Event $event)
|
|
||||||
{
|
|
||||||
/** @var Input $input */
|
|
||||||
/** @var RouterLoadViewAndControllerEvent $event */
|
|
||||||
$input = Factory::getInstance('input');
|
|
||||||
$methods = $event->viewMethods[Priority::NORMAL];
|
|
||||||
foreach ($methods as $method)
|
|
||||||
$event->addMethod(strtolower($input->method()) . '_' . $method);
|
|
||||||
|
|
||||||
Logger::log("Added input method '" . $input->method() . "' as a prefix to view methods.");
|
|
||||||
return $event;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handle a Web request.
|
* Handle a Web request.
|
||||||
*
|
*
|
||||||
@ -180,13 +151,33 @@ class WebComponent implements iComponent
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
// Set the output to display when shutting down
|
// Set the output to display when shutting down
|
||||||
Events::addListener([$this, 'shutdownEventListener'], 'coreShutdownEvent', Priority::NORMAL);
|
Events::addListener(function ($event) {
|
||||||
|
/** @var Output $output */
|
||||||
|
Logger::logInfo("Parsing output...");
|
||||||
|
$output = Factory::getInstance()->output;
|
||||||
|
$output->display();
|
||||||
|
return $event;
|
||||||
|
}, 'coreShutdownEvent', Priority::NORMAL);
|
||||||
|
|
||||||
// Intercept output of Layout and redirect it to Output
|
// Intercept output of Layout and redirect it to Output
|
||||||
Events::addListener([$this, 'layoutDisplayEventListener'], 'layoutDisplayEvent', Priority::NORMAL);
|
Events::addListener(function($event){
|
||||||
|
/** @var $event LayoutDisplayEvent */
|
||||||
|
/** @var Output $output */
|
||||||
|
$output = Factory::getInstance('output');
|
||||||
|
$output->appendOutput($event->contents);
|
||||||
|
$event->setCancelled(true);
|
||||||
|
}, 'layoutDisplayEvent', Priority::NORMAL);
|
||||||
|
|
||||||
// Add HTTP method prefix to requests to views
|
// Add HTTP method prefix to requests to views
|
||||||
Events::addListener([$this, 'routerLoadViewAndControllerEventListener'], 'routerLoadViewAndControllerEvent', Priority::NORMAL);
|
Events::addListener(function($event){
|
||||||
|
/** @var Input $input */
|
||||||
|
/** @var RouterLoadViewAndControllerEvent $event */
|
||||||
|
$input = Factory::getInstance('input');
|
||||||
|
$methods = $event->viewMethods[Priority::NORMAL];
|
||||||
|
foreach ($methods as $method)
|
||||||
|
$event->addMethod(strtolower($input->method()) . '_' . $method);
|
||||||
|
return $event;
|
||||||
|
}, 'routerLoadViewAndControllerEvent', Priority::NORMAL);
|
||||||
|
|
||||||
// Create an error 500 page when a haltEvent is fired
|
// Create an error 500 page when a haltEvent is fired
|
||||||
Events::addListener([$this, 'haltEventListener'], 'haltExecutionEvent', Priority::NORMAL);
|
Events::addListener([$this, 'haltEventListener'], 'haltExecutionEvent', Priority::NORMAL);
|
||||||
@ -240,7 +231,7 @@ class WebComponent implements iComponent
|
|||||||
return true;
|
return true;
|
||||||
|
|
||||||
// Attempt to load a static resource
|
// Attempt to load a static resource
|
||||||
if ($resources->serveResource($uri->uriString()))
|
if ($resources->serveResource($uri->segmentArray()))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
// First test for Cross Site Request Forgery
|
// First test for Cross Site Request Forgery
|
||||||
@ -312,6 +303,7 @@ class WebComponent implements iComponent
|
|||||||
*/
|
*/
|
||||||
public function callViewEventListener(RouterCallViewEvent $event, SecurityException $exception)
|
public function callViewEventListener(RouterCallViewEvent $event, SecurityException $exception)
|
||||||
{
|
{
|
||||||
|
/** @var RouterCallViewEvent $event */
|
||||||
// If the securityExceptionHandler method exists, cancel based on that methods output
|
// If the securityExceptionHandler method exists, cancel based on that methods output
|
||||||
if (method_exists($event->view, 'securityExceptionHandler'))
|
if (method_exists($event->view, 'securityExceptionHandler'))
|
||||||
$event->setCancelled(!$event->view->securityExceptionHandler($exception));
|
$event->setCancelled(!$event->view->securityExceptionHandler($exception));
|
||||||
@ -326,7 +318,7 @@ class WebComponent implements iComponent
|
|||||||
*
|
*
|
||||||
* Fired when FuzeWorks halts it's execution. Loads an error 500 page.
|
* Fired when FuzeWorks halts it's execution. Loads an error 500 page.
|
||||||
*
|
*
|
||||||
* @param HaltExecutionEvent $event
|
* @param $event
|
||||||
* @throws EventException
|
* @throws EventException
|
||||||
* @throws FactoryException
|
* @throws FactoryException
|
||||||
* @TODO remove FuzeWorks\Layout dependency
|
* @TODO remove FuzeWorks\Layout dependency
|
||||||
@ -340,17 +332,14 @@ class WebComponent implements iComponent
|
|||||||
/** @var Layout $layout */
|
/** @var Layout $layout */
|
||||||
$output = Factory::getInstance()->output;
|
$output = Factory::getInstance()->output;
|
||||||
$router = Factory::getInstance()->router;
|
$router = Factory::getInstance()->router;
|
||||||
|
|
||||||
// Reset the layout engine
|
|
||||||
if (isset(Factory::getInstance()->layouts))
|
|
||||||
{
|
|
||||||
$layout = Factory::getInstance()->layouts;
|
$layout = Factory::getInstance()->layouts;
|
||||||
$layout->reset();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Cancel event
|
// Cancel event
|
||||||
$event->setCancelled(true);
|
$event->setCancelled(true);
|
||||||
|
|
||||||
|
// Reset the layout engine
|
||||||
|
$layout->reset();
|
||||||
|
|
||||||
// Remove listener so that error pages won't be intercepted
|
// Remove listener so that error pages won't be intercepted
|
||||||
Events::removeListener([$this, 'callViewEventListener'], 'routerCallViewEvent',Priority::HIGHEST);
|
Events::removeListener([$this, 'callViewEventListener'], 'routerCallViewEvent',Priority::HIGHEST);
|
||||||
|
|
||||||
@ -385,6 +374,7 @@ class WebComponent implements iComponent
|
|||||||
$security = Factory::getInstance()->security;
|
$security = Factory::getInstance()->security;
|
||||||
$config = Factory::getInstance()->config;
|
$config = Factory::getInstance()->config;
|
||||||
|
|
||||||
|
/** @var LayoutLoadEvent $event */
|
||||||
$event->assign('csrfHash', $security->get_csrf_hash());
|
$event->assign('csrfHash', $security->get_csrf_hash());
|
||||||
$event->assign('csrfTokenName', $security->get_csrf_token_name());
|
$event->assign('csrfTokenName', $security->get_csrf_token_name());
|
||||||
$event->assign('siteURL', $config->getConfig('web')->get('base_url'));
|
$event->assign('siteURL', $config->getConfig('web')->get('base_url'));
|
||||||
|
Loading…
Reference in New Issue
Block a user