From effd58b296ecd52693f7e0f464156c0a95cf241f Mon Sep 17 00:00:00 2001
From: Catalin Vatra <yo3cat@dstar-yo.ro>
Date: Thu, 25 Jun 2020 07:30:48 +0300
Subject: [PATCH 1/7] Update class.reflector.php

---
 dashboard2/pgs/class.reflector.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dashboard2/pgs/class.reflector.php b/dashboard2/pgs/class.reflector.php
index d6505f7..504fcfa 100644
--- a/dashboard2/pgs/class.reflector.php
+++ b/dashboard2/pgs/class.reflector.php
@@ -43,11 +43,11 @@ class xReflector {
          fclose($handle);
          
          $this->ServiceName = substr($this->XMLContent, strpos($this->XMLContent, "<XLX")+4, 3);
-         if (!is_numeric($this->ServiceName)) {
-            $this->ServiceName = null;
-            return false;
-         }
-         
+# XLX alphanumeric naming... By commenting the following four lines, it is possible to use an alphanumeric name for the reflector (eg: XLXABC)          
+#         if (!is_numeric($this->ServiceName)) {
+#            $this->ServiceName = null;
+#            return false;
+#         }  
          $this->ReflectorName = "XLX".$this->ServiceName;
          
          $LinkedPeersName = "XLX".$this->ServiceName."  linked peers";

From 8d7cb4b605771f9a462a8ac39817163fca49ebcc Mon Sep 17 00:00:00 2001
From: Catalin Vatra <yo3cat@dstar-yo.ro>
Date: Thu, 25 Jun 2020 07:32:12 +0300
Subject: [PATCH 2/7] Allows alphanumeric names for the reflector

---
 dashboard/pgs/class.reflector.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/dashboard/pgs/class.reflector.php b/dashboard/pgs/class.reflector.php
index 6ec8a6e..4f5fb60 100755
--- a/dashboard/pgs/class.reflector.php
+++ b/dashboard/pgs/class.reflector.php
@@ -43,10 +43,11 @@ class xReflector {
          fclose($handle);
          
          $this->ServiceName = substr($this->XMLContent, strpos($this->XMLContent, "<XLX")+4, 3);
-         if (!is_numeric($this->ServiceName)) {
-            $this->ServiceName = null;
-            return false;
-         }
+# XLX alphanumeric naming... By commenting the following four lines, it is possible to use an alphanumeric name for the reflector (eg: XLXABC)
+#         if (!is_numeric($this->ServiceName)) {
+#            $this->ServiceName = null;
+#            return false;
+#         }
          
          $this->ReflectorName = "XLX".$this->ServiceName;
          

From 40e732bf7b04f9db89a34e4f18a95ada63a78171 Mon Sep 17 00:00:00 2001
From: Catalin Vatra <yo3cat@dstar-yo.ro>
Date: Thu, 25 Jun 2020 07:33:33 +0300
Subject: [PATCH 3/7] Allows alphanumeric names for the reflector

---
 dashboard2/pgs/class.reflector.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dashboard2/pgs/class.reflector.php b/dashboard2/pgs/class.reflector.php
index 504fcfa..f9cb053 100644
--- a/dashboard2/pgs/class.reflector.php
+++ b/dashboard2/pgs/class.reflector.php
@@ -48,6 +48,7 @@ class xReflector {
 #            $this->ServiceName = null;
 #            return false;
 #         }  
+         
          $this->ReflectorName = "XLX".$this->ServiceName;
          
          $LinkedPeersName = "XLX".$this->ServiceName."  linked peers";
@@ -60,7 +61,8 @@ class xReflector {
          $tmpNodes          = $XML->GetAllElements($AllNodesString, "NODE");
          
          for ($i=0;$i<count($tmpNodes);$i++) {
-             $Node = new Node($XML->GetElement($tmpNodes[$i], 'Callsign'), $XML->GetElement($tmpNodes[$i], 'IP'), $XML->GetElement($tmpNodes[$i], 'LinkedModule'), $XML->GetElement($tmpNodes[$i], 'Protocol'), $XML->GetElement($tmpNodes[$i], 'ConnectTime'), $XML->GetElement($tmpNodes[$i], 'LastHeardTime'), CreateCode(16));
+            
+           $Node = new Node($XML->GetElement($tmpNodes[$i], 'Callsign'), $XML->GetElement($tmpNodes[$i], 'IP'), $XML->GetElement($tmpNodes[$i], 'LinkedModule'), $XML->GetElement($tmpNodes[$i], 'Protocol'), $XML->GetElement($tmpNodes[$i], 'ConnectTime'), $XML->GetElement($tmpNodes[$i], 'LastHeardTime'), CreateCode(16));
              $this->AddNode($Node);
          }
          

From 257d97c58350ac298c60f8952e7d65ca4111c5b6 Mon Sep 17 00:00:00 2001
From: Catalin Vatra <yo3cat@dstar-yo.ro>
Date: Thu, 25 Jun 2020 07:39:49 +0300
Subject: [PATCH 4/7] Add alphanumeric name to reflector

---
 dashboard2/pgs/class.reflector.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dashboard2/pgs/class.reflector.php b/dashboard2/pgs/class.reflector.php
index f9cb053..010c4b0 100644
--- a/dashboard2/pgs/class.reflector.php
+++ b/dashboard2/pgs/class.reflector.php
@@ -61,8 +61,7 @@ class xReflector {
          $tmpNodes          = $XML->GetAllElements($AllNodesString, "NODE");
          
          for ($i=0;$i<count($tmpNodes);$i++) {
-            
-           $Node = new Node($XML->GetElement($tmpNodes[$i], 'Callsign'), $XML->GetElement($tmpNodes[$i], 'IP'), $XML->GetElement($tmpNodes[$i], 'LinkedModule'), $XML->GetElement($tmpNodes[$i], 'Protocol'), $XML->GetElement($tmpNodes[$i], 'ConnectTime'), $XML->GetElement($tmpNodes[$i], 'LastHeardTime'), CreateCode(16));
+             $Node = new Node($XML->GetElement($tmpNodes[$i], 'Callsign'), $XML->GetElement($tmpNodes[$i], 'IP'), $XML->GetElement($tmpNodes[$i], 'LinkedModule'), $XML->GetElement($tmpNodes[$i], 'Protocol'), $XML->GetElement($tmpNodes[$i], 'ConnectTime'), $XML->GetElement($tmpNodes[$i], 'LastHeardTime'), CreateCode(16));
              $this->AddNode($Node);
          }
          

From 40ce30446cfc0a5c11163b1ab63e250b0362cdad Mon Sep 17 00:00:00 2001
From: Catalin Vatra <yo3cat@dstar-yo.ro>
Date: Thu, 25 Jun 2020 07:41:04 +0300
Subject: [PATCH 5/7] Allows alphanumeric names for the reflector

---
 dashboard2/pgs/class.reflector.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dashboard2/pgs/class.reflector.php b/dashboard2/pgs/class.reflector.php
index 010c4b0..beb5ae2 100644
--- a/dashboard2/pgs/class.reflector.php
+++ b/dashboard2/pgs/class.reflector.php
@@ -48,7 +48,7 @@ class xReflector {
 #            $this->ServiceName = null;
 #            return false;
 #         }  
-         
+#         
          $this->ReflectorName = "XLX".$this->ServiceName;
          
          $LinkedPeersName = "XLX".$this->ServiceName."  linked peers";

From ac3f9e4ad216938085c8210bb545b4c4fc93056f Mon Sep 17 00:00:00 2001
From: Catalin Vatra <yo3cat@dstar-yo.ro>
Date: Mon, 18 Jan 2021 11:34:52 +0200
Subject: [PATCH 6/7] Update class.reflector.php

---
 dashboard/pgs/class.reflector.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/dashboard/pgs/class.reflector.php b/dashboard/pgs/class.reflector.php
index 4f5fb60..d545e99 100755
--- a/dashboard/pgs/class.reflector.php
+++ b/dashboard/pgs/class.reflector.php
@@ -41,9 +41,15 @@ class xReflector {
          $handle = fopen($this->XMLFile, 'r');
          $this->XMLContent = fread($handle, filesize($this->XMLFile));
          fclose($handle);
-         
+
+ # XLX alphanumeric naming...
          $this->ServiceName = substr($this->XMLContent, strpos($this->XMLContent, "<XLX")+4, 3);
-# XLX alphanumeric naming... By commenting the following four lines, it is possible to use an alphanumeric name for the reflector (eg: XLXABC)
+         if (preg_match('/[^a-zA-Z0-9]/', $this->ServiceName) == 1) {
+            $this->ServiceName = null;
+            return false;
+         }
+
+#         $this->ServiceName = substr($this->XMLContent, strpos($this->XMLContent, "<XLX")+4, 3);
 #         if (!is_numeric($this->ServiceName)) {
 #            $this->ServiceName = null;
 #            return false;

From c69651ccb2c571fccdf2d9b85345179f60d30c36 Mon Sep 17 00:00:00 2001
From: Catalin Vatra <yo3cat@dstar-yo.ro>
Date: Mon, 18 Jan 2021 11:35:36 +0200
Subject: [PATCH 7/7] Update class.reflector.php

---
 dashboard2/pgs/class.reflector.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/dashboard2/pgs/class.reflector.php b/dashboard2/pgs/class.reflector.php
index beb5ae2..4a2c246 100644
--- a/dashboard2/pgs/class.reflector.php
+++ b/dashboard2/pgs/class.reflector.php
@@ -41,9 +41,15 @@ class xReflector {
          $handle = fopen($this->XMLFile, 'r');
          $this->XMLContent = fread($handle, filesize($this->XMLFile));
          fclose($handle);
-         
+
+# XLX alphanumeric naming...
          $this->ServiceName = substr($this->XMLContent, strpos($this->XMLContent, "<XLX")+4, 3);
-# XLX alphanumeric naming... By commenting the following four lines, it is possible to use an alphanumeric name for the reflector (eg: XLXABC)          
+         if (preg_match('/[^a-zA-Z0-9]/', $this->ServiceName) == 1) {
+            $this->ServiceName = null;
+            return false;
+         }
+         
+#         $this->ServiceName = substr($this->XMLContent, strpos($this->XMLContent, "<XLX")+4, 3);        
 #         if (!is_numeric($this->ServiceName)) {
 #            $this->ServiceName = null;
 #            return false;