xlx db v2.0.6

- "index.php" now reads out the XLX service uptime and not the server
uptime
- "country.csv" prefixes update
- "class.reflector.php" flags showing improvements
- "users.php" limits user show up to 40 users
- "repeaters.php" limits nodes show up to 40 nodes

dashboard/changes.txt

@@ -0,0 +1,11 @@
+xlx db v2.0.6
+
+- "index.php" now reads out the XLX service uptime and not the server uptime
+- "country.csv" prefixes update
+- "class.reflector.php" flags showing improvements
+- "users.php" limits user show up to 40 users
+- "repeaters.php" limits nodes show up to 40 nodes
+
+xlx db v2.0.5
+
+- "class.reflector.php" extra callsign checking

dashboard/index.php

@@ -1,6 +1,31 @@
 <?php
+/*
+----------------------------------------------------------------------------
+	xlxd
+
+	Created by Luc Engelmann (LX1IQ) on 31/12/2015
+	Copyright © 2015 Luc Engelmann (LX1IQ). All rights reserved.
+
+----------------------------------------------------------------------------
+	This file is part of xlxd.
+
+	xlxd is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	xlxd is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+----------------------------------------------------------------------------
+*/
 
 $FILE = "/var/log/xlxd.xml";
+$PID  = "/var/log/xlxd.pid";
 
 require_once("./pgs/functions.php");
 if (!class_exists('ParseXML'))   require_once("./pgs/class.parsexml.php");
@@ -81,7 +106,11 @@ for ($i=0;$i<count($tmpStations);$i++) {
             
           </table>
       </div>
-      <div id="info"><?php echo str_replace ("up" , "&nbsp;&nbsp;Server uptime" , GetSystemUptime()); ?>&nbsp;<br />XLX<?php echo $ServiceName; ?>&nbsp;v<?php echo $XML->GetElement($FILECONTENT, "Version"); ?>&nbsp;-&nbsp;Dashboard v2.0.5&nbsp;&nbsp;</div>
+      <div id="info">Service uptime: <?php 
+            if (file_exists($PID) && is_readable($PID)) {
+               echo FormatSeconds(time()-filectime($PID));
+            }
+         ?>&nbsp;<br />XLX<?php echo $ServiceName; ?>&nbsp;v<?php echo $XML->GetElement($FILECONTENT, "Version"); ?>&nbsp;-&nbsp;Dashboard v2.0.6&nbsp;&nbsp;</div>
    </div>
    <div id="content" align="center">
    

dashboard/pgs/class.reflector.php

@@ -1,4 +1,28 @@
 <?php
+/*
+----------------------------------------------------------------------------
+	xlxd
+
+	Created by Luc Engelmann (LX1IQ) on 31/12/2015
+	Copyright © 2015 Luc Engelmann (LX1IQ). All rights reserved.
+
+----------------------------------------------------------------------------
+	This file is part of xlxd.
+
+	xlxd is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	xlxd is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+----------------------------------------------------------------------------
+*/
 
 class xReflector {
    
@@ -145,15 +169,6 @@ class xReflector {
          $Letters++;
       }
       
-      if (!$FoundFlag) {
-         $Prefix = substr($Callsign, 0, 1);  
-         if ($Prefix == 'N') { $Image = "us"; }
-         if ($Prefix == 'K') { $Image = "us"; }
-         if ($Prefix == 'W') { $Image = "us"; }
-         if ($Prefix == 'G') { $Image = "gb"; }
-         if ($Prefix == 'R') { $Image = "ru"; }
-         if ($Prefix == 'F') { $Image = "fr"; }
-      }
       return strtolower($Image);
    }
    
@@ -187,4 +202,4 @@ class xReflector {
       
 }
 
-?>
+?>

dashboard/pgs/country.csv

@@ -1,5 +1,5 @@
 Afghanistan;AF;YA-T6
-Åland Islands;AX;OH0
+Aland Islands;AX;OH0
 Albania;AL;ZA
 Algeria;DZ;7T-7U-7V-7W-7X-7Y
 American Samoa;AS;KH8
@@ -52,7 +52,7 @@ Congo;CG;TN
 Congo, the Democratic Republic of the;CD;9Q-9R-9S-9T
 Cook Islands;CK;E5
 Costa Rica;CR;TI-TE
-Côte d'Ivoire;CI;TU
+Cote d'Ivoire;CI;TU
 Croatia;HR;9A
 Cuba;CU;CO-CM
 Curaçao;CW;PJ2
@@ -73,7 +73,7 @@ Falkland Islands (Malvinas);FK;VP8
 Faroe Islands;FO;OY
 Fiji;FJ;3D2
 Finland;FI;OF-OG-OH-OI
-France;FR;F
+France;FR;F0-F1-F2-F3-F4-F5-F6-F7-F8-F9
 French Guiana;GF;FY
 French Polynesia;PF;FO-TX
 French Southern Territories;TF;TK
@@ -107,7 +107,7 @@ Iraq;IQ;YI
 Ireland;IE;EI-EJ
 Isle of Man;IM;GD-GT
 Israel;IL;4X-4Z
-Italy;IT;I
+Italy;IT;I0-I1-I2-I3-I4-I5-I6-I7-I8-I9-IU-IZ-IR-IW-IK
 Jamaica;JM;6Y
 Japan;JP;JA-JB-JC-JD-JE-JF-JG-JH-JI-JJ-JK-JL-JM-JN-JO-JP-JQ-JR-JS-7J-7K-7L-7M-7N
 Jersey;JE;GJ-GH
@@ -232,8 +232,8 @@ Tuvalu;TV;T2
 Uganda;UG;5X
 Ukraine;UA;UR-US-UT-UU-UV-UW-UX-UY-UZ
 United Arab Emirates;AE;A6
-United Kingdom;GB;G-GX-M
-United States;US;K-W-N-AA-AB-AC-AD-AE-AF-AG-AH-AI-AJ-AK-NS
+United Kingdom;GB;2E-M0-M1-M2-M3-M4-M5-M6-M7-M8-M9-G0-G1-G2-G3-G4-G5-G6-G7-G8-G9-GX
+United States;US;K0-K1-K2-K3-K4-K5-K6-K7-K8-K9-KC-W0-W1-W2-W3-W4-W5-W6-W7-W8-W9-N0-N1-N2-N3-N4-N5-N6-N7-N8-N9-NO-WB-AA-AB-AC-AD-AE-AF-AG-AH-AI-AJ-AK-NS-KD
 United States Minor Outlying Islands;UM;
 Uruguay;UY;CV-CW-CX
 Uzbekistan;UZ;UJ-UK-UL-UM

dashboard/pgs/repeaters.php

@@ -1,29 +1,31 @@
 <?php
-// ----------------------------------------------------------------------------
-//  xlxd
-//
-//  Created by Luc Engelmann (LX1IQ) on 31/12/2015
-//  Copyright © 2015 Luc Engelmann (LX1IQ). All rights reserved.
-//
-// ----------------------------------------------------------------------------
-//    This file is part of xlxd.
-//
-//    xlxd is free software: you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation, either version 3 of the License, or
-//    (at your option) any later version.
-//
-//    xlxd is distributed in the hope that it will be useful,
-//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
-//
-//    You should have received a copy of the GNU General Public License
-//    along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
-// ----------------------------------------------------------------------------
+/*
+----------------------------------------------------------------------------
+	xlxd
+
+	Created by Luc Engelmann (LX1IQ) on 31/12/2015
+	Copyright © 2015 Luc Engelmann (LX1IQ). All rights reserved.
+
+----------------------------------------------------------------------------
+	This file is part of xlxd.
+
+	xlxd is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	xlxd is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+----------------------------------------------------------------------------
+*/
 ?>
 <table class="listingtable">
- <tr>
+ <tr>   
    <th width="25">#</th>
    <th width="60">Flag</th>
    <th width="100">DV Station</th>
@@ -40,9 +42,9 @@ $odd = "";
 $Reflector->LoadFlags();
 
 for ($i=0;$i<$Reflector->NodeCount();$i++) {
-
+         
    if ($odd == "#FFFFFF") { $odd = "#F1FAFA"; } else { $odd = "#FFFFFF"; }
-
+ 
    echo '
   <tr height="30" bgcolor="'.$odd.'" onMouseOver="this.bgColor=\'#FFFFCA\';" onMouseOut="this.bgColor=\''.$odd.'\';">
    <td align="center">'.($i+1).'</td>
@@ -54,7 +56,7 @@ for ($i=0;$i<$Reflector->NodeCount();$i++) {
    <td><a href="http://www.aprs.fi/'.$Reflector->Nodes[$i]->GetCallSign();
    if ($Reflector->Nodes[$i]->GetSuffix() != "") echo '-'.$Reflector->Nodes[$i]->GetSuffix();
    echo '" class="pl" target="_blank">'.$Reflector->Nodes[$i]->GetCallSign();
-   if ($Reflector->Nodes[$i]->GetSuffix() != "") { echo '-'.$Reflector->Nodes[$i]->GetSuffix(); }
+   if ($Reflector->Nodes[$i]->GetSuffix() != "") { echo '-'.$Reflector->Nodes[$i]->GetSuffix(); } 
    echo '</a></td>
    <td>';
    switch ($Reflector->Nodes[$i]->GetSuffix()) {
@@ -62,7 +64,7 @@ for ($i=0;$i<$Reflector->NodeCount();$i++) {
       case 'B' : echo '70cm'; break;
       case 'C' : echo '2m'; break;
       case 'G' : echo 'Internet-Gateway'; break;
-      default  : echo '';
+      default  : echo ''; 
    }
    echo '</td>
    <td>'.date("d.m.Y H:i", $Reflector->Nodes[$i]->GetLastHeardTime()).'</td>
@@ -71,9 +73,9 @@ for ($i=0;$i<$Reflector->NodeCount();$i++) {
    <td align="center">'.$Reflector->Nodes[$i]->GetLinkedModule().'</td>
    <td>'.$Reflector->Nodes[$i]->GetIP().'</td>
  </tr>';
-   if ($i == 41) { $i = $Reflector->NodeCount()+1; }
+   if ($i == 39) { $i = $Reflector->NodeCount()+1; }
 }
 
-?>
-
+?> 
+ 
 </table>

dashboard/pgs/users.php

@@ -1,34 +1,36 @@
 <?php
-// ----------------------------------------------------------------------------
-//  xlxd
-//
-//  Created by Luc Engelmann (LX1IQ) on 31/12/2015
-//  Copyright © 2015 Luc Engelmann (LX1IQ). All rights reserved.
-//
-// ----------------------------------------------------------------------------
-//    This file is part of xlxd.
-//
-//    xlxd is free software: you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation, either version 3 of the License, or
-//    (at your option) any later version.
-//
-//    xlxd is distributed in the hope that it will be useful,
-//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
-//
-//    You should have received a copy of the GNU General Public License
-//    along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
-// ----------------------------------------------------------------------------
+/*
+----------------------------------------------------------------------------
+	xlxd
+
+	Created by Luc Engelmann (LX1IQ) on 31/12/2015
+	Copyright © 2015 Luc Engelmann (LX1IQ). All rights reserved.
+
+----------------------------------------------------------------------------
+	This file is part of xlxd.
+
+	xlxd is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	xlxd is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+----------------------------------------------------------------------------
+*/
 ?>
 <table border="0">
    <tr>
       <td  valign="top">
-
+         
 
 <table class="listingtable">
- <tr>
+ <tr>   
    <th>#</th>
    <th>Flag</th>
    <th>Callsign</th>
@@ -47,11 +49,11 @@ for ($i=0;$i<$Reflector->StationCount();$i++) {
   <tr height="30" bgcolor="'.$odd.'" onMouseOver="this.bgColor=\'#FFFFCA\';" onMouseOut="this.bgColor=\''.$odd.'\';">
    <td align="center" width="35">';
    echo ($i==0 ? '<img src="./img/radio-waves-hi.png" />' : $i+1);
-
-
+   
+   
    echo '</td>
    <td align="center" width="60">';
-
+   
    if (file_exists("./img/flags/".$Reflector->GetFlag($Reflector->Stations[$i]->GetCallSign()).".png")) {
       echo '<img src="./img/flags/'.$Reflector->GetFlag($Reflector->Stations[$i]->GetCallSign()).'.png" height="15" />';
    }
@@ -62,22 +64,22 @@ for ($i=0;$i<$Reflector->StationCount();$i++) {
    <td width="90">'.$Reflector->Stations[$i]->GetVia().'</td>
    <td width="150">'.date("d.m.Y H:i", $Reflector->Stations[$i]->GetLastHeardTime()).'</td>
  </tr>';
-   if ($i == 41) { $i = $Reflector->StationCount()+1; }
+   if ($i == 39) { $i = $Reflector->StationCount()+1; }
 }
 
-?>
-
+?> 
+ 
 </table>
 
 
 </td>
 <td style="padding-left:50px;" align="center" valign="top">
-
-
+   
+   
 
 
 <table class="listingtable">
-<?php
+<?php 
 echo '
 <tr>';
 
@@ -92,11 +94,11 @@ echo '
 <tr bgcolor="#FFFFFF" style="padding:0px;">';
 
 for ($i=0;$i<count($Modules);$i++) {
-
+    
     $Users = $Reflector->GetCallSignsInModules($Modules[$i]);
     echo '
    <td valign="top" style="border:0px;padding:0px;">
-
+   
    <table width="100" border="0" style="padding:0px;margin:0px;">';
    $odd = "";
    for ($j=0;$j<count($Users);$j++) {
@@ -107,7 +109,7 @@ for ($i=0;$i<count($Modules);$i++) {
    }
    echo '
    </table>
-
+   
    </td>';
 }
 
@@ -115,9 +117,9 @@ echo '
 </tr>';
 
 ?>
-</table>
+</table>    
 
 
 </td>
 </tr>
-</table>
+</table>