From 183df0248fac0da82324a1fa999b4306834a12e3 Mon Sep 17 00:00:00 2001
From: CT2JAY <pjao.ct2jay@gmail.com>
Date: Sat, 4 Mar 2017 17:04:14 +0000
Subject: [PATCH 1/3] TalkAlias - putting back callsign

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

diff --git a/include/functions.php b/include/functions.php
index 0379ccd..739d658 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -831,16 +831,15 @@ function getName($callsign) {
 // M: 2017-02-13 15:53:31.253 0000:  05 00 20 47 69 6F 76 61 DC                         *.. Giova.*
 function decodeAlias($logLine) {
   if (substr($logLine, 34, 2) !=="04")
-   {
     $tok1 = encode(substr($logLine, 40, 2));
-    $tok2 = encode(substr($logLine, 43, 2));
-    $tok3 = encode(substr($logLine, 46, 2));
-    $tok4 = encode(substr($logLine, 49, 2));
-    $tok5 = encode(substr($logLine, 52, 2));
-    $tok6 = encode(substr($logLine, 55, 2));
-    $tok7 = encode(dechex(hexdec(substr($logLine, 58, 2))/2));
-    return $tok1.$tok2.$tok3.$tok4.$tok5.$tok6.$tok7;
-   } 
-   return;
+  else
+  $tok1 = "";
+  $tok2 = encode(substr($logLine, 43, 2));
+  $tok3 = encode(substr($logLine, 46, 2));
+  $tok4 = encode(substr($logLine, 49, 2));
+  $tok5 = encode(substr($logLine, 52, 2));
+  $tok6 = encode(substr($logLine, 55, 2));
+  $tok7 = encode(dechex(hexdec(substr($logLine, 58, 2))/2));
+  return $tok1.$tok2.$tok3.$tok4.$tok5.$tok6.$tok7;
 }
 ?>

From 1da9ee8b821597a546cedc663a4005803b1763e4 Mon Sep 17 00:00:00 2001
From: CT2JAY <pjao.ct2jay@gmail.com>
Date: Mon, 6 Mar 2017 22:26:15 +0000
Subject: [PATCH 2/3] Get TalkAlias only printable caracters

---
 include/functions.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/functions.php b/include/functions.php
index 739d658..2921100 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -262,8 +262,9 @@ function getHeardList($logLines, $onlyLast) {
       }
 
       if(strpos($logLine, "0000") > 0){
-      	$decodedAlias = decodeAlias($logLine);
+      	$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;
 	    else

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 3/3] 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;