From 2e367cbbd8a330e890b53b60b28ea9f5edffc6d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kim=20H=C3=BCbel?= Date: Fri, 30 Oct 2020 13:27:48 +0000 Subject: [PATCH] Removed DStar-ID collumn if MMDVMHost not D-Star enabled --- include/functions.php | 18 ++++++++++++----- include/lh_ajax.php | 4 ++++ include/localtx_ajax.php | 4 ++++ include/txinfo.php | 4 ++++ txinfo.php | 42 +++++++++++++++++++++++++++------------- version.php | 2 +- 6 files changed, 55 insertions(+), 19 deletions(-) diff --git a/include/functions.php b/include/functions.php index 7d10a73..bea630c 100644 --- a/include/functions.php +++ b/include/functions.php @@ -247,7 +247,7 @@ function getMMDVMLog() { // Open Logfile and copy loglines into LogLines-Array() $logPath = MMDVMLOGPATH."/".MMDVMLOGPREFIX."-".date("Y-m-d").".log"; //$logLines = explode("\n", `egrep -h "from|end|watchdog|lost|POCSAG" $logPath`); - $logLines = explode("\n", `egrep -h "from|watchdog|lost|POCSAG" $logPath`); + $logLines = explode("\n", `egrep -h "from|end|watchdog|lost|POCSAG" $logPath`); return $logLines; } @@ -593,18 +593,26 @@ function getHeardList($logLines, $onlyLast) { if ( strlen($callsign) < 11 ) { $name = ""; if (defined("ENABLEXTDLOOKUP")) { - array_push($heardList, array(convertTimezone($timestamp), $mode, $callsign, $name, $id, $target, $source, $duration, $loss, $ber, $rssi, $alias)); + if (getEnabled("D-Star", $mmdvmconfigs) == 1) { + array_push($heardList, array(convertTimezone($timestamp), $mode, $callsign, $name, $id, $target, $source, $duration, $loss, $ber, $rssi, $alias)); + } else { + array_push($heardList, array(convertTimezone($timestamp), $mode, $callsign, $name, $target, $source, $duration, $loss, $ber, $rssi, $alias)); + } $alias = ""; } else { - array_push($heardList, array(convertTimezone($timestamp), $mode, $callsign, $id, $target, $source, $duration, $loss, $ber, $rssi, $alias)); + if (getEnabled("D-Star", $mmdvmconfigs) == 1) { + array_push($heardList, array(convertTimezone($timestamp), $mode, $callsign, $id, $target, $source, $duration, $loss, $ber, $rssi, $alias)); + } else { + array_push($heardList, array(convertTimezone($timestamp), $mode, $callsign, $target, $source, $duration, $loss, $ber, $rssi, $alias)); + } $alias = ""; - }/* + } $duration = ""; $loss = ""; $ber = ""; $rssi = ""; $ts1alias = "---"; - $ts2alias = "---";*/ + $ts2alias = "---"; if ($onlyLast && count($heardList )> 20) { return $heardList; } diff --git a/include/lh_ajax.php b/include/lh_ajax.php index d22f52b..2589cdc 100644 --- a/include/lh_ajax.php +++ b/include/lh_ajax.php @@ -29,8 +29,12 @@ exec("wc -l ".DMRIDDATPATH." | cut -f1 -d' '", $output2); + diff --git a/include/localtx_ajax.php b/include/localtx_ajax.php index 24a1a33..1892d50 100644 --- a/include/localtx_ajax.php +++ b/include/localtx_ajax.php @@ -19,8 +19,12 @@ $totalLH = count($lastHeard); + diff --git a/include/txinfo.php b/include/txinfo.php index b02098d..650bb5d 100644 --- a/include/txinfo.php +++ b/include/txinfo.php @@ -21,8 +21,12 @@ + diff --git a/txinfo.php b/txinfo.php index 72ea550..f36d7db 100644 --- a/txinfo.php +++ b/txinfo.php @@ -26,26 +26,42 @@ foreach ($lastHeard as $listElem) { // echo""; - if (defined("ENABLEXTDLOOKUP") && $listElem[7] == null && $listElem[1] != "POCSAG" || !defined("ENABLEXTDLOOKUP") && $listElem[6] == null && $listElem[1] != "POCSAG" ) { + if (getEnabled("D-Star", $mmdvmconfigs) == 1 && defined("ENABLEXTDLOOKUP") && $listElem[7] == null && $listElem[1] != "POCSAG" || !defined("ENABLEXTDLOOKUP") && $listElem[6] == null && $listElem[1] != "POCSAG" || \ + getEnabled("D-Star", $mmdvmconfigs) == 0 && defined("ENABLEXTDLOOKUP") && $listElem[6] == null && $listElem[1] != "POCSAG" || !defined("ENABLEXTDLOOKUP") && $listElem[5] == null && $listElem[1] != "POCSAG" ) { echo ""; echo"$listElem[0]"; echo"$listElem[1]"; echo"$listElem[2]"; if (defined("ENABLEXTDLOOKUP")) { echo"$listElem[3]"; - if (defined("TALKERALIAS")) - echo"$listElem[11]"; - echo"$listElem[4]"; - echo"$listElem[5]"; - if ($listElem[6] == "RF"){ - echo "RF"; - }else{ - echo"$listElem[6]"; + if (getEnabled("D-Star", $mmdvmconfigs) == 1) { + if (defined("TALKERALIAS")) + echo"$listElem[11]"; + echo"$listElem[4]"; + echo"$listElem[5]"; + if ($listElem[6] == "RF"){ + echo "RF"; + }else{ + echo"$listElem[6]"; + } + $d1 = new DateTime($listElem[0], new DateTimeZone(TIMEZONE)); + $d2 = new DateTime('now', new DateTimeZone(TIMEZONE)); + $diff = $d2->getTimestamp() - $d1->getTimestamp(); + echo"$diff s"; + } else { + if (defined("TALKERALIAS")) + echo"$listElem[10]"; + echo"$listElem[4]"; + if ($listElem[5] == "RF"){ + echo "RF"; + }else{ + echo"$listElem[5]"; + } + $d1 = new DateTime($listElem[0], new DateTimeZone(TIMEZONE)); + $d2 = new DateTime('now', new DateTimeZone(TIMEZONE)); + $diff = $d2->getTimestamp() - $d1->getTimestamp(); + echo"$diff s"; } - $d1 = new DateTime($listElem[0], new DateTimeZone(TIMEZONE)); - $d2 = new DateTime('now', new DateTimeZone(TIMEZONE)); - $diff = $d2->getTimestamp() - $d1->getTimestamp(); - echo"$diff s"; } else { if (defined("TALKERALIAS")) echo"$listElem[10]"; diff --git a/version.php b/version.php index f7c4466..0be8cf7 100644 --- a/version.php +++ b/version.php @@ -1,3 +1,3 @@