Compare commits

..

3 Commits

6 changed files with 36 additions and 53 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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