ShaYmez/xlxd
1
0
Fork 0
mirror of https://github.com/ShaYmez/xlxd.git synced 2025-11-03 13:30:29 -05:00
Code Issues Projects Releases Wiki Activity

db 2.1.5

Browse Source
This commit is contained in:
LX3JL 2016-03-01 09:28:55 +01:00
parent e1cf5f5c92
commit ce2016c99e
6 changed files with 47 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dashboard/changes.txt
View File

@ -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 xlx db v2.1.4
- "class.reflector.php" improved the flag search - "class.reflector.php" improved the flag search

BIN
dashboard/img/gate.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

2
dashboard/index.php
View File

@ -80,7 +80,7 @@ for ($i=0;$i<count($tmpPeers);$i++) {
</head> </head>
<body> <body>
<div id="top"><img src="./img/header.jpg" alt="XLX Multiprotocol Gateway Reflector" style="margin-top:15px;" /> <div id="top"><img src="./img/header.jpg" alt="XLX Multiprotocol Gateway Reflector" style="margin-top:15px;" />
<br />&nbsp;XLX<?php echo $ServiceName; ?>&nbsp;v<?php echo $XML->GetElement($FILECONTENT, "Version"); ?>&nbsp;-&nbsp;Dashboard v2.1.4&nbsp;&nbsp;/&nbsp;&nbsp;Service uptime: <?php <br />&nbsp;XLX<?php echo $ServiceName; ?>&nbsp;v<?php echo $XML->GetElement($FILECONTENT, "Version"); ?>&nbsp;-&nbsp;Dashboard v2.1.5&nbsp;&nbsp;/&nbsp;&nbsp;Service uptime: <?php
if (file_exists($PID) && is_readable($PID)) { if (file_exists($PID) && is_readable($PID)) {
echo FormatSeconds(time()-filectime($PID)); echo FormatSeconds(time()-filectime($PID));
} }

5
dashboard/pgs/class.node.php
View File

@ -9,6 +9,7 @@ class Node {
private $ConnectTime; private $ConnectTime;
private $LastHeardTime; private $LastHeardTime;
private $Suffix; private $Suffix;
private $Prefix;
public function __construct($Callsign, $IP, $LinkedModule, $Protocol, $ConnectTime, $LastHeardTime) { public function __construct($Callsign, $IP, $LinkedModule, $Protocol, $ConnectTime, $LastHeardTime) {
@ -21,10 +22,12 @@ class Node {
if (strpos($Callsign, " ") !== false) { if (strpos($Callsign, " ") !== false) {
$this->Callsign = trim(substr($Callsign, 0, strpos($Callsign, " "))); $this->Callsign = trim(substr($Callsign, 0, strpos($Callsign, " ")));
$this->Suffix = trim(substr($Callsign, strpos($Callsign, " "), strlen($Callsign))); $this->Suffix = trim(substr($Callsign, strpos($Callsign, " "), strlen($Callsign)));
$this->Prefix = strtoupper(trim(substr($Callsign, 0, 3)));
} }
else { else {
$this->Callsign = trim($Callsign); $this->Callsign = trim($Callsign);
$this->Suffix = ""; $this->Suffix = "";
$this->Prefix = "";
} }
@ -39,7 +42,7 @@ class Node {
public function GetConnectTime() { return $this->ConnectTime; } public function GetConnectTime() { return $this->ConnectTime; }
public function GetLastHeardTime() { return $this->LastHeardTime; } public function GetLastHeardTime() { return $this->LastHeardTime; }
public function GetSuffix() { return $this->Suffix; } public function GetSuffix() { return $this->Suffix; }
public function GetPrefix() { return $this->Prefix; }
} }
?> ?>

39
dashboard/pgs/country.csv
View File

@ -24,8 +24,8 @@ Belize;BZ;V3
Benin;BJ;TY Benin;BJ;TY
Bermuda;BM;VP9 Bermuda;BM;VP9
Bhutan;BT;A5 Bhutan;BT;A5
Bolivia, Plurinational State of;BO;CP Bolivia Plurinational State of;BO;CP
Bonaire, Sint Eustatius and Saba;BQ;PJ4 Bonaire Sint Eustatius and Saba;BQ;PJ4
Bosnia and Herzegovina;BA;E7 Bosnia and Herzegovina;BA;E7
Botswana;BW;A2 Botswana;BW;A2
Bouvet Island;BV;3Y Bouvet Island;BV;3Y
@ -49,7 +49,7 @@ Cocos (Keeling) Islands;CC;VK9C
Colombia;CO;HJ-HK-5J-5K Colombia;CO;HJ-HK-5J-5K
Comoros;KM;D6 Comoros;KM;D6
Congo;CG;TN 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 Cook Islands;CK;E5
Costa Rica;CR;TI-TE Costa Rica;CR;TI-TE
Cote d'Ivoire;CI;TU Cote d'Ivoire;CI;TU
@ -102,12 +102,12 @@ Hungary;HU;HA-HG
Iceland;IS;TF Iceland;IS;TF
India;IN;VU India;IN;VU
Indonesia;ID;YB-YC-YD-YE-YF-YG-YH 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 Iraq;IQ;YI
Ireland;IE;EI-EJ-MI-GI Ireland;IE;EI-EJ-MI-GI
Isle of Man;IM;GD-GT Isle of Man;IM;GD-GT
Israel;IL;4X-4Z 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 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 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 Jersey;JE;GJ-GH
@ -115,8 +115,8 @@ Jordan;JO;JY
Kazakhstan;KZ;UN-UO-UP-UQ Kazakhstan;KZ;UN-UO-UP-UQ
Kenya;KE;5Y-5Z Kenya;KE;5Y-5Z
Kiribati;KI;T30 Kiribati;KI;T30
Korea, Democratic People's Republic of;KP;P5 Korea Democratic People's Republic of;KP;P5
Korea, Republic of;KR;DS-HL-6K-6L-6M-6N Korea Republic of;KR;DS-HL-6K-6L-6M-6N
Kuwait;KW;9K Kuwait;KW;9K
Kyrgyzstan;KG;EX Kyrgyzstan;KG;EX
Lao People's Democratic Republic;LA;XW Lao People's Democratic Republic;LA;XW
@ -129,7 +129,7 @@ Liechtenstein;LI;HB0
Lithuania;LT;LY Lithuania;LT;LY
Luxembourg;LU;LX Luxembourg;LU;LX
Macao;MO;XX9 Macao;MO;XX9
Macedonia, the Former Yugoslav Republic of;MK;Z3 Macedonia the Former Yugoslav Republic of;MK;Z3
Madagascar;MG;5R Madagascar;MG;5R
Malawi;MW;7Q Malawi;MW;7Q
Malaysia;MY;9M Malaysia;MY;9M
@ -142,8 +142,8 @@ Mauritania;MR;5T
Mauritius;MU;3B8 Mauritius;MU;3B8
Mayotte;YT;FH-FO Mayotte;YT;FH-FO
Mexico;MX;XA-XB-XC-XD-XE-XF-XG-XH-XI Mexico;MX;XA-XB-XC-XD-XE-XF-XG-XH-XI
Micronesia, Federated States of;FM;V6 Micronesia Federated States of;FM;V6
Moldova, Republic of;MD;ER Moldova Republic of;MD;ER
Monaco;MC;3A Monaco;MC;3A
Mongolia;MN;JT-JU-JV Mongolia;MN;JT-JU-JV
Montenegro;ME;4O 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 Oman;OM;YO-YP-YQ-YR
Pakistan;PK;AP Pakistan;PK;AP
Palau;PW;T8 Palau;PW;T8
Palestine, State of;PS;E4 Palestine State of;PS;E4
Panama;PA;HO-HP Panama;PA;HO-HP
Papua New Guinea;PG;P2 Papua New Guinea;PG;P2
Paraguay;PY;ZP Paraguay;PY;ZP
@ -182,8 +182,8 @@ Reunion;RE;FR-TO
Romania;RO;YO-YP-YQ-YR 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 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 Rwanda;RW;9X
Saint Barthélemy;BL;FJ-TO Saint Barthelemy;BL;FJ-TO
Saint Helena, Ascension and Tristan da Cunha;SH;ZD9 Saint Helena Ascension and Tristan da Cunha;SH;ZD9
Saint Kitts and Nevis;KN;V4 Saint Kitts and Nevis;KN;V4
Saint Lucia;LC;J6 Saint Lucia;LC;J6
Saint Martin (French part);MF;FS Saint Martin (French part);MF;FS
@ -193,7 +193,7 @@ Samoa;WS;5W
San Marino;SM;T7 San Marino;SM;T7
Sao Tome and Principe;ST;S9 Sao Tome and Principe;ST;S9
Saudi Arabia;SA;HZ Saudi Arabia;SA;HZ
Scotland;SH;GM Scotland;SH;GM-2M0
Senegal;SN;6V-6W Senegal;SN;6V-6W
Serbia;RS;YT-YU Serbia;RS;YT-YU
Seychelles;SC;S7 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 Sweden;SE;SA-SB-SC-SD-SE-SF-SG-SH-SI-SJ-SK-SL-SM-7S-8S
Switzerland;CH;HB Switzerland;CH;HB
Syrian Arab Republic;SY;YK 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 Tajikistan;TJ;EY
Tanzania, United Republic of;TZ;5H-5I Tanzania United Republic of;TZ;5H-5I
Thailand;TH;HS-E2 Thailand;TH;HS-E2
Timor-Leste;TL;4W Timor-Leste;TL;4W
Togo;TG;5V Togo;TG;5V
@ -239,13 +239,14 @@ United States Minor Outlying Islands;UM;
Uruguay;UY;CV-CW-CX Uruguay;UY;CV-CW-CX
Uzbekistan;UZ;UJ-UK-UL-UM Uzbekistan;UZ;UJ-UK-UL-UM
Vanuatu;VU;YJ 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 Viet Nam;VN;3W-XV
Virgin Islands, British;VG;VP2V Virgin Islands British;VG;VP2V
Virgin Islands, U.S.;VI;KP2 Virgin Islands U.S.;VI;KP2
Wales;WL;2W-GW-MW Wales;WL;2W-GW-MW
Wallis and Futuna;WF;FW Wallis and Futuna;WF;FW
Western Sahara;EH;S0 Western Sahara;EH;S0
Yemen;YE;7O Yemen;YE;7O
Zambia;ZM;9I-9J Zambia;ZM;9I-9J
Zimbabwe;ZW;Z2 Zimbabwe;ZW;Z2
GATE;GATE;REF-XRF

1 Afghanistan AF YA-T6
24 Benin BJ TY
25 Bermuda BM VP9
26 Bhutan BT A5
27 Bolivia, Plurinational State of Bolivia Plurinational State of BO CP
28 Bonaire, Sint Eustatius and Saba Bonaire Sint Eustatius and Saba BQ PJ4
29 Bosnia and Herzegovina BA E7
30 Botswana BW A2
31 Bouvet Island BV 3Y
49 Colombia CO HJ-HK-5J-5K
50 Comoros KM D6
51 Congo CG TN
52 Congo, the Democratic Republic of the Congo the Democratic Republic of the CD 9Q-9R-9S-9T
53 Cook Islands CK E5
54 Costa Rica CR TI-TE
55 Cote d'Ivoire CI TU
102 Iceland IS TF
103 India IN VU
104 Indonesia ID YB-YC-YD-YE-YF-YG-YH
105 Iran, Islamic Republic of Iran Islamic Republic of IR EP-EQ
106 Iraq IQ YI
107 Ireland IE EI-EJ-MI-GI
108 Isle of Man IM GD-GT
109 Israel IL 4X-4Z
110 Italy IT I0-I1-I2-I3-I4-I5-I6-I7-I8-I9-IK-TR-IT-IU-IW-IZ I0-I1-I2-I3-I4-I5-I6-I7-I8-I9-IK-IN-IQ-IR-IS-IT-IU-IW-IZ
111 Jamaica JM 6Y
112 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
113 Jersey JE GJ-GH
115 Kazakhstan KZ UN-UO-UP-UQ
116 Kenya KE 5Y-5Z
117 Kiribati KI T30
118 Korea, Democratic People's Republic of Korea Democratic People's Republic of KP P5
119 Korea, Republic of Korea Republic of KR DS-HL-6K-6L-6M-6N
120 Kuwait KW 9K
121 Kyrgyzstan KG EX
122 Lao People's Democratic Republic LA XW
129 Lithuania LT LY
130 Luxembourg LU LX
131 Macao MO XX9
132 Macedonia, the Former Yugoslav Republic of Macedonia the Former Yugoslav Republic of MK Z3
133 Madagascar MG 5R
134 Malawi MW 7Q
135 Malaysia MY 9M
142 Mauritius MU 3B8
143 Mayotte YT FH-FO
144 Mexico MX XA-XB-XC-XD-XE-XF-XG-XH-XI
145 Micronesia, Federated States of Micronesia Federated States of FM V6
146 Moldova, Republic of Moldova Republic of MD ER
147 Monaco MC 3A
148 Mongolia MN JT-JU-JV
149 Montenegro ME 4O
167 Oman OM YO-YP-YQ-YR
168 Pakistan PK AP
169 Palau PW T8
170 Palestine, State of Palestine State of PS E4
171 Panama PA HO-HP
172 Papua New Guinea PG P2
173 Paraguay PY ZP
182 Romania RO YO-YP-YQ-YR
183 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
184 Rwanda RW 9X
185 Saint Barthlemy Saint Barthelemy BL FJ-TO
186 Saint Helena, Ascension and Tristan da Cunha Saint Helena Ascension and Tristan da Cunha SH ZD9
187 Saint Kitts and Nevis KN V4
188 Saint Lucia LC J6
189 Saint Martin (French part) MF FS
193 San Marino SM T7
194 Sao Tome and Principe ST S9
195 Saudi Arabia SA HZ
196 Scotland SH GM GM-2M0
197 Senegal SN 6V-6W
198 Serbia RS YT-YU
199 Seychelles SC S7
216 Sweden SE SA-SB-SC-SD-SE-SF-SG-SH-SI-SJ-SK-SL-SM-7S-8S
217 Switzerland CH HB
218 Syrian Arab Republic SY YK
219 Taiwan, Province of China Taiwan Province of China TW BU-BV-BW-BX
220 Tajikistan TJ EY
221 Tanzania, United Republic of Tanzania United Republic of TZ 5H-5I
222 Thailand TH HS-E2
223 Timor-Leste TL 4W
224 Togo TG 5V
239 Uruguay UY CV-CW-CX
240 Uzbekistan UZ UJ-UK-UL-UM
241 Vanuatu VU YJ
242 Venezuela, Bolivarian Republic of Venezuela Bolivarian Republic of VE YV-YW-YX-YY-4M
243 Viet Nam VN 3W-XV
244 Virgin Islands, British Virgin Islands British VG VP2V
245 Virgin Islands, U.S. Virgin Islands U.S. VI KP2
246 Wales WL 2W-GW-MW
247 Wallis and Futuna WF FW
248 Western Sahara EH S0
249 Yemen YE 7O
250 Zambia ZM 9I-9J
251 Zimbabwe ZW Z2
252 GATE GATE REF-XRF

22
dashboard/pgs/repeaters.php Executable file → Normal file
View File

@ -33,13 +33,21 @@ for ($i=0;$i<$Reflector->NodeCount();$i++) {
if ($Reflector->Nodes[$i]->GetSuffix() != "") { echo '-'.$Reflector->Nodes[$i]->GetSuffix(); } if ($Reflector->Nodes[$i]->GetSuffix() != "") { echo '-'.$Reflector->Nodes[$i]->GetSuffix(); }
echo '</a></td> echo '</a></td>
<td>'; <td>';
switch ($Reflector->Nodes[$i]->GetSuffix()) { if (($Reflector->Nodes[$i]->GetPrefix() == 'REF') || ($Reflector->Nodes[$i]->GetPrefix() == 'XRF')) {
case 'A' : echo '23cm'; break; switch ($Reflector->Nodes[$i]->GetPrefix()) {
case 'B' : echo '70cm'; break; case 'REF' : echo 'REF-Link'; break;
case 'C' : echo '2m'; break; case 'XRF' : echo 'XRF-Link'; break;
case 'D' : echo 'dongle'; break; }
case 'G' : echo 'Internet-Gateway'; break; }
default : echo ''; 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 '</td> echo '</td>
<td>'.date("d.m.Y H:i", $Reflector->Nodes[$i]->GetLastHeardTime()).'</td> <td>'.date("d.m.Y H:i", $Reflector->Nodes[$i]->GetLastHeardTime()).'</td>