Refactor toolbar for tablet (#3123)

- Fix merge issue
- Simplify alerts
- Simplify update banner
- Refactor away some inline styles

package.json

@@ -23,8 +23,8 @@
 	},
 	"devDependencies": {
 		"@prettier/plugin-php": "^0.19.2",
-		"@typescript-eslint/eslint-plugin": "^5.45.1",
-		"@typescript-eslint/parser": "^5.45.1",
+		"@typescript-eslint/eslint-plugin": "^5.46.0",
+		"@typescript-eslint/parser": "^5.46.0",
 		"cssnano": "^5.1.14",
 		"eslint": "^8.29.0",
 		"eslint-config-prettier": "^8.5.0",
@@ -44,7 +44,7 @@
 		"stylelint": "^14.16.0",
 		"stylelint-config-prettier": "^9.0.4",
 		"stylelint-config-standard": "^29.0.0",
-		"typescript": "^4.9.3",
+		"typescript": "^4.9.4",
 		"vitepress": "1.0.0-alpha.30",
 		"vue": "^3.2.45"
 	}

web/css/src/themes/dark.css

@@ -569,12 +569,6 @@ textarea:focus::placeholder {
 	color: #909090;
 }
 
-.toggle-psw-visibility-icon {
-}
-
-.show-passwords-enabled-action {
-}
-
 .hint {
 	color: #a2a2a2;
 }

web/css/src/themes/default.css

@@ -540,7 +540,6 @@
 	color: #fff;
 	font-weight: 400;
 	padding: 15px;
-	position: relative;
 	box-shadow: var(--alert-box-shadow);
 	text-shadow: var(--alert-text-shadow);
 
@@ -554,9 +553,7 @@
 	}
 
 	& .fas {
-		position: absolute;
-		top: 19px;
-		left: 15px;
+		flex-shrink: 0;
 		size: 32px;
 		font-size: 1.3rem;
 		font-weight: 600;
@@ -564,12 +561,17 @@
 		border-radius: 50%;
 		text-align: center;
 		background-color: #fff;
+		margin-bottom: 10px;
 	}
-}
 
-.alert-with-icon {
-	padding-left: 63px;
-	min-height: 65px;
+	@media (--viewport-small) {
+		display: flex;
+
+		& .fas {
+			margin-right: 15px;
+			margin-bottom: 0;
+		}
+	}
 }
 
 .alert-info {
@@ -633,69 +635,6 @@
 	}
 }
 
-/* Cards
-   ========================================================================== */
-
-.cards {
-	@media (--viewport-small) {
-		display: grid;
-		gap: 25px;
-		grid-template-columns: repeat(2, 1fr);
-	}
-
-	@media (--viewport-medium) {
-		grid-template-columns: repeat(4, 1fr);
-	}
-}
-
-.card {
-	overflow: hidden;
-	background-color: #f5f5f5;
-	border: 1px solid #d3d3d3;
-	box-shadow: 0 1px 4px rgb(0 0 0 / 20%);
-	border-radius: 4px;
-	margin-bottom: 20px;
-
-	@media (--viewport-small) {
-		margin-bottom: 0;
-	}
-
-	&.disabled {
-		color: #b6b6b6;
-
-		& .card-thumb {
-			filter: grayscale(100%);
-			opacity: 0.3;
-		}
-	}
-}
-
-.card-thumb {
-	background-color: #fff;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	height: 180px;
-	padding: 20px;
-
-	& img {
-		max-width: 100%;
-		max-height: 100%;
-	}
-}
-
-.card-content {
-	padding: 10px;
-	color: #353535;
-	border-top: 1px solid #e6e6e6;
-	text-align: center;
-}
-
-.card-title {
-	font-size: 1rem;
-	font-weight: 600;
-}
-
 /* Toolbar
    ========================================================================== */
 
@@ -735,12 +674,9 @@
 		&:focus {
 			border-right-color: #008fee;
 		}
-
-		&.activated {
-		}
 	}
 
-	@media (--viewport-medium) {
+	@media (--viewport-large) {
 		position: sticky;
 		z-index: 1;
 		top: 39px;
@@ -758,19 +694,13 @@
 .toolbar-inner {
 	padding: 10px 20px;
 
-	@media (--viewport-medium) {
+	@media (--viewport-large) {
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
 		flex-grow: 1;
 		max-width: 1024px;
-		padding-top: 5px;
-		padding-bottom: 5px;
-	}
-
-	@media (--viewport-large) {
-		padding-left: 0;
-		padding-right: 0;
+		padding: 5px 0;
 	}
 }
 
@@ -779,7 +709,7 @@
 		display: flex;
 	}
 
-	@media (--viewport-medium) {
+	@media (--viewport-large) {
 		display: flex;
 	}
 }
@@ -802,7 +732,7 @@
 		}
 	}
 
-	@media (--viewport-medium) {
+	@media (--viewport-large) {
 		padding-bottom: 0;
 	}
 }
@@ -990,7 +920,6 @@
 	@media (--viewport-medium) {
 		display: flex;
 		align-items: center;
-		padding-bottom: 0;
 
 		& .inline-success,
 		& .inline-danger {
@@ -998,7 +927,6 @@
 		}
 
 		& .button {
-			width: auto;
 			margin-bottom: 0;
 			margin-right: 8px;
 
@@ -1007,14 +935,85 @@
 			}
 		}
 	}
+
+	@media (--viewport-large) {
+		padding-bottom: 0;
+
+		& .button {
+			width: auto;
+		}
+	}
 }
 
 .toolbar-search {
-	@media (--viewport-medium) {
+	@media (--viewport-large) {
 		margin-left: 12px;
 	}
 }
 
+/* Cards
+   ========================================================================== */
+
+.cards {
+	@media (--viewport-small) {
+		display: grid;
+		gap: 25px;
+		grid-template-columns: repeat(2, 1fr);
+	}
+
+	@media (--viewport-medium) {
+		grid-template-columns: repeat(4, 1fr);
+	}
+}
+
+.card {
+	overflow: hidden;
+	background-color: #f5f5f5;
+	border: 1px solid #d3d3d3;
+	box-shadow: 0 1px 4px rgb(0 0 0 / 20%);
+	border-radius: 4px;
+	margin-bottom: 20px;
+
+	@media (--viewport-small) {
+		margin-bottom: 0;
+	}
+
+	&.disabled {
+		color: #b6b6b6;
+
+		& .card-thumb {
+			filter: grayscale(100%);
+			opacity: 0.3;
+		}
+	}
+}
+
+.card-thumb {
+	background-color: #fff;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	height: 180px;
+	padding: 20px;
+
+	& img {
+		max-width: 100%;
+		max-height: 100%;
+	}
+}
+
+.card-content {
+	padding: 10px;
+	color: #353535;
+	border-top: 1px solid #e6e6e6;
+	text-align: center;
+}
+
+.card-title {
+	font-size: 1rem;
+	font-weight: 600;
+}
+
 .body-user .l-unit.animate__animated.animate__fadeIn {
 	line-height: 2rem;
 }
@@ -1849,10 +1848,6 @@
 	margin: -2px;
 }
 
-.show-passwords-enabled-action {
-	opacity: 0.4;
-}
-
 .password-meter {
 	appearance: none;
 	display: block;
@@ -1864,56 +1859,22 @@
 	border-bottom-left-radius: 3px;
 	border-bottom-right-radius: 3px;
 	box-shadow: 0 1px 2px rgb(0 0 0 / 25%);
-}
-
-.password-meter[value="1"] {
-	background: red;
-}
-
-.password-meter[value="2"] {
-	background: orange;
-}
-
-.password-meter[value="3"] {
-	background: yellow;
-}
-
-.password-meter[value="4"] {
-	background: green;
-}
-
-/* Webkit based browsers */
-.password-meter[value="1"]::-webkit-meter-optimum-value {
-	background: red;
-}
-
-.password-meter[value="2"]::-webkit-meter-optimum-value {
-	background: orange;
-}
 
-.password-meter[value="3"]::-webkit-meter-optimum-value {
-	background: yellow;
-}
-
-.password-meter[value="4"]::-webkit-meter-optimum-value {
-	background: green;
-}
-
-/* Gecko based browsers */
-.password-meter[value="1"]::-moz-meter-bar {
-	background: red;
-}
+	&[value="1"] {
+		background: red;
+	}
 
-.password-meter[value="2"]::-moz-meter-bar {
-	background: orange;
-}
+	&[value="2"] {
+		background: orange;
+	}
 
-.password-meter[value="3"]::-moz-meter-bar {
-	background: yellow;
-}
+	&[value="3"] {
+		background: yellow;
+	}
 
-.password-meter[value="4"]::-moz-meter-bar {
-	background: green;
+	&[value="4"] {
+		background: green;
+	}
 }
 
 .hint {
@@ -2411,7 +2372,6 @@
 	font-weight: 600;
 	padding-top: 28px;
 	padding-bottom: 12px;
-	letter-spacing: -0.01em;
 	border-bottom: 1px solid #ccc;
 }
 
@@ -2633,69 +2593,6 @@ form#vstobjects.suspended {
 	text-shadow: 0 !important;
 }
 
-.footer-banner {
-	width: 100%;
-	text-align: center;
-	border-top: 1px solid rgb(255 255 255 / 25%);
-	box-shadow: 0 -2px 4px rgb(0 0 0 / 40%);
-	font-size: 0.75rem;
-	padding: 10px;
-	position: fixed;
-	bottom: 0;
-}
-
-.footer-banner b,
-.footer-banner strong {
-	color: unset;
-}
-
-.footer-banner a {
-	font-weight: 500;
-	color: #fff;
-
-	&:hover {
-		color: #fff;
-		text-decoration: underline;
-	}
-}
-
-.footer-banner.alpha {
-	background-color: #222;
-	color: #fff;
-}
-
-.footer-banner.alpha a {
-	color: #fff;
-
-	&:hover {
-		color: #fff;
-	}
-}
-
-.footer-banner.beta {
-	background-color: #eaeaea;
-	color: #404040;
-}
-
-.footer-banner.beta a {
-	color: #404040;
-}
-
-.footer-banner.developer {
-	background-color: yellow;
-	color: #000;
-}
-
-.footer-banner.developer a {
-	font-weight: 500;
-	color: #000;
-}
-
-.footer-banner.updates {
-	background-color: green;
-	color: #fff;
-}
-
 .helper-container {
 	float: right;
 	margin-bottom: -450px;
@@ -2862,6 +2759,32 @@ li[aria-expanded="true"] a {
 	}
 }
 
+/* Updates banner
+   ========================================================================== */
+
+.updates-banner {
+	width: 100%;
+	text-align: center;
+	border-top: 1px solid rgb(255 255 255 / 25%);
+	box-shadow: 0 -2px 4px rgb(0 0 0 / 40%);
+	background-color: green;
+	color: #fff;
+	font-size: 0.75rem;
+	padding: 10px;
+	position: fixed;
+	bottom: 0;
+
+	& a {
+		color: #fff;
+		font-weight: 500;
+
+		&:hover {
+			color: #fff;
+			text-decoration: underline;
+		}
+	}
+}
+
 /* Debug panel
    ========================================================================== */
 

web/css/src/utilities.css

@@ -27,11 +27,11 @@
 	user-select: none !important;
 }
 
-.text-right {
+.u-text-right {
 	text-align: right !important;
 }
 
-.text-center {
+.u-text-center {
 	text-align: center !important;
 }
 
@@ -49,6 +49,10 @@
 	white-space: nowrap !important;
 }
 
+.u-opacity-50 {
+	opacity: 0.5 !important;
+}
+
 .u-mt15 {
 	margin-top: 15px !important;
 }

web/js/events.js

@@ -254,14 +254,14 @@ const VE = {
 				'<span class="toggle-password"><i class="toggle-psw-visibility-icon fas fa-eye-slash ' +
 				enabled
 					? ''
-					: 'show-passwords-enabled-action' +
+					: 'u-opacity-50' +
 					  '" onclick="VE.helpers.toggleHiddenPasswordText(\'' +
 					  ref +
 					  '\', this)"></i></span>';
 			$(ref).after(html);
 		},
 		toggleHiddenPasswordText: (ref, triggering_elm) => {
-			$(triggering_elm).toggleClass('show-passwords-enabled-action');
+			$(triggering_elm).toggleClass('u-opacity-50');
 
 			if ($(ref).prop('type') == 'text') {
 				Cookies.set('hide_passwords', 1, 365);

web/js/shortcuts.js

@@ -144,7 +144,6 @@ document.addEventListener('alpine:init', () => {
 			{ key: 'F' },
 			(_evt) => {
 				const searchBox = document.querySelector('.js-search-input');
-				searchBox.classList.toggle('activated', true);
 				searchBox.focus();
 			},
 			{ disabledInInput: true }

web/templates/footer.php

@@ -4,12 +4,11 @@
 	$_SESSION["POLICY_SYSTEM_HIDE_SERVICES"] !== "yes"
 ) { ?>
 	<?php if ($_SESSION["UPDATE_AVAILABLE"] === "yes") { ?>
-		<div x-data="{ open: false }" x-cloak x-show="open" class="footer-banner updates" id="banner">
-			<div>
-				<b>New updates are available!</b> To upgrade your server now, run <span style="font-family:'Courier New', Courier, monospace">apt update && apt upgrade</span> from a shell session.
-			</div>
-			<div style="margin-top: 4px;"></div><a href="#" x-on:click="open = false">Hide</a></div>
-		</div>
+		<p x-data="{ open: true }" x-cloak x-show="open" class="updates-banner">
+			<strong>New updates are available!</strong> To upgrade your server now, run
+			<code>apt update && apt upgrade</code> from a shell session.
+			(<a href="#" x-on:click="open = false"><strong>hide</strong></a>)
+		</p>
 	<?php } ?>
 <?php } ?>
 	<div title="<?= _("Confirmation") ?>" class="dialog js-confirm-dialog-redirect">

web/templates/pages/add_db.php

@@ -32,7 +32,7 @@
 			<h1 class="form-title"><?= _("Adding database") ?></h1>
 			<?php show_alert_message($_SESSION); ?>
 			<?php if ($user_plain == "admin" && $_GET["accept"] !== "true") { ?>
-				<div class="alert alert-danger alert-with-icon" role="alert">
+				<div class="alert alert-danger" role="alert">
 					<i class="fas fa-exclamation"></i>
 					<p><?= _("Avoid adding web domains on admin account") ?></p>
 				</div>

web/templates/pages/add_dns.php

@@ -32,7 +32,7 @@
 			<h1 class="form-title"><?= _("Adding DNS Domain") ?></h1>
 			<?php show_alert_message($_SESSION); ?>
 			<?php if ($user_plain == "admin" && $_GET["accept"] !== "true") { ?>
-				<div class="alert alert-danger alert-with-icon" role="alert">
+				<div class="alert alert-danger" role="alert">
 					<i class="fas fa-exclamation"></i>
 					<p><?= _("Avoid adding web domains on admin account") ?></p>
 				</div>

web/templates/pages/add_dns_rec.php

@@ -18,20 +18,20 @@
 <div class="container animate__animated animate__fadeIn">
 
 	<form id="vstobjects" name="v_add_dns_rec" method="post">
-		<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 		<input type="hidden" name="ok_rec" value="add">
 
 		<div class="form-container">
 			<h1 class="form-title"><?= _("Adding DNS Record") ?></h1>
-			<?php show_alert_message($_SESSION);?>
+			<?php show_alert_message($_SESSION); ?>
 			<div class="u-mb10">
 				<label for="v_domain" class="form-label"><?= _("Domain") ?></label>
-				<input type="text" class="form-control" name="v_domain" id="v_domain" value="<?=htmlentities(trim($v_domain, "'"))?>" disabled>
-				<input type="hidden" name="v_domain" value="<?=htmlentities(trim($v_domain, "'"))?>">
+				<input type="text" class="form-control" name="v_domain" id="v_domain" value="<?= htmlentities(trim($v_domain, "'")) ?>" disabled>
+				<input type="hidden" name="v_domain" value="<?= htmlentities(trim($v_domain, "'")) ?>">
 			</div>
 			<div class="u-mb10">
 				<label for="v_rec" class="form-label"><?= _("Record") ?></label>
-				<input type="text" class="form-control" name="v_rec" id="v_rec" value="<?=htmlentities(trim($v_rec, "'"))?>">
+				<input type="text" class="form-control" name="v_rec" id="v_rec" value="<?= htmlentities(trim($v_rec, "'")) ?>">
 				<small class="hint"></small>
 			</div>
 			<div class="u-mb10">

web/templates/pages/add_firewall.php

@@ -18,12 +18,12 @@
 <div class="container animate__animated animate__fadeIn">
 
 	<form id="vstobjects" name="v_add_ip" method="post">
-		<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 		<input type="hidden" name="ok" value="Add">
 
 		<div class="form-container">
 			<h1 class="form-title"><?= _("Adding Firewall Rule") ?></h1>
-			<?php show_alert_message($_SESSION);?>
+			<?php show_alert_message($_SESSION); ?>
 			<div class="u-mb10">
 				<label for="v_action" class="form-label"><?= _("Action") ?></label>
 				<select class="form-select" name="v_action" id="v_action">
@@ -43,7 +43,7 @@
 				<label for="v_port" class="form-label">
 					<?= _("Port") ?> <span class="optional">(<?= _("Ranges and Lists are acceptable") ?>)</span>
 				</label>
-				<input type="text" class="form-control" name="v_port" id="v_port" value="<?=htmlentities(trim($v_port, "'"))?>" placeholder="<?= _("All ports: 0, Range: 80-82, List: 80,443,8080,8443") ?>">
+				<input type="text" class="form-control" name="v_port" id="v_port" value="<?= htmlentities(trim($v_port, "'")) ?>" placeholder="<?= _("All ports: 0, Range: 80-82, List: 80,443,8080,8443") ?>">
 			</div>
 			<div class="u-mb10">
 				<label for="v_ip" class="form-label">
@@ -53,14 +53,14 @@
 					<select class="form-select" tabindex="-1" id="quickips_list" onchange="this.nextElementSibling.value=this.value">
 						<option value="">&nbsp;</option>
 					</select>
-					<input type="text" class="form-control list-editor" name="v_ip" id="v_ip" value="<?=htmlentities(trim($v_ip, "'"))?>">
+					<input type="text" class="form-control list-editor" name="v_ip" id="v_ip" value="<?= htmlentities(trim($v_ip, "'")) ?>">
 				</div>
 			</div>
 			<div class="u-mb10">
 				<label for="v_comment" class="form-label">
 					<?= _("Comment") ?> <span class="optional">(<?= _("optional") ?>)</span>
 				</label>
-				<input type="text" class="form-control" name="v_comment" id="v_comment" maxlength="255" value="<?=htmlentities(trim($v_comment, "'"))?>">
+				<input type="text" class="form-control" name="v_comment" id="v_comment" maxlength="255" value="<?= htmlentities(trim($v_comment, "'")) ?>">
 			</div>
 		</div>
 

web/templates/pages/add_firewall_banlist.php

@@ -18,17 +18,17 @@
 <div class="container animate__animated animate__fadeIn">
 
 	<form id="vstobjects" name="v_add_ip" method="post">
-		<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 		<input type="hidden" name="ok" value="Add">
 
 		<div class="form-container">
 			<h1 class="form-title"><?= _("Adding IP Address to Banlist") ?></h1>
-			<?php show_alert_message($_SESSION);?>
+			<?php show_alert_message($_SESSION); ?>
 			<div class="u-mb20">
 				<label for="v_ip" class="form-label">
 					<?= _("IP address") ?> <span class="optional">(<?= _("CIDR format is supported") ?>)</span>
 				</label>
-				<input type="text" class="form-control" name="v_ip" id="v_ip" value="<?=htmlentities(trim($v_ip, "'"))?>">
+				<input type="text" class="form-control" name="v_ip" id="v_ip" value="<?= htmlentities(trim($v_ip, "'")) ?>">
 			</div>
 			<div class="u-mb10">
 				<label for="v_chain" class="form-label"><?= _("Banlist") ?></label>

web/templates/pages/add_firewall_ipset.php

@@ -18,15 +18,15 @@
 <div class="container animate__animated animate__fadeIn">
 
 	<form id="vstobjects" name="v_add_ipset" method="post">
-		<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 		<input type="hidden" name="ok" value="Add">
 
 		<div class="form-container">
 			<h1 class="form-title"><?= _("Adding Firewall Ipset List") ?></h1>
-			<?php show_alert_message($_SESSION);?>
+			<?php show_alert_message($_SESSION); ?>
 			<div class="u-mb10">
 				<label for="v_ipname" class="form-label"><?= _("Ip List Name") ?></label>
-				<input type="text" class="form-control" name="v_ipname" id="v_ipname" maxlength="255" value="<?=htmlentities(trim($v_ipname, "'"))?>">
+				<input type="text" class="form-control" name="v_ipname" id="v_ipname" maxlength="255" value="<?= htmlentities(trim($v_ipname, "'")) ?>">
 			</div>
 			<div class="u-mb10">
 				<label for="v_datasource" class="form-label">
@@ -36,7 +36,7 @@
 					<select class="form-select" tabindex="-1" id="datasource_list" onchange="this.nextElementSibling.value=this.value">
 						<option value="">clear</option>
 					</select>
-					<input type="text" class="form-control list-editor" name="v_datasource" id="v_datasource" maxlength="255" value="<?=htmlentities(trim($v_datasource, "'"))?>">
+					<input type="text" class="form-control list-editor" name="v_datasource" id="v_datasource" maxlength="255" value="<?= htmlentities(trim($v_datasource, "'")) ?>">
 				</div>
 			</div>
 			<div class="u-mb10">

web/templates/pages/add_ip.php

@@ -19,25 +19,25 @@
 
 	<form
 		x-data="{
-			showUserTable: <?= empty($v_dedicated) ? 'false' : 'true' ?>
+			showUserTable: <?= empty($v_dedicated) ? "false" : "true" ?>
 		}"
 		id="vstobjects"
 		name="v_add_ip"
 		method="post"
 	>
-		<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 		<input type="hidden" name="ok" value="Add">
 
 		<div class="form-container">
 			<h1 class="form-title"><?= _("Adding IP address") ?></h1>
-			<?php show_alert_message($_SESSION);?>
+			<?php show_alert_message($_SESSION); ?>
 			<div class="u-mb10">
 				<label for="v_ip" class="form-label"><?= _("IP address") ?></label>
-				<input type="text" class="form-control" name="v_ip" id="v_ip" value="<?=htmlentities(trim($v_ip, "'"))?>">
+				<input type="text" class="form-control" name="v_ip" id="v_ip" value="<?= htmlentities(trim($v_ip, "'")) ?>">
 			</div>
 			<div class="u-mb10">
 				<label for="v_netmask" class="form-label"><?= _("Netmask") ?></label>
-				<input type="text" class="form-control" name="v_netmask" id="v_netmask" value="<?=htmlentities(trim($v_netmask, "'"))?>">
+				<input type="text" class="form-control" name="v_netmask" id="v_netmask" value="<?= htmlentities(trim($v_netmask, "'")) ?>">
 			</div>
 			<div class="u-mb10">
 				<label for="v_interface" class="form-label"><?= _("Interface") ?></label>
@@ -75,13 +75,13 @@
 				<label for="v_name" class="form-label">
 					<?= _("Assigned domain") ?> <span class="optional">(<?= _("optional") ?>)</span>
 				</label>
-				<input type="text" class="form-control" name="v_name" id="v_name" value="<?=htmlentities(trim($v_name, "'"))?>">
+				<input type="text" class="form-control" name="v_name" id="v_name" value="<?= htmlentities(trim($v_name, "'")) ?>">
 			</div>
 			<div class="u-mb10">
 				<label for="v_nat" class="form-label">
 					<?= _("NAT IP association") ?> <span class="optional">(<?= _("optional") ?>)</span>
 				</label>
-				<input type="text" class="form-control" name="v_nat" id="v_nat" value="<?=htmlentities(trim($v_nat, "'"))?>">
+				<input type="text" class="form-control" name="v_nat" id="v_nat" value="<?= htmlentities(trim($v_nat, "'")) ?>">
 			</div>
 		</div>
 

web/templates/pages/add_mail.php

@@ -19,36 +19,36 @@
 
 	<form
 		x-data="{
-			hasSmtpRelay: <?= $v_smtp_relay == 'true' ? true : false ?>
+			hasSmtpRelay: <?= $v_smtp_relay == "true" ? true : false ?>
 		}"
 		id="vstobjects"
 		name="v_add_mail"
 		method="post"
 	>
-		<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 		<input type="hidden" name="ok" value="Add">
 
 		<div class="form-container">
 			<h1 class="form-title"><?= _("Adding Mail Domain") ?></h1>
-			<?php show_alert_message($_SESSION);?>
-			<?php if (($user_plain == 'admin') && (($_GET['accept'] !== "true"))) {?>
-				<div class="alert alert-danger alert-with-icon" role="alert">
+			<?php show_alert_message($_SESSION); ?>
+			<?php if ($user_plain == "admin" && $_GET["accept"] !== "true") { ?>
+				<div class="alert alert-danger" role="alert">
 					<i class="fas fa-exclamation"></i>
 					<p><?= _("Avoid adding web domains on admin account") ?></p>
 				</div>
 			<?php } ?>
-			<?php if (($user_plain == 'admin') && (empty($_GET['accept']))) {?>
+			<?php if ($user_plain == "admin" && empty($_GET["accept"])) { ?>
 				<div class="u-side-by-side u-pt18">
 					<a href="/add/user/" class="button u-width-full u-mr10"><?= _("Add User") ?></a>
 					<a href="/add/mail/?accept=true" class="button button-danger u-width-full u-ml10"><?= _("Continue") ?></a>
 				</div>
 			<?php } ?>
-			<?php if (($user_plain == 'admin') && (($_GET['accept'] === "true")) || ($user_plain !== "admin")) {?>
+			<?php if (($user_plain == "admin" && $_GET["accept"] === "true") || $user_plain !== "admin") { ?>
 				<div class="u-mb20">
 					<label for="v_domain" class="form-label"><?= _("Domain") ?></label>
-					<input type="text" class="form-control" name="v_domain" id="v_domain" value="<?=htmlentities(trim($v_domain, "'"))?>">
+					<input type="text" class="form-control" name="v_domain" id="v_domain" value="<?= htmlentities(trim($v_domain, "'")) ?>">
 				</div>
-				<?php if($_SESSION['WEBMAIL_SYSTEM']){?>
+				<?php if ($_SESSION["WEBMAIL_SYSTEM"]) { ?>
 					<div class="u-mb20">
 						<label for="v_webmail" class="form-label"><?= _("Webmail Client") ?></label>
 						<select class="form-select" name="v_webmail" id="v_webmail" tabindex="6">
@@ -64,7 +64,7 @@
 						</select>
 					</div>
 				<?php } ?>
-				<?php if (!empty($_SESSION['ANTISPAM_SYSTEM'])) {?>
+				<?php if (!empty($_SESSION["ANTISPAM_SYSTEM"])) { ?>
 					<div class="form-check u-mb10">
 						<input class="form-check-input" type="checkbox" name="v_antispam" id="v_antispam" <?php if ((empty($v_antispam)) || ($v_antispam == 'yes')) echo 'checked'; ?>>
 						<label for="v_antispam">
@@ -101,15 +101,15 @@
 				<div x-cloak x-show="hasSmtpRelay" id="smtp_relay_table" class="u-pl30">
 					<div class="u-mb10">
 						<label for="v_smtp_relay_host" class="form-label"><?= _("Host") ?></label>
-						<input type="text" class="form-control" name="v_smtp_relay_host" id="v_smtp_relay_host" value="<?=htmlentities(trim($v_smtp_relay_host, "'"))?>">
+						<input type="text" class="form-control" name="v_smtp_relay_host" id="v_smtp_relay_host" value="<?= htmlentities(trim($v_smtp_relay_host, "'")) ?>">
 					</div>
 					<div class="u-mb10">
 						<label for="v_smtp_relay_port" class="form-label"><?= _("Port") ?></label>
-						<input type="text" class="form-control" name="v_smtp_relay_port" id="v_smtp_relay_port" value="<?=htmlentities(trim($v_smtp_relay_port, "'"))?>">
+						<input type="text" class="form-control" name="v_smtp_relay_port" id="v_smtp_relay_port" value="<?= htmlentities(trim($v_smtp_relay_port, "'")) ?>">
 					</div>
 					<div class="u-mb10">
 						<label for="v_smtp_relay_user" class="form-label"><?= _("Username") ?></label>
-						<input type="text" class="form-control" name="v_smtp_relay_user" id="v_smtp_relay_user" value="<?=htmlentities(trim($v_smtp_relay_user, "'"))?>">
+						<input type="text" class="form-control" name="v_smtp_relay_user" id="v_smtp_relay_user" value="<?= htmlentities(trim($v_smtp_relay_user, "'")) ?>">
 					</div>
 					<div class="u-mb10">
 						<label for="v_smtp_relay_pass" class="form-label"><?= _("Password") ?></label>

web/templates/pages/add_mail_acc.php

@@ -19,28 +19,28 @@
 
 	<form
 		x-data="{
-			showAdvanced: <?= empty($v_adv) ? 'false' : 'true' ?>
+			showAdvanced: <?= empty($v_adv) ? "false" : "true" ?>
 		}"
 		id="vstobjects"
 		name="v_add_mail_acc"
 		method="post"
 	>
-		<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 		<input type="hidden" name="ok_acc" value="add">
 
 		<div class="form-container form-container-wide">
 			<h1 class="form-title"><?= _("Adding Mail Account") ?></h1>
-			<?php show_alert_message($_SESSION);?>
+			<?php show_alert_message($_SESSION); ?>
 			<div class="sidebar-container">
 				<div>
 					<div class="u-mb10">
 						<label for="v_domain" class="form-label"><?= _("Domain") ?></label>
-						<input type="text" class="form-control" name="v_domain" id="v_domain" value="<?=htmlentities(trim($v_domain, "'"))?>" disabled>
-						<input type="hidden" name="v_domain" value="<?=htmlentities(trim($v_domain, "'"))?>">
+						<input type="text" class="form-control" name="v_domain" id="v_domain" value="<?= htmlentities(trim($v_domain, "'")) ?>" disabled>
+						<input type="hidden" name="v_domain" value="<?= htmlentities(trim($v_domain, "'")) ?>">
 					</div>
 					<div class="u-mb10">
 						<label for="v_account" class="form-label"><?= _("Account") ?></label>
-						<input type="text" class="form-control" name="v_account" id="v_account" value="<?=htmlentities(trim($v_account, "'"))?>">
+						<input type="text" class="form-control" name="v_account" id="v_account" value="<?= htmlentities(trim($v_account, "'")) ?>">
 					</div>
 					<div class="u-mb10">
 						<label for="v_password" class="form-label">
@@ -67,7 +67,7 @@
 								<?= _("Quota") ?> <span class="optional">(<?= _("in megabytes") ?>)</span>
 							</label>
 							<div class="u-pos-relative">
-								<input type="text" class="form-control" name="v_quota" id="v_quota" value="<?=htmlentities(trim($v_quota, "'"))?>">
+								<input type="text" class="form-control" name="v_quota" id="v_quota" value="<?= htmlentities(trim($v_quota, "'")) ?>">
 								<i class="unlim-trigger fas fa-infinity" title="<?= _("Unlimited") ?>"></i>
 							</div>
 						</div>
@@ -75,7 +75,7 @@
 							<label for="v_aliases" class="form-label">
 								<?= _("Aliases") ?> <span class="optional">(<?= _("use local-part") ?>)</span>
 							</label>
-							<textarea class="form-control" name="v_aliases" id="v_aliases"><?=htmlentities(trim($v_aliases, "'"))?></textarea>
+							<textarea class="form-control" name="v_aliases" id="v_aliases"><?= htmlentities(trim($v_aliases, "'")) ?></textarea>
 						</div>
 						<div class="u-mb10">
 							<label for="v_fwd" class="form-label">
@@ -108,7 +108,7 @@
 						<label for="v_send_email" class="form-label">
 							<?= _("Send login credentials to email address") ?>
 						</label>
-						<input type="email" class="form-control" name="v_send_email" id="v_send_email" value="<?=htmlentities(trim($v_send_email, "'"))?>">
+						<input type="email" class="form-control" name="v_send_email" id="v_send_email" value="<?= htmlentities(trim($v_send_email, "'")) ?>">
 						<input type="hidden" name="v_credentials" class="js-hidden-credentials">
 					</div>
 				</div>
@@ -118,21 +118,21 @@
 						<ul class="values-list u-mb20">
 							<li class="values-list-item">
 								<span class="values-list-label"><?= _("Username") ?></span>
-								<span class="values-list-value"><span class="js-account-output"></span>@<?=htmlentities(trim($v_domain, "'"))?></span>
+								<span class="values-list-value"><span class="js-account-output"></span>@<?= htmlentities(trim($v_domain, "'")) ?></span>
 							</li>
 							<li class="values-list-item">
 								<span class="values-list-label"><?= _("Password") ?></span>
 								<span class="values-list-value"><span class="js-password-output"></span></span>
 							</li>
-							<?php if ($_SESSION['WEBMAIL_SYSTEM']) {?>
+							<?php if ($_SESSION["WEBMAIL_SYSTEM"]) { ?>
 								<li class="values-list-item">
 									<span class="values-list-label"><?= _("Webmail") ?></span>
-									<span class="values-list-value"><a href="http://<?=htmlentities($v_webmail_alias)?>" target="_blank">http://<?=htmlentities($v_webmail_alias)?></a></span>
+									<span class="values-list-value"><a href="http://<?= htmlentities($v_webmail_alias) ?>" target="_blank">http://<?= htmlentities($v_webmail_alias) ?></a></span>
 								</li>
 							<?php } ?>
 							<li class="values-list-item">
 								<span class="values-list-label"><?= _("Hostname") ?></span>
-								<span class="values-list-value">mail.<?=htmlentities($v_domain)?></span>
+								<span class="values-list-value">mail.<?= htmlentities($v_domain) ?></span>
 							</li>
 						</ul>
 						<h2 class="u-text-H3 u-mb10"><?= _("IMAP settings") ?></h2>

web/templates/pages/add_package.php

@@ -29,22 +29,22 @@
 		name="v_add_package"
 		method="post"
 	>
-		<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 		<input type="hidden" name="ok" value="Add">
 
 		<div class="form-container">
 			<h1 class="form-title"><?= _("Adding Package") ?></h1>
-			<?php show_alert_message($_SESSION);?>
+			<?php show_alert_message($_SESSION); ?>
 			<div class="u-mb10">
 				<label for="v_package" class="form-label"><?= _("Package Name") ?></label>
-				<input type="text" class="form-control" name="v_package" id="v_package" value="<?=htmlentities(trim($v_package, "'"))?>">
+				<input type="text" class="form-control" name="v_package" id="v_package" value="<?= htmlentities(trim($v_package, "'")) ?>">
 			</div>
 			<div class="u-mb10">
 				<label for="v_disk_quota" class="form-label">
 					<?= _("Quota") ?> <span class="optional">(<?= _("in megabytes") ?>)</span>
 				</label>
 				<div class="u-pos-relative">
-					<input type="text" class="form-control" name="v_disk_quota" id="v_disk_quota" value="<?=htmlentities(trim($v_disk_quota, "'"))?>">
+					<input type="text" class="form-control" name="v_disk_quota" id="v_disk_quota" value="<?= htmlentities(trim($v_disk_quota, "'")) ?>">
 					<i class="unlim-trigger fas fa-infinity" title="<?= _("Unlimited") ?>"></i>
 				</div>
 			</div>
@@ -53,13 +53,13 @@
 					<?= _("Bandwidth") ?> <span class="optional">(<?= _("in megabytes") ?>)</span>
 				</label>
 				<div class="u-pos-relative">
-					<input type="text" class="form-control" name="v_bandwidth" id="v_bandwidth" value="<?=htmlentities(trim($v_bandwidth, "'"))?>">
+					<input type="text" class="form-control" name="v_bandwidth" id="v_bandwidth" value="<?= htmlentities(trim($v_bandwidth, "'")) ?>">
 					<i class="unlim-trigger fas fa-infinity" title="<?= _("Unlimited") ?>"></i>
 				</div>
 			</div>
 			<div class="u-mb10">
 				<label for="v_backups" class="form-label"><?= _("Backups") ?></label>
-				<input type="text" class="form-control" name="v_backups" id="v_backups" value="<?=htmlentities(trim($v_backups, "'"))?>">
+				<input type="text" class="form-control" name="v_backups" id="v_backups" value="<?= htmlentities(trim($v_backups, "'")) ?>">
 			</div>
 			<h2 x-on:click="showWebOptions = !showWebOptions" class="section-title">
 				<?= _("Web") ?>
@@ -72,7 +72,7 @@
 				<div class="u-mt15 u-mb10">
 					<label for="v_web_domains" class="form-label"><?= _("Web Domains") ?></label>
 					<div class="u-pos-relative">
-						<input type="text" class="form-control" name="v_web_domains" id="v_web_domains" value="<?=htmlentities(trim($v_web_domains, "'"))?>">
+						<input type="text" class="form-control" name="v_web_domains" id="v_web_domains" value="<?= htmlentities(trim($v_web_domains, "'")) ?>">
 						<i class="unlim-trigger fas fa-infinity" title="<?= _("Unlimited") ?>"></i>
 					</div>
 				</div>
@@ -81,13 +81,13 @@
 						<?= _("Web Aliases") ?> <span class="optional">(<?= _("per domain") ?>)</span>
 					</label>
 					<div class="u-pos-relative">
-						<input type="text" class="form-control" name="v_web_aliases" id="v_web_aliases" value="<?=htmlentities(trim($v_web_aliases, "'"))?>">
+						<input type="text" class="form-control" name="v_web_aliases" id="v_web_aliases" value="<?= htmlentities(trim($v_web_aliases, "'")) ?>">
 						<i class="unlim-trigger fas fa-infinity" title="<?= _("Unlimited") ?>"></i>
 					</div>
 				</div>
 				<div class="u-mb10">
 					<label for="v_web_template" class="form-label">
-						<?= _("Web Template") . " <span class='optional'> " .strtoupper($_SESSION['WEB_SYSTEM']) . "</span>";?>
+						<?= _("Web Template") . " <span class='optional'> " . strtoupper($_SESSION["WEB_SYSTEM"]) . "</span>" ?>
 					</label>
 					<select class="form-select" name="v_web_template" id="v_web_template">
 						<?php
@@ -149,7 +149,7 @@
 			<div x-cloak x-show="showDnsOptions" id="dns-options">
 				<div class="u-mt15 u-mb10">
 					<label for="v_dns_template" class="form-label">
-						<?= _("DNS Template") . "<span class='optional'>" .strtoupper($_SESSION['DNS_SYSTEM']) . "</span>";?>
+						<?= _("DNS Template") . "<span class='optional'>" . strtoupper($_SESSION["DNS_SYSTEM"]) . "</span>" ?>
 					</label>
 					<select class="form-select" name="v_dns_template" id="v_dns_template">
 						<?php
@@ -166,7 +166,7 @@
 				<div class="u-mb10">
 					<label for="v_dns_domains" class="form-label"><?= _("DNS domains") ?></label>
 					<div class="u-pos-relative">
-						<input type="text" class="form-control" name="v_dns_domains" id="v_dns_domains" value="<?=htmlentities(trim($v_dns_domains, "'"))?>">
+						<input type="text" class="form-control" name="v_dns_domains" id="v_dns_domains" value="<?= htmlentities(trim($v_dns_domains, "'")) ?>">
 						<i class="unlim-trigger fas fa-infinity" title="<?= _("Unlimited") ?>"></i>
 					</div>
 				</div>
@@ -175,17 +175,17 @@
 						<?= _("DNS records") ?> <span class="optional">(<?= _("per domain") ?>)</span>
 					</label>
 					<div class="u-pos-relative">
-						<input type="text" class="form-control" name="v_dns_records" id="v_dns_records" value="<?=htmlentities(trim($v_dns_records, "'"))?>">
+						<input type="text" class="form-control" name="v_dns_records" id="v_dns_records" value="<?= htmlentities(trim($v_dns_records, "'")) ?>">
 						<i class="unlim-trigger fas fa-infinity" title="<?= _("Unlimited") ?>"></i>
 					</div>
 				</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"><?= _("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) {
@@ -288,7 +288,7 @@
 				<div class="u-mt15 u-mb10">
 					<label for="v_cron_jobs" class="form-label"><?= _("Cron Jobs") ?></label>
 					<div class="u-pos-relative">
-						<input type="text" class="form-control" name="v_cron_jobs" id="v_cron_jobs" value="<?=htmlentities(trim($v_cron_jobs, "'"))?>">
+						<input type="text" class="form-control" name="v_cron_jobs" id="v_cron_jobs" value="<?= htmlentities(trim($v_cron_jobs, "'")) ?>">
 						<i class="unlim-trigger fas fa-infinity" title="<?= _("Unlimited") ?>"></i>
 					</div>
 				</div>

web/templates/pages/add_user.php

@@ -25,23 +25,23 @@
 		name="v_add_user"
 		method="post"
 	>
-		<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 		<input type="hidden" name="ok" value="Add">
 
 		<div class="form-container">
 			<h1 class="form-title"><?= _("Adding User") ?></h1>
-			<?php show_alert_message($_SESSION);?>
+			<?php show_alert_message($_SESSION); ?>
 			<div class="u-mb10">
 				<label for="v_username" class="form-label"><?= _("Username") ?></label>
-				<input type="text" class="form-control" name="v_username" id="v_username" value="<?=htmlentities(trim($v_username, "'"))?>" tabindex="1">
+				<input type="text" class="form-control" name="v_username" id="v_username" value="<?= htmlentities(trim($v_username, "'")) ?>" tabindex="1">
 			</div>
 			<div class="u-mb10">
 				<label for="v_name" class="form-label"><?= _("Contact") ?></label>
-				<input type="text" class="form-control" name="v_name" id="v_name" value="<?=htmlentities(trim($v_name, "'"))?>" tabindex="2">
+				<input type="text" class="form-control" name="v_name" id="v_name" value="<?= htmlentities(trim($v_name, "'")) ?>" tabindex="2">
 			</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, "'"))?>" tabindex="3">
+				<input type="email" class="form-control" name="v_email" id="v_email" value="<?= htmlentities(trim($v_email, "'")) ?>" tabindex="3">
 			</div>
 			<div class="u-mb10">
 				<label for="v_password" class="form-label">
@@ -49,7 +49,7 @@
 					<a href="javascript:applyRandomString();" title="<?= _("generate") ?>" class="u-ml5"><i class="fas fa-arrows-rotate status-icon green icon-large"></i></a>
 				</label>
 				<div class="u-pos-relative u-mb10">
-					<input type="text" class="form-control js-password-input" name="v_password" id="v_password" value="<?=htmlentities(trim($v_password, "'"))?>" tabindex="4">
+					<input type="text" class="form-control js-password-input" name="v_password" id="v_password" value="<?= htmlentities(trim($v_password, "'")) ?>" tabindex="4">
 					<meter max="4" class="password-meter"></meter>
 				</div>
 			</div>

web/templates/pages/add_web.php

@@ -20,28 +20,28 @@
 <div class="container animate__animated animate__fadeIn">
 
 	<form id="vstobjects" name="v_add_web" method="post">
-		<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 		<input type="hidden" name="ok" value="Add">
 
 		<div class="form-container">
 			<h1 class="form-title"><?= _("Add Web Domain") ?></h1>
-			<?php show_alert_message($_SESSION);?>
-			<?php if (($user_plain == 'admin') && (($_GET['accept'] !== "true"))) {?>
-				<div class="alert alert-danger alert-with-icon" role="alert">
+			<?php show_alert_message($_SESSION); ?>
+			<?php if ($user_plain == "admin" && $_GET["accept"] !== "true") { ?>
+				<div class="alert alert-danger" role="alert">
 					<i class="fas fa-exclamation"></i>
 					<p><?= _("Avoid adding web domains on admin account") ?></p>
 				</div>
 			<?php } ?>
-			<?php if (($user_plain == 'admin') && (empty($_GET['accept']))) {?>
+			<?php if ($user_plain == "admin" && empty($_GET["accept"])) { ?>
 				<div class="u-side-by-side u-pt18">
 					<a href="/add/user/" class="button u-width-full u-mr10"><?= _("Add User") ?></a>
 					<a href="/add/web/?accept=true" class="button button-danger u-width-full u-ml10"><?= _("Continue") ?></a>
 				</div>
 			<?php } ?>
-			<?php if (($user_plain == 'admin') && (($_GET['accept'] === "true")) || ($user_plain !== "admin")) {?>
+			<?php if (($user_plain == "admin" && $_GET["accept"] === "true") || $user_plain !== "admin") { ?>
 				<div class="u-mb10">
 					<label for="v_domain" class="form-label"><?= _("Domain") ?></label>
-					<input type="text" class="form-control" name="v_domain" id="v_domain" value="<?=htmlentities(trim($v_domain, "'"))?>">
+					<input type="text" class="form-control" name="v_domain" id="v_domain" value="<?= htmlentities(trim($v_domain, "'")) ?>">
 				</div>
 				<div class="u-mb20">
 					<label for="v_ip" class="form-label"><?= _("IP Address") ?></label>
@@ -55,20 +55,20 @@
 						?>
 					</select>
 				</div>
-				<?php if ((isset($_SESSION['DNS_SYSTEM'])) && (!empty($_SESSION['DNS_SYSTEM']))) {?>
-					<?php if($panel[$user_plain]['DNS_DOMAINS'] != "0") { ?>
+				<?php if (isset($_SESSION["DNS_SYSTEM"]) && !empty($_SESSION["DNS_SYSTEM"])) { ?>
+					<?php if ($panel[$user_plain]["DNS_DOMAINS"] != "0") { ?>
 						<div class="form-check u-mb10">
-							<input class="form-check-input" type="checkbox" name="v_dns" id="v_dns" <?php if (empty($v_dns)&&$panel[$user_plain]['DNS_DOMAINS'] != "0") ?>>
+							<input class="form-check-input" type="checkbox" name="v_dns" id="v_dns" <?php if (empty($v_dns) && $panel[$user_plain]["DNS_DOMAINS"] != "0"); ?>>
 							<label for="v_dns">
 								<?= _("DNS Support") ?>
 							</label>
 						</div>
 					<?php } ?>
 				<?php } ?>
-				<?php if ((isset($_SESSION['IMAP_SYSTEM'])) && (!empty($_SESSION['IMAP_SYSTEM']))) {?>
-					<?php if($panel[$user_plain]['MAIL_DOMAINS'] != "0") { ?>
+				<?php if (isset($_SESSION["IMAP_SYSTEM"]) && !empty($_SESSION["IMAP_SYSTEM"])) { ?>
+					<?php if ($panel[$user_plain]["MAIL_DOMAINS"] != "0") { ?>
 						<div class="form-check">
-							<input class="form-check-input" type="checkbox" name="v_mail" id="v_mail" <?php if (empty($v_mail)&&$panel[$user_plain]['MAIL_DOMAINS'] != "0") ?>>
+							<input class="form-check-input" type="checkbox" name="v_mail" id="v_mail" <?php if (empty($v_mail) && $panel[$user_plain]["MAIL_DOMAINS"] != "0"); ?>>
 							<label for="v_mail">
 								<?= _("Mail Support") ?>
 							</label>

web/templates/pages/edit_dns.php

@@ -17,17 +17,17 @@
 
 <div class="container animate__animated animate__fadeIn">
 
-	<form id="vstobjects" name="v_edit_dns" method="post" class="<?=$v_status?>">
-		<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+	<form id="vstobjects" name="v_edit_dns" method="post" class="<?= $v_status ?>">
+		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 		<input type="hidden" name="save" value="save">
 
 		<div class="form-container">
 			<h1 class="form-title"><?= _("Editing DNS Domain") ?></h1>
-			<?php show_alert_message($_SESSION);?>
+			<?php show_alert_message($_SESSION); ?>
 			<div class="u-mb10">
 				<label for="v_domain" class="form-label"><?= _("Domain") ?></label>
-				<input type="text" class="form-control" name="v_domain" id="v_domain" value="<?=htmlentities(trim($v_domain, "'"))?>" disabled>
-				<input type="hidden" name="v_domain" value="<?=htmlentities(trim($v_domain, "'"))?>">
+				<input type="text" class="form-control" name="v_domain" id="v_domain" value="<?= htmlentities(trim($v_domain, "'")) ?>" disabled>
+				<input type="hidden" name="v_domain" value="<?= htmlentities(trim($v_domain, "'")) ?>">
 			</div>
 			<div class="u-mb10">
 				<label for="v_ip" class="form-label"><?= _("IP address") ?></label>
@@ -42,13 +42,13 @@
 							}
 						?>
 					</select>
-					<input type="text" class="form-control list-editor" name="v_ip" id="v_ip" value="<?=htmlentities(trim($v_ip, "'"))?>">
+					<input type="text" class="form-control list-editor" name="v_ip" id="v_ip" value="<?= htmlentities(trim($v_ip, "'")) ?>">
 				</div>
 			</div>
-			<?php if (($_SESSION['userContext'] === 'admin') || ($_SESSION['userContext'] === 'user') && ($_SESSION['POLICY_USER_EDIT_DNS_TEMPLATES'] === 'yes')) { ?>
+			<?php if ($_SESSION["userContext"] === "admin" || ($_SESSION["userContext"] === "user" && $_SESSION["POLICY_USER_EDIT_DNS_TEMPLATES"] === "yes")) { ?>
 				<div class="u-mb10">
 					<label for="v_template" class="form-label">
-						<?= _("Template") . "<span class='optional'>" . strtoupper($_SESSION['DNS_SYSTEM']) . "</span>";?>
+						<?= _("Template") . "<span class='optional'>" . strtoupper($_SESSION["DNS_SYSTEM"]) . "</span>" ?>
 					</label>
 					<select class="form-select" name="v_template" id="v_template">
 						<?php
@@ -74,15 +74,15 @@
 				<label for="v_exp" class="form-label">
 					<?= _("Expiration Date") ?><span class="optional">(<?= _("YYYY-MM-DD") ?>)</span>
 				</label>
-				<input type="text" class="form-control" name="v_exp" id="v_exp" value="<?=htmlentities(trim($v_exp, "'"))?>">
+				<input type="text" class="form-control" name="v_exp" id="v_exp" value="<?= htmlentities(trim($v_exp, "'")) ?>">
 			</div>
 			<div class="u-mb10">
 				<label for="v_soa" class="form-label"><?= _("SOA") ?></label>
-				<input type="text" class="form-control" name="v_soa" id="v_soa" value="<?=htmlentities(trim($v_soa, "'"))?>">
+				<input type="text" class="form-control" name="v_soa" id="v_soa" value="<?= htmlentities(trim($v_soa, "'")) ?>">
 			</div>
 			<div class="u-mb10">
 				<label for="v_ttl" class="form-label"><?= _("TTL") ?></label>
-				<input type="text" class="form-control" name="v_ttl" id="v_ttl" value="<?=htmlentities(trim($v_ttl, "'"))?>">
+				<input type="text" class="form-control" name="v_ttl" id="v_ttl" value="<?= htmlentities(trim($v_ttl, "'")) ?>">
 			</div>
 		</div>
 

web/templates/pages/edit_dns_rec.php

@@ -17,22 +17,22 @@
 
 <div class="container animate__animated animate__fadeIn">
 
-	<form id="vstobjects" name="v_edit_dns_rec" method="post" class="<?=$v_status?>">
-		<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+	<form id="vstobjects" name="v_edit_dns_rec" method="post" class="<?= $v_status ?>">
+		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 		<input type="hidden" name="save" value="save">
 
 		<div class="form-container">
 			<h1 class="form-title"><?= _("Editing DNS Record") ?></h1>
-			<?php show_alert_message($_SESSION);?>
+			<?php show_alert_message($_SESSION); ?>
 			<div class="u-mb10">
 				<label for="v_domain" class="form-label"><?= _("Domain") ?></label>
-				<input type="text" class="form-control" name="v_domain" id="v_domain" value="<?=htmlentities(trim($v_domain, "'"))?>" disabled>
-				<input type="hidden" name="v_domain" value="<?=htmlentities(trim($v_domain, "'"))?>">
+				<input type="text" class="form-control" name="v_domain" id="v_domain" value="<?= htmlentities(trim($v_domain, "'")) ?>" disabled>
+				<input type="hidden" name="v_domain" value="<?= htmlentities(trim($v_domain, "'")) ?>">
 			</div>
 			<div class="u-mb10">
 				<label for="v_rec" class="form-label"><?= _("Record") ?></label>
-				<input type="text" class="form-control" name="v_rec" id="v_rec" value="<?=htmlentities(trim($v_rec, "'"))?>">
-				<input type="hidden" name="v_record_id" value="<?=htmlentities(trim($v_record_id, "'"))?>">
+				<input type="text" class="form-control" name="v_rec" id="v_rec" value="<?= htmlentities(trim($v_rec, "'")) ?>">
+				<input type="hidden" name="v_record_id" value="<?= htmlentities(trim($v_record_id, "'")) ?>">
 				<small class="hint"></small>
 			</div>
 			<div class="u-mb10">
@@ -67,20 +67,20 @@
 							}
 						?>
 					</select>
-					<input type="text" class="form-control list-editor" name="v_val" id="v_val" value="<?=htmlentities(trim($v_val, "'"))?>">
+					<input type="text" class="form-control list-editor" name="v_val" id="v_val" value="<?= htmlentities(trim($v_val, "'")) ?>">
 				</div>
 			</div>
 			<div class="u-mb10">
 				<label for="v_priority" class="form-label">
 					<?= _("Priority") ?> <span class="optional">(<?= _("optional") ?>)</span>
 				</label>
-				<input type="text" class="form-control" name="v_priority" id="v_priority" value="<?=htmlentities(trim($v_priority, "'"))?>">
+				<input type="text" class="form-control" name="v_priority" id="v_priority" value="<?= htmlentities(trim($v_priority, "'")) ?>">
 			</div>
 			<div class="u-mb10">
 				<label for="v_ttl" class="form-label">
 					<?= _("TTL") ?> <span class="optional">(<?= _("optional") ?>)</span>
 				</label>
-				<input type="text" class="form-control" name="v_ttl" id="v_ttl" value="<?=htmlentities(trim($v_ttl, "'"))?>">
+				<input type="text" class="form-control" name="v_ttl" id="v_ttl" value="<?= htmlentities(trim($v_ttl, "'")) ?>">
 			</div>
 		</div>
 

web/templates/pages/edit_firewall.php

@@ -17,13 +17,13 @@
 
 <div class="container animate__animated animate__fadeIn">
 
-	<form id="vstobjects" name="v_edit_firewall" method="post" class="<?=$v_status?>">
-		<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+	<form id="vstobjects" name="v_edit_firewall" method="post" class="<?= $v_status ?>">
+		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 		<input type="hidden" name="save" value="save">
 
 		<div class="form-container">
 			<h1 class="form-title"><?= _("Editing Firewall Rule") ?></h1>
-			<?php show_alert_message($_SESSION);?>
+			<?php show_alert_message($_SESSION); ?>
 			<div class="u-mb10">
 				<label for="v_action" class="form-label"><?= _("Action") ?></label>
 				<select class="form-select" name="v_action" id="v_action">
@@ -43,7 +43,7 @@
 				<label for="v_port" class="form-label">
 					<?= _("Port") ?> <span class="optional">(<?= _("Ranges and Lists are acceptable") ?>)</span>
 				</label>
-				<input type="text" class="form-control" name="v_port" id="v_port" value="<?=htmlentities(trim($v_port, "'"))?>" placeholder="<?= _("All ports: 0, Range: 80-82, List: 80,443,8080,8443") ?>">
+				<input type="text" class="form-control" name="v_port" id="v_port" value="<?= htmlentities(trim($v_port, "'")) ?>" placeholder="<?= _("All ports: 0, Range: 80-82, List: 80,443,8080,8443") ?>">
 			</div>
 			<div class="u-mb10">
 				<label for="v_ip" class="form-label">
@@ -53,14 +53,14 @@
 					<select class="form-select" tabindex="-1" id="quickips_list" onchange="this.nextElementSibling.value=this.value">
 						<option value="">&nbsp;</option>
 					</select>
-					<input type="text" class="form-control list-editor" name="v_ip" id="v_ip" value="<?=htmlentities(trim($v_ip, "'"))?>">
+					<input type="text" class="form-control list-editor" name="v_ip" id="v_ip" value="<?= htmlentities(trim($v_ip, "'")) ?>">
 				</div>
 			</div>
 			<div class="u-mb10">
 				<label for="v_comment" class="form-label">
 					<?= _("Comment") ?> <span class="optional">(<?= _("optional") ?>)</span>
 				</label>
-				<input type="text" class="form-control" name="v_comment" id="v_comment" maxlength="255" value="<?=htmlentities(trim($v_comment, "'"))?>">
+				<input type="text" class="form-control" name="v_comment" id="v_comment" maxlength="255" value="<?= htmlentities(trim($v_comment, "'")) ?>">
 			</div>
 		</div>
 

web/templates/pages/edit_ip.php

@@ -19,30 +19,30 @@
 
 	<form
 		x-data="{
-			showUserTable: <?= empty($v_dedicated) ? 'false' : 'true' ?>
+			showUserTable: <?= empty($v_dedicated) ? "false" : "true" ?>
 		}"
 		id="vstobjects"
 		name="v_edit_ip"
 		method="post"
 	>
-		<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 		<input type="hidden" name="save" value="save">
 
 		<div class="form-container">
 			<h1 class="form-title"><?= _("Editing IP Address") ?></h1>
-			<?php show_alert_message($_SESSION);?>
+			<?php show_alert_message($_SESSION); ?>
 			<div class="u-mb10">
 				<label for="v_ip" class="form-label"><?= _("IP address") ?></label>
-				<input type="text" class="form-control" name="v_ip" id="v_ip" value="<?=htmlentities(trim($v_ip, "'"))?>" disabled>
-				<input type="hidden" name="v_ip" value="<?=htmlentities(trim($v_ip, "'"))?>">
+				<input type="text" class="form-control" name="v_ip" id="v_ip" value="<?= htmlentities(trim($v_ip, "'")) ?>" disabled>
+				<input type="hidden" name="v_ip" value="<?= htmlentities(trim($v_ip, "'")) ?>">
 			</div>
 			<div class="u-mb10">
 				<label for="v_netmask" class="form-label"><?= _("Netmask") ?></label>
-				<input type="text" class="form-control" name="v_netmask" id="v_netmask" value="<?=htmlentities(trim($v_netmask, "'"))?>" disabled>
+				<input type="text" class="form-control" name="v_netmask" id="v_netmask" value="<?= htmlentities(trim($v_netmask, "'")) ?>" disabled>
 			</div>
 			<div class="u-mb10">
 				<label for="v_interface" class="form-label"><?= _("Interface") ?></label>
-				<input type="text" class="form-control" name="v_interface" id="v_interface" value="<?=htmlentities(trim($v_interface, "'"))?>" disabled>
+				<input type="text" class="form-control" name="v_interface" id="v_interface" value="<?= htmlentities(trim($v_interface, "'")) ?>" disabled>
 			</div>
 			<div class="form-check u-mb10">
 				<input x-model="showUserTable" class="form-check-input" type="checkbox" name="v_shared" id="v_shared">
@@ -68,13 +68,13 @@
 				<label for="v_name" class="form-label">
 					<?= _("Assigned domain") ?> <span class="optional">(<?= _("optional") ?>)</span>
 				</label>
-				<input type="text" class="form-control" name="v_name" id="v_name" value="<?=htmlentities(trim($v_name, "'"))?>">
+				<input type="text" class="form-control" name="v_name" id="v_name" value="<?= htmlentities(trim($v_name, "'")) ?>">
 			</div>
 			<div class="u-mb10">
 				<label for="v_nat" class="form-label">
 					<?= _("NAT IP association") ?> <span class="optional">(<?= _("optional") ?>)</span>
 				</label>
-				<input type="text" class="form-control" name="v_nat" id="v_nat" value="<?=htmlentities(trim($v_nat, "'"))?>">
+				<input type="text" class="form-control" name="v_nat" id="v_nat" value="<?= htmlentities(trim($v_nat, "'")) ?>">
 			</div>
 		</div>
 

web/templates/pages/edit_mail.php

@@ -19,27 +19,27 @@
 
 	<form
 		x-data="{
-			sslEnabled: <?= $v_ssl == 'yes' ? 'true' : 'false' ?>,
-			letsEncryptEnabled: <?= $v_letsencrypt == 'yes' ? 'true' : 'false' ?>,
-			hasSmtpRelay: <?= $v_smtp_relay == 'true' ? 'true' : 'false' ?>
+			sslEnabled: <?= $v_ssl == "yes" ? "true" : "false" ?>,
+			letsEncryptEnabled: <?= $v_letsencrypt == "yes" ? "true" : "false" ?>,
+			hasSmtpRelay: <?= $v_smtp_relay == "true" ? "true" : "false" ?>
 		}"
 		id="vstobjects"
 		name="v_edit_mail"
 		method="post"
-		class="<?=$v_status?>"
+		class="<?= $v_status ?>"
 	>
-		<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 		<input type="hidden" name="save" value="save">
 
 		<div class="form-container">
 			<h1 class="form-title"><?= _("Editing Mail Domain") ?></h1>
-			<?php show_alert_message($_SESSION);?>
+			<?php show_alert_message($_SESSION); ?>
 			<div class="u-mb20">
 				<label for="v_domain" class="form-label"><?= _("Domain") ?></label>
-				<input type="text" class="form-control" name="v_domain" id="v_domain" value="<?=htmlentities(trim($v_domain, "'"))?>" disabled>
-				<input type="hidden" name="v_domain" value="<?=htmlentities(trim($v_domain, "'"))?>">
+				<input type="text" class="form-control" name="v_domain" id="v_domain" value="<?= htmlentities(trim($v_domain, "'")) ?>" disabled>
+				<input type="hidden" name="v_domain" value="<?= htmlentities(trim($v_domain, "'")) ?>">
 			</div>
-			<?php if($_SESSION['WEBMAIL_SYSTEM']) {?>
+			<?php if ($_SESSION["WEBMAIL_SYSTEM"]) { ?>
 				<div class="u-mb10">
 					<label for="v_webmail" class="form-label"><?= _("Webmail Client") ?></label>
 					<select class="form-select" name="v_webmail" id="v_webmail" tabindex="6">
@@ -57,7 +57,7 @@
 			<?php } ?>
 			<div class="u-mb10">
 				<label for="v_catchall" class="form-label"><?= _("Catchall email") ?></label>
-				<input type="email" class="form-control" name="v_catchall" id="v_catchall" value="<?=htmlentities(trim($v_catchall, "'"))?>">
+				<input type="email" class="form-control" name="v_catchall" id="v_catchall" value="<?= htmlentities(trim($v_catchall, "'")) ?>">
 			</div>
 			<div class="u-mb20">
 				<label for="v_rate" class="form-label">
@@ -107,62 +107,64 @@
 					</label>
 				</div>
 				<div id="le-warning" class="u-mb20">
-					<div class="alert alert-info alert-with-icon" role="alert">
+					<div class="alert alert-info" role="alert">
 						<i class="fas fa-exclamation"></i>
-						<p><?php echo $v_webmail_alias;?></p>
-						<p><?=sprintf(_("To enable Let's Encrypt SSL, ensure that DNS records exist for mail.%s and %s!"), $v_domain, $v_webmail_alias); ?></p>
+						<div>
+							<p><?php echo $v_webmail_alias; ?></p>
+							<p><?= sprintf(_("To enable Let's Encrypt SSL, ensure that DNS records exist for mail.%s and %s!"), $v_domain, $v_webmail_alias) ?></p>
+						</div>
 					</div>
 				</div>
 				<div x-cloak x-show="letsEncryptEnabled" id="ssl-details">
 					<div class="u-mb10">
 						<label for="v_ssl_crt" class="form-label">
 							<?= _("SSL Certificate") ?>
-							<span x-cloak x-show="!letsEncryptEnabled" id="generate-csr" > / <a class="generate" target="_blank" href="/generate/ssl/?domain=<?=htmlentities($v_domain)?>"><?= _("Generate CSR") ?></a></span>
+							<span x-cloak x-show="!letsEncryptEnabled" id="generate-csr" > / <a class="generate" target="_blank" href="/generate/ssl/?domain=<?= htmlentities($v_domain) ?>"><?= _("Generate CSR") ?></a></span>
 						</label>
-						<textarea x-bind:disabled="!letsEncryptEnabled" class="form-control u-min-height100 u-console" name="v_ssl_crt" id="v_ssl_crt"><?=htmlentities(trim($v_ssl_crt, "'"))?></textarea>
+						<textarea x-bind:disabled="!letsEncryptEnabled" class="form-control u-min-height100 u-console" name="v_ssl_crt" id="v_ssl_crt"><?= htmlentities(trim($v_ssl_crt, "'")) ?></textarea>
 					</div>
 					<div class="u-mb10">
 						<label for="v_ssl_key" class="form-label"><?= _("SSL Key") ?></label>
-						<textarea x-bind:disabled="!letsEncryptEnabled" class="form-control u-min-height100 u-console" name="v_ssl_key" id="v_ssl_key"><?=htmlentities(trim($v_ssl_key, "'"))?></textarea>
+						<textarea x-bind:disabled="!letsEncryptEnabled" class="form-control u-min-height100 u-console" name="v_ssl_key" id="v_ssl_key"><?= htmlentities(trim($v_ssl_key, "'")) ?></textarea>
 					</div>
 					<div class="u-mb20">
 						<label for="v_ssl_ca" class="form-label">
 							<?= _("SSL Certificate Authority / Intermediate") ?> <span class="optional">(<?= _("optional") ?>)</span>
 						</label>
-						<textarea x-bind:disabled="!letsEncryptEnabled" class="form-control u-min-height100 u-console" name="v_ssl_ca" id="v_ssl_ca"><?=htmlentities(trim($v_ssl_ca, "'"))?></textarea>
+						<textarea x-bind:disabled="!letsEncryptEnabled" class="form-control u-min-height100 u-console" name="v_ssl_ca" id="v_ssl_ca"><?= htmlentities(trim($v_ssl_ca, "'")) ?></textarea>
 					</div>
 				</div>
-				<?php if ($v_ssl != 'no') {?>
+				<?php if ($v_ssl != "no") { ?>
 					<ul class="values-list">
 						<li class="values-list-item">
 							<span class="values-list-label"><?= _("SUBJECT") ?></span>
-							<span class="values-list-value"><?=htmlentities($v_ssl_subject);?></span>
+							<span class="values-list-value"><?= htmlentities($v_ssl_subject) ?></span>
 						</li>
-						<?php if ($v_ssl_aliases) {?>
+						<?php if ($v_ssl_aliases) { ?>
 							<li class="values-list-item">
 								<span class="values-list-label"><?= _("Aliases") ?></span>
-								<span class="values-list-value"><?=htmlentities($v_ssl_aliases);?></span>
+								<span class="values-list-value"><?= htmlentities($v_ssl_aliases) ?></span>
 							</li>
 						<?php } ?>
 						<li class="values-list-item">
 							<span class="values-list-label"><?= _("NOT_BEFORE") ?></span>
-							<span class="values-list-value"><?=htmlentities($v_ssl_not_before)?></span>
+							<span class="values-list-value"><?= htmlentities($v_ssl_not_before) ?></span>
 						</li>
 						<li class="values-list-item">
 							<span class="values-list-label"><?= _("NOT_AFTER") ?></span>
-							<span class="values-list-value"><?=htmlentities($v_ssl_not_after)?></span>
+							<span class="values-list-value"><?= htmlentities($v_ssl_not_after) ?></span>
 						</li>
 						<li class="values-list-item">
 							<span class="values-list-label"><?= _("SIGNATURE") ?></span>
-							<span class="values-list-value"><?=htmlentities($v_ssl_signature)?></span>
+							<span class="values-list-value"><?= htmlentities($v_ssl_signature) ?></span>
 						</li>
 						<li class="values-list-item">
 							<span class="values-list-label"><?= _("PUB_KEY") ?></span>
-							<span class="values-list-value"><?=htmlentities($v_ssl_pub_key)?></span>
+							<span class="values-list-value"><?= htmlentities($v_ssl_pub_key) ?></span>
 						</li>
 						<li class="values-list-item">
 							<span class="values-list-label"><?= _("ISSUER") ?></span>
-							<span class="values-list-value"><?=htmlentities($v_ssl_issuer)?></span>
+							<span class="values-list-value"><?= htmlentities($v_ssl_issuer) ?></span>
 						</li>
 					</ul>
 				<?php } ?>

web/templates/pages/edit_mail_acc.php

@@ -19,26 +19,26 @@
 
 	<form
 		x-data="{
-			hasAutoReply: <?= $v_autoreply == 'yes' ? 'true' : 'false' ?>
+			hasAutoReply: <?= $v_autoreply == "yes" ? "true" : "false" ?>
 		}"
 		id="vstobjects"
 		name="v_edit_mail_acc"
 		method="post"
-		class="<?=$v_status?>"
+		class="<?= $v_status ?>"
 	>
-		<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 		<input type="hidden" name="save" value="save">
 
 		<div class="form-container form-container-wide">
 			<h1 class="form-title"><?= _("Editing Mail Account") ?></h1>
-			<?php show_alert_message($_SESSION);?>
+			<?php show_alert_message($_SESSION); ?>
 			<div class="sidebar-container">
 				<div>
 					<div class="u-mb10">
 						<label for="v_email" class="form-label"><?= _("Account") ?></label>
-						<input type="text" class="form-control" name="v_email" id="v_email" value="<?=htmlentities($_GET['account'])."@".htmlentities($_GET['domain'])?>" disabled>
-						<input type="hidden" name="v_domain" value="<?=htmlentities(trim($v_domain, "'"))?>">
-						<input type="hidden" name="v_account" value="<?=htmlentities(trim($v_account, "'"))?>">
+						<input type="text" class="form-control" name="v_email" id="v_email" value="<?= htmlentities($_GET["account"]) . "@" . htmlentities($_GET["domain"]) ?>" disabled>
+						<input type="hidden" name="v_domain" value="<?= htmlentities(trim($v_domain, "'")) ?>">
+						<input type="hidden" name="v_account" value="<?= htmlentities(trim($v_account, "'")) ?>">
 					</div>
 					<div class="u-mb10">
 						<label for="v_password" class="form-label">
@@ -46,7 +46,7 @@
 							<a href="javascript:applyRandomString();" title="<?= _("generate") ?>" class="u-ml5"><i class="fas fa-arrows-rotate status-icon green icon-large"></i></a>
 						</label>
 						<div class="u-pos-relative u-mb10">
-							<input type="text" class="form-control js-password-input" name="v_password" id="v_password" value="<?=htmlentities(trim($v_password, "'"))?>">
+							<input type="text" class="form-control js-password-input" name="v_password" id="v_password" value="<?= htmlentities(trim($v_password, "'")) ?>">
 							<meter max="4" class="password-meter"></meter>
 						</div>
 					</div>
@@ -60,7 +60,7 @@
 						<label for="v_send_email" class="form-label">
 							<?= _("Send login credentials to email address") ?>
 						</label>
-						<input type="email" class="form-control" name="v_send_email" id="v_send_email" value="<?=htmlentities(trim($v_send_email, "'"))?>">
+						<input type="email" class="form-control" name="v_send_email" id="v_send_email" value="<?= htmlentities(trim($v_send_email, "'")) ?>">
 						<input type="hidden" name="v_credentials" class="js-hidden-credentials">
 					</div>
 					<div class="u-mb10">
@@ -76,7 +76,7 @@
 						<label for="v_aliases" class="form-label">
 							<?= _("Aliases") ?> <span class="optional">(<?= _("use local-part") ?>)</span>
 						</label>
-						<textarea class="form-control" name="v_aliases" id="v_aliases"><?=htmlentities(trim($v_aliases, "'"))?></textarea>
+						<textarea class="form-control" name="v_aliases" id="v_aliases"><?= htmlentities(trim($v_aliases, "'")) ?></textarea>
 					</div>
 					<div class="form-check">
 						<input class="form-check-input" type="checkbox" name="v_blackhole" id="v_blackhole" <?php if ($v_blackhole == 'yes') echo 'checked' ?>>
@@ -101,7 +101,7 @@
 					<div x-cloak x-show="hasAutoReply" id="autoreplytable">
 						<div class="u-mb10">
 							<label for="v_autoreply_message" class="form-label"><?= _("Message") ?></label>
-							<textarea class="form-control" name="v_autoreply_message" id="v_autoreply_message"><?=htmlentities(trim($v_autoreply_message, "'"))?></textarea>
+							<textarea class="form-control" name="v_autoreply_message" id="v_autoreply_message"><?= htmlentities(trim($v_autoreply_message, "'")) ?></textarea>
 						</div>
 					</div>
 					<div id="v-fwd-opt">
@@ -125,21 +125,21 @@
 						<ul class="values-list u-mb20">
 							<li class="values-list-item">
 								<span class="values-list-label"><?= _("Username") ?></span>
-								<span class="values-list-value"><span class="js-account-output"></span>@<?=htmlentities(trim($v_domain, "'"))?></span>
+								<span class="values-list-value"><span class="js-account-output"></span>@<?= htmlentities(trim($v_domain, "'")) ?></span>
 							</li>
 							<li class="values-list-item">
 								<span class="values-list-label"><?= _("Password") ?></span>
 								<span class="values-list-value"><span class="js-password-output"></span></span>
 							</li>
-							<?php if ($_SESSION['WEBMAIL_SYSTEM']) {?>
+							<?php if ($_SESSION["WEBMAIL_SYSTEM"]) { ?>
 								<li class="values-list-item">
 									<span class="values-list-label"><?= _("Webmail") ?></span>
-									<span class="values-list-value"><a href="http://<?=htmlentities($v_webmail_alias)?>" target="_blank">http://<?=htmlentities($v_webmail_alias)?></a></span>
+									<span class="values-list-value"><a href="http://<?= htmlentities($v_webmail_alias) ?>" target="_blank">http://<?= htmlentities($v_webmail_alias) ?></a></span>
 								</li>
 							<?php } ?>
 							<li class="values-list-item">
 								<span class="values-list-label"><?= _("Hostname") ?></span>
-								<span class="values-list-value">mail.<?=htmlentities($v_domain)?></span>
+								<span class="values-list-value">mail.<?= htmlentities($v_domain) ?></span>
 							</li>
 						</ul>
 						<h2 class="u-text-H3 u-mb10"><?= _("IMAP settings") ?></h2>

web/templates/pages/edit_package.php

@@ -74,7 +74,7 @@
 				<div class="u-mt15 u-mb10">
 					<label for="v_web_domains" class="form-label"><?= _("Web Domains") ?></label>
 					<div class="u-pos-relative">
-						<input type="text" class="form-control" name="v_web_domains" id="v_web_domains" value="<?=htmlentities(trim($v_web_domains, "'"))?>">
+						<input type="text" class="form-control" name="v_web_domains" id="v_web_domains" value="<?= htmlentities(trim($v_web_domains, "'")) ?>">
 						<i class="unlim-trigger fas fa-infinity" title="<?= _("Unlimited") ?>"></i>
 					</div>
 				</div>
@@ -83,13 +83,13 @@
 						<?= _("Web Aliases") ?> <span class="optional">(<?= _("per domain") ?>)</span>
 					</label>
 					<div class="u-pos-relative">
-						<input type="text" class="form-control" name="v_web_aliases" id="v_web_aliases" value="<?=htmlentities(trim($v_web_aliases, "'"))?>">
+						<input type="text" class="form-control" name="v_web_aliases" id="v_web_aliases" value="<?= htmlentities(trim($v_web_aliases, "'")) ?>">
 						<i class="unlim-trigger fas fa-infinity" title="<?= _("Unlimited") ?>"></i>
 					</div>
 				</div>
 				<div class="u-mb10">
 					<label for="v_web_template" class="form-label">
-						<?= _("Web Template") . " <span class='optional'> " .strtoupper($_SESSION['WEB_SYSTEM']) . "</span>";?>
+						<?= _("Web Template") . " <span class='optional'> " . strtoupper($_SESSION["WEB_SYSTEM"]) . "</span>" ?>
 					</label>
 					<select class="form-select" name="v_web_template" id="v_web_template">
 						<?php
@@ -106,7 +106,7 @@
 				<?php if (!empty($_SESSION['WEB_BACKEND'])) { echo ""; ?>
 					<div class="u-mb10">
 						<label for="v_backend_template" class="form-label">
-							<?= _("Backend Template") . "<span class='optional'>" .strtoupper($_SESSION['WEB_BACKEND']) . "</span>";?>
+							<?= _("Backend Template") . "<span class='optional'>" . strtoupper($_SESSION["WEB_BACKEND"]) . "</span>" ?>
 						</label>
 						<select class="form-select" name="v_backend_template" id="v_backend_template">
 							<?php
@@ -124,7 +124,7 @@
 				<?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
 					<div class="u-mb10">
 						<label for="v_proxy_template" class="form-label">
-							<?= _("Proxy Template") . "<span class='optional'>" .strtoupper($_SESSION['PROXY_SYSTEM']) . "</span>";?>
+							<?= _("Proxy Template") . "<span class='optional'>" . strtoupper($_SESSION["PROXY_SYSTEM"]) . "</span>" ?>
 						</label>
 						<select class="form-select" name="v_proxy_template" id="v_proxy_template">
 							<?php
@@ -150,7 +150,7 @@
 			<div x-cloak x-show="showDnsOptions" id="dns-options">
 				<div class="u-mt15 u-mb10">
 					<label for="v_dns_template" class="form-label">
-						<?= _("DNS Template") . "<span class='optional'>" .strtoupper($_SESSION['DNS_SYSTEM']) . "</span>";?>
+						<?= _("DNS Template") . "<span class='optional'>" . strtoupper($_SESSION["DNS_SYSTEM"]) . "</span>" ?>
 					</label>
 					<select class="form-select" name="v_dns_template" id="v_dns_template">
 						<?php
@@ -170,7 +170,7 @@
 				<div class="u-mb10">
 					<label for="v_dns_domains" class="form-label"><?= _("DNS domains") ?></label>
 					<div class="u-pos-relative">
-						<input type="text" class="form-control" name="v_dns_domains" id="v_dns_domains" value="<?=htmlentities(trim($v_dns_domains, "'"))?>">
+						<input type="text" class="form-control" name="v_dns_domains" id="v_dns_domains" value="<?= htmlentities(trim($v_dns_domains, "'")) ?>">
 						<i class="unlim-trigger fas fa-infinity" title="<?= _("Unlimited") ?>"></i>
 					</div>
 				</div>
@@ -179,17 +179,17 @@
 						<?= _("DNS records") ?> <span class="optional">(<?= _("per domain") ?>)</span>
 					</label>
 					<div class="u-pos-relative">
-						<input type="text" class="form-control" name="v_dns_records" id="v_dns_records" value="<?=htmlentities(trim($v_dns_records, "'"))?>">
+						<input type="text" class="form-control" name="v_dns_records" id="v_dns_records" value="<?= htmlentities(trim($v_dns_records, "'")) ?>">
 						<i class="unlim-trigger fas fa-infinity" title="<?= _("Unlimited") ?>"></i>
 					</div>
 				</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"><?= _("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) {
@@ -292,7 +292,7 @@
 				<div class="u-mt15 u-mb10">
 					<label for="v_cron_jobs" class="form-label"><?= _("Cron Jobs") ?></label>
 					<div class="u-pos-relative">
-						<input type="text" class="form-control" name="v_cron_jobs" id="v_cron_jobs" value="<?=htmlentities(trim($v_cron_jobs, "'"))?>">
+						<input type="text" class="form-control" name="v_cron_jobs" id="v_cron_jobs" value="<?= htmlentities(trim($v_cron_jobs, "'")) ?>">
 						<i class="unlim-trigger fas fa-infinity" title="<?= _("Unlimited") ?>"></i>
 					</div>
 				</div>

web/templates/pages/edit_server.php

@@ -27,19 +27,19 @@
 
 	<form
 		x-data="{
-			hasSmtpRelay: <?= $v_smtp_relay == 'true' ? 'true' : 'false' ?>,
-			remoteBackupEnabled: <?= !empty($v_backup_remote_adv) ? 'true' : 'false' ?>
+			hasSmtpRelay: <?= $v_smtp_relay == "true" ? "true" : "false" ?>,
+			remoteBackupEnabled: <?= !empty($v_backup_remote_adv) ? "true" : "false" ?>
 		}"
 		id="vstobjects"
 		name="v_configure_server"
 		method="post"
 	>
-		<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 		<input type="hidden" name="save" value="save">
 
 		<div class="form-container">
 			<h1 class="form-title"><?= _("Configuring Server") ?></h1>
-			<?php show_alert_message($_SESSION);?>
+			<?php show_alert_message($_SESSION); ?>
 
 			<!-- Basic options tab -->
 			<details class="collapse u-mb10">
@@ -49,7 +49,7 @@
 				<div class="collapse-content">
 					<div class="u-mb10">
 						<label for="v_hostname" class="form-label"><?= _("Hostname") ?></label>
-						<input type="text" class="form-control" name="v_hostname" id="v_hostname" value="<?=htmlentities(trim($v_hostname, "'"))?>">
+						<input type="text" class="form-control" name="v_hostname" id="v_hostname" value="<?= htmlentities(trim($v_hostname, "'")) ?>">
 					</div>
 					<div class="u-mb10">
 						<label for="v_timezone" class="form-label"><?= _("Time Zone") ?></label>
@@ -115,10 +115,10 @@
 				</summary>
 				<div class="collapse-content">
 					<p class="u-mb10">
-						<?= _("Version") ?>: <span class="optional"><?=$_SESSION['VERSION'];?></span>
+						<?= _("Version") ?>: <span class="optional"><?= $_SESSION["VERSION"] ?></span>
 					</p>
-					<?php if ($_SESSION['RELEASE_BRANCH'] !== 'release') {?>
-						<p><?= _("Release") ?>: <span class="optional"><?=$_SESSION['RELEASE_BRANCH'];?></span></p>
+					<?php if ($_SESSION["RELEASE_BRANCH"] !== "release") { ?>
+						<p><?= _("Release") ?>: <span class="optional"><?= $_SESSION["RELEASE_BRANCH"] ?></span></p>
 					<?php } ?>
 					<p class="u-mb5"><?= _("Options") ?></p>
 					<div class="form-check">
@@ -155,68 +155,68 @@
 					<i class="fas fa-earth-americas u-mr15"></i><?= _("Web Server") ?>
 				</summary>
 				<div class="collapse-content">
-					<?php if (!empty($_SESSION['PROXY_SYSTEM'])) { ?>
+					<?php if (!empty($_SESSION["PROXY_SYSTEM"])) { ?>
 						<p>
-							<?= _("Proxy Server") ?>: <span class="u-ml5"><?=$_SESSION['PROXY_SYSTEM']; ?></span>
+							<?= _("Proxy Server") ?>: <span class="u-ml5"><?= $_SESSION["PROXY_SYSTEM"] ?></span>
 							<a href="/edit/server/<? echo $_SESSION['PROXY_SYSTEM'] ?>/" class="u-ml5">
 								<i class="fas fa-pencil status-icon orange"></i>
 							</a>
 						</p>
 					<?php } ?>
-					<?php if (!empty($_SESSION['WEB_SYSTEM'])) { ?>
+					<?php if (!empty($_SESSION["WEB_SYSTEM"])) { ?>
 						<p>
-							<?= _("Web Server") ?>: <span class="u-ml5"><?=$_SESSION['WEB_SYSTEM']; ?></span>
+							<?= _("Web Server") ?>: <span class="u-ml5"><?= $_SESSION["WEB_SYSTEM"] ?></span>
 							<a href="/edit/server/<? echo $_SESSION['WEB_SYSTEM'] ?>/" class="u-ml5">
 								<i class="fas fa-pencil status-icon orange"></i>
 							</a>
 						</p>
 					<?php } ?>
-					<?php if (!empty($_SESSION['WEB_BACKEND'])) { ?>
+					<?php if (!empty($_SESSION["WEB_BACKEND"])) { ?>
 						<p>
-							<?= _("Backend Server") ?>: <span class="u-ml5"><?=$_SESSION['WEB_BACKEND']; ?></span>
+							<?= _("Backend Server") ?>: <span class="u-ml5"><?= $_SESSION["WEB_BACKEND"] ?></span>
 							<a href="/edit/server/<? echo $_SESSION['WEB_BACKEND'] ?>/" class="u-ml5">
 								<i class="fas fa-pencil status-icon orange"></i>
 							</a>
 						</p>
 					<?php } ?>
-					<?php if (!empty($_SESSION['WEB_BACKEND_POOL'])) { ?>
+					<?php if (!empty($_SESSION["WEB_BACKEND_POOL"])) { ?>
 						<p>
-							<?= _("Backend Pool Mode") ?>: <span class="u-ml5"><?=$_SESSION['WEB_BACKEND_POOL']; ?></span>
+							<?= _("Backend Pool Mode") ?>: <span class="u-ml5"><?= $_SESSION["WEB_BACKEND_POOL"] ?></span>
 						</p>
 					<?php } ?>
-					<?php if(count($v_php_versions)): ?>
+					<?php if (count($v_php_versions)): ?>
 						<div class="u-mt15">
 							<p class="u-mb10"><?= _("Enabled multi PHP versions") ?></p>
-							<div class="alert alert-info alert-with-icon u-mb10" role="alert">
+							<div class="alert alert-info u-mb10" role="alert">
 								<i class="fas fa-info"></i>
 								<p><?= _("Please wait while php is installed or removed") ?></p>
 							</div>
 						</div>
-						<?php foreach($v_php_versions as $php_version): ?>
+						<?php foreach ($v_php_versions as $php_version): ?>
 							<div class="form-check">
 								<input class="form-check-input" type="checkbox"
-									<?=$php_version->installed?'checked':''; ?>
-									<?=$php_version->protected?'disabled':''; ?>
-									id="<?=$php_version->name?>"
-									name="v_php_versions[<?=$php_version->tpl?>]">
-								<label for="<?=$php_version->name?>">
-									<?=$php_version->name?>
+									<?= $php_version->installed ? "checked" : "" ?>
+									<?= $php_version->protected ? "disabled" : "" ?>
+									id="<?= $php_version->name ?>"
+									name="v_php_versions[<?= $php_version->tpl ?>]">
+								<label for="<?= $php_version->name ?>">
+									<?= $php_version->name ?>
 								</label>
 							</div>
-							<?php foreach($php_version->usedby as $wd_user => $wd_domains ): ?>
-								<?php foreach($wd_domains as $wd_domain ): ?>
+							<?php foreach ($php_version->usedby as $wd_user => $wd_domains): ?>
+								<?php foreach ($wd_domains as $wd_domain): ?>
 									<p class="u-side-by-side" style="border: 1px lightgrey; padding:0 10px;">
 										<span>
 											<i class="fas fa-user"></i>
-											<?=$wd_user;?>
+											<?= $wd_user ?>
 										</span>
-										<span class="optional"><?=$wd_domain;?></span>
+										<span class="optional"><?= $wd_domain ?></span>
 									</p>
 								<?php endforeach; ?>
 							<?php endforeach; ?>
 						<?php endforeach; ?>
 					<?php endif; ?>
-					<?php if(!empty($_SESSION['WEB_BACKEND'])){ ?>
+					<?php if (!empty($_SESSION["WEB_BACKEND"])) { ?>
 						<div class="u-mt10">
 							<label for="v_php_default_version" class="form-label"><?= _("System PHP version") ?></label>
 							<select class="form-select" name="v_php_default_version" id="v_php_default_version">
@@ -236,14 +236,14 @@
 			</details>
 
 			<!-- DNS Server tab -->
-			<?php if (!empty($_SESSION['DNS_SYSTEM'])) { ?>
+			<?php if (!empty($_SESSION["DNS_SYSTEM"])) { ?>
 				<details class="collapse u-mb10">
 					<summary class="collapse-header">
 						<i class="fas fa-book-atlas u-mr15"></i><?= _("DNS Server") ?>
 					</summary>
 					<div class="collapse-content">
 						<p>
-							<?= _("DNS Server") ?>: <span class="u-ml5"><?=$_SESSION['DNS_SYSTEM']; ?></span>
+							<?= _("DNS Server") ?>: <span class="u-ml5"><?= $_SESSION["DNS_SYSTEM"] ?></span>
 							<a href="/edit/server/<? echo $_SESSION['DNS_SYSTEM'] ?>/" class="u-ml5">
 								<i class="fas fa-pencil status-icon orange"></i>
 							</a>
@@ -257,8 +257,8 @@
 								$i++;
 							?>
 							<div>
-								<label for="v_dns_remote_host" class="form-label"><?= _("Host"). ' #'.$i ?></label>
-								<input type="text" class="form-control" name="v_dns_remote_host" id="v_dns_remote_host" value="<?=$key; ?>" disabled>
+								<label for="v_dns_remote_host" class="form-label"><?= _("Host") . " #" . $i ?></label>
+								<input type="text" class="form-control" name="v_dns_remote_host" id="v_dns_remote_host" value="<?= $key ?>" disabled>
 							</div>
 						<?php } } ?>
 					</div>
@@ -266,40 +266,40 @@
 			<?php } ?>
 
 			<!-- Mail Server tab -->
-			<?php if ((!empty($_SESSION['MAIL_SYSTEM']))) { ?>
+			<?php if (!empty($_SESSION["MAIL_SYSTEM"])) { ?>
 				<details class="collapse u-mb10">
 					<summary class="collapse-header">
 						<i class="fas fa-envelopes-bulk u-mr15"></i><?= _("Mail Server") ?>
 					</summary>
 					<div class="collapse-content">
 						<p>
-							<?= _("Mail Server") ?>: <span class="u-ml5"><?=$_SESSION['MAIL_SYSTEM']; ?></span>
+							<?= _("Mail Server") ?>: <span class="u-ml5"><?= $_SESSION["MAIL_SYSTEM"] ?></span>
 							<a href="/edit/server/<? echo $_SESSION['MAIL_SYSTEM'] ?>/" class="u-ml5">
 								<i class="fas fa-pencil status-icon orange"></i>
 							</a>
 						</p>
-						<?php if (!empty($_SESSION['ANTIVIRUS_SYSTEM'])) { ?>
+						<?php if (!empty($_SESSION["ANTIVIRUS_SYSTEM"])) { ?>
 							<p>
-								<?= _("Antivirus") ?>: <span class="u-ml5"><?=$_SESSION['ANTIVIRUS_SYSTEM']; ?></span>
+								<?= _("Antivirus") ?>: <span class="u-ml5"><?= $_SESSION["ANTIVIRUS_SYSTEM"] ?></span>
 								<a href="/edit/server/<? echo $_SESSION['ANTIVIRUS_SYSTEM'] ?>/" class="u-ml5">
 									<i class="fas fa-pencil status-icon orange"></i>
 								</a>
 							</p>
 						<?php } ?>
-						<?php if (!empty($_SESSION['ANTISPAM_SYSTEM'])) { ?>
+						<?php if (!empty($_SESSION["ANTISPAM_SYSTEM"])) { ?>
 							<p>
-								<?= _("AntiSpam") ?>: <span class="u-ml5"><?=$_SESSION['ANTISPAM_SYSTEM']; ?></span>
+								<?= _("AntiSpam") ?>: <span class="u-ml5"><?= $_SESSION["ANTISPAM_SYSTEM"] ?></span>
 								<a href="/edit/server/<? echo $_SESSION['ANTISPAM_SYSTEM'] ?>/" class="u-ml5">
 									<i class="fas fa-pencil status-icon orange"></i>
 								</a>
 							</p>
 						<?php } ?>
-						<?php if($_SESSION['WEBMAIL_SYSTEM']){?>
+						<?php if ($_SESSION["WEBMAIL_SYSTEM"]) { ?>
 							<div class="u-mt15 u-mb10">
 								<label for="v_webmail_alias" class="form-label">
-									<?= _("Webmail URL") ?> <span class="hint">(<?=$_SESSION['WEBMAIL_ALIAS'];?>.example.com)</span>
+									<?= _("Webmail URL") ?> <span class="hint">(<?= $_SESSION["WEBMAIL_ALIAS"] ?>.example.com)</span>
 								</label>
-								<input type="text" class="form-control" name="v_webmail_alias" id="v_webmail_alias" value="<?=$_SESSION['WEBMAIL_ALIAS']; ?>">
+								<input type="text" class="form-control" name="v_webmail_alias" id="v_webmail_alias" value="<?= $_SESSION["WEBMAIL_ALIAS"] ?>">
 							</div>
 						<?php } ?>
 						<div class="form-check u-mt20">
@@ -311,15 +311,15 @@
 						<div x-cloak x-show="hasSmtpRelay" id="smtp_relay_table" class="u-pl30 u-mt20">
 							<div class="u-mb10">
 								<label for="v_smtp_relay_host" class="form-label"><?= _("Host") ?></label>
-								<input type="text" class="form-control" name="v_smtp_relay_host" id="v_smtp_relay_host" value="<?=htmlentities(trim($v_smtp_relay_host, "'"))?>">
+								<input type="text" class="form-control" name="v_smtp_relay_host" id="v_smtp_relay_host" value="<?= htmlentities(trim($v_smtp_relay_host, "'")) ?>">
 							</div>
 							<div class="u-mb10">
 								<label for="v_smtp_relay_port" class="form-label"><?= _("Port") ?></label>
-								<input type="text" class="form-control" name="v_smtp_relay_port" id="v_smtp_relay_port" value="<?=htmlentities(trim($v_smtp_relay_port, "'"))?>">
+								<input type="text" class="form-control" name="v_smtp_relay_port" id="v_smtp_relay_port" value="<?= htmlentities(trim($v_smtp_relay_port, "'")) ?>">
 							</div>
 							<div class="u-mb10">
 								<label for="v_smtp_relay_user" class="form-label"><?= _("Username") ?></label>
-								<input type="text" class="form-control" name="v_smtp_relay_user" id="v_smtp_relay_user" value="<?=htmlentities(trim($v_smtp_relay_user, "'"))?>">
+								<input type="text" class="form-control" name="v_smtp_relay_user" id="v_smtp_relay_user" value="<?= htmlentities(trim($v_smtp_relay_user, "'")) ?>">
 							</div>
 							<div class="u-mb10">
 								<label for="v_smtp_relay_pass" class="form-label"><?= _("Password") ?></label>
@@ -333,7 +333,7 @@
 			<?php } ?>
 
 			<!-- Databases tab -->
-			<?php if (!empty($_SESSION['DB_SYSTEM'])) { ?>
+			<?php if (!empty($_SESSION["DB_SYSTEM"])) { ?>
 				<details class="collapse u-mb10">
 					<summary class="collapse-header">
 						<i class="fas fa-database u-mr15"></i><?= _("Databases") ?>
@@ -349,10 +349,10 @@
 							</select>
 						</div>
 						<!-- MySQL / MariaDB Options-->
-						<?php if ($v_mysql == 'yes') { ?>
+						<?php if ($v_mysql == "yes") { ?>
 							<div class="u-mb20">
 								<label for="v_mysql_url" class="form-label"><?= _("phpMyAdmin URL") ?></label>
-								<input type="text" class="form-control" name="v_mysql_url" id="v_mysql_url" value="<?=$_SESSION['DB_PMA_ALIAS']; ?>">
+								<input type="text" class="form-control" name="v_mysql_url" id="v_mysql_url" value="<?= $_SESSION["DB_PMA_ALIAS"] ?>">
 							</div>
 							<div class="u-mb10">
 								<label for="v_phpmyadmin_key" class="form-label">
@@ -371,8 +371,8 @@
 							?>
 							<div class="u-pl30">
 								<div class="u-mb10">
-									<label for="v_mysql_host" class="form-label"><?= _("Host"). ' #'.$i ?></label>
-									<input type="text" class="form-control" name="v_mysql_host" id="v_mysql_host" value="<?=$value['HOST']?>" disabled>
+									<label for="v_mysql_host" class="form-label"><?= _("Host") . " #" . $i ?></label>
+									<input type="text" class="form-control" name="v_mysql_host" id="v_mysql_host" value="<?= $value["HOST"] ?>" disabled>
 								</div>
 								<div class="u-mb10">
 									<label for="v_mysql_password" class="form-label"><?= _("Password") ?></label>
@@ -384,13 +384,13 @@
 									<label for="v_mysql_max" class="form-label">
 										<?= _("Maximum Number Of Databases") ?>
 									</label>
-									<input type="text" class="form-control" name="v_mysql_max" id="v_mysql_max" value="<?=$value['MAX_DB']; ?>" disabled>
+									<input type="text" class="form-control" name="v_mysql_max" id="v_mysql_max" value="<?= $value["MAX_DB"] ?>" disabled>
 								</div>
 								<div class="u-mb10">
 									<label for="v_mysql_current" class="form-label">
 										<?= _("Current Number Of Databases") ?>
 									</label>
-									<input type="text" class="form-control" name="v_mysql_current" id="v_mysql_current" value="<?=$value['U_DB_BASES']; ?>" disabled>
+									<input type="text" class="form-control" name="v_mysql_current" id="v_mysql_current" value="<?= $value["U_DB_BASES"] ?>" disabled>
 								</div>
 							</div>
 						<?php }} ?>
@@ -409,7 +409,7 @@
 								<label for="v_pgsql_url" class="form-label">
 									<?= _("phpPgAdmin URL") ?>
 								</label>
-								<input type="text" class="form-control" name="v_pgsql_url" id="v_pgsql_url" value="<?=$_SESSION['DB_PGA_ALIAS']; ?>">
+								<input type="text" class="form-control" name="v_pgsql_url" id="v_pgsql_url" value="<?= $_SESSION["DB_PGA_ALIAS"] ?>">
 							</div>
 						<?php } ?>
 						<?php if ($v_pgsql == 'yes') {
@@ -419,20 +419,20 @@
 							?>
 							<div class="u-pl30">
 								<div class="u-mb10">
-									<label for="v_pgsql_host" class="form-label"><?= _("Host"). ' #'.$i ?></label>
-									<input type="text" class="form-control" name="v_pgsql_host" id="v_pgsql_host" value="<?=$value['HOST']?>" disabled>
+									<label for="v_pgsql_host" class="form-label"><?= _("Host") . " #" . $i ?></label>
+									<input type="text" class="form-control" name="v_pgsql_host" id="v_pgsql_host" value="<?= $value["HOST"] ?>" disabled>
 								</div>
 								<div class="u-mb10">
 									<label for="v_psql_max" class="form-label">
 										<?= _("Maximum Number Of Databases") ?>
 									</label>
-									<input type="text" class="form-control" name="v_psql_max" id="v_psql_max" value="<?=$value['MAX_DB']; ?>" disabled>
+									<input type="text" class="form-control" name="v_psql_max" id="v_psql_max" value="<?= $value["MAX_DB"] ?>" disabled>
 								</div>
 								<div class="u-mb10">
 									<label for="v_pgsql_max" class="form-label">
 										<?= _("Current Number Of Databases") ?>
 									</label>
-									<input type="text" class="form-control" name="v_pgsql_max" id="v_pgsql_max" value="<?=$value['U_DB_BASES']; ?>" disabled>
+									<input type="text" class="form-control" name="v_pgsql_max" id="v_pgsql_max" value="<?= $value["U_DB_BASES"] ?>" disabled>
 								</div>
 							</div>
 						<?php }} ?>
@@ -485,7 +485,7 @@
 								<i class="fas fa-circle-question"></i>
 							</a>
 						</label>
-						<input type="text" class="form-control" name="v_backup_dir" id="v_backup_dir" value="<?=trim($v_backup_dir, "'")?>" disabled="disabled">
+						<input type="text" class="form-control" name="v_backup_dir" id="v_backup_dir" value="<?= trim($v_backup_dir, "'") ?>" disabled="disabled">
 					</div>
 					<div class="form-check">
 						<input x-model="remoteBackupEnabled" class="form-check-input" type="checkbox" name="v_backup_remote_adv" id="v_backup_remote_adv">
@@ -625,17 +625,17 @@
 					<i class="fas fa-key u-mr15"></i><?= _("Security") ?>
 				</summary>
 				<div class="collapse-content">
-					<h3 x-on:click="showSystemOptions = !showSystemOptions" class="section-title">
+					<h2 x-on:click="showSystemOptions = !showSystemOptions" class="section-title">
 						<?= _("System") ?>
 						<i
 							x-bind:class="showSystemOptions ? 'fa-square-minus' : 'fa-square-plus'"
 							class="fas status-icon dim maroon js-section-toggle-icon"
 						></i>
-					</h3>
+					</h2>
 					<div x-cloak x-show="showSystemOptions" id="security-system-table">
-						<p class="u-pt18" style="font-size:1rem;padding-bottom:12px;">
+						<h3 class="u-mt20 u-mb10">
 							<?= _("API") ?>
-						</p>
+						</h3>
 						<div class="u-mb10">
 							<label for="api-system" class="form-label"><?= _("Enable API access") ?></label>
 							<select class="form-select" name="v_api_system" id="api-system">
@@ -663,9 +663,9 @@
 									?></textarea>
 							</div>
 						</div>
-						<p class="u-pt18" style="font-size:1rem;padding-bottom:12px;">
+						<h3 class="u-mt20 u-mb10">
 							<?= _("Login") ?>
-						</p>
+						</h3>
 						<div class="u-mb10">
 							<label for="v_login_style" class="form-label"><?= _("Login screen style") ?></label>
 							<select class="form-select" name="v_login_style" id="v_login_style">
@@ -696,17 +696,17 @@
 						</div>
 					</div>
 					<?php if (($_SESSION['userContext'] === "admin") && ($_SESSION['user'] === 'admin')) {?>
-						<h3 x-on:click="showProtectionOptions = !showProtectionOptions" class="section-title">
+						<h2 x-on:click="showProtectionOptions = !showProtectionOptions" class="section-title">
 							<?= _("System Protection") ?>
 							<i
 								x-bind:class="showProtectionOptions ? 'fa-square-minus' : 'fa-square-plus'"
 								class="fas status-icon dim maroon js-section-toggle-icon"
 							></i>
-						</h3>
+						</h2>
 						<div x-cloak x-show="showProtectionOptions" id="security-sysadminprotect-table">
-							<p class="u-pt18" style="font-size:1rem;padding-bottom:12px;">
+							<h3 class="u-mt20 u-mb10">
 								<?= _("System Administrator account") ?>
-							</p>
+							</h3>
 							<div class="u-mb10">
 								<label for="v_policy_system_protected_admin" class="form-label"><?= _("Restrict access to read-only for other administrators") ?></label>
 								<select class="form-select" name="v_policy_system_protected_admin" id="v_policy_system_protected_admin">
@@ -730,18 +730,18 @@
 							</div>
 						</div>
 					<?php } ?>
-					<h3 x-on:click="showPolicyOptions = !showPolicyOptions" class="section-title">
+					<h2 x-on:click="showPolicyOptions = !showPolicyOptions" class="section-title">
 						<?= _("Policies") ?>
 						<i
 							x-bind:class="showPolicyOptions ? 'fa-square-minus' : 'fa-square-plus'"
 							class="fas status-icon dim maroon js-section-toggle-icon"
 						></i>
-					</h3>
+					</h2>
 					<div x-cloak x-show="showPolicyOptions" id="security-policies-table">
-						<p class="u-pt18" style="font-size:1rem;padding-bottom:12px;">
+						<h3 class="u-mt20 u-mb10">
 							<?= _("Users") ?>
-						</p>
-						<?php if ($_SESSION['POLICY_SYSTEM_ENABLE_BACON'] === 'true') { ?>
+						</h3>
+						<?php if ($_SESSION["POLICY_SYSTEM_ENABLE_BACON"] === "true") { ?>
 							<div class="u-mb10">
 								<label for="v_policy_user_view_suspended" class="form-label">
 									<?= _("Allow suspended users to log in with read-only access") ?> <span class="hint">(<?= _("Preview") ?>)</span>
@@ -787,9 +787,9 @@
 								<option value="no" <?php if($_SESSION['POLICY_USER_DELETE_LOGS'] == 'no') echo 'selected' ?>><?= _("No") ?></option>
 							</select>
 						</div>
-						<p class="u-pt18" style="font-size:1rem;padding-bottom:12px;">
+						<h3 class="u-mt20 u-mb10">
 							<?= _("Domains") ?>
-						</p>
+						</h3>
 						<div class="u-mb10">
 							<label for="v_enforce_subdomain_ownership" class="form-label"><?= _("Enforce subdomain ownership") ?></label>
 							<select class="form-select" name="v_enforce_subdomain_ownership" id="v_enforce_subdomain_ownership">

web/templates/pages/edit_server_mysql.php

@@ -18,12 +18,12 @@
 <div class="container animate__animated animate__fadeIn">
 
 	<form id="vstobjects" name="v_configure_server" method="post">
-		<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 		<input type="hidden" name="save" value="save">
 
 		<div class="form-container">
-			<h1 class="form-title"><?= _("Configuring Server") ?>: <?=$v_service_name;?></h1>
-			<?php show_alert_message($_SESSION);?>
+			<h1 class="form-title"><?= _("Configuring Server") ?>: <?= $v_service_name ?></h1>
+			<?php show_alert_message($_SESSION); ?>
 			<div id="basic-options">
 				<div class="u-mb10">
 					<label for="v_max_connections" class="form-label">max_connections</label>
@@ -35,7 +35,7 @@
 				</div>
 				<div class="u-mb10">
 					<label for="v_wait_timeout" class="form-label">wait_timeout</label>
-					<input type="text" class="form-control" regexp="wait_timeout" prev_value="<?=htmlentities($v_wait_timeout)?>" name="v_wait_timeout" id="v_wait_timeout" value="<?=htmlentities($v_wait_timeout)?>">
+					<input type="text" class="form-control" regexp="wait_timeout" prev_value="<?= htmlentities($v_wait_timeout) ?>" name="v_wait_timeout" id="v_wait_timeout" value="<?= htmlentities($v_wait_timeout) ?>">
 				</div>
 				<div class="u-mb10">
 					<label for="v_interactive_timeout" class="form-label">interactive_timeout</label>
@@ -54,8 +54,8 @@
 					<a href="javascript:toggleOptions();" class="button button-secondary"><?= _("Basic options") ?></a>
 				</div>
 				<div class="u-mb20">
-					<label for="v_config" class="form-label"><?=$v_config_path;?></label>
-					<textarea class="form-control u-min-height600 u-allow-resize u-console" name="v_config" id="v_config"><?=$v_config;?></textarea>
+					<label for="v_config" class="form-label"><?= $v_config_path ?></label>
+					<textarea class="form-control u-min-height600 u-allow-resize u-console" name="v_config" id="v_config"><?= $v_config ?></textarea>
 				</div>
 				<div class="form-check">
 					<input class="form-check-input" type="checkbox" name="v_restart" id="v_restart" checked>

web/templates/pages/edit_server_nginx.php

@@ -21,12 +21,12 @@
 <div class="container animate__animated animate__fadeIn">
 
 	<form id="vstobjects" name="v_configure_server" method="post">
-		<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 		<input type="hidden" name="save" value="save">
 
 		<div class="form-container">
-			<h1 class="form-title"><?= _("Configuring Server") ?>: <?=$v_service_name;?></h1>
-			<?php show_alert_message($_SESSION);?>
+			<h1 class="form-title"><?= _("Configuring Server") ?>: <?= $v_service_name ?></h1>
+			<?php show_alert_message($_SESSION); ?>
 			<div id="basic-options">
 				<div class="u-mb10">
 					<label for="v_worker_processes" class="form-label">worker_processes</label>
@@ -58,7 +58,7 @@
 				</div>
 				<div class="u-mb10">
 					<label for="v_gzip" class="form-label">gzip</label>
-					<input type="text" class="form-control" regexp="gzip" prev_value="<?=htmlentities($v_gzip)?>" name="v_gzip" id="v_gzip" value="<?=htmlentities($v_gzip)?>">
+					<input type="text" class="form-control" regexp="gzip" prev_value="<?= htmlentities($v_gzip) ?>" name="v_gzip" id="v_gzip" value="<?= htmlentities($v_gzip) ?>">
 				</div>
 				<div class="u-mb10">
 					<label for="v_gzip_comp_level" class="form-label">gzip_comp_level</label>
@@ -66,7 +66,7 @@
 				</div>
 				<div class="u-mb20">
 					<label for="v_charset" class="form-label">charset</label>
-					<input type="text" class="form-control" regexp="charset" prev_value="<?=htmlentities($v_charset)?>" name="v_charset" id="v_charset" value="<?=htmlentities($v_charset)?>">
+					<input type="text" class="form-control" regexp="charset" prev_value="<?= htmlentities($v_charset) ?>" name="v_charset" id="v_charset" value="<?= htmlentities($v_charset) ?>">
 				</div>
 				<div class="u-mb20">
 					<a href="javascript:toggleOptions();" class="button button-secondary"><?= _("Advanced options") ?></a>
@@ -77,8 +77,8 @@
 					<a href="javascript:toggleOptions();" class="button button-secondary"><?= _("Basic options") ?></a>
 				</div>
 				<div class="u-mb20">
-					<label for="v_config" class="form-label"><?=$v_config_path;?></label>
-					<textarea class="form-control u-min-height600 u-allow-resize u-console" name="v_config" id="v_config"><?=$v_config;?></textarea>
+					<label for="v_config" class="form-label"><?= $v_config_path ?></label>
+					<textarea class="form-control u-min-height600 u-allow-resize u-console" name="v_config" id="v_config"><?= $v_config ?></textarea>
 				</div>
 				<div class="form-check">
 					<input class="form-check-input" type="checkbox" name="v_restart" id="v_restart" checked>

web/templates/pages/edit_server_php.php

@@ -18,12 +18,12 @@
 <div class="container animate__animated animate__fadeIn">
 
 	<form id="vstobjects" name="v_configure_server" method="post">
-		<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 		<input type="hidden" name="save" value="save">
 
 		<div class="form-container">
 			<h1 class="form-title"><?= _("Configuring Server") ?>: PHP</h1>
-			<?php show_alert_message($_SESSION);?>
+			<?php show_alert_message($_SESSION); ?>
 			<div id="basic-options">
 				<div class="u-mb10">
 					<label for="v_max_execution_time" class="form-label">max_execution_time</label>
@@ -35,7 +35,7 @@
 				</div>
 				<div class="u-mb10">
 					<label for="v_memory_limit" class="form-label">memory_limit</label>
-					<input type="text" class="form-control" regexp="memory_limit" prev_value="<?=htmlentities($v_memory_limit)?>" name="v_memory_limit" id="v_memory_limit" value="<?=htmlentities($v_memory_limit)?>">
+					<input type="text" class="form-control" regexp="memory_limit" prev_value="<?= htmlentities($v_memory_limit) ?>" name="v_memory_limit" id="v_memory_limit" value="<?= htmlentities($v_memory_limit) ?>">
 				</div>
 				<div class="u-mb10">
 					<label for="v_error_reporting" class="form-label">error_reporting</label>
@@ -62,8 +62,8 @@
 					<a href="javascript:toggleOptions();" class="button button-secondary"><?= _("Basic options") ?></a>
 				</div>
 				<div class="u-mb20">
-					<label for="v_config" class="form-label"><?=$v_config_path;?></label>
-					<textarea class="form-control u-min-height600 u-allow-resize u-console" name="v_config" id="v_config"><?=$v_config;?></textarea>
+					<label for="v_config" class="form-label"><?= $v_config_path ?></label>
+					<textarea class="form-control u-min-height600 u-allow-resize u-console" name="v_config" id="v_config"><?= $v_config ?></textarea>
 				</div>
 				<div class="form-check">
 					<input class="form-check-input" type="checkbox" name="v_restart" id="v_restart" checked>

web/templates/pages/edit_user.php

@@ -19,8 +19,8 @@
 			<a href="<?=$ssh_key_url; ?>" class="button button-secondary" id="btn-create" title="<?= _("Manage SSH keys") ?>">
 				<i class="fas fa-key status-icon orange"></i><?= _("Manage SSH keys") ?>
 			</a>
-			<?php if (($_SESSION['userContext'] == 'admin') || ($_SESSION['userContext'] !== 'admin') && ($_SESSION['POLICY_USER_VIEW_LOGS'] !== 'no')) {?>
-				<a href="<?=$log_url; ?>" class="button button-secondary" id="btn-create" title="<?= _("Logs") ?>">
+			<?php if ($_SESSION["userContext"] == "admin" || ($_SESSION["userContext"] !== "admin" && $_SESSION["POLICY_USER_VIEW_LOGS"] !== "no")) { ?>
+				<a href="<?= $log_url ?>" class="button button-secondary" id="btn-create" title="<?= _("Logs") ?>">
 					<i class="fas fa-clock-rotate-left status-icon maroon"></i><?= _("Logs") ?>
 				</a>
 			<?php } ?>
@@ -33,18 +33,18 @@
 			<?php } ?>
 		</div>
 		<div class="toolbar-buttons">
-			<?php if (($_SESSION['user'] == $v_username) || (isset($_SESSION['look']))) {?>
+			<?php if ($_SESSION["user"] == $v_username || isset($_SESSION["look"])) { ?>
 				<!-- Do not show delete button for currently logged in user-->
 			<?} else {?>
-				<a href="/login/?loginas=<?=htmlentities($v_username)?>&token=<?=$_SESSION['token']?>" class="button button-secondary" id="btn-create" title="<?= _("login as") ?>">
+				<a href="/login/?loginas=<?= htmlentities($v_username) ?>&token=<?= $_SESSION["token"] ?>" class="button button-secondary" id="btn-create" title="<?= _("login as") ?>">
 					<i class="fas fa-right-to-bracket status-icon maroon"></i><?= _("login as") ?>
 				</a>
 				<a class="data-controls do_delete button button-secondary button-danger">
 					<i class="do_delete fas fa-circle-xmark status-icon red"></i>
 					<?= _("Delete") ?>
-					<input type="hidden" name="delete_url" value="/delete/user/?user=<?=htmlentities($v_username)?>&token=<?=$_SESSION['token']?>">
+					<input type="hidden" name="delete_url" value="/delete/user/?user=<?= htmlentities($v_username) ?>&token=<?= $_SESSION["token"] ?>">
 					<div class="dialog js-confirm-dialog-delete" title="<?= _("Confirmation") ?>">
-						<p><?=sprintf(_('DELETE_USER_CONFIRMATION'),htmlentities($v_username))?></p>
+						<p><?= sprintf(_("DELETE_USER_CONFIRMATION"), htmlentities($v_username)) ?></p>
 					</div>
 				</a>
 			<?php } ?>
@@ -60,25 +60,25 @@
 
 	<form
 		x-data="{
-			loginDisabled: <?= $v_login_disabled === "yes" ? 'true' : 'false' ?>,
-			useIpAllowList: <?= $v_login_use_iplist === "yes" ? 'true' : 'false' ?>,
+			loginDisabled: <?= $v_login_disabled === "yes" ? "true" : "false" ?>,
+			useIpAllowList: <?= $v_login_use_iplist === "yes" ? "true" : "false" ?>,
 			showAdvanced: false,
 		}"
 		id="vstobjects"
 		method="post"
 		name="v_edit_user"
-		class="<?=$v_status?>"
+		class="<?= $v_status ?>"
 	>
-		<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 		<input type="hidden" name="save" value="save">
 
 		<div class="form-container">
 			<h1 class="form-title"><?= _("Editing User") ?></h1>
-			<?php show_alert_message($_SESSION);?>
+			<?php show_alert_message($_SESSION); ?>
 			<div class="u-mb10">
 				<label for="v_user" class="form-label"><?= _("Username") ?></label>
-				<input type="text" class="form-control" name="v_user" id="v_user" value="<?=htmlentities(trim($v_username, "'"))?>" disabled>
-				<input type="hidden" name="v_username" value="<?=htmlentities(trim($v_username, "'"))?>">
+				<input type="text" class="form-control" name="v_user" id="v_user" value="<?= htmlentities(trim($v_username, "'")) ?>" disabled>
+				<input type="hidden" name="v_username" value="<?= htmlentities(trim($v_username, "'")) ?>">
 			</div>
 			<div class="u-mb10">
 				<label for="v_name" class="form-label"><?= _("Contact") ?></label>
@@ -100,7 +100,7 @@
 					<a href="javascript:applyRandomString();" title="<?= _("generate") ?>" class="u-ml5"><i class="fas fa-arrows-rotate status-icon green icon-large"></i></a>
 				</label>
 				<div class="u-pos-relative u-mb10">
-					<input type="text" class="form-control js-password-input" name="v_password" id="v_password" value="<?=htmlentities(trim($v_password, "'"))?>">
+					<input type="text" class="form-control js-password-input" name="v_password" id="v_password" value="<?= htmlentities(trim($v_password, "'")) ?>">
 					<meter max="4" class="password-meter"></meter>
 				</div>
 			</div>
@@ -111,7 +111,7 @@
 					<li><?= _("1 uppercase & 1 lowercase character") ?></li>
 					<li><?= _("1 number") ?></li>
 				</ul>
-				<?php if ($_SESSION['userContext'] === 'admin') {?>
+				<?php if ($_SESSION["userContext"] === "admin") { ?>
 					<div class="form-check">
 						<input x-model="loginDisabled" class="form-check-input" type="checkbox" name="v_login_disabled" id="v_login_disabled">
 						<label for="v_login_disabled">
@@ -127,9 +127,9 @@
 						</label>
 					</div>
 					<?php if (!empty($v_twofa)) { ?>
-						<p class="u-mb10"><?= _("2FA Reset Code:") . ' '.$v_twofa; ?></p>
+						<p class="u-mb10"><?= _("2FA Reset Code:") . " " . $v_twofa ?></p>
 						<p class="u-mb10"><?= _("Please scan the code below in your 2FA application:") ?></p>
-						<div><img class="qr-code" src="<?=htmlentities($v_qrcode); ?>" alt=""></div>
+						<div><img class="qr-code" src="<?= htmlentities($v_qrcode) ?>" alt=""></div>
 					<?php } ?>
 				</div>
 				<div x-cloak x-show="loginDisabled" id="password-options-ip">
@@ -141,7 +141,7 @@
 					</div>
 				</div>
 				<div x-cloak x-show="useIpAllowList" id="ip-allowlist" class="u-mt10">
-					<input type="text" class="form-control" name="v_login_allowed_ips" value="<?=htmlentities(trim($v_login_allowed_ips, "'"))?>" placeholder="<?= _("Example: 127.0.0.1,192.168.1.100") ?>">
+					<input type="text" class="form-control" name="v_login_allowed_ips" value="<?= htmlentities(trim($v_login_allowed_ips, "'")) ?>" placeholder="<?= _("Example: 127.0.0.1,192.168.1.100") ?>">
 				</div>
 			</div>
 			<div class="u-mb10">
@@ -162,10 +162,10 @@
 					?>
 				</select>
 			</div>
-			<?php if ($v_username == 'admin') {?>
+			<?php if ($v_username == "admin") { ?>
 				<!-- Hide option to change 'admin' user's role-->
 			<?php } else { ?>
-				<?php if (($_SESSION['userContext'] === 'admin') && ($_SESSION['user'] != $v_username)) {?>
+				<?php if ($_SESSION["userContext"] === "admin" && $_SESSION["user"] != $v_username) { ?>
 					<div class="u-mb10">
 						<label for="v_role" class="form-label"><?= _("Role") ?></label>
 						<select class="form-select" name="v_role" id="v_role">
@@ -176,7 +176,7 @@
 					</div>
 				<?php } ?>
 			<?php } ?>
-			<?php if ($_SESSION['POLICY_USER_CHANGE_THEME'] !== 'no') {?>
+			<?php if ($_SESSION["POLICY_USER_CHANGE_THEME"] !== "no") { ?>
 			<div class="u-mb10">
 				<label for="v_user_theme" class="form-label"><?= _("Theme") ?></label>
 				<select class="form-select" name="v_user_theme" id="v_user_theme">

web/templates/pages/edit_web.php

@@ -10,8 +10,8 @@
 			<a href="/delete/web/cache/?domain=<?=htmlentities($v_domain);?>&token=<?=$_SESSION['token'];?>" class="button button-secondary <?php if ( $v_nginx_cache == 'yes' || (($v_proxy_template == 'caching' || is_int(strpos($v_proxy_template, 'caching-'))) && $_SESSION['PROXY_SYSTEM'] == 'nginx')) { echo "block"; } else{ echo "u-hidden"; }?>" id="v-clear-cache">
 				<i class="fas fa-trash status-icon red"></i><?= _("Purge Nginx Cache") ?>
 			</a>
-			<?php if ($_SESSION['PLUGIN_APP_INSTALLER'] !== 'false') {?>
-				<a href="/add/webapp/?domain=<?=htmlentities($v_domain);?>" class="button button-secondary">
+			<?php if ($_SESSION["PLUGIN_APP_INSTALLER"] !== "false") { ?>
+				<a href="/add/webapp/?domain=<?= htmlentities($v_domain) ?>" class="button button-secondary">
 					<i class="fas fa-magic status-icon blue"></i> <?= _("Quick Install App") ?>
 				</a>
 			<?php } ?>
@@ -27,39 +27,39 @@
 
 	<form
 		x-data="{
-			statsAuthEnabled: <?= !empty($v_stats_user) ? 'true' : 'false' ?>,
-			redirectEnabled: <?= !empty($v_redirect) ? 'true' : 'false' ?>,
-			sslEnabled: <?= $v_ssl == 'yes' ? 'true' : 'false' ?>,
-			letsEncryptEnabled: <?= $v_letsencrypt == 'yes' || $v_letsencrypt == 'on' ? 'true' : 'false' ?>,
-			showCertificates: <?= $v_letsencrypt == 'yes' || $v_letsencrypt == 'on' ? 'false' : 'true' ?>,
+			statsAuthEnabled: <?= !empty($v_stats_user) ? "true" : "false" ?>,
+			redirectEnabled: <?= !empty($v_redirect) ? "true" : "false" ?>,
+			sslEnabled: <?= $v_ssl == "yes" ? "true" : "false" ?>,
+			letsEncryptEnabled: <?= $v_letsencrypt == "yes" || $v_letsencrypt == "on" ? "true" : "false" ?>,
+			showCertificates: <?= $v_letsencrypt == "yes" || $v_letsencrypt == "on" ? "false" : "true" ?>,
 			showAdvanced: false,
-			nginxCacheEnabled: <?= $v_nginx_cache == 'yes' ? 'true' : 'false' ?>,
-			proxySupportEnabled: <?= !empty($v_proxy) ? 'true' : 'false' ?>,
-			customDocumentRootEnabled: <?= !empty($v_custom_doc_root) ? 'true' : 'false' ?>
+			nginxCacheEnabled: <?= $v_nginx_cache == "yes" ? "true" : "false" ?>,
+			proxySupportEnabled: <?= !empty($v_proxy) ? "true" : "false" ?>,
+			customDocumentRootEnabled: <?= !empty($v_custom_doc_root) ? "true" : "false" ?>
 		}"
 		id="vstobjects"
 		name="v_edit_web"
 		method="post"
-		class="<?=$v_status?>"
+		class="<?= $v_status ?>"
 	>
-		<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 		<input type="hidden" name="save" value="save">
 
 		<div class="form-container">
 			<h1 class="form-title"><?= _("Editing Domain") ?></h1>
-			<?php show_alert_message($_SESSION);?>
+			<?php show_alert_message($_SESSION); ?>
 			<div class="u-mb10">
 				<label for="v_domain" class="form-label"><?= _("Domain") ?></label>
-				<input type="text" class="form-control" name="v_domain" id="v_domain" value="<?=htmlentities(trim($v_domain, "'"))?>" disabled>
-				<input type="hidden" name="v_domain" value="<?=htmlentities(trim($v_domain, "'"))?>">
+				<input type="text" class="form-control" name="v_domain" id="v_domain" value="<?= htmlentities(trim($v_domain, "'")) ?>" disabled>
+				<input type="hidden" name="v_domain" value="<?= htmlentities(trim($v_domain, "'")) ?>">
 			</div>
 			<div class="u-mb10">
 				<label for="v_aliases" class="form-label"><?= _("Aliases") ?></label>
-				<textarea class="form-control" name="v_aliases" id="v_aliases"><?=htmlentities(trim($v_aliases, "'"))?></textarea>
+				<textarea class="form-control" name="v_aliases" id="v_aliases"><?= htmlentities(trim($v_aliases, "'")) ?></textarea>
 			</div>
-			<?php if ($v_letsencrypt == 'yes' || $v_letsencrypt == 'on') {?>
+			<?php if ($v_letsencrypt == "yes" || $v_letsencrypt == "on") { ?>
 				<div class="u-mb10">
-					<div class="alert alert-info alert-with-icon" role="alert">
+					<div class="alert alert-info" role="alert">
 						<i class="fas fa-exclamation"></i>
 						<p><?= _("Lets Encrypt will obtain a new SSL certificate if web domain aliases are changed.") ?></p>
 					</div>
@@ -191,77 +191,57 @@
 					<div class="u-mb10">
 						<label for="ssl_crt" class="form-label">
 							<?= _("SSL Certificate") ?>
-							<span id="generate-csr"> / <a class="generate" target="_blank" href="/generate/ssl/?domain=<?=htmlentities($v_domain)?>"><?= _("Generate CSR") ?></a></span>
+							<span id="generate-csr"> / <a class="generate" target="_blank" href="/generate/ssl/?domain=<?= htmlentities($v_domain) ?>"><?= _("Generate CSR") ?></a></span>
 						</label>
-						<textarea class="form-control u-min-height100 u-console" name="v_ssl_crt" id="ssl_crt"><?=htmlentities(trim($v_ssl_crt, "'"))?></textarea>
+						<textarea class="form-control u-min-height100 u-console" name="v_ssl_crt" id="ssl_crt"><?= htmlentities(trim($v_ssl_crt, "'")) ?></textarea>
 					</div>
 					<div class="u-mb10">
 						<label for="v_ssl_key" class="form-label"><?= _("SSL Key") ?></label>
-						<textarea class="form-control u-min-height100 u-console" name="v_ssl_key" id="v_ssl_key"><?=htmlentities(trim($v_ssl_key, "'"))?></textarea>
+						<textarea class="form-control u-min-height100 u-console" name="v_ssl_key" id="v_ssl_key"><?= htmlentities(trim($v_ssl_key, "'")) ?></textarea>
 					</div>
 					<div class="u-mb20">
 						<label for="v_ssl_ca" class="form-label">
 							<?= _("SSL Certificate Authority / Intermediate") ?> <span class="optional">(<?= _("optional") ?>)</span>
 						</label>
-						<textarea class="form-control u-min-height100 u-console" name="v_ssl_ca" id="v_ssl_ca"><?=htmlentities(trim($v_ssl_ca, "'"))?></textarea>
+						<textarea class="form-control u-min-height100 u-console" name="v_ssl_ca" id="v_ssl_ca"><?= htmlentities(trim($v_ssl_ca, "'")) ?></textarea>
 					</div>
 				</div>
-				<?php if ($v_ssl != 'no') { ?>
+				<?php if ($v_ssl != "no") { ?>
 					<ul class="values-list">
 						<li class="values-list-item">
 							<span class="values-list-label"><?= _("SUBJECT") ?></span>
-							<span class="values-list-value"><?=$v_ssl_subject?></span>
+							<span class="values-list-value"><?= $v_ssl_subject ?></span>
 						</li>
-						<?php if ($v_ssl_aliases) {?>
+						<?php if ($v_ssl_aliases) { ?>
 							<li class="values-list-item">
 								<span class="values-list-label"><?= _("ALIASES") ?></span>
-								<span class="values-list-value"><?=$v_ssl_aliases?></span>
+								<span class="values-list-value"><?= $v_ssl_aliases ?></span>
 							</li>
 						<?php } ?>
-						<tr>
-							<td>
-								<b><?= _("NOT_BEFORE") ?>:</b>
-							</td>
-							<td class="details">
-								<?=$v_ssl_not_before?>
-							</td>
-						</tr>
-						<tr>
-							<td>
-								<b><?= _("NOT_AFTER") ?>:</b>
-							</td>
-							<td class="details">
-								<?=$v_ssl_not_after?>
-							</td>
-						</tr>
-						<tr>
-							<td>
-								<b><?= _("SIGNATURE") ?>:</b>
-							</td>
-							<td class="details">
-								<?=$v_ssl_signature?>
-							</td>
-						</tr>
-						<tr>
-							<td>
-								<b><?= _("PUB_KEY") ?>:</b>
-							</td>
-							<td class="details">
-								<?=$v_ssl_pub_key?>
-							</td>
-						</tr>
-						<tr>
-							<td>
-								<b><?= _("ISSUER") ?>:</b>
-							</td>
-							<td class="details">
-								<?=$v_ssl_issuer?>
-							</td>
-						</tr>
-						<tr x-cloak x-show="letsEncryptEnabled" id="letsinfo">
-							<td><a x-on:click="showCertificates = !showCertificates" href="#" class="generate"><?= _("Show Certificate") ?></a></td>
-						</tr>
-					</table>
+						<li class="values-list-item">
+							<span class="values-list-label"><?= _("NOT_BEFORE") ?></span>
+							<span class="values-list-value"><?= $v_ssl_not_before ?></span>
+						</li>
+						<li class="values-list-item">
+							<span class="values-list-label"><?= _("NOT_AFTER") ?></span>
+							<span class="values-list-value"><?= $v_ssl_not_after ?></span>
+						</li>
+						<li class="values-list-item">
+							<span class="values-list-label"><?= _("SIGNATURE") ?></span>
+							<span class="values-list-value"><?= $v_ssl_signature ?></span>
+						</li>
+						<li class="values-list-item">
+							<span class="values-list-label"><?= _("PUB_KEY") ?></span>
+							<span class="values-list-value"><?= $v_ssl_pub_key ?></span>
+						</li>
+						<li class="values-list-item">
+							<span class="values-list-label"><?= _("ISSUER") ?></span>
+							<span class="values-list-value"><?= $v_ssl_issuer ?></span>
+						</li>
+						<p x-cloak x-show="letsEncryptEnabled" id="letsinfo">
+							<a x-on:click="showCertificates = !showCertificates" href="#" class="generate"><?= _("Show Certificate") ?></a>
+						</p>
+					</ul>
 				<?php } ?>
 			</div>
 			<div class="u-mt15 u-mb20">
@@ -371,25 +351,25 @@
 				<div x-cloak x-show="customDocumentRootEnabled" id="v_custom_doc_root" class="u-pl30">
 					<div class="u-mb10">
 						<label for="v-custom-doc-domain" class="form-label"><?= _("Point to") ?></label>
-						<input type="hidden" name="v-custom-doc-root_prepath" value="<?=$v_custom_doc_root_prepath;?>">
+						<input type="hidden" name="v-custom-doc-root_prepath" value="<?= $v_custom_doc_root_prepath ?>">
 						<select class="form-select" name="v-custom-doc-domain" id="v-custom-doc-domain">
 							<?php foreach ($user_domains as $domain): ?>
-							<option value="<?=htmlentities($domain);?>"
-								<?=($v_custom_doc_domain === $domain || (empty($v_custom_doc_domain) && $domain === $v_domain))?' selected="selected" ':''; ?>>
-								<?=htmlentities($domain);?>
+							<option value="<?= htmlentities($domain) ?>"
+								<?= $v_custom_doc_domain === $domain || (empty($v_custom_doc_domain) && $domain === $v_domain) ? ' selected="selected" ' : "" ?>>
+								<?= htmlentities($domain) ?>
 							</option>
 							<?php endforeach; ?>
 						</select>
 					</div>
 					<div class="u-mb10">
 						<label for="v-custom-doc-folder" class="form-label">
-							<?php print( _('Directory'));?> <span class="optional">(<?= _("optional") ?>)</span>
+							<?php print _("Directory"); ?> <span class="optional">(<?= _("optional") ?>)</span>
 						</label>
-						<input type="text" class="form-control" name="v-custom-doc-folder" id="v-custom-doc-folder" value="<?=htmlentities(trim($v_custom_doc_folder, "'"))?>">
+						<input type="text" class="form-control" name="v-custom-doc-folder" id="v-custom-doc-folder" value="<?= htmlentities(trim($v_custom_doc_folder, "'")) ?>">
 						<small class="custom_docroot_hint"></small>
 					</div>
 				</div>
-				<?php if (in_array($_SESSION['FTP_SYSTEM'], array('vsftpd', 'proftpd'))) { ?>
+				<?php if (in_array($_SESSION["FTP_SYSTEM"], ["vsftpd", "proftpd"])) { ?>
 					<div class="form-check u-mb10">
 						<input class="form-check-input" type="checkbox" name="v_ftp" id="v_ftp" <?php if (!empty($v_ftp_user)) echo 'checked' ?> onclick="App.Actions.WEB.toggle_additional_ftp_accounts(this)">
 						<label for="v_ftp">

web/templates/pages/list_access_keys.php

@@ -40,10 +40,10 @@
 					<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" title="<?= _("Select all") ?>">
 				</div>
 				<div class="clearfix l-unit__stat-col--left wide-6"><b><?= _("Access Key") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left compact text-right"><b>&nbsp;</b></div>
-				<div class="clearfix l-unit__stat-col--left text-center wide-2"><b><?= _("Comment") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("Date") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("Time") ?></b></div>
+				<div class="clearfix l-unit__stat-col--left compact u-text-right"><b>&nbsp;</b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center wide-2"><b><?= _("Comment") ?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Date") ?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Time") ?></b></div>
 			</div>
 		</div>
 	</div>
@@ -73,7 +73,7 @@
 				</div>
 
 				<!-- START QUICK ACTION TOOLBAR AREA -->
-				<div class="clearfix l-unit__stat-col--left compact text-right">
+				<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__delete shortcut-delete" key-action="js">
@@ -89,9 +89,9 @@
 					</div>
 				</div>
 				<!-- END QUICK ACTION TOOLBAR AREA -->
-				<div class="clearfix l-unit__stat-col--left text-center wide-2"><b><?= _($key_comment) ?></b></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><b><?= $key_date ?></b></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><b><?= $key_time ?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center wide-2"><b><?= _($key_comment) ?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= $key_date ?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= $key_time ?></b></div>
 			</div>
 		</div>
 	<?php } ?>

web/templates/pages/list_backup.php

@@ -42,11 +42,11 @@
 					<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" title="<?= _("Select all") ?>" <?=$display_mode;?>>
 				</div>
 				<div class="clearfix l-unit__stat-col--left wide-4"><b><?= _("File Name") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left compact-4 text-right"><b>&nbsp;</b></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("Date") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("Size") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("Type") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("Runtime") ?></b></div>
+				<div class="clearfix l-unit__stat-col--left compact-4 u-text-right"><b>&nbsp;</b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Date") ?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Size") ?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Type") ?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Runtime") ?></b></div>
 			</div>
 		</div>
 	</div>
@@ -85,7 +85,7 @@
 						</b>
 					</div>
 					<!-- START QUICK ACTION TOOLBAR AREA -->
-					<div class="clearfix l-unit__stat-col--left compact-4 text-right">
+					<div class="clearfix l-unit__stat-col--left compact-4 u-text-right">
 						<div class="l-unit-toolbar__col l-unit-toolbar__col--right u-noselect">
 							<div class="actions-panel clearfix">
 								<?php if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($read_only === 'true')) {?>
@@ -110,10 +110,10 @@
 						</div>
 					</div>
 					<!-- END QUICK ACTION TOOLBAR AREA -->
-					<div class="clearfix l-unit__stat-col--left text-center"><b><?= translate_date($data[$key]["DATE"]) ?></b></div>
-					<div class="clearfix l-unit__stat-col--left text-center"><b><?= humanize_usage_size($data[$key]["SIZE"]) ?></b> <span class="u-text-small"><?= humanize_usage_measure($data[$key]["SIZE"]) ?></span></div>
-					<div class="clearfix l-unit__stat-col--left text-center"><?= $data[$key]["TYPE"] ?></div>
-					<div class="clearfix l-unit__stat-col--left text-center"><?= humanize_time($data[$key]["RUNTIME"]) ?></div>
+					<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= translate_date($data[$key]["DATE"]) ?></b></div>
+					<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= humanize_usage_size($data[$key]["SIZE"]) ?></b> <span class="u-text-small"><?= humanize_usage_measure($data[$key]["SIZE"]) ?></span></div>
+					<div class="clearfix l-unit__stat-col--left u-text-center"><?= $data[$key]["TYPE"] ?></div>
+					<div class="clearfix l-unit__stat-col--left u-text-center"><?= humanize_time($data[$key]["RUNTIME"]) ?></div>
 				</div>
 			</div>
 		</div>

web/templates/pages/list_backup_detail.php

@@ -38,7 +38,7 @@
 				</div>
 				<div class="clearfix l-unit__stat-col--left compact-4"><b><?= _("Type") ?></b></div>
 				<div class="clearfix l-unit__stat-col--left wide-7"><b><?= _("Details") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left text-right compact-4"><b><?= _("Restore") ?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-right compact-4"><b><?= _("Restore") ?></b></div>
 			</div>
 		</div>
 	</div>
@@ -62,7 +62,7 @@
 				<div class="clearfix l-unit__stat-col--left wide-7">
 					<div class="l-unit__stat-col l-unit__stat-col--left wide-7"><b><?=$key?></b></div>
 				</div>
-				<div class="clearfix l-unit__stat-col--left compact-4 text-right">
+				<div class="clearfix l-unit__stat-col--left compact-4 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__list shortcut-enter" key-action="href">
@@ -94,7 +94,7 @@
 				<div class="clearfix l-unit__stat-col--left wide-7">
 					<div class="l-unit__stat-col l-unit__stat-col--left wide-7"><b><?=$key?></b></div>
 				</div>
-				<div class="clearfix l-unit__stat-col--left compact-4 text-right">
+				<div class="clearfix l-unit__stat-col--left compact-4 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__list shortcut-enter" key-action="href">
@@ -126,7 +126,7 @@
 				<div class="clearfix l-unit__stat-col--left wide-7">
 					<div class="l-unit__stat-col l-unit__stat-col--left wide-7"><b><?=$key?></b></div>
 				</div>
-				<div class="clearfix l-unit__stat-col--left compact-4 text-right">
+				<div class="clearfix l-unit__stat-col--left compact-4 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__list shortcut-enter" key-action="href">
@@ -158,7 +158,7 @@
 				<div class="clearfix l-unit__stat-col--left wide-7">
 					<div class="l-unit__stat-col l-unit__stat-col--left wide-7"><b><?=$key?></b></div>
 				</div>
-				<div class="clearfix l-unit__stat-col--left compact-4 text-right">
+				<div class="clearfix l-unit__stat-col--left compact-4 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__list shortcut-enter" key-action="href">
@@ -187,7 +187,7 @@
 				<div class="clearfix l-unit__stat-col--left wide-7">
 					<div class="l-unit__stat-col l-unit__stat-col--left wide-7"><b><?= "cron " . _("records") ?></b></div>
 				</div>
-				<div class="clearfix l-unit__stat-col--left compact-4 text-right">
+				<div class="clearfix l-unit__stat-col--left compact-4 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__list shortcut-enter" key-action="href">
@@ -219,7 +219,7 @@
 				<div class="clearfix l-unit__stat-col--left wide-7">
 					<div class="l-unit__stat-col l-unit__stat-col--left wide-7"><b><?=$key?></b></div>
 				</div>
-				<div class="clearfix l-unit__stat-col--left compact-4 text-right">
+				<div class="clearfix l-unit__stat-col--left compact-4 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__list shortcut-enter" key-action="href">

web/templates/pages/list_backup_exclusions.php

@@ -25,7 +25,7 @@
 		<div class="l-unit__col l-unit__col--right">
 			<div class="clearfix l-unit__stat-col--left super-compact">&nbsp;</div>
 			<div class="clearfix l-unit__stat-col--left wide-1"><b><?= _("Type") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left compact text-right"><b>&nbsp;</b></div>
+			<div class="clearfix l-unit__stat-col--left compact u-text-right"><b>&nbsp;</b></div>
 			<div class="clearfix l-unit__stat-col--left wide-3"><b><?= _("Value") ?></b></div>
 		</div>
 	</div>
@@ -37,7 +37,7 @@
 				<div class="l-unit__col l-unit__col--right">
 					<div class="clearfix l-unit__stat-col--left super-compact">&nbsp;</div>
 					<div class="clearfix l-unit__stat-col--left wide-1"><b><?= $key ?></b></div>
-					<div class="clearfix l-unit__stat-col--left compact text-right"><b>&nbsp;</b></div>
+					<div class="clearfix l-unit__stat-col--left compact u-text-right"><b>&nbsp;</b></div>
 					<div class="clearfix l-unit__stat-col--left wide-3">
 						<?php
 							if (empty($value)) echo _('no exclusions');

web/templates/pages/list_cron.php

@@ -62,12 +62,12 @@
 				<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" title="<?= _("Select all") ?>" <?=$display_mode;?>>
 			</div>
 			<div class="clearfix l-unit__stat-col--left wide-5"><b><?= _("Command") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left compact-2 text-right"><b>&nbsp;</b></div>
-			<div class="clearfix l-unit__stat-col--left compact-3 text-center"><b><?= _("Min") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left compact-3 text-center"><b><?= _("Hour") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left compact-3 text-center"><b><?= _("Day") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left compact-3 text-center"><b><?= _("Month") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left compact-3 text-center"><b><?= _("Day of week") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left compact-2 u-text-right"><b>&nbsp;</b></div>
+			<div class="clearfix l-unit__stat-col--left compact-3 u-text-center"><b><?= _("Min") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left compact-3 u-text-center"><b><?= _("Hour") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left compact-3 u-text-center"><b><?= _("Day") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left compact-3 u-text-center"><b><?= _("Month") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left compact-3 u-text-center"><b><?= _("Day of week") ?></b></div>
 		</div>
 	</div>
 
@@ -101,7 +101,7 @@
 					<?php } ?>
 				</div>
 				<!-- START QUICK ACTION TOOLBAR AREA -->
-				<div class="clearfix l-unit__stat-col--left compact-2 text-right">
+				<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">
 							<?php if ($read_only === 'true') {?>
@@ -134,11 +134,11 @@
 					</div>
 				</div>
 				<!-- END QUICK ACTION TOOLBAR AREA -->
-				<div class="clearfix l-unit__stat-col--left compact-3 text-center"><?= $data[$key]["MIN"] ?></div>
-				<div class="clearfix l-unit__stat-col--left compact-3 text-center"><?= $data[$key]["HOUR"] ?></div>
-				<div class="clearfix l-unit__stat-col--left compact-3 text-center"><?= $data[$key]["DAY"] ?></div>
-				<div class="clearfix l-unit__stat-col--left compact-3 text-center"><?= $data[$key]["MONTH"] ?></div>
-				<div class="clearfix l-unit__stat-col--left compact-3 text-center"><?= $data[$key]["WDAY"] ?></div>
+				<div class="clearfix l-unit__stat-col--left compact-3 u-text-center"><?= $data[$key]["MIN"] ?></div>
+				<div class="clearfix l-unit__stat-col--left compact-3 u-text-center"><?= $data[$key]["HOUR"] ?></div>
+				<div class="clearfix l-unit__stat-col--left compact-3 u-text-center"><?= $data[$key]["DAY"] ?></div>
+				<div class="clearfix l-unit__stat-col--left compact-3 u-text-center"><?= $data[$key]["MONTH"] ?></div>
+				<div class="clearfix l-unit__stat-col--left compact-3 u-text-center"><?= $data[$key]["WDAY"] ?></div>
 			</div>
 		</div>
 	<?php } ?>

web/templates/pages/list_db.php

@@ -92,12 +92,12 @@ if (!empty($_SESSION["DB_PGA_ALIAS"])) {
 				<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" title="<?= _("Select all") ?>" <?=$display_mode;?>>
 			</div>
 			<div class="clearfix l-unit__stat-col--left wide-3"><b><?= _("Name") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-right compact-3"><b>&nbsp;</b></div>
-			<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("Disk") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center compact"><b><?= _("Type") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center wide"><b><?= _("Username") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("Hostname") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("Charset") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-right compact-3"><b>&nbsp;</b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Disk") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center compact"><b><?= _("Type") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center wide"><b><?= _("Username") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Hostname") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Charset") ?></b></div>
 		</div>
 	</div>
 
@@ -141,7 +141,7 @@ if (!empty($_SESSION["DB_PGA_ALIAS"])) {
 						<?php } ?>
 					</div>
 					<!-- START QUICK ACTION TOOLBAR AREA -->
-					<div class="clearfix l-unit__stat-col--left text-right compact-3">
+					<div class="clearfix l-unit__stat-col--left u-text-right compact-3">
 						<div class="l-unit-toolbar__col l-unit-toolbar__col--right u-noselect">
 							<div class="actions-panel clearfix">
 								<?php if ($read_only === 'true') {?>
@@ -177,11 +177,11 @@ if (!empty($_SESSION["DB_PGA_ALIAS"])) {
 						</div>
 					</div>
 					<!-- END QUICK ACTION TOOLBAR AREA -->
-					<div class="clearfix l-unit__stat-col--left text-center"><b><?= humanize_usage_size($data[$key]["U_DISK"]) ?></b> <span class="u-text-small"><?= humanize_usage_measure($data[$key]["U_DISK"]) ?></span></div>
-					<div class="clearfix l-unit__stat-col--left text-center compact"><?= $data[$key]["TYPE"] ?></div>
-					<div class="clearfix l-unit__stat-col--left text-center wide"><b><?= $data[$key]["DBUSER"] ?></b></div>
-					<div class="clearfix l-unit__stat-col--left text-center"><b><?= $data[$key]["HOST"] ?></b></div>
-					<div class="clearfix l-unit__stat-col--left text-center"><?= $data[$key]["CHARSET"] ?></div>
+					<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= humanize_usage_size($data[$key]["U_DISK"]) ?></b> <span class="u-text-small"><?= humanize_usage_measure($data[$key]["U_DISK"]) ?></span></div>
+					<div class="clearfix l-unit__stat-col--left u-text-center compact"><?= $data[$key]["TYPE"] ?></div>
+					<div class="clearfix l-unit__stat-col--left u-text-center wide"><b><?= $data[$key]["DBUSER"] ?></b></div>
+					<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= $data[$key]["HOST"] ?></b></div>
+					<div class="clearfix l-unit__stat-col--left u-text-center"><?= $data[$key]["CHARSET"] ?></div>
 				</div>
 			</div>
 		</div>

web/templates/pages/list_dns.php

@@ -61,13 +61,13 @@
 				<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" title="<?= _("Select all") ?>" <?=$display_mode;?>>
 			</div>
 			<div class="clearfix l-unit__stat-col--left wide-3"><b><?= _("Name") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-right"><b>&nbsp;</b></div>
-			<div class="clearfix l-unit__stat-col--left text-center compact"><b><?= _("Records_DNS") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("Template") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center compact"><b><?= _("TTL") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("SOA") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center compact-3"><b><?= _("DNSSEC") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("Expiration Date") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-right"><b>&nbsp;</b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center compact"><b><?= _("Records_DNS") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Template") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center compact"><b><?= _("TTL") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("SOA") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center compact-3"><b><?= _("DNSSEC") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Expiration Date") ?></b></div>
 		</div>
 	</div>
 
@@ -104,7 +104,7 @@
 					<?=empty($data[$key]['SRC'])? '' : '<br>⇢ <span style="font-size:11px;">' . htmlspecialchars($data[$key]['SRC'], ENT_QUOTES) . '</span>'; ?>
 				</div>
 				<!-- START QUICK ACTION TOOLBAR AREA -->
-				<div class="clearfix l-unit__stat-col--left text-right">
+				<div class="clearfix l-unit__stat-col--left u-text-right">
 					<div class="l-unit-toolbar__col l-unit-toolbar__col--right u-noselect">
 						<div class="actions-panel clearfix">
 							<?php if ($read_only === 'true') {?>
@@ -141,16 +141,16 @@
 					</div>
 				</div>
 				<!-- END QUICK ACTION TOOLBAR AREA -->
-				<div class="clearfix l-unit__stat-col--left text-center compact">
+				<div class="clearfix l-unit__stat-col--left u-text-center compact">
 					<?php if ($data[$key]['RECORDS']) echo '<span>'.$data[$key]['RECORDS'].'</span>';?>
 				</div>
-				<div class="clearfix l-unit__stat-col--left text-center"><b><?=$data[$key]['TPL']?></b></div>
-				<div class="clearfix l-unit__stat-col--left text-center compact"><?=$data[$key]['TTL']?></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><?=$data[$key]['SOA']?></div>
-				<div class="clearfix l-unit__stat-col--left text-center compact-3">
+				<div class="clearfix l-unit__stat-col--left u-text-center"><b><?=$data[$key]['TPL']?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center compact"><?=$data[$key]['TTL']?></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center"><?=$data[$key]['SOA']?></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center compact-3">
 					<i class="fas <?=$dnssec_icon;?>"></i>
 				</div>
-				<div class="clearfix l-unit__stat-col--left text-center"><b><?=$data[$key]['EXP']?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center"><b><?=$data[$key]['EXP']?></b></div>
 			</div>
 		</div>
 	<?php } ?>

web/templates/pages/list_dns_public.php

@@ -60,31 +60,31 @@
 
 <div class="l-unit animate__animated animate__fadeIn">
 	<div class="l-unit__col l-unit__col--right">
-		<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b><?= _("DNSKEY record") ?></b></div>
+		<div class="clearfix l-unit__stat-col--left u-text-center u-pt10"><b><?= _("DNSKEY record") ?></b></div>
 		<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="form-control" value="<?php echo $data[$domain]["RECORD"]; ?>"></b></div>
 	</div>
 </div>
 <div class="l-unit animate__animated animate__fadeIn">
 	<div class="l-unit__col l-unit__col--right">
-		<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b><?= _("DS record") ?></b></div>
+		<div class="clearfix l-unit__stat-col--left u-text-center u-pt10"><b><?= _("DS record") ?></b></div>
 		<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="form-control" value="<?php echo $data[$domain]["DS"]; ?>"></b></div>
 	</div>
 </div>
 <div class="l-unit animate__animated animate__fadeIn">
 	<div class="l-unit__col l-unit__col--right">
-		<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b><?= _("Public key") ?></b></div>
+		<div class="clearfix l-unit__stat-col--left u-text-center u-pt10"><b><?= _("Public key") ?></b></div>
 		<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="form-control" value="<?php echo $data[$domain]["KEY"]; ?>"></b></div>
 	</div>
 </div>
 <div class="l-unit animate__animated animate__fadeIn">
 	<div class="l-unit__col l-unit__col--right">
-		<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b><?= _("Key Tag / Flag") ?></b></div>
+		<div class="clearfix l-unit__stat-col--left u-text-center u-pt10"><b><?= _("Key Tag / Flag") ?></b></div>
 		<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="form-control" value="<?php echo $flag; ?>"></b></div>
 	</div>
 </div>
 <div class="l-unit animate__animated animate__fadeIn">
 	<div class="l-unit__col l-unit__col--right">
-		<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b><?= _("Algorithm") ?></b></div>
+		<div class="clearfix l-unit__stat-col--left u-text-center u-pt10"><b><?= _("Algorithm") ?></b></div>
 		<div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="form-control" value="<?php echo $algorithm; ?>"></b></div>
 	</div>
 </div>

web/templates/pages/list_dns_rec.php

@@ -61,10 +61,10 @@
 				<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" title="<?= _("Select all") ?>" <?=$display_mode;?>>
 			</div>
 			<div class="clearfix l-unit__stat-col--left"><b><?= _("Record") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left super-compact text-right"><b>&nbsp;</b></div>
-			<div class="clearfix l-unit__stat-col--left compact text-center" style="padding-left: 32px;"><b><?= _("Type") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left compact text-center"><b><?= _("Priority") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left compact text-center"><b><?= _("TTL") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left super-compact u-text-right"><b>&nbsp;</b></div>
+			<div class="clearfix l-unit__stat-col--left compact u-text-center" style="padding-left: 32px;"><b><?= _("Type") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left compact u-text-center"><b><?= _("Priority") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left compact u-text-center"><b><?= _("TTL") ?></b></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"><b><?= _("IP or Value") ?></b></div>
 		</div>
@@ -102,7 +102,7 @@
 					</b>
 				</div>
 			<!-- START QUICK ACTION TOOLBAR AREA -->
-			<div class="clearfix l-unit__stat-col--left super-compact text-right">
+			<div class="clearfix l-unit__stat-col--left super-compact u-text-right">
 				<div class="l-unit-toolbar__col l-unit-toolbar__col--right u-noselect">
 					<div class="actions-panel clearfix">
 						<?php if ($read_only === 'true') {?>
@@ -126,9 +126,9 @@
 				</div>
 			</div>
 			<!-- END QUICK ACTION TOOLBAR AREA -->
-			<div class="clearfix l-unit__stat-col--left compact text-center" style="padding-left: 32px;"><b><?=$data[$key]['TYPE']?></b></div>
-			<div class="clearfix l-unit__stat-col--left compact text-center"><?=$data[$key]['PRIORITY']?>&nbsp;</div>
-			<div class="clearfix l-unit__stat-col--left compact 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 truncate" style="word-break: break-word;"><?=htmlspecialchars($data[$key]['VALUE'], ENT_QUOTES, 'UTF-8') ?></div>
 		</div>

web/templates/pages/list_firewall.php

@@ -44,11 +44,11 @@
 				<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" title="<?= _("Select all") ?>">
 			</div>
 			<div class="clearfix l-unit__stat-col--left wide-1"><b><?= _("Action") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left compact-2 text-right"><b>&nbsp;</b></div>
+			<div class="clearfix l-unit__stat-col--left compact-2 u-text-right"><b>&nbsp;</b></div>
 			<div class="clearfix l-unit__stat-col--left wide-3"><b><?= _("Comment") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("Protocol") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left wide-3 text-center"><b><?= _("Port") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("IP address") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Protocol") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left wide-3 u-text-center"><b><?= _("Port") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("IP address") ?></b></div>
 		</div>
 	</div>
 
@@ -96,7 +96,7 @@
 						</b>
 					</div>
 					<!-- START QUICK ACTION TOOLBAR AREA -->
-					<div class="clearfix l-unit__stat-col--left compact-2 text-right">
+					<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" key-action="href"><a href="/edit/firewall/?rule=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Editing Firewall Rule") ?>"><i class="fas fa-pencil status-icon orange status-icon dim"></i></a></div>
@@ -123,9 +123,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 text-center"><?=_($data[$key]['PROTOCOL'])?></div>
-					<div class="clearfix l-unit__stat-col--left wide-3 text-center"><b><?=$data[$key]['PORT']?></b></div>
-					<div class="clearfix l-unit__stat-col--left 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_firewall_banlist.php

@@ -29,9 +29,9 @@
 			</div>
 			<div class="clearfix l-unit__stat-col--left wide-3"><b><?= _("IP address") ?></b></div>
 			<div class="clearfix l-unit__stat-col--left compact-4"><b>&nbsp;</b></div>
-			<div class="clearfix l-unit__stat-col--left text-center compact-5"><b><?= _("Date") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center compact-5"><b><?= _("Time") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left wide text-center"><b><?= _("Comment") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center compact-5"><b><?= _("Date") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center compact-5"><b><?= _("Time") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left wide u-text-center"><b><?= _("Comment") ?></b></div>
 		</div>
 	</div>
 
@@ -64,9 +64,9 @@
 					</div>
 				</div>
 				<!-- END QUICK ACTION TOOLBAR AREA -->
-				<div class="clearfix l-unit__stat-col--left text-center compact-5"><?=_($data[$key]['DATE'])?></div>
-				<div class="clearfix l-unit__stat-col--left text-center compact-5"><?=$data[$key]['TIME']?></div>
-				<div class="clearfix l-unit__stat-col--left text-center wide"><b><?=_($value['CHAIN'])?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center compact-5"><?=_($data[$key]['DATE'])?></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center compact-5"><?=$data[$key]['TIME']?></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center wide"><b><?=_($value['CHAIN'])?></b></div>
 			</div>
 		</div>
 	<?php } ?>

web/templates/pages/list_firewall_ipset.php

@@ -29,10 +29,10 @@
 			</div>
 			<div class="clearfix l-unit__stat-col--left wide-3"><b><?= _("Ip List Name") ?></b></div>
 			<div class="clearfix l-unit__stat-col--left compact-4"><b>&nbsp;</b></div>
-			<div class="clearfix l-unit__stat-col--left text-center compact-5"><b><?= _("Autoupdate") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center compact-4"><b><?= _("Ip Version") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center compact-4"><b><?= _("Date") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center compact-4"><b><?= _("Time") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center compact-5"><b><?= _("Autoupdate") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center compact-4"><b><?= _("Ip Version") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center compact-4"><b><?= _("Date") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center compact-4"><b><?= _("Time") ?></b></div>
 		</div>
 	</div>
 
@@ -62,7 +62,7 @@
 					</div>
 				</div>
 				<!-- END QUICK ACTION TOOLBAR AREA -->
-				<div class="clearfix l-unit__stat-col--left text-center compact-5"><b>
+				<div class="clearfix l-unit__stat-col--left u-text-center compact-5"><b>
 						<?php if ($data[$key]["AUTOUPDATE"] == "no") { ?>
 							<i class="fas fa-circle-xmark status-icon red"></i>
 						<?php } else { ?>
@@ -70,9 +70,9 @@
 						<?php } ?>
 					</b>
 				</div>
-				<div class="clearfix l-unit__stat-col--left text-center compact-4"><?= _($data[$key]["IP_VERSION"]) ?></div>
-				<div class="clearfix l-unit__stat-col--left text-center compact-4"><?= _($data[$key]["DATE"]) ?></div>
-				<div class="clearfix l-unit__stat-col--left text-center compact-4"><?= $data[$key]["TIME"] ?></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center compact-4"><?= _($data[$key]["IP_VERSION"]) ?></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center compact-4"><?= _($data[$key]["DATE"]) ?></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center compact-4"><?= $data[$key]["TIME"] ?></div>
 			</div>
 		</div>
 	<?php } ?>

web/templates/pages/list_ip.php

@@ -43,12 +43,12 @@
 					<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" title="<?= _("Select all") ?>">
 				</div>
 				<div class="clearfix l-unit__stat-col--left wide-3"><b><?= _("IP Address") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left compact text-right"><b>&nbsp;</b></div>
-				<div class="clearfix l-unit__stat-col--left text-center compact-5"><b><?= _("Netmask") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("Interface") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("Status") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("Domains") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("Owner") ?></b></div>
+				<div class="clearfix l-unit__stat-col--left compact u-text-right"><b>&nbsp;</b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center compact-5"><b><?= _("Netmask") ?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Interface") ?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Status") ?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Domains") ?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Owner") ?></b></div>
 			</div>
 		</div>
 	</div>
@@ -70,7 +70,7 @@
 				<div class="clearfix l-unit__stat-col--left wide-3"><b><a href="/edit/ip/?ip=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Editing 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 text-right">
+				<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" key-action="href"><a href="/edit/ip/?ip=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Editing IP Address") ?>"><i class="fas fa-pencil status-icon orange status-icon dim"></i></a></div>
@@ -87,11 +87,11 @@
 					</div>
 				</div>
 				<!-- END QUICK ACTION TOOLBAR AREA -->
-				<div class="clearfix l-unit__stat-col--left text-center compact-5"><?= $data[$key]["NETMASK"] ?></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><?= $data[$key]["INTERFACE"] ?></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><b><?= _($data[$key]["STATUS"]) ?></b></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><b><?= $data[$key]["U_WEB_DOMAINS"] ?></b></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><b><?= $data[$key]["OWNER"] ?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center compact-5"><?= $data[$key]["NETMASK"] ?></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center"><?= $data[$key]["INTERFACE"] ?></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _($data[$key]["STATUS"]) ?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= $data[$key]["U_WEB_DOMAINS"] ?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= $data[$key]["OWNER"] ?></b></div>
 			</div>
 		</div>
 	<?php } ?>

web/templates/pages/list_log.php

@@ -58,7 +58,7 @@
 
 	<div class="header table-header">
 		<div class="l-unit__col l-unit__col--right">
-			<div class="clearfix l-unit__stat-col--left super-compact text-center">&nbsp;</div>
+			<div class="clearfix l-unit__stat-col--left super-compact u-text-center">&nbsp;</div>
 			<div class="clearfix l-unit__stat-col--left"><b><?= _("Date") ?></b></div>
 			<div class="clearfix l-unit__stat-col--left compact-2"><b><?= _("Time") ?></b></div>
 			<div class="clearfix l-unit__stat-col--left"><b><?= _("Category") ?></b></div>
@@ -83,7 +83,7 @@
 		?>
 		<div class="l-unit header animate__animated animate__fadeIn">
 			<div class="l-unit__col l-unit__col--right">
-				<div class="clearfix l-unit__stat-col--left super-compact text-center">
+				<div class="clearfix l-unit__stat-col--left super-compact u-text-center">
 					<i class="fas <?=$level_icon;?>"></i>
 				</div>
 				<div class="clearfix l-unit__stat-col--left"><b><?=translate_date($data[$key]['DATE'])?></b></div>

web/templates/pages/list_log_auth.php

@@ -37,7 +37,7 @@
 <div class="container units">
 	<div class="header table-header">
 		<div class="l-unit__col l-unit__col--right">
-			<div class="clearfix l-unit__stat-col--left text-center">
+			<div class="clearfix l-unit__stat-col--left u-text-center">
 				<b><?= _("Status") ?></b>
 			</div>
 			<div class="clearfix l-unit__stat-col--left"><b><?= _("Date") ?></b></div>
@@ -69,7 +69,7 @@
 		?>
 		<div class="l-unit header animate__animated animate__fadeIn">
 			<div class="l-unit__col l-unit__col--right">
-				<div class="clearfix l-unit__stat-col--left text-center">
+				<div class="clearfix l-unit__stat-col--left u-text-center">
 					<i class="fas <?=$status_icon;?> icon-pad-right" title="<?=$status_title;?>"></i>
 				</div>
 				<div class="clearfix l-unit__stat-col--left"><b><?=translate_date($data[$key]['DATE'])?></b></div>

web/templates/pages/list_mail.php

@@ -60,13 +60,13 @@
 				<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" title="<?= _("Select all") ?>" <?=$display_mode;?>>
 			</div>
 			<div class="clearfix l-unit__stat-col--left wide-3"><b><?= _("Name") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-right compact-5"><b>&nbsp;</b></div>
-			<div class="clearfix l-unit__stat-col--left text-center compact-2"><b><?= _("Accounts") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center compact-2"><b><?= _("Disk") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center compact-3"><b><?= _("Antivirus") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center compact-3"><b><?= _("AntiSpam") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center compact-3"><b><?= _("DKIM") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center compact-3"><b><?= _("SSL") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-right compact-5"><b>&nbsp;</b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center compact-2"><b><?= _("Accounts") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center compact-2"><b><?= _("Disk") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center compact-3"><b><?= _("Antivirus") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center compact-3"><b><?= _("AntiSpam") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center compact-3"><b><?= _("DKIM") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center compact-3"><b><?= _("SSL") ?></b></div>
 		</div>
 	</div>
 
@@ -142,7 +142,7 @@
 					</div>
 					<div class="clearfix l-unit__stat-col--left wide-3 truncate"><b><a href="?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("mail accounts") ?>: <?=$key?>"><?=$key?></a></b></div>
 					<!-- START QUICK ACTION TOOLBAR AREA -->
-					<div class="clearfix l-unit__stat-col--left text-right compact-5">
+					<div class="clearfix l-unit__stat-col--left u-text-right compact-5">
 						<div class="l-unit-toolbar__col l-unit-toolbar__col--right u-noselect">
 							<div class="actions-panel clearfix">
 								<?php if ($read_only === 'true') {?>
@@ -186,7 +186,7 @@
 						</div>
 					</div>
 					<!-- END QUICK ACTION TOOLBAR AREA -->
-					<div class="clearfix l-unit__stat-col--left text-center compact-2"><b>
+					<div class="clearfix l-unit__stat-col--left u-text-center compact-2"><b>
 							<?php
 								if ($data[$key]['ACCOUNTS']) {
 									$mail_accounts = htmlentities($data[$key]['ACCOUNTS']);
@@ -197,19 +197,19 @@
 							<span><?=$mail_accounts;?></span>
 						</b>
 					</div>
-					<div class="clearfix l-unit__stat-col--left text-center compact-2"><b>
+					<div class="clearfix l-unit__stat-col--left u-text-center compact-2"><b>
 							<?=humanize_usage_size($data[$key]['U_DISK'])?></b> <span class="u-text-small"><?=humanize_usage_measure($data[$key]['U_DISK'])?></span>
 					</div>
-					<div class="clearfix l-unit__stat-col--left text-center compact-3">
+					<div class="clearfix l-unit__stat-col--left u-text-center compact-3">
 						<i class="fas <?=$antivirus_icon;?>"></i>
 					</div>
-					<div class="clearfix l-unit__stat-col--left text-center compact-3">
+					<div class="clearfix l-unit__stat-col--left u-text-center compact-3">
 						<i class="fas <?=$antispam_icon;?>"></i>
 					</div>
-					<div class="clearfix l-unit__stat-col--left text-center compact-3">
+					<div class="clearfix l-unit__stat-col--left u-text-center compact-3">
 						<i class="fas <?=$dkim_icon;?>"></i>
 					</div>
-					<div class="clearfix l-unit__stat-col--left text-center compact-3">
+					<div class="clearfix l-unit__stat-col--left u-text-center compact-3">
 						<i class="fas <?=$ssl_icon;?>"></i>
 					</div>
 				</div>

web/templates/pages/list_mail_acc.php

@@ -65,12 +65,12 @@
 					<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" title="<?= _("Select all") ?>" <?=$display_mode;?>>
 				</div>
 				<div class="clearfix l-unit__stat-col--left wide-3"><b><?= _("Name") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left text-right compact-4"><b>&nbsp;</b></div>
-				<div class="clearfix l-unit__stat-col--left text-center compact"><b><?= _("Disk") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("Quota") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("Aliases") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("Forwarding") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("Autoreply") ?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-right compact-4"><b>&nbsp;</b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center compact"><b><?= _("Disk") ?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Quota") ?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Aliases") ?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Forwarding") ?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Autoreply") ?></b></div>
 			</div>
 		</div>
 	</div>
@@ -136,7 +136,7 @@
 					<?php } ?>
 				</div>
 				<!-- START QUICK ACTION TOOLBAR AREA -->
-				<div class="clearfix l-unit__stat-col--left text-right compact-4">
+				<div class="clearfix l-unit__stat-col--left u-text-right compact-4">
 					<div class="l-unit-toolbar__col l-unit-toolbar__col--right u-noselect">
 						<div class="actions-panel clearfix">
 							<?php if ($read_only === 'true') { ?>
@@ -179,15 +179,15 @@
 					<!-- END QUICK ACTION TOOLBAR AREA -->
 				</div>
 
-				<div class="clearfix l-unit__stat-col--left text-center compact"><b><?= humanize_usage_size($data[$key]["U_DISK"]) ?></b> <span class="u-text-small"><?= humanize_usage_measure($data[$key]["U_DISK"]) ?></span></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><b><?= _(humanize_usage_size($data[$key]["QUOTA"])) ?></b> <span class="u-text-small"><?= _(humanize_usage_measure($data[$key]["QUOTA"])) ?></span></div>
-				<div class="clearfix l-unit__stat-col--left text-center">
+				<div class="clearfix l-unit__stat-col--left u-text-center compact"><b><?= humanize_usage_size($data[$key]["U_DISK"]) ?></b> <span class="u-text-small"><?= humanize_usage_measure($data[$key]["U_DISK"]) ?></span></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _(humanize_usage_size($data[$key]["QUOTA"])) ?></b> <span class="u-text-small"><?= _(humanize_usage_measure($data[$key]["QUOTA"])) ?></span></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center">
 					<i class="fas <?= $alias_icon ?>"></i>
 				</div>
-				<div class="clearfix l-unit__stat-col--left text-center">
+				<div class="clearfix l-unit__stat-col--left u-text-center">
 					<i class="fas <?= $fwd_icon ?>"></i>
 				</div>
-				<div class="clearfix l-unit__stat-col--left text-center">
+				<div class="clearfix l-unit__stat-col--left u-text-center">
 					<i class="fas <?= $autoreply_icon ?>"></i>
 				</div>
 			</div>

web/templates/pages/list_mail_dns.php

@@ -19,9 +19,9 @@ if (!empty($_SESSION["WEBMAIL_ALIAS"])) {
 		<div class="l-unit__col l-unit__col--right">
 			<div>
 				<div class="clearfix l-unit__stat-col--left wide-3"><b><?= _("Record") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("Type") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("Priority") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("TTL") ?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Type") ?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Priority") ?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("TTL") ?></b></div>
 				<div class="clearfix l-unit__stat-col--left wide-3"><b><?= _("IP or Value") ?></b></div>
 			</div>
 		</div>
@@ -32,9 +32,9 @@ if (!empty($_SESSION["WEBMAIL_ALIAS"])) {
 			<div class="clearfix l-unit__stat-col--left wide-3">
 				<input type="text" class="form-control" style="width:260px;" value="mail.<?= htmlspecialchars($_GET["domain"]) ?>">
 			</div>
-			<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>A</b></div>
-			<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>&nbsp;</b></div>
-			<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>14400</b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center u-pt10"><b>A</b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center u-pt10"><b>&nbsp;</b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center u-pt10"><b>14400</b></div>
 			<div class="clearfix l-unit__stat-col--left wide-3">
 				<input type="text" class="form-control" style="width:400px;" value="<?= empty($ips[array_key_first($ips)]["NAT"]) ? array_key_first($ips) : $ips[array_key_first($ips)]["NAT"] ?>">
 			</div>
@@ -46,9 +46,9 @@ if (!empty($_SESSION["WEBMAIL_ALIAS"])) {
 				<div class="clearfix l-unit__stat-col--left wide-3">
 					<input type="text" class="form-control" style="width:260px;" value="<?= $v_webmail_alias ?>.<?= htmlspecialchars($_GET["domain"]) ?>">
 				</div>
-				<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>A</b></div>
-				<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>&nbsp;</b></div>
-				<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>14400</b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center u-pt10"><b>A</b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center u-pt10"><b>&nbsp;</b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center u-pt10"><b>14400</b></div>
 				<div class="clearfix l-unit__stat-col--left wide-3">
 					<input type="text" class="form-control" style="width:400px;" value="<?= empty($ips[array_key_first($ips)]["NAT"]) ? array_key_first($ips) : $ips[array_key_first($ips)]["NAT"] ?>">
 				</div>
@@ -60,9 +60,9 @@ if (!empty($_SESSION["WEBMAIL_ALIAS"])) {
 			<div class="clearfix l-unit__stat-col--left wide-3">
 				<input type="text" class="form-control" style="width:260px;" value="<?= htmlspecialchars($_GET["domain"]) ?>">
 			</div>
-			<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>MX</b></div>
-			<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>10</b></div>
-			<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>14400</b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center u-pt10"><b>MX</b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center u-pt10"><b>10</b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center u-pt10"><b>14400</b></div>
 			<div class="clearfix l-unit__stat-col--left wide-3">
 				<input type="text" class="form-control" style="width:400px;" value="mail.<?= htmlspecialchars($_GET["domain"]) ?>.">
 			</div>
@@ -73,9 +73,9 @@ if (!empty($_SESSION["WEBMAIL_ALIAS"])) {
 			<div class="clearfix l-unit__stat-col--left wide-3">
 				<input type="text" class="form-control" style="width:260px;" value="<?= htmlspecialchars($_GET["domain"]) ?>">
 			</div>
-			<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>TXT</b></div>
-			<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>&nbsp;</b></div>
-			<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>14400</b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center u-pt10"><b>TXT</b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center u-pt10"><b>&nbsp;</b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center u-pt10"><b>14400</b></div>
 			<?php $ip = empty($ips[array_key_first($ips)]["NAT"]) ? array_key_first($ips) : $ips[array_key_first($ips)]["NAT"]; ?>
 			<div class="clearfix l-unit__stat-col--left wide-3">
 				<input type="text" class="form-control" style="width:400px;" value="<?= htmlspecialchars("v=spf1 a mx ip4:" . $ip . " -all") ?>">
@@ -87,9 +87,9 @@ if (!empty($_SESSION["WEBMAIL_ALIAS"])) {
 			<div class="clearfix l-unit__stat-col--left wide-3">
 				<input type="text" class="form-control" style="width:260px;" value="_dmarc">
 			</div>
-			<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>TXT</b></div>
-			<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>&nbsp;</b></div>
-			<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>14400</b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center u-pt10"><b>TXT</b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center u-pt10"><b>&nbsp;</b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center u-pt10"><b>14400</b></div>
 			<div class="clearfix l-unit__stat-col--left wide-3">
 				<input type="text" class="form-control" style="width:400px;" value="<?= htmlspecialchars("v=DMARC1; p=quarantine; pct=100") ?>">
 			</div>
@@ -101,9 +101,9 @@ if (!empty($_SESSION["WEBMAIL_ALIAS"])) {
 				<div class="clearfix l-unit__stat-col--left wide-3">
 					<input type="text" class="form-control" style="width:260px;" value="<?= htmlspecialchars($key) ?>">
 				</div>
-				<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>TXT</b></div>
-				<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>&nbsp;</b></div>
-				<div class="clearfix l-unit__stat-col--left text-center u-pt10"><b>3600</b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center u-pt10"><b>TXT</b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center u-pt10"><b>&nbsp;</b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center u-pt10"><b>3600</b></div>
 				<div class="clearfix l-unit__stat-col--left wide-3">
 					<input type="text" class="form-control" style="width:400px;" value="<?= htmlspecialchars(str_replace(['"', "'"], "", $dkim[$key]["TXT"])) ?>">
 				</div>

web/templates/pages/list_packages.php

@@ -41,19 +41,19 @@
 				<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" title="<?= _("Select all") ?>">
 			</div>
 			<div class="clearfix l-unit__stat-col--left wide-2"><b><?= _("Package") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left compact-3 text-right"><b>&nbsp;</b></div>
-			<div class="clearfix l-unit__stat-col--left text-center compact"><b><i class="fas fa-terminal" title="<?= _("Shell") ?>"></i></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center compact"><b><i class="fas fa-hard-drive" title="<?= _("Quota") ?>"></i></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center compact"><b><i class="fas fa-right-left" title="<?= _("Bandwidth") ?>"></i></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-earth-americas" title="<?= _("Web Domains") ?>"></i></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-link" title="<?= _("Web Aliases") ?>"></i></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-book-atlas" title="<?= _("DNS Domains") ?>"></i></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-globe" title="<?= _("DNS Records") ?>"></i></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-envelopes-bulk" title="<?= _("Mail Domains") ?>"></i></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-inbox" title="<?= _("Mail Accounts") ?>"></i></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-database" title="<?= _("Databases") ?>"></i></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-clock" title="<?= _("Cron Jobs") ?>"></i></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-file-zipper" title="<?= _("Backups") ?>"></i></b></div>
+			<div class="clearfix l-unit__stat-col--left compact-3 u-text-right"><b>&nbsp;</b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center compact"><b><i class="fas fa-terminal" title="<?= _("Shell") ?>"></i></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center compact"><b><i class="fas fa-hard-drive" title="<?= _("Quota") ?>"></i></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center compact"><b><i class="fas fa-right-left" title="<?= _("Bandwidth") ?>"></i></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center super-compact"><b><i class="fas fa-earth-americas" title="<?= _("Web Domains") ?>"></i></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center super-compact"><b><i class="fas fa-link" title="<?= _("Web Aliases") ?>"></i></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center super-compact"><b><i class="fas fa-book-atlas" title="<?= _("DNS Domains") ?>"></i></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center super-compact"><b><i class="fas fa-globe" title="<?= _("DNS Records") ?>"></i></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center super-compact"><b><i class="fas fa-envelopes-bulk" title="<?= _("Mail Domains") ?>"></i></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center super-compact"><b><i class="fas fa-inbox" title="<?= _("Mail Accounts") ?>"></i></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center super-compact"><b><i class="fas fa-database" title="<?= _("Databases") ?>"></i></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center super-compact"><b><i class="fas fa-clock" title="<?= _("Cron Jobs") ?>"></i></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center super-compact"><b><i class="fas fa-file-zipper" title="<?= _("Backups") ?>"></i></b></div>
 		</div>
 	</div>
 
@@ -75,7 +75,7 @@
 					<div class="clearfix l-unit__stat-col--left wide-2 truncate"><b><a href="/edit/package/?package=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Editing Package") ?>: <?=$key?>"><?=$key?></a></b></div>
 				<?php } ?>
 				<!-- START QUICK ACTION TOOLBAR AREA -->
-				<div class="clearfix l-unit__stat-col--left text-right compact-3">
+				<div class="clearfix l-unit__stat-col--left u-text-right compact-3">
 					<div class="l-unit-toolbar__col l-unit-toolbar__col--right u-noselect">
 						<div class="actions-panel clearfix">
 							<?php if (($key == 'system')) { ?>
@@ -101,14 +101,14 @@
 					</div>
 				</div>
 				<!-- END QUICK ACTION TOOLBAR AREA -->
-				<div class="clearfix l-unit__stat-col--left text-center compact">
+				<div class="clearfix l-unit__stat-col--left u-text-center compact">
 					<?php if ($data[$key]["SHELL"] == "nologin") { ?>
 						<i class="fas fa-circle-minus status-icon large" title="<?= _("SSH Access") ?>: <?= $data[$key]["SHELL"] ?>"> </i>
 					<?php } else { ?>
 						<i class="fas fa-circle-check status-icon green large"></i>
 					<?php } ?>
 				</div>
-				<div class="clearfix l-unit__stat-col--left text-center compact">
+				<div class="clearfix l-unit__stat-col--left u-text-center compact">
 					<span title="<?= _("Quota") ?>: <?= humanize_usage_size($data[$key]["DISK_QUOTA"]) ?> <?= humanize_usage_measure($data[$key]["DISK_QUOTA"]) ?>">
 						<?php if (preg_match("/[a-z]/i", $data[$key]["DISK_QUOTA"])): ?>
 							<b>&infin;</b>
@@ -117,7 +117,7 @@
 						<?php endif; ?>
 					</span>
 				</div>
-				<div class="clearfix l-unit__stat-col--left text-center compact">
+				<div class="clearfix l-unit__stat-col--left u-text-center compact">
 					<span title="<?= _("Bandwidth") ?>: <?= humanize_usage_size($data[$key]["BANDWIDTH"]) ?> <?= humanize_usage_measure($data[$key]["BANDWIDTH"]) ?>">
 						<?php if ($data[$key]["BANDWIDTH"] == "unlimited") { ?>
 							<b>&infin;</b>
@@ -126,7 +126,7 @@
 						<?php } ?>
 					</span>
 				</div>
-				<div class="clearfix l-unit__stat-col--left text-center super-compact">
+				<div class="clearfix l-unit__stat-col--left u-text-center super-compact">
 					<span class="jump-top badge gray raised" title="<?= _("Web Domains") ?>: <?= $data[$key]["WEB_DOMAINS"] ?>">
 						<?php if ($data[$key]["WEB_DOMAINS"] == "unlimited") { ?>
 							<b>&infin;</b>
@@ -135,7 +135,7 @@
 						<?php } ?>
 					</span>
 				</div>
-				<div class="clearfix l-unit__stat-col--left text-center super-compact">
+				<div class="clearfix l-unit__stat-col--left u-text-center super-compact">
 					<span class="jump-top badge gray raised" title="<?= _("Web Aliases") ?>: <?= $data[$key]["WEB_ALIASES"] ?>">
 						<?php if ($data[$key]["WEB_ALIASES"] == "unlimited") { ?>
 							<b>&infin;</b>
@@ -144,7 +144,7 @@
 						<?php } ?>
 					</span>
 				</div>
-				<div class="clearfix l-unit__stat-col--left text-center super-compact">
+				<div class="clearfix l-unit__stat-col--left u-text-center super-compact">
 					<span class="jump-top badge gray raised" title="<?= _("DNS Domains") ?>: <?= $data[$key]["DNS_DOMAINS"] ?>">
 						<?php if ($data[$key]["DNS_DOMAINS"] == "unlimited") { ?>
 							<b>&infin;</b>
@@ -153,7 +153,7 @@
 						<?php } ?>
 					</span>
 				</div>
-				<div class="clearfix l-unit__stat-col--left text-center super-compact">
+				<div class="clearfix l-unit__stat-col--left u-text-center super-compact">
 					<span class="jump-top badge gray raised" title="<?= _("DNS Records") ?>: <?= $data[$key]["DNS_RECORDS"] ?>">
 						<?php if ($data[$key]["DNS_RECORDS"] == "unlimited") { ?>
 							<b>&infin;</b>
@@ -162,7 +162,7 @@
 						<?php } ?>
 					</span>
 				</div>
-				<div class="clearfix l-unit__stat-col--left text-center super-compact">
+				<div class="clearfix l-unit__stat-col--left u-text-center super-compact">
 					<span class="jump-top badge gray raised" title="<?= _("Mail Domains") ?>: <?= $data[$key]["MAIL_DOMAINS"] ?>">
 						<?php if ($data[$key]["MAIL_DOMAINS"] == "unlimited") { ?>
 							<b>&infin;</b>
@@ -171,7 +171,7 @@
 						<?php } ?>
 					</span>
 				</div>
-				<div class="clearfix l-unit__stat-col--left text-center super-compact">
+				<div class="clearfix l-unit__stat-col--left u-text-center super-compact">
 					<span class="jump-top badge gray raised" title="<?= _("Mail Accounts") ?>: <?= $data[$key]["MAIL_ACCOUNTS"] ?>">
 						<?php if ($data[$key]["MAIL_ACCOUNTS"] == "unlimited") { ?>
 							<b>&infin;</b>
@@ -180,7 +180,7 @@
 						<?php } ?>
 					</span>
 				</div>
-				<div class="clearfix l-unit__stat-col--left text-center super-compact">
+				<div class="clearfix l-unit__stat-col--left u-text-center super-compact">
 					<span class="jump-top badge gray raised" title="<?= _("Databases") ?>: <?= $data[$key]["DATABASES"] ?>">
 						<?php if ($data[$key]["DATABASES"] == "unlimited") { ?>
 							<b>&infin;</b>
@@ -189,7 +189,7 @@
 						<?php } ?>
 					</span>
 				</div>
-				<div class="clearfix l-unit__stat-col--left text-center super-compact">
+				<div class="clearfix l-unit__stat-col--left u-text-center super-compact">
 					<span class="jump-top badge gray raised" title="<?= _("Cron Jobs") ?>: <?= $data[$key]["CRON_JOBS"] ?>">
 						<?php if ($data[$key]["CRON_JOBS"] == "unlimited") { ?>
 							<b>&infin;</b>
@@ -198,7 +198,7 @@
 						<?php } ?>
 					</span>
 				</div>
-				<div class="clearfix l-unit__stat-col--left text-center super-compact">
+				<div class="clearfix l-unit__stat-col--left u-text-center super-compact">
 					<span class="jump-top badge gray raised" title="<?= _("Backups") ?>: <?= $data[$key]["BACKUPS"] ?>">
 						<?php if ($data[$key]["BACKUPS"] == "unlimited") { ?>
 							<b>&infin;</b>

web/templates/pages/list_search.php

@@ -35,12 +35,12 @@
 			<div class="clearfix l-unit__stat-col--left super-compact">
 				&nbsp;
 			</div>
-			<div class="clearfix l-unit__stat-col--left text-center compact-2"><b><?= _("Status") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center compact-2"><b><?= _("Status") ?></b></div>
 			<div class="clearfix l-unit__stat-col--left wide-5"><b><?= _("Search Results") ?></b></div>
 			<div class="clearfix l-unit__stat-col--left compact-3"><b>&nbsp;</b></div>
-			<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("Date") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("Owner") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("Type") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Date") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Owner") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Type") ?></b></div>
 		</div>
 	</div>
 
@@ -73,7 +73,7 @@
 			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 text-center">
+				<div class="clearfix l-unit__stat-col--left super-compact u-text-center">
 					<?php
 						if ($object === 'web domain') {
 								$icon = 'fa-earth-americas';
@@ -96,7 +96,7 @@
 					?>
 					<i class="fa <?=$icon;?> status-icon dim"></i>
 				</div>
-				<div class="clearfix l-unit__stat-col--left compact-2 text-center">
+				<div class="clearfix l-unit__stat-col--left compact-2 u-text-center">
 					<b>
 						<?php if ($status === 'active') {?>
 							<i class="fas fa-circle-check status-icon green"></i>
@@ -132,15 +132,15 @@
 						<?php } ?>
 					</b>
 				</div>
-				<div class="clearfix l-unit__stat-col--left text-right compact-3">
+				<div class="clearfix l-unit__stat-col--left u-text-right compact-3">
 					<div class="l-unit-toolbar__col l-unit-toolbar__col--right u-noselect">
 						<div class="actions-panel clearfix">
 							&nbsp;
 						</div>
 					</div>
 				</div>
-				<div class="clearfix l-unit__stat-col--left text-center"><?=translate_date($value['DATE'])?></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><b>
+				<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>
 						<?php if (!($_SESSION['POLICY_SYSTEM_HIDE_ADMIN'] === 'yes' && $value['USER'] !== 'admin')){
 						if ($_SESSION['userContext'] === 'admin'){
@@ -151,7 +151,7 @@
 						}
 						?>
 						</b></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><?=_($object)?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center"><?=_($object)?></b></div>
 			</div>
 		</div>
 	<?php } ?>

web/templates/pages/list_server_preview.php

@@ -14,7 +14,7 @@
 
 	<div class="header table-header">
 		<div class="l-unit__col l-unit__col--right">
-			<div class="clearfix l-unit__stat-col--left super-compact text-center">&nbsp;</div>
+			<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>
@@ -24,7 +24,7 @@
 	<!-- Start of item element-->
 	<div class="l-unit header animate__animated animate__fadeIn">
 		<div class="l-unit__col l-unit__col--right">
-			<div class="clearfix l-unit__stat-col--left super-compact text-center">
+			<div class="clearfix l-unit__stat-col--left super-compact u-text-center">
 				<i class="fas fa-gear status-icon blue"></i>
 			</div>
 			<div class="clearfix l-unit__stat-col--left"><b><?= _("System") ?></b></div>

web/templates/pages/list_services.php

@@ -99,11 +99,11 @@
 				</div>
 
 				<div class="clearfix l-unit__stat-col--left wide-2"><b><?= _("Service") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left text-right compact-2">&nbsp;</div>
+				<div class="clearfix l-unit__stat-col--left u-text-right compact-2">&nbsp;</div>
 				<div class="clearfix l-unit__stat-col--left wide-3"><b><?= _("Description") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("Uptime") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("CPU") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("Memory") ?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Uptime") ?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("CPU") ?></b></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Memory") ?></b></div>
 			</div>
 		</div>
 
@@ -142,7 +142,7 @@
 						<i class="fas <?=$state_icon;?> icon-pad-right"></i>
 						<b><a href="/edit/server/<? echo $edit_url ?>/" title="<?= _("edit") ?>: <?=$key?>"><?=$key?></a></b>
 					</div>
-					<div class="clearfix l-unit__stat-col--left text-center compact-2">
+					<div class="clearfix l-unit__stat-col--left u-text-center compact-2">
 						<div class="actions-panel clearfix">
 							<div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href">
 								<a href="/edit/server/<? echo $edit_url ?>/" title="<?= _("edit") ?>"><i class="fas fa-pencil status-icon orange status-icon dim icon-large"></i></a>
@@ -168,9 +168,9 @@
 						</div>
 					</div>
 					<div class="clearfix l-unit__stat-col--left wide-3"><?=_($data[$key]['SYSTEM'])?></div>
-					<div class="clearfix l-unit__stat-col--left text-center"><b><?=humanize_time($data[$key]['RTIME'])?></b></div>
-					<div class="clearfix l-unit__stat-col--left text-center"><b><?=$cpu?></b></div>
-					<div class="clearfix l-unit__stat-col--left text-center"><b><?=$data[$key]['MEM']?> <?= _("mb") ?></b></div>
+					<div class="clearfix l-unit__stat-col--left u-text-center"><b><?=humanize_time($data[$key]['RTIME'])?></b></div>
+					<div class="clearfix l-unit__stat-col--left u-text-center"><b><?=$cpu?></b></div>
+					<div class="clearfix l-unit__stat-col--left u-text-center"><b><?=$data[$key]['MEM']?> <?= _("mb") ?></b></div>
 				</div>
 			</div>
 		<?php } ?>

web/templates/pages/list_stats.php

@@ -77,7 +77,7 @@
 											<div class="l-unit__stat-col l-unit__stat-col--left">
 												<i class="fas fa-right-left status-icon dim large icon-pad-right" title="<?= _("Bandwidth") ?>"></i><b><?= _("Bandwidth") ?></b>
 											</div>
-											<div class="l-unit__stat-col l-unit__stat-col--right text-right">
+											<div class="l-unit__stat-col l-unit__stat-col--right u-text-right">
 												<b><?= humanize_usage_size($data[$key]["U_BANDWIDTH"]) ?></b> <?= humanize_usage_measure($data[$key]["U_BANDWIDTH"]) ?>
 											</div>
 										</div>
@@ -88,7 +88,7 @@
 								</td>
 								<td>
 									<div class="l-unit__stat-cols clearfix">
-										<div class="l-unit__stat-col l-unit__stat-col--left text-right icon-pad-right u-text-italic"><?= _("Web Domains") ?>:</div>
+										<div class="l-unit__stat-col l-unit__stat-col--left u-text-right icon-pad-right u-text-italic"><?= _("Web Domains") ?>:</div>
 										<div class="l-unit__stat-col l-unit__stat-col--right statistics-count">
 											<b><?= $data[$key]["U_WEB_DOMAINS"] ?></b>
 										</div>
@@ -96,7 +96,7 @@
 								</td>
 								<td>
 									<div class="l-unit__stat-cols clearfix last">
-										<div class="l-unit__stat-col l-unit__stat-col--left text-right icon-pad-right u-text-italic"><?= _("Mail Domains") ?>:</div>
+										<div class="l-unit__stat-col l-unit__stat-col--left u-text-right icon-pad-right u-text-italic"><?= _("Mail Domains") ?>:</div>
 										<div class="l-unit__stat-col l-unit__stat-col--right statistics-count">
 											<b><?= $data[$key]["U_MAIL_DOMAINS"] ?></b>
 										</div>
@@ -106,7 +106,7 @@
 							<tr>
 								<td>
 									<div class="l-unit__stat-cols clearfix u-text-small">
-										<div class="text-right">
+										<div class="u-text-right">
 											<?php if ($_SESSION["userContext"] === "admin" || ($_SESSION["userContext"] === "user" && $data[$key]["IP_OWNED"] != "0")) { ?>
 												<span style="float: left;font-weight:500;"><?= _("IP Addresses") ?>:</span><b><?= $data[$key]["IP_OWNED"] ?></b> <?= _("IPs") ?></span>
 											<?php } ?>
@@ -115,7 +115,7 @@
 								</td>
 								<td>
 									<div class="l-unit__stat-cols clearfix">
-										<div class="l-unit__stat-col l-unit__stat-col--left text-right icon-pad-right u-text-italic"><?= _("SSL Domains") ?>:</div>
+										<div class="l-unit__stat-col l-unit__stat-col--left u-text-right icon-pad-right u-text-italic"><?= _("SSL Domains") ?>:</div>
 										<div class="l-unit__stat-col l-unit__stat-col--right statistics-count">
 											<b><?= $data[$key]["U_WEB_SSL"] ?></b>
 										</div>
@@ -123,7 +123,7 @@
 								</td>
 								<td>
 									<div class="l-unit__stat-cols clearfix last">
-										<div class="l-unit__stat-col l-unit__stat-col--left text-right icon-pad-right u-text-italic"><?= _("Mail Accounts") ?>:</div>
+										<div class="l-unit__stat-col l-unit__stat-col--left u-text-right icon-pad-right u-text-italic"><?= _("Mail Accounts") ?>:</div>
 										<div class="l-unit__stat-col l-unit__stat-col--right statistics-count">
 											<b><?= $data[$key]["U_MAIL_ACCOUNTS"] ?></b>
 										</div>
@@ -134,7 +134,7 @@
 								<td>
 									<div class="l-unit__stat-cols clearfix graph">
 										<div class="l-unit__stat-col l-unit__stat-col--left"><i class="fas fa-hard-drive status-icon dim large icon-pad-right" title="<?= _("Disk") ?>"></i><b><?= _("Disk") ?></b></div>
-										<div class="l-unit__stat-col l-unit__stat-col--right text-right">
+										<div class="l-unit__stat-col l-unit__stat-col--right u-text-right">
 											<b><?= humanize_usage_size($data[$key]["U_DISK"]) ?></b> <?= humanize_usage_measure($data[$key]["U_DISK"]) ?>
 										</div>
 									</div>
@@ -144,7 +144,7 @@
 								</td>
 								<td>
 									<div class="l-unit__stat-cols clearfix">
-										<div class="l-unit__stat-col l-unit__stat-col--left text-right icon-pad-right u-text-italic"><?= _("Web Aliases") ?>:</div>
+										<div class="l-unit__stat-col l-unit__stat-col--left u-text-right icon-pad-right u-text-italic"><?= _("Web Aliases") ?>:</div>
 										<div class="l-unit__stat-col l-unit__stat-col--right statistics-count">
 											<b><?= $data[$key]["U_WEB_ALIASES"] ?></b>
 										</div>
@@ -152,7 +152,7 @@
 								</td>
 								<td>
 									<div class="l-unit__stat-cols clearfix last">
-										<div class="l-unit__stat-col l-unit__stat-col--left text-right icon-pad-right u-text-italic"><?= _("Databases") ?>:</div>
+										<div class="l-unit__stat-col l-unit__stat-col--left u-text-right icon-pad-right u-text-italic"><?= _("Databases") ?>:</div>
 										<div class="l-unit__stat-col l-unit__stat-col--right statistics-count">
 											<b><?= $data[$key]["U_DATABASES"] ?></b>
 										</div>
@@ -162,17 +162,17 @@
 							<tr>
 								<td>
 									<div class="l-unit__stat-cols clearfix u-text-small">
-										<div class="text-right">
+										<div class="u-text-right">
 											<span style="float: left;font-weight:500;"><?= _("Web") ?>:</span> <b><?= humanize_usage_size($data[$key]["U_DISK_WEB"]) ?></b> <?= humanize_usage_measure($data[$key]["U_DISK_WEB"]) ?>
 										</div>
-										<div class="text-right">
+										<div class="u-text-right">
 											<span style="float: left;font-weight:500;"><?= _("Databases") ?>:</span> <b><?= humanize_usage_size($data[$key]["U_DISK_DB"]) ?></b> <?= humanize_usage_measure($data[$key]["U_DISK_DB"]) ?>
 										</div>
 									</div>
 								</td>
 								<td>
 									<div class="l-unit__stat-cols clearfix">
-										<div class="l-unit__stat-col l-unit__stat-col--left text-right icon-pad-right u-text-italic"><?= _("DNS domains") ?>:</div>
+										<div class="l-unit__stat-col l-unit__stat-col--left u-text-right icon-pad-right u-text-italic"><?= _("DNS domains") ?>:</div>
 										<div class="l-unit__stat-col l-unit__stat-col--right statistics-count">
 											<b><?= $data[$key]["U_DNS_DOMAINS"] ?></b>
 										</div>
@@ -180,7 +180,7 @@
 								</td>
 								<td>
 									<div class="l-unit__stat-cols clearfix last">
-										<div class="l-unit__stat-col l-unit__stat-col--left text-right icon-pad-right u-text-italic"><?= _("Cron Jobs") ?>:</div>
+										<div class="l-unit__stat-col l-unit__stat-col--left u-text-right icon-pad-right u-text-italic"><?= _("Cron Jobs") ?>:</div>
 										<div class="l-unit__stat-col l-unit__stat-col--right statistics-count">
 											<b><?= $data[$key]["U_CRON_JOBS"] ?></b>
 										</div>
@@ -190,17 +190,17 @@
 							<tr>
 								<td>
 									<div class="l-unit__stat-cols clearfix u-text-small">
-										<div class="text-right">
+										<div class="u-text-right">
 											<span style="float: left;font-weight:500;"><?= _("Mail") ?>:</span> <b><?= humanize_usage_size($data[$key]["U_DISK_MAIL"]) ?></b> <?= humanize_usage_measure($data[$key]["U_DISK_MAIL"]) ?>
 										</div>
-										<div class="text-right">
+										<div class="u-text-right">
 											<span style="float: left;font-weight:500;"><?= _("User Directories") ?>:</span> <b><?= humanize_usage_size($data[$key]["U_DISK_DIRS"]) ?></b> <?= humanize_usage_measure($data[$key]["U_DISK_DIRS"]) ?>
 										</div>
 									</div>
 								</td>
 								<td>
 									<div class="l-unit__stat-cols clearfix">
-										<div class="l-unit__stat-col l-unit__stat-col--left text-right icon-pad-right u-text-italic"><?= _("DNS records") ?>:</div>
+										<div class="l-unit__stat-col l-unit__stat-col--left u-text-right icon-pad-right u-text-italic"><?= _("DNS records") ?>:</div>
 										<div class="l-unit__stat-col l-unit__stat-col--right statistics-count">
 											<b><?= $data[$key]["U_DNS_RECORDS"] ?></b>
 										</div>
@@ -208,7 +208,7 @@
 								</td>
 								<td>
 									<div class="l-unit__stat-cols clearfix last">
-										<div class="l-unit__stat-col l-unit__stat-col--left text-right icon-pad-right u-text-italic"><?= _("Backups") ?>:</div>
+										<div class="l-unit__stat-col l-unit__stat-col--left u-text-right icon-pad-right u-text-italic"><?= _("Backups") ?>:</div>
 										<div class="l-unit__stat-col l-unit__stat-col--right statistics-count">
 											<b><?= $data[$key]["U_BACKUPS"] ?></b>
 										</div>

web/templates/pages/list_updates.php

@@ -29,8 +29,8 @@
 				</div>
 				<div class="clearfix l-unit__stat-col--left wide"><b><?= _("Package") ?></b></div>
 				<div class="clearfix l-unit__stat-col--left wide-5"><b><?= _("Description") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left text-center wide"><b><?= _("Version") ?></b></div>
-				<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("Status") ?></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>
@@ -61,8 +61,8 @@
 					</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 text-center wide"><?=$data[$key]['VERSION'] ?> (<?=$data[$key]['ARCH']?>)</div>
-					<div class="clearfix l-unit__stat-col--left text-center">
+					<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 status-icon green"></i>'; } ?>
 					</div>

web/templates/pages/list_user.php

@@ -65,16 +65,16 @@
 			</div>
 			<div class="clearfix l-unit__stat-col--left wide-3"><b><?= _("Name") ?></b></div>
 			<div class="clearfix l-unit__stat-col--left compact-3"><b>&nbsp;</b></div>
-			<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("Package") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><?= _("IPs") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-hard-drive" title="<?= _("Disk") ?>"></i></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center compact"><b><i class="fas fa-right-left" title="<?= _("Bandwidth") ?>"></i></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-earth-americas" title="<?= _("Web Domains") ?>"></i></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-book-atlas" title="<?= _("DNS Domains") ?>"></i></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-envelopes-bulk" title="<?= _("Mail Domains") ?>"></i></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-database" title="<?= _("Databases") ?>"></i></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-clock" title="<?= _("Cron Jobs") ?>"></i></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-file-zipper" title="<?= _("Backups") ?>"></i></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Package") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center super-compact"><b><?= _("IPs") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center super-compact"><b><i class="fas fa-hard-drive" title="<?= _("Disk") ?>"></i></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center compact"><b><i class="fas fa-right-left" title="<?= _("Bandwidth") ?>"></i></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center super-compact"><b><i class="fas fa-earth-americas" title="<?= _("Web Domains") ?>"></i></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center super-compact"><b><i class="fas fa-book-atlas" title="<?= _("DNS Domains") ?>"></i></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center super-compact"><b><i class="fas fa-envelopes-bulk" title="<?= _("Mail Domains") ?>"></i></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center super-compact"><b><i class="fas fa-database" title="<?= _("Databases") ?>"></i></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center super-compact"><b><i class="fas fa-clock" title="<?= _("Cron Jobs") ?>"></i></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center super-compact"><b><i class="fas fa-file-zipper" title="<?= _("Backups") ?>"></i></b></div>
 		</div>
 	</div>
 
@@ -111,7 +111,7 @@
 					<div class="userlist-email"><b><?= _("Email") ?>:</b> <?=$data[$key]['CONTACT']?></div>
 				</div>
 				<!-- START QUICK ACTION TOOLBAR AREA -->
-				<div class="clearfix l-unit__stat-col--left text-right compact-3">
+				<div class="clearfix l-unit__stat-col--left u-text-right compact-3">
 					<div class="l-unit-toolbar__col l-unit-toolbar__col--right u-noselect">
 						<div class="actions-panel clearfix">
 							<?php if ($key == $user_plain) { ?>
@@ -155,7 +155,7 @@
 					</div>
 				</div>
 				<!-- END QUICK ACTION TOOLBAR AREA -->
-				<div class="clearfix l-unit__stat-col--left text-center">
+				<div class="clearfix l-unit__stat-col--left u-text-center">
 					<b>
 						<?php if ($data[$key]["PACKAGE"] === "default") { ?>
 							<?= $data[$key]["PACKAGE"] ?>
@@ -164,15 +164,15 @@
 						<?php } ?>
 					</b>
 				</div>
-				<div class="clearfix l-unit__stat-col--left text-center super-compact"><?= $data[$key]["IP_OWNED"] ?></div>
-				<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><?= humanize_usage_size($data[$key]["U_DISK"]) ?></b> <span class="u-text-small"><?= humanize_usage_measure($data[$key]["U_DISK"]) ?></span></div>
-				<div class="clearfix l-unit__stat-col--left text-center compact"><b><?= humanize_usage_size($data[$key]["U_BANDWIDTH"]) ?></b> <span class="u-text-small"><?= humanize_usage_measure($data[$key]["U_BANDWIDTH"]) ?></span></div>
-				<div class="clearfix l-unit__stat-col--left text-center super-compact" title="<?= $data[$key]["U_WEB_DOMAINS"] ?> <?= _("Web Domains") ?>"><span class="jump-top badge gray raised"><b><?= $data[$key]["U_WEB_DOMAINS"] ?></b></span></div>
-				<div class="clearfix l-unit__stat-col--left text-center super-compact" title="<?= $data[$key]["U_DNS_DOMAINS"] ?> <?= _("DNS Domains") ?>"><span class="jump-top badge gray raised"><b><?= $data[$key]["U_DNS_DOMAINS"] ?></b></span></div>
-				<div class="clearfix l-unit__stat-col--left text-center super-compact" title="<?= $data[$key]["U_MAIL_DOMAINS"] ?> <?= _("Mail Domains") ?>"><span class="jump-top badge gray raised"><b><?= $data[$key]["U_MAIL_DOMAINS"] ?></b></span></div>
-				<div class="clearfix l-unit__stat-col--left text-center super-compact" title="<?= $data[$key]["U_DATABASES"] ?> <?= _("Databases") ?>"><span class="jump-top badge gray raised"><b><?= $data[$key]["U_DATABASES"] ?></b></span></div>
-				<div class="clearfix l-unit__stat-col--left text-center super-compact" title="<?= $data[$key]["U_CRON_JOBS"] ?> <?= _("Cron Jobs") ?>"><span class="jump-top badge gray raised"><b><?= $data[$key]["U_CRON_JOBS"] ?></b></span></div>
-				<div class="clearfix l-unit__stat-col--left text-center super-compact" title="<?= $data[$key]["U_BACKUPS"] ?> <?= _("Backups") ?>"><span class="jump-top badge gray raised"><b><?= $data[$key]["U_BACKUPS"] ?></b></span></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center super-compact"><?= $data[$key]["IP_OWNED"] ?></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center super-compact"><b><?= humanize_usage_size($data[$key]["U_DISK"]) ?></b> <span class="u-text-small"><?= humanize_usage_measure($data[$key]["U_DISK"]) ?></span></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center compact"><b><?= humanize_usage_size($data[$key]["U_BANDWIDTH"]) ?></b> <span class="u-text-small"><?= humanize_usage_measure($data[$key]["U_BANDWIDTH"]) ?></span></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center super-compact" title="<?= $data[$key]["U_WEB_DOMAINS"] ?> <?= _("Web Domains") ?>"><span class="jump-top badge gray raised"><b><?= $data[$key]["U_WEB_DOMAINS"] ?></b></span></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center super-compact" title="<?= $data[$key]["U_DNS_DOMAINS"] ?> <?= _("DNS Domains") ?>"><span class="jump-top badge gray raised"><b><?= $data[$key]["U_DNS_DOMAINS"] ?></b></span></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center super-compact" title="<?= $data[$key]["U_MAIL_DOMAINS"] ?> <?= _("Mail Domains") ?>"><span class="jump-top badge gray raised"><b><?= $data[$key]["U_MAIL_DOMAINS"] ?></b></span></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center super-compact" title="<?= $data[$key]["U_DATABASES"] ?> <?= _("Databases") ?>"><span class="jump-top badge gray raised"><b><?= $data[$key]["U_DATABASES"] ?></b></span></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center super-compact" title="<?= $data[$key]["U_CRON_JOBS"] ?> <?= _("Cron Jobs") ?>"><span class="jump-top badge gray raised"><b><?= $data[$key]["U_CRON_JOBS"] ?></b></span></div>
+				<div class="clearfix l-unit__stat-col--left u-text-center super-compact" title="<?= $data[$key]["U_BACKUPS"] ?> <?= _("Backups") ?>"><span class="jump-top badge gray raised"><b><?= $data[$key]["U_BACKUPS"] ?></b></span></div>
 			</div>
 		</div>
 	<?php } ?>

web/templates/pages/list_web.php

@@ -2,7 +2,7 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<?php if ($read_only !== 'true') {?>
+			<?php if ($read_only !== "true") { ?>
 				<a href="/add/web/" class="button button-secondary" id="btn-create">
 					<i class="fas fa-circle-plus status-icon green"></i><?= _("Add Web Domain") ?>
 				</a>
@@ -65,12 +65,12 @@
 				<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" title="<?= _("Select all") ?>" <?=$display_mode;?>>
 			</div>
 			<div class="clearfix l-unit__stat-col--left wide-4"><b><?= _("Name") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left compact-4 text-right"><b>&nbsp;</b></div>
-			<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("IP address") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("Disk") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center compact"><b><?= _("Bandwidth") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center"><b><?= _("SSL") ?></b></div>
-			<div class="clearfix l-unit__stat-col--left text-center compact"><b><?= _("Statistics") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left compact-4 u-text-right"><b>&nbsp;</b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("IP address") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Disk") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center compact"><b><?= _("Bandwidth") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("SSL") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left u-text-center compact"><b><?= _("Statistics") ?></b></div>
 		</div>
 	</div>
 
@@ -188,7 +188,7 @@
 						</b>
 					</div>
 					<!-- START QUICK ACTION TOOLBAR AREA -->
-					<div class="clearfix l-unit__stat-col--left compact-4 text-right">
+					<div class="clearfix l-unit__stat-col--left compact-4 u-text-right">
 						<div class="l-unit-toolbar__col l-unit-toolbar__col--right u-noselect">
 							<div class="actions-panel clearfix">
 								<?php if (!empty($data[$key]['STATS'])) { ?>
@@ -226,13 +226,13 @@
 						</div>
 					</div>
 					<!-- END QUICK ACTION TOOLBAR AREA -->
-					<div class="clearfix l-unit__stat-col--left text-center"><?=empty($ips[$data[$key]['IP']]['NAT']) ? $data[$key]['IP'] : "{$ips[$data[$key]['IP']]['NAT']}"; ?></div>
-					<div class="clearfix l-unit__stat-col--left text-center"><b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <span class="u-text-small"><?=humanize_usage_measure($data[$key]['U_DISK'])?></span></div>
-					<div class="clearfix l-unit__stat-col--left text-center compact"><b><?=humanize_usage_size($data[$key]['U_BANDWIDTH'])?></b> <span class="u-text-small"><?=humanize_usage_measure($data[$key]['U_BANDWIDTH'])?></span></div>
-					<div class="clearfix l-unit__stat-col--left text-center">
+					<div class="clearfix l-unit__stat-col--left u-text-center"><?=empty($ips[$data[$key]['IP']]['NAT']) ? $data[$key]['IP'] : "{$ips[$data[$key]['IP']]['NAT']}"; ?></div>
+					<div class="clearfix l-unit__stat-col--left u-text-center"><b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <span class="u-text-small"><?=humanize_usage_measure($data[$key]['U_DISK'])?></span></div>
+					<div class="clearfix l-unit__stat-col--left u-text-center compact"><b><?=humanize_usage_size($data[$key]['U_BANDWIDTH'])?></b> <span class="u-text-small"><?=humanize_usage_measure($data[$key]['U_BANDWIDTH'])?></span></div>
+					<div class="clearfix l-unit__stat-col--left u-text-center">
 						<i class="fas <?=$icon_ssl;?>"></i>
 					</div>
-					<div class="clearfix l-unit__stat-col--left text-center compact">
+					<div class="clearfix l-unit__stat-col--left u-text-center compact">
 						<i class="fas <?=$icon_webstats;?>"></i>
 					</div>
 				</div>

web/templates/pages/list_weblog.php

@@ -61,9 +61,9 @@
 								</a>
 							</li>
 							<li class="top-bar-menu-item">
-								<a class="top-bar-menu-link" href="/edit/user/" title="<?=htmlentities($user)?>">
+								<a class="top-bar-menu-link" href="/edit/user/" title="<?= htmlentities($user) ?>">
 									<i class="fas fa-circle-user"></i>
-									<span class="u-hidden"><?=htmlentities($user)?></span>
+									<span class="u-hidden"><?= htmlentities($user) ?></span>
 								</a>
 							</li>
 							<li class="top-bar-menu-item">

web/templates/pages/login/reset_2.php

@@ -7,7 +7,7 @@
 			<?= _("Forgot Password") ?>
 		</h1>
 		<?php if (isset($ERROR)) echo $ERROR ?>
-		<p style="padding: 12px 0 0 2px;">
+		<p class="inline-success u-mb10">
 			<?= _("RESET_CODE_SENT") ?>
 		</p>
 		<div class="u-mb20">

web/templates/pages/setup_webapp.php

@@ -26,19 +26,21 @@
 
 <div class="container animate__animated animate__fadeIn">
 
-	<?php if( !empty($WebappInstaller->getOptions())): ?>
+	<?php if (!empty($WebappInstaller->getOptions())): ?>
 		<form id="vstobjects" method="POST" name="v_setup_webapp">
-			<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+			<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 			<input type="hidden" name="ok" value="true">
 
 			<div class="form-container">
-				<h1 class="form-title"><?=sprintf(_('Install %s'),$WebappInstaller -> info()['name'])?></h1>
-				<?php if( !$WebappInstaller->isDomainRootClean()): ?>
-					<div class="alert alert-info alert-with-icon" role="alert">
+				<h1 class="form-title"><?= sprintf(_("Install %s"), $WebappInstaller->info()["name"]) ?></h1>
+				<?php if (!$WebappInstaller->isDomainRootClean()): ?>
+					<div class="alert alert-info" role="alert">
 						<i class="fas fa-info"></i>
-						<p class="u-mb10"><?= _("Data loss warning!") ?></p>
-						<p class="u-mb10"><?= _("Your web folder already has files uploaded to it. The installer will overwrite your files and / or the installation might fail.") ?></p>
-						<p><?php echo sprintf(_('Please make sure ~/web/%s/public_html is empty!'),$v_domain);?></p>
+						<div>
+							<p class="u-mb10"><?= _("Data loss warning!") ?></p>
+							<p class="u-mb10"><?= _("Your web folder already has files uploaded to it. The installer will overwrite your files and / or the installation might fail.") ?></p>
+							<p><?php echo sprintf(_('Please make sure ~/web/%s/public_html is empty!'),$v_domain);?></p>
+						</div>
 					</div>
 				<?php endif; ?>
 				<div class="u-mt20">
@@ -47,16 +49,16 @@
 							$f_name = $WebappInstaller->formNs() . '_' . $form_name;
 							$f_type = $form_control;
 							$f_value = '';
-							if(isset($form_control['label'])){
+							if (isset($form_control['label'])) {
 								$f_label = htmlentities($form_control['label']);
-							}else{
+							} else {
 								$f_label = ucwords(str_replace(['.','_'], ' ', $form_name));
 							}
 							$f_placeholder = '';
 							if (is_array($form_control)) {
-									$f_type = (!empty($form_control['type']))?$form_control['type']:'text';
-									$f_value = (!empty($form_control['value']))?$form_control['value']:'';
-									$f_placeholder = (!empty($form_control['placeholder']))?$form_control['placeholder']:'';
+								$f_type = (!empty($form_control['type']))?$form_control['type']:'text';
+								$f_value = (!empty($form_control['value']))?$form_control['value']:'';
+								$f_placeholder = (!empty($form_control['placeholder']))?$form_control['placeholder']:'';
 							}
 
 							$f_value = htmlentities($f_value);

yarn.lock

@@ -626,13 +626,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:^5.45.1":
-  version: 5.45.1
-  resolution: "@typescript-eslint/eslint-plugin@npm:5.45.1"
+"@typescript-eslint/eslint-plugin@npm:^5.46.0":
+  version: 5.46.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:5.46.0"
   dependencies:
-    "@typescript-eslint/scope-manager": 5.45.1
-    "@typescript-eslint/type-utils": 5.45.1
-    "@typescript-eslint/utils": 5.45.1
+    "@typescript-eslint/scope-manager": 5.46.0
+    "@typescript-eslint/type-utils": 5.46.0
+    "@typescript-eslint/utils": 5.46.0
     debug: ^4.3.4
     ignore: ^5.2.0
     natural-compare-lite: ^1.4.0
@@ -645,43 +645,43 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 9fc7cc17ebd1d6f9b1321afa3dcedb936ba538f95a026035a436c4b75eb976ac61140be44be304634c8f87612e30690ce12bf3498ac59826134387d91d75d888
+  checksum: 5b7dde66a3db3d3009c9da5c1357d72c19b94d75474d8f51b6ac765962aa181bf8fe88fcca02a70faaceb2ed5739f790313d1d521d77149cab94ab5e3a987cf3
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:^5.45.1":
-  version: 5.45.1
-  resolution: "@typescript-eslint/parser@npm:5.45.1"
+"@typescript-eslint/parser@npm:^5.46.0":
+  version: 5.46.0
+  resolution: "@typescript-eslint/parser@npm:5.46.0"
   dependencies:
-    "@typescript-eslint/scope-manager": 5.45.1
-    "@typescript-eslint/types": 5.45.1
-    "@typescript-eslint/typescript-estree": 5.45.1
+    "@typescript-eslint/scope-manager": 5.46.0
+    "@typescript-eslint/types": 5.46.0
+    "@typescript-eslint/typescript-estree": 5.46.0
     debug: ^4.3.4
   peerDependencies:
     eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 48704224972e67d7ecf928118d47a1eda6732afd585bb4aab6716b7d363e5d4a2e0b0f1bbb92cbef80c7dd75ede10b610e858eb0cb86a67d1866fd17d0722895
+  checksum: 34e2e8fb35050ac119ed2696293ecd9a1b40c3ccc915d06b8d48880c6656e8f40665b969807b76058eb9198227481653f1d1465a89a4ac6a98bc7ab9850ada1f
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:5.45.1":
-  version: 5.45.1
-  resolution: "@typescript-eslint/scope-manager@npm:5.45.1"
+"@typescript-eslint/scope-manager@npm:5.46.0":
+  version: 5.46.0
+  resolution: "@typescript-eslint/scope-manager@npm:5.46.0"
   dependencies:
-    "@typescript-eslint/types": 5.45.1
-    "@typescript-eslint/visitor-keys": 5.45.1
-  checksum: ee0f47ad85e6d8649a5c25cc923933e439542079929e02a7eb20332e18291674af36b25ab579f7d067745ca27c2b37e5d9be605902269968e274d26c1d2b684e
+    "@typescript-eslint/types": 5.46.0
+    "@typescript-eslint/visitor-keys": 5.46.0
+  checksum: 10d992a6f9bbe747a8fb5f8b02732e3a289d2667e32ea835de825efe7a841688e683ae1d15d250df84c2ada313b9a3f41c9c9b5ae924c3d9b90d73f23241ae7f
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:5.45.1":
-  version: 5.45.1
-  resolution: "@typescript-eslint/type-utils@npm:5.45.1"
+"@typescript-eslint/type-utils@npm:5.46.0":
+  version: 5.46.0
+  resolution: "@typescript-eslint/type-utils@npm:5.46.0"
   dependencies:
-    "@typescript-eslint/typescript-estree": 5.45.1
-    "@typescript-eslint/utils": 5.45.1
+    "@typescript-eslint/typescript-estree": 5.46.0
+    "@typescript-eslint/utils": 5.46.0
     debug: ^4.3.4
     tsutils: ^3.21.0
   peerDependencies:
@@ -689,23 +689,23 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: dcb9f425803b399c340ab3d72c3f7e61f2a136d4281bd710853e954c1c101064ac0bb4b768c84c1ad310ec493cd8dc6b754054d9a81cb56be37ef1f4130c2c3a
+  checksum: 96feae3b67b78bc74b916bb7c3c654c13c6f000fc1f6945709764010fb6644e7cbf7749faa6ab0562255197b49fbf7c28c9a5b558378fa74e2cd38aeddc459cb
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:5.45.1":
-  version: 5.45.1
-  resolution: "@typescript-eslint/types@npm:5.45.1"
-  checksum: 7f809d2951812ae5752c9d1617b7e6dfd662370390b0ddba72005ebc62bd5f04745567bb62cf00a9e43db9dfd222d18ea22945f5457f76ea86386ef7b98c8424
+"@typescript-eslint/types@npm:5.46.0":
+  version: 5.46.0
+  resolution: "@typescript-eslint/types@npm:5.46.0"
+  checksum: 162e2e7841369598d3018f315545e85b79e57cc2f9033770397dbbdab0c80d72a8ee791710d10570b70624b5f343f7f8fc7ffabaec62f708cd7bfc5b432ad595
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:5.45.1":
-  version: 5.45.1
-  resolution: "@typescript-eslint/typescript-estree@npm:5.45.1"
+"@typescript-eslint/typescript-estree@npm:5.46.0":
+  version: 5.46.0
+  resolution: "@typescript-eslint/typescript-estree@npm:5.46.0"
   dependencies:
-    "@typescript-eslint/types": 5.45.1
-    "@typescript-eslint/visitor-keys": 5.45.1
+    "@typescript-eslint/types": 5.46.0
+    "@typescript-eslint/visitor-keys": 5.46.0
     debug: ^4.3.4
     globby: ^11.1.0
     is-glob: ^4.0.3
@@ -714,35 +714,35 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 867b19ba050af7410c75e4e42b511d4299c8043d238959e9794bb65d7a9db1a875880e5dd50f112896218f3a3d163cd8ce61db94034ca628eca4f7ddccb1d348
+  checksum: 645f9fd65836019073fd7af5bfa0e4c3d47303deda0917c4d8fb6ed6790bebaaeb7020a7a104b96c5fda707eb20e248c38fc711cdc83439775c563ef9f169746
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:5.45.1":
-  version: 5.45.1
-  resolution: "@typescript-eslint/utils@npm:5.45.1"
+"@typescript-eslint/utils@npm:5.46.0":
+  version: 5.46.0
+  resolution: "@typescript-eslint/utils@npm:5.46.0"
   dependencies:
     "@types/json-schema": ^7.0.9
     "@types/semver": ^7.3.12
-    "@typescript-eslint/scope-manager": 5.45.1
-    "@typescript-eslint/types": 5.45.1
-    "@typescript-eslint/typescript-estree": 5.45.1
+    "@typescript-eslint/scope-manager": 5.46.0
+    "@typescript-eslint/types": 5.46.0
+    "@typescript-eslint/typescript-estree": 5.46.0
     eslint-scope: ^5.1.1
     eslint-utils: ^3.0.0
     semver: ^7.3.7
   peerDependencies:
     eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: 7e673b07e207a0b596b23f60e6c2d4b04fd534bd15dc326ce67d7f61637ed2c211fe5a5ffdcf6b3fa3f39000fe61de0bf7d0c7feb03dcd3d72c382ae35287ad9
+  checksum: f4962a7d34f55c44b238df550d45aacbc7b8fcba7d172fd96ee17eb5ce964481e3e68376205598146f4f3aa69df7627686a9bd16022b51246d6e9fe94ffb2bb8
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:5.45.1":
-  version: 5.45.1
-  resolution: "@typescript-eslint/visitor-keys@npm:5.45.1"
+"@typescript-eslint/visitor-keys@npm:5.46.0":
+  version: 5.46.0
+  resolution: "@typescript-eslint/visitor-keys@npm:5.46.0"
   dependencies:
-    "@typescript-eslint/types": 5.45.1
+    "@typescript-eslint/types": 5.46.0
     eslint-visitor-keys: ^3.3.0
-  checksum: 725a434fb05010b6ead7e880fa1fcdb4dbc7421b80667e96ad27fcfb3c2b2b0edde64be488740577dd147547fc4a9eac52e2602eb6a8a261ee14a917d4a50c4f
+  checksum: 83ec2514b2469db395f006576c934bd60b21e74e2e67c183f8d9249954119c56074de286ce8c55d42e20b06d0083d4665f3baf0eed720712203796be488f0944
   languageName: node
   linkType: hard
 
@@ -2687,8 +2687,8 @@ __metadata:
   dependencies:
     "@fortawesome/fontawesome-free": ^6.2.1
     "@prettier/plugin-php": ^0.19.2
-    "@typescript-eslint/eslint-plugin": ^5.45.1
-    "@typescript-eslint/parser": ^5.45.1
+    "@typescript-eslint/eslint-plugin": ^5.46.0
+    "@typescript-eslint/parser": ^5.46.0
     cssnano: ^5.1.14
     eslint: ^8.29.0
     eslint-config-prettier: ^8.5.0
@@ -2709,7 +2709,7 @@ __metadata:
     stylelint: ^14.16.0
     stylelint-config-prettier: ^9.0.4
     stylelint-config-standard: ^29.0.0
-    typescript: ^4.9.3
+    typescript: ^4.9.4
     vitepress: 1.0.0-alpha.30
     vue: ^3.2.45
   languageName: unknown
@@ -5781,23 +5781,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@npm:^4.9.3":
-  version: 4.9.3
-  resolution: "typescript@npm:4.9.3"
+"typescript@npm:^4.9.4":
+  version: 4.9.4
+  resolution: "typescript@npm:4.9.4"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 17b8f816050b412403e38d48eef0e893deb6be522d6dc7caf105e54a72e34daf6835c447735fd2b28b66784e72bfbf87f627abb4818a8e43d1fa8106396128dc
+  checksum: e782fb9e0031cb258a80000f6c13530288c6d63f1177ed43f770533fdc15740d271554cdae86701c1dd2c83b082cea808b07e97fd68b38a172a83dbf9e0d0ef9
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@^4.9.3#~builtin<compat/typescript>":
-  version: 4.9.3
-  resolution: "typescript@patch:typescript@npm%3A4.9.3#~builtin<compat/typescript>::version=4.9.3&hash=d73830"
+"typescript@patch:typescript@^4.9.4#~builtin<compat/typescript>":
+  version: 4.9.4
+  resolution: "typescript@patch:typescript@npm%3A4.9.4#~builtin<compat/typescript>::version=4.9.4&hash=d73830"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 67ca21a387c0572f1c04936e638dde7782c5aa520c3754aadc7cc9b7c915da9ebc3e27c601bfff4ccb7d7264e82dce6d277ada82ec09dc75024349e0ef64926d
+  checksum: 37f6e2c3c5e2aa5934b85b0fddbf32eeac8b1bacf3a5b51d01946936d03f5377fe86255d4e5a4ae628fd0cd553386355ad362c57f13b4635064400f3e8e05b9d
   languageName: node
   linkType: hard