Fixes logs and register plugins
parent
eb4b5ca7bc
commit
1dde66a9f1
|
|
@ -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:#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']) {
|
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>';
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -143,15 +143,11 @@ 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
|
||||||
|
|
||||||
\App\Helpers\Theme::include('page-header');
|
// Get any new feedback messages
|
||||||
\App\Helpers\Theme::include('page-menu');
|
include_once APP_PATH . 'helpers/feedback.php';
|
||||||
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';
|
||||||
include PLUGIN_LOGS_PATH . 'views/logs.php';
|
|
||||||
|
|
||||||
\App\Helpers\Theme::include('page-footer');
|
// Load the view
|
||||||
|
include PLUGIN_LOGS_PATH . 'views/logs.php';
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -142,18 +142,12 @@ 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;
|
||||||
|
|
||||||
\App\Helpers\Theme::include('page-header');
|
// Get any new feedback messages
|
||||||
\App\Helpers\Theme::include('page-menu');
|
include_once APP_PATH . 'helpers/feedback.php';
|
||||||
if ($validSession) {
|
|
||||||
\App\Helpers\Theme::include('page-sidebar');
|
|
||||||
}
|
|
||||||
|
|
||||||
include APP_PATH . 'helpers/feedback.php';
|
$csrf_token = \SecurityHelper::getInstance()->generateCsrfToken();
|
||||||
|
$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');
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue