From ce2016c99e87db65964620f288c288a08f68b557 Mon Sep 17 00:00:00 2001 From: LX3JL Date: Tue, 1 Mar 2016 09:28:55 +0100 Subject: [PATCH] db 2.1.5 --- dashboard/changes.txt | 7 +++++++ dashboard/img/gate.png | Bin 0 -> 3687 bytes dashboard/index.php | 2 +- dashboard/pgs/class.node.php | 5 ++++- dashboard/pgs/country.csv | 39 ++++++++++++++++++----------------- dashboard/pgs/repeaters.php | 22 +++++++++++++------- 6 files changed, 47 insertions(+), 28 deletions(-) create mode 100644 dashboard/img/gate.png mode change 100755 => 100644 dashboard/pgs/repeaters.php diff --git a/dashboard/changes.txt b/dashboard/changes.txt index 0afb9bc..15eaa66 100644 --- a/dashboard/changes.txt +++ b/dashboard/changes.txt @@ -1,3 +1,10 @@ +xlx db v2.1.5 + +- "class.node.php" added "get prefix +- "repeaters.php" check for XRF or REF link +- "country.csv " prefixes update + gate symbol +- "flags" gate.png + xlx db v2.1.4 - "class.reflector.php" improved the flag search diff --git a/dashboard/img/gate.png b/dashboard/img/gate.png new file mode 100644 index 0000000000000000000000000000000000000000..da2c5232952a0cd8930f856a4806cd9dbd34f0d1 GIT binary patch literal 3687 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 FV1i4=*$@B# literal 0 HcmV?d00001 diff --git a/dashboard/index.php b/dashboard/index.php index 0541dca..2b53adb 100644 --- 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.4  /  Service uptime:  XLX vGetElement($FILECONTENT, "Version"); ?> - Dashboard v2.1.5  /  Service uptime: Callsign = trim(substr($Callsign, 0, strpos($Callsign, " "))); $this->Suffix = trim(substr($Callsign, strpos($Callsign, " "), strlen($Callsign))); + $this->Prefix = strtoupper(trim(substr($Callsign, 0, 3))); } else { $this->Callsign = trim($Callsign); $this->Suffix = ""; + $this->Prefix = ""; } @@ -39,7 +42,7 @@ class Node { public function GetConnectTime() { return $this->ConnectTime; } public function GetLastHeardTime() { return $this->LastHeardTime; } public function GetSuffix() { return $this->Suffix; } - + public function GetPrefix() { return $this->Prefix; } } ?> \ No newline at end of file diff --git a/dashboard/pgs/country.csv b/dashboard/pgs/country.csv index 9a8218c..5140149 100644 --- a/dashboard/pgs/country.csv +++ b/dashboard/pgs/country.csv @@ -24,8 +24,8 @@ Belize;BZ;V3 Benin;BJ;TY Bermuda;BM;VP9 Bhutan;BT;A5 -Bolivia, Plurinational State of;BO;CP -Bonaire, Sint Eustatius and Saba;BQ;PJ4 +Bolivia Plurinational State of;BO;CP +Bonaire Sint Eustatius and Saba;BQ;PJ4 Bosnia and Herzegovina;BA;E7 Botswana;BW;A2 Bouvet Island;BV;3Y @@ -49,7 +49,7 @@ Cocos (Keeling) Islands;CC;VK9C Colombia;CO;HJ-HK-5J-5K Comoros;KM;D6 Congo;CG;TN -Congo, the Democratic Republic of the;CD;9Q-9R-9S-9T +Congo the Democratic Republic of the;CD;9Q-9R-9S-9T Cook Islands;CK;E5 Costa Rica;CR;TI-TE Cote d'Ivoire;CI;TU @@ -102,12 +102,12 @@ Hungary;HU;HA-HG Iceland;IS;TF India;IN;VU Indonesia;ID;YB-YC-YD-YE-YF-YG-YH -Iran, Islamic Republic of;IR;EP-EQ +Iran Islamic Republic of;IR;EP-EQ Iraq;IQ;YI Ireland;IE;EI-EJ-MI-GI Isle of Man;IM;GD-GT Israel;IL;4X-4Z -Italy;IT;I0-I1-I2-I3-I4-I5-I6-I7-I8-I9-IK-TR-IT-IU-IW-IZ +Italy;IT;I0-I1-I2-I3-I4-I5-I6-I7-I8-I9-IK-IN-IQ-IR-IS-IT-IU-IW-IZ 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 @@ -115,8 +115,8 @@ Jordan;JO;JY Kazakhstan;KZ;UN-UO-UP-UQ Kenya;KE;5Y-5Z Kiribati;KI;T30 -Korea, Democratic People's Republic of;KP;P5 -Korea, Republic of;KR;DS-HL-6K-6L-6M-6N +Korea Democratic People's Republic of;KP;P5 +Korea Republic of;KR;DS-HL-6K-6L-6M-6N Kuwait;KW;9K Kyrgyzstan;KG;EX Lao People's Democratic Republic;LA;XW @@ -129,7 +129,7 @@ Liechtenstein;LI;HB0 Lithuania;LT;LY Luxembourg;LU;LX Macao;MO;XX9 -Macedonia, the Former Yugoslav Republic of;MK;Z3 +Macedonia the Former Yugoslav Republic of;MK;Z3 Madagascar;MG;5R Malawi;MW;7Q Malaysia;MY;9M @@ -142,8 +142,8 @@ Mauritania;MR;5T Mauritius;MU;3B8 Mayotte;YT;FH-FO Mexico;MX;XA-XB-XC-XD-XE-XF-XG-XH-XI -Micronesia, Federated States of;FM;V6 -Moldova, Republic of;MD;ER +Micronesia Federated States of;FM;V6 +Moldova Republic of;MD;ER Monaco;MC;3A Mongolia;MN;JT-JU-JV Montenegro;ME;4O @@ -167,7 +167,7 @@ Norway;NO;LA-LB-LC-LD-LE-LF-LG-LH-LI-LJ-LK-LL-LM-LN Oman;OM;YO-YP-YQ-YR Pakistan;PK;AP Palau;PW;T8 -Palestine, State of;PS;E4 +Palestine State of;PS;E4 Panama;PA;HO-HP Papua New Guinea;PG;P2 Paraguay;PY;ZP @@ -182,8 +182,8 @@ Reunion;RE;FR-TO Romania;RO;YO-YP-YQ-YR Russian Federation;RU;UA-UB-UC-UD-UE-UF-UG-UH-UI-RA-RB-RC-RD-RE-RF-RG-RH-RI-RJ-RK-RL-RM-RN-RO-RP-RQ-RR-RS-RT-RT-RU-RV-RW-RX-RY-RZ Rwanda;RW;9X -Saint Barthélemy;BL;FJ-TO -Saint Helena, Ascension and Tristan da Cunha;SH;ZD9 +Saint Barthelemy;BL;FJ-TO +Saint Helena Ascension and Tristan da Cunha;SH;ZD9 Saint Kitts and Nevis;KN;V4 Saint Lucia;LC;J6 Saint Martin (French part);MF;FS @@ -193,7 +193,7 @@ Samoa;WS;5W San Marino;SM;T7 Sao Tome and Principe;ST;S9 Saudi Arabia;SA;HZ -Scotland;SH;GM +Scotland;SH;GM-2M0 Senegal;SN;6V-6W Serbia;RS;YT-YU Seychelles;SC;S7 @@ -216,9 +216,9 @@ Swaziland;SZ;3DA Sweden;SE;SA-SB-SC-SD-SE-SF-SG-SH-SI-SJ-SK-SL-SM-7S-8S Switzerland;CH;HB Syrian Arab Republic;SY;YK -Taiwan, Province of China;TW;BU-BV-BW-BX +Taiwan Province of China;TW;BU-BV-BW-BX Tajikistan;TJ;EY -Tanzania, United Republic of;TZ;5H-5I +Tanzania United Republic of;TZ;5H-5I Thailand;TH;HS-E2 Timor-Leste;TL;4W Togo;TG;5V @@ -239,13 +239,14 @@ United States Minor Outlying Islands;UM; Uruguay;UY;CV-CW-CX Uzbekistan;UZ;UJ-UK-UL-UM Vanuatu;VU;YJ -Venezuela, Bolivarian Republic of;VE;YV-YW-YX-YY-4M +Venezuela Bolivarian Republic of;VE;YV-YW-YX-YY-4M Viet Nam;VN;3W-XV -Virgin Islands, British;VG;VP2V -Virgin Islands, U.S.;VI;KP2 +Virgin Islands British;VG;VP2V +Virgin Islands U.S.;VI;KP2 Wales;WL;2W-GW-MW Wallis and Futuna;WF;FW Western Sahara;EH;S0 Yemen;YE;7O Zambia;ZM;9I-9J Zimbabwe;ZW;Z2 +GATE;GATE;REF-XRF diff --git a/dashboard/pgs/repeaters.php b/dashboard/pgs/repeaters.php old mode 100755 new mode 100644 index 659dba9..f868be0 --- a/dashboard/pgs/repeaters.php +++ b/dashboard/pgs/repeaters.php @@ -33,13 +33,21 @@ for ($i=0;$i<$Reflector->NodeCount();$i++) { if ($Reflector->Nodes[$i]->GetSuffix() != "") { echo '-'.$Reflector->Nodes[$i]->GetSuffix(); } echo ' '; - switch ($Reflector->Nodes[$i]->GetSuffix()) { - 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 ''; + if (($Reflector->Nodes[$i]->GetPrefix() == 'REF') || ($Reflector->Nodes[$i]->GetPrefix() == 'XRF')) { + switch ($Reflector->Nodes[$i]->GetPrefix()) { + case 'REF' : echo 'REF-Link'; break; + case 'XRF' : echo 'XRF-Link'; break; + } + } + else { + switch ($Reflector->Nodes[$i]->GetSuffix()) { + 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 ' '.date("d.m.Y H:i", $Reflector->Nodes[$i]->GetLastHeardTime()).'