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

fixed name lookup

Browse source
This commit is contained in:
dg9vh 2016-10-09 15:29:55 +00:00
parent 2731c1b08e
commit 22df2ef377
2 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
include/functions.php
View file

@ -301,8 +301,11 @@ function getLastHeard($logLines, $onlyLast) {
if(!(array_search($listElem[2]."#".$listElem[1].$listElem[4], $heardCalls) > -1)) { if(!(array_search($listElem[2]."#".$listElem[1].$listElem[4], $heardCalls) > -1)) {
array_push($heardCalls, $listElem[2]."#".$listElem[1].$listElem[4]); array_push($heardCalls, $listElem[2]."#".$listElem[1].$listElem[4]);
$listElem[3] = getName($listElem[2]); if ($listElem[2] !== "??????????") {
$listElem[3] = getName($listElem[2]);
} else {
$listElem[3] = "---";
}
if (constant("SHOWQRZ") && $listElem[2] !== "??????????" && !is_numeric($listElem[2])) { if (constant("SHOWQRZ") && $listElem[2] !== "??????????" && !is_numeric($listElem[2])) {
$listElem[2] = "<a target=\"_new\" href=\"https://qrz.com/db/$listElem[2]\">".str_replace("0","&Oslash;",$listElem[2])."</a>"; $listElem[2] = "<a target=\"_new\" href=\"https://qrz.com/db/$listElem[2]\">".str_replace("0","&Oslash;",$listElem[2])."</a>";
} else { } else {
@ -574,18 +577,23 @@ function getName($callsign) {
if (is_numeric($callsign)) { if (is_numeric($callsign)) {
return "---"; return "---";
} }
$callsign = trim($callsign);
if (strpos($callsign,"-")) { if (file_exists(DMRIDDATPATH)) {
$callsign = substr($callsign,0,strpos($callsign,"-")); $callsign = trim($callsign);
} if (strpos($callsign,"-")) {
$delimiter =" "; $callsign = substr($callsign,0,strpos($callsign,"-"));
exec("grep -P '".$callsign.$delimiter."' ".DMRIDDATPATH, $output); }
if (count($output) == 0) { $delimiter =" ";
$delimiter = "\t";
exec("grep -P '".$callsign.$delimiter."' ".DMRIDDATPATH, $output); exec("grep -P '".$callsign.$delimiter."' ".DMRIDDATPATH, $output);
if (count($output) == 0) {
$delimiter = "\t";
exec("grep -P '".$callsign.$delimiter."' ".DMRIDDATPATH, $output);
}
$name = substr($output[0], strpos($output[0],$delimiter)+1);
$name = substr($name, strpos($name,$delimiter)+1);
return $name;
} else {
return "DMRIDs.dat not correct!";
} }
$name = substr($output[0], strpos($output[0],$delimiter)+1);
$name = substr($name, strpos($name,$delimiter)+1);
return $name;
} }
?> ?>

2
version.php
View file

@ -1,3 +1,3 @@
<?php <?php
define("VERSION", "20161008-2"); define("VERSION", "20161009-1");
?> ?>