Merge pull request #101 from pjao/master
Talker Alias - Putting back callsign - Only printable characters
This commit is contained in:
commit
dffdab8165
1 changed files with 19 additions and 18 deletions
|
@ -197,6 +197,7 @@ function getShortMMDVMLog() {
|
||||||
// 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|Alias|0000" $logPath | tail -20`);
|
$logLines = explode("\n", `egrep -h "from|end|watchdog|lost|Alias|0000" $logPath | tail -20`);
|
||||||
|
|
||||||
return $logLines;
|
return $logLines;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -261,9 +262,10 @@ function getHeardList($logLines, $onlyLast) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(strpos($logLine, "0000") > 0){
|
if(strpos($logLine, "0000")){
|
||||||
$decodedAlias = decodeAlias($logLine);
|
$decodedAlias = $decodedAlias = preg_replace('/[\x00-\x1F\x7F-\xA0\xAD]/u', '', decodeAlias($logLine));
|
||||||
if ($decodedAlias == "" && $alias == "") $decodedAlias="---";
|
if ($decodedAlias == "" && $alias == "") $decodedAlias="---";
|
||||||
|
else if ($alias!="---") $alias = str_replace("---", "", $alias);
|
||||||
if ($alias == "")
|
if ($alias == "")
|
||||||
$alias = $decodedAlias;
|
$alias = $decodedAlias;
|
||||||
else
|
else
|
||||||
|
@ -428,14 +430,14 @@ function getHeardList($logLines, $onlyLast) {
|
||||||
$loss = $ts1loss;
|
$loss = $ts1loss;
|
||||||
$ber = $ts1ber;
|
$ber = $ts1ber;
|
||||||
$rssi = $ts1rssi;
|
$rssi = $ts1rssi;
|
||||||
$alias = $ts1alias;
|
// $alias = $ts1alias;
|
||||||
break;
|
break;
|
||||||
case "DMR Slot 2":
|
case "DMR Slot 2":
|
||||||
$duration = $ts2duration;
|
$duration = $ts2duration;
|
||||||
$loss = $ts2loss;
|
$loss = $ts2loss;
|
||||||
$ber = $ts2ber;
|
$ber = $ts2ber;
|
||||||
$rssi = $ts2rssi;
|
$rssi = $ts2rssi;
|
||||||
$alias = $ts2alias;
|
// $alias = $ts2alias;
|
||||||
break;
|
break;
|
||||||
case "YSF":
|
case "YSF":
|
||||||
$duration = $ysfduration;
|
$duration = $ysfduration;
|
||||||
|
@ -831,8 +833,9 @@ function getName($callsign) {
|
||||||
// M: 2017-02-13 15:53:31.253 0000: 05 00 20 47 69 6F 76 61 DC *.. Giova.*
|
// M: 2017-02-13 15:53:31.253 0000: 05 00 20 47 69 6F 76 61 DC *.. Giova.*
|
||||||
function decodeAlias($logLine) {
|
function decodeAlias($logLine) {
|
||||||
if (substr($logLine, 34, 2) !=="04")
|
if (substr($logLine, 34, 2) !=="04")
|
||||||
{
|
|
||||||
$tok1 = encode(substr($logLine, 40, 2));
|
$tok1 = encode(substr($logLine, 40, 2));
|
||||||
|
else
|
||||||
|
$tok1 = "";
|
||||||
$tok2 = encode(substr($logLine, 43, 2));
|
$tok2 = encode(substr($logLine, 43, 2));
|
||||||
$tok3 = encode(substr($logLine, 46, 2));
|
$tok3 = encode(substr($logLine, 46, 2));
|
||||||
$tok4 = encode(substr($logLine, 49, 2));
|
$tok4 = encode(substr($logLine, 49, 2));
|
||||||
|
@ -841,6 +844,4 @@ function decodeAlias($logLine) {
|
||||||
$tok7 = encode(dechex(hexdec(substr($logLine, 58, 2))/2));
|
$tok7 = encode(dechex(hexdec(substr($logLine, 58, 2))/2));
|
||||||
return $tok1.$tok2.$tok3.$tok4.$tok5.$tok6.$tok7;
|
return $tok1.$tok2.$tok3.$tok4.$tok5.$tok6.$tok7;
|
||||||
}
|
}
|
||||||
return;
|
|
||||||
}
|
|
||||||
?>
|
?>
|
||||||
|
|
Loading…
Reference in a new issue