Compare commits

..

No commits in common. "71c25c778f69a1b3a3f70f28d895150c93bd0aa4" and "eb4b5ca7bcba02d559c728dcb2b7b9f7126c70d5" have entirely different histories.

6 changed files with 53 additions and 36 deletions

View File

@ -417,7 +417,7 @@ if (!empty($adminOverviewStatuses) && is_array($adminOverviewStatuses)) {
$statusBadges = []; $statusBadges = [];
$statusBadges[] = $plugin['enabled'] $statusBadges[] = $plugin['enabled']
? '<span class="badge text-uppercase" style="background-color:#198754;color:#fff;">Enabled</span>' ? '<span class="badge text-uppercase" style="background-color:#198754;color:#fff;">Enabled</span>'
: '<span class="badge text-uppercase" style="background-color:#c6c6c6;color:#fff;">Disabled</span>'; : '<span class="badge text-uppercase" style="background-color:#6c757d;color:#fff;">Disabled</span>';
if ($plugin['enabled'] && empty($depErrors) && $plugin['loaded']) { if ($plugin['enabled'] && empty($depErrors) && $plugin['loaded']) {
$statusBadges[] = '<span class="badge text-uppercase" style="background-color:#0dcaf0;color:#052c65;">Loaded</span>'; $statusBadges[] = '<span class="badge text-uppercase" style="background-color:#0dcaf0;color:#052c65;">Loaded</span>';
} }

View File

@ -143,11 +143,15 @@ function logs_plugin_render_list($logObject, $db, int $userId, bool $validSessio
$username = $userObject->getUserDetails($userId)[0]['username']; $username = $userObject->getUserDetails($userId)[0]['username'];
$page = 'logs'; // For pagination template $page = 'logs'; // For pagination template
// Get any new feedback messages \App\Helpers\Theme::include('page-header');
include_once APP_PATH . 'helpers/feedback.php'; \App\Helpers\Theme::include('page-menu');
if ($validSession) {
\App\Helpers\Theme::include('page-sidebar');
}
include APP_PATH . 'helpers/feedback.php';
require_once PLUGIN_LOGS_PATH . 'helpers/logs_view_helper.php'; require_once PLUGIN_LOGS_PATH . 'helpers/logs_view_helper.php';
// Load the view
include PLUGIN_LOGS_PATH . 'views/logs.php'; include PLUGIN_LOGS_PATH . 'views/logs.php';
\App\Helpers\Theme::include('page-footer');
} }

View File

@ -1,5 +1,5 @@
{ {
"name": "Logger Plugin", "name": "Logger Plugin",
"version": "1.0.2", "version": "1.0.2",
"description": "Logging system for storing logs in the DB" "description": "Initializes logging system via LoggerFactory"
} }

View File

@ -142,12 +142,18 @@ function register_plugin_render_form(bool $validSession, string $app_root, array
$formValues = $data['values'] ?? ['username' => '']; $formValues = $data['values'] ?? ['username' => ''];
$registrationEnabled = $data['registrationEnabled'] ?? true; $registrationEnabled = $data['registrationEnabled'] ?? true;
// Get any new feedback messages \App\Helpers\Theme::include('page-header');
include_once APP_PATH . 'helpers/feedback.php'; \App\Helpers\Theme::include('page-menu');
if ($validSession) {
\App\Helpers\Theme::include('page-sidebar');
}
$csrf_token = \SecurityHelper::getInstance()->generateCsrfToken(); include APP_PATH . 'helpers/feedback.php';
$registerCsrfToken = $csrf_token;
$values = $formValues;
$app_root = $app_root;
// Load the view
include PLUGIN_REGISTER_PATH . 'views/form-register.php'; include PLUGIN_REGISTER_PATH . 'views/form-register.php';
\App\Helpers\Theme::include('page-footer');
} }

View File

@ -1,5 +1,5 @@
{ {
"name": "Registration Plugin", "name": "Registration Plugin",
"version": "1.0.2", "version": "1.0.2",
"description": "Registration of new users" "description": "Provides registration functionality as a plugin."
} }

View File

@ -425,16 +425,22 @@ if ($page == 'logout') {
'logger' => $logObject, 'logger' => $logObject,
'time_now' => $timeNow ?? null, 'time_now' => $timeNow ?? null,
]; ];
// Check if this is a PluginRouteRegistry route if (PluginRouteRegistry::match($page)) {
$pluginRouteMatch = PluginRouteRegistry::match($page); $handled = PluginRouteRegistry::dispatch($page, $routeContext);
$isPluginRoute = $pluginRouteMatch !== null; if ($handled !== false) {
ob_end_flush();
exit;
}
}
// page building // page building
if ($isPluginRoute) { if (in_array($page, $allowed_urls)) {
// The page is from a PluginRouteRegistry route (a plugin's page) // The page is in allowed URLs
if (isset($mapped_plugin_controllers[$page]) && file_exists($mapped_plugin_controllers[$page])) {
// The page is from a plugin controller
if (defined('PLUGIN_PAGE_DIRECT_OUTPUT') && PLUGIN_PAGE_DIRECT_OUTPUT === true) { if (defined('PLUGIN_PAGE_DIRECT_OUTPUT') && PLUGIN_PAGE_DIRECT_OUTPUT === true) {
// Barebone page controller, we don't output anything extra (no common header/footer etc.) // Barebone page controller, we don't output anything extra
PluginRouteRegistry::dispatch($page, $routeContext); include $mapped_plugin_controllers[$page];
ob_end_flush(); ob_end_flush();
exit; exit;
} else { } else {
@ -443,10 +449,10 @@ if ($page == 'logout') {
if ($validSession) { if ($validSession) {
\App\Helpers\Theme::include('page-sidebar'); \App\Helpers\Theme::include('page-sidebar');
} }
PluginRouteRegistry::dispatch($page, $routeContext); include $mapped_plugin_controllers[$page];
\App\Helpers\Theme::include('page-footer'); \App\Helpers\Theme::include('page-footer');
} }
} elseif (in_array($page, $allowed_urls)) { } else {
// The page is from a core controller // The page is from a core controller
\App\Helpers\Theme::include('page-header'); \App\Helpers\Theme::include('page-header');
\App\Helpers\Theme::include('page-menu'); \App\Helpers\Theme::include('page-menu');
@ -459,6 +465,7 @@ if ($page == 'logout') {
include APP_PATH . 'templates/error-notfound.php'; include APP_PATH . 'templates/error-notfound.php';
} }
\App\Helpers\Theme::include('page-footer'); \App\Helpers\Theme::include('page-footer');
}
} else { } else {
// The page is not in allowed URLs // The page is not in allowed URLs
\App\Helpers\Theme::include('page-header'); \App\Helpers\Theme::include('page-header');