From 83428eeb1c49294616fa7c154d1bd698b25396b2 Mon Sep 17 00:00:00 2001
From: HB9HIL <fabian.berg@hb9hil.org>
Date: Thu, 8 Aug 2024 12:53:28 +0200
Subject: [PATCH] resorted user fields

---
 install/index.php | 294 +++++++++++++++++++++++-----------------------
 1 file changed, 146 insertions(+), 148 deletions(-)

diff --git a/install/index.php b/install/index.php
index 2a865011a..4bab6e7f4 100644
--- a/install/index.php
+++ b/install/index.php
@@ -476,158 +476,14 @@ if (!file_exists('.lock')) {
 											<div class="alert" id="userform_warnings" style="display: none; margin-top: 10px;"></div>
 										</div>
 									</div>
-
 									<div class="row">
 										<div class="col-md-6 mb-2">
 											<label for="firstname" class="form-label"><?= __("First Name"); ?></label>
 											<input type="text" id="firstname" tabindex="1" placeholder="Ham" class="form-control" name="firstname" />
 										</div>
-										<div class="col-md-6 mb-2">
-											<label for="username" class="form-label"><?= __("Username"); ?></label>
-											<input type="text" id="username" tabindex="7" placeholder="ham.radio" class="form-control" name="username" />
-										</div>
-									</div>
-									<div class="row">
-										<div class="col-md-6 mb-2">
-											<label for="lastname" class="form-label"><?= __("Last Name"); ?></label>
-											<input type="text" id="lastname" tabindex="2" placeholder="Radio" class="form-control" name="lastname" />
-										</div>
-										<div class="col-md-6 mb-2 position-relative">
-											<label for="password" class="form-label"><?= __("Password"); ?></label>
-											<input type="password" id="password" tabindex="8" placeholder="**********" class="form-control" name="password" />
-										</div>
-									</div>
-									<div class="row">
-										<div class="col-md-6 mb-2">
-											<label for="callsign" class="form-label"><?= __("Callsign"); ?></label>
-											<input type="text" id="callsign" tabindex="3" placeholder="4W7EST" class="form-control uppercase" name="callsign" />
-										</div>
-										<div class="col-md-6 mb-2">
-											<label for="cnfm_password" class="form-label"><?= __("Confirm Password"); ?></label>
-											<input type="password" id="cnfm_password" tabindex="9" placeholder="**********" class="form-control" name="cnfm_password" />
-										</div>
-									</div>
-									<div class="row">
-										<div class="col-md-6 mb-2">
-											<label for="city" class="form-label"><?= __("City"); ?></label>
-											<input type="text" id="city" tabindex="4" placeholder="City" class="form-control" name="city" />
-										</div>
-										<div class="col-md-6 mb-2">
-											<label for="user_email" class="form-label"><?= __("E-Mail Address"); ?></label>
-											<input type="email" id="user_email" tabindex="10" placeholder="ham.radio@example.com" class="form-control mb-2" name="user_email" />
-										</div>
-									</div>
-									<div class="row">
-										<div class="col-md-6 mb-2">
-											<label for="userlocator" class="form-label"><?= __("Gridsquare/Locator"); ?></label>
-											<input type="text" id="userlocator" tabindex="5" placeholder="HA44AA" class="form-control uppercase" name="userlocator" />
-										</div>
-										<div class="col-md-6 mb-2">
-											<label for="timezone" class="form-label"><?= __("Timezone"); ?></label>
-											<select id="timezone" tabindex="11" class="form-select" name="timezone">
-												<?php
-												// timezones
-												$timezones = [
-													['1', '-12.0', '(GMT-12:00)-International Date Line West'],
-													['4', '-9.0', '(GMT-09:00)-Alaska'],
-													['5', '-8.0', '(GMT-08:00)-Pacific Time (US & Canada); Tijuana'],
-													['6', '-7.0', '(GMT-07:00)-Arizona'],
-													['8', '-7.0', '(GMT-07:00)-Mountain Time (US & Canada)'],
-													['13', '-5.0', '(GMT-05:00)-Bogota, Lima, Quito'],
-													['15', '-5.0', '(GMT-05:00)-Indiana (East)'],
-													['17', '-4.0', '(GMT-04:00)-La Paz'],
-													['19', '-3.5', '(GMT-03:30)-Newfoundland'],
-													['22', '-3.0', '(GMT-03:00)-Greenland'],
-													['23', '-2.0', '(GMT-02:00)-Mid-Atlantic'],
-													['0', '0.0', '(GMT+00:00)-Greenwich Mean Time: Dublin, Edinburgh, Lisbon, London', true],
-													['30', '1.0', '(GMT+01:00)-Brussels, Copenhagen, Madrid, Paris'],
-													['31', '1.0', '(GMT+01:00)-Sarajevo, Skopje, Warsaw, Zagreb'],
-													['35', '2.0', '(GMT+02:00)-Cairo'],
-													['36', '2.0', '(GMT+02:00)-Harare, Pretoria'],
-													['38', '2.0', '(GMT+02:00)-Jerusalem'],
-													['39', '3.0', '(GMT+03:00)-Baghdad'],
-													['41', '3.0', '(GMT+03:00)-Moscow, St. Petersburg, Volgograd'],
-													['43', '3.5', '(GMT+03:30)-Tehran'],
-													['44', '4.0', '(GMT+04:00)-Abu Dhabi, Muscat'],
-													['45', '4.0', '(GMT+04:00)-Baku, Tbilisi, Yerevan'],
-													['46', '4.5', '(GMT+04:30)-Kabul'],
-													['51', '6.0', '(GMT+06:00)-Almaty, Novosibirsk'],
-													['54', '6.5', '(GMT+06:30)-Rangoon'],
-													['55', '7.0', '(GMT+07:00)-Bangkok, Hanoi, Jakarta'],
-													['56', '7.0', '(GMT+07:00)-Krasnoyarsk'],
-													['58', '8.0', '(GMT+08:00)-Irkutsk, Ulaan Bataar'],
-													['59', '8.0', '(GMT+08:00)-Kuala Lumpur, Singapore'],
-													['60', '8.0', '(GMT+08:00)-Perth'],
-													['63', '9.0', '(GMT+09:00)-Seoul'],
-													['64', '9.0', '(GMT+09:00)-Vakutsk'],
-													['66', '9.5', '(GMT+09:30)-Darwin'],
-													['69', '10.0', '(GMT+10:00)-Guam, Port Moresby'],
-													['71', '10.0', '(GMT+10:00)-Vladivostok'],
-													['74', '12.0', '(GMT+12:00)-Fiji, Kamchatka, Marshall Is.'],
-													['76', '-11.0', '(GMT-11:00)-Midway Island, Samoa'],
-													['77', '-10.0', '(GMT-10:00)-Hawaii'],
-													['81', '-7.0', '(GMT-07:00)-Chihuahua, La Paz, Mazatlan'],
-													['83', '-6.0', '(GMT-06:00)-Central America'],
-													['84', '-6.0', '(GMT-06:00)-Central Time (US & Canada)'],
-													['85', '-6.0', '(GMT-06:00)-Guadalajara, Mexico City, Monterrey'],
-													['86', '-6.0', '(GMT-06:00)-Saskatchewan'],
-													['88', '-5.0', '(GMT-05:00)-Eastern Time (US & Canada)'],
-													['90', '-4.0', '(GMT-04:00)-Atlantic Time (Canada)'],
-													['91', '-4.0', '(GMT-04:00)-Caracas, La Paz'],
-													['92', '-4.0', '(GMT-04:00)-Santiago'],
-													['94', '-3.0', '(GMT-03:00)-Brasilia'],
-													['95', '-3.0', '(GMT-03:00)-Buenos Aires, Georgetown'],
-													['98', '-1.0', '(GMT-01:00)-Azores'],
-													['99', '-1.0', '(GMT-01:00)-Cape Verde Is.'],
-													['100', '0.0', '(GMT+00:00)-Casablanca, Monrovia'],
-													['102', '1.0', '(GMT+01:00)-Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna'],
-													['103', '1.0', '(GMT+01:00)-Belgrade, Bratislava, Budapest, Ljubljana, Prague'],
-													['106', '1.0', '(GMT+01:00)-West Central Africa'],
-													['107', '2.0', '(GMT+02:00)-Athens, Beirut, Istanbul, Minsk'],
-													['108', '2.0', '(GMT+02:00)-Bucharest'],
-													['111', '2.0', '(GMT+02:00)-Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius'],
-													['114', '3.0', '(GMT+03:00)-Kuwait, Riyadh'],
-													['116', '3.0', '(GMT+03:00)-Nairobi'],
-													['121', '5.0', '(GMT+05:00)-Ekaterinburg'],
-													['122', '5.0', '(GMT+05:00)-Islamabad, Karachi, Tashkent'],
-													['123', '5.5', '(GMT+05:30)-Chennai, Kolkata, Mumbai, New Delhi'],
-													['124', '5.8', '(GMT+05:45)-Kathmandu'],
-													['126', '6.0', '(GMT+06:00)-Astana, Dhaka'],
-													['127', '6.0', '(GMT+06:00)-Sri Jayawardenepura'],
-													['129', '7.0', '(GMT+07:00)-Bangkok, Hanoi, Jakarta'],
-													['131', '8.0', '(GMT+08:00)-Beijing, Chongqing, Hong Kong, Urumqi'],
-													['135', '8.0', '(GMT+08:00)-Taipei'],
-													['136', '9.0', '(GMT+09:00)-Osaka, Sapporo, Tokyo'],
-													['139', '9.5', '(GMT+09:30)-Adelaide'],
-													['141', '10.0', '(GMT+10:00)-Brisbane'],
-													['142', '10.0', '(GMT+10:00)-Canberra, Melbourne, Sydney'],
-													['144', '10.0', '(GMT+10:00)-Hobart'],
-													['146', '11.0', '(GMT+11:00)-Magadan, Solomon Is., New Caledonia'],
-													['147', '12.0', '(GMT+12:00)-Auckland, Wellington'],
-													['149', '13.0', '(GMT+13:00)-Nuku\'alofa'],
-													['150', '-4.5', '(GMT-04:30)-Caracas'],
-												];
-
-												usort($timezones, function ($a, $b) {
-													return strcmp($a[1], $b[1]);
-												});
-
-												// Loop through timezones to generate options
-												foreach ($timezones as $timezone) {
-													$value = $timezone[0];
-													$label = $timezone[2];
-													$selected = isset($timezone[3]) && $timezone[3] ? 'selected' : '';
-
-													echo '<option value="' . $value . '" ' . $selected . '>' . $label . '</option>';
-												}
-												?>
-											</select>
-										</div>
-									</div>
-									<div class="row">
 										<div class="col-md-6 mb-2">
 											<label for="dxcc" class="form-label"><?= __("DXCC"); ?></label>
-											<select class="form-control" id="dxcc_id" name="dxcc" tabindex="6" aria-describedby="stationCallsignInputHelp">
+											<select class="form-control" id="dxcc_id" name="dxcc" tabindex="7" aria-describedby="stationCallsignInputHelp">
 												<option value="0" selected=""><?= _pgettext("No DXCC", "- None -"); ?></option>
 												<option value="2">Abu Ail Is - A1 (<?= __("Deleted DXCC"); ?>)</option>
 												<option value="3">Afghanistan - YA</option>
@@ -1033,6 +889,149 @@ if (!file_exists('.lock')) {
 												<option value="452">Zimbabwe - Z2</option>
 											</select>
 										</div>
+									</div>
+									<div class="row">
+										<div class="col-md-6 mb-2">
+											<label for="lastname" class="form-label"><?= __("Last Name"); ?></label>
+											<input type="text" id="lastname" tabindex="2" placeholder="Radio" class="form-control" name="lastname" />
+										</div>
+										<div class="col-md-6 mb-2">
+											<label for="callsign" class="form-label"><?= __("Callsign"); ?></label>
+											<input type="text" id="callsign" tabindex="8" placeholder="4W7EST" class="form-control uppercase" name="callsign" />
+										</div>
+									</div>
+									<div class="row">
+										<div class="col-md-6 mb-2">
+											<label for="username" class="form-label"><?= __("Username"); ?></label>
+											<input type="text" id="username" tabindex="3" placeholder="ham.radio" class="form-control" name="username" />
+										</div>
+										<div class="col-md-6 mb-2">
+											<label for="userlocator" class="form-label"><?= __("Gridsquare/Locator"); ?></label>
+											<input type="text" id="userlocator" tabindex="9" placeholder="HA44AA" class="form-control uppercase" name="userlocator" />
+										</div>
+									</div>
+									<div class="row">
+										<div class="col-md-6 mb-2 position-relative">
+											<label for="password" class="form-label"><?= __("Password"); ?></label>
+											<input type="password" id="password" tabindex="4" placeholder="**********" class="form-control" name="password" />
+										</div>
+										<div class="col-md-6 mb-2">
+											<label for="city" class="form-label"><?= __("City"); ?></label>
+											<input type="text" id="city" tabindex="10" placeholder="City" class="form-control" name="city" />
+										</div>
+									</div>
+									<div class="row">
+										<div class="col-md-6 mb-2">
+											<label for="cnfm_password" class="form-label"><?= __("Confirm Password"); ?></label>
+											<input type="password" id="cnfm_password" tabindex="5" placeholder="**********" class="form-control" name="cnfm_password" />
+										</div>
+										<div class="col-md-6 mb-2">
+											<label for="timezone" class="form-label"><?= __("Timezone"); ?></label>
+											<select id="timezone" tabindex="11" class="form-select" name="timezone">
+												<?php
+												// timezones
+												$timezones = [
+													['1', '-12.0', '(GMT-12:00)-International Date Line West'],
+													['4', '-9.0', '(GMT-09:00)-Alaska'],
+													['5', '-8.0', '(GMT-08:00)-Pacific Time (US & Canada); Tijuana'],
+													['6', '-7.0', '(GMT-07:00)-Arizona'],
+													['8', '-7.0', '(GMT-07:00)-Mountain Time (US & Canada)'],
+													['13', '-5.0', '(GMT-05:00)-Bogota, Lima, Quito'],
+													['15', '-5.0', '(GMT-05:00)-Indiana (East)'],
+													['17', '-4.0', '(GMT-04:00)-La Paz'],
+													['19', '-3.5', '(GMT-03:30)-Newfoundland'],
+													['22', '-3.0', '(GMT-03:00)-Greenland'],
+													['23', '-2.0', '(GMT-02:00)-Mid-Atlantic'],
+													['0', '0.0', '(GMT+00:00)-Greenwich Mean Time: Dublin, Edinburgh, Lisbon, London', true],
+													['30', '1.0', '(GMT+01:00)-Brussels, Copenhagen, Madrid, Paris'],
+													['31', '1.0', '(GMT+01:00)-Sarajevo, Skopje, Warsaw, Zagreb'],
+													['35', '2.0', '(GMT+02:00)-Cairo'],
+													['36', '2.0', '(GMT+02:00)-Harare, Pretoria'],
+													['38', '2.0', '(GMT+02:00)-Jerusalem'],
+													['39', '3.0', '(GMT+03:00)-Baghdad'],
+													['41', '3.0', '(GMT+03:00)-Moscow, St. Petersburg, Volgograd'],
+													['43', '3.5', '(GMT+03:30)-Tehran'],
+													['44', '4.0', '(GMT+04:00)-Abu Dhabi, Muscat'],
+													['45', '4.0', '(GMT+04:00)-Baku, Tbilisi, Yerevan'],
+													['46', '4.5', '(GMT+04:30)-Kabul'],
+													['51', '6.0', '(GMT+06:00)-Almaty, Novosibirsk'],
+													['54', '6.5', '(GMT+06:30)-Rangoon'],
+													['55', '7.0', '(GMT+07:00)-Bangkok, Hanoi, Jakarta'],
+													['56', '7.0', '(GMT+07:00)-Krasnoyarsk'],
+													['58', '8.0', '(GMT+08:00)-Irkutsk, Ulaan Bataar'],
+													['59', '8.0', '(GMT+08:00)-Kuala Lumpur, Singapore'],
+													['60', '8.0', '(GMT+08:00)-Perth'],
+													['63', '9.0', '(GMT+09:00)-Seoul'],
+													['64', '9.0', '(GMT+09:00)-Vakutsk'],
+													['66', '9.5', '(GMT+09:30)-Darwin'],
+													['69', '10.0', '(GMT+10:00)-Guam, Port Moresby'],
+													['71', '10.0', '(GMT+10:00)-Vladivostok'],
+													['74', '12.0', '(GMT+12:00)-Fiji, Kamchatka, Marshall Is.'],
+													['76', '-11.0', '(GMT-11:00)-Midway Island, Samoa'],
+													['77', '-10.0', '(GMT-10:00)-Hawaii'],
+													['81', '-7.0', '(GMT-07:00)-Chihuahua, La Paz, Mazatlan'],
+													['83', '-6.0', '(GMT-06:00)-Central America'],
+													['84', '-6.0', '(GMT-06:00)-Central Time (US & Canada)'],
+													['85', '-6.0', '(GMT-06:00)-Guadalajara, Mexico City, Monterrey'],
+													['86', '-6.0', '(GMT-06:00)-Saskatchewan'],
+													['88', '-5.0', '(GMT-05:00)-Eastern Time (US & Canada)'],
+													['90', '-4.0', '(GMT-04:00)-Atlantic Time (Canada)'],
+													['91', '-4.0', '(GMT-04:00)-Caracas, La Paz'],
+													['92', '-4.0', '(GMT-04:00)-Santiago'],
+													['94', '-3.0', '(GMT-03:00)-Brasilia'],
+													['95', '-3.0', '(GMT-03:00)-Buenos Aires, Georgetown'],
+													['98', '-1.0', '(GMT-01:00)-Azores'],
+													['99', '-1.0', '(GMT-01:00)-Cape Verde Is.'],
+													['100', '0.0', '(GMT+00:00)-Casablanca, Monrovia'],
+													['102', '1.0', '(GMT+01:00)-Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna'],
+													['103', '1.0', '(GMT+01:00)-Belgrade, Bratislava, Budapest, Ljubljana, Prague'],
+													['106', '1.0', '(GMT+01:00)-West Central Africa'],
+													['107', '2.0', '(GMT+02:00)-Athens, Beirut, Istanbul, Minsk'],
+													['108', '2.0', '(GMT+02:00)-Bucharest'],
+													['111', '2.0', '(GMT+02:00)-Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius'],
+													['114', '3.0', '(GMT+03:00)-Kuwait, Riyadh'],
+													['116', '3.0', '(GMT+03:00)-Nairobi'],
+													['121', '5.0', '(GMT+05:00)-Ekaterinburg'],
+													['122', '5.0', '(GMT+05:00)-Islamabad, Karachi, Tashkent'],
+													['123', '5.5', '(GMT+05:30)-Chennai, Kolkata, Mumbai, New Delhi'],
+													['124', '5.8', '(GMT+05:45)-Kathmandu'],
+													['126', '6.0', '(GMT+06:00)-Astana, Dhaka'],
+													['127', '6.0', '(GMT+06:00)-Sri Jayawardenepura'],
+													['129', '7.0', '(GMT+07:00)-Bangkok, Hanoi, Jakarta'],
+													['131', '8.0', '(GMT+08:00)-Beijing, Chongqing, Hong Kong, Urumqi'],
+													['135', '8.0', '(GMT+08:00)-Taipei'],
+													['136', '9.0', '(GMT+09:00)-Osaka, Sapporo, Tokyo'],
+													['139', '9.5', '(GMT+09:30)-Adelaide'],
+													['141', '10.0', '(GMT+10:00)-Brisbane'],
+													['142', '10.0', '(GMT+10:00)-Canberra, Melbourne, Sydney'],
+													['144', '10.0', '(GMT+10:00)-Hobart'],
+													['146', '11.0', '(GMT+11:00)-Magadan, Solomon Is., New Caledonia'],
+													['147', '12.0', '(GMT+12:00)-Auckland, Wellington'],
+													['149', '13.0', '(GMT+13:00)-Nuku\'alofa'],
+													['150', '-4.5', '(GMT-04:30)-Caracas'],
+												];
+
+												usort($timezones, function ($a, $b) {
+													return strcmp($a[1], $b[1]);
+												});
+
+												// Loop through timezones to generate options
+												foreach ($timezones as $timezone) {
+													$value = $timezone[0];
+													$label = $timezone[2];
+													$selected = isset($timezone[3]) && $timezone[3] ? 'selected' : '';
+
+													echo '<option value="' . $value . '" ' . $selected . '>' . $label . '</option>';
+												}
+												?>
+											</select>
+										</div>
+									</div>
+									<div class="row">
+										<div class="col-md-6 mb-2">
+											<label for="user_email" class="form-label"><?= __("E-Mail Address"); ?></label>
+											<input type="email" id="user_email" tabindex="6" placeholder="ham.radio@example.com" class="form-control mb-2" name="user_email" />
+										</div>
 										<div class="col-md-6 mb-2">
 											<label for="userlanguage" class="form-label"><?= __("Language"); ?></label>
 											<select class="form-select" id="userlanguage" name="userlanguage" tabindex="12">
@@ -1928,7 +1927,7 @@ if (!file_exists('.lock')) {
 					<div class="card-body text-center p-4">
 						<h3 style="margin-top: 50px;"><?= __("PHP Module missing"); ?></h3>
 						<img src="assets/images/danger_triangle.png" alt="danger_triangle" style="max-width: 400px; height: auto; margin-bottom: 50px;">
-						<p><?= __("The following PHP modules are missing:")." <code>".implode(',', installer_required_modules())."</code>"; ?></p>
+						<p><?= __("The following PHP modules are missing:") . " <code>" . implode(',', installer_required_modules()) . "</code>"; ?></p>
 						<p><?= __("Without this module the Wavelog Installer does not work!"); ?></p>
 						<p><?= __("Please install the required modules and restart the webserver."); ?></p>
 					</div>
@@ -1941,7 +1940,6 @@ if (!file_exists('.lock')) {
 <?php } else {
 
 	header("Location: $websiteurl");
-
 } ?>
 
-</html>
+</html>
\ No newline at end of file