mirror of
https://github.com/slawkens/myaac.git
synced 2025-10-16 10:44:55 +02:00
Rewriting the router v2
To be more flexible
This commit is contained in:
slawkens
@@ -8,6 +8,35 @@
|
||||
* @link https://my-aac.org
|
||||
*/
|
||||
|
||||
if(!isset($content[0]))
|
||||
$content = '';
|
||||
|
||||
// check if site has been closed
|
||||
$load_it = true;
|
||||
$site_closed = false;
|
||||
if(fetchDatabaseConfig('site_closed', $site_closed)) {
|
||||
$site_closed = ($site_closed == 1);
|
||||
if($site_closed) {
|
||||
if(!admin())
|
||||
{
|
||||
$title = getDatabaseConfig('site_closed_title');
|
||||
$content .= '<p class="note">' . getDatabaseConfig('site_closed_message') . '</p><br/>';
|
||||
$load_it = false;
|
||||
}
|
||||
|
||||
if(!$logged)
|
||||
{
|
||||
ob_start();
|
||||
require SYSTEM . 'pages/account/manage.php';
|
||||
$content .= ob_get_contents();
|
||||
ob_end_clean();
|
||||
$load_it = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
define('SITE_CLOSED', $site_closed);
|
||||
|
||||
/** @var boolean $load_it */
|
||||
if(!$load_it) {
|
||||
// ignore warnings in some functions/plugins
|
||||
// page is not loaded anyways
|
||||
@@ -17,145 +46,153 @@ if(!$load_it) {
|
||||
return;
|
||||
}
|
||||
|
||||
/** @var string $content */
|
||||
if(SITE_CLOSED && admin())
|
||||
$content .= '<p class="note">Site is under maintenance (closed mode). Only privileged users can see it.</p>';
|
||||
|
||||
$ignore = false;
|
||||
|
||||
/** @var boolean $logged */
|
||||
/** @var OTS_Account $account_logged */
|
||||
$logged_access = 1;
|
||||
if($logged && $account_logged && $account_logged->isLoaded()) {
|
||||
$logged_access = $account_logged->getAccess();
|
||||
}
|
||||
|
||||
$success = false;
|
||||
$tmp_content = getCustomPage($uri, $success);
|
||||
if($success) {
|
||||
$content .= $tmp_content;
|
||||
if(hasFlag(FLAG_CONTENT_PAGES) || superAdmin()) {
|
||||
$pageInfo = getCustomPageInfo($uri);
|
||||
$content = $twig->render('admin.pages.links.html.twig', array(
|
||||
'page' => array('id' => $pageInfo !== null ? $pageInfo['id'] : 0, 'hidden' => $pageInfo !== null ? $pageInfo['hidden'] : '0')
|
||||
)) . $content;
|
||||
/**
|
||||
* Routes loading
|
||||
*/
|
||||
$dispatcher = FastRoute\cachedDispatcher(function (FastRoute\RouteCollector $r) {
|
||||
$routes = require SYSTEM . 'routes.php';
|
||||
|
||||
$duplicates = [];
|
||||
|
||||
$routesTmp = [];
|
||||
foreach(getDatabasePages() as $page) {
|
||||
$duplicates[$page] = true;
|
||||
$routesTmp[] = [['GET', 'POST'], $page, 'database/' . $page, true];
|
||||
}
|
||||
|
||||
$page = $uri;
|
||||
} else {
|
||||
// old support for pages like /?subtopic=accountmanagement
|
||||
$page = $_REQUEST['p'] ?? ($_REQUEST['subtopic'] ?? '');
|
||||
if(!empty($page) && preg_match('/^[A-z0-9\-]+$/', $page)) {
|
||||
if(config('backward_support')) {
|
||||
require SYSTEM . 'compat_pages.php';
|
||||
Plugins::clearWarnings();
|
||||
foreach (Plugins::getRoutes() as $route) {
|
||||
if(!isset($duplicates[$route[1]])) {
|
||||
$duplicates[$route[1]] = true;
|
||||
$routesTmp[] = [$route[0], $route[1], $route[2]];
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($routes as $route) {
|
||||
if(!isset($duplicates[$route[1]])) {
|
||||
$routesTmp[] = [$route[0], $route[1], 'system/pages/' . $route[2]];
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($routesTmp as $route) {
|
||||
if (strpos($route[2], '.php') === false && !isset($route[3])) {
|
||||
$route[2] = str_replace('system/pages/', '', 'redirect/' . $route[2]);
|
||||
}
|
||||
|
||||
$file = SYSTEM . 'pages/' . $page . '.php';
|
||||
if (!is_file($file)) {
|
||||
$page = '404';
|
||||
$file = SYSTEM . 'pages/404.php';
|
||||
$r->addRoute($route[0], $route[1], $route[2]);
|
||||
}
|
||||
|
||||
if (config('env') === 'dev') {
|
||||
foreach(Plugins::getWarnings() as $warning) {
|
||||
log_append('router.log', $warning);
|
||||
}
|
||||
}
|
||||
},
|
||||
[
|
||||
'cacheFile' => CACHE . 'route.cache',
|
||||
'cacheDisabled' => config('env') === 'dev',
|
||||
]
|
||||
);
|
||||
|
||||
// Fetch method and URI
|
||||
$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 {
|
||||
$dispatcher = FastRoute\cachedDispatcher(function (FastRoute\RouteCollector $r) {
|
||||
$routes = require SYSTEM . 'routes.php';
|
||||
$uri = str_replace_first('?', '', $uri);
|
||||
}
|
||||
}
|
||||
|
||||
$duplicates = [];
|
||||
Plugins::clearWarnings();
|
||||
foreach (Plugins::getRoutes() as $route) {
|
||||
$duplicates[$route[1]] = true;
|
||||
$r->addRoute($route[0], '/' . $route[1], $route[2]);
|
||||
$uri = rawurldecode($uri);
|
||||
define('URI', $uri);
|
||||
|
||||
$found = true;
|
||||
|
||||
// old support for pages like /?subtopic=accountmanagement
|
||||
$page = $_REQUEST['p'] ?? ($_REQUEST['subtopic'] ?? '');
|
||||
if(!empty($page) && preg_match('/^[A-z0-9\-]+$/', $page)) {
|
||||
if (config('backward_support')) {
|
||||
require SYSTEM . 'compat/pages.php';
|
||||
}
|
||||
|
||||
$file = loadPageFromFileSystem($page, $found);
|
||||
if(!$found) {
|
||||
$file = false;
|
||||
}
|
||||
}
|
||||
else {
|
||||
$routeInfo = $dispatcher->dispatch($httpMethod, $uri);
|
||||
switch ($routeInfo[0]) {
|
||||
case FastRoute\Dispatcher::NOT_FOUND:
|
||||
// ... 404 Not Found
|
||||
//var_dump('not found');
|
||||
/**
|
||||
* Fallback to load page from templates/ or system/pages/ directory
|
||||
*/
|
||||
$page = $uri;
|
||||
if (preg_match('/^[A-z0-9\/\-]+$/', $page)) {
|
||||
$file = loadPageFromFileSystem($page, $found);
|
||||
} else {
|
||||
$found = false;
|
||||
}
|
||||
|
||||
foreach ($routes as $route) {
|
||||
if(!isset($duplicates[$route[1]])) {
|
||||
$r->addRoute($route[0], '/' . $route[1], 'system/pages/' . $route[2]);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
if (config('env') === 'dev') {
|
||||
foreach(Plugins::getWarnings() as $warning) {
|
||||
log_append('router.log', $warning);
|
||||
}
|
||||
}
|
||||
},
|
||||
[
|
||||
'cacheFile' => CACHE . 'route.cache',
|
||||
'cacheDisabled' => config('env') === 'dev',
|
||||
]
|
||||
);
|
||||
case FastRoute\Dispatcher::METHOD_NOT_ALLOWED:
|
||||
// ... 405 Method Not Allowed
|
||||
$page = '405';
|
||||
$allowedMethods = $routeInfo[1];
|
||||
$file = SYSTEM . 'pages/405.php';
|
||||
break;
|
||||
|
||||
// Fetch method and URI from somewhere
|
||||
$httpMethod = $_SERVER['REQUEST_METHOD'];
|
||||
$uri = $_SERVER['REQUEST_URI'];
|
||||
case FastRoute\Dispatcher::FOUND:
|
||||
$path = $routeInfo[1];
|
||||
$vars = $routeInfo[2];
|
||||
|
||||
// Strip query string (?foo=bar) and decode URI
|
||||
if (false !== $pos = strpos($uri, '?')) {
|
||||
if ($pos !== 1) {
|
||||
$uri = substr($uri, 0, $pos);
|
||||
}
|
||||
else {
|
||||
$uri = str_replace_first('?', '', $uri);
|
||||
}
|
||||
}
|
||||
$uri = rawurldecode($uri);
|
||||
$_REQUEST = array_merge($_REQUEST, $vars);
|
||||
$_GET = array_merge($_GET, $vars);
|
||||
|
||||
$routeInfo = $dispatcher->dispatch($httpMethod, $uri);
|
||||
switch ($routeInfo[0]) {
|
||||
case FastRoute\Dispatcher::NOT_FOUND:
|
||||
// ... 404 Not Found
|
||||
$tmp = URI;
|
||||
$found = true;
|
||||
if (strpos($path, 'database/') !== false) {
|
||||
//var_dump($path);
|
||||
$pageName = str_replace('database/', '', $path);
|
||||
|
||||
$page = $tmp;
|
||||
if (preg_match('/^[A-z0-9\/\-]+$/', $tmp)) {
|
||||
global $template_path;
|
||||
$file = $template_path . '/pages/' . $tmp . '.php';
|
||||
if (!is_file($file)) {
|
||||
$file = SYSTEM . 'pages/' . $tmp . '.php';
|
||||
if (!is_file($file)) {
|
||||
$found = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
$tmp_ = BASE_DIR;
|
||||
$uri = $_SERVER['REQUEST_URI'];
|
||||
if (!empty($tmp)) {
|
||||
$uri = str_replace(BASE_DIR . '/', '', $uri);
|
||||
$success = false;
|
||||
$tmp_content = getCustomPage($pageName, $success);
|
||||
if ($success) {
|
||||
$content .= $tmp_content;
|
||||
if (hasFlag(FLAG_CONTENT_PAGES) || superAdmin()) {
|
||||
$pageInfo = getCustomPageInfo($pageName);
|
||||
$content = $twig->render('admin.pages.links.html.twig', array(
|
||||
'page' => array('id' => $pageInfo !== null ? $pageInfo['id'] : 0, 'hidden' => $pageInfo !== null ? $pageInfo['hidden'] : '0')
|
||||
)) . $content;
|
||||
}
|
||||
|
||||
if (false !== $pos = strpos($uri, '?')) {
|
||||
$tmp = substr($uri, 0, $pos);
|
||||
}
|
||||
|
||||
if (empty($tmp)) {
|
||||
$page = 'news';
|
||||
$file = SYSTEM . 'pages/news.php';
|
||||
}
|
||||
else {
|
||||
$found = false;
|
||||
}
|
||||
$page = $pageName;
|
||||
$file = false;
|
||||
}
|
||||
|
||||
if (!$found) {
|
||||
$page = '404';
|
||||
$file = SYSTEM . 'pages/404.php';
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case FastRoute\Dispatcher::METHOD_NOT_ALLOWED:
|
||||
// ... 405 Method Not Allowed
|
||||
$page = '405';
|
||||
$allowedMethods = $routeInfo[1];
|
||||
$file = SYSTEM . 'pages/405.php';
|
||||
break;
|
||||
|
||||
case FastRoute\Dispatcher::FOUND:
|
||||
$path = $routeInfo[1];
|
||||
$vars = $routeInfo[2];
|
||||
|
||||
$_REQUEST = array_merge($_REQUEST, $vars);
|
||||
$_GET = array_merge($_GET, $vars);
|
||||
|
||||
} else if (strpos($path, 'redirect/') !== false) {
|
||||
$path = str_replace('redirect/', '', $path);
|
||||
header('Location: ' . BASE_URL . $path);
|
||||
exit;
|
||||
} else {
|
||||
// parse for define PAGE
|
||||
$tmp = BASE_DIR;
|
||||
$uri = $_SERVER['REQUEST_URI'];
|
||||
@@ -172,24 +209,23 @@ if($success) {
|
||||
|
||||
$page = $uri;
|
||||
$file = BASE . $path;
|
||||
}
|
||||
|
||||
unset($tmp, $uri);
|
||||
break;
|
||||
}
|
||||
unset($tmp, $uri);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
define('PAGE', $page);
|
||||
if(config('backward_support')) {
|
||||
$subtopic = $page;
|
||||
if (!$found) {
|
||||
$page = '404';
|
||||
$file = SYSTEM . 'pages/404.php';
|
||||
}
|
||||
|
||||
$action = isset($_REQUEST['action']) ? strtolower($_REQUEST['action']) : '';
|
||||
define('ACTION', $action);
|
||||
define('PAGE', $page);
|
||||
|
||||
ob_start();
|
||||
if($hooks->trigger(HOOK_BEFORE_PAGE)) {
|
||||
if(!$ignore)
|
||||
if(!$ignore && $file !== false)
|
||||
require $file;
|
||||
}
|
||||
|
||||
@@ -202,13 +238,49 @@ $content .= ob_get_contents();
|
||||
ob_end_clean();
|
||||
$hooks->trigger(HOOK_AFTER_PAGE);
|
||||
|
||||
if(!isset($title)) {
|
||||
$title = ucfirst($page);
|
||||
}
|
||||
|
||||
if(config('backward_support')) {
|
||||
$main_content = $content;
|
||||
if(!isset($title)) {
|
||||
$title = ucfirst($page);
|
||||
}
|
||||
|
||||
$topic = $title;
|
||||
}
|
||||
|
||||
unset($page);
|
||||
|
||||
function getDatabasePages() {
|
||||
global $db;
|
||||
$pages = $db->query('SELECT `name` FROM ' . TABLE_PREFIX . 'pages');
|
||||
$ret = [];
|
||||
|
||||
if ($pages->rowCount() < 1) {
|
||||
return $ret;
|
||||
}
|
||||
|
||||
foreach($pages->fetchAll() as $page) {
|
||||
$ret [] = $page['name'];
|
||||
}
|
||||
|
||||
return $ret;
|
||||
}
|
||||
|
||||
function loadPageFromFileSystem($page, &$found) {
|
||||
$file = SYSTEM . 'pages/' . $page . '.php';
|
||||
if (!is_file($file)) {
|
||||
// feature: convert camelCase to snake_case
|
||||
// so instead of forum/move_thread
|
||||
// we can write: forum/moveThread
|
||||
$file = SYSTEM . 'pages/' . camelCaseToUnderscore($page) . '.php';
|
||||
if (!is_file($file)) {
|
||||
// feature: load pages from templates/ dir
|
||||
global $template_path;
|
||||
$file = $template_path . '/pages/' . $page . '.php';
|
||||
if (!is_file($file)) {
|
||||
$found = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $file;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user