prevent direct memory access, remove duplicated reader init

This commit is contained in:
ghost 2024-02-04 15:07:02 +02:00
parent 525c7e89fa
commit 173191e0b1

View file

@ -348,19 +348,19 @@ $server->setHandler(
$_uri = isset($matches[1]) ? $matches[1] : ''; $_uri = isset($matches[1]) ? $matches[1] : '';
// Check for cached results
if ($content = $memory->get($_uri))
{
$response->setContent(
$content
);
return $response;
}
// File request, get page content // File request, get page content
else if ($path = $filesystem->getPagePathByUri($_uri)) if ($path = $filesystem->getPagePathByUri($_uri))
{ {
// Check for cached results
if ($content = $memory->get($path))
{
$response->setContent(
$content
);
return $response;
}
// Define base URL // Define base URL
$reader->setMacros( $reader->setMacros(
'~URL:base~', '~URL:base~',
@ -506,7 +506,7 @@ $server->setHandler(
// Cache results // Cache results
$memory->set( $memory->set(
$_uri, $path,
$content $content
); );
@ -519,10 +519,17 @@ $server->setHandler(
} }
// File not found, request directory for minimal navigation // File not found, request directory for minimal navigation
else if ($directory = $filesystem->getDirectoryPathByUri($_uri)) else if ($path = $filesystem->getDirectoryPathByUri($_uri))
{ {
// Init reader // Check for cached results
$reader = new \Yggverse\Gemini\Dokuwiki\Reader(); if ($content = $memory->get($path))
{
$response->setContent(
$content
);
return $response;
}
// Init home page content // Init home page content
$lines = [ $lines = [
@ -656,7 +663,7 @@ $server->setHandler(
// Cache results // Cache results
$memory->set( $memory->set(
$_uri, $path,
$content $content
); );