From 22df2ef37792e47c5061faeff87e90f42a5fae4c Mon Sep 17 00:00:00 2001
From: dg9vh <kim@huebel-online.de>
Date: Sun, 9 Oct 2016 15:29:55 +0000
Subject: [PATCH] fixed name lookup

---
 include/functions.php | 34 +++++++++++++++++++++-------------
 version.php           |  2 +-
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/include/functions.php b/include/functions.php
index 8bb86a4..4ae69e1 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -301,8 +301,11 @@ function getLastHeard($logLines, $onlyLast) {
 			if(!(array_search($listElem[2]."#".$listElem[1].$listElem[4], $heardCalls) > -1)) {
 				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])) {
 					$listElem[2] = "<a target=\"_new\" href=\"https://qrz.com/db/$listElem[2]\">".str_replace("0","&Oslash;",$listElem[2])."</a>";
 				} else {
@@ -574,18 +577,23 @@ function getName($callsign) {
 	if (is_numeric($callsign)) {
 		return "---";
 	}
-	$callsign = trim($callsign);
-	if (strpos($callsign,"-")) {
-		$callsign = substr($callsign,0,strpos($callsign,"-"));
-	}
-	$delimiter =" ";
-	exec("grep -P '".$callsign.$delimiter."' ".DMRIDDATPATH, $output);
-	if (count($output) == 0) {
-		$delimiter = "\t";
+	
+	if (file_exists(DMRIDDATPATH)) {
+		$callsign = trim($callsign);
+		if (strpos($callsign,"-")) {
+			$callsign = substr($callsign,0,strpos($callsign,"-"));
+		}
+		$delimiter =" ";
 		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;
 }
 ?>
diff --git a/version.php b/version.php
index ed661c6..ca05280 100644
--- a/version.php
+++ b/version.php
@@ -1,3 +1,3 @@
 <?php
-define("VERSION", "20161008-2");
+define("VERSION", "20161009-1");
 ?>