From 796a9d50c26db95456cacca759c7a87d256cae22 Mon Sep 17 00:00:00 2001 From: mischa Date: Sat, 14 Oct 2023 14:47:02 +0000 Subject: [PATCH] use ADMIN_ROLE in stead of ADMIN_RIGHTS, like the rest of the code --- conf.php-sample | 2 +- setup.php | 8 ++++---- templates/menu.tpl | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf.php-sample b/conf.php-sample index b1b6d8a..aac1f8e 100644 --- a/conf.php-sample +++ b/conf.php-sample @@ -24,7 +24,7 @@ define('ALIASES', '10'); define('MAILBOXES', '10'); // Mail Admin Administrator tag -define('ADMIN_RIGHTS', 'ADMINISTRATOR'); +define('ADMIN_ROLE', 'ADMINISTRATOR'); // Expose virtual mail construct 'vmail' to admins. define('ALIAS_CONTROL', 'NO'); diff --git a/setup.php b/setup.php index 351aef7..c4addc0 100644 --- a/setup.php +++ b/setup.php @@ -2,7 +2,7 @@ /** * OpenSMTPD Admin Refactor * by Jeroen Janssen - * Copyright (c) 2022 LAYLO + * Copyright (c) 2022-2023 LAYLO */ // Check whether the configuration file exists - bail if that is the case @@ -12,7 +12,7 @@ if (file_exists(realpath("./conf.php"))) { } // Define the app specifics DEFINE('APP_NAME', 'OpenSMTPD Admin Setup Checker'); -DEFINE('VERSION', '1.1'); +DEFINE('VERSION', '1.2'); // Start generating the HTML output $html = ''; @@ -30,14 +30,14 @@ $html .= 'PHP version:'; $html .= (version_compare(PHP_VERSION, '7.4.0') >= 0) ? '' . phpversion() . '' : '' . phpversion() . ''; $html .= ''; $html .= 'SQL support:'; -$html .= (extension_loaded('mysqli')) ? 'MySQL/MariaDB' : 'MySQL/MariaDB'; +$html .= (extension_loaded('PDO')) ? 'PDO - MySQL/MariaDB' : 'PDO - MySQL/MariaDB'; $html .= ''; $html .= 'Functions:'; $html .= (extension_loaded('pcre')) ? 'pcre' : 'pcre'; -$html .= (function_exists('get_magic_quotes_gpc')) ? ' - get_magic_quotes_gpc' : ' - get_magic_quotes_gpc'; $html .= (function_exists('session_start')) ? ' - session_start' : ' - session_start'; $html .= ''; $html .= ''; +$html .= '

cp or mv conf.php-sample to conf.php and change it to reflect your setup.

'; $html .= ''; $html .= ''; diff --git a/templates/menu.tpl b/templates/menu.tpl index 2cc3095..09d7324 100644 --- a/templates/menu.tpl +++ b/templates/menu.tpl @@ -1,6 +1,6 @@