From 4627d4f20508800165ba6a98de8f735d3a85db8d Mon Sep 17 00:00:00 2001
From: CT2JAY <pjao.ct2jay@gmail.com>
Date: Tue, 7 Mar 2017 00:11:49 +0000
Subject: [PATCH] Fixed showing Talker Alias with header!

---
 include/functions.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/include/functions.php b/include/functions.php
index 2921100..a3fd912 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -197,6 +197,7 @@ function getShortMMDVMLog() {
    // Open Logfile and copy loglines into LogLines-Array()
    $logPath = MMDVMLOGPATH."/".MMDVMLOGPREFIX."-".date("Y-m-d").".log";
    $logLines = explode("\n", `egrep -h "from|end|watchdog|lost|Alias|0000" $logPath | tail -20`);
+
    return $logLines;
 }
 
@@ -261,14 +262,14 @@ function getHeardList($logLines, $onlyLast) {
          continue;
       }
 
-      if(strpos($logLine, "0000") > 0){
+      if(strpos($logLine, "0000")){
       	$decodedAlias = $decodedAlias = preg_replace('/[\x00-\x1F\x7F-\xA0\xAD]/u', '', decodeAlias($logLine));
-        if ($decodedAlias == "" && $alias =="") $decodedAlias="---";
-        else $alias = str_replace("---", "", $alias);
-      	if ($alias =="")
-	      	$alias =$decodedAlias;
+        if ($decodedAlias == "" && $alias == "") $decodedAlias="---";
+        else if ($alias!="---") $alias = str_replace("---", "", $alias);
+      	if ($alias == "")
+	      	$alias = $decodedAlias;
 	    else
-	    	$alias =$decodedAlias.$alias;
+	    	$alias = $decodedAlias.$alias;
       }
       if (strpos($logLine,"Embedded Talker Alias")) {
       	switch (substr($logLine, 27, strpos($logLine,",") - 27)) {
@@ -429,14 +430,14 @@ function getHeardList($logLines, $onlyLast) {
             $loss = $ts1loss;
             $ber = $ts1ber;
             $rssi = $ts1rssi;
-            $alias = $ts1alias;
+//            $alias = $ts1alias;
             break;
          case "DMR Slot 2":
             $duration = $ts2duration;
             $loss = $ts2loss;
             $ber = $ts2ber;
             $rssi = $ts2rssi;
-            $alias = $ts2alias;
+//            $alias = $ts2alias;
             break;
          case "YSF":
             $duration = $ysfduration;