klaute/MMDVMHost-Dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed double display of local transmissions.

Browse source
This commit is contained in:
Kim Hübel 2020-10-29 22:00:16 +00:00
parent 62b6fbdb79
commit 35c2980280
3 changed files with 81 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ajax.php
View file

@ -111,7 +111,7 @@ if ($_GET['section'] == "localTx") {
$call_canon = substr($call_canon, 0, strpos($call_canon, "-")); $call_canon = substr($call_canon, 0, strpos($call_canon, "-"));
} }
if (defined("ENABLEXTDLOOKUP")) { if (defined("ENABLEXTDLOOKUP")) {
$listElem[11] =""; //$listElem[11] ="";
if ($listElem[6] == "RF" && ($listElem[1]=="D-Star" || startsWith($listElem[1], "DMR") || $listElem[1]=="YSF" || $listElem[1]=="P25" || $listElem[1]=="NXDN")) { if ($listElem[6] == "RF" && ($listElem[1]=="D-Star" || startsWith($listElem[1], "DMR") || $listElem[1]=="YSF" || $listElem[1]=="P25" || $listElem[1]=="NXDN")) {
$listElem[3] = getName($call_canon); $listElem[3] = getName($call_canon);
if ($listElem[2] !== "??????????") { if ($listElem[2] !== "??????????") {
@ -126,9 +126,10 @@ if ($_GET['section'] == "localTx") {
} }
} }
array_push($lastHeard, $listElem); array_push($lastHeard, $listElem);
$oldListElem = $listElem;
} }
} else { } else {
$listElem[10] =""; //$listElem[10] ="";
if ($listElem[5] == "RF" && ($listElem[1]=="D-Star" || startsWith($listElem[1], "DMR") || $listElem[1]=="YSF" || $listElem[1]=="P25" || $listElem[1]=="NXDN")) { if ($listElem[5] == "RF" && ($listElem[1]=="D-Star" || startsWith($listElem[1], "DMR") || $listElem[1]=="YSF" || $listElem[1]=="P25" || $listElem[1]=="NXDN")) {
if ($listElem[2] !== "??????????") { if ($listElem[2] !== "??????????") {
if (!is_numeric($listElem[2])) { if (!is_numeric($listElem[2])) {

20
include/functions.php
View file

@ -246,7 +246,8 @@ function showMode($mode, $mmdvmconfigs) {
function getMMDVMLog() { function getMMDVMLog() {
// Open Logfile and copy loglines into LogLines-Array() // Open Logfile and copy loglines into LogLines-Array()
$logPath = MMDVMLOGPATH."/".MMDVMLOGPREFIX."-".date("Y-m-d").".log"; $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|end|watchdog|lost|POCSAG" $logPath`);
$logLines = explode("\n", `egrep -h "from|watchdog|lost|POCSAG" $logPath`);
return $logLines; return $logLines;
} }
@ -496,6 +497,9 @@ function getHeardList($logLines, $onlyLast) {
break; break;
} }
} }
} else {
if (!$onlyLast)
continue;
} }
$timestamp = substr($logLine, 3, 23); $timestamp = substr($logLine, 3, 23);
$mode = substr($logLine, 27, strpos($logLine,",") - 27); $mode = substr($logLine, 27, strpos($logLine,",") - 27);
@ -594,6 +598,16 @@ function getHeardList($logLines, $onlyLast) {
} else { } else {
array_push($heardList, array(convertTimezone($timestamp), $mode, $callsign, $id, $target, $source, $duration, $loss, $ber, $rssi, $alias)); array_push($heardList, array(convertTimezone($timestamp), $mode, $callsign, $id, $target, $source, $duration, $loss, $ber, $rssi, $alias));
$alias = ""; $alias = "";
}/*
$duration = "";
$loss = "";
$ber = "";
$rssi = "";
$ts1alias = "---";
$ts2alias = "---";*/
if ($onlyLast && count($heardList )> 20) {
return $heardList;
}
} }
$duration = ""; $duration = "";
$loss = ""; $loss = "";
@ -601,10 +615,6 @@ function getHeardList($logLines, $onlyLast) {
$rssi = ""; $rssi = "";
$ts1alias = "---"; $ts1alias = "---";
$ts2alias = "---"; $ts2alias = "---";
if ($onlyLast && count($heardList )> 20) {
return $heardList;
}
}
} }
return $heardList; return $heardList;
} }

2
version.php
View file

@ -1,3 +1,3 @@
<?php <?php
define("VERSION", "20200922-1 (".getGitVersion().")"); define("VERSION", "20201029-1 (".getGitVersion().")");
?> ?>