From 085dac7fab5a475d66aa2e384cf9cd3f59c09347 Mon Sep 17 00:00:00 2001
From: RaspbianProyect by HP3ICC <setcom40@gmail.com>
Date: Sun, 19 Mar 2023 01:52:06 +0000
Subject: [PATCH] Update dvswitch.sh

---
 install/dvswitch.sh | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/install/dvswitch.sh b/install/dvswitch.sh
index 301b809..104625d 100644
--- a/install/dvswitch.sh
+++ b/install/dvswitch.sh
@@ -153,21 +153,15 @@ include_once $_SERVER['DOCUMENT_ROOT'].'/include/functions.php';
 <?php
 $i = 0;
 $a = 0;
-$dmrCall = "";
-$dmrIDline = array();
-$dmrID = fopen(DMRIDDATPATH."/DMRIds.dat", "r");
-while (!feof($dmrID)) {
-	$line = fgets($dmrID);
-	$line = trim($line," \t\n\r\0\x0B");
-	$dmrIDline[] = $line;
-}
-fclose($dmrID);
+$dmrCall = 0;
+$dmrIDline = file(DMRIDDATPATH."/DMRIds.dat");
+$countDMRId = count($dmrIDline);
 for ($i = 0;  ($i <= 19); $i++) { //Last 20 calls
 	if (isset($lastHeard[$i])) {
 		$listElem = $lastHeard[$i];
 		if ( $listElem[2] ) {
 			$utc_time = $listElem[0];
-                        $utc_tz =  new DateTimeZone('Europe/Paris');
+                        $utc_tz =  new DateTimeZone('UTC');
                         $local_tz = new DateTimeZone(date_default_timezone_get ());
                         $dt = new DateTime($utc_time, $utc_tz);
                         $dt->setTimeZone($local_tz);
@@ -188,15 +182,18 @@ for ($i = 0;  ($i <= 19); $i++) { //Last 20 calls
 			echo "<td align=\"left\">&nbsp;<a href=\"http://www.qrz.com/db/$listElem[2]\" target=\"_blank\"><b>$listElem[2]</b></a></td>";
 		    }
 		}
-		for ($a = 0; ($a < count($dmrIDline)); $a++) {
-			if (strpos($dmrIDline[$a], $listElem[2]) != false) {
+		$arr2 = strtoupper($listElem[2]);
+		for ($a = 0; ($a < $countDMRId); $a++) {
+			if (strpos($dmrIDline[$a], $arr2." ") != false) {
 				$arr = explode(" ", strtoupper($dmrIDline[$a]));
-				if (($arr[1] != $dmrCall) && ($listElem[2] != $dmrCall)) {
+				if ($arr[1] == $arr2) {
 					echo "<td align=\"left\" style=\"color:red; font-weight:bold;\">&nbsp;<b>$arr[2]</b></a></td>";
-					$dmrCall = $arr[1];
+					$dmrCall = 1;
+					break;
 				}
 			}
 		}
+		if ($dmrCall == 0) { echo "<td align=\"left\" style=\"color:red; font-weight:bold;\">&nbsp;<b></b></a></td>"; }
 		if (strlen($listElem[4]) == 1) { $listElem[4] = str_pad($listElem[4], 8, " ", STR_PAD_LEFT); }
 		if ( substr($listElem[4], 0, 6) === 'CQCQCQ' ) {
 			echo "<td align=\"left\">&nbsp;<span style=\"color:#b5651d;font-weight:bold;\">$listElem[4]</span></td>";
@@ -238,7 +235,7 @@ for ($i = 0;  ($i <= 19); $i++) { //Last 20 calls
 			else { echo "<td style=\"background:#f33;color:#f9f9f9;\">$listElem[8]</td>"; }
 		}
 		echo"</tr>\n";
-		$dmrCall = "";
+		$dmrCall = 0;
 		}
 	}
 }