From b39624131c2e4c42ad10bc77548101af385213c5 Mon Sep 17 00:00:00 2001
From: dg9vh <kim@huebel-online.de>
Date: Wed, 26 Oct 2016 12:59:55 +0000
Subject: [PATCH] removed MMDVMLOGPREFIX from setup, fetching it from MMDVM.ini

---
 ajax.php         | 1 +
 include/init.php | 2 ++
 setup.php        | 4 ----
 txinfo.php       | 1 +
 version.php      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ajax.php b/ajax.php
index f20af34..9bc0d3a 100644
--- a/ajax.php
+++ b/ajax.php
@@ -7,6 +7,7 @@ include "include/tools.php";
 include "include/functions.php";
 
 $mmdvmconfigs = getMMDVMConfig();
+define("MMDVMLOGPREFIX", getConfigItem("Log", "FileRoot", $mmdvmconfigs));
 $logLinesMMDVM = getMMDVMLog();
 $reverseLogLinesMMDVM = $logLinesMMDVM;
 array_multisort($reverseLogLinesMMDVM,SORT_DESC);
diff --git a/include/init.php b/include/init.php
index 5e114a7..2d38351 100644
--- a/include/init.php
+++ b/include/init.php
@@ -1,6 +1,8 @@
 <?php
 //Some basic inits
 $mmdvmconfigs = getMMDVMConfig();
+define("MMDVMLOGPREFIX", getConfigItem("Log", "FileRoot", $mmdvmconfigs));
+echo MMDVMLOGPREFIX;
 $logLinesMMDVM = getMMDVMLog();
 showLapTime("getMMDVMLog");
 //getNames(" ");
diff --git a/setup.php b/setup.php
index 144eedf..3c0f2ef 100644
--- a/setup.php
+++ b/setup.php
@@ -58,10 +58,6 @@ include "include/tools.php";
         <span class="input-group-addon" id="MMDVMLOGPATH" style="width: 300px">Path to MMDVMHost-logfile</span>
         <input type="text" value="<?php echo constant("MMDVMLOGPATH") ?>" name="MMDVMLOGPATH" class="form-control" placeholder="/var/log/mmdvm/" aria-describedby="MMDVMLOGPATH" required data-fv-notempty-message="Value is required">
       </div>
-      <div class="input-group">
-        <span class="input-group-addon" id="MMDVMLOGPREFIX" style="width: 300px">Logfile-prefix</span>
-        <input type="text" value="<?php echo constant("MMDVMLOGPREFIX") ?>" name="MMDVMLOGPREFIX" class="form-control" placeholder="MMDVM" aria-describedby="MMDVMLOGPREFIX" required data-fv-notempty-message="Value is required">
-      </div>
       <div class="input-group">
         <span class="input-group-addon" id="MMDVMINIPATH" style="width: 300px">Path to MMDVM.ini</span>
         <input type="text" value="<?php echo constant("MMDVMINIPATH") ?>" name="MMDVMINIPATH" class="form-control" placeholder="/etc/mmdvm/" aria-describedby="MMDVMINIPATH" required data-fv-notempty-message="Value is required">
diff --git a/txinfo.php b/txinfo.php
index 99ae174..7d4e4f0 100644
--- a/txinfo.php
+++ b/txinfo.php
@@ -6,6 +6,7 @@ include "config/config.php";
 include "include/tools.php";
 include "include/functions.php";
 $mmdvmconfigs = getMMDVMConfig();
+define("MMDVMLOGPREFIX", getConfigItem("Log", "FileRoot", $mmdvmconfigs));
 $logLinesMMDVM = getShortMMDVMLog();
 $reverseLogLinesMMDVM = $logLinesMMDVM;
 array_multisort($reverseLogLinesMMDVM,SORT_DESC);
diff --git a/version.php b/version.php
index 6caf628..f5ec75a 100644
--- a/version.php
+++ b/version.php
@@ -1,3 +1,3 @@
 <?php
-define("VERSION", "20161025-2");
+define("VERSION", "20161026-1");
 ?>