diff --git a/include/functions.php b/include/functions.php index 91579d1..f72ae84 100644 --- a/include/functions.php +++ b/include/functions.php @@ -51,6 +51,13 @@ function getDMRNetwork() { return $network; } +function getDMRNetwork2() { + $fp = fopen('../config/DMRNetwork.txt', 'r'); + $network = fread($fp, filesize("../config/DMRNetwork.txt")); + fclose($fp); + return $network; +} + function getDMRMasterState() { $logPath = MMDVMLOGPATH."/".MMDVMLOGPREFIX."-".date("Y-m-d").".log"; $logLines = explode("\n", `egrep -h "(DMR, Logged into the master successfully)|(DMR, Closing DMR Network)" $logPath`); diff --git a/index.php b/index.php index 8d3f8d0..9ab6723 100644 --- a/index.php +++ b/index.php @@ -53,9 +53,20 @@ include "version.php"; } ?> - + diff --git a/scripts/switchnetwork.php b/scripts/switchnetwork.php index e755673..c299d22 100644 --- a/scripts/switchnetwork.php +++ b/scripts/switchnetwork.php @@ -70,7 +70,7 @@ if ($_GET['network'] == "BRANDMEISTER") { // exec( "sudo killall MMDVMHost && sudo ".MMDVMHOSTPATH."/MMDVMHost ".MMDVMINIPATH."/".MMDVMINIFILENAME." &" ); } ?> - +
diff --git a/setup.php b/setup.php index 3f27214..3f1cd55 100644 --- a/setup.php +++ b/setup.php @@ -185,6 +185,14 @@ get_tz_options(constant("TIMEZONE"), "Timezone", ''); " name="LOGO" class="form-control" placeholder="http://your-logo" aria-describedby="LOGO">
+
+ + " name="DMRPLUSLOGO" class="form-control" placeholder="http://your-logo" aria-describedby="DMRPLUSLOGO"> +
+
+ + " name="BRANDMEISTERLOGO" class="form-control" placeholder="http://your-logo" aria-describedby="BRANDMEISTERLOGO"> +
Refresh page after in seconds " name="REFRESHAFTER" class="form-control" placeholder="60" aria-describedby="REFRESHAFTER" required data-fv-notempty-message="Value is required"> diff --git a/version.php b/version.php index e6a2aa5..871de3d 100644 --- a/version.php +++ b/version.php @@ -1,3 +1,3 @@