From e809e8f2cb340842531484f655c7433abe7ce79d Mon Sep 17 00:00:00 2001 From: LX3JL Date: Fri, 19 Feb 2016 12:23:06 +0100 Subject: [PATCH] db 2.1.3 --- dashboard/changes.txt | 7 +++++++ dashboard/index.php | 2 +- dashboard/pgs/class.reflector.php | 15 +++++++-------- dashboard/pgs/repeaters.php | 13 +++++++------ dashboard/pgs/users.php | 17 ++++++++++++++--- 5 files changed, 36 insertions(+), 18 deletions(-) mode change 100644 => 100755 dashboard/changes.txt mode change 100644 => 100755 dashboard/index.php mode change 100644 => 100755 dashboard/pgs/class.reflector.php mode change 100644 => 100755 dashboard/pgs/repeaters.php mode change 100644 => 100755 dashboard/pgs/users.php diff --git a/dashboard/changes.txt b/dashboard/changes.txt old mode 100644 new mode 100755 index ef26123..75f20a0 --- a/dashboard/changes.txt +++ b/dashboard/changes.txt @@ -1,3 +1,10 @@ +xlx db v2.1.3 + +- "index.php" added support for multiradio repeaters +- "users.php" added support for multiradio repeaters +- "class.reflector.php" added support for multiradio repeaters +- "repeaters.php" added suffix "D" for "dongle" + xlx db v2.1.2 - "index.php" bugfix to correct an error if XLX name is equal to XLX000 diff --git a/dashboard/index.php b/dashboard/index.php old mode 100644 new mode 100755 index 27abef1..fb40f16 --- a/dashboard/index.php +++ b/dashboard/index.php @@ -80,7 +80,7 @@ for ($i=0;$i
XLX Multiprotocol Gateway Reflector -
 XLX vGetElement($FILECONTENT, "Version"); ?> - Dashboard v2.1.2  /  Service uptime:  XLX vGetElement($FILECONTENT, "Version"); ?> - Dashboard v2.1.3  /  Service uptime: NodeCount()) { - - if (strpos($this->Nodes[$i]->GetCallSign(), $Repeater) !== false) { - - - $suffix = $this->Nodes[$i]->GetSuffix(); - $found = true; + if ($this->Nodes[$i]->GetLinkedModule() == $LinkedModul) { + if (strpos($this->Nodes[$i]->GetCallSign(), $Repeater) !== false) { + $suffix = $this->Nodes[$i]->GetSuffix(); + $found = true; + } } $i++; } diff --git a/dashboard/pgs/repeaters.php b/dashboard/pgs/repeaters.php old mode 100644 new mode 100755 index f3d0509..659dba9 --- a/dashboard/pgs/repeaters.php +++ b/dashboard/pgs/repeaters.php @@ -1,14 +1,14 @@ - + - - - + + + - - + + NodeCount();$i++) { case 'A' : echo '23cm'; break; case 'B' : echo '70cm'; break; case 'C' : echo '2m'; break; + case 'D' : echo 'dongle'; break; case 'G' : echo 'Internet-Gateway'; break; default : echo ''; } diff --git a/dashboard/pgs/users.php b/dashboard/pgs/users.php old mode 100644 new mode 100755 index 5958f05..bdd820b --- a/dashboard/pgs/users.php +++ b/dashboard/pgs/users.php @@ -26,7 +26,7 @@ for ($i=0;$i<$Reflector->StationCount();$i++) { echo ' - - - + '; + $UserCheckedArray[] = $Users[$j]; } echo '
#FlagFlag DV StationBandLast HeardLinked forBandLast HeardLinked for ProtocolModuleIPModuleIP
'; + '; if (file_exists("./img/flags/".$Reflector->GetFlag($Reflector->Stations[$i]->GetCallSign()).".png")) { echo ''; @@ -35,7 +35,7 @@ for ($i=0;$i<$Reflector->StationCount();$i++) { '.$Reflector->Stations[$i]->GetCallsignOnly().' '.$Reflector->Stations[$i]->GetSuffix().' '.$Reflector->Stations[$i]->GetVia(); + '.$Reflector->Stations[$i]->GetVia(); if ($Reflector->Stations[$i]->GetPeer() != 'XLX'.$ServiceName) { echo ' / '.$Reflector->Stations[$i]->GetPeer(); } @@ -79,11 +79,22 @@ for ($i=0;$i'; $odd = ""; + + $UserCheckedArray = array(); + for ($j=0;$jGetSuffixOfRepeater($Users[$j], $Modules[$i], max($CurrentPositions)+1); + } + else { + $Displayname = $Users[$j].'-'.$Reflector->GetSuffixOfRepeater($Users[$j], $Modules[$i]); + } echo '
'.$Users[$j].'-'.$Reflector->GetSuffixOfRepeater($Users[$j]).' '.$Displayname.'