Fixes templates loading in index
parent
d65b7bcc55
commit
b1dae54aac
|
@ -39,6 +39,7 @@ $localConfigPath = str_replace(__DIR__ . '/..', '', $config_file);
|
||||||
$app_root = $config['folder'] ?? '/';
|
$app_root = $config['folder'] ?? '/';
|
||||||
|
|
||||||
// Preparing plugins and hooks
|
// Preparing plugins and hooks
|
||||||
|
// Initialize HookDispatcher and plugin system
|
||||||
require_once __DIR__ . '/../app/core/HookDispatcher.php';
|
require_once __DIR__ . '/../app/core/HookDispatcher.php';
|
||||||
require_once __DIR__ . '/../app/core/PluginManager.php';
|
require_once __DIR__ . '/../app/core/PluginManager.php';
|
||||||
use App\Core\HookDispatcher;
|
use App\Core\HookDispatcher;
|
||||||
|
@ -153,8 +154,6 @@ $allowed_urls = [
|
||||||
// Let plugins filter/extend allowed_urls
|
// Let plugins filter/extend allowed_urls
|
||||||
$allowed_urls = filter_allowed_urls($allowed_urls);
|
$allowed_urls = filter_allowed_urls($allowed_urls);
|
||||||
|
|
||||||
// Config and app_root are now set at the top of the file
|
|
||||||
|
|
||||||
// Dispatch routing and auth
|
// Dispatch routing and auth
|
||||||
require_once __DIR__ . '/../app/core/Router.php';
|
require_once __DIR__ . '/../app/core/Router.php';
|
||||||
use App\Core\Router;
|
use App\Core\Router;
|
||||||
|
@ -329,17 +328,17 @@ if ($page == 'logout') {
|
||||||
} else {
|
} else {
|
||||||
include '../app/templates/error-notfound.php';
|
include '../app/templates/error-notfound.php';
|
||||||
}
|
}
|
||||||
include '../app/templates/page-footer.php';
|
\App\Helpers\Theme::include('page-footer');
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// The page is not in allowed URLs
|
// The page is not in allowed URLs
|
||||||
include '../app/templates/page-header.php';
|
\App\Helpers\Theme::include('page-header');
|
||||||
include '../app/templates/page-menu.php';
|
\App\Helpers\Theme::include('page-menu');
|
||||||
if ($validSession) {
|
if ($validSession) {
|
||||||
include '../app/templates/page-sidebar.php';
|
\App\Helpers\Theme::include('page-sidebar');
|
||||||
}
|
}
|
||||||
include '../app/templates/error-notfound.php';
|
include '../app/templates/error-notfound.php';
|
||||||
include '../app/templates/page-footer.php';
|
\App\Helpers\Theme::include('page-footer');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue