\ No newline at end of file
diff --git a/admin/index.php b/admin/index.php
index 345f89c..2184858 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -1,10 +1,8 @@
getSetting($mysqli,"name"));
- define("TITLE", $db->getSetting($mysqli,"title"));
- define("WEB_URL", $db->getSetting($mysqli,"url"));
- define("MAILER_NAME", $db->getSetting($mysqli,"mailer"));
- define("MAILER_ADDRESS", $db->getSetting($mysqli,"mailer_email"));
+ define("NAME", $db->getSetting($mysqli, "name"));
+ define("TITLE", $db->getSetting($mysqli, "title"));
+ define("WEB_URL", $db->getSetting($mysqli, "url"));
+ define("MAILER_NAME", $db->getSetting($mysqli, "mailer"));
+ define("MAILER_ADDRESS", $db->getSetting($mysqli, "mailer_email"));
define("GOOGLE_RECAPTCHA", $db->getBooleanSetting($mysqli, "google_recaptcha"));
define("GOOGLE_RECAPTCHA_SECRET", $db->getSetting($mysqli, "google_recaptcha_secret"));
@@ -39,58 +37,45 @@ else{
// Process the subscriber notification queue
// If CRON_SERVER_IP is not set, call notification once incident has been saved
- if ( empty(CRON_SERVER_IP) )
- {
- if ( isset($_GET['sent']) && $_GET['sent'] == true )
- {
+ if (empty(CRON_SERVER_IP)) {
+ if (isset($_GET['sent']) && $_GET['sent'] == true) {
Queue::process_queue();
}
- }
- else if ( isset($_GET['task']) && $_GET['task'] == 'cron' )
- {
+ } else if (isset($_GET['task']) && $_GET['task'] == 'cron') {
// Else, base it on call to /admin?task=cron being called from IP defined by CRON_SERVER_IP
- if (! empty(CRON_SERVER_IP) && $_SERVER['REMOTE_ADDR'] == CRON_SERVER_IP )
- {
- Queue::process_queue();
- syslog(1, "CRON server processed");
- }
- else {
- syslog(1, "CRON called from unauthorised server");
+ if (!empty(CRON_SERVER_IP) && $_SERVER['REMOTE_ADDR'] == CRON_SERVER_IP) {
+ Queue::process_queue();
+ syslog(1, "CRON server processed");
+ } else {
+ syslog(1, "CRON called from unauthorised server");
}
}
- if(isset($_COOKIE['user'])&&!isset($_SESSION['user']))
- {
+ if (isset($_COOKIE['user']) && !isset($_SESSION['user'])) {
User::restore_session();
}
- if (!isset($_SESSION['user']))
- {
- if (isset($_GET['do']) && $_GET['do']=="lost-password")
- {
+ if (!isset($_SESSION['user'])) {
+ if (isset($_GET['do']) && $_GET['do'] == "lost-password") {
require_once("lost-password.php");
- }else if (isset($_GET['do']) && $_GET['do']=="change-email"){
+ } else if (isset($_GET['do']) && $_GET['do'] == "change-email") {
$user_pwd = new User($_GET['id']);
$user_pwd->change_email();
require_once("login-form.php");
- }
- else{
+ } else {
User::login();
require_once("login-form.php");
}
- }
- else
- {
+ } else {
$user = new User($_SESSION['user']);
- if (!$user->is_active())
- {
+ if (!$user->is_active()) {
User::logout();
}
- if (!isset($_GET['do'])){
+ if (!isset($_GET['do'])) {
$do = "";
- }else{
+ } else {
$do = $_GET['do'];
}
@@ -98,17 +83,17 @@ else{
case 'change-email':
$user = new User($_GET['id']);
$user->change_email();
- case 'user':
- require_once("user.php");
- break;
+ case 'user':
+ require_once("user.php");
+ break;
- case 'settings':
- require_once("settings.php");
- break;
+ case 'settings':
+ require_once("settings.php");
+ break;
- case 'new-user':
- require_once("new-user.php");
- break;
+ case 'new-user':
+ require_once("new-user.php");
+ break;
case 'new-service':
case 'edit-service':
@@ -128,9 +113,9 @@ else{
User::logout();
break;
- default:
- require_once("dashboard.php");
- break;
+ default:
+ require_once("dashboard.php");
+ break;
}
Template::render_footer(true);
diff --git a/admin/login-form.php b/admin/login-form.php
index f4ef6f9..b166bae 100644
--- a/admin/login-form.php
+++ b/admin/login-form.php
@@ -1,32 +1,42 @@
-
-
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/admin/options.php b/admin/options.php
index 3ebdb16..45699de 100644
--- a/admin/options.php
+++ b/admin/options.php
@@ -1,15 +1,14 @@
getBooleanSetting($mysqli, "notifyUpdates");
- $emailSubscription_status = $db->getBooleanSetting($mysqli, "subscribe_email");
- $telegramSubscription_status = $db->getBooleanSetting($mysqli, "subscribe_telegram");
- $tg_bot_api_token = $db->getSetting($mysqli, "tg_bot_api_token");
- $tg_bot_username = $db->getSetting($mysqli, "tg_bot_username");
- $php_mailer_status = $db->getBooleanSetting($mysqli, "php_mailer");
- $php_mailer_smtp_status = $db->getBooleanSetting($mysqli, "php_mailer_smtp");
- $php_mailer_secure_status = $db->getBooleanSetting($mysqli, "php_mailer_secure");
- $php_mailer_path = $db->getSetting($mysqli, "php_mailer_path");
- $php_mailer_host = $db->getSetting($mysqli, "php_mailer_host");
- $php_mailer_port = $db->getSetting($mysqli, "php_mailer_port");
- $php_mailer_user = $db->getSetting($mysqli, "php_mailer_user");
- $php_mailer_pass = $db->getSetting($mysqli, "php_mailer_pass");
- $cron_server_ip = $db->getSetting($mysqli, "cron_server_ip");
- $google_rechaptcha_status = $db->getBooleanSetting($mysqli, "google_recaptcha");
- $google_recaptcha_sitekey = $db->getSetting($mysqli, "google_recaptcha_sitekey");
- $google_recaptcha_secret = $db->getSetting($mysqli, "google_recaptcha_secret");
+$db = new SSDB();
+$notifyUpdates_status = $db->getBooleanSetting($mysqli, "notifyUpdates");
+$emailSubscription_status = $db->getBooleanSetting($mysqli, "subscribe_email");
+$telegramSubscription_status = $db->getBooleanSetting($mysqli, "subscribe_telegram");
+$tg_bot_api_token = $db->getSetting($mysqli, "tg_bot_api_token");
+$tg_bot_username = $db->getSetting($mysqli, "tg_bot_username");
+$php_mailer_status = $db->getBooleanSetting($mysqli, "php_mailer");
+$php_mailer_smtp_status = $db->getBooleanSetting($mysqli, "php_mailer_smtp");
+$php_mailer_secure_status = $db->getBooleanSetting($mysqli, "php_mailer_secure");
+$php_mailer_path = $db->getSetting($mysqli, "php_mailer_path");
+$php_mailer_host = $db->getSetting($mysqli, "php_mailer_host");
+$php_mailer_port = $db->getSetting($mysqli, "php_mailer_port");
+$php_mailer_user = $db->getSetting($mysqli, "php_mailer_user");
+$php_mailer_pass = $db->getSetting($mysqli, "php_mailer_pass");
+$cron_server_ip = $db->getSetting($mysqli, "cron_server_ip");
+$google_rechaptcha_status = $db->getBooleanSetting($mysqli, "google_recaptcha");
+$google_recaptcha_sitekey = $db->getSetting($mysqli, "google_recaptcha_sitekey");
+$google_recaptcha_secret = $db->getSetting($mysqli, "google_recaptcha_secret");
- $db->getSetting($mysqli, "");
- $set_post = false;
- if(!empty($_POST)){
- $db->updateSetting($mysqli, "notifyUpdates", getToggle($_POST["nu_toggle"]));
- $db->updateSetting($mysqli, "name",htmlspecialchars($_POST["sitename"], ENT_QUOTES));
- $db->updateSetting($mysqli, "subscribe_email", getToggle($_POST["email_subscription_toggle"]));
- $db->updateSetting($mysqli, "subscribe_telegram", getToggle($_POST["telegram_subscription_toggle"]));
- $db->updateSetting($mysqli, "tg_bot_api_token", htmlspecialchars($_POST["tg_bot_api_token"], ENT_QUOTES));
- $db->updateSetting($mysqli, "tg_bot_username", htmlspecialchars($_POST["tg_bot_username"], ENT_QUOTES));
- $db->updateSetting($mysqli, "php_mailer", getToggle($_POST["php_mailer_toggle"]));
- $db->updateSetting($mysqli, "php_mailer_smtp", getToggle($_POST["php_mailer_smtp_toggle"]));
- $db->updateSetting($mysqli, "php_mailer_secure", getToggle($_POST["php_mailer_secure_toggle"]));
- $db->updateSetting($mysqli, "php_mailer_path", htmlspecialchars($_POST["php_mailer_path"], ENT_QUOTES));
- $db->updateSetting($mysqli, "php_mailer_host", htmlspecialchars($_POST["php_mailer_host"], ENT_QUOTES));
- $db->updateSetting($mysqli, "php_mailer_port", htmlspecialchars($_POST["php_mailer_port"], ENT_QUOTES));
- $db->updateSetting($mysqli, "php_mailer_user", htmlspecialchars($_POST["php_mailer_user"], ENT_QUOTES));
- $db->updateSetting($mysqli, "php_mailer_pass", htmlspecialchars($_POST["php_mailer_pass"], ENT_QUOTES));
- $db->updateSetting($mysqli, "cron_server_ip", htmlspecialchars($_POST["cron_server_ip"], ENT_QUOTES));
- $db->updateSetting($mysqli, "google_recaptcha", getToggle($_POST["google_rechaptcha_toggle"]));
- $db->updateSetting($mysqli, "google_recaptcha_sitekey", htmlspecialchars($_POST["google_recaptcha_sitekey"], ENT_QUOTES));
- $db->updateSetting($mysqli, "google_recaptcha_secret", htmlspecialchars($_POST["google_recaptcha_secret"], ENT_QUOTES));
+$db->getSetting($mysqli, "");
+$set_post = false;
+if (!empty($_POST)) {
+ $db->updateSetting($mysqli, "notifyUpdates", getToggle($_POST["nu_toggle"]));
+ $db->updateSetting($mysqli, "name", htmlspecialchars($_POST["sitename"], ENT_QUOTES));
+ $db->updateSetting($mysqli, "subscribe_email", getToggle($_POST["email_subscription_toggle"]));
+ $db->updateSetting($mysqli, "subscribe_telegram", getToggle($_POST["telegram_subscription_toggle"]));
+ $db->updateSetting($mysqli, "tg_bot_api_token", htmlspecialchars($_POST["tg_bot_api_token"], ENT_QUOTES));
+ $db->updateSetting($mysqli, "tg_bot_username", htmlspecialchars($_POST["tg_bot_username"], ENT_QUOTES));
+ $db->updateSetting($mysqli, "php_mailer", getToggle($_POST["php_mailer_toggle"]));
+ $db->updateSetting($mysqli, "php_mailer_smtp", getToggle($_POST["php_mailer_smtp_toggle"]));
+ $db->updateSetting($mysqli, "php_mailer_secure", getToggle($_POST["php_mailer_secure_toggle"]));
+ $db->updateSetting($mysqli, "php_mailer_path", htmlspecialchars($_POST["php_mailer_path"], ENT_QUOTES));
+ $db->updateSetting($mysqli, "php_mailer_host", htmlspecialchars($_POST["php_mailer_host"], ENT_QUOTES));
+ $db->updateSetting($mysqli, "php_mailer_port", htmlspecialchars($_POST["php_mailer_port"], ENT_QUOTES));
+ $db->updateSetting($mysqli, "php_mailer_user", htmlspecialchars($_POST["php_mailer_user"], ENT_QUOTES));
+ $db->updateSetting($mysqli, "php_mailer_pass", htmlspecialchars($_POST["php_mailer_pass"], ENT_QUOTES));
+ $db->updateSetting($mysqli, "cron_server_ip", htmlspecialchars($_POST["cron_server_ip"], ENT_QUOTES));
+ $db->updateSetting($mysqli, "google_recaptcha", getToggle($_POST["google_rechaptcha_toggle"]));
+ $db->updateSetting($mysqli, "google_recaptcha_sitekey", htmlspecialchars($_POST["google_recaptcha_sitekey"], ENT_QUOTES));
+ $db->updateSetting($mysqli, "google_recaptcha_secret", htmlspecialchars($_POST["google_recaptcha_secret"], ENT_QUOTES));
- $set_post = true;
- /*if($nu_toggle == "yes"){
+ $set_post = true;
+ /*if($nu_toggle == "yes"){
$notifyUpdates_status = true;
} else {
$notifyUpdates_status = false;
}*/
- // TODO - Reload page to prevent showing old values! or update variables being displayed
- header("Location: " .$uri = $_SERVER['REQUEST_URI']);
- // TODO - The code below will not happen ...
+ // TODO - Reload page to prevent showing old values! or update variables being displayed
+ header("Location: " . $uri = $_SERVER['REQUEST_URI']);
+ // TODO - The code below will not happen ...
- /*define("NAME", $db->getSetting($mysqli,"name"));
+ /*define("NAME", $db->getSetting($mysqli,"name"));
define("TITLE", $db->getSetting($mysqli,"title"));
define("WEB_URL", $db->getSetting($mysqli,"url"));
define("MAILER_NAME", $db->getSetting($mysqli,"mailer"));
@@ -92,92 +91,119 @@ else{
define("PHP_MAILER_PASS", $db->getSetting($mysqli,"php_mailer_pass"));
define("CRON_SERVER_IP", $db->getSetting($mysqli,"cron_server_ip"));
*/
- }
- Template::render_header(_("Options"), true);
+}
+Template::render_header(_("Options"), "options", true);
?>
-
+
-