From e1352f303739dcbcefa36c6f19a559d9a5185e28 Mon Sep 17 00:00:00 2001
From: Kim Huebel <dg9vh@darc.de>
Date: Fri, 22 Sep 2017 15:49:32 +0000
Subject: [PATCH] Again some bugfixing on switch-scripts

---
 scripts/switchnetwork.php      | 10 ++++++++--
 scripts/switchreflector.php    |  9 ++++++++-
 scripts/switchysfreflector.php | 11 +++++++++--
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/scripts/switchnetwork.php b/scripts/switchnetwork.php
index cc79f3e..c04bc4c 100644
--- a/scripts/switchnetwork.php
+++ b/scripts/switchnetwork.php
@@ -10,7 +10,14 @@ include "../config/config.php";
 include("../config/networks.php");
 include "../include/tools.php";
 include "../include/functions.php";
-include "../include/init.php";
+
+//Some basic inits
+$mmdvmconfigs = getMMDVMConfig();
+if (!defined("MMDVMLOGPREFIX"))
+   define("MMDVMLOGPREFIX", getConfigItem("Log", "FileRoot", $mmdvmconfigs));
+if (!defined("TIMEZONE"))
+   define("TIMEZONE", "UTC");
+
 if (!isset($_SERVER['PHP_AUTH_USER']) && SWITCHNETWORKUSER !== "" && SWITCHNETWORKPW !== "") {
     header('WWW-Authenticate: Basic realm="Dashboard"');
     header('HTTP/1.0 401 Unauthorized');
@@ -53,7 +60,6 @@ if (!isset($_SERVER['PHP_AUTH_USER']) && SWITCHNETWORKUSER !== "" && SWITCHNETWO
 </div>
 <?php
 checkSetup();
-//include "../include/sysinfo_ajax.php";
 if (defined("JSONNETWORK")) {
   $netname = $_GET['network'];
   $key = recursive_array_search($netname,$networks);
diff --git a/scripts/switchreflector.php b/scripts/switchreflector.php
index 895ba9a..027672a 100644
--- a/scripts/switchreflector.php
+++ b/scripts/switchreflector.php
@@ -9,7 +9,14 @@ $start = $time;
 include "../config/config.php";
 include "../include/tools.php";
 include "../include/functions.php";
-include "../include/init.php";
+
+//Some basic inits
+$mmdvmconfigs = getMMDVMConfig();
+if (!defined("MMDVMLOGPREFIX"))
+   define("MMDVMLOGPREFIX", getConfigItem("Log", "FileRoot", $mmdvmconfigs));
+if (!defined("TIMEZONE"))
+   define("TIMEZONE", "UTC");
+
 if (!isset($_SERVER['PHP_AUTH_USER']) && SWITCHNETWORKUSER !== "" && SWITCHNETWORKPW !== "") {
     header('WWW-Authenticate: Basic realm="Dashboard"');
     header('HTTP/1.0 401 Unauthorized');
diff --git a/scripts/switchysfreflector.php b/scripts/switchysfreflector.php
index 2a12de4..3fe5174 100644
--- a/scripts/switchysfreflector.php
+++ b/scripts/switchysfreflector.php
@@ -9,7 +9,14 @@ $start = $time;
 include "../config/config.php";
 include "../include/tools.php";
 include "../include/functions.php";
-include "../include/init.php";
+
+//Some basic inits
+$mmdvmconfigs = getMMDVMConfig();
+if (!defined("MMDVMLOGPREFIX"))
+   define("MMDVMLOGPREFIX", getConfigItem("Log", "FileRoot", $mmdvmconfigs));
+if (!defined("TIMEZONE"))
+   define("TIMEZONE", "UTC");
+
 if (!isset($_SERVER['PHP_AUTH_USER']) && SWITCHNETWORKUSER !== "" && SWITCHNETWORKPW !== "") {
     header('WWW-Authenticate: Basic realm="Dashboard"');
     header('HTTP/1.0 401 Unauthorized');
@@ -53,7 +60,7 @@ if (!isset($_SERVER['PHP_AUTH_USER']) && SWITCHNETWORKUSER !== "" && SWITCHNETWO
 <?php
 $reflektor_nr=$_GET['reflector'];
 checkSetup();
-include "../include/sysinfo.php";
+
 exec( "sudo /bin/sed '/#Startup=/d' -i ".YSFGATEWAYINIPATH."/".YSFGATEWAYINIFILENAME);
 exec( "sudo /bin/sed 's/Startup=.*$/Startup=".$reflektor_nr."/' -i ".YSFGATEWAYINIPATH."/".YSFGATEWAYINIFILENAME);
 exec( REBOOTYSFGATEWAY );