mirror of
https://github.com/ShaYmez/FreeSTAR-Status-Engine.git
synced 2026-06-02 06:04:44 -04:00
Revert "Merge branch 'dev' into master"
This reverts commit18b89e8c35, reversing changes made to81132e9ccf.
This commit is contained in:
+3
-68
@@ -7,58 +7,7 @@ if (!file_exists("../config.php"))
|
||||
else{
|
||||
require_once("../config.php");
|
||||
require_once("../classes/constellation.php");
|
||||
require_once("../classes/mailer.php");
|
||||
require_once("../classes/notification.php");
|
||||
require_once("../template.php");
|
||||
require_once("../libs/parsedown/Parsedown.php");
|
||||
require_once("../classes/queue.php");
|
||||
require_once("../classes/db-class.php");
|
||||
$db = new SSDB();
|
||||
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"));
|
||||
define("GOOGLE_RECAPTCHA_SITEKEY", $db->getSetting($mysqli, "google_recaptcha_sitekey"));
|
||||
define("SUBSCRIBE_EMAIL", $db->getBooleanSetting($mysqli, "subscribe_email"));
|
||||
define("SUBSCRIBE_TELEGRAM", $db->getBooleanSetting($mysqli, "subscribe_telegram"));
|
||||
define("TG_BOT_USERNAME", $db->getSetting($mysqli, "tg_bot_username"));
|
||||
define("TG_BOT_API_TOKEN", $db->getSetting($mysqli, "tg_bot_api_token"));
|
||||
define("PHP_MAILER", $db->getBooleanSetting($mysqli, "php_mailer"));
|
||||
define("PHP_MAILER_SMTP", $db->getBooleanSetting($mysqli, "php_mailer_smtp"));
|
||||
define("PHP_MAILER_PATH", $db->getSetting($mysqli, "php_mailer_path"));
|
||||
define("PHP_MAILER_HOST", $db->getSetting($mysqli, "php_mailer_host"));
|
||||
define("PHP_MAILER_PORT", $db->getSetting($mysqli, "php_mailer_port"));
|
||||
define("PHP_MAILER_SECURE", $db->getBooleanSetting($mysqli, "php_mailer_secure"));
|
||||
define("PHP_MAILER_USER", $db->getSetting($mysqli, "php_mailer_user"));
|
||||
define("PHP_MAILER_PASS", $db->getSetting($mysqli, "php_mailer_pass"));
|
||||
define("CRON_SERVER_IP", $db->getSetting($mysqli, "cron_server_ip"));
|
||||
|
||||
// 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 )
|
||||
{
|
||||
Queue::process_queue();
|
||||
}
|
||||
}
|
||||
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(isset($_COOKIE['user'])&&!isset($_SESSION['user']))
|
||||
{
|
||||
@@ -80,7 +29,7 @@ else{
|
||||
require_once("login-form.php");
|
||||
}
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
$user = new User($_SESSION['user']);
|
||||
if (!$user->is_active())
|
||||
@@ -101,7 +50,7 @@ else{
|
||||
case 'user':
|
||||
require_once("user.php");
|
||||
break;
|
||||
|
||||
|
||||
case 'settings':
|
||||
require_once("settings.php");
|
||||
break;
|
||||
@@ -110,20 +59,6 @@ else{
|
||||
require_once("new-user.php");
|
||||
break;
|
||||
|
||||
case 'new-service':
|
||||
case 'edit-service':
|
||||
require_once('service.php');
|
||||
break;
|
||||
|
||||
case 'new-service-group':
|
||||
case 'edit-service-group':
|
||||
require_once('service-group.php');
|
||||
break;
|
||||
|
||||
case 'options':
|
||||
require_once("options.php");
|
||||
break;
|
||||
|
||||
case 'logout':
|
||||
User::logout();
|
||||
break;
|
||||
@@ -135,4 +70,4 @@ else{
|
||||
|
||||
Template::render_footer(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user