Migrate more tables to .units-table (#3682)

* Migrate List Server Preview to .units-table

* Migrate List Updates to .units-table

* Apply some Prettier formatting

web/templates/includes/panel.php

@@ -141,7 +141,7 @@
 								<!-- Hide file manager when impersonating admin-->
 							<?php } else { ?>
 								<li class="top-bar-menu-item">
-									<a title="<?= _("File manager") ?>" class="top-bar-menu-link <?php if($TAB == 'FM') echo 'active' ?>" href="/fm/">
+									<a title="<?= _("File manager") ?>" class="top-bar-menu-link <?php if ($TAB == 'FM') echo 'active' ?>" href="/fm/">
 										<i class="fas fa-folder-open"></i>
 										<span class="top-bar-menu-link-label u-hide-desktop"><?= _("File manager") ?></span>
 									</a>
@@ -155,7 +155,7 @@
 								<!-- Hide 'Server Settings' button when impersonating 'admin' or other users -->
 							<?php } else { ?>
 								<li class="top-bar-menu-item">
-									<a title="<?= _("Server settings") ?>" class="top-bar-menu-link <?php if(in_array($TAB, ['SERVER', 'IP', 'RRD', 'FIREWALL'])) echo 'active' ?>" href="/list/server/">
+									<a title="<?= _("Server settings") ?>" class="top-bar-menu-link <?php if (in_array($TAB, ['SERVER', 'IP', 'RRD', 'FIREWALL'])) echo 'active' ?>" href="/list/server/">
 										<i class="fas fa-gear"></i>
 										<span class="top-bar-menu-link-label u-hide-desktop"><?= _("Server settings") ?></span>
 									</a>
@@ -167,7 +167,7 @@
 						<?php if ($_SESSION["userContext"] === "admin" && (isset($_SESSION["look"]) && $user == "admin")) { ?>
 							<!-- Hide 'edit user' entry point from other administrators for default 'admin' account-->
 							<li class="top-bar-menu-item">
-								<a title="<?= _("Logs") ?>" class="top-bar-menu-link <?php if($TAB == 'LOG') echo 'active' ?>" href="/list/log/">
+								<a title="<?= _("Logs") ?>" class="top-bar-menu-link <?php if ($TAB == 'LOG') echo 'active' ?>" href="/list/log/">
 									<i class="fas fa-clock-rotate-left"></i>
 									<span class="top-bar-menu-link-label u-hide-desktop"><?= _("Logs") ?></span>
 								</a>
@@ -185,7 +185,7 @@
 
 						<!-- Statistics -->
 						<li class="top-bar-menu-item">
-							<a title="<?= _("Statistics") ?>" class="top-bar-menu-link <?php if($TAB == 'STATS') echo 'active' ?>" href="/list/stats/">
+							<a title="<?= _("Statistics") ?>" class="top-bar-menu-link <?php if ($TAB == 'STATS') echo 'active' ?>" href="/list/stats/">
 								<i class="fas fa-chart-line"></i>
 								<span class="top-bar-menu-link-label u-hide-desktop"><?= _("Statistics") ?></span>
 							</a>
@@ -239,7 +239,7 @@
 			<ul x-cloak x-show="open" class="main-menu-list">
 
 				<!-- Users tab -->
-				<?php if (($_SESSION['userContext'] == 'admin') && (empty($_SESSION['look']))) {?>
+				<?php if (($_SESSION['userContext'] == 'admin') && (empty($_SESSION['look']))) { ?>
 					<?php
 						if (($_SESSION['user'] !== 'admin') && ($_SESSION['POLICY_SYSTEM_HIDE_ADMIN'] === 'yes')) {
 							$user_count = $panel[$user]['U_USERS'] - 1;
@@ -248,7 +248,7 @@
 						}
 					?>
 					<li class="main-menu-item">
-						<a class="main-menu-item-link <?php if(in_array($TAB, ['USER', 'LOG'])) echo 'active' ?>" href="/list/user/" title="<?= _("Users") ?>: <?=$user_count;?>&#13;<?= _("Suspended") ?>: <?=$panel[$user]['SUSPENDED_USERS']?>">
+						<a class="main-menu-item-link <?php if (in_array($TAB, ['USER', 'LOG'])) echo 'active' ?>" href="/list/user/" title="<?= _("Users") ?>: <?= $user_count;?>&#13;<?= _("Suspended") ?>: <?= $panel[$user]['SUSPENDED_USERS'] ?>">
 							<p class="main-menu-item-label"><?= _("USER") ?><i class="fas fa-users"></i></p>
 							<ul class="main-menu-stats">
 								<li>
@@ -266,7 +266,7 @@
 				<?php if (isset($_SESSION["WEB_SYSTEM"]) && !empty($_SESSION["WEB_SYSTEM"])) { ?>
 					<?php if ($panel[$user]["WEB_DOMAINS"] != "0") { ?>
 						<li class="main-menu-item">
-							<a class="main-menu-item-link <?php if($TAB == 'WEB') echo 'active' ?>" href="/list/web/" title="<?= _("Domains") ?>: <?=$panel[$user]['U_WEB_DOMAINS']?>&#13;<?= _("Aliases") ?>: <?=$panel[$user]['U_WEB_ALIASES']?>&#13;<?= _("Limit") ?>: <?=$panel[$user]['WEB_DOMAINS']=='unlimited' ? "∞" : $panel[$user]['WEB_DOMAINS']?>&#13;<?= _("Suspended") ?>: <?=$panel[$user]['SUSPENDED_WEB']?>">
+							<a class="main-menu-item-link <?php if ($TAB == 'WEB') echo 'active' ?>" href="/list/web/" title="<?= _("Domains") ?>: <?= $panel[$user]['U_WEB_DOMAINS'] ?>&#13;<?= _("Aliases") ?>: <?= $panel[$user]['U_WEB_ALIASES'] ?>&#13;<?= _("Limit") ?>: <?= $panel[$user]['WEB_DOMAINS']=='unlimited' ? "∞" : $panel[$user]['WEB_DOMAINS'] ?>&#13;<?= _("Suspended") ?>: <?= $panel[$user]['SUSPENDED_WEB'] ?>">
 								<p class="main-menu-item-label"><?= _("WEB") ?><i class="fas fa-earth-americas"></i></p>
 								<ul class="main-menu-stats">
 									<li>
@@ -285,7 +285,7 @@
 				<?php if (isset($_SESSION["DNS_SYSTEM"]) && !empty($_SESSION["DNS_SYSTEM"])) { ?>
 					<?php if ($panel[$user]["DNS_DOMAINS"] != "0") { ?>
 						<li class="main-menu-item">
-							<a class="main-menu-item-link <?php if($TAB == 'DNS') echo 'active' ?>" href="/list/dns/" title="<?= _("Domains") ?>: <?=$panel[$user]['U_DNS_DOMAINS']?>&#13;<?= _("Limit") ?>: <?=$panel[$user]['DNS_DOMAINS']=='unlimited' ? "∞" : $panel[$user]['DNS_DOMAINS']?>&#13;<?= _("Suspended") ?>: <?=$panel[$user]['SUSPENDED_DNS']?>">
+							<a class="main-menu-item-link <?php if ($TAB == 'DNS') echo 'active' ?>" href="/list/dns/" title="<?= _("Domains") ?>: <?= $panel[$user]['U_DNS_DOMAINS'] ?>&#13;<?= _("Limit") ?>: <?= $panel[$user]['DNS_DOMAINS']=='unlimited' ? "∞" : $panel[$user]['DNS_DOMAINS'] ?>&#13;<?= _("Suspended") ?>: <?= $panel[$user]['SUSPENDED_DNS'] ?>">
 								<p class="main-menu-item-label"><?= _("DNS") ?><i class="fas fa-book-atlas"></i></p>
 								<ul class="main-menu-stats">
 									<li>
@@ -304,14 +304,14 @@
 				<?php if (isset($_SESSION["MAIL_SYSTEM"]) && !empty($_SESSION["MAIL_SYSTEM"])) { ?>
 					<?php if ($panel[$user]["MAIL_DOMAINS"] != "0") { ?>
 						<li class="main-menu-item">
-							<a class="main-menu-item-link <?php if($TAB == 'MAIL') echo 'active' ?>" href="/list/mail/" title="<?= _("Domains") ?>: <?=$panel[$user]['U_MAIL_DOMAINS']?>&#13;<?= _("Limit") ?>: <?=$panel[$user]['MAIL_DOMAINS']=='unlimited' ? "∞" : $panel[$user]['MAIL_DOMAINS']?>&#13;<?= _("Suspended") ?>: <?=$panel[$user]['SUSPENDED_MAIL']?>">
+							<a class="main-menu-item-link <?php if ($TAB == 'MAIL') echo 'active' ?>" href="/list/mail/" title="<?= _("Domains") ?>: <?= $panel[$user]['U_MAIL_DOMAINS'] ?>&#13;<?= _("Limit") ?>: <?= $panel[$user]['MAIL_DOMAINS']=='unlimited' ? "∞" : $panel[$user]['MAIL_DOMAINS'] ?>&#13;<?= _("Suspended") ?>: <?= $panel[$user]['SUSPENDED_MAIL'] ?>">
 								<p class="main-menu-item-label"><?= _("MAIL") ?><i class="fas fa-envelopes-bulk"></i></p>
 								<ul class="main-menu-stats">
 									<li>
 										<?= _("Domains") ?>: <span><?= $panel[$user]["U_MAIL_DOMAINS"] ?> / <?= $panel[$user]["MAIL_DOMAINS"] == "unlimited" ? "<b>∞</b>" : $panel[$user]["MAIL_DOMAINS"] ?> (<?= $panel[$user]["SUSPENDED_MAIL"] ?>)</span>
 									</li>
 									<li>
-										<?= _("Accounts") ?>: <span><?=$panel[$user]['U_MAIL_ACCOUNTS']?> / <?=$panel[$user]['MAIL_ACCOUNTS']=='unlimited' || $panel[$user]['MAIL_DOMAINS']=='unlimited' ? "<b>∞</b>" : $panel[$user]['MAIL_ACCOUNTS'] * $panel[$user]['MAIL_DOMAINS']?></span>
+										<?= _("Accounts") ?>: <span><?= $panel[$user]['U_MAIL_ACCOUNTS'] ?> / <?= $panel[$user]['MAIL_ACCOUNTS']=='unlimited' || $panel[$user]['MAIL_DOMAINS']=='unlimited' ? "<b>∞</b>" : $panel[$user]['MAIL_ACCOUNTS'] * $panel[$user]['MAIL_DOMAINS'] ?></span>
 									</li>
 								</ul>
 							</a>
@@ -323,7 +323,7 @@
 				<?php if (isset($_SESSION["DB_SYSTEM"]) && !empty($_SESSION["DB_SYSTEM"])) { ?>
 					<?php if ($panel[$user]["DATABASES"] != "0") { ?>
 						<li class="main-menu-item">
-							<a class="main-menu-item-link <?php if($TAB == 'DB') echo 'active' ?>" href="/list/db/" title="<?= _("Databases") ?>: <?=$panel[$user]['U_DATABASES']?>&#13;<?= _("Limit") ?>: <?=$panel[$user]['DATABASES']=='unlimited' ? "∞" : $panel[$user]['DATABASES']?>&#13;<?= _("Suspended") ?>: <?=$panel[$user]['SUSPENDED_DB']?>">
+							<a class="main-menu-item-link <?php if ($TAB == 'DB') echo 'active' ?>" href="/list/db/" title="<?= _("Databases") ?>: <?= $panel[$user]['U_DATABASES'] ?>&#13;<?= _("Limit") ?>: <?= $panel[$user]['DATABASES']=='unlimited' ? "∞" : $panel[$user]['DATABASES'] ?>&#13;<?= _("Suspended") ?>: <?= $panel[$user]['SUSPENDED_DB'] ?>">
 								<p class="main-menu-item-label"><?= _("DB") ?><i class="fas fa-database"></i></p>
 								<ul class="main-menu-stats">
 									<li>
@@ -339,7 +339,7 @@
 				<?php if (isset($_SESSION["CRON_SYSTEM"]) && !empty($_SESSION["CRON_SYSTEM"])) { ?>
 					<?php if ($panel[$user]["CRON_JOBS"] != "0") { ?>
 						<li class="main-menu-item">
-							<a class="main-menu-item-link <?php if($TAB == 'CRON') echo 'active' ?>" href="/list/cron/" title="<?= _("Jobs") ?>: <?=$panel[$user]['U_WEB_DOMAINS']?>&#13;<?= _("Limit") ?>: <?=$panel[$user]['CRON_JOBS']=='unlimited' ? "∞" : $panel[$user]['CRON_JOBS']?>&#13;<?= _("Suspended") ?>: <?=$panel[$user]['SUSPENDED_CRON']?>">
+							<a class="main-menu-item-link <?php if ($TAB == 'CRON') echo 'active' ?>" href="/list/cron/" title="<?= _("Jobs") ?>: <?= $panel[$user]['U_WEB_DOMAINS'] ?>&#13;<?= _("Limit") ?>: <?= $panel[$user]['CRON_JOBS']=='unlimited' ? "∞" : $panel[$user]['CRON_JOBS'] ?>&#13;<?= _("Suspended") ?>: <?= $panel[$user]['SUSPENDED_CRON'] ?>">
 								<p class="main-menu-item-label"><?= _("CRON") ?><i class="fas fa-clock"></i></p>
 								<ul class="main-menu-stats">
 									<li>
@@ -355,7 +355,7 @@
 				<?php if (isset($_SESSION["BACKUP_SYSTEM"]) && !empty($_SESSION["BACKUP_SYSTEM"])) { ?>
 					<?php if ($panel[$user]["BACKUPS"] != "0" || $panel[$user]["U_BACKUPS"] != "0") { ?>
 						<li class="main-menu-item">
-							<a class="main-menu-item-link <?php if($TAB == 'BACKUP') echo 'active' ?>" href="/list/backup/" title="<?= _("Backups") ?>: <?=$panel[$user]['U_BACKUPS']?>&#13;<?= _("Limit") ?>: <?=$panel[$user]['BACKUPS']=='unlimited' ? "∞" : $panel[$user]['BACKUPS']?>">
+							<a class="main-menu-item-link <?php if ($TAB == 'BACKUP') echo 'active' ?>" href="/list/backup/" title="<?= _("Backups") ?>: <?= $panel[$user]['U_BACKUPS'] ?>&#13;<?= _("Limit") ?>: <?= $panel[$user]['BACKUPS']=='unlimited' ? "∞" : $panel[$user]['BACKUPS'] ?>">
 								<p class="main-menu-item-label"><?= _("BACKUP") ?><i class="fas fa-file-zipper"></i></p>
 								<ul class="main-menu-stats">
 									<li>

web/templates/pages/add_dns.php

@@ -90,7 +90,7 @@
 				<div x-cloak  x-show="showAdvanced" id="advtable">
 					<?php if ($_SESSION["DNS_CLUSTER_SYSTEM"] == "hestia-zone" && $_SESSION["SUPPORT_DNSSEC"] == "yes") { ?>
 					<div class="form-check u-mb10">
-						<input class="form-check-input" type="checkbox" name="v_dnssec" id="v_dnssec" value="yes" <?php if($v_dnssec === 'yes'){ echo ' checked'; } ?>>
+						<input class="form-check-input" type="checkbox" name="v_dnssec" id="v_dnssec" value="yes" <?php if ($v_dnssec === 'yes'){ echo ' checked'; } ?>>
 						<label for="v_dnssec">
 							<?= _("Enable DNSSEC") ?>
 						</label>

web/templates/pages/add_mail.php

@@ -60,7 +60,7 @@
 								echo ">".htmlentities(ucfirst($client))."</option>\n";
 								}
 							?>
-							<option value="" <?php if (empty($v_webmail) || $v_webmail == 'disabled' ){ echo "selected";}?>><?= _("Disabled") ?></option>
+							<option value="" <?php if (empty($v_webmail) || $v_webmail == 'disabled' ){ echo "selected"; }?>><?= _("Disabled") ?></option>
 						</select>
 					</div>
 				<?php } ?>
@@ -78,7 +78,7 @@
 						</label>
 					</div>
 				<?php } ?>
-				<?php if (!empty($_SESSION['ANTIVIRUS_SYSTEM'])) {?>
+				<?php if (!empty($_SESSION['ANTIVIRUS_SYSTEM'])) { ?>
 					<div class="form-check u-mb10">
 						<input class="form-check-input" type="checkbox" name="v_antivirus" id="v_antivirus" <?php if ((empty($v_antivirus)) || ($v_antivirus == 'yes')) echo 'checked'; ?>>
 						<label for="v_antivirus">

web/templates/pages/add_mail_acc.php

@@ -89,7 +89,7 @@
 							<label for="v_fwd" class="form-label">
 								<?= _("Forward to") ?> <span class="optional">(<?= _("One or more email addresses") ?>)</span>
 							</label>
-							<textarea class="form-control js-forward-to-textarea" name="v_fwd" id="v_fwd" <?php if($v_blackhole == 'yes') echo "disabled";?>><?=htmlentities(trim($v_fwd, "'"))?></textarea>
+							<textarea class="form-control js-forward-to-textarea" name="v_fwd" id="v_fwd" <?php if ($v_blackhole == 'yes') echo "disabled"; ?>><?= htmlentities(trim($v_fwd, "'")) ?></textarea>
 						</div>
 						<div class="form-check">
 							<input class="form-check-input js-discard-all-mail" type="checkbox" name="v_blackhole" id="v_blackhole" <?php if ($v_blackhole == 'yes') echo 'checked' ?>>
@@ -107,7 +107,7 @@
 							<label for="v_rate" class="form-label">
 								<?= _("Rate Limit") ?> <span class="optional">(<?= _("email / hour") ?>)</span>
 							</label>
-							<input type="text" class="form-control" name="v_rate" id="v_rate" value="<?=htmlentities(trim($v_rate, "'"))?>" <?php if($_SESSION['userContext'] != "admin"){ echo "disabled";}?>>
+							<input type="text" class="form-control" name="v_rate" id="v_rate" value="<?= htmlentities(trim($v_rate, "'")) ?>" <?php if ($_SESSION['userContext'] != "admin"){ echo "disabled"; }?>>
 						</div>
 					</div>
 					<div class="u-mt15 u-mb20">

web/templates/pages/edit_dns.php

@@ -66,7 +66,7 @@
 			<?php } ?>
 			<?php if ($_SESSION["DNS_CLUSTER_SYSTEM"] == "hestia-zone" && $_SESSION["SUPPORT_DNSSEC"] == "yes") { ?>
 			<div class="form-check u-mb10">
-				<input class="form-check-input" type="checkbox" name="v_dnssec" id="v_dnssec" value="yes" <?php if($v_dnssec === 'yes'){ echo ' checked'; } ?>>
+				<input class="form-check-input" type="checkbox" name="v_dnssec" id="v_dnssec" value="yes" <?php if ($v_dnssec === 'yes'){ echo ' checked'; } ?>>
 				<label for="v_dnssec">
 					<?= _("Enable DNSSEC") ?>
 				</label>

web/templates/pages/edit_mail.php

@@ -51,7 +51,7 @@
 							echo ">".htmlentities(ucfirst($client))."</option>\n";
 							}
 						?>
-						<option value="disabled" <?php if (htmlentities(trim($v_webmail,"'")) == 'disabled') { echo "selected";}?>><?= _("Disabled") ?></option>
+						<option value="disabled" <?php if (htmlentities(trim($v_webmail,"'")) == 'disabled') { echo "selected"; }?>><?= _("Disabled") ?></option>
 					</select>
 				</div>
 			<?php } ?>
@@ -63,7 +63,7 @@
 				<label for="v_rate" class="form-label">
 					<?= _("Rate Limit") ?> <span class="optional">(<?= _("email / hour / account") ?>)</span>
 				</label>
-				<input type="text" class="form-control" name="v_rate" id="v_rate" value="<?=htmlentities(trim($v_rate, "'"))?>" <?php if($_SESSION['userContext'] != "admin"){ echo "disabled";}?>>
+				<input type="text" class="form-control" name="v_rate" id="v_rate" value="<?= htmlentities(trim($v_rate, "'")) ?>" <?php if ($_SESSION['userContext'] != "admin"){ echo "disabled"; }?>>
 			</div>
 			<?php if (!empty($_SESSION["ANTISPAM_SYSTEM"])) { ?>
 				<div class="form-check u-mb10">

web/templates/pages/edit_mail_acc.php

@@ -99,7 +99,7 @@
 						<label for="v_fwd" class="form-label">
 							<?= _("Forward to") ?> <span class="optional">(<?= _("one or more email addresses") ?>)</span>
 						</label>
-						<textarea class="form-control" name="v_fwd" id="v_fwd" <?php if($v_blackhole == 'yes') echo "disabled";?>><?=htmlentities(trim($v_fwd, "'"))?></textarea>
+						<textarea class="form-control" name="v_fwd" id="v_fwd" <?php if ($v_blackhole == 'yes') echo "disabled"; ?>><?= htmlentities(trim($v_fwd, "'")) ?></textarea>
 					</div>
 					<div class="form-check u-mb10">
 						<input x-model="hasAutoReply" class="form-check-input" type="checkbox" name="v_autoreply" id="v_autoreply">
@@ -117,7 +117,7 @@
 						<label for="v_rate" class="form-label">
 							<?= _("Rate Limit") ?> <span class="optional">(<?= _("email / hour") ?>)</span>
 						</label>
-						<input type="text" class="form-control" name="v_rate" id="v_rate" value="<?=htmlentities(trim($v_rate, "'"))?>" <?php if($_SESSION['userContext'] != "admin"){ echo "disabled";}?>>
+						<input type="text" class="form-control" name="v_rate" id="v_rate" value="<?= htmlentities(trim($v_rate, "'")) ?>" <?php if ($_SESSION['userContext'] != "admin"){ echo "disabled"; }?>>
 					</div>
 				</div>
 				<div class="sidebar-right-grid-sidebar">

web/templates/pages/edit_server_mysql.php

@@ -27,11 +27,11 @@
 			<div class="js-basic-options">
 				<div class="u-mb10">
 					<label for="v_max_connections" class="form-label">max_connections</label>
-					<input type="text" class="form-control" data-regexp="max_connections" data-prev-value="<?=htmlentities($v_max_connections)?>" name="v_max_connections" id="v_max_connections" value="<?=htmlentities($v_max_connections)?>">
+					<input type="text" class="form-control" data-regexp="max_connections" data-prev-value="<?= htmlentities($v_max_connections) ?>" name="v_max_connections" id="v_max_connections" value="<?= htmlentities($v_max_connections) ?>">
 				</div>
 				<div class="u-mb10">
 					<label for="v_max_user_connections" class="form-label">max_user_connections</label>
-					<input type="text" class="form-control" data-regexp="max_user_connections" data-prev-value="<?=htmlentities($v_max_user_connections)?>" name="v_max_user_connections" id="v_max_user_connections" value="<?=htmlentities($v_max_user_connections)?>">
+					<input type="text" class="form-control" data-regexp="max_user_connections" data-prev-value="<?= htmlentities($v_max_user_connections) ?>" name="v_max_user_connections" id="v_max_user_connections" value="<?= htmlentities($v_max_user_connections) ?>">
 				</div>
 				<div class="u-mb10">
 					<label for="v_wait_timeout" class="form-label">wait_timeout</label>
@@ -39,11 +39,11 @@
 				</div>
 				<div class="u-mb10">
 					<label for="v_interactive_timeout" class="form-label">interactive_timeout</label>
-					<input type="text" class="form-control" data-regexp="interactive_timeout" data-prev-value="<?=htmlentities($v_interactive_timeout)?>" name="v_interactive_timeout" id="v_interactive_timeout" value="<?=htmlentities($v_interactive_timeout)?>">
+					<input type="text" class="form-control" data-regexp="interactive_timeout" data-prev-value="<?= htmlentities($v_interactive_timeout) ?>" name="v_interactive_timeout" id="v_interactive_timeout" value="<?= htmlentities($v_interactive_timeout) ?>">
 				</div>
 				<div class="u-mb20">
 					<label for="v_display_errors" class="form-label">max_allowed_packet</label>
-					<input type="text" class="form-control" data-regexp="max_allowed_packet" data-prev-value="<?=htmlentities($v_max_allowed_packet)?>" name="v_display_errors" id="v_display_errors" value="<?=htmlentities($v_max_allowed_packet)?>">
+					<input type="text" class="form-control" data-regexp="max_allowed_packet" data-prev-value="<?= htmlentities($v_max_allowed_packet) ?>" name="v_display_errors" id="v_display_errors" value="<?= htmlentities($v_max_allowed_packet) ?>">
 				</div>
 				<div class="u-mb20">
 					<button type="button" class="button button-secondary js-toggle-options">

web/templates/pages/edit_server_nginx.php

@@ -30,31 +30,31 @@
 			<div class="js-basic-options">
 				<div class="u-mb10">
 					<label for="v_worker_processes" class="form-label">worker_processes</label>
-					<input type="text" class="form-control" data-regexp="worker_processes" data-prev-value="<?=htmlentities($v_worker_processes)?>" name="v_worker_processes" id="v_worker_processes" value="<?=htmlentities($v_worker_processes)?>">
+					<input type="text" class="form-control" data-regexp="worker_processes" data-prev-value="<?= htmlentities($v_worker_processes) ?>" name="v_worker_processes" id="v_worker_processes" value="<?= htmlentities($v_worker_processes) ?>">
 				</div>
 				<div class="u-mb10">
 					<label for="v_worker_connections" class="form-label">worker_connections</label>
-					<input type="text" class="form-control" data-regexp="worker_connections" data-prev-value="<?=htmlentities($v_worker_connections)?>" name="v_worker_connections" id="v_worker_connections" value="<?=htmlentities($v_worker_connections)?>">
+					<input type="text" class="form-control" data-regexp="worker_connections" data-prev-value="<?= htmlentities($v_worker_connections) ?>" name="v_worker_connections" id="v_worker_connections" value="<?= htmlentities($v_worker_connections) ?>">
 				</div>
 				<div class="u-mb10">
 					<label for="v_client_max_body_size" class="form-label">client_max_body_size</label>
-					<input type="text" class="form-control" data-regexp="client_max_body_size" data-prev-value="<?=htmlentities($v_client_max_body_size)?>" name="v_client_max_body_size" id="v_client_max_body_size" value="<?=htmlentities($v_client_max_body_size)?>">
+					<input type="text" class="form-control" data-regexp="client_max_body_size" data-prev-value="<?= htmlentities($v_client_max_body_size) ?>" name="v_client_max_body_size" id="v_client_max_body_size" value="<?= htmlentities($v_client_max_body_size) ?>">
 				</div>
 				<div class="u-mb10">
 					<label for="v_send_timeout" class="form-label">send_timeout</label>
-					<input type="text" class="form-control" data-regexp="send_timeout" data-prev-value="<?=htmlentities($v_send_timeout)?>" name="v_send_timeout" id="v_send_timeout" value="<?=htmlentities($v_send_timeout)?>">
+					<input type="text" class="form-control" data-regexp="send_timeout" data-prev-value="<?= htmlentities($v_send_timeout) ?>" name="v_send_timeout" id="v_send_timeout" value="<?= htmlentities($v_send_timeout) ?>">
 				</div>
 				<div class="u-mb10">
 					<label for="v_proxy_connect_timeout" class="form-label">proxy_connect_timeout</label>
-					<input type="text" class="form-control" data-regexp="proxy_connect_timeout" data-prev-value="<?=htmlentities($v_proxy_connect_timeout)?>" name="v_proxy_connect_timeout" id="v_proxy_connect_timeout" value="<?=htmlentities($v_proxy_connect_timeout)?>">
+					<input type="text" class="form-control" data-regexp="proxy_connect_timeout" data-prev-value="<?= htmlentities($v_proxy_connect_timeout) ?>" name="v_proxy_connect_timeout" id="v_proxy_connect_timeout" value="<?= htmlentities($v_proxy_connect_timeout) ?>">
 				</div>
 				<div class="u-mb10">
 					<label for="v_proxy_send_timeout" class="form-label">proxy_send_timeout</label>
-					<input type="text" class="form-control" data-regexp="proxy_send_timeout" data-prev-value="<?=htmlentities($v_proxy_send_timeout)?>" name="v_proxy_send_timeout" id="v_proxy_send_timeout" value="<?=htmlentities($v_proxy_send_timeout)?>">
+					<input type="text" class="form-control" data-regexp="proxy_send_timeout" data-prev-value="<?= htmlentities($v_proxy_send_timeout) ?>" name="v_proxy_send_timeout" id="v_proxy_send_timeout" value="<?= htmlentities($v_proxy_send_timeout) ?>">
 				</div>
 				<div class="u-mb10">
 					<label for="v_proxy_read_timeout" class="form-label">proxy_read_timeout</label>
-					<input type="text" class="form-control" data-regexp="proxy_read_timeout" data-prev-value="<?=htmlentities($v_proxy_read_timeout)?>" name="v_proxy_read_timeout" id="v_proxy_read_timeout" value="<?=htmlentities($v_proxy_read_timeout)?>">
+					<input type="text" class="form-control" data-regexp="proxy_read_timeout" data-prev-value="<?= htmlentities($v_proxy_read_timeout) ?>" name="v_proxy_read_timeout" id="v_proxy_read_timeout" value="<?= htmlentities($v_proxy_read_timeout) ?>">
 				</div>
 				<div class="u-mb10">
 					<label for="v_gzip" class="form-label">gzip</label>
@@ -62,7 +62,7 @@
 				</div>
 				<div class="u-mb10">
 					<label for="v_gzip_comp_level" class="form-label">gzip_comp_level</label>
-					<input type="text" class="form-control" data-regexp="gzip_comp_level" data-prev-value="<?=htmlentities($v_gzip_comp_level)?>" name="v_gzip_comp_level" id="v_gzip_comp_level" value="<?=htmlentities($v_gzip_comp_level)?>">
+					<input type="text" class="form-control" data-regexp="gzip_comp_level" data-prev-value="<?= htmlentities($v_gzip_comp_level) ?>" name="v_gzip_comp_level" id="v_gzip_comp_level" value="<?= htmlentities($v_gzip_comp_level) ?>">
 				</div>
 				<div class="u-mb20">
 					<label for="v_charset" class="form-label">charset</label>

web/templates/pages/edit_server_php.php

@@ -27,11 +27,11 @@
 			<div class="js-basic-options">
 				<div class="u-mb10">
 					<label for="v_max_execution_time" class="form-label">max_execution_time</label>
-					<input type="text" class="form-control" data-regexp="max_execution_time" data-prev-value="<?=htmlentities($v_max_execution_time)?>" name="v_max_execution_time" id="v_max_execution_time" value="<?=htmlentities($v_max_execution_time)?>">
+					<input type="text" class="form-control" data-regexp="max_execution_time" data-prev-value="<?= htmlentities($v_max_execution_time) ?>" name="v_max_execution_time" id="v_max_execution_time" value="<?= htmlentities($v_max_execution_time) ?>">
 				</div>
 				<div class="u-mb10">
 					<label for="v_worker_connections" class="form-label">max_input_time</label>
-					<input type="text" class="form-control" data-regexp="max_input_time" data-prev-value="<?=htmlentities($v_max_input_time)?>" name="v_worker_connections" id="v_worker_connections" value="<?=htmlentities($v_max_input_time)?>">
+					<input type="text" class="form-control" data-regexp="max_input_time" data-prev-value="<?= htmlentities($v_max_input_time) ?>" name="v_worker_connections" id="v_worker_connections" value="<?= htmlentities($v_max_input_time) ?>">
 				</div>
 				<div class="u-mb10">
 					<label for="v_memory_limit" class="form-label">memory_limit</label>
@@ -39,19 +39,19 @@
 				</div>
 				<div class="u-mb10">
 					<label for="v_error_reporting" class="form-label">error_reporting</label>
-					<input type="text" class="form-control" data-regexp="error_reporting" data-prev-value="<?=htmlentities($v_error_reporting)?>" name="v_error_reporting" id="v_error_reporting" value="<?=htmlentities($v_error_reporting)?>">
+					<input type="text" class="form-control" data-regexp="error_reporting" data-prev-value="<?= htmlentities($v_error_reporting) ?>" name="v_error_reporting" id="v_error_reporting" value="<?= htmlentities($v_error_reporting) ?>">
 				</div>
 				<div class="u-mb10">
 					<label for="v_display_errors" class="form-label">display_errors</label>
-					<input type="text" class="form-control" data-regexp="display_errors" data-prev-value="<?=htmlentities($v_display_errors)?>" name="v_display_errors" id="v_display_errors" value="<?=htmlentities($v_display_errors)?>">
+					<input type="text" class="form-control" data-regexp="display_errors" data-prev-value="<?= htmlentities($v_display_errors) ?>" name="v_display_errors" id="v_display_errors" value="<?= htmlentities($v_display_errors) ?>">
 				</div>
 				<div class="u-mb10">
 					<label for="v_post_max_size" class="form-label">post_max_size</label>
-					<input type="text" class="form-control" data-regexp="post_max_size" data-prev-value="<?=htmlentities($v_post_max_size)?>" name="v_post_max_size" id="v_post_max_size" value="<?=htmlentities($v_post_max_size)?>">
+					<input type="text" class="form-control" data-regexp="post_max_size" data-prev-value="<?= htmlentities($v_post_max_size) ?>" name="v_post_max_size" id="v_post_max_size" value="<?= htmlentities($v_post_max_size) ?>">
 				</div>
 				<div class="u-mb20">
 					<label for="v_upload_max_filesize" class="form-label">upload_max_filesize</label>
-					<input type="text" class="form-control" data-regexp="upload_max_filesize" data-prev-value="<?=htmlentities($v_upload_max_filesize)?>" name="v_upload_max_filesize" id="v_upload_max_filesize" value="<?=htmlentities($v_upload_max_filesize)?>">
+					<input type="text" class="form-control" data-regexp="upload_max_filesize" data-prev-value="<?= htmlentities($v_upload_max_filesize) ?>" name="v_upload_max_filesize" id="v_upload_max_filesize" value="<?= htmlentities($v_upload_max_filesize) ?>">
 				</div>
 				<div class="u-mb20">
 					<button type="button" class="button button-secondary js-toggle-options">

web/templates/pages/edit_user.php

@@ -16,7 +16,7 @@
 					$keys_url = "/list/access-key/";
 				}
 			?>
-			<a href="<?=$ssh_key_url; ?>" class="button button-secondary js-button-create" title="<?= _("Manage SSH Keys") ?>">
+			<a href="<?= $ssh_key_url; ?>" class="button button-secondary js-button-create" title="<?= _("Manage SSH Keys") ?>">
 				<i class="fas fa-key icon-orange"></i><?= _("Manage SSH Keys") ?>
 			</a>
 			<?php if ($_SESSION["userContext"] == "admin" || ($_SESSION["userContext"] !== "admin" && $_SESSION["POLICY_USER_VIEW_LOGS"] !== "no")) { ?>
@@ -27,7 +27,7 @@
 			<?php
 				$api_status = (!empty($_SESSION['API_SYSTEM']) && is_numeric($_SESSION['API_SYSTEM'])) ? $_SESSION['API_SYSTEM'] : 0;
 				if (($user_plain == 'admin' && $api_status > 0) || ($user_plain != 'admin' && $api_status > 1)) { ?>
-				<a href="<?=$keys_url; ?>" class="button button-secondary js-button-create" title="<?= _("Access Keys") ?>">
+				<a href="<?= $keys_url; ?>" class="button button-secondary js-button-create" title="<?= _("Access Keys") ?>">
 					<i class="fas fa-key icon-purple"></i><?= _("Access Keys") ?>
 				</a>
 			<?php } ?>
@@ -67,16 +67,16 @@
 			</div>
 			<div class="u-mb10">
 				<label for="v_name" class="form-label"><?= _("Contact Name") ?></label>
-				<input type="text" class="form-control" name="v_name" id="v_name" value="<?=htmlentities(trim($v_name, "'"))?>" <?php if (($_SESSION['userContext'] !=='admin' ) && ($_SESSION['POLICY_USER_EDIT_DETAILS'] !=='yes' )) { echo 'disabled' ; }?> required>
-				<?php if (($_SESSION['userContext'] !== 'admin') && ($_SESSION['POLICY_USER_EDIT_DETAILS'] !== 'yes')) {?>
-					<input type="hidden" name="v_name" value="<?=htmlentities(trim($v_name, "'"))?>">
+				<input type="text" class="form-control" name="v_name" id="v_name" value="<?= htmlentities(trim($v_name, "'")) ?>" <?php if (($_SESSION['userContext'] !=='admin' ) && ($_SESSION['POLICY_USER_EDIT_DETAILS'] !=='yes' )) { echo 'disabled' ; }?> required>
+				<?php if (($_SESSION['userContext'] !== 'admin') && ($_SESSION['POLICY_USER_EDIT_DETAILS'] !== 'yes')) { ?>
+					<input type="hidden" name="v_name" value="<?= htmlentities(trim($v_name, "'")) ?>">
 				<?php } ?>
 			</div>
 			<div class="u-mb10">
 				<label for="v_email" class="form-label"><?= _("Email") ?></label>
-				<input type="email" class="form-control" name="v_email" id="v_email" value="<?=htmlentities(trim($v_email, "'"))?>" <?php if (($_SESSION['userContext'] !=='admin' ) && ($_SESSION['POLICY_USER_EDIT_DETAILS'] !=='yes' )) { echo 'disabled' ; }?> required>
-				<?php if (($_SESSION['userContext'] !== 'admin') && ($_SESSION['POLICY_USER_EDIT_DETAILS'] !== 'yes')) {?>
-					<input type="hidden" name="v_email" value="<?=htmlentities(trim($v_email, "'"))?>">
+				<input type="email" class="form-control" name="v_email" id="v_email" value="<?= htmlentities(trim($v_email, "'")) ?>" <?php if (($_SESSION['userContext'] !=='admin' ) && ($_SESSION['POLICY_USER_EDIT_DETAILS'] !=='yes' )) { echo 'disabled' ; }?> required>
+				<?php if (($_SESSION['userContext'] !== 'admin') && ($_SESSION['POLICY_USER_EDIT_DETAILS'] !== 'yes')) { ?>
+					<input type="hidden" name="v_email" value="<?= htmlentities(trim($v_email, "'")) ?>">
 				<?php } ?>
 			</div>
 			<div class="u-mb10">
@@ -110,7 +110,7 @@
 				<?php } ?>
 				<div x-cloak x-show="!loginDisabled" id="password-options">
 					<div class="form-check">
-						<input class="form-check-input" type="checkbox" name="v_twofa" id="v_twofa" <?php if(!empty($v_twofa)) echo 'checked' ?>>
+						<input class="form-check-input" type="checkbox" name="v_twofa" id="v_twofa" <?php if (!empty($v_twofa)) echo 'checked' ?>>
 						<label for="v_twofa">
 							<?= _("Enable two-factor authentication") ?>
 						</label>
@@ -185,11 +185,11 @@
 				<div class="u-mb10">
 					<label for="v_sort_order" class="form-label"><?= _("Default List Sort Order") ?></label>
 					<select class="form-select" name="v_sort_order" id="v_sort_order">
-						<option value='date' <?php if($v_sort_order === 'date') echo 'selected' ?>><?= _("Date") ?></option>
-						<option value='name' <?php if($v_sort_order === 'name') echo 'selected' ?>><?= _("Name") ?></option>
+						<option value='date' <?php if ($v_sort_order === 'date') echo 'selected' ?>><?= _("Date") ?></option>
+						<option value='name' <?php if ($v_sort_order === 'name') echo 'selected' ?>><?= _("Name") ?></option>
 					</select>
 				</div>
-			<?php if ($_SESSION['userContext'] === 'admin') {?>
+			<?php if ($_SESSION['userContext'] === 'admin') { ?>
 				<div class="u-mb20">
 					<label for="v_package" class="form-label"><?= _("Package") ?></label>
 					<select class="form-select" name="v_package" id="v_package" required>
@@ -245,13 +245,13 @@
 							?>
 						</select>
 					</div>
-					<?php if ((isset($_SESSION['DNS_SYSTEM'])) && (!empty($_SESSION['DNS_SYSTEM']))) {?>
+					<?php if ((isset($_SESSION['DNS_SYSTEM'])) && (!empty($_SESSION['DNS_SYSTEM']))) { ?>
 						<p class="form-label u-mb10"><?= _("Default Name Servers") ?></p>
 						<div class="u-mb5">
-							<input type="text" class="form-control" name="v_ns1" value="<?=htmlentities(trim($v_ns1, "'"))?>">
+							<input type="text" class="form-control" name="v_ns1" value="<?= htmlentities(trim($v_ns1, "'")) ?>">
 						</div>
 						<div class="u-mb5">
-							<input type="text" class="form-control" name="v_ns2" value="<?=htmlentities(trim($v_ns2, "'"))?>">
+							<input type="text" class="form-control" name="v_ns2" value="<?= htmlentities(trim($v_ns2, "'")) ?>">
 						</div>
 						<?php
 							if($v_ns3) {

web/templates/pages/edit_web.php

@@ -7,7 +7,7 @@
 			</a>
 		</div>
 		<div class="toolbar-buttons">
-			<a href="/delete/web/cache/?domain=<?=htmlentities($v_domain);?>&token=<?=$_SESSION['token'];?>" class="button button-secondary js-clear-cache-button <?php if (!($v_nginx_cache == 'yes' || (($v_proxy_template == 'caching' || is_int(strpos($v_proxy_template, 'caching-'))) && $_SESSION['PROXY_SYSTEM'] == 'nginx'))) { echo "u-hidden"; } ?>">
+			<a href="/delete/web/cache/?domain=<?= htmlentities($v_domain);?>&token=<?= $_SESSION['token'];?>" class="button button-secondary js-clear-cache-button <?php if (!($v_nginx_cache == 'yes' || (($v_proxy_template == 'caching' || is_int(strpos($v_proxy_template, 'caching-'))) && $_SESSION['PROXY_SYSTEM'] == 'nginx'))) { echo "u-hidden"; } ?>">
 				<i class="fas fa-trash icon-red"></i><?= _("Purge NGINX Cache") ?>
 			</a>
 			<?php if ($_SESSION["PLUGIN_APP_INSTALLER"] !== "false") { ?>
@@ -134,13 +134,13 @@
 					</label>
 				</div>
 				<div class="form-check">
-					<input class="form-check-input js-redirect-custom-value" type="radio" name="v-redirect" id="v-redirect-radio-2" value="<?=htmlentities($v_domain);?>" <?php if( $v_redirect == $v_domain) echo 'checked';?> >
+					<input class="form-check-input js-redirect-custom-value" type="radio" name="v-redirect" id="v-redirect-radio-2" value="<?= htmlentities($v_domain);?>" <?php if ( $v_redirect == $v_domain) echo 'checked';?> >
 					<label for="v-redirect-radio-2">
 						<?= sprintf(_("Redirect visitors to %s"), htmlentities($v_domain)) ?>
 					</label>
 				</div>
 				<div class="form-check">
-					<input class="form-check-input js-redirect-custom-value" type="radio" name="v-redirect" id="v-redirect-radio-3" value="custom" <?php if( !empty($v_redirect_custom)) echo 'checked';?>>
+					<input class="form-check-input js-redirect-custom-value" type="radio" name="v-redirect" id="v-redirect-radio-3" value="custom" <?php if ( !empty($v_redirect_custom)) echo 'checked';?>>
 					<label for="v-redirect-radio-3">
 						<?= _("Redirect visitors to a custom domain or web address") ?>
 					</label>
@@ -177,13 +177,13 @@
 					</label>
 				</div>
 				<div class="form-check u-mb10">
-					<input class="form-check-input" type="checkbox" name="v_ssl_forcessl" id="v_ssl_forcessl" <?php if($v_ssl_forcessl == 'yes') echo 'checked' ?>>
+					<input class="form-check-input" type="checkbox" name="v_ssl_forcessl" id="v_ssl_forcessl" <?php if ($v_ssl_forcessl == 'yes') echo 'checked' ?>>
 					<label for="v_ssl_forcessl">
 						<?= _("Enable automatic HTTPS redirection") ?>
 					</label>
 				</div>
 				<div class="form-check u-mb20">
-					<input class="form-check-input" type="checkbox" name="v_ssl_hsts" id="ssl_hsts" <?php if($v_ssl_hsts == 'yes') echo 'checked' ?>>
+					<input class="form-check-input" type="checkbox" name="v_ssl_hsts" id="ssl_hsts" <?php if ($v_ssl_hsts == 'yes') echo 'checked' ?>>
 					<label for="ssl_hsts">
 						<?= _("Enable HTTP Strict Transport Security (HSTS)") ?><a href="https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security" target="_blank"><i class="fas fa-question-circle"></i></a>
 					</label>
@@ -396,41 +396,41 @@
 						?>
 						<div class="js-ftp-account js-ftp-account-nrm" name="v_add_domain_ftp" style="<?php if (empty($v_ftp_user)) { echo 'display: none;'; } ?>">
 							<div class="u-mb10">
-								<?= _("FTP") ?> #<span class="js-ftp-user-number"><?=$i + 1; ?></span>
+								<?= _("FTP") ?> #<span class="js-ftp-user-number"><?= $i + 1; ?></span>
 								<button type="button" class="form-link form-link-danger u-ml5 js-delete-ftp-account"><?= _("Delete") ?></button>
-								<input type="hidden" class="js-ftp-user-deleted" name="v_ftp_user[<?=$i ?>][delete]" value="0">
-								<input type="hidden" class="js-ftp-user-is-new" name="v_ftp_user[<?=$i ?>][is_new]" value="<?=htmlentities($ftp_user['is_new']) ?>">
+								<input type="hidden" class="js-ftp-user-deleted" name="v_ftp_user[<?= $i ?>][delete]" value="0">
+								<input type="hidden" class="js-ftp-user-is-new" name="v_ftp_user[<?= $i ?>][is_new]" value="<?= htmlentities($ftp_user['is_new']) ?>">
 							</div>
 							<div class="u-pl30 u-mb10">
-								<label for="v_ftp_user[<?=$i ?>][v_ftp_user]" class="form-label">
+								<label for="v_ftp_user[<?= $i ?>][v_ftp_user]" class="form-label">
 									<?= _("Username") ?><br>
-									<span style="color:#777;"><?=sprintf(_('Prefix %s will be added to username automatically'),$user_plain."_");?></span>
+									<span style="color:#777;"><?= sprintf(_('Prefix %s will be added to username automatically'),$user_plain."_");?></span>
 								</label>
-								<input type="text" class="form-control js-ftp-user" <?=$ftp_user['is_new'] != 1 ? 'disabled="disabled"' : '' ?>
-								name="v_ftp_user[<?=$i ?>][v_ftp_user]" id="v_ftp_user[<?=$i ?>][v_ftp_user]" value="<?=htmlentities(trim($v_ftp_user, "'"))?>">
-								<input type="hidden" name="v_record_id" value="<?=htmlentities(trim($v_record_id, "'"))?>">
+								<input type="text" class="form-control js-ftp-user" <?= $ftp_user['is_new'] != 1 ? 'disabled="disabled"' : '' ?>
+								name="v_ftp_user[<?= $i ?>][v_ftp_user]" id="v_ftp_user[<?= $i ?>][v_ftp_user]" value="<?= htmlentities(trim($v_ftp_user, "'")) ?>">
+								<input type="hidden" name="v_record_id" value="<?= htmlentities(trim($v_record_id, "'")) ?>">
 								<small class="hint js-ftp-user-hint"></small>
 							</div>
 							<div class="u-pl30 u-mb10">
-								<label for="v_ftp_user[<?=$i ?>][v_ftp_password]" class="form-label">
+								<label for="v_ftp_user[<?= $i ?>][v_ftp_password]" class="form-label">
 									<?= _("Password") ?>
 									<button type="button" title="<?= _("Generate") ?>" class="u-unstyled-button u-ml5 js-ftp-password-generate">
 										<i class="fas fa-arrows-rotate icon-green"></i>
 									</button>
 								</label>
-								<input type="text" class="form-control js-ftp-user-psw" name="v_ftp_user[<?=$i ?>][v_ftp_password]" id="v_ftp_user[<?=$i ?>][v_ftp_password]" value="<?=htmlentities(trim($v_ftp_password, "'"))?>">
+								<input type="text" class="form-control js-ftp-user-psw" name="v_ftp_user[<?= $i ?>][v_ftp_password]" id="v_ftp_user[<?= $i ?>][v_ftp_password]" value="<?= htmlentities(trim($v_ftp_password, "'")) ?>">
 							</div>
 							<div class="u-pl30 u-mb10">
-								<label for="v_ftp_user[<?=$i ?>][v_ftp_path]" class="form-label"><?= _("Path") ?></label>
+								<label for="v_ftp_user[<?= $i ?>][v_ftp_path]" class="form-label"><?= _("Path") ?></label>
 								<input type="hidden" name="v_ftp_pre_path" value="<?=!empty($v_ftp_pre_path) ? htmlentities(trim($v_ftp_pre_path, "'")) : '/'; ?>">
-								<input type="hidden" name="v_ftp_user[<?=$i ?>][v_ftp_path_prev]" value="<?php if (!empty($v_ftp_path)) echo ($v_ftp_path[0] != '/' ? '/' : '').htmlentities(trim($v_ftp_path, "'")) ?>">
-								<input type="text" class="form-control js-ftp-path" name="v_ftp_user[<?=$i ?>][v_ftp_path]" id="v_ftp_user[<?=$i ?>][v_ftp_path]" value="<?php if (!empty($v_ftp_path)) echo ($v_ftp_path[0] != '/' ? '/' : '').htmlentities(trim($v_ftp_path, "'")) ?>">
-								<span class="hint-prefix"><?=htmlentities(trim($v_ftp_pre_path, "'"))?></span><span class="hint js-ftp-path-hint"></span>
+								<input type="hidden" name="v_ftp_user[<?= $i ?>][v_ftp_path_prev]" value="<?php if (!empty($v_ftp_path)) echo ($v_ftp_path[0] != '/' ? '/' : '').htmlentities(trim($v_ftp_path, "'")) ?>">
+								<input type="text" class="form-control js-ftp-path" name="v_ftp_user[<?= $i ?>][v_ftp_path]" id="v_ftp_user[<?= $i ?>][v_ftp_path]" value="<?php if (!empty($v_ftp_path)) echo ($v_ftp_path[0] != '/' ? '/' : '').htmlentities(trim($v_ftp_path, "'")) ?>">
+								<span class="hint-prefix"><?= htmlentities(trim($v_ftp_pre_path, "'")) ?></span><span class="hint js-ftp-path-hint"></span>
 							</div>
 							<?php if ($ftp_user['is_new'] == 1): ?>
 								<div class="u-pl30 u-mb10">
-									<label for="v_ftp_user[<?=$i ?>][v_ftp_email]" class="form-label"><?= _("Send FTP credentials to email") ?></label>
-									<input type="email" class="form-control js-email-alert-on-psw" name="v_ftp_user[<?=$i ?>][v_ftp_email]" id="v_ftp_user[<?=$i ?>][v_ftp_email]" value="<?=htmlentities(trim($v_ftp_email, "'"))?>">
+									<label for="v_ftp_user[<?= $i ?>][v_ftp_email]" class="form-label"><?= _("Send FTP credentials to email") ?></label>
+									<input type="email" class="form-control js-email-alert-on-psw" name="v_ftp_user[<?= $i ?>][v_ftp_email]" id="v_ftp_user[<?= $i ?>][v_ftp_email]" value="<?= htmlentities(trim($v_ftp_email, "'")) ?>">
 								</div>
 							<?php endif; ?>
 						</div>

web/templates/pages/list_access_keys.php

@@ -69,9 +69,9 @@
 				$key_time = !empty($value['TIME']) ? $value['TIME'] : '-';
 			?>
 			<div class="units-table-row animate__animated animate__fadeIn js-unit"
-				data-sort-key="<?=strtolower($key)?>"
-				data-sort-comment="<?=strtolower($key_comment)?>"
-				data-sort-date="<?=strtotime($data[$key]['DATE'] .' '. $data[$key]['TIME'] )?>">
+				data-sort-key="<?= strtolower($key) ?>"
+				data-sort-comment="<?= strtolower($key_comment) ?>"
+				data-sort-date="<?= strtotime($data[$key]['DATE'] .' '. $data[$key]['TIME'] ) ?>">
 				<div class="units-table-cell">
 					<div>
 						<input id="check<?= $i ?>" class="js-unit-checkbox" type="checkbox" title="<?= _("Select") ?>" name="key[]" value="<?= $key ?>">

web/templates/pages/list_cron.php

@@ -39,8 +39,8 @@
 						<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 						<select class="form-select" name="action">
 							<option value=""><?= _("Apply to selected") ?></option>
-							<?php if($panel[$user_plain]['CRON_REPORTS'] == 'yes') echo '<option value="delete-cron-reports">' . _('Disable Notifications') . '</option>'; ?>
-							<?php if($panel[$user_plain]['CRON_REPORTS'] == 'no') echo '<option value="add-cron-reports">' . _('Enable Notifications') . '</option>'; ?>
+							<?php if ($panel[$user_plain]['CRON_REPORTS'] == 'yes') echo '<option value="delete-cron-reports">' . _('Disable Notifications') . '</option>'; ?>
+							<?php if ($panel[$user_plain]['CRON_REPORTS'] == 'no') echo '<option value="add-cron-reports">' . _('Enable Notifications') . '</option>'; ?>
 							<option value="suspend"><?= _("Suspend") ?></option>
 							<option value="unsuspend"><?= _("Unsuspend") ?></option>
 							<option value="delete"><?= _("Delete") ?></option>
@@ -102,8 +102,8 @@
 			}
 		?>
 			<div class="units-table-row <?php if ($status == 'suspended') echo 'disabled'; ?> animate__animated animate__fadeIn js-unit"
-				data-sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>"
-				data-sort-name="<?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?>">
+				data-sort-date="<?= strtotime($data[$key]['DATE'].' '.$data[$key]['TIME']) ?>"
+				data-sort-name="<?= htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES) ?>">
 				<div class="units-table-cell">
 					<div>
 						<input id="check<?= $i ?>" class="js-unit-checkbox" type="checkbox" title="<?= _("Select") ?>" name="job[]" value="<?= $key ?>" <?= $display_mode ?>>
@@ -115,19 +115,19 @@
 					<?php if ($read_only === "true" || $data[$key]["SUSPENDED"] == "yes") { ?>
 						<?= htmlspecialchars($data[$key]["CMD"], ENT_NOQUOTES) ?>
 					<?php } else { ?>
-						<a href="/edit/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" title="<?= _("Edit Cron Job") ?>: <?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?>">
-							<?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?>
+						<a href="/edit/cron/?job=<?= $data[$key]['JOB'] ?>&token=<?= $_SESSION['token'] ?>" title="<?= _("Edit Cron Job") ?>: <?= htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES) ?>">
+							<?= htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES) ?>
 						</a>
 					<?php } ?>
 				</div>
 				<div class="units-table-cell">
 					<?php if (!$read_only) { ?>
 						<ul class="units-table-row-actions">
-							<?php if ($data[$key]['SUSPENDED'] == 'no') {?>
+							<?php if ($data[$key]['SUSPENDED'] == 'no') { ?>
 								<li class="units-table-row-action shortcut-enter" data-key-action="href">
 									<a
 										class="units-table-row-action-link"
-										href="/edit/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>"
+										href="/edit/cron/?job=<?= $data[$key]['JOB'] ?>&token=<?= $_SESSION['token'] ?>"
 										title="<?= _("Edit") ?>"
 									>
 										<i class="fas fa-pencil icon-orange"></i>

web/templates/pages/list_db.php

@@ -144,10 +144,10 @@ if (!empty($_SESSION["DB_PGA_ALIAS"])) {
 			<div class="units-table-row <?php if ($data[$key]['SUSPENDED'] == 'yes') echo 'disabled'; ?> animate__animated animate__fadeIn js-unit"
 				data-sort-date="<?= strtotime($data[$key]['DATE'].' '.$data[$key]['TIME']) ?>"
 				data-sort-name="<?= $key ?>"
-				data-sort-disk="<?= $data[$key]['U_DISK'] ?>"
-				data-sort-user="<?= $data[$key]['DBUSER'] ?>"
-				data-sort-server="<?= $data[$key]['HOST'] ?>"
-				data-sort-charset="<?= $data[$key]['CHARSET'] ?>">
+				data-sort-disk="<?= $data[$key]["U_DISK"] ?>"
+				data-sort-user="<?= $data[$key]["DBUSER"] ?>"
+				data-sort-server="<?= $data[$key]["HOST"] ?>"
+				data-sort-charset="<?= $data[$key]["CHARSET"] ?>">
 				<div class="units-table-cell">
 					<div>
 						<input id="check<?= $i ?>" class="js-unit-checkbox" type="checkbox" title="<?= _("Select") ?>" name="database[]" value="<?= $key ?>" <?= $display_mode ?>>
@@ -171,7 +171,7 @@ if (!empty($_SESSION["DB_PGA_ALIAS"])) {
 								<li class="units-table-row-action shortcut-enter" data-key-action="href">
 									<a
 										class="units-table-row-action-link"
-										href="/edit/db/?database=<?=$key?>&token=<?=$_SESSION['token']?>"
+										href="/edit/db/?database=<?= $key ?>&token=<?= $_SESSION["token"] ?>"
 										title="<?= _("Edit Database") ?>"
 									>
 										<i class="fas fa-pencil icon-orange"></i>
@@ -183,7 +183,7 @@ if (!empty($_SESSION["DB_PGA_ALIAS"])) {
 								<li class="units-table-row-action shortcut-enter" data-key-action="href">
 									<a
 										class="units-table-row-action-link"
-										href="<?=$db_myadmin_link?>hestia-sso.php?database=<?=$key?>&user=<?=$user_plain?>&exp=<?=$time?>&hestia_token=<?=password_hash($key.$user_plain.$_SESSION['user_combined_ip'].$time.$_SESSION['PHPMYADMIN_KEY'], PASSWORD_DEFAULT)?>"
+										href="<?= $db_myadmin_link?>hestia-sso.php?database=<?= $key ?>&user=<?= $user_plain?>&exp=<?= $time?>&hestia_token=<?=password_hash($key.$user_plain.$_SESSION['user_combined_ip'].$time.$_SESSION['PHPMYADMIN_KEY'], PASSWORD_DEFAULT) ?>"
 										title="phpMyAdmin"
 									>
 										<i class="fas fa-right-to-bracket icon-orange"></i>
@@ -194,7 +194,7 @@ if (!empty($_SESSION["DB_PGA_ALIAS"])) {
 							<li class="units-table-row-action shortcut-enter" data-key-action="href">
 								<a
 									class="units-table-row-action-link"
-									href="/download/database/?database=<?=$key?>&token=<?=$_SESSION['token']?>"
+									href="/download/database/?database=<?= $key ?>&token=<?= $_SESSION["token"] ?>"
 									title="<?= _("Download Database") ?>"
 								>
 									<i class="fas fa-download icon-orange"></i>
@@ -204,7 +204,7 @@ if (!empty($_SESSION["DB_PGA_ALIAS"])) {
 							<li class="units-table-row-action shortcut-s" data-key-action="js">
 								<a
 									class="units-table-row-action-link data-controls js-confirm-action"
-									href="/<?= $spnd_action ?>/db/?database=<?=$key?>&token=<?=$_SESSION['token']?>"
+									href="/<?= $spnd_action ?>/db/?database=<?= $key ?>&token=<?= $_SESSION["token"] ?>"
 									title="<?= $spnd_action_title ?>"
 									data-confirm-title="<?= $spnd_action_title ?>"
 									data-confirm-message="<?= sprintf($spnd_confirmation, $key) ?>"

web/templates/pages/list_dns.php

@@ -111,11 +111,11 @@
 				}
 			?>
 			<div class="units-table-row <?php if ($status == 'suspended') echo 'disabled'; ?> animate__animated animate__fadeIn js-unit"
-				data-sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>"
-				data-sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>"
-				data-sort-name="<?=htmlentities($key);?>"
-				data-sort-expire="<?=strtotime($data[$key]['EXP'])?>"
-				data-sort-records="<?=(int)$data[$key]['RECORDS']?>">
+				data-sort-ip="<?= str_replace('.', '', $data[$key]['IP']) ?>"
+				data-sort-date="<?= strtotime($data[$key]['DATE'].' '.$data[$key]['TIME']) ?>"
+				data-sort-name="<?= htmlentities($key);?>"
+				data-sort-expire="<?= strtotime($data[$key]['EXP']) ?>"
+				data-sort-records="<?=(int)$data[$key]['RECORDS'] ?>">
 				<div class="units-table-cell">
 					<div>
 						<input id="check<?= $i ?>" class="js-unit-checkbox" type="checkbox" title="<?= _("Select") ?>" name="domain[]" value="<?= $key ?>" <?= $display_mode ?>>
@@ -132,11 +132,11 @@
 				<div class="units-table-cell">
 					<?php if (!$read_only) { ?>
 						<ul class="units-table-row-actions">
-							<?php if ($data[$key]['SUSPENDED'] == 'no') {?>
+							<?php if ($data[$key]["SUSPENDED"] == "no") { ?>
 								<li class="units-table-row-action shortcut-n" data-key-action="href">
 									<a
 										class="units-table-row-action-link"
-										href="/add/dns/?domain=<?=htmlentities($key);?>&token=<?=$_SESSION['token']?>"
+										href="/add/dns/?domain=<?= htmlentities($key) ?>&token=<?= $_SESSION["token"] ?>"
 										title="<?= _("Add DNS Record") ?>"
 									>
 										<i class="fas fa-circle-plus icon-green"></i>
@@ -146,18 +146,18 @@
 								<li class="units-table-row-action shortcut-enter" data-key-action="href">
 									<a
 										class="units-table-row-action-link"
-										href="/edit/dns/?domain=<?=htmlentities($key);?>&token=<?=$_SESSION['token']?>"
+										href="/edit/dns/?domain=<?= htmlentities($key) ?>&token=<?= $_SESSION["token"] ?>"
 										title="<?= _("Edit DNS Domain") ?>"
 									>
 										<i class="fas fa-pencil icon-orange"></i>
 										<span class="u-hide-desktop"><?= _("Edit DNS Domain") ?></span>
 									</a>
 								</li>
-								<?php if ($data[$key]['DNSSEC'] == "yes") { ?>
+								<?php if ($data[$key]["DNSSEC"] == "yes") { ?>
 									<li class="units-table-row-action shortcut-enter" data-key-action="href">
 										<a
 											class="units-table-row-action-link"
-											href="/list/dns/?domain=<?=htmlentities($key);?>&action=dnssec&token=<?=$_SESSION['token']?>"
+											href="/list/dns/?domain=<?= htmlentities($key) ?>&action=dnssec&token=<?= $_SESSION["token"] ?>"
 											title="<?= _("View Public DNSSEC Key") ?>"
 										>
 											<i class="fas fa-key icon-orange"></i>
@@ -169,7 +169,7 @@
 							<li class="units-table-row-action shortcut-l" data-key-action="href">
 								<a
 									class="units-table-row-action-link"
-									href="/list/dns/?domain=<?=htmlentities($key);?>&token=<?=$_SESSION['token']?>"
+									href="/list/dns/?domain=<?= htmlentities($key) ?>&token=<?= $_SESSION["token"] ?>"
 									title="<?= _("DNS Records") ?>"
 								>
 									<i class="fas fa-list icon-lightblue"></i>
@@ -179,7 +179,7 @@
 							<li class="units-table-row-action shortcut-s" data-key-action="js">
 								<a
 									class="units-table-row-action-link data-controls js-confirm-action"
-									href="/<?= $spnd_action ?>/dns/?domain=<?=htmlentities($key);?>&token=<?=$_SESSION['token']?>"
+									href="/<?= $spnd_action ?>/dns/?domain=<?= htmlentities($key) ?>&token=<?= $_SESSION["token"] ?>"
 									title="<?= $spnd_action_title ?>"
 									data-confirm-title="<?= $spnd_action_title ?>"
 									data-confirm-message="<?= sprintf($spnd_confirmation, $key) ?>"

web/templates/pages/list_dns_rec.php

@@ -100,21 +100,21 @@
 				}
 			?>
 			<div class="l-unit <?php if ($status == 'suspended') echo 'l-unit--suspended';?> animate__animated animate__fadeIn js-unit"
-				data-sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>"
-				data-sort-record="<?=$data[$key]['RECORD']?>"
-				data-sort-type="<?=$data[$key]['TYPE']?>"
-				data-sort-ttl="<?=$data[$key]['TTL']?>"
-				data-sort-value="<?=$data[$key]['VALUE']?>">
+				data-sort-date="<?= strtotime($data[$key]['DATE'].' '.$data[$key]['TIME']) ?>"
+				data-sort-record="<?= $data[$key]['RECORD'] ?>"
+				data-sort-type="<?= $data[$key]['TYPE'] ?>"
+				data-sort-ttl="<?= $data[$key]['TTL'] ?>"
+				data-sort-value="<?= $data[$key]['VALUE'] ?>">
 				<div class="l-unit__col l-unit__col--right">
 					<div class="clearfix l-unit__stat-col--left super-compact">
 						<input id="check<?= $data[$key]["ID"] ?>" class="js-unit-checkbox" type="checkbox" title="<?= _("Select") ?>" name="record[]" value="<?= $data[$key]["ID"] ?>" <?= $display_mode ?>>
 					</div>
 					<div class="clearfix l-unit__stat-col--left u-text-truncate">
 						<b>
-						<?php if (($read_only === 'true') || ($data[$key]['SUSPENDED'] == 'yes')) {?>
-							<?=substr($data[$key]['RECORD'], 0, 12); if(strlen($data[$key]['RECORD']) > 12 ) echo '...'; ?>
+						<?php if (($read_only === 'true') || ($data[$key]['SUSPENDED'] == 'yes')) { ?>
+							<?= substr($data[$key]['RECORD'], 0, 12); if(strlen($data[$key]['RECORD']) > 12 ) echo '...'; ?>
 						<?php } else { ?>
-							<a href="/edit/dns/?domain=<?=htmlspecialchars($_GET['domain'])?>&record_id=<?=$data[$key]['ID']?>&token=<?=$_SESSION['token']?>" title="<?= _("Edit DNS Record") . ': '.htmlspecialchars($data[$key]['RECORD'])?>"><? echo substr($data[$key]['RECORD'], 0, 12); if(strlen($data[$key]['RECORD']) > 12 ) echo '...'; ?></a>
+							<a href="/edit/dns/?domain=<?= htmlspecialchars($_GET['domain']) ?>&record_id=<?= $data[$key]['ID'] ?>&token=<?= $_SESSION['token'] ?>" title="<?= _("Edit DNS Record") . ': '.htmlspecialchars($data[$key]['RECORD']) ?>"><? echo substr($data[$key]['RECORD'], 0, 12); if(strlen($data[$key]['RECORD']) > 12 ) echo '...'; ?></a>
 						<?php } ?>
 						</b>
 					</div>
@@ -126,8 +126,8 @@
 								<!-- Restrict editing of DNS records when impersonating 'admin' account -->
 								&nbsp;
 							<?php } else { ?>
-								<?php if ($data[$key]['SUSPENDED'] == 'no') {?>
-									<div class="actions-panel__col actions-panel__logs shortcut-enter" data-key-action="href"><a href="/edit/dns/?domain=<?=htmlspecialchars($_GET['domain'])?>&record_id=<?=$data[$key]['ID']?>&token=<?=$_SESSION['token']?>" title="<?= _("Edit DNS Record") ?>"><i class="fas fa-pencil icon-orange icon-dim"></i></a></div>
+								<?php if ($data[$key]['SUSPENDED'] == 'no') { ?>
+									<div class="actions-panel__col actions-panel__logs shortcut-enter" data-key-action="href"><a href="/edit/dns/?domain=<?= htmlspecialchars($_GET['domain']) ?>&record_id=<?= $data[$key]['ID'] ?>&token=<?= $_SESSION['token'] ?>" title="<?= _("Edit DNS Record") ?>"><i class="fas fa-pencil icon-orange icon-dim"></i></a></div>
 								<?php } ?>
 								<div class="actions-panel__col actions-panel__delete shortcut-delete" data-key-action="js">
 									<a
@@ -144,9 +144,9 @@
 					</div>
 				</div>
 				<!-- END QUICK ACTION TOOLBAR AREA -->
-				<div class="clearfix l-unit__stat-col--left compact u-text-center" style="padding-left: 32px;"><b><?=$data[$key]['TYPE']?></b></div>
-				<div class="clearfix l-unit__stat-col--left compact u-text-center"><?=$data[$key]['PRIORITY']?>&nbsp;</div>
-				<div class="clearfix l-unit__stat-col--left compact u-text-center"><?php if($data[$key]['TTL'] == ''){ echo _('Default'); }else{ echo $data[$key]['TTL'];} ?></div>
+				<div class="clearfix l-unit__stat-col--left compact u-text-center" style="padding-left: 32px;"><b><?= $data[$key]['TYPE'] ?></b></div>
+				<div class="clearfix l-unit__stat-col--left compact u-text-center"><?= $data[$key]['PRIORITY'] ?>&nbsp;</div>
+				<div class="clearfix l-unit__stat-col--left compact u-text-center"><?php if ($data[$key]['TTL'] == ''){ echo _('Default'); }else{ echo $data[$key]['TTL'];} ?></div>
 				<div class="clearfix l-unit__stat-col--left super-compact"><b>&nbsp;</b></div>
 				<div class="clearfix l-unit__stat-col--left wide-6 u-text-break"><?= htmlspecialchars($data[$key]["VALUE"], ENT_QUOTES, "UTF-8") ?></div>
 			</div>

web/templates/pages/list_firewall.php

@@ -94,11 +94,11 @@
 				}
 			?>
 			<div class="l-unit <?php if ($status == 'suspended') echo 'l-unit--suspended'; ?> animate__animated animate__fadeIn js-unit"
-				data-sort-action="<?=$data[$key]['ACTION']?>"
-				data-sort-protocol="<?=$data[$key]['PROTOCOL']?>"
-				data-sort-port="<?=$data[$key]['PORT']?>"
-				data-sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>"
-				data-sort-comment="<?=$data[$key]['COMMENT']?>">
+				data-sort-action="<?= $data[$key]['ACTION'] ?>"
+				data-sort-protocol="<?= $data[$key]['PROTOCOL'] ?>"
+				data-sort-port="<?= $data[$key]['PORT'] ?>"
+				data-sort-ip="<?= str_replace('.', '', $data[$key]['IP']) ?>"
+				data-sort-comment="<?= $data[$key]['COMMENT'] ?>">
 				<div class="l-unit__col l-unit__col--right">
 					<div>
 						<div class="clearfix l-unit__stat-col--left super-compact">
@@ -121,11 +121,11 @@
 						<div class="clearfix l-unit__stat-col--left compact-2 u-text-right">
 							<div class="l-unit-toolbar__col l-unit-toolbar__col--right u-noselect">
 								<div class="actions-panel clearfix" style="padding-right: 10px;">
-									<div class="actions-panel__col actions-panel__logs shortcut-enter" data-key-action="href"><a href="/edit/firewall/?rule=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Edit Firewall Rule") ?>"><i class="fas fa-pencil icon-orange icon-dim"></i></a></div>
+									<div class="actions-panel__col actions-panel__logs shortcut-enter" data-key-action="href"><a href="/edit/firewall/?rule=<?= $key ?>&token=<?= $_SESSION['token'] ?>" title="<?= _("Edit Firewall Rule") ?>"><i class="fas fa-pencil icon-orange icon-dim"></i></a></div>
 									<div class="actions-panel__col actions-panel__suspend shortcut-s" data-key-action="js">
 										<a
 											class="data-controls js-confirm-action"
-											href="/<?= $spnd_action ?>/firewall/?rule=<?=$key?>&token=<?=$_SESSION['token']?>"
+											href="/<?= $spnd_action ?>/firewall/?rule=<?= $key ?>&token=<?= $_SESSION["token"] ?>"
 											data-confirm-title="<?= $spnd_action_title ?>"
 											data-confirm-message="<?= sprintf($spnd_confirmation, $key) ?>"
 										>
@@ -135,9 +135,9 @@
 									<div class="actions-panel__col actions-panel__delete shortcut-delete" data-key-action="js">
 										<a
 											class="data-controls js-confirm-action"
-											href="/delete/firewall/?rule=<?=$key?>&token=<?=$_SESSION['token']?>"
+											href="/delete/firewall/?rule=<?= $key ?>&token=<?= $_SESSION["token"] ?>"
 											data-confirm-title="<?= _("Delete") ?>"
-											data-confirm-message="<?= sprintf(_('Are you sure you want to delete rule %s'), $key) ?>"
+											data-confirm-message="<?= sprintf(_("Are you sure you want to delete rule %s"), $key) ?>"
 										>
 											<i class="fas fa-trash icon-red icon-dim"></i>
 										</a>
@@ -147,9 +147,9 @@
 						</div>
 						<!-- END QUICK ACTION TOOLBAR AREA -->
 						<div class="clearfix l-unit__stat-col--left wide-3"><b><?php if (!empty($data[$key]['COMMENT'])) echo '' . $data[$key]['COMMENT']; else echo "&nbsp;"; ?></b></div>
-						<div class="clearfix l-unit__stat-col--left u-text-center"><?=_($data[$key]['PROTOCOL'])?></div>
-						<div class="clearfix l-unit__stat-col--left wide-3 u-text-center"><b><?=$data[$key]['PORT']?></b></div>
-						<div class="clearfix l-unit__stat-col--left u-text-center"><?=$data[$key]['IP']?></div>
+						<div class="clearfix l-unit__stat-col--left u-text-center"><?= _($data[$key]['PROTOCOL']) ?></div>
+						<div class="clearfix l-unit__stat-col--left wide-3 u-text-center"><b><?= $data[$key]['PORT'] ?></b></div>
+						<div class="clearfix l-unit__stat-col--left u-text-center"><?= $data[$key]['IP'] ?></div>
 					</div>
 				</div>
 			</div>

web/templates/pages/list_ip.php

@@ -91,13 +91,13 @@
 					<div class="clearfix l-unit__stat-col--left super-compact">
 						<input id="check<?= $i ?>" class="js-unit-checkbox" type="checkbox" title="<?= _("Select") ?>" name="ip[]" value="<?= $key ?>">
 					</div>
-					<div class="clearfix l-unit__stat-col--left wide-3"><b><a href="/edit/ip/?ip=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Edit IP Address") ?>"><?=$key?> <?php if (!empty($data[$key]['NAT'])) echo ' → ' . $data[$key]['NAT'] . ''; ?></a></b>
+					<div class="clearfix l-unit__stat-col--left wide-3"><b><a href="/edit/ip/?ip=<?= $key ?>&token=<?= $_SESSION['token'] ?>" title="<?= _("Edit IP Address") ?>"><?= $key ?> <?php if (!empty($data[$key]['NAT'])) echo ' → ' . $data[$key]['NAT'] . ''; ?></a></b>
 					</div>
 					<!-- START QUICK ACTION TOOLBAR AREA -->
 					<div class="clearfix l-unit__stat-col--left compact u-text-right">
 						<div class="l-unit-toolbar__col l-unit-toolbar__col--right u-noselect">
 							<div class="actions-panel clearfix">
-								<div class="actions-panel__col actions-panel__logs shortcut-enter" data-key-action="href"><a href="/edit/ip/?ip=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Edit IP Address") ?>"><i class="fas fa-pencil icon-orange icon-dim"></i></a></div>
+								<div class="actions-panel__col actions-panel__logs shortcut-enter" data-key-action="href"><a href="/edit/ip/?ip=<?= $key ?>&token=<?= $_SESSION['token'] ?>" title="<?= _("Edit IP Address") ?>"><i class="fas fa-pencil icon-orange icon-dim"></i></a></div>
 								<div class="actions-panel__col actions-panel__delete shortcut-delete" data-key-action="js">
 									<a
 										class="data-controls js-confirm-action"

web/templates/pages/list_log.php

@@ -24,8 +24,8 @@
 			<?php if ($_SESSION['DEMO_MODE'] != "yes"){
 			if (($_SESSION['userContext'] === 'admin') && (htmlentities($_GET['user']) !== 'admin')) { ?>
 				<?php if (($_SESSION['userContext'] === 'admin') && ($_GET['user'] != '') && (htmlentities($_GET['user']) !== 'admin')) { ?>
-					<?php if (htmlentities($_GET['user']) !== 'system') {?>
-						<a href="/list/log/auth/?user=<?=htmlentities($_GET['user']); ?>&token=<?=$_SESSION['token']?>" class="button button-secondary button-back js-button-back" title="<?= _("Login History") ?>">
+					<?php if (htmlentities($_GET['user']) !== 'system') { ?>
+						<a href="/list/log/auth/?user=<?= htmlentities($_GET['user']); ?>&token=<?= $_SESSION['token'] ?>" class="button button-secondary button-back js-button-back" title="<?= _("Login History") ?>">
 							<i class="fas fa-binoculars icon-green"></i><?= _("Login History") ?>
 						</a>
 					<?php } ?>

web/templates/pages/list_mail.php

@@ -31,12 +31,12 @@
 						<span class="name <?php if ($_SESSION['userSortOrder'] === 'name') { echo 'active'; } ?>"><?= _("Name") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span>
 					</li>
 				</ul>
-				<?php if ($read_only !== 'true') {?>
+				<?php if ($read_only !== 'true') { ?>
 					<form x-data x-bind="BulkEdit" action="/bulk/mail/" method="post">
-						<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+						<input type="hidden" name="token" value="<?= $_SESSION['token'] ?>">
 						<select class="form-select" name="action">
 							<option value=""><?= _("Apply to selected") ?></option>
-							<?php if ($_SESSION['userContext'] === 'admin') {?>
+							<?php if ($_SESSION['userContext'] === 'admin') { ?>
 								<option value="rebuild"><?= _("Rebuild All") ?></option>
 							<?php } ?>
 							<option value="suspend"><?= _("Suspend") ?></option>
@@ -163,10 +163,10 @@
 				}
 			?>
 			<div class="units-table-row <?php if ($status == 'suspended') echo 'disabled'; ?> animate__animated animate__fadeIn js-unit"
-				data-sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>"
-				data-sort-name="<?=$key?>"
-				data-sort-disk="<?=$data[$key]['U_DISK']?>"
-				data-sort-accounts="<?=$data[$key]['ACCOUNTS']?>">
+				data-sort-date="<?= strtotime($data[$key]['DATE'].' '.$data[$key]['TIME']) ?>"
+				data-sort-name="<?= $key ?>"
+				data-sort-disk="<?= $data[$key]['U_DISK'] ?>"
+				data-sort-accounts="<?= $data[$key]['ACCOUNTS'] ?>">
 				<div class="units-table-cell">
 					<div>
 						<input id="check<?= $i ?>" class="js-unit-checkbox" type="checkbox" title="<?= _("Select") ?>" name="domain[]" value="<?= $key ?>" <?= $display_mode ?>>
@@ -175,7 +175,7 @@
 				</div>
 				<div class="units-table-cell units-table-heading-cell u-text-bold">
 					<span class="u-hide-desktop"><?= _("Name") ?>:</span>
-					<a href="?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Mail Accounts") ?>: <?=$key?>">
+					<a href="?domain=<?= $key ?>&token=<?= $_SESSION['token'] ?>" title="<?= _("Mail Accounts") ?>: <?= $key ?>">
 						<?= $key ?>
 					</a>
 				</div>
@@ -185,7 +185,7 @@
 							<li class="units-table-row-action shortcut-l" data-key-action="href">
 								<a
 									class="units-table-row-action-link"
-									href="?domain=<?=$key?>&token=<?=$_SESSION['token']?>"
+									href="?domain=<?= $key ?>&token=<?= $_SESSION['token'] ?>"
 									title="<?= _("Mail Accounts") ?>"
 								>
 									<i class="fas fa-users icon-blue"></i>
@@ -195,7 +195,7 @@
 							<li class="units-table-row-action shortcut-l" data-key-action="href">
 								<a
 									class="units-table-row-action-link"
-									href="?domain=<?=$key?>&dns=1&token=<?=$_SESSION['token']?>"
+									href="?domain=<?= $key ?>&dns=1&token=<?= $_SESSION['token'] ?>"
 									title="<?= _("DNS Records") ?>"
 								>
 									<i class="fas fa-book-atlas icon-blue"></i>
@@ -206,7 +206,7 @@
 								<li class="units-table-row-action" data-key-action="href">
 									<a
 										class="units-table-row-action-link"
-										href="http://<?=$webmail;?>.<?=$key?>/"
+										href="http://<?= $webmail;?>.<?= $key ?>/"
 										target="_blank"
 										title="<?= _("Open Webmail") ?>"
 									>
@@ -220,7 +220,7 @@
 								<li class="units-table-row-action shortcut-n" data-key-action="href">
 									<a
 										class="units-table-row-action-link"
-										href="/add/mail/?domain=<?=$key?>&token=<?=$_SESSION['token']?>"
+										href="/add/mail/?domain=<?= $key ?>&token=<?= $_SESSION['token'] ?>"
 										title="<?= _("Add Mail Account") ?>"
 									>
 										<i class="fas fa-circle-plus icon-green"></i>
@@ -232,7 +232,7 @@
 										<li class="units-table-row-action" data-key-action="href">
 											<a
 												class="units-table-row-action-link"
-												href="http://<?=$webmail;?>.<?=$key?>/"
+												href="http://<?= $webmail;?>.<?= $key ?>/"
 												target="_blank"
 												title="<?= _("Open Webmail") ?>"
 											>
@@ -245,7 +245,7 @@
 								<li class="units-table-row-action shortcut-enter" data-key-action="href">
 									<a
 										class="units-table-row-action-link"
-										href="/edit/mail/?domain=<?=$key?>&token=<?=$_SESSION['token']?>"
+										href="/edit/mail/?domain=<?= $key ?>&token=<?= $_SESSION['token'] ?>"
 										title="<?= _("Edit Mail Domain") ?>"
 									>
 										<i class="fas fa-pencil icon-orange"></i>
@@ -256,7 +256,7 @@
 							<li class="units-table-row-action shortcut-l" data-key-action="href">
 								<a
 									class="units-table-row-action-link"
-									href="?domain=<?=$key?>&dns=1&token=<?=$_SESSION['token']?>"
+									href="?domain=<?= $key ?>&dns=1&token=<?= $_SESSION['token'] ?>"
 									title="<?= _("DNS Records") ?>"
 								>
 									<i class="fas fa-book-atlas icon-blue"></i>
@@ -266,7 +266,7 @@
 							<li class="units-table-row-action shortcut-s" data-key-action="js">
 								<a
 									class="units-table-row-action-link data-controls js-confirm-action"
-									href="/<?= $spnd_action ?>/mail/?domain=<?=$key?>&token=<?=$_SESSION['token']?>"
+									href="/<?= $spnd_action ?>/mail/?domain=<?= $key ?>&token=<?= $_SESSION['token'] ?>"
 									title="<?= $spnd_action_title ?>"
 									data-confirm-title="<?= $spnd_action_title ?>"
 									data-confirm-message="<?= sprintf($spnd_confirmation, $key) ?>"
@@ -278,7 +278,7 @@
 							<li class="units-table-row-action shortcut-delete" data-key-action="js">
 								<a
 									class="units-table-row-action-link data-controls js-confirm-action"
-									href="/delete/mail/?domain=<?=$key?>&token=<?=$_SESSION['token']?>"
+									href="/delete/mail/?domain=<?= $key ?>&token=<?= $_SESSION['token'] ?>"
 									title="<?= _("Delete") ?>"
 									data-confirm-title="<?= _("Delete") ?>"
 									data-confirm-message="<?= sprintf(_('Are you sure you want to delete domain %s?'), $key) ?>"

web/templates/pages/list_mail_acc.php

@@ -167,7 +167,7 @@ if (!empty($_SESSION["WEBMAIL_ALIAS"])) {
 					<?php if ($read_only === "true" || $data[$key]["SUSPENDED"] == "yes") { ?>
 						<?= $key . "@" . htmlentities($_GET["domain"]) ?>
 					<?php } else { ?>
-						<a href="/edit/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Edit Mail Account") ?>: <?=$key?>@<?=htmlspecialchars($_GET['domain'])?>">
+						<a href="/edit/mail/?domain=<?= htmlspecialchars($_GET['domain']) ?>&account=<?= $key ?>&token=<?= $_SESSION['token'] ?>" title="<?= _("Edit Mail Account") ?>: <?= $key ?>@<?= htmlspecialchars($_GET['domain']) ?>">
 							<?= $key."@".htmlentities($_GET['domain']); ?>
 						</a>
 					<?php } ?>

web/templates/pages/list_packages.php

@@ -94,10 +94,10 @@
 							<div class="actions-panel clearfix">
 								<?php if ($key == "system") { ?>
 									<!-- Restrict editing system package -->
-								<?php } else {?>
-									<div class="actions-panel__col actions-panel__edit shortcut-enter" data-key-action="href"><a href="/edit/package/?package=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Edit Package") ?>"><i class="fas fa-pencil icon-orange icon-dim"></i></a></div>
+								<?php } else { ?>
+									<div class="actions-panel__col actions-panel__edit shortcut-enter" data-key-action="href"><a href="/edit/package/?package=<?= $key ?>&token=<?= $_SESSION['token'] ?>" title="<?= _("Edit Package") ?>"><i class="fas fa-pencil icon-orange icon-dim"></i></a></div>
 								<?php } ?>
-								<div class="actions-panel__col actions-panel__edit" data-key-action="href"><a href="/copy/package/?package=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Duplicate") ?>"><i class="fas fa-clone icon-teal icon-dim"></i></a></div>
+								<div class="actions-panel__col actions-panel__edit" data-key-action="href"><a href="/copy/package/?package=<?= $key ?>&token=<?= $_SESSION['token'] ?>" title="<?= _("Duplicate") ?>"><i class="fas fa-clone icon-teal icon-dim"></i></a></div>
 								<?php if ($key == 'system') { ?>
 									<!-- Restrict deleting system package -->
 								<?php } else { ?>

web/templates/pages/list_search.php

@@ -82,14 +82,14 @@
 				}
 				$uniq_id .= sha1($value['RESULT']);
 			?>
-			<div class="l-unit <?php if($status == 'suspended') echo 'l-unit--suspended'; ?> animate__animated animate__fadeIn js-unit"
-				data-uniq-id="<?=$uniq_id?>"
-				data-sort-date="<?=strtotime($value['DATE'].' '.$value['TIME'])?>"
-				data-sort-name="<?=$value['RESULT']?>"
-				data-sort-type="<?=_($object)?>"
-				data-sort-owner="<?=$value['USER']?>"
-				data-sort-status="<?=$status?>"
-				style="<?php if (($_SESSION['POLICY_SYSTEM_HIDE_ADMIN'] === 'yes') && ($value['USER']) === 'admin') { echo 'display: none;';}?>">
+			<div class="l-unit <?php if ($status == 'suspended') echo 'l-unit--suspended'; ?> animate__animated animate__fadeIn js-unit"
+				data-uniq-id="<?= $uniq_id?>"
+				data-sort-date="<?= strtotime($value['DATE'].' '.$value['TIME']) ?>"
+				data-sort-name="<?= $value['RESULT'] ?>"
+				data-sort-type="<?= _($object) ?>"
+				data-sort-owner="<?= $value['USER'] ?>"
+				data-sort-status="<?= $status ?>"
+				style="<?php if (($_SESSION['POLICY_SYSTEM_HIDE_ADMIN'] === 'yes') && ($value['USER']) === 'admin') { echo 'display: none;'; } ?>">
 
 				<div class="l-unit__col l-unit__col--right">
 					<div class="clearfix l-unit__stat-col--left super-compact u-text-center">
@@ -113,7 +113,7 @@
 									$icon = 'fa-clock';
 							}
 						?>
-						<i class="fa <?=$icon;?> icon-dim"></i>
+						<i class="fa <?= $icon ?> icon-dim"></i>
 					</div>
 					<div class="clearfix l-unit__stat-col--left compact-2 u-text-center">
 						<b>
@@ -168,9 +168,9 @@
 					<div class="clearfix l-unit__stat-col--left u-text-center"><?= translate_date($value["DATE"]) ?></div>
 					<div class="clearfix l-unit__stat-col--left u-text-center">
 						<b>
-							<a href="/search/?q=<?=htmlentities($_GET['q']); ?>&u=<?=$value['USER']; ?>&token=<?=$_SESSION['token']?>"><?=$value['USER']; ?></a>
+							<a href="/search/?q=<?= htmlentities($_GET['q']); ?>&u=<?= $value['USER']; ?>&token=<?= $_SESSION['token'] ?>"><?= $value['USER']; ?></a>
 							<?php if (!($_SESSION['POLICY_SYSTEM_HIDE_ADMIN'] === 'yes' && $value['USER'] !== 'admin') && ($_SESSION['userContext'] === 'admin')) { ?>
-								<a href="/login/?loginas=<?=$value['USER']?>&token=<?=$_SESSION['token']?>" title="<?= _("Log in as") ?> <?=$value['USER']?>">
+								<a href="/login/?loginas=<?= $value['USER'] ?>&token=<?= $_SESSION['token'] ?>" title="<?= _("Log in as") ?> <?= $value['USER'] ?>">
 									<i class="fas fa-right-to-bracket icon-green icon-dim"></i>
 								</a>
 							<?php } ?>

web/templates/pages/list_server_info.php

@@ -36,56 +36,56 @@
 								</a>
 							</li>
 							<li class="top-bar-menu-item">
-								<a class="top-bar-menu-link <?php if(isset($_GET['cpu'])) echo 'active' ?>" href="/list/server/?cpu">
+								<a class="top-bar-menu-link <?php if (isset($_GET['cpu'])) echo 'active' ?>" href="/list/server/?cpu">
 									<i class="fas fa-microchip"></i>
 									<span class="top-bar-menu-link-label"><?= _("CPU") ?></span>
 								</a>
 							</li>
 							<li class="top-bar-menu-item">
-								<a class="top-bar-menu-link <?php if(isset($_GET['mem'])) echo 'active' ?>" href="/list/server/?mem">
+								<a class="top-bar-menu-link <?php if (isset($_GET['mem'])) echo 'active' ?>" href="/list/server/?mem">
 									<i class="fas fa-memory"></i>
 									<span class="top-bar-menu-link-label"><?= _("RAM") ?></span>
 								</a>
 							</li>
 							<li class="top-bar-menu-item">
-								<a class="top-bar-menu-link <?php if(isset($_GET['disk'])) echo 'active' ?>" href="/list/server/?disk">
+								<a class="top-bar-menu-link <?php if (isset($_GET['disk'])) echo 'active' ?>" href="/list/server/?disk">
 									<i class="fas fa-hard-drive"></i>
 									<span class="top-bar-menu-link-label"><?= _("Disk") ?></span>
 								</a>
 							</li>
 							<li class="top-bar-menu-item">
-								<a class="top-bar-menu-link <?php if(isset($_GET['net'])) echo 'active' ?>" href="/list/server/?net">
+								<a class="top-bar-menu-link <?php if (isset($_GET['net'])) echo 'active' ?>" href="/list/server/?net">
 									<i class="fas fa-hard-drive"></i>
 									<span class="top-bar-menu-link-label"><?= _("Network") ?></span>
 								</a>
 							</li>
-							<?php if ((isset($_SESSION['WEB_SYSTEM'])) && (!empty($_SESSION['WEB_SYSTEM']))) {?>
+							<?php if ((isset($_SESSION['WEB_SYSTEM'])) && (!empty($_SESSION['WEB_SYSTEM']))) { ?>
 								<li class="top-bar-menu-item">
-									<a class="top-bar-menu-link <?php if(isset($_GET['web'])) echo 'active' ?>" href="/list/server/?web">
+									<a class="top-bar-menu-link <?php if (isset($_GET['web'])) echo 'active' ?>" href="/list/server/?web">
 										<i class="fas fa-earth-europe"></i>
 										<span class="top-bar-menu-link-label"><?= _("Web") ?></span>
 									</a>
 								</li>
 							<?php } ?>
-							<?php if ((isset($_SESSION['DNS_SYSTEM'])) && (!empty($_SESSION['DNS_SYSTEM']))) {?>
+							<?php if ((isset($_SESSION['DNS_SYSTEM'])) && (!empty($_SESSION['DNS_SYSTEM']))) { ?>
 								<li class="top-bar-menu-item">
-									<a class="top-bar-menu-link <?php if(isset($_GET['dns'])) echo 'active' ?>" href="/list/server/?dns">
+									<a class="top-bar-menu-link <?php if (isset($_GET['dns'])) echo 'active' ?>" href="/list/server/?dns">
 										<i class="fas fa-book-atlas"></i>
 										<span class="top-bar-menu-link-label"><?= _("DNS") ?></span>
 									</a>
 								</li>
 							<?php } ?>
-							<?php if ((isset($_SESSION['MAIL_SYSTEM'])) && (!empty($_SESSION['MAIL_SYSTEM']))) {?>
+							<?php if ((isset($_SESSION['MAIL_SYSTEM'])) && (!empty($_SESSION['MAIL_SYSTEM']))) { ?>
 								<li class="top-bar-menu-item">
-									<a class="top-bar-menu-link <?php if(isset($_GET['mail'])) echo 'active' ?>" href="/list/server/?mail">
+									<a class="top-bar-menu-link <?php if (isset($_GET['mail'])) echo 'active' ?>" href="/list/server/?mail">
 										<i class="fas fa-envelopes-bulk"></i>
 										<span class="top-bar-menu-link-label"><?= _("Mail") ?></span>
 									</a>
 								</li>
 							<?php } ?>
-							<?php if ((isset($_SESSION['DB_SYSTEM'])) && (!empty($_SESSION['DB_SYSTEM']))) {?>
+							<?php if ((isset($_SESSION['DB_SYSTEM'])) && (!empty($_SESSION['DB_SYSTEM']))) { ?>
 								<li class="top-bar-menu-item">
-									<a class="top-bar-menu-link <?php if(isset($_GET['db'])) echo 'active' ?>" href="/list/server/?db">
+									<a class="top-bar-menu-link <?php if (isset($_GET['db'])) echo 'active' ?>" href="/list/server/?db">
 										<i class="fas fa-database"></i>
 										<span class="top-bar-menu-link-label"><?= _("DB") ?></span>
 									</a>
@@ -98,7 +98,7 @@
 								</a>
 							</li>
 							<li class="top-bar-menu-item">
-								<a class="top-bar-menu-link top-bar-menu-link-logout" href="/logout/?token=<?=$_SESSION['token']?>" title="<?= _("Log out") ?>">
+								<a class="top-bar-menu-link top-bar-menu-link-logout" href="/logout/?token=<?= $_SESSION["token"] ?>" title="<?= _("Log out") ?>">
 									<i class="fas fa-right-from-bracket"></i>
 									<span class="u-hidden"><?= _("Log out") ?></span>
 								</a>

web/templates/pages/list_server_preview.php

@@ -12,24 +12,29 @@
 
 <div class="container">
 
-	<div class="units js-units-container">
-		<div class="header units-header">
-			<div class="l-unit__col l-unit__col--right">
-				<div class="clearfix l-unit__stat-col--left super-compact u-text-center">&nbsp;</div>
-				<div class="clearfix l-unit__stat-col--left"><b><?= _("Category") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left wide-6"><b><?= _("Name") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left wide-2"><b><?= _("Status") ?></b></div>
-			</div>
+	<div class="units-table js-units-container">
+		<div class="units-table-header">
+			<div class="units-table-cell"></div>
+			<div class="units-table-cell"><?= _("Category") ?></div>
+			<div class="units-table-cell"><?= _("Name") ?></div>
+			<div class="units-table-cell"><?= _("Status") ?></div>
 		</div>
 
-		<div class="l-unit header animate__animated animate__fadeIn js-unit">
-			<div class="l-unit__col l-unit__col--right">
-				<div class="clearfix l-unit__stat-col--left super-compact u-text-center">
-					<i class="fas fa-gear icon-blue"></i>
-				</div>
-				<div class="clearfix l-unit__stat-col--left"><b><?= _("System") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left wide-6"><b><?= _("Policy") ?>: <?= _("Allow suspended users to log in with read-only access") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left wide-2"><?= _("Partially implemented") ?></div>
+		<div class="units-table-row animate__animated animate__fadeIn js-unit">
+			<div class="units-table-cell u-text-center-desktop">
+				<i class="fas fa-gear icon-blue"></i>
+			</div>
+			<div class="units-table-cell units-table-heading-cell u-text-bold">
+				<span class="u-hide-desktop"><?= _("Category") ?>:</span>
+				<?= _("System") ?>
+			</div>
+			<div class="units-table-cell u-text-bold">
+				<span class="u-hide-desktop"><?= _("Name") ?>:</span>
+				<?= _("Policy") ?>: <?= _("Allow suspended users to log in with read-only access") ?>
+			</div>
+			<div class="units-table-cell">
+				<span class="u-hide-desktop u-text-bold"><?= _("Status") ?>:</span>
+				<?= _("Partially implemented") ?>
 			</div>
 		</div>
 	</div>

web/templates/pages/list_updates.php

@@ -6,7 +6,7 @@
 				<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
 			</a>
 			<?php
-				if($autoupdate == 'Enabled') {
+				if ($autoupdate == 'Enabled') {
 					$btn_url = '/delete/cron/autoupdate/?token='.$_SESSION['token'].'';
 					$btn_icon = 'fa-toggle-on icon-green';
 					$btn_label = _('Disable Automatic Updates');
@@ -16,8 +16,8 @@
 					$btn_label = _('Enable Automatic Updates');
 				}
 			?>
-			<a class="button button-secondary" href="<?=$btn_url;?>">
-				<i class="fas <?=$btn_icon;?>"></i><?= $btn_label; ?>
+			<a class="button button-secondary" href="<?= $btn_url ?>">
+				<i class="fas <?= $btn_icon ?>"></i><?= $btn_label ?>
 			</a>
 		</div>
 	</div>
@@ -26,20 +26,12 @@
 
 <div class="container">
 
-	<div class="units js-units-container">
-		<div class="header units-header">
-			<div class="l-unit__col l-unit__col--right">
-				<div>
-					<div class="clearfix l-unit__stat-col--left super-compact center">
-						<input type="checkbox" class="js-toggle-all-checkbox" title="<?= _("Select all") ?>">
-					</div>
-					<!-- Not a typo, to differentiate from User "Package Name" -->
-					<div class="clearfix l-unit__stat-col--left wide"><b><?= _("Package Names") ?></b></div>
-					<div class="clearfix l-unit__stat-col--left wide-5"><b><?= _("Description") ?></b></div>
-					<div class="clearfix l-unit__stat-col--left u-text-center wide"><b><?= _("Version") ?></b></div>
-					<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Status") ?></b></div>
-				</div>
-			</div>
+	<div class="units-table js-units-container">
+		<div class="units-table-header">
+			<div class="units-table-cell"><?= _("Package") ?></div>
+			<div class="units-table-cell"><?= _("Description") ?></div>
+			<div class="units-table-cell u-text-center"><?= _("Version") ?></div>
+			<div class="units-table-cell u-text-center"><?= _("Status") ?></div>
 		</div>
 
 		<!-- Begin update list item loop -->
@@ -55,25 +47,23 @@
 					$upd_status = 'outdated';
 				}
 			?>
-			<div class="l-unit <?php if ($status == 'suspended') echo 'l-unit--outdated'; ?> animate__animated animate__fadeIn js-unit">
-				<div class="l-unit-toolbar clearfix">
-					<div class="l-unit-toolbar__col l-unit-toolbar__col--right u-noselect">
-					</div>
+			<div class="units-table-row <?php if ($status == 'suspended') echo 'disabled'; ?> animate__animated animate__fadeIn js-unit">
+				<div class="units-table-cell units-table-heading-cell u-text-bold">
+					<span class="u-hide-desktop"><?= _("Package") ?>:</span>
+					<?= $key ?>
 				</div>
-
-				<div class="l-unit__col l-unit__col--right">
-					<div>
-						<div class="clearfix l-unit__stat-col--left super-compact center">
-							<input id="check<?= $i ?>" class="js-unit-checkbox" type="checkbox" title="<?= _("Select") ?>" name="pkg[]" value="<?= $key ?>">
-						</div>
-						<div class="clearfix l-unit__stat-col--left wide"><b><?=$key?></b></div>
-						<div class="clearfix l-unit__stat-col--left wide-5"><?=_($data[$key]['DESCR'])?></div>
-						<div class="clearfix l-unit__stat-col--left u-text-center wide"><?=$data[$key]['VERSION'] ?> (<?=$data[$key]['ARCH']?>)</div>
-						<div class="clearfix l-unit__stat-col--left u-text-center">
-							<?php if ($data[$key]['UPDATED'] == 'no') { echo '<i class="fas fa-triangle-exclamation" style="color: orange;"></i>'; } ?>
-							<?php if ($data[$key]['UPDATED'] == 'yes') { echo '<i class="fas fa-circle-check icon-green"></i>'; } ?>
-						</div>
-					</div>
+				<div class="units-table-cell">
+					<span class="u-hide-desktop u-text-bold"><?= _("Description") ?>:</span>
+					<?= _($data[$key]["DESCR"]) ?>
+				</div>
+				<div class="units-table-cell u-text-center-desktop">
+					<span class="u-hide-desktop u-text-bold"><?= _("Version") ?>:</span>
+					<?= $data[$key]["VERSION"] ?> (<?= $data[$key]["ARCH"] ?>)
+				</div>
+				<div class="units-table-cell u-text-center-desktop">
+					<span class="u-hide-desktop u-text-bold"><?= _("Status") ?>:</span>
+					<?php if ($data[$key]['UPDATED'] == 'no') { echo '<i class="fas fa-triangle-exclamation" style="color: orange;"></i>'; } ?>
+					<?php if ($data[$key]['UPDATED'] == 'yes') { echo '<i class="fas fa-circle-check icon-green"></i>'; } ?>
 				</div>
 			</div>
 		<?php } ?>

web/templates/pages/list_user.php

@@ -129,10 +129,10 @@
 				}
 			?>
 			<div class="units-table-row <?php if ($status == 'suspended') echo 'disabled'; ?> animate__animated animate__fadeIn js-unit <?php if (($_SESSION['POLICY_SYSTEM_HIDE_ADMIN'] === 'yes') && ($_SESSION['user'] !== 'admin') && ($key === 'admin')) { echo 'u-hidden'; } ?>"
-				data-sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>"
-				data-sort-name="<?=strtolower($key)?>"
-				data-sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>"
-				data-sort-disk="<?=$data[$key]['U_DISK']?>">
+				data-sort-date="<?= strtotime($data[$key]['DATE'].' '.$data[$key]['TIME']) ?>"
+				data-sort-name="<?= strtolower($key) ?>"
+				data-sort-bandwidth="<?= $data[$key]["U_BANDWIDTH"] ?>"
+				data-sort-disk="<?= $data[$key]["U_DISK"] ?>">
 				<div class="units-table-cell">
 					<div>
 						<input id="check<?= $i ?>" class="js-unit-checkbox" type="checkbox" title="<?= _("Select") ?>" name="user[]" value="<?= $key ?>">

web/templates/pages/list_web.php

@@ -14,7 +14,7 @@
 					<?= _("Sort by") ?>:
 					<span class="u-text-bold">
 						<?php if ($_SESSION['userSortOrder'] === 'name') { $label = ('Name'); } else { $label = _('Date'); } ?>
-						<?=$label?> <i class="fas fa-arrow-down-a-z"></i>
+						<?= $label?> <i class="fas fa-arrow-down-a-z"></i>
 					</span>
 				</button>
 				<ul class="toolbar-sorting-menu animate__animated animate__fadeIn js-sorting-menu u-hidden">
@@ -182,11 +182,11 @@
 				}
 			?>
 			<div class="units-table-row <?php if ($data[$key]['SUSPENDED'] == 'yes') echo 'disabled'; ?> animate__animated animate__fadeIn js-unit"
-				data-sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>"
-				data-sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>"
-				data-sort-name="<?=$key?>"
-				data-sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>"
-				data-sort-disk="<?=$data[$key]['U_DISK']?>">
+				data-sort-ip="<?= str_replace('.', '', $data[$key]['IP']) ?>"
+				data-sort-date="<?= strtotime($data[$key]['DATE'].' '.$data[$key]['TIME']) ?>"
+				data-sort-name="<?= $key ?>"
+				data-sort-bandwidth="<?= $data[$key]['U_BANDWIDTH'] ?>"
+				data-sort-disk="<?= $data[$key]['U_DISK'] ?>">
 				<div class="units-table-cell">
 					<div>
 						<input id="check<?= $i ?>" class="js-unit-checkbox" type="checkbox" title="<?= _("Select") ?>" name="domain[]" value="<?= $key ?>" <?= $display_mode ?>>
@@ -206,7 +206,7 @@
 							}
 						}
 						?>
-						<a href="/edit/web/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Edit Domain") ?>: <?=$key?>">
+						<a href="/edit/web/?domain=<?= $key ?>&token=<?= $_SESSION['token'] ?>" title="<?= _("Edit Domain") ?>: <?= $key ?>">
 							<?= $key ?>
 							<?php
 								if (!empty($alias_new) && !empty($data[$key]['ALIAS'])) {

web/templates/pages/list_weblog.php

@@ -36,25 +36,25 @@
 								</a>
 							</li>
 							<li class="top-bar-menu-item">
-								<a class="top-bar-menu-link <?php if($_GET['type'] == 'access') echo 'active' ?>" href="/list/web-log/?domain=<?=htmlentities($_GET['domain'])?>&type=access&token=<?=$_SESSION['token']?>" title="<?= _("Access Log") ?>">
+								<a class="top-bar-menu-link <?php if ($_GET['type'] == 'access') echo 'active' ?>" href="/list/web-log/?domain=<?= htmlentities($_GET['domain']) ?>&type=access&token=<?= $_SESSION['token'] ?>" title="<?= _("Access Log") ?>">
 									<i class="fas fa-eye"></i>
 									<span class="top-bar-menu-link-label"><?= _("Access Log") ?></span>
 								</a>
 							</li>
 							<li class="top-bar-menu-item">
-								<a class="top-bar-menu-link <?php if($_GET['type'] == 'access') echo 'active' ?>" href="/download/web-log/?domain=<?=htmlentities($_GET['domain'])?>&type=access&&token=<?=$_SESSION['token']?>" title="<?= _("Download") ?>">
+								<a class="top-bar-menu-link <?php if ($_GET['type'] == 'access') echo 'active' ?>" href="/download/web-log/?domain=<?= htmlentities($_GET['domain']) ?>&type=access&&token=<?= $_SESSION['token'] ?>" title="<?= _("Download") ?>">
 									<i class="fas fa-download"></i>
 									<span class="u-hidden"><?= _("Download") ?></span>
 								</a>
 							</li>
 							<li class="top-bar-menu-item">
-								<a class="top-bar-menu-link <?php if($_GET['type'] == 'error') echo 'active' ?>" href="/list/web-log/?domain=<?=htmlentities($_GET['domain'])?>&type=error&token=<?=$_SESSION['token']?>" title="<?= _("Error Log") ?>">
+								<a class="top-bar-menu-link <?php if ($_GET['type'] == 'error') echo 'active' ?>" href="/list/web-log/?domain=<?= htmlentities($_GET['domain']) ?>&type=error&token=<?= $_SESSION['token'] ?>" title="<?= _("Error Log") ?>">
 									<i class="fas fa-circle-exclamation"></i>
 									<span class="top-bar-menu-link-label"><?= _("Error Log") ?></span>
 								</a>
 							</li>
 							<li class="top-bar-menu-item">
-								<a class="top-bar-menu-link <?php if($_GET['type'] == 'error') echo 'active' ?>" href="/download/web-log/?domain=<?=htmlentities($_GET['domain'])?>&type=error&token=<?=$_SESSION['token']?>" title="<?= _("Download") ?>">
+								<a class="top-bar-menu-link <?php if ($_GET['type'] == 'error') echo 'active' ?>" href="/download/web-log/?domain=<?= htmlentities($_GET['domain']) ?>&type=error&token=<?= $_SESSION['token'] ?>" title="<?= _("Download") ?>">
 									<i class="fas fa-download"></i>
 									<span class="u-hidden"><?= _("Download") ?></span>
 								</a>

web/templates/pages/setup_webapp.php

@@ -36,8 +36,7 @@
 						</div>
 					</div>
 				<?php } ?>
-				<?php
-				foreach ($WebappInstaller->getOptions() as $form_name => $form_control) {
+				<?php foreach ($WebappInstaller->getOptions() as $form_name => $form_control) {
 					$field_name = $WebappInstaller->formNs() . "_" . $form_name;
 					$field_type = $form_control;
 					$field_value = "";
@@ -68,11 +67,11 @@
 							</label>
 						<?php endif; ?>
 
-						<?php if ($field_type == 'select' && count($form_control['options'])): ?>
+						<?php if ($field_type == "select" && count($form_control["options"])): ?>
 							<select class="form-select" name="<?= $field_name ?>" id="<?= $field_name ?>">
-								<?php foreach ($form_control['options'] as $key => $option):
+								<?php foreach ($form_control["options"] as $key => $option):
 									$key = !is_numeric($key) ? $key : $option;
-									$selected = !empty($form_control['value'] && $key == $form_control['value']) ? 'selected' : ''; ?>
+									$selected = !empty($form_control["value"] && $key == $form_control["value"]) ? "selected" : ""; ?>
 									<option value="<?= $key ?>" <?= $selected ?>>
 										<?= htmlentities($option) ?>
 									</option>