Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-05-02 04:09:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix double ACTION define + undefined URI in template

Browse Source
This commit is contained in:
slawkens 2023-02-06 16:58:51 +01:00
parent 07a03c38b3
commit 35a660be7d
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
system/router.php
View File

@ -36,11 +36,29 @@ if(fetchDatabaseConfig('site_closed', $site_closed)) {
} }
define('SITE_CLOSED', $site_closed); define('SITE_CLOSED', $site_closed);
// Strip query string (?foo=bar) and decode URI
/** @var string $uri */
if (false !== $pos = strpos($uri, '?')) {
if ($pos !== 1) {
$uri = substr($uri, 0, $pos);
}
else {
$uri = str_replace_first('?', '', $uri);
}
}
$uri = rawurldecode($uri);
if (BASE_DIR !== '') {
$tmp = str_replace_first('/', '', BASE_DIR);
$uri = str_replace_first($tmp . '/', '', $uri);
}
define('URI', $uri);
/** @var boolean $load_it */ /** @var boolean $load_it */
if(!$load_it) { if(!$load_it) {
// ignore warnings in some functions/plugins // ignore warnings in some functions/plugins
// page is not loaded anyways // page is not loaded anyways
define('ACTION', '');
define('PAGE', ''); define('PAGE', '');
return; return;
@ -116,25 +134,6 @@ $dispatcher = FastRoute\cachedDispatcher(function (FastRoute\RouteCollector $r)
// Fetch method and URI // Fetch method and URI
$httpMethod = $_SERVER['REQUEST_METHOD']; $httpMethod = $_SERVER['REQUEST_METHOD'];
// Strip query string (?foo=bar) and decode URI
/** @var string $uri */
if (false !== $pos = strpos($uri, '?')) {
if ($pos !== 1) {
$uri = substr($uri, 0, $pos);
}
else {
$uri = str_replace_first('?', '', $uri);
}
}
$uri = rawurldecode($uri);
if (BASE_DIR !== '') {
$tmp = str_replace_first('/', '', BASE_DIR);
$uri = str_replace_first($tmp . '/', '', $uri);
}
define('URI', $uri);
$found = true; $found = true;
// old support for pages like /?subtopic=accountmanagement // old support for pages like /?subtopic=accountmanagement