diff --git a/setup.php b/setup.php
index efe1b36..174c782 100644
--- a/setup.php
+++ b/setup.php
@@ -1,131 +1,50 @@
-// Copyright (c) 2022 LAYLO
-?>
-
-
-OpenSMTPD Admin Setup Checker
-
-
-
-
-Welcome to OpenSMTPD Admin
-OpenSMTPD Admin Setup Checker 1.1
-It seems that you are running this version of OpenSMTPD Admin for the first time.
-
-
+ * Copyright (c) 2022 LAYLO
+ */
+
+// Check whether the configuration file exists - bail if that is the case
if (file_exists(realpath("./config.inc.php"))) {
- print "It seems that config.inc.php is already configured. Please delete setup.php to continue.";
+ print 'It seems that config.inc.php is already configured. Please delete setup.php to continue.';
die();
}
+// Define the app specifics
+DEFINE('APP_NAME', 'OpenSMTPD Admin Setup Checker');
+DEFINE('VERSION', '1.1');
+
+// Start generating the HTML output
+$html = '';
+$html .= '';
+$html .= '';
+$html .= '';
+$html .= '';
+$html .= '';
+$html .= '';
+$html .= '' . APP_NAME . ' v' . VERSION . '
';
+$html .= 'It seems that you are running this version of OpenSMTPD Admin for the first time.
';
+$html .= '';
+$html .= '';
+$html .= 'PHP version: | ';
+$html .= (version_compare(PHP_VERSION, '8.0.0') >= 0) ? '' . phpversion() . ' | ' : '' . phpversion() . ' | ';
+$html .= '
';
+$html .= 'SQL support: | ';
+$html .= (extension_loaded('mysqli')) ? 'MySQL/MariaDB' : ' | MySQL/MariaDB';
+$html .= (extension_loaded('pgsql')) ? ' - PostgreSQL (change the database_type if you want to use PostgreSQL) | ' : ' - PostgreSQL';
+$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 .= 'Copy the
config.inc.php.sample
to config.inc.php
, edit it to your environment and delete setup.php
'
+$html .= '';
+$html .= '';
+
+print $html;
+
+die();
+
?>
-This will tell you if all functions are available for OpenSMTPD Admin to run.
-
-If you still encounter any problems please check the documentation and website for more information.
-
-Running software:
-
-= 8) $phpversion = 8;
- print "- PHP version " . phpversion() . "
\n";
-} else {
- print "Unable to check for PHP version. (missing function: phpversion())
\n";
-}
-print "\n";
-print "Checking for dependencies:
\n";
-print "\n";
-
-//
-// Check for config.inc.php
-//
-if ($file_config == 1) {
- print "- Depends on: presence config.inc.php - OK
\n";
-} else {
- print "Error: Depends on: presence config.inc.php - NOT FOUND
\n";
- print "Create the file.
";
- print "For example:
\n";
- print "% cp config.inc.php.sample config.inc.php
\n";
- $error =+ 1;
-}
-print "\n";
-
-//
-// Check if there is support for at least 1 database
-//
-if (($f_mysql_connect == 0) and ($f_mysqli_connect == 0) and ($f_pg_connect == 0)) {
- print "Error: There is no database support in your PHP setup
\n";
- print "To install MariaDB 10 support on OpenBSD:
\n";
- print "% pkg_add php-mysqli\n";
- print "To install PostgreSQL support on OpenBSD:
\n";
- print "% pkg_add php-pgsql\n";
- $error =+ 1;
-}
-//
-// MariaDB functions
-//
-if ($f_mysqli_connect == 1) {
- print "- Depends on: MariaDB - OK
\n";
-}
-print "\n";
-
-//
-// PostgreSQL functions
-//
-if ($f_pg_connect == 1) {
- print "- Depends on: PostgreSQL - OK (change the database_type in config.inc.php!!)
\n";
-}
-print "\n";
-
-//
-// Session functions
-//
-if ($f_session_start == 1) {
- print "- Depends on: session - OK
\n";
-} else {
- print "Error: Depends on: session - NOT FOUND
\n";
- $error =+ 1;
-}
-print "\n";
-
-//
-// PCRE functions
-//
-if ($f_preg_match == 1) {
- print "- Depends on: pcre - OK
\n";
-} else {
- print "Error: Depends on: pcre - NOT FOUND
\n";
- $error =+ 1;
-}
-print "\n";
-
-if ($error == 0) {
- print "Everything seems fine... you are ready to rock & roll!\n";
- print "Make sure you delete this setup.php file!
\n";
- print "Also check the config.inc.php file for any settings that you might need to change!
\n";
- print "Click here to go to the admin section (make sure that your .htaccess is setup properly)\n";
-}
-?>
-
-