From abc0f9e9bfcd0a7dabdad4c08b58efaaa8129cc2 Mon Sep 17 00:00:00 2001
From: phl0 <florian@florian-wolters.de>
Date: Fri, 29 Jul 2016 14:41:28 +0200
Subject: [PATCH 01/10] Add dashboard URL to Peers page

---
 dashboard/pgs/peers.php | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/dashboard/pgs/peers.php b/dashboard/pgs/peers.php
index 3b8ea77..960aba2 100644
--- a/dashboard/pgs/peers.php
+++ b/dashboard/pgs/peers.php
@@ -1,3 +1,20 @@
+<?php
+
+$Result = @fopen($CallingHome['ServerURL']."?do=GetReflectorList", "r");
+
+if (!$Result) die("HEUTE GIBTS KEIN BROT");
+
+$INPUT = "";
+while (!feof ($Result)) {
+       $INPUT .= fgets ($Result, 1024);
+}
+fclose($Result);
+
+$XML = new ParseXML();
+$Reflectorlist = $XML->GetElement($INPUT, "reflectorlist");
+$Reflectors    = $XML->GetAllElements($Reflectorlist, "reflector");
+
+?>
 <table class="listingtable">
  <tr>   
    <th width="25">#</th>
@@ -25,8 +42,16 @@ for ($i=0;$i<$Reflector->PeerCount();$i++) {
  
    echo '
   <tr height="30" bgcolor="'.$odd.'" onMouseOver="this.bgColor=\'#FFFFCA\';" onMouseOut="this.bgColor=\''.$odd.'\';">
-   <td align="center">'.($i+1).'</td>
-   <td>'.$Reflector->Peers[$i]->GetCallSign().'</td>
+   <td align="center">'.($i+1).'</td>';
+   $Name = $Reflector->Peers[$i]->GetCallSign();
+   for ($j=1;$j<count($Reflectors);$j++) {
+      if ($Name === $XML->GetElement($Reflectors[$j], "name")) {
+         $URL  = $XML->GetElement($Reflectors[$j], "dashboardurl");
+         break;
+      }
+   }
+   echo '
+   <td><a href="'.$URL.'" target="_blank" class="listinglink" title="Visit the Dashboard of&nbsp;'.$Name.'">'.$Name.'</a></td>
    <td>'.date("d.m.Y H:i", $Reflector->Peers[$i]->GetLastHeardTime()).'</td>
    <td>'.FormatSeconds(time()-$Reflector->Peers[$i]->GetConnectTime()).' s</td>
    <td align="center">'.$Reflector->Peers[$i]->GetProtocol().'</td>

From 1bbc072a542505ebd775b26cf263074ad5385ede Mon Sep 17 00:00:00 2001
From: phl0 <florian@florian-wolters.de>
Date: Fri, 29 Jul 2016 14:42:49 +0200
Subject: [PATCH 02/10] Correct some indentiations and whitespace

---
 dashboard/pgs/peers.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dashboard/pgs/peers.php b/dashboard/pgs/peers.php
index 960aba2..afe442d 100644
--- a/dashboard/pgs/peers.php
+++ b/dashboard/pgs/peers.php
@@ -37,11 +37,11 @@ $odd = "";
 $Reflector->LoadFlags();
 
 for ($i=0;$i<$Reflector->PeerCount();$i++) {
-         
+
    if ($odd == "#FFFFFF") { $odd = "#F1FAFA"; } else { $odd = "#FFFFFF"; }
- 
+
    echo '
-  <tr height="30" bgcolor="'.$odd.'" onMouseOver="this.bgColor=\'#FFFFCA\';" onMouseOut="this.bgColor=\''.$odd.'\';">
+   <tr height="30" bgcolor="'.$odd.'" onMouseOver="this.bgColor=\'#FFFFCA\';" onMouseOut="this.bgColor=\''.$odd.'\';">
    <td align="center">'.($i+1).'</td>';
    $Name = $Reflector->Peers[$i]->GetCallSign();
    for ($j=1;$j<count($Reflectors);$j++) {
@@ -75,6 +75,6 @@ for ($i=0;$i<$Reflector->PeerCount();$i++) {
    if ($i == $PageOptions['PeerPage']['LimitTo']) { $i = $Reflector->PeerCount()+1; }
 }
 
-?> 
- 
+?>
+
 </table>

From 6d6eb552c06a698237b2fd7a039935f24b07ecc2 Mon Sep 17 00:00:00 2001
From: phl0 <florian@florian-wolters.de>
Date: Fri, 29 Jul 2016 14:44:42 +0200
Subject: [PATCH 03/10] Remove link to bare IP address of reflector

---
 dashboard/pgs/peers.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dashboard/pgs/peers.php b/dashboard/pgs/peers.php
index afe442d..251029c 100644
--- a/dashboard/pgs/peers.php
+++ b/dashboard/pgs/peers.php
@@ -65,7 +65,7 @@ for ($i=0;$i<$Reflector->PeerCount();$i++) {
             case 'ShowLast1ByteOfIP'      : echo $PageOptions['PeerPage']['MasqueradeCharacter'].'.'.$PageOptions['PeerPage']['MasqueradeCharacter'].'.'.$PageOptions['PeerPage']['MasqueradeCharacter'].'.'.$Bytes[3]; break;
             case 'ShowLast2ByteOfIP'      : echo $PageOptions['PeerPage']['MasqueradeCharacter'].'.'.$PageOptions['PeerPage']['MasqueradeCharacter'].'.'.$Bytes[2].'.'.$Bytes[3]; break;
             case 'ShowLast3ByteOfIP'      : echo $PageOptions['PeerPage']['MasqueradeCharacter'].'.'.$Bytes[1].'.'.$Bytes[2].'.'.$Bytes[3]; break;
-            default                       : echo '<a href="http://'.$Reflector->Peers[$i]->GetIP().'" target="_blank" style="text-decoration:none;color:#000000;">'.$Reflector->Peers[$i]->GetIP().'</a>';
+            default                       : echo $Reflector->Peers[$i]->GetIP();
          }
       }
       echo '</td>';

From 0ed02a083c14324d3f34974964c37093fedc6d9d Mon Sep 17 00:00:00 2001
From: phl0 <florian@florian-wolters.de>
Date: Fri, 29 Jul 2016 17:42:16 +0200
Subject: [PATCH 04/10] Fix one more whitespace

---
 dashboard/pgs/peers.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dashboard/pgs/peers.php b/dashboard/pgs/peers.php
index 251029c..e24031a 100644
--- a/dashboard/pgs/peers.php
+++ b/dashboard/pgs/peers.php
@@ -16,7 +16,7 @@ $Reflectors    = $XML->GetAllElements($Reflectorlist, "reflector");
 
 ?>
 <table class="listingtable">
- <tr>   
+ <tr>
    <th width="25">#</th>
    <th width="100">XLX Peer</th>
    <th width="154">Last Heard</th>

From a73b8734cbae04b3fc18a6ade337a611442e7c5d Mon Sep 17 00:00:00 2001
From: phl0 <florian@florian-wolters.de>
Date: Fri, 29 Jul 2016 17:49:58 +0200
Subject: [PATCH 05/10] Handle the case when a reflector dashboard URL is not
 found

---
 dashboard/pgs/peers.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/dashboard/pgs/peers.php b/dashboard/pgs/peers.php
index e24031a..3d7255f 100644
--- a/dashboard/pgs/peers.php
+++ b/dashboard/pgs/peers.php
@@ -44,14 +44,21 @@ for ($i=0;$i<$Reflector->PeerCount();$i++) {
    <tr height="30" bgcolor="'.$odd.'" onMouseOver="this.bgColor=\'#FFFFCA\';" onMouseOut="this.bgColor=\''.$odd.'\';">
    <td align="center">'.($i+1).'</td>';
    $Name = $Reflector->Peers[$i]->GetCallSign();
+   $URL = '';
    for ($j=1;$j<count($Reflectors);$j++) {
       if ($Name === $XML->GetElement($Reflectors[$j], "name")) {
          $URL  = $XML->GetElement($Reflectors[$j], "dashboardurl");
          break;
       }
    }
+   if ($URL) {
+      echo '
+   <td><a href="'.$URL.'" target="_blank" class="listinglink" title="Visit the Dashboard of&nbsp;'.$Name.'">'.$Name.'</a></td>'
+   } else {
+      echo '
+   <td>'.$Name.'</td>'
+   }
    echo '
-   <td><a href="'.$URL.'" target="_blank" class="listinglink" title="Visit the Dashboard of&nbsp;'.$Name.'">'.$Name.'</a></td>
    <td>'.date("d.m.Y H:i", $Reflector->Peers[$i]->GetLastHeardTime()).'</td>
    <td>'.FormatSeconds(time()-$Reflector->Peers[$i]->GetConnectTime()).' s</td>
    <td align="center">'.$Reflector->Peers[$i]->GetProtocol().'</td>

From bec01172a1961068a2c026de28380d864a87a97c Mon Sep 17 00:00:00 2001
From: phl0 <florian@florian-wolters.de>
Date: Fri, 29 Jul 2016 17:51:56 +0200
Subject: [PATCH 06/10] Add forgotten semicola

---
 dashboard/pgs/peers.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dashboard/pgs/peers.php b/dashboard/pgs/peers.php
index 3d7255f..3fbfff9 100644
--- a/dashboard/pgs/peers.php
+++ b/dashboard/pgs/peers.php
@@ -53,10 +53,10 @@ for ($i=0;$i<$Reflector->PeerCount();$i++) {
    }
    if ($URL) {
       echo '
-   <td><a href="'.$URL.'" target="_blank" class="listinglink" title="Visit the Dashboard of&nbsp;'.$Name.'">'.$Name.'</a></td>'
+   <td><a href="'.$URL.'" target="_blank" class="listinglink" title="Visit the Dashboard of&nbsp;'.$Name.'">'.$Name.'</a></td>';
    } else {
       echo '
-   <td>'.$Name.'</td>'
+   <td>'.$Name.'</td>';
    }
    echo '
    <td>'.date("d.m.Y H:i", $Reflector->Peers[$i]->GetLastHeardTime()).'</td>

From d71ed905e0e220d0662fc288509dd3b13d85aeee Mon Sep 17 00:00:00 2001
From: phl0 <florian@florian-wolters.de>
Date: Fri, 29 Jul 2016 21:54:01 +0200
Subject: [PATCH 07/10] Remove superflous break

---
 dashboard/pgs/peers.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dashboard/pgs/peers.php b/dashboard/pgs/peers.php
index 3fbfff9..efcc67d 100644
--- a/dashboard/pgs/peers.php
+++ b/dashboard/pgs/peers.php
@@ -48,7 +48,6 @@ for ($i=0;$i<$Reflector->PeerCount();$i++) {
    for ($j=1;$j<count($Reflectors);$j++) {
       if ($Name === $XML->GetElement($Reflectors[$j], "name")) {
          $URL  = $XML->GetElement($Reflectors[$j], "dashboardurl");
-         break;
       }
    }
    if ($URL) {

From 6fd164b65bed0bc1f74142457676869d2034046f Mon Sep 17 00:00:00 2001
From: phl0 <florian@florian-wolters.de>
Date: Sun, 31 Jul 2016 16:02:43 +0200
Subject: [PATCH 08/10] Remove text decoration from hyper links

---
 dashboard/pgs/peers.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dashboard/pgs/peers.php b/dashboard/pgs/peers.php
index efcc67d..4ab2a32 100644
--- a/dashboard/pgs/peers.php
+++ b/dashboard/pgs/peers.php
@@ -52,7 +52,7 @@ for ($i=0;$i<$Reflector->PeerCount();$i++) {
    }
    if ($URL) {
       echo '
-   <td><a href="'.$URL.'" target="_blank" class="listinglink" title="Visit the Dashboard of&nbsp;'.$Name.'">'.$Name.'</a></td>';
+   <td><a href="'.$URL.'" target="_blank" class="listinglink" title="Visit the Dashboard of&nbsp;'.$Name.'" style="text-decoration:none;color:#000000;">'.$Name.'</a></td>';
    } else {
       echo '
    <td>'.$Name.'</td>';

From d885444f9528468b45abe279f88c2971a037ee6b Mon Sep 17 00:00:00 2001
From: phl0 <florian@florian-wolters.de>
Date: Sun, 31 Jul 2016 18:39:31 +0200
Subject: [PATCH 09/10] Don't die if API server is not reachable. Instead just
 show reflector names without hyler links

---
 dashboard/pgs/peers.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/dashboard/pgs/peers.php b/dashboard/pgs/peers.php
index 4ab2a32..e43bcf1 100644
--- a/dashboard/pgs/peers.php
+++ b/dashboard/pgs/peers.php
@@ -2,18 +2,20 @@
 
 $Result = @fopen($CallingHome['ServerURL']."?do=GetReflectorList", "r");
 
-if (!$Result) die("HEUTE GIBTS KEIN BROT");
-
 $INPUT = "";
-while (!feof ($Result)) {
+
+if ($Result) {
+
+   while (!feof ($Result)) {
        $INPUT .= fgets ($Result, 1024);
+   }
+
+   $XML = new ParseXML();
+   $Reflectorlist = $XML->GetElement($INPUT, "reflectorlist");
+   $Reflectors    = $XML->GetAllElements($Reflectorlist, "reflector");
 }
+
 fclose($Result);
-
-$XML = new ParseXML();
-$Reflectorlist = $XML->GetElement($INPUT, "reflectorlist");
-$Reflectors    = $XML->GetAllElements($Reflectorlist, "reflector");
-
 ?>
 <table class="listingtable">
  <tr>
@@ -50,7 +52,7 @@ for ($i=0;$i<$Reflector->PeerCount();$i++) {
          $URL  = $XML->GetElement($Reflectors[$j], "dashboardurl");
       }
    }
-   if ($URL) {
+   if ($Result && $URL) {
       echo '
    <td><a href="'.$URL.'" target="_blank" class="listinglink" title="Visit the Dashboard of&nbsp;'.$Name.'" style="text-decoration:none;color:#000000;">'.$Name.'</a></td>';
    } else {

From e8a19b40dd2fd3b8fba33641d3e171324f34326a Mon Sep 17 00:00:00 2001
From: phl0 <florian@florian-wolters.de>
Date: Mon, 1 Aug 2016 18:04:55 +0200
Subject: [PATCH 10/10] Make check for URL more explicit

---
 dashboard/pgs/peers.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dashboard/pgs/peers.php b/dashboard/pgs/peers.php
index e43bcf1..c9eff13 100644
--- a/dashboard/pgs/peers.php
+++ b/dashboard/pgs/peers.php
@@ -52,7 +52,7 @@ for ($i=0;$i<$Reflector->PeerCount();$i++) {
          $URL  = $XML->GetElement($Reflectors[$j], "dashboardurl");
       }
    }
-   if ($Result && $URL) {
+   if ($Result && (trim($URL) != "")) {
       echo '
    <td><a href="'.$URL.'" target="_blank" class="listinglink" title="Visit the Dashboard of&nbsp;'.$Name.'" style="text-decoration:none;color:#000000;">'.$Name.'</a></td>';
    } else {