Apply more Prettier formatting (#3122)

* Tidy copy

* Improve link URL

* Bump node deps

* Apply Prettier formatting

* Manually apply Prettier formatting

package.json

@@ -34,10 +34,10 @@
 		"markdownlint-cli2": "^0.5.1",
 		"postcss": "^8.4.19",
 		"postcss-cli": "^10.1.0",
-		"postcss-import": "^15.0.1",
+		"postcss-import": "^15.1.0",
 		"postcss-preset-env": "^7.8.3",
 		"postcss-size": "^4.0.1",
-		"prettier": "^2.8.0",
+		"prettier": "^2.8.1",
 		"prettier-plugin-nginx": "^1.0.2",
 		"prettier-plugin-sh": "^0.12.8",
 		"prettier-plugin-sql": "^0.12.1",

web/css/src/themes/default.css

@@ -161,7 +161,7 @@
 	border-top: none;
 
 	@media (--viewport-small) {
-		width: 320px;
+		width: 330px;
 	}
 
 	@media (--viewport-medium) {

web/templates/footer.php

@@ -1,26 +1,25 @@
 	</main>
-<?php
-	if (($_SESSION['userContext'] === 'admin') && ($_SESSION['POLICY_SYSTEM_HIDE_SERVICES'] !== 'yes')) {
-		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.
+<?php if (
+	$_SESSION["userContext"] === "admin" &&
+	$_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>
-		<div style="margin-top: 4px;"></div><a href="#" x-on:click="open = false">Hide</a></div>
-	</div>
-<?php
-		}
-	}
-?>
-	<div title="<?=_('Confirmation');?>" class="dialog js-confirm-dialog-redirect">
-		<p><?=_('LEAVE_PAGE_CONFIRMATION')?></p>
+	<?php } ?>
+<?php } ?>
+	<div title="<?= _("Confirmation") ?>" class="dialog js-confirm-dialog-redirect">
+		<p><?= _("LEAVE_PAGE_CONFIRMATION") ?></p>
 	</div>
 
 	<div x-data>
 		<dialog x-ref="dialog" class="shortcuts animate__animated animate__fadeIn">
 			<div class="shortcuts-header">
-				<div class="shortcuts-title"><?=_('Shortcuts')?></div>
+				<div class="shortcuts-title"><?= _("Shortcuts") ?></div>
 				<div
 					x-on:click="$refs.dialog.close()"
 					class="shortcuts-close"
@@ -30,24 +29,24 @@
 			</div>
 			<div class="shortcuts-inner">
 				<ul class="shortcuts-list">
-					<li><span class="key">a</span><?=_('Add New object')?></li>
-					<li><span class="key">Ctrl + Enter</span><?=_('Save Form')?></li>
-					<li class="u-mb20"><span class="key">Ctrl + Backspace</span><?=_('Cancel saving form')?></li>
-					<li><span class="key">1</span><?=_('Go to WEB list')?></li>
-					<li><span class="key">2</span><?=_('Go to DNS list')?></li>
-					<li><span class="key">3</span><?=_('Go to MAIL list')?></li>
-					<li><span class="key">4</span><?=_('Go to DB list')?></li>
-					<li><span class="key">5</span><?=_('Go to CRON list')?></li>
-					<li><span class="key">6</span><?=_('Go to BACKUP list')?></li>
+					<li><span class="key">a</span><?= _("Add New object") ?></li>
+					<li><span class="key">Ctrl + Enter</span><?= _("Save Form") ?></li>
+					<li class="u-mb20"><span class="key">Ctrl + Backspace</span><?= _("Cancel saving form") ?></li>
+					<li><span class="key">1</span><?= _("Go to WEB list") ?></li>
+					<li><span class="key">2</span><?= _("Go to DNS list") ?></li>
+					<li><span class="key">3</span><?= _("Go to MAIL list") ?></li>
+					<li><span class="key">4</span><?= _("Go to DB list") ?></li>
+					<li><span class="key">5</span><?= _("Go to CRON list") ?></li>
+					<li><span class="key">6</span><?= _("Go to BACKUP list") ?></li>
 				</ul>
 				<ul class="shortcuts-list">
-					<li class="u-mb20"><span class="key">f</span><?=_('Focus on search')?></li>
-					<li class="u-mb20"><span class="key">h</span><?=_('Display/Close shortcuts')?></li>
-					<li><span class="key bigger">&larr;</span><?=_('Move backward through top menu')?></li>
-					<li><span class="key bigger">&rarr;</span><?=_('Move forward through top menu')?></li>
-					<li class="u-mb20"><span class="key">Enter</span><?=_('Enter focused element')?></li>
-					<li><span class="key bigger">&uarr;</span><?=_('Move up through elements list')?></li>
-					<li><span class="key bigger">&darr;</span><?=_('Move down through elements list')?></li>
+					<li class="u-mb20"><span class="key">f</span><?= _("Focus on search") ?></li>
+					<li class="u-mb20"><span class="key">h</span><?= _("Display/Close shortcuts") ?></li>
+					<li><span class="key bigger">&larr;</span><?= _("Move backward through top menu") ?></li>
+					<li><span class="key bigger">&rarr;</span><?= _("Move forward through top menu") ?></li>
+					<li class="u-mb20"><span class="key">Enter</span><?= _("Enter focused element") ?></li>
+					<li><span class="key bigger">&uarr;</span><?= _("Move up through elements list") ?></li>
+					<li><span class="key bigger">&darr;</span><?= _("Move down through elements list") ?></li>
 				</ul>
 			</div>
 		</dialog>
@@ -56,24 +55,22 @@
 			x-on:click="$refs.dialog.showModal()"
 			type="button"
 			class="button button-secondary button-circle button-floating button-floating-shortcuts"
-			title="<?=_('Shortcuts');?>"
+			title="<?= _("Shortcuts") ?>"
 		>
 			<i class="fas fa-keyboard"></i>
-			<span class="u-hidden"><?=_('Shortcuts');?></span>
+			<span class="u-hidden"><?= _("Shortcuts") ?></span>
 		</button>
 	</div>
 	<a
 		href="#top"
 		class="button button-secondary button-circle button-floating button-floating-top "
-		title="<?=_('Top');?>"
+		title="<?= _("Top") ?>"
 	>
 		<i class="fas fa-arrow-up"></i>
-		<span class="u-hidden"><?=_('Top');?></span>
+		<span class="u-hidden"><?= _("Top") ?></span>
 	</a>
 
-<?php
-	if (!empty($_SESSION['error_msg'])):
-	?>
+<?php if (!empty($_SESSION["error_msg"])): ?>
 	<div>
 		<script>
 			$(function() {
@@ -95,7 +92,7 @@
 			});
 		</script>
 		<div id="dialog-message" title="">
-			<p><?=htmlentities($_SESSION['error_msg'])?></p>
+			<p><?= htmlentities($_SESSION["error_msg"]) ?></p>
 		</div>
 	</div>
 <?php

web/templates/includes/js.php

@@ -33,7 +33,7 @@
 			UNLIM_VALUE: 'unlimited',
 			UNLIM_TRANSLATED_VALUE: '<?= _("unlimited") ?>',
 			NOTIFICATIONS_EMPTY: '<?= _("no notifications") ?>',
-			NOTIFICATIONS_DELETE_ALL: '<?= _("Delete notifications") ?>',
+			NOTIFICATIONS_DELETE_ALL: '<?= _("Delete all notifications") ?>',
 			isUnlimitedValue(value) {
 				return value.trim() == this.UNLIM_VALUE || value.trim() == this.UNLIM_TRANSLATED_VALUE;
 			}

web/templates/includes/panel.php

@@ -1,4 +1,4 @@
-<div id="token" token="<?=$_SESSION['token']?>"></div>
+<div id="token" token="<?= $_SESSION["token"] ?>"></div>
 
 <header class="app-header">
 
@@ -9,8 +9,8 @@
 			<div class="top-bar-left">
 
 				<!-- Logo / Home Button -->
-				<a href="<?=htmlspecialchars($home_url)?>" class="top-bar-logo" title="<?=_('Hestia Control Panel');?>">
-					<img src="/images/logo-header.svg" alt="<?=_('Hestia Control Panel');?>" width="54" height="29">
+				<a href="<?= htmlspecialchars($home_url) ?>" class="top-bar-logo" title="<?= _("Hestia Control Panel") ?>">
+					<img src="/images/logo-header.svg" alt="<?= _("Hestia Control Panel") ?>" width="54" height="29">
 				</a>
 
 				<!-- Usage Statistics -->
@@ -26,16 +26,16 @@
 					?>
 					<div class="top-bar-usage-inner">
 						<span class="top-bar-usage-item">
-							<i class="fas <?=$user_icon;?>" title="<?=_('Logged in as');?>: <?=htmlspecialchars($panel[$user]['NAME'])?>"></i>
-							<b><?=htmlspecialchars($user)?></b>
+							<i class="fas <?= $user_icon ?>" title="<?= _("Logged in as") ?>: <?= htmlspecialchars($panel[$user]["NAME"]) ?>"></i>
+							<b><?= htmlspecialchars($user) ?></b>
 						</span>
 						<span class="top-bar-usage-item">
-							<i class="fas fa-hard-drive" title="<?=_('Disk');?>: <?=humanize_usage_size($panel[$user]['U_DISK'])?> <?=humanize_usage_measure($panel[$user]['U_DISK'])?>"></i>
-							<b><?=humanize_usage_size($panel[$user]['U_DISK'])?></b> <?=humanize_usage_measure($panel[$user]['U_DISK'])?>
+							<i class="fas fa-hard-drive" title="<?= _("Disk") ?>: <?= humanize_usage_size($panel[$user]["U_DISK"]) ?> <?= humanize_usage_measure($panel[$user]["U_DISK"]) ?>"></i>
+							<b><?= humanize_usage_size($panel[$user]["U_DISK"]) ?></b> <?= humanize_usage_measure($panel[$user]["U_DISK"]) ?>
 						</span>
 						<span class="top-bar-usage-item">
-							<i class="fas fa-right-left" title="<?=_('Bandwidth');?>: <?=humanize_usage_size($panel[$user]['U_BANDWIDTH'])?> <?=humanize_usage_measure($panel[$user]['U_BANDWIDTH'])?>"></i>
-							<b><?=humanize_usage_size($panel[$user]['U_BANDWIDTH'])?></b> <?=humanize_usage_measure($panel[$user]['U_BANDWIDTH'])?>
+							<i class="fas fa-right-left" title="<?= _("Bandwidth") ?>: <?= humanize_usage_size($panel[$user]["U_BANDWIDTH"]) ?> <?= humanize_usage_measure($panel[$user]["U_BANDWIDTH"]) ?>"></i>
+							<b><?= humanize_usage_size($panel[$user]["U_BANDWIDTH"]) ?></b> <?= humanize_usage_measure($panel[$user]["U_BANDWIDTH"]) ?>
 						</span>
 					</div>
 				</div>
@@ -56,15 +56,15 @@
 							x-bind:class="open && 'active'"
 							class="top-bar-menu-link"
 							type="button"
-							title="<?=_('Notifications');?>"
+							title="<?= _("Notifications") ?>"
 						>
 							<i
 								x-bind:class="{
-									'animate__animated animate__swing status-icon orange': (!initialized && <?= $panel[$user]['NOTIFICATIONS'] == 'yes' ? 'true': 'false' ?>) || notifications.length != 0,
+									'animate__animated animate__swing status-icon orange': (!initialized && <?= $panel[$user]["NOTIFICATIONS"] == "yes" ? "true" : "false" ?>) || notifications.length != 0,
 									'fas fa-bell': true
 								}"
 							></i>
-							<span class="u-hidden"><?=_('Notifications');?></span>
+							<span class="u-hidden"><?= _("Notifications") ?></span>
 						</button>
 						<ul
 							x-cloak
@@ -108,7 +108,7 @@
 										class="top-bar-notification-mark-all"
 									>
 										<i class="fas fa-check"></i>
-										<?= _("Delete notifications") ?>
+										<?= _("Delete all notifications") ?>
 									</a>
 								</li>
 							</template>
@@ -119,56 +119,56 @@
 				<!-- Menu -->
 				<nav x-data="{ open: false }" class="top-bar-menu">
 
-					<button x-on:click="open = !open" type="button" class="top-bar-menu-link u-hide-tablet" title="<?=_('Toggle menu');?>">
+					<button x-on:click="open = !open" type="button" class="top-bar-menu-link u-hide-tablet" title="<?= _("Toggle menu") ?>">
 						<i class="fas fa-bars"></i>
-						<span class="u-hidden"><?=_('Toggle menu');?></span>
+						<span class="u-hidden"><?= _("Toggle menu") ?></span>
 					</button>
 
 					<ul x-cloak x-show="open" class="top-bar-menu-list animate__animated animate__fadeIn">
 
 						<!-- File Manager -->
-						<?php if ((isset($_SESSION['FILE_MANAGER'])) && (!empty($_SESSION['FILE_MANAGER'])) && ($_SESSION['FILE_MANAGER'] == "true")) {?>
-							<?php if (($_SESSION['userContext'] === 'admin') && (isset($_SESSION['look']) && ($_SESSION['look'] === 'admin') && ($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] == 'yes'))) {?>
+						<?php if (isset($_SESSION["FILE_MANAGER"]) && !empty($_SESSION["FILE_MANAGER"]) && $_SESSION["FILE_MANAGER"] == "true") { ?>
+							<?php if ($_SESSION["userContext"] === "admin" && (isset($_SESSION["look"]) && $_SESSION["look"] === "admin" && $_SESSION["POLICY_SYSTEM_PROTECTED_ADMIN"] == "yes")) { ?>
 								<!-- Hide file manager when impersonating admin-->
 							<?php } else { ?>
 								<li class="top-bar-menu-item">
-									<a title="<?=_('File manager');?>" class="top-bar-menu-link <?php if($TAB == 'FM') echo 'active' ?>" href="/fm/">
+									<a title="<?= _("File manager") ?>" class="top-bar-menu-link <?php if($TAB == 'FM') echo 'active' ?>" href="/fm/">
 										<i class="fas fa-folder-open"></i>
-										<span class="top-bar-menu-link-label u-hide-desktop"><?=_('File manager');?></span>
+										<span class="top-bar-menu-link-label u-hide-desktop"><?= _("File manager") ?></span>
 									</a>
 								</li>
 							<?php } ?>
 						<?php } ?>
 
 						<!-- Server Settings -->
-						<?php if (($_SESSION['userContext'] === 'admin') && ($_SESSION['POLICY_SYSTEM_HIDE_SERVICES'] !== 'yes') || ($_SESSION['user'] === 'admin')) {?>
-							<?php if (($_SESSION['userContext'] === 'admin') && (!empty($_SESSION['look']))) {?>
+						<?php if (($_SESSION["userContext"] === "admin" && $_SESSION["POLICY_SYSTEM_HIDE_SERVICES"] !== "yes") || $_SESSION["user"] === "admin") { ?>
+							<?php if ($_SESSION["userContext"] === "admin" && !empty($_SESSION["look"])) { ?>
 								<!-- Hide 'Server Settings' button when impersonating 'admin' or other users -->
 							<?php } else { ?>
 								<li class="top-bar-menu-item">
-									<a title="<?=_('Server');?>" class="top-bar-menu-link <?php if(in_array($TAB, ['SERVER', 'IP', 'RRD', 'FIREWALL'])) echo 'active' ?>" href="/list/server/">
+									<a title="<?= _("Server") ?>" class="top-bar-menu-link <?php if(in_array($TAB, ['SERVER', 'IP', 'RRD', 'FIREWALL'])) echo 'active' ?>" href="/list/server/">
 										<i class="fas fa-gear"></i>
-										<span class="top-bar-menu-link-label u-hide-desktop"><?=_('Server');?></span>
+										<span class="top-bar-menu-link-label u-hide-desktop"><?= _("Server") ?></span>
 									</a>
 								</li>
 							<?php } ?>
 						<?php } ?>
 
 						<!-- Edit User -->
-						<?php if (($_SESSION['userContext'] === 'admin') && (isset($_SESSION['look']) && ($user == 'admin'))) {?>
+						<?php if ($_SESSION["userContext"] === "admin" && (isset($_SESSION["look"]) && $user == "admin")) { ?>
 							<!-- Hide 'edit user' entry point from other administrators for default 'admin' account-->
 							<li class="top-bar-menu-item">
-								<a title="<?=_('Logs');?>" class="top-bar-menu-link <?php if($TAB == 'LOG') echo 'active' ?>" href="/list/log/">
+								<a title="<?= _("Logs") ?>" class="top-bar-menu-link <?php if($TAB == 'LOG') echo 'active' ?>" href="/list/log/">
 									<i class="fas fa-clock-rotate-left"></i>
-									<span class="top-bar-menu-link-label u-hide-desktop"><?=_('Logs');?></span>
+									<span class="top-bar-menu-link-label u-hide-desktop"><?= _("Logs") ?></span>
 								</a>
 							</li>
 						<?php } else { ?>
-							<?php if ($panel[$user]['SUSPENDED'] === 'no') {?>
+							<?php if ($panel[$user]["SUSPENDED"] === "no") { ?>
 								<li class="top-bar-menu-item">
-									<a title="<?=htmlspecialchars($user)?> (<?=htmlspecialchars($panel[$user]['NAME'])?>)" class="top-bar-menu-link" href="/edit/user/?user=<?=$user; ?>&token=<?=$_SESSION['token']?>">
+									<a title="<?= htmlspecialchars($user) ?> (<?= htmlspecialchars($panel[$user]["NAME"]) ?>)" class="top-bar-menu-link" href="/edit/user/?user=<?= $user ?>&token=<?= $_SESSION["token"] ?>">
 										<i class="fas fa-circle-user"></i>
-										<span class="top-bar-menu-link-label u-hide-desktop"><?=htmlspecialchars($user)?> (<?=htmlspecialchars($panel[$user]['NAME'])?>)</span>
+										<span class="top-bar-menu-link-label u-hide-desktop"><?= htmlspecialchars($user) ?> (<?= htmlspecialchars($panel[$user]["NAME"]) ?>)</span>
 									</a>
 								</li>
 							<?php } ?>
@@ -176,33 +176,33 @@
 
 						<!-- Statistics -->
 						<li class="top-bar-menu-item">
-							<a title="<?=_('Statistics');?>" class="top-bar-menu-link <?php if($TAB == 'STATS') echo 'active' ?>" href="/list/stats/">
+							<a title="<?= _("Statistics") ?>" class="top-bar-menu-link <?php if($TAB == 'STATS') echo 'active' ?>" href="/list/stats/">
 								<i class="fas fa-chart-line"></i>
-								<span class="top-bar-menu-link-label u-hide-desktop"><?=_('Statistics');?></span>
+								<span class="top-bar-menu-link-label u-hide-desktop"><?= _("Statistics") ?></span>
 							</a>
 						</li>
 
 						<!-- Help / Documentation -->
 						<li class="top-bar-menu-item">
-							<a title="<?=_('Help');?>" class="top-bar-menu-link" href="https://docs.hestiacp.com/" target="_blank" rel="noopener">
+							<a title="<?= _("Help") ?>" class="top-bar-menu-link" href="https://docs.hestiacp.com/" target="_blank" rel="noopener">
 								<i class="fas fa-circle-question"></i>
-								<span class="top-bar-menu-link-label u-hide-desktop"><?=_('Help');?></span>
+								<span class="top-bar-menu-link-label u-hide-desktop"><?= _("Help") ?></span>
 							</a>
 						</li>
 
 						<!-- Logout -->
-						<?php if (isset($_SESSION['look']) && (!empty($_SESSION['look']))) { ?>
+						<?php if (isset($_SESSION["look"]) && !empty($_SESSION["look"])) { ?>
 							<li class="top-bar-menu-item">
-								<a title="<?=_('Log out');?> (<?=$user?>)" class="top-bar-menu-link top-bar-menu-link-logout" href="/logout/?token=<?=$_SESSION['token']?>">
+								<a title="<?= _("Log out") ?> (<?= $user ?>)" class="top-bar-menu-link top-bar-menu-link-logout" href="/logout/?token=<?= $_SESSION["token"] ?>">
 									<i class="fas fa-circle-up"></i>
-									<span class="top-bar-menu-link-label u-hide-desktop"><?=_('Log out');?> (<?=$user?>)</span>
+									<span class="top-bar-menu-link-label u-hide-desktop"><?= _("Log out") ?> (<?= $user ?>)</span>
 								</a>
 							</li>
 						<?php } else { ?>
 							<li class="top-bar-menu-item">
-								<a title="<?=_('Log out');?>" class="top-bar-menu-link top-bar-menu-link-logout" href="/logout/?token=<?=$_SESSION['token']?>">
+								<a title="<?= _("Log out") ?>" class="top-bar-menu-link top-bar-menu-link-logout" href="/logout/?token=<?= $_SESSION["token"] ?>">
 									<i class="fas fa-right-from-bracket"></i>
-									<span class="top-bar-menu-link-label u-hide-desktop"><?=_('Log out');?></span>
+									<span class="top-bar-menu-link-label u-hide-desktop"><?= _("Log out") ?></span>
 								</a>
 							</li>
 						<?php } ?>
@@ -220,7 +220,7 @@
 			<button x-on:click="open = !open" type="button" class="main-menu-toggle">
 				<i class="fas fa-bars"></i>
 				<span
-					x-text="open ? '<?=_('Collapse main menu');?>' : '<?=_('Expand main menu');?>'"
+					x-text="open ? '<?= _("Collapse main menu") ?>' : '<?= _("Expand main menu") ?>'"
 					class="main-menu-toggle-label"
 				>
 				</span>
@@ -237,14 +237,14 @@
 						}
 					?>
 					<li class="main-menu-item">
-						<a class="main-menu-item-link <?php if(in_array($TAB, ['USER', 'LOG'])) echo 'active' ?>" href="/list/user/" title="<?=_('Users');?>: <?=$user_count;?>&#13;<?=_('Suspended');?>: <?=$panel[$user]['SUSPENDED_USERS']?>">
-							<p class="main-menu-item-label"><?=_('USER');?><i class="fas fa-users"></i></p>
+						<a class="main-menu-item-link <?php if(in_array($TAB, ['USER', 'LOG'])) echo 'active' ?>" href="/list/user/" title="<?= _("Users") ?>: <?=$user_count;?>&#13;<?= _("Suspended") ?>: <?=$panel[$user]['SUSPENDED_USERS']?>">
+							<p class="main-menu-item-label"><?= _("USER") ?><i class="fas fa-users"></i></p>
 							<ul class="main-menu-stats">
 								<li>
-									<?=_('users');?>: <span><?=htmlspecialchars($user_count);?></span>
+									<?= _("users") ?>: <span><?= htmlspecialchars($user_count) ?></span>
 								</li>
 								<li>
-									<?=_('spnd');?>: <span><?=$panel[$user]['SUSPENDED_USERS']?></span>
+									<?= _("spnd") ?>: <span><?= $panel[$user]["SUSPENDED_USERS"] ?></span>
 								</li>
 							</ul>
 						</a>
@@ -252,17 +252,17 @@
 				<?php } ?>
 
 				<!-- Web tab -->
-				<?php if ((isset($_SESSION['WEB_SYSTEM'])) && (!empty($_SESSION['WEB_SYSTEM']))) {?>
-					<?php if($panel[$user]['WEB_DOMAINS'] != "0") { ?>
+				<?php if (isset($_SESSION["WEB_SYSTEM"]) && !empty($_SESSION["WEB_SYSTEM"])) { ?>
+					<?php if ($panel[$user]["WEB_DOMAINS"] != "0") { ?>
 						<li class="main-menu-item">
-							<a class="main-menu-item-link <?php if($TAB == 'WEB') echo 'active' ?>" href="/list/web/" title="<?=_('Domains');?>: <?=$panel[$user]['U_WEB_DOMAINS']?>&#13;<?=_('Aliases');?>: <?=$panel[$user]['U_WEB_ALIASES']?>&#13;<?=_('Limit')?>: <?=$panel[$user]['WEB_DOMAINS']=='unlimited' ? "∞" : $panel[$user]['WEB_DOMAINS']?>&#13;<?=_('Suspended');?>: <?=$panel[$user]['SUSPENDED_WEB']?>">
-								<p class="main-menu-item-label"><?=_('WEB');?><i class="fas fa-earth-americas"></i></p>
+							<a class="main-menu-item-link <?php if($TAB == 'WEB') echo 'active' ?>" href="/list/web/" title="<?= _("Domains") ?>: <?=$panel[$user]['U_WEB_DOMAINS']?>&#13;<?= _("Aliases") ?>: <?=$panel[$user]['U_WEB_ALIASES']?>&#13;<?= _("Limit") ?>: <?=$panel[$user]['WEB_DOMAINS']=='unlimited' ? "∞" : $panel[$user]['WEB_DOMAINS']?>&#13;<?= _("Suspended") ?>: <?=$panel[$user]['SUSPENDED_WEB']?>">
+								<p class="main-menu-item-label"><?= _("WEB") ?><i class="fas fa-earth-americas"></i></p>
 								<ul class="main-menu-stats">
 									<li>
-										<?=_('domains');?>: <span><?=$panel[$user]['U_WEB_DOMAINS']?> / <?=$panel[$user]['WEB_DOMAINS']=='unlimited' ? "<b>∞</b>" : $panel[$user]['WEB_DOMAINS']?> (<?=$panel[$user]['SUSPENDED_WEB']?>)</span>
+										<?= _("domains") ?>: <span><?= $panel[$user]["U_WEB_DOMAINS"] ?> / <?= $panel[$user]["WEB_DOMAINS"] == "unlimited" ? "<b>∞</b>" : $panel[$user]["WEB_DOMAINS"] ?> (<?= $panel[$user]["SUSPENDED_WEB"] ?>)</span>
 									</li>
 									<li>
-										<?=_('aliases');?>: <span><?=$panel[$user]['U_WEB_ALIASES']?> / <?=$panel[$user]['WEB_ALIASES']=='unlimited' || $panel[$user]['WEB_DOMAINS']=='unlimited' ? "<b>∞</b>" : $panel[$user]['WEB_ALIASES'] * $panel[$user]['WEB_DOMAINS']?></span>
+										<?= _("aliases") ?>: <span><?= $panel[$user]["U_WEB_ALIASES"] ?> / <?= $panel[$user]["WEB_ALIASES"] == "unlimited" || $panel[$user]["WEB_DOMAINS"] == "unlimited" ? "<b>∞</b>" : $panel[$user]["WEB_ALIASES"] * $panel[$user]["WEB_DOMAINS"] ?></span>
 									</li>
 								</ul>
 							</a>
@@ -271,17 +271,17 @@
 				<?php } ?>
 
 				<!-- DNS tab -->
-				<?php if ((isset($_SESSION['DNS_SYSTEM'])) && (!empty($_SESSION['DNS_SYSTEM']))) {?>
-					<?php if($panel[$user]['DNS_DOMAINS'] != "0") { ?>
+				<?php if (isset($_SESSION["DNS_SYSTEM"]) && !empty($_SESSION["DNS_SYSTEM"])) { ?>
+					<?php if ($panel[$user]["DNS_DOMAINS"] != "0") { ?>
 						<li class="main-menu-item">
-							<a class="main-menu-item-link <?php if($TAB == 'DNS') echo 'active' ?>" href="/list/dns/" title="<?=_('Domains');?>: <?=$panel[$user]['U_DNS_DOMAINS']?>&#13;<?=_('Limit')?>: <?=$panel[$user]['DNS_DOMAINS']=='unlimited' ? "∞" : $panel[$user]['DNS_DOMAINS']?>&#13;<?=_('Suspended');?>: <?=$panel[$user]['SUSPENDED_DNS']?>">
-								<p class="main-menu-item-label"><?=_('DNS');?><i class="fas fa-book-atlas"></i></p>
+							<a class="main-menu-item-link <?php if($TAB == 'DNS') echo 'active' ?>" href="/list/dns/" title="<?= _("Domains") ?>: <?=$panel[$user]['U_DNS_DOMAINS']?>&#13;<?= _("Limit") ?>: <?=$panel[$user]['DNS_DOMAINS']=='unlimited' ? "∞" : $panel[$user]['DNS_DOMAINS']?>&#13;<?= _("Suspended") ?>: <?=$panel[$user]['SUSPENDED_DNS']?>">
+								<p class="main-menu-item-label"><?= _("DNS") ?><i class="fas fa-book-atlas"></i></p>
 								<ul class="main-menu-stats">
 									<li>
-										<?=_('zones');?>: <span><?=$panel[$user]['U_DNS_DOMAINS']?> / <?=$panel[$user]['DNS_DOMAINS']=='unlimited' ? "<b>∞</b>" : $panel[$user]['DNS_DOMAINS']?> (<?=$panel[$user]['SUSPENDED_DNS']?>)</span>
+										<?= _("zones") ?>: <span><?= $panel[$user]["U_DNS_DOMAINS"] ?> / <?= $panel[$user]["DNS_DOMAINS"] == "unlimited" ? "<b>∞</b>" : $panel[$user]["DNS_DOMAINS"] ?> (<?= $panel[$user]["SUSPENDED_DNS"] ?>)</span>
 									</li>
 									<li>
-										<?=_('records');?>: <span><?=$panel[$user]['U_DNS_RECORDS']?> / <?=$panel[$user]['DNS_RECORDS']=='unlimited' || $panel[$user]['DNS_DOMAINS']=='unlimited' ? "<b>∞</b>" : $panel[$user]['DNS_RECORDS'] * $panel[$user]['DNS_DOMAINS']?></span>
+										<?= _("records") ?>: <span><?= $panel[$user]["U_DNS_RECORDS"] ?> / <?= $panel[$user]["DNS_RECORDS"] == "unlimited" || $panel[$user]["DNS_DOMAINS"] == "unlimited" ? "<b>∞</b>" : $panel[$user]["DNS_RECORDS"] * $panel[$user]["DNS_DOMAINS"] ?></span>
 									</li>
 								</ul>
 							</a>
@@ -290,17 +290,17 @@
 				<?php } ?>
 
 				<!-- Mail tab -->
-				<?php if ((isset($_SESSION['MAIL_SYSTEM'])) && (!empty($_SESSION['MAIL_SYSTEM']))) {?>
-					<?php if($panel[$user]['MAIL_DOMAINS'] != "0") { ?>
+				<?php if (isset($_SESSION["MAIL_SYSTEM"]) && !empty($_SESSION["MAIL_SYSTEM"])) { ?>
+					<?php if ($panel[$user]["MAIL_DOMAINS"] != "0") { ?>
 						<li class="main-menu-item">
-							<a class="main-menu-item-link <?php if($TAB == 'MAIL') echo 'active' ?>" href="/list/mail/" title="<?=_('Domains');?>: <?=$panel[$user]['U_MAIL_DOMAINS']?>&#13;<?=_('Limit')?>: <?=$panel[$user]['MAIL_DOMAINS']=='unlimited' ? "∞" : $panel[$user]['MAIL_DOMAINS']?>&#13;<?=_('Suspended');?>: <?=$panel[$user]['SUSPENDED_MAIL']?>">
-								<p class="main-menu-item-label"><?=_('MAIL');?><i class="fas fa-envelopes-bulk"></i></p>
+							<a class="main-menu-item-link <?php if($TAB == 'MAIL') echo 'active' ?>" href="/list/mail/" title="<?= _("Domains") ?>: <?=$panel[$user]['U_MAIL_DOMAINS']?>&#13;<?= _("Limit") ?>: <?=$panel[$user]['MAIL_DOMAINS']=='unlimited' ? "∞" : $panel[$user]['MAIL_DOMAINS']?>&#13;<?= _("Suspended") ?>: <?=$panel[$user]['SUSPENDED_MAIL']?>">
+								<p class="main-menu-item-label"><?= _("MAIL") ?><i class="fas fa-envelopes-bulk"></i></p>
 								<ul class="main-menu-stats">
 									<li>
-										<?=_('domains');?>: <span><?=$panel[$user]['U_MAIL_DOMAINS']?> / <?=$panel[$user]['MAIL_DOMAINS']=='unlimited' ? "<b>∞</b>" : $panel[$user]['MAIL_DOMAINS']?> (<?=$panel[$user]['SUSPENDED_MAIL']?>)</span>
+										<?= _("domains") ?>: <span><?= $panel[$user]["U_MAIL_DOMAINS"] ?> / <?= $panel[$user]["MAIL_DOMAINS"] == "unlimited" ? "<b>∞</b>" : $panel[$user]["MAIL_DOMAINS"] ?> (<?= $panel[$user]["SUSPENDED_MAIL"] ?>)</span>
 									</li>
 									<li>
-										<?=_('accounts');?>: <span><?=$panel[$user]['U_MAIL_ACCOUNTS']?> / <?=$panel[$user]['MAIL_ACCOUNTS']=='unlimited' || $panel[$user]['MAIL_DOMAINS']=='unlimited' ? "<b>∞</b>" : $panel[$user]['MAIL_ACCOUNTS'] * $panel[$user]['MAIL_DOMAINS']?></span>
+										<?= _("accounts") ?>: <span><?=$panel[$user]['U_MAIL_ACCOUNTS']?> / <?=$panel[$user]['MAIL_ACCOUNTS']=='unlimited' || $panel[$user]['MAIL_DOMAINS']=='unlimited' ? "<b>∞</b>" : $panel[$user]['MAIL_ACCOUNTS'] * $panel[$user]['MAIL_DOMAINS']?></span>
 									</li>
 								</ul>
 							</a>
@@ -309,14 +309,14 @@
 				<?php } ?>
 
 				<!-- Databases tab -->
-				<?php if ((isset($_SESSION['DB_SYSTEM'])) && (!empty($_SESSION['DB_SYSTEM']))) {?>
-					<?php if($panel[$user]['DATABASES'] != "0") { ?>
+				<?php if (isset($_SESSION["DB_SYSTEM"]) && !empty($_SESSION["DB_SYSTEM"])) { ?>
+					<?php if ($panel[$user]["DATABASES"] != "0") { ?>
 						<li class="main-menu-item">
-							<a class="main-menu-item-link <?php if($TAB == 'DB') echo 'active' ?>" href="/list/db/" title="<?=_('Databases');?>: <?=$panel[$user]['U_DATABASES']?>&#13;<?=_('Limit')?>: <?=$panel[$user]['DATABASES']=='unlimited' ? "∞" : $panel[$user]['DATABASES']?>&#13;<?=_('Suspended');?>: <?=$panel[$user]['SUSPENDED_DB']?>">
-								<p class="main-menu-item-label"><?=_('DB');?><i class="fas fa-database"></i></p>
+							<a class="main-menu-item-link <?php if($TAB == 'DB') echo 'active' ?>" href="/list/db/" title="<?= _("Databases") ?>: <?=$panel[$user]['U_DATABASES']?>&#13;<?= _("Limit") ?>: <?=$panel[$user]['DATABASES']=='unlimited' ? "∞" : $panel[$user]['DATABASES']?>&#13;<?= _("Suspended") ?>: <?=$panel[$user]['SUSPENDED_DB']?>">
+								<p class="main-menu-item-label"><?= _("DB") ?><i class="fas fa-database"></i></p>
 								<ul class="main-menu-stats">
 									<li>
-										<?=_('databases');?>: <span><?=$panel[$user]['U_DATABASES']?> / <?=$panel[$user]['DATABASES']=='unlimited' ? "<b>∞</b>" : $panel[$user]['DATABASES']?> (<?=$panel[$user]['SUSPENDED_DB']?>)</span>
+										<?= _("databases") ?>: <span><?= $panel[$user]["U_DATABASES"] ?> / <?= $panel[$user]["DATABASES"] == "unlimited" ? "<b>∞</b>" : $panel[$user]["DATABASES"] ?> (<?= $panel[$user]["SUSPENDED_DB"] ?>)</span>
 									</li>
 								</ul>
 							</a>
@@ -325,14 +325,14 @@
 				<?php } ?>
 
 				<!-- Cron tab -->
-				<?php if ((isset($_SESSION['CRON_SYSTEM'])) && (!empty($_SESSION['CRON_SYSTEM']))) {?>
-					<?php if($panel[$user]['CRON_JOBS'] != "0") { ?>
+				<?php if (isset($_SESSION["CRON_SYSTEM"]) && !empty($_SESSION["CRON_SYSTEM"])) { ?>
+					<?php if ($panel[$user]["CRON_JOBS"] != "0") { ?>
 						<li class="main-menu-item">
-							<a class="main-menu-item-link <?php if($TAB == 'CRON') echo 'active' ?>" href="/list/cron/" title="<?=_('Jobs');?>: <?=$panel[$user]['U_WEB_DOMAINS']?>&#13;<?=_('Limit')?>: <?=$panel[$user]['CRON_JOBS']=='unlimited' ? "∞" : $panel[$user]['CRON_JOBS']?>&#13;<?=_('Suspended');?>: <?=$panel[$user]['SUSPENDED_CRON']?>">
-								<p class="main-menu-item-label"><?=_('CRON');?><i class="fas fa-clock"></i></p>
+							<a class="main-menu-item-link <?php if($TAB == 'CRON') echo 'active' ?>" href="/list/cron/" title="<?= _("Jobs") ?>: <?=$panel[$user]['U_WEB_DOMAINS']?>&#13;<?= _("Limit") ?>: <?=$panel[$user]['CRON_JOBS']=='unlimited' ? "∞" : $panel[$user]['CRON_JOBS']?>&#13;<?= _("Suspended") ?>: <?=$panel[$user]['SUSPENDED_CRON']?>">
+								<p class="main-menu-item-label"><?= _("CRON") ?><i class="fas fa-clock"></i></p>
 								<ul class="main-menu-stats">
 									<li>
-										<?=_('jobs');?>: <span><?=$panel[$user]['U_CRON_JOBS']?> / <?=$panel[$user]['CRON_JOBS']=='unlimited' ? "<b>∞</b>" : $panel[$user]['CRON_JOBS']?> (<?=$panel[$user]['SUSPENDED_CRON']?>)</span>
+										<?= _("jobs") ?>: <span><?= $panel[$user]["U_CRON_JOBS"] ?> / <?= $panel[$user]["CRON_JOBS"] == "unlimited" ? "<b>∞</b>" : $panel[$user]["CRON_JOBS"] ?> (<?= $panel[$user]["SUSPENDED_CRON"] ?>)</span>
 									</li>
 								</ul>
 							</a>
@@ -341,14 +341,14 @@
 				<?php } ?>
 
 				<!-- Backups tab -->
-				<?php if ((isset($_SESSION['BACKUP_SYSTEM'])) && (!empty($_SESSION['BACKUP_SYSTEM']))) {?>
-					<?php if($panel[$user]['BACKUPS'] != "0") { ?>
+				<?php if (isset($_SESSION["BACKUP_SYSTEM"]) && !empty($_SESSION["BACKUP_SYSTEM"])) { ?>
+					<?php if ($panel[$user]["BACKUPS"] != "0") { ?>
 						<li class="main-menu-item">
-							<a class="main-menu-item-link <?php if($TAB == 'BACKUP') echo 'active' ?>" href="/list/backup/" title="<?=_('Backups');?>: <?=$panel[$user]['U_BACKUPS']?>&#13;<?=_('Limit')?>: <?=$panel[$user]['BACKUPS']=='unlimited' ? "∞" : $panel[$user]['BACKUPS']?>">
-								<p class="main-menu-item-label"><?=_('BACKUP');?><i class="fas fa-file-zipper"></i></p>
+							<a class="main-menu-item-link <?php if($TAB == 'BACKUP') echo 'active' ?>" href="/list/backup/" title="<?= _("Backups") ?>: <?=$panel[$user]['U_BACKUPS']?>&#13;<?= _("Limit") ?>: <?=$panel[$user]['BACKUPS']=='unlimited' ? "∞" : $panel[$user]['BACKUPS']?>">
+								<p class="main-menu-item-label"><?= _("BACKUP") ?><i class="fas fa-file-zipper"></i></p>
 								<ul class="main-menu-stats">
 									<li>
-										<?=_('backups');?>: <span><?=$panel[$user]['U_BACKUPS']?> / <?=$panel[$user]['BACKUPS']=='unlimited' ? "<b>∞</b>" : $panel[$user]['BACKUPS']?></span>
+										<?= _("backups") ?>: <span><?= $panel[$user]["U_BACKUPS"] ?> / <?= $panel[$user]["BACKUPS"] == "unlimited" ? "<b>∞</b>" : $panel[$user]["BACKUPS"] ?></span>
 									</li>
 								</ul>
 							</a>

web/templates/pages/add_cron.php

@@ -3,12 +3,12 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/cron/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -20,11 +20,11 @@
 	<div class="helper-container">
 		<div id="tabs" class="cron-helper-tabs">
 			<ul>
-				<li><a href="#tabs-1"><?=_('Minutes');?></a></li>
-				<li><a href="#tabs-2"><?=_('Hourly');?></a></li>
-				<li><a href="#tabs-3"><?=_('Daily');?></a></li>
-				<li><a href="#tabs-4"><?=_('Weekly');?></a></li>
-				<li><a href="#tabs-5"><?=_('Monthly');?></a></li>
+				<li><a href="#tabs-1"><?= _("Minutes") ?></a></li>
+				<li><a href="#tabs-2"><?= _("Hourly") ?></a></li>
+				<li><a href="#tabs-3"><?= _("Daily") ?></a></li>
+				<li><a href="#tabs-4"><?= _("Weekly") ?></a></li>
+				<li><a href="#tabs-5"><?= _("Monthly") ?></a></li>
 			</ul>
 			<div id="tabs-1">
 				<form>
@@ -33,19 +33,19 @@
 					<input type="hidden" name="h_month" value="*">
 					<input type="hidden" name="h_wday" value="*">
 					<div class="u-mt10 u-mb20">
-						<label for="h_min_1" class="form-label first"><?=_('Run Command');?>:</label>
+						<label for="h_min_1" class="form-label first"><?= _("Run Command") ?>:</label>
 						<select class="form-select" name="h_min" id="h_min_1">
-							<option value="*" selected="selected"><?=_('every minute');?></option>
-							<option value="*/2"><?=_('every two minutes');?></option>
-							<option value="*/5"><?=_('every');?> 5</option>
-							<option value="*/10"><?=_('every');?> 10</option>
-							<option value="*/15"><?=_('every');?> 15</option>
-							<option value="*/30"><?=_('every');?> 30</option>
+							<option value="*" selected="selected"><?= _("every minute") ?></option>
+							<option value="*/2"><?= _("every two minutes") ?></option>
+							<option value="*/5"><?= _("every") ?> 5</option>
+							<option value="*/10"><?= _("every") ?> 10</option>
+							<option value="*/15"><?= _("every") ?> 15</option>
+							<option value="*/30"><?= _("every") ?> 30</option>
 						</select>
 					</div>
 					<div class="u-pt10">
 						<button type="submit" class="button button-secondary">
-							<?=_('generate');?>
+							<?= _("generate") ?>
 						</button>
 					</div>
 				</form>
@@ -57,16 +57,16 @@
 					<input type="hidden" name="h_month" value="*">
 					<input type="hidden" name="h_wday" value="*">
 					<div class="u-mt10 u-mb10">
-						<label for="h_hour_2" class="form-label first"><?=_('Run Command');?>:</label>
+						<label for="h_hour_2" class="form-label first"><?= _("Run Command") ?>:</label>
 						<select class="form-select" name="h_hour" id="h_hour_2">
-							<option value="*" selected="selected"><?=_('every hour');?></option>
-							<option value="*/2"><?=_('every two hours');?></option>
-							<option value="*/6"><?=_('every');?> 6</option>
-							<option value="*/12"><?=_('every');?> 12</option>
+							<option value="*" selected="selected"><?= _("every hour") ?></option>
+							<option value="*/2"><?= _("every two hours") ?></option>
+							<option value="*/6"><?= _("every") ?> 6</option>
+							<option value="*/12"><?= _("every") ?> 12</option>
 						</select>
 					</div>
 					<div class="u-mb20">
-						<label for="h_min_2" class="form-label first"><?=_('Minute');?>:</label>
+						<label for="h_min_2" class="form-label first"><?= _("Minute") ?>:</label>
 						<select class="form-select" name="h_min" id="h_min_2" style="width:70px;">
 							<option value="0" selected="selected">00</option>
 							<option value="15">15</option>
@@ -76,7 +76,7 @@
 					</div>
 					<div class="u-pt10">
 						<button type="submit" class="button button-secondary">
-							<?=_('generate');?>
+							<?= _("generate") ?>
 						</button>
 					</div>
 				</form>
@@ -87,19 +87,19 @@
 					<input type="hidden" name="h_month" value="*">
 					<input type="hidden" name="h_wday" value="*">
 					<div class="u-mt10 u-mb10">
-						<label for="h_day_3" class="form-label first"><?=_('Run Command');?>:</label>
+						<label for="h_day_3" class="form-label first"><?= _("Run Command") ?>:</label>
 						<select class="form-select" name="h_day" id="h_day_3">
-							<option value="*" selected="selected"><?=_('every day');?></option>
-							<option value="1-31/2"><?=_('every odd day');?></option>
-							<option value="*/2"><?=_('every even day');?></option>
-							<option value="*/3"><?=_('every');?> 3</option>
-							<option value="*/5"><?=_('every');?> 5</option>
-							<option value="*/10"><?=_('every');?> 10</option>
-							<option value="*/15"><?=_('every');?> 15</option>
+							<option value="*" selected="selected"><?= _("every day") ?></option>
+							<option value="1-31/2"><?= _("every odd day") ?></option>
+							<option value="*/2"><?= _("every even day") ?></option>
+							<option value="*/3"><?= _("every") ?> 3</option>
+							<option value="*/5"><?= _("every") ?> 5</option>
+							<option value="*/10"><?= _("every") ?> 10</option>
+							<option value="*/15"><?= _("every") ?> 15</option>
 						</select>
 					</div>
 					<div class="u-mb20">
-						<label for="h_hour_3" class="form-label first"><?=_('Hour');?>:</label>
+						<label for="h_hour_3" class="form-label first"><?= _("Hour") ?>:</label>
 						<select class="form-select" name="h_hour" id="h_hour_3" style="width:70px;">
 							<option value="0">00</option>
 							<option value="1">01</option>
@@ -126,7 +126,7 @@
 							<option value="22">22</option>
 							<option value="23">23</option>
 						</select>
-						<label for="h_min_3" class="form-label"><?=_('Minute');?>:</label>
+						<label for="h_min_3" class="form-label"><?= _("Minute") ?>:</label>
 						<select class="form-select" name="h_min" id="h_min_3" style="width:70px;">
 							<option value="0" selected="selected">00</option>
 							<option value="1">01</option>
@@ -146,7 +146,7 @@
 					</div>
 					<div class="u-pt10">
 						<button type="submit" class="button button-secondary">
-							<?=_('generate');?>
+							<?= _("generate") ?>
 						</button>
 					</div>
 				</form>
@@ -157,22 +157,22 @@
 					<input type="hidden" name="h_month" value="*">
 					<input type="hidden" name="h_day" value="*">
 					<div class="u-mt10 u-mb10">
-						<label for="h_wday_4" class="form-label first"><?=_('Run Command');?>:</label>
+						<label for="h_wday_4" class="form-label first"><?= _("Run Command") ?>:</label>
 						<select class="form-select" name="h_wday" id="h_wday_4">
-							<option value="*" selected="selected"><?=_('every day');?></option>
-							<option value="1,2,3,4,5"><?=_('weekdays (5 days)');?></option>
-							<option value="0,6"><?=_('weekend (2 days)');?></option>
-							<option value="1"><?=_('Monday');?></option>
-							<option value="2"><?=_('Tuesday');?></option>
-							<option value="3"><?=_('Wednesday');?></option>
-							<option value="4"><?=_('Thursday');?></option>
-							<option value="5"><?=_('Friday');?></option>
-							<option value="6"><?=_('Saturday');?></option>
-							<option value="0"><?=_('Sunday');?></option>
+							<option value="*" selected="selected"><?= _("every day") ?></option>
+							<option value="1,2,3,4,5"><?= _("weekdays (5 days)") ?></option>
+							<option value="0,6"><?= _("weekend (2 days)") ?></option>
+							<option value="1"><?= _("Monday") ?></option>
+							<option value="2"><?= _("Tuesday") ?></option>
+							<option value="3"><?= _("Wednesday") ?></option>
+							<option value="4"><?= _("Thursday") ?></option>
+							<option value="5"><?= _("Friday") ?></option>
+							<option value="6"><?= _("Saturday") ?></option>
+							<option value="0"><?= _("Sunday") ?></option>
 						</select>
 					</div>
 					<div class="u-mb20">
-						<label for="h_hour_4" class="form-label first"><?=_('Hour');?>:</label>
+						<label for="h_hour_4" class="form-label first"><?= _("Hour") ?>:</label>
 						<select class="form-select" name="h_hour" id="h_hour_4" style="width:70px;">
 							<option value="0">00</option>
 							<option value="1">01</option>
@@ -199,7 +199,7 @@
 							<option value="22">22</option>
 							<option value="23">23</option>
 						</select>
-						<label for="h_min_4" class="form-label"><?=_('Minute');?>:</label>
+						<label for="h_min_4" class="form-label"><?= _("Minute") ?>:</label>
 						<select class="form-select" name="h_min" id="h_min_4" style="width:70px;">
 							<option value="0" selected="selected">00</option>
 							<option value="1">01</option>
@@ -219,7 +219,7 @@
 					</div>
 					<div class="u-pt10">
 						<button type="submit" class="button button-secondary">
-							<?=_('generate');?>
+							<?= _("generate") ?>
 						</button>
 					</div>
 				</form>
@@ -229,29 +229,29 @@
 				<form>
 					<input type="hidden" name="h_wday" value="*">
 					<div class="u-mt10 u-mb10">
-						<label for="h_month_5" class="form-label first"><?=_('Run Command');?>:</label>
+						<label for="h_month_5" class="form-label first"><?= _("Run Command") ?>:</label>
 						<select class="form-select" name="h_month" id="h_month_5">
-							<option value="*" selected="selected"><?=_('every month');?></option>
-							<option value="1-11/2"><?=_('every odd month');?></option>
-							<option value="*/2"><?=_('every even month');?></option>
-							<option value="*/3"><?=_('every');?> 3</option>
-							<option value="*/6"><?=_('every');?> 6</option>
-							<option value="1"><?=_('Jan');?></option>
-							<option value="2"><?=_('Feb');?></option>
-							<option value="3"><?=_('Mar');?></option>
-							<option value="4"><?=_('Apr');?></option>
-							<option value="5"><?=_('May');?></option>
-							<option value="6"><?=_('Jun');?></option>
-							<option value="7"><?=_('Jul');?></option>
-							<option value="8"><?=_('Aug');?></option>
-							<option value="9"><?=_('Sep');?></option>
-							<option value="10"><?=_('Oct');?></option>
-							<option value="11"><?=_('Nov');?></option>
-							<option value="12"><?=_('Dec');?></option>
+							<option value="*" selected="selected"><?= _("every month") ?></option>
+							<option value="1-11/2"><?= _("every odd month") ?></option>
+							<option value="*/2"><?= _("every even month") ?></option>
+							<option value="*/3"><?= _("every") ?> 3</option>
+							<option value="*/6"><?= _("every") ?> 6</option>
+							<option value="1"><?= _("Jan") ?></option>
+							<option value="2"><?= _("Feb") ?></option>
+							<option value="3"><?= _("Mar") ?></option>
+							<option value="4"><?= _("Apr") ?></option>
+							<option value="5"><?= _("May") ?></option>
+							<option value="6"><?= _("Jun") ?></option>
+							<option value="7"><?= _("Jul") ?></option>
+							<option value="8"><?= _("Aug") ?></option>
+							<option value="9"><?= _("Sep") ?></option>
+							<option value="10"><?= _("Oct") ?></option>
+							<option value="11"><?= _("Nov") ?></option>
+							<option value="12"><?= _("Dec") ?></option>
 						</select>
 					</div>
 					<div class="u-mb20">
-						<label for="h_day_5" class="form-label first"><?=_('Date');?>:</label>
+						<label for="h_day_5" class="form-label first"><?= _("Date") ?>:</label>
 						<select class="form-select" name="h_day" id="h_day_5" style="width:70px;">
 							<option value="1" selected="selected">1</option>
 							<option value="2">2</option>
@@ -285,7 +285,7 @@
 							<option value="30">30</option>
 							<option value="31">31</option>
 						</select>
-						<label for="h_hour_5" class="form-label"><?=_('Hour');?>:</label>
+						<label for="h_hour_5" class="form-label"><?= _("Hour") ?>:</label>
 						<select class="form-select" name="h_hour" id="h_hour_5" style="width:70px;">
 							<option value="0">00</option>
 							<option value="1">01</option>
@@ -312,7 +312,7 @@
 							<option value="22">22</option>
 							<option value="23">23</option>
 						</select>
-						<label for="h_min_5" class="form-label"><?=_('Minute');?>:</label>
+						<label for="h_min_5" class="form-label"><?= _("Minute") ?>:</label>
 						<select class="form-select" name="h_min" id="h_min_5" style="width:70px;">
 							<option value="0" selected="selected">00</option>
 							<option value="1">01</option>
@@ -332,7 +332,7 @@
 					</div>
 					<div class="u-pt10">
 						<button type="submit" class="button button-secondary">
-							<?=_('generate');?>
+							<?= _("generate") ?>
 						</button>
 					</div>
 				</form>
@@ -341,35 +341,35 @@
 	</div>
 
 	<form id="vstobjects" name="v_add_cron" 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 Cron Job');?></h1>
-			<?php show_alert_message($_SESSION);?>
+			<h1 class="form-title"><?= _("Adding Cron Job") ?></h1>
+			<?php show_alert_message($_SESSION); ?>
 			<div class="u-mb20">
-				<label for="v_cmd" class="form-label"><?=_('Command');?></label>
-				<input type="text" class="form-control" name="v_cmd" id="v_cmd" value="<?=htmlentities(trim($v_cmd, "'"))?>">
+				<label for="v_cmd" class="form-label"><?= _("Command") ?></label>
+				<input type="text" class="form-control" name="v_cmd" id="v_cmd" value="<?= htmlentities(trim($v_cmd, "'")) ?>">
 			</div>
 			<div class="u-mb10">
-				<label for="v_min" class="form-label"><?=_('Minute');?></label>
-				<input type="text" class="form-control" name="v_min" id="v_min" style="width:220px;" value="<?=htmlentities(trim($v_min, "'"))?>">
+				<label for="v_min" class="form-label"><?= _("Minute") ?></label>
+				<input type="text" class="form-control" name="v_min" id="v_min" style="width:220px;" value="<?= htmlentities(trim($v_min, "'")) ?>">
 			</div>
 			<div class="u-mb10">
-				<label for="v_hour" class="form-label"><?=_('Hour');?></label>
-				<input type="text" class="form-control" name="v_hour" id="v_hour" style="width:220px;" value="<?=htmlentities(trim($v_hour, "'"))?>">
+				<label for="v_hour" class="form-label"><?= _("Hour") ?></label>
+				<input type="text" class="form-control" name="v_hour" id="v_hour" style="width:220px;" value="<?= htmlentities(trim($v_hour, "'")) ?>">
 			</div>
 			<div class="u-mb10">
-				<label for="v_day" class="form-label"><?=_('Day');?></label>
-				<input type="text" class="form-control" name="v_day" id="v_day" style="width:220px;" value="<?=htmlentities(trim($v_day, "'"))?>">
+				<label for="v_day" class="form-label"><?= _("Day") ?></label>
+				<input type="text" class="form-control" name="v_day" id="v_day" style="width:220px;" value="<?= htmlentities(trim($v_day, "'")) ?>">
 			</div>
 			<div class="u-mb10">
-				<label for="v_month" class="form-label"><?=_('Month');?></label>
-				<input type="text" class="form-control" name="v_month" id="v_month" style="width:220px;" value="<?=htmlentities(trim($v_month, "'"))?>">
+				<label for="v_month" class="form-label"><?= _("Month") ?></label>
+				<input type="text" class="form-control" name="v_month" id="v_month" style="width:220px;" value="<?= htmlentities(trim($v_month, "'")) ?>">
 			</div>
 			<div class="u-mb10">
-				<label for="v_wday" class="form-label"><?=_('Day of week');?></label>
-				<input type="text" class="form-control" name="v_wday" id="v_wday" style="width:220px;" value="<?=htmlentities(trim($v_wday, "'"))?>">
+				<label for="v_wday" class="form-label"><?= _("Day of week") ?></label>
+				<input type="text" class="form-control" name="v_wday" id="v_wday" style="width:220px;" value="<?= htmlentities(trim($v_wday, "'")) ?>">
 			</div>
 		</div>
 

web/templates/pages/add_db.php

@@ -3,12 +3,12 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/db/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -19,41 +19,41 @@
 
 	<form
 		x-data="{
-			showAdvanced: <?= empty($v_adv) ? 'false' : 'true' ?>
+			showAdvanced: <?= empty($v_adv) ? "false" : "true" ?>
 		}"
 		id="vstobjects"
 		name="v_add_db"
 		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 database');?></h1>
-			<?php show_alert_message($_SESSION);?>
-			<?php if (($user_plain == 'admin') && (($_GET['accept'] !== "true"))) {?>
+			<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">
 					<i class="fas fa-exclamation"></i>
-					<p><?=_('Avoid adding web domains on admin account');?></p>
+					<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/db/?accept=true" class="button button-danger u-width-full u-ml10"><?=_('Continue');?></a>
+					<a href="/add/user/" class="button u-width-full u-mr10"><?= _("Add User") ?></a>
+					<a href="/add/db/?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") { ?>
 				<p class="hint u-mb20">
-					<?=sprintf(_('Prefix %s will be automatically added to database name and database user'),'<b>'.$user_plain.'_</b>');?>
+					<?= sprintf(_("Prefix %s will be automatically added to database name and database user"), "<b>" . $user_plain . "_</b>") ?>
 				</p>
 				<div class="u-mb10">
-					<label for="v_database" class="form-label"><?=_('Database');?></label>
-					<input type="text" class="form-control" name="v_database" id="v_database" value="<?=htmlentities(trim($v_database, "'"))?>">
+					<label for="v_database" class="form-label"><?= _("Database") ?></label>
+					<input type="text" class="form-control" name="v_database" id="v_database" value="<?= htmlentities(trim($v_database, "'")) ?>">
 					<small class="hint"></small>
 				</div>
 				<div class="u-mb10">
-					<label for="v_type" class="form-label"><?=_('Type');?></label>
+					<label for="v_type" class="form-label"><?= _("Type") ?></label>
 					<select class="form-select" name="v_type" id="v_type">
 						<?php
 							foreach ($db_types as $key => $value) {
@@ -66,40 +66,40 @@
 				</div>
 				<div class="u-mb10">
 					<label for="v_dbuser" class="form-label u-side-by-side">
-						<?=_('Username');?>
-						<em><small>(<?=sprintf(_('maximum characters length, including prefix'), 32);?>)</small></em>
+						<?= _("Username") ?>
+						<em><small>(<?= sprintf(_("maximum characters length, including prefix"), 32) ?>)</small></em>
 					</label>
-					<input type="text" class="form-control" name="v_dbuser" id="v_dbuser" value="<?=htmlentities(trim($v_dbuser, "'"))?>">
+					<input type="text" class="form-control" name="v_dbuser" id="v_dbuser" value="<?= htmlentities(trim($v_dbuser, "'")) ?>">
 					<small class="hint"></small>
 				</div>
 				<div class="u-mb10">
 					<label for="v_password" class="form-label">
-						<?=_('Password');?>
-						<a href="javascript:applyRandomString();" title="<?=_('generate');?>" class="u-ml5"><i class="fas fa-arrows-rotate status-icon green icon-large"></i></a>
+						<?= _("Password") ?>
+						<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">
 						<meter max="4" class="password-meter"></meter>
 					</div>
 				</div>
-				<p class="u-mb10"><?=_('Your password must have at least');?>:</p>
+				<p class="u-mb10"><?= _("Your password must have at least") ?>:</p>
 				<ul class="u-list-bulleted u-mb10">
-					<li><?=_('8 characters long');?></li>
-					<li><?=_('1 uppercase & 1 lowercase character');?></li>
-					<li><?=_('1 number');?></li>
+					<li><?= _("8 characters long") ?></li>
+					<li><?= _("1 uppercase & 1 lowercase character") ?></li>
+					<li><?= _("1 number") ?></li>
 				</ul>
 				<div class="u-mb20">
 					<label for="v_db_email" class="form-label">
-						<?=_('Send login credentials to email address') ?>
+						<?= _("Send login credentials to email address") ?>
 					</label>
-					<input type="email" class="form-control" name="v_db_email" id="v_db_email" value="<?=htmlentities(trim($v_db_email, "'"))?>">
+					<input type="email" class="form-control" name="v_db_email" id="v_db_email" value="<?= htmlentities(trim($v_db_email, "'")) ?>">
 				</div>
 				<div class="u-mb20">
-					<a x-on:click="showAdvanced = !showAdvanced" class="button button-secondary"><?=_('Advanced options');?></a>
+					<a x-on:click="showAdvanced = !showAdvanced" class="button button-secondary"><?= _("Advanced options") ?></a>
 				</div>
 				<div x-cloak x-show="showAdvanced" id="advanced-opts">
 					<div class="u-mb10">
-						<label for="v_host" class="form-label"><?=_('Host');?></label>
+						<label for="v_host" class="form-label"><?= _("Host") ?></label>
 						<select class="form-select" name="v_host" id="v_host">
 							<?php
 								foreach ($db_hosts as $value) {
@@ -111,7 +111,7 @@
 						</select>
 					</div>
 					<div class="u-mb10">
-						<label for="v_charset" class="form-label"><?=_('Charset');?></label>
+						<label for="v_charset" class="form-label"><?= _("Charset") ?></label>
 						<select class="form-select" name="v_charset" id="v_charset">
 							<option value=big5 <?php if ((!empty($v_charset)) && ( $v_charset == 'big5')) echo 'selected';?>>big5</option>
 							<option value=dec8 <?php if ((!empty($v_charset)) && ( $v_charset == 'dec8')) echo 'selected';?>>dec8</option>

web/templates/pages/add_dns.php

@@ -3,12 +3,12 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/dns/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -19,37 +19,37 @@
 
 	<form
 		x-data="{
-			showAdvanced: <?= empty($v_adv) ? 'false' : 'true' ?>
+			showAdvanced: <?= empty($v_adv) ? "false" : "true" ?>
 		}"
 		id="vstobjects"
 		name="v_add_dns"
 		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 DNS Domain');?></h1>
-			<?php show_alert_message($_SESSION);?>
-			<?php if (($user_plain == 'admin') && (($_GET['accept'] !== "true"))) {?>
+			<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">
 					<i class="fas fa-exclamation"></i>
-					<p><?=_('Avoid adding web domains on admin account');?></p>
+					<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/dns/?accept=true" class="button button-danger u-width-full u-ml10"><?=_('Continue');?></a>
+					<a href="/add/user/" class="button u-width-full u-mr10"><?= _("Add User") ?></a>
+					<a href="/add/dns/?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, "'"))?>">
+					<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, "'")) ?>">
 				</div>
 				<div class="u-mb10">
-					<label for="v_ip" class="form-label"><?=_('IP address');?></label>
+					<label for="v_ip" class="form-label"><?= _("IP address") ?></label>
 					<div class="u-pos-relative">
 						<select class="form-select" tabindex="-1" onchange="this.nextElementSibling.value=this.value">
 							<option value="">clear</option>
@@ -60,13 +60,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
@@ -83,31 +83,31 @@
 					</div>
 				<?php } ?>
 				<div class="u-mb20 u-mt20">
-					<a x-on:click="showAdvanced = !showAdvanced" class="button button-secondary"><?=_('Advanced options');?></a>
+					<a x-on:click="showAdvanced = !showAdvanced" class="button button-secondary"><?= _("Advanced options") ?></a>
 				</div>
 				<div x-cloak  x-show="showAdvanced" id="advtable">
 					<div class="form-check u-mb10">
 						<input class="form-check-input" type="checkbox" name="v_dnssec" id="v_dnssec" value="yes" <?php if($v_dnssec === 'yes'){ echo ' checked'; } ?>>
 						<label for="v_dnssec">
-							<?=_('Enable DNSSEC');?>
+							<?= _("Enable DNSSEC") ?>
 						</label>
 					</div>
 					<div class="u-mb10">
 						<label for="v_exp" class="form-label">
-							<?=_('Expiration Date');?> <span class="optional">(<?=_('YYYY-MM-DD');?>)</span>
+							<?= _("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_ttl" class="form-label"><?=_('TTL');?></label>
-						<input type="text" class="form-control" name="v_ttl" id="v_ttl" value="<?=htmlentities(trim($v_ttl, "'"))?>">
+						<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, "'")) ?>">
 					</div>
-					<p class="form-label u-mb10"><?=_('Name servers');?></p>
+					<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) {
@@ -148,7 +148,7 @@
 						}
 					?>
 					<div class="u-pt18 js-add-ns" <?php if ($v_ns8) echo 'style="display:none;"'; ?>>
-						<span class="js-add-ns-button additional-control add"><?=_('Add one more Name Server');?></span>
+						<span class="js-add-ns-button additional-control add"><?= _("Add one more Name Server") ?></span>
 					</div>
 				</div>
 			<?php } ?>

web/templates/pages/add_dns_rec.php

@@ -2,13 +2,13 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/list/dns/?domain=<?=htmlentities(trim($v_domain, "'"))?>&token=<?=$_SESSION['token']?>">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+			<a class="button button-secondary" id="btn-back" href="/list/dns/?domain=<?= htmlentities(trim($v_domain, "'")) ?>&token=<?= $_SESSION["token"] ?>">
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -22,20 +22,20 @@
 		<input type="hidden" name="ok_rec" value="add">
 
 		<div class="form-container">
-			<h1 class="form-title"><?=_('Adding DNS Record');?></h1>
+			<h1 class="form-title"><?= _("Adding DNS Record") ?></h1>
 			<?php show_alert_message($_SESSION);?>
 			<div class="u-mb10">
-				<label for="v_domain" class="form-label"><?=_('Domain');?></label>
+				<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, "'"))?>">
 			</div>
 			<div class="u-mb10">
-				<label for="v_rec" class="form-label"><?=_('Record');?></label>
+				<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, "'"))?>">
 				<small class="hint"></small>
 			</div>
 			<div class="u-mb10">
-				<label for="v_type" class="form-label"><?=_('Type');?></label>
+				<label for="v_type" class="form-label"><?= _("Type") ?></label>
 				<select class="form-select" name="v_type" id="v_type">
 					<option value="A" <?php if ($v_type == 'A') echo "selected"; ?>>A</option>
 					<option value="AAAA" <?php if ($v_type == 'AAAA') echo "selected"; ?>>AAAA</option>
@@ -55,7 +55,7 @@
 				</select>
 			</div>
 			<div class="u-mb10">
-				<label for="v_val" class="form-label"><?=_('IP or Value');?></label>
+				<label for="v_val" class="form-label"><?= _("IP or Value") ?></label>
 				<div class="u-pos-relative">
 					<select class="form-select" tabindex="-1" onchange="this.nextElementSibling.value=this.value">
 						<option value="">&nbsp;</option>
@@ -71,13 +71,13 @@
 			</div>
 			<div class="u-mb10">
 				<label for="v_priority" class="form-label">
-					<?=_('Priority');?> <span class="optional">(<?=_('optional');?>)</span>
+					<?= _("Priority") ?> <span class="optional">(<?= _("optional") ?>)</span>
 				</label>
 				<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>
+					<?= _("TTL") ?> <span class="optional">(<?= _("optional") ?>)</span>
 				</label>
 				<input type="text" class="form-control" name="v_ttl" id="v_ttl" value="<?=htmlentities(trim($v_ttl, "'"))?>">
 			</div>

web/templates/pages/add_firewall.php

@@ -3,12 +3,12 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/firewall/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -22,32 +22,32 @@
 		<input type="hidden" name="ok" value="Add">
 
 		<div class="form-container">
-			<h1 class="form-title"><?=_('Adding Firewall Rule');?></h1>
+			<h1 class="form-title"><?= _("Adding Firewall Rule") ?></h1>
 			<?php show_alert_message($_SESSION);?>
 			<div class="u-mb10">
-				<label for="v_action" class="form-label"><?=_('Action') ?></label>
+				<label for="v_action" class="form-label"><?= _("Action") ?></label>
 				<select class="form-select" name="v_action" id="v_action">
-					<option value="DROP" <?php if ((!empty($v_action)) && ( $v_action == "'DROP'" )) echo 'selected'?>><?=_('DROP');?></option>
-					<option value="ACCEPT" <?php if ((!empty($v_action)) && ( $v_action == "'ACCEPT'" )) echo 'selected'?>><?=_('ACCEPT');?></option>
+					<option value="DROP" <?php if ((!empty($v_action)) && ( $v_action == "'DROP'" )) echo 'selected'?>><?= _("DROP") ?></option>
+					<option value="ACCEPT" <?php if ((!empty($v_action)) && ( $v_action == "'ACCEPT'" )) echo 'selected'?>><?= _("ACCEPT") ?></option>
 				</select>
 			</div>
 			<div class="u-mb10">
-				<label for="v_protocol" class="form-label"><?=_('Protocol') ?></label>
+				<label for="v_protocol" class="form-label"><?= _("Protocol") ?></label>
 				<select class="form-select" name="v_protocol" id="v_protocol">
-					<option value="TCP" <?php if ((!empty($v_protocol)) && ( $v_protocol == "'TCP'" )) echo 'selected'?>><?=_('TCP');?></option>
-					<option value="UDP" <?php if ((!empty($v_protocol)) && ( $v_protocol == "'UDP'" )) echo 'selected'?>><?=_('UDP');?></option>
-					<option value="ICMP" <?php if ((!empty($v_protocol)) && ( $v_protocol == "'ICMP'" )) echo 'selected'?>><?=_('ICMP');?></option>
+					<option value="TCP" <?php if ((!empty($v_protocol)) && ( $v_protocol == "'TCP'" )) echo 'selected'?>><?= _("TCP") ?></option>
+					<option value="UDP" <?php if ((!empty($v_protocol)) && ( $v_protocol == "'UDP'" )) echo 'selected'?>><?= _("UDP") ?></option>
+					<option value="ICMP" <?php if ((!empty($v_protocol)) && ( $v_protocol == "'ICMP'" )) echo 'selected'?>><?= _("ICMP") ?></option>
 				</select>
 			</div>
 			<div class="u-mb10">
 				<label for="v_port" class="form-label">
-					<?=_('Port');?> <span class="optional">(<?=_('Ranges and Lists are acceptable');?>)</span>
+					<?= _("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">
-					<?=_('IP address / IPset');?> <span class="optional">(<?=_('CIDR format is supported');?>)</span>
+					<?= _("IP address / IPset") ?> <span class="optional">(<?= _("CIDR format is supported") ?>)</span>
 				</label>
 				<div class="u-pos-relative">
 					<select class="form-select" tabindex="-1" id="quickips_list" onchange="this.nextElementSibling.value=this.value">
@@ -58,7 +58,7 @@
 			</div>
 			<div class="u-mb10">
 				<label for="v_comment" class="form-label">
-					<?=_('Comment');?> <span class="optional">(<?=_('optional');?>)</span>
+					<?= _("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, "'"))?>">
 			</div>
@@ -69,7 +69,7 @@
 </div>
 
 <script>
-	var ipLists = JSON.parse('<?=$ipset_lists_json?>');
+	var ipLists = JSON.parse('<?= $ipset_lists_json ?>');
 	ipLists.sort(function (a, b) {
 		return a.name > b.name;
 	});

web/templates/pages/add_firewall_banlist.php

@@ -3,12 +3,12 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/firewall/banlist/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -22,24 +22,24 @@
 		<input type="hidden" name="ok" value="Add">
 
 		<div class="form-container">
-			<h1 class="form-title"><?=_('Adding IP Address to Banlist');?></h1>
+			<h1 class="form-title"><?= _("Adding IP Address to Banlist") ?></h1>
 			<?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>
+					<?= _("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, "'"))?>">
 			</div>
 			<div class="u-mb10">
-				<label for="v_chain" class="form-label"><?=_('Banlist') ?></label>
+				<label for="v_chain" class="form-label"><?= _("Banlist") ?></label>
 				<select class="form-select" name="v_chain" id="v_chain">
-					<option value="SSH" <?php if ((!empty($v_chain)) && ( $v_chain == "'SSH'" )) echo 'selected'?>><?=_('SSH');?></option>
-					<option value="WEB" <?php if ((!empty($v_chain)) && ( $v_chain == "'WEB'" )) echo 'selected'?>><?=_('WEB');?></option>
-					<option value="FTP" <?php if ((!empty($v_chain)) && ( $v_chain == "'FTP'" )) echo 'selected'?>><?=_('FTP');?></option>
-					<option value="DNS" <?php if ((!empty($v_chain)) && ( $v_chain == "'DNS'" )) echo 'selected'?>><?=_('DNS');?></option>
-					<option value="MAIL" <?php if ((!empty($v_chain)) && ( $v_chain == "'MAIL'" )) echo 'selected'?>><?=_('MAIL');?></option>
-					<option value="DB" <?php if ((!empty($v_chain)) && ( $v_chain == "'DB'" )) echo 'selected'?>><?=_('DB');?></option>
-					<option value="HESTIA" <?php if ((!empty($v_chain)) && ( $v_chain == "'HESTIA'" )) echo 'selected'?>><?=_('HESTIA');?></option>
+					<option value="SSH" <?php if ((!empty($v_chain)) && ( $v_chain == "'SSH'" )) echo 'selected'?>><?= _("SSH") ?></option>
+					<option value="WEB" <?php if ((!empty($v_chain)) && ( $v_chain == "'WEB'" )) echo 'selected'?>><?= _("WEB") ?></option>
+					<option value="FTP" <?php if ((!empty($v_chain)) && ( $v_chain == "'FTP'" )) echo 'selected'?>><?= _("FTP") ?></option>
+					<option value="DNS" <?php if ((!empty($v_chain)) && ( $v_chain == "'DNS'" )) echo 'selected'?>><?= _("DNS") ?></option>
+					<option value="MAIL" <?php if ((!empty($v_chain)) && ( $v_chain == "'MAIL'" )) echo 'selected'?>><?= _("MAIL") ?></option>
+					<option value="DB" <?php if ((!empty($v_chain)) && ( $v_chain == "'DB'" )) echo 'selected'?>><?= _("DB") ?></option>
+					<option value="HESTIA" <?php if ((!empty($v_chain)) && ( $v_chain == "'HESTIA'" )) echo 'selected'?>><?= _("HESTIA") ?></option>
 				</select>
 			</div>
 		</div>

web/templates/pages/add_firewall_ipset.php

@@ -3,12 +3,12 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/firewall/ipset/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -22,15 +22,15 @@
 		<input type="hidden" name="ok" value="Add">
 
 		<div class="form-container">
-			<h1 class="form-title"><?=_('Adding Firewall Ipset List');?></h1>
+			<h1 class="form-title"><?= _("Adding Firewall Ipset List") ?></h1>
 			<?php show_alert_message($_SESSION);?>
 			<div class="u-mb10">
-				<label for="v_ipname" class="form-label"><?=_('Ip List Name') ?></label>
+				<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, "'"))?>">
 			</div>
 			<div class="u-mb10">
 				<label for="v_datasource" class="form-label">
-					<?=_('Data Source') ?> <span class="optional">(<?=_('url, script or file');?>)</span>
+					<?= _("Data Source") ?> <span class="optional">(<?= _("url, script or file") ?>)</span>
 				</label>
 				<div class="u-pos-relative">
 					<select class="form-select" tabindex="-1" id="datasource_list" onchange="this.nextElementSibling.value=this.value">
@@ -40,17 +40,17 @@
 				</div>
 			</div>
 			<div class="u-mb10">
-				<label for="v_ipver" class="form-label"><?=_('Ip Version') ?></label>
+				<label for="v_ipver" class="form-label"><?= _("Ip Version") ?></label>
 				<select class="form-select" name="v_ipver" id="v_ipver">
-					<option value="v4" <?php if ((!empty($v_ipver)) && ( $v_ipver == "'v4'" )) echo 'selected'?>><?=_('ip v4');?></option>
-					<option value="v6" <?php if ((!empty($v_ipver)) && ( $v_ipver == "'v6'" )) echo 'selected'?>><?=_('ip v6');?></option>
+					<option value="v4" <?php if ((!empty($v_ipver)) && ( $v_ipver == "'v4'" )) echo 'selected'?>><?= _("ip v4") ?></option>
+					<option value="v6" <?php if ((!empty($v_ipver)) && ( $v_ipver == "'v6'" )) echo 'selected'?>><?= _("ip v6") ?></option>
 				</select>
 			</div>
 			<div class="u-mb10">
-				<label for="v_autoupdate" class="form-label"><?=_('Autoupdate') ?></label>
+				<label for="v_autoupdate" class="form-label"><?= _("Autoupdate") ?></label>
 				<select class="form-select" name="v_autoupdate" id="v_autoupdate">
-					<option value="yes" <?php if ((!empty($v_autoupdate)) && ( $v_autoupdate == "'yes'" )) echo 'selected'?>><?=_('yes');?></option>
-					<option value="no" <?php if ((!empty($v_autoupdate)) && ( $v_autoupdate == "'no'" )) echo 'selected'?>><?=_('no');?></option>
+					<option value="yes" <?php if ((!empty($v_autoupdate)) && ( $v_autoupdate == "'yes'" )) echo 'selected'?>><?= _("yes") ?></option>
+					<option value="no" <?php if ((!empty($v_autoupdate)) && ( $v_autoupdate == "'no'" )) echo 'selected'?>><?= _("no") ?></option>
 				</select>
 			</div>
 		</div>
@@ -97,7 +97,7 @@
 
 		// Blacklist
 		var newEl = document.createElement("option");
-		newEl.text = "<?=_('BLACKLIST') ?>";
+		newEl.text = "<?= _("BLACKLIST") ?>";
 		newEl.disabled = true;
 		targetElement.appendChild(newEl);
 
@@ -110,7 +110,7 @@
 
 		// IPVERSE
 		var newEl = document.createElement("option");
-		newEl.text = "<?=_('IPVERSE') ?>";
+		newEl.text = "<?= _("IPVERSE") ?>";
 		newEl.disabled = true;
 		targetElement.appendChild(newEl);
 

web/templates/pages/add_ip.php

@@ -3,12 +3,12 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/ip/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -29,18 +29,18 @@
 		<input type="hidden" name="ok" value="Add">
 
 		<div class="form-container">
-			<h1 class="form-title"><?=_('Adding IP address');?></h1>
+			<h1 class="form-title"><?= _("Adding IP address") ?></h1>
 			<?php show_alert_message($_SESSION);?>
 			<div class="u-mb10">
-				<label for="v_ip" class="form-label"><?=_('IP address') ?></label>
+				<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, "'"))?>">
 			</div>
 			<div class="u-mb10">
-				<label for="v_netmask" class="form-label"><?=_('Netmask');?></label>
+				<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, "'"))?>">
 			</div>
 			<div class="u-mb10">
-				<label for="v_interface" class="form-label"><?=_('Interface');?></label>
+				<label for="v_interface" class="form-label"><?= _("Interface") ?></label>
 				<select class="form-select" name="v_interface" id="v_interface">
 					<?php
 						foreach ($interfaces as $key => $value) {
@@ -54,12 +54,12 @@
 			<div class="form-check u-mb10">
 				<input x-model="showUserTable" class="form-check-input" type="checkbox" name="v_shared" id="v_shared">
 				<label for="v_shared">
-					<?=_('Shared');?>
+					<?= _("Shared") ?>
 				</label>
 			</div>
 			<div x-cloak x-show="showUserTable" id="usrtable">
 				<div class="u-mb10">
-					<label for="v_owner" class="form-label"><?=_('Assigned user');?></label>
+					<label for="v_owner" class="form-label"><?= _("Assigned user") ?></label>
 					<select class="form-select" name="v_owner" id="v_owner">
 						<?php
 							foreach ($users as $key => $value) {
@@ -73,13 +73,13 @@
 			</div>
 			<div class="u-mb10">
 				<label for="v_name" class="form-label">
-					<?=_('Assigned domain');?> <span class="optional">(<?=_('optional');?>)</span>
+					<?= _("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, "'"))?>">
 			</div>
 			<div class="u-mb10">
 				<label for="v_nat" class="form-label">
-					<?=_('NAT IP association');?> <span class="optional">(<?=_('optional');?>)</span>
+					<?= _("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, "'"))?>">
 			</div>

web/templates/pages/add_key.php

@@ -2,19 +2,19 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<?php if (($_SESSION['userContext'] === 'admin') && (isset($_GET['user'])) && ($_GET['user'] !== 'admin')) { ?>
-				<a class="button button-secondary" id="btn-back" href="/list/key/?user=<?=htmlentities($_GET['user']);?>">
-					<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+			<?php if ($_SESSION["userContext"] === "admin" && isset($_GET["user"]) && $_GET["user"] !== "admin") { ?>
+				<a class="button button-secondary" id="btn-back" href="/list/key/?user=<?= htmlentities($_GET["user"]) ?>">
+					<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 				</a>
 			<?php } else { ?>
 				<a class="button button-secondary" id="btn-back" href="/list/key/">
-					<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+					<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 				</a>
 			<?php } ?>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -24,15 +24,15 @@
 <div class="container animate__animated animate__fadeIn">
 
 	<form id="vstobjects" name="v_add_key" 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 SSH Key');?></h1>
-			<?php show_alert_message($_SESSION);?>
+			<h1 class="form-title"><?= _("Add SSH Key") ?></h1>
+			<?php show_alert_message($_SESSION); ?>
 			<div>
-				<label for="v_key" class="form-label"><?=_('SSH KEY') ?></label>
-				<textarea class="form-control u-min-height300" name="v_key" id="v_key"><?=htmlentities(trim($v_key, "'"))?></textarea>
+				<label for="v_key" class="form-label"><?= _("SSH KEY") ?></label>
+				<textarea class="form-control u-min-height300" name="v_key" id="v_key"><?= htmlentities(trim($v_key, "'")) ?></textarea>
 			</div>
 		</div>
 

web/templates/pages/add_mail.php

@@ -3,12 +3,12 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/mail/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -29,28 +29,28 @@
 		<input type="hidden" name="ok" value="Add">
 
 		<div class="form-container">
-			<h1 class="form-title"><?=_('Adding Mail Domain');?></h1>
+			<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">
 					<i class="fas fa-exclamation"></i>
-					<p><?=_('Avoid adding web domains on admin account');?></p>
+					<p><?= _("Avoid adding web domains on admin account") ?></p>
 				</div>
 			<?php } ?>
 			<?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>
+					<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")) {?>
 				<div class="u-mb20">
-					<label for="v_domain" class="form-label"><?=_('Domain');?></label>
+					<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, "'"))?>">
 				</div>
 				<?php if($_SESSION['WEBMAIL_SYSTEM']){?>
 					<div class="u-mb20">
-						<label for="v_webmail" class="form-label"><?=_('Webmail Client');?></label>
+						<label for="v_webmail" class="form-label"><?= _("Webmail Client") ?></label>
 						<select class="form-select" name="v_webmail" id="v_webmail" tabindex="6">
 							<?php foreach ($webmail_clients as $client){
 								echo "\t\t\t\t<option value=\"".htmlentities($client)."\"";
@@ -60,7 +60,7 @@
 								echo ">".htmlentities(ucfirst($client))."</option>\n";
 								}
 							?>
-							<option value="" <?php if (empty($v_webmail) || $v_webmail == 'disabled' ){ echo "selected";}?>><?=_('Disabled');?></option>
+							<option value="" <?php if (empty($v_webmail) || $v_webmail == 'disabled' ){ echo "selected";}?>><?= _("Disabled") ?></option>
 						</select>
 					</div>
 				<?php } ?>
@@ -68,13 +68,13 @@
 					<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">
-							<?=_('AntiSpam Support');?>
+							<?= _("AntiSpam Support") ?>
 						</label>
 					</div>
 					<div class="form-check u-mb10">
 						<input class="form-check-input" type="checkbox" name="v_reject" id="v_reject" <?php if ((empty($v_reject)) || ($v_reject == 'yes')) echo 'checked'; ?>>
 						<label for="v_reject">
-							<?=_('Reject spam');?>
+							<?= _("Reject spam") ?>
 						</label>
 					</div>
 				<?php } ?>
@@ -82,37 +82,37 @@
 					<div class="form-check u-mb10">
 						<input class="form-check-input" type="checkbox" name="v_antivirus" id="v_antivirus" <?php if ((empty($v_antivirus)) || ($v_antivirus == 'yes')) echo 'checked'; ?>>
 						<label for="v_antivirus">
-							<?=_('AntiVirus Support');?>
+							<?= _("AntiVirus Support") ?>
 						</label>
 					</div>
 				<?php } ?>
 				<div class="form-check u-mb10">
 					<input class="form-check-input" type="checkbox" name="v_dkim" id="v_dkim" <?php if (isset($v_dkim)&&$v_dkim == 'yes') echo 'checked'; ?>>
 					<label for="v_dkim">
-						<?=_('DKIM Support');?>
+						<?= _("DKIM Support") ?>
 					</label>
 				</div>
 				<div class="form-check u-mb10">
 					<input x-model="hasSmtpRelay" class="form-check-input" type="checkbox" name="v_smtp_relay" id="v_smtp_relay">
 					<label for="v_smtp_relay">
-						<?=_('SMTP Relay');?>
+						<?= _("SMTP Relay") ?>
 					</label>
 				</div>
 				<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>
+						<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, "'"))?>">
 					</div>
 					<div class="u-mb10">
-						<label for="v_smtp_relay_port" class="form-label"><?=_('Port');?></label>
+						<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, "'"))?>">
 					</div>
 					<div class="u-mb10">
-						<label for="v_smtp_relay_user" class="form-label"><?=_('Username');?></label>
+						<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, "'"))?>">
 					</div>
 					<div class="u-mb10">
-						<label for="v_smtp_relay_pass" class="form-label"><?=_('Password');?></label>
+						<label for="v_smtp_relay_pass" class="form-label"><?= _("Password") ?></label>
 						<input type="text" class="form-control" name="v_smtp_relay_pass" id="v_smtp_relay_pass">
 					</div>
 				</div>

web/templates/pages/add_mail_acc.php

@@ -2,13 +2,13 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/list/mail/?domain=<?=htmlentities(trim($v_domain, "'"))?>&token=<?=$_SESSION['token']?>">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+			<a class="button button-secondary" id="btn-back" href="/list/mail/?domain=<?= htmlentities(trim($v_domain, "'")) ?>&token=<?= $_SESSION["token"] ?>">
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -29,84 +29,84 @@
 		<input type="hidden" name="ok_acc" value="add">
 
 		<div class="form-container form-container-wide">
-			<h1 class="form-title"><?=_('Adding Mail Account');?></h1>
+			<h1 class="form-title"><?= _("Adding Mail Account") ?></h1>
 			<?php show_alert_message($_SESSION);?>
 			<div class="sidebar-container">
 				<div>
 					<div class="u-mb10">
-						<label for="v_domain" class="form-label"><?=_('Domain');?></label>
+						<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, "'"))?>">
 					</div>
 					<div class="u-mb10">
-						<label for="v_account" class="form-label"><?=_('Account');?></label>
+						<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, "'"))?>">
 					</div>
 					<div class="u-mb10">
 						<label for="v_password" class="form-label">
-							<?=_('Password');?>
-							<a href="javascript:applyRandomString();" title="<?=_('generate');?>" class="u-ml5"><i class="fas fa-arrows-rotate status-icon green icon-large"></i></a>
+							<?= _("Password") ?>
+							<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">
 							<meter max="4" class="password-meter"></meter>
 						</div>
 					</div>
-					<p class="u-mb10"><?=_('Your password must have at least');?>:</p>
+					<p class="u-mb10"><?= _("Your password must have at least") ?>:</p>
 					<ul class="u-list-bulleted">
-						<li><?=_('8 characters long');?></li>
-						<li><?=_('1 uppercase & 1 lowercase character');?></li>
-						<li><?=_('1 number');?></li>
+						<li><?= _("8 characters long") ?></li>
+						<li><?= _("1 uppercase & 1 lowercase character") ?></li>
+						<li><?= _("1 number") ?></li>
 					</ul>
 					<div class="u-pt18 u-mb20">
-						<a x-on:click="showAdvanced = !showAdvanced" class="button button-secondary"><?=_('Advanced options');?></a>
+						<a x-on:click="showAdvanced = !showAdvanced" class="button button-secondary"><?= _("Advanced options") ?></a>
 					</div>
 					<div x-cloak x-show="showAdvanced" id="advtable">
 						<div class="u-mb10">
 							<label for="v_quota" class="form-label">
-								<?=_('Quota');?> <span class="optional">(<?=_('in megabytes');?>)</span>
+								<?= _("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, "'"))?>">
-								<i class="unlim-trigger fas fa-infinity" title="<?=_('Unlimited');?>"></i>
+								<i class="unlim-trigger fas fa-infinity" title="<?= _("Unlimited") ?>"></i>
 							</div>
 						</div>
 						<div class="u-mb10">
 							<label for="v_aliases" class="form-label">
-								<?=_('Aliases');?> <span class="optional">(<?=_('use local-part');?>)</span>
+								<?= _("Aliases") ?> <span class="optional">(<?= _("use local-part") ?>)</span>
 							</label>
 							<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">
-								<?=_('Forward to');?> <span class="optional">(<?=_('one or more email addresses');?>)</span>
+								<?= _("Forward to") ?> <span class="optional">(<?= _("one or more email addresses") ?>)</span>
 							</label>
 							<textarea class="form-control" name="v_fwd" id="v_fwd" <?php if($v_blackhole == 'yes') echo "disabled";?>><?=htmlentities(trim($v_fwd, "'"))?></textarea>
 						</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' ?>>
 							<label for="v_blackhole">
-								<?=_('Discard all mail');?>
+								<?= _("Discard all mail") ?>
 							</label>
 						</div>
 						<div id="id_fwd_for" style="display:<?php if ($v_blackhole == 'yes') {echo 'none';} else {echo 'block';}?> ;">
 							<div class="form-check">
 								<input class="form-check-input" type="checkbox" name="v_fwd_only" id="v_fwd_for" <?php if ($v_fwd_only == 'yes') echo 'checked' ?>>
 								<label for="v_fwd_for">
-									<?=_('Do not store forwarded mail');?>
+									<?= _("Do not store forwarded mail") ?>
 								</label>
 							</div>
 						</div>
 						<div class="u-mt10 u-mb10">
 							<label for="v_rate" class="form-label">
-								<?=_('Rate limit');?> <span class="optional">(<?=_('Email / hour');?>)</span>
+								<?= _("Rate limit") ?> <span class="optional">(<?= _("Email / hour") ?>)</span>
 							</label>
 							<input type="text" class="form-control" name="v_rate" id="v_rate" value="<?=htmlentities(trim($v_rate, "'"))?>" <?php if($_SESSION['userContext'] != "admin"){ echo "disabled";}?>>
 						</div>
 					</div>
 					<div class="u-mt15 u-mb20">
 						<label for="v_send_email" class="form-label">
-							<?=_('Send login credentials to email address') ?>
+							<?= _("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="hidden" name="v_credentials" class="js-hidden-credentials">
@@ -114,82 +114,82 @@
 				</div>
 				<div>
 					<div class="panel js-mail-info">
-						<h2 class="u-text-H3 u-mb10"><?=_('Common account settings');?></h2>
+						<h2 class="u-text-H3 u-mb10"><?= _("Common account settings") ?></h2>
 						<ul class="values-list u-mb20">
 							<li class="values-list-item">
-								<span class="values-list-label"><?=_('Username');?></span>
+								<span class="values-list-label"><?= _("Username") ?></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-label"><?= _("Password") ?></span>
 								<span class="values-list-value"><span class="js-password-output"></span></span>
 							</li>
 							<?php if ($_SESSION['WEBMAIL_SYSTEM']) {?>
 								<li class="values-list-item">
-									<span class="values-list-label"><?=_('Webmail');?></span>
+									<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>
 								</li>
 							<?php } ?>
 							<li class="values-list-item">
-								<span class="values-list-label"><?=_('Hostname');?></span>
+								<span class="values-list-label"><?= _("Hostname") ?></span>
 								<span class="values-list-value">mail.<?=htmlentities($v_domain)?></span>
 							</li>
 						</ul>
-						<h2 class="u-text-H3 u-mb10"><?=_('IMAP settings');?></h2>
+						<h2 class="u-text-H3 u-mb10"><?= _("IMAP settings") ?></h2>
 						<ul class="values-list u-mb20">
 							<li class="values-list-item">
-								<span class="values-list-label"><?=_('Authentication');?></span>
-								<span class="values-list-value"><?=_('Normal password');?></span>
+								<span class="values-list-label"><?= _("Authentication") ?></span>
+								<span class="values-list-value"><?= _("Normal password") ?></span>
 							</li>
 							<li class="values-list-item">
-								<span class="values-list-label"><?=_('SSL/TLS');?></span>
-								<span class="values-list-value"><?=_('Port');?> 993</span>
+								<span class="values-list-label"><?= _("SSL/TLS") ?></span>
+								<span class="values-list-value"><?= _("Port") ?> 993</span>
 							</li>
 							<li class="values-list-item">
-								<span class="values-list-label"><?=_('STARTTLS');?></span>
-								<span class="values-list-value"><?=_('Port');?> 143</span>
+								<span class="values-list-label"><?= _("STARTTLS") ?></span>
+								<span class="values-list-value"><?= _("Port") ?> 143</span>
 							</li>
 							<li class="values-list-item">
-								<span class="values-list-label"><?=_('No encryption');?></span>
-								<span class="values-list-value"><?=_('Port');?> 143</span>
+								<span class="values-list-label"><?= _("No encryption") ?></span>
+								<span class="values-list-value"><?= _("Port") ?> 143</span>
 							</li>
 						</ul>
-						<h2 class="u-text-H3 u-mb10"><?=_('POP3 settings');?></h2>
+						<h2 class="u-text-H3 u-mb10"><?= _("POP3 settings") ?></h2>
 						<ul class="values-list u-mb20">
 							<li class="values-list-item">
-								<span class="values-list-label"><?=_('Authentication');?></span>
-								<span class="values-list-value"><?=_('Normal password');?></span>
+								<span class="values-list-label"><?= _("Authentication") ?></span>
+								<span class="values-list-value"><?= _("Normal password") ?></span>
 							</li>
 							<li class="values-list-item">
-								<span class="values-list-label"><?=_('SSL/TLS');?></span>
-								<span class="values-list-value"><?=_('Port');?> 995</span>
+								<span class="values-list-label"><?= _("SSL/TLS") ?></span>
+								<span class="values-list-value"><?= _("Port") ?> 995</span>
 							</li>
 							<li class="values-list-item">
-								<span class="values-list-label"><?=_('STARTTLS');?></span>
-								<span class="values-list-value"><?=_('Port');?> 110</span>
+								<span class="values-list-label"><?= _("STARTTLS") ?></span>
+								<span class="values-list-value"><?= _("Port") ?> 110</span>
 							</li>
 							<li class="values-list-item">
-								<span class="values-list-label"><?=_('No encryption');?></span>
-								<span class="values-list-value"><?=_('Port');?> 110</span>
+								<span class="values-list-label"><?= _("No encryption") ?></span>
+								<span class="values-list-value"><?= _("Port") ?> 110</span>
 							</li>
 						</ul>
-						<h2 class="u-text-H3 u-mb10"><?=_('SMTP settings');?></h2>
+						<h2 class="u-text-H3 u-mb10"><?= _("SMTP settings") ?></h2>
 						<ul class="values-list">
 							<li class="values-list-item">
-								<span class="values-list-label"><?=_('Authentication');?></span>
-								<span class="values-list-value"><?=_('Normal password');?></span>
+								<span class="values-list-label"><?= _("Authentication") ?></span>
+								<span class="values-list-value"><?= _("Normal password") ?></span>
 							</li>
 							<li class="values-list-item">
-								<span class="values-list-label"><?=_('SSL/TLS');?></span>
-								<span class="values-list-value"><?=_('Port');?> 465</span>
+								<span class="values-list-label"><?= _("SSL/TLS") ?></span>
+								<span class="values-list-value"><?= _("Port") ?> 465</span>
 							</li>
 							<li class="values-list-item">
-								<span class="values-list-label"><?=_('STARTTLS');?></span>
-								<span class="values-list-value"><?=_('Port');?> 587</span>
+								<span class="values-list-label"><?= _("STARTTLS") ?></span>
+								<span class="values-list-value"><?= _("Port") ?> 587</span>
 							</li>
 							<li class="values-list-item">
-								<span class="values-list-label"><?=_('No encryption');?></span>
-								<span class="values-list-value"><?=_('Port');?> 25</span>
+								<span class="values-list-label"><?= _("No encryption") ?></span>
+								<span class="values-list-value"><?= _("Port") ?> 25</span>
 							</li>
 						</ul>
 					</div>

web/templates/pages/add_package.php

@@ -3,12 +3,12 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/package/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -33,36 +33,36 @@
 		<input type="hidden" name="ok" value="Add">
 
 		<div class="form-container">
-			<h1 class="form-title"><?=_('Adding Package');?></h1>
+			<h1 class="form-title"><?= _("Adding Package") ?></h1>
 			<?php show_alert_message($_SESSION);?>
 			<div class="u-mb10">
-				<label for="v_package" class="form-label"><?=_('Package Name');?></label>
+				<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, "'"))?>">
 			</div>
 			<div class="u-mb10">
 				<label for="v_disk_quota" class="form-label">
-					<?=_('Quota');?> <span class="optional">(<?=_('in megabytes');?>)</span>
+					<?= _("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, "'"))?>">
-					<i class="unlim-trigger fas fa-infinity" title="<?=_('Unlimited');?>"></i>
+					<i class="unlim-trigger fas fa-infinity" title="<?= _("Unlimited") ?>"></i>
 				</div>
 			</div>
 			<div class="u-mb10">
 				<label for="v_bandwidth" class="form-label">
-					<?=_('Bandwidth');?> <span class="optional">(<?=_('in megabytes');?>)</span>
+					<?= _("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, "'"))?>">
-					<i class="unlim-trigger fas fa-infinity" title="<?=_('Unlimited');?>"></i>
+					<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>
+				<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, "'"))?>">
 			</div>
 			<h2 x-on:click="showWebOptions = !showWebOptions" class="section-title">
-				<?=_('Web');?>
+				<?= _("Web") ?>
 				<i
 					x-bind:class="showWebOptions ? 'fa-square-minus' : 'fa-square-plus'"
 					class="fas status-icon dim maroon js-section-toggle-icon"
@@ -70,24 +70,24 @@
 			</h2>
 			<div x-cloak x-show="showWebOptions" id="web-options">
 				<div class="u-mt15 u-mb10">
-					<label for="v_web_domains" class="form-label"><?=_('Web Domains');?></label>
+					<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, "'"))?>">
-						<i class="unlim-trigger fas fa-infinity" title="<?=_('Unlimited');?>"></i>
+						<i class="unlim-trigger fas fa-infinity" title="<?= _("Unlimited") ?>"></i>
 					</div>
 				</div>
 				<div class="u-mb10">
 					<label for="v_web_aliases" class="form-label">
-						<?=_('Web Aliases');?> <span class="optional">(<?=_('per domain');?>)</span>
+						<?= _("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, "'"))?>">
-						<i class="unlim-trigger fas fa-infinity" title="<?=_('Unlimited');?>"></i>
+						<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
@@ -104,7 +104,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
@@ -123,7 +123,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
@@ -140,7 +140,7 @@
 				<?=""; }?>
 			</div>
 			<h2 x-on:click="showDnsOptions = !showDnsOptions" class="section-title">
-				<?=_('DNS');?>
+				<?= _("DNS") ?>
 				<i
 					x-bind:class="showDnsOptions ? 'fa-square-minus' : 'fa-square-plus'"
 					class="fas status-icon dim maroon js-section-toggle-icon"
@@ -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
@@ -164,23 +164,23 @@
 					</select>
 				</div>
 				<div class="u-mb10">
-					<label for="v_dns_domains" class="form-label"><?=_('DNS domains');?></label>
+					<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, "'"))?>">
-						<i class="unlim-trigger fas fa-infinity" title="<?=_('Unlimited');?>"></i>
+						<i class="unlim-trigger fas fa-infinity" title="<?= _("Unlimited") ?>"></i>
 					</div>
 				</div>
 				<div class="u-mb10">
 					<label for="v_dns_records" class="form-label">
-						<?=_('DNS records');?> <span class="optional">(<?=_('per domain');?>)</span>
+						<?= _("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, "'"))?>">
-						<i class="unlim-trigger fas fa-infinity" title="<?=_('Unlimited');?>"></i>
+						<i class="unlim-trigger fas fa-infinity" title="<?= _("Unlimited") ?>"></i>
 					</div>
 				</div>
 				<?php if ((isset($_SESSION['DNS_SYSTEM'])) && (!empty($_SESSION['DNS_SYSTEM']))) {?>
-					<p class="form-label u-mb10"><?=_('Name servers');?></p>
+					<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, "'"))?>">
 					</div>
@@ -226,12 +226,12 @@
 						}
 					?>
 					<div class="u-pt18 js-add-ns" <?php if ($v_ns8) echo 'style="display:none;"'; ?>>
-						<span class="js-add-ns-button additional-control add"><?=_('Add one more Name Server');?></span>
+						<span class="js-add-ns-button additional-control add"><?= _("Add one more Name Server") ?></span>
 					</div>
 				<?php } ?>
 			</div>
 			<h2 x-on:click="showMailOptions = !showMailOptions" class="section-title">
-				<?=_('Mail');?>
+				<?= _("Mail") ?>
 				<i
 					x-bind:class="showMailOptions ? 'fa-square-minus' : 'fa-square-plus'"
 					class="fas status-icon dim maroon js-section-toggle-icon"
@@ -239,30 +239,30 @@
 			</h2>
 			<div x-cloak x-show="showMailOptions" id="mail-options">
 				<div class="u-mt15 u-mb10">
-					<label for="v_mail_domains" class="form-label"><?=_('Mail Domains');?></label>
+					<label for="v_mail_domains" class="form-label"><?= _("Mail Domains") ?></label>
 					<div class="u-pos-relative">
-						<input type="text" class="form-control" name="v_mail_domains" id="v_mail_domains" value="<?=htmlentities(trim($v_mail_domains, "'"))?>">
-						<i class="unlim-trigger fas fa-infinity" title="<?=_('Unlimited');?>"></i>
+						<input type="text" class="form-control" name="v_mail_domains" id="v_mail_domains" value="<?= htmlentities(trim($v_mail_domains, "'")) ?>">
+						<i class="unlim-trigger fas fa-infinity" title="<?= _("Unlimited") ?>"></i>
 					</div>
 				</div>
 				<div class="u-mb10">
 					<label for="v_mail_accounts" class="form-label">
-						<?=_('Mail Accounts');?> <span class="optional">(<?=_('per domain');?>)</span>
+						<?= _("Mail Accounts") ?> <span class="optional">(<?= _("per domain") ?>)</span>
 					</label>
 					<div class="u-pos-relative">
-						<input type="text" class="form-control" name="v_mail_accounts" id="v_mail_accounts" value="<?=htmlentities(trim($v_mail_accounts, "'"))?>">
-						<i class="unlim-trigger fas fa-infinity" title="<?=_('Unlimited');?>"></i>
+						<input type="text" class="form-control" name="v_mail_accounts" id="v_mail_accounts" value="<?= htmlentities(trim($v_mail_accounts, "'")) ?>">
+						<i class="unlim-trigger fas fa-infinity" title="<?= _("Unlimited") ?>"></i>
 					</div>
 				</div>
 				<div class="u-mb10">
 					<label for="v_ratelimit" class="form-label">
-						<?=_('Rate limit');?> <span class="optional">(<?=_('per account / hour');?>)</span>
+						<?= _("Rate limit") ?> <span class="optional">(<?= _("per account / hour") ?>)</span>
 					</label>
-					<input type="text" class="form-control" name="v_ratelimit" id="v_ratelimit" value="<?=htmlentities(trim($v_ratelimit, "'"))?>">
+					<input type="text" class="form-control" name="v_ratelimit" id="v_ratelimit" value="<?= htmlentities(trim($v_ratelimit, "'")) ?>">
 				</div>
 			</div>
 			<h2 x-on:click="showDatabaseOptions = !showDatabaseOptions" class="section-title">
-				<?=_('Databases');?>
+				<?= _("Databases") ?>
 				<i
 					x-bind:class="showDatabaseOptions ? 'fa-square-minus' : 'fa-square-plus'"
 					class="fas status-icon dim maroon js-section-toggle-icon"
@@ -270,15 +270,15 @@
 			</h2>
 			<div x-cloak x-show="showDatabaseOptions" id="database-options">
 				<div class="u-mt15 u-mb10">
-					<label for="v_databases" class="form-label"><?=_('Databases');?></label>
+					<label for="v_databases" class="form-label"><?= _("Databases") ?></label>
 					<div class="u-pos-relative">
-						<input type="text" class="form-control" name="v_databases" id="v_databases" value="<?=htmlentities(trim($v_databases, "'"))?>">
-						<i class="unlim-trigger fas fa-infinity" title="<?=_('Unlimited');?>"></i>
+						<input type="text" class="form-control" name="v_databases" id="v_databases" value="<?= htmlentities(trim($v_databases, "'")) ?>">
+						<i class="unlim-trigger fas fa-infinity" title="<?= _("Unlimited") ?>"></i>
 					</div>
 				</div>
 			</div>
 			<h2 x-on:click="showSystemOptions = !showSystemOptions" class="section-title">
-				<?=_('System');?>
+				<?= _("System") ?>
 				<i
 					x-bind:class="showSystemOptions ? 'fa-square-minus' : 'fa-square-plus'"
 					class="fas status-icon dim maroon js-section-toggle-icon"
@@ -286,14 +286,14 @@
 			</h2>
 			<div x-cloak x-show="showSystemOptions" id="system-options">
 				<div class="u-mt15 u-mb10">
-					<label for="v_cron_jobs" class="form-label"><?=_('Cron Jobs');?></label>
+					<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, "'"))?>">
-						<i class="unlim-trigger fas fa-infinity" title="<?=_('Unlimited');?>"></i>
+						<i class="unlim-trigger fas fa-infinity" title="<?= _("Unlimited") ?>"></i>
 					</div>
 				</div>
 				<div class="u-mb10">
-					<label for="v_shell" class="form-label"><?=_('SSH Access');?></label>
+					<label for="v_shell" class="form-label"><?= _("SSH Access") ?></label>
 					<select class="form-select" name="v_shell" id="v_shell">
 						<?php
 							foreach ($shells as $key => $value) {

web/templates/pages/add_user.php

@@ -3,12 +3,12 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/user/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -29,52 +29,52 @@
 		<input type="hidden" name="ok" value="Add">
 
 		<div class="form-container">
-			<h1 class="form-title"><?=_('Adding User');?></h1>
+			<h1 class="form-title"><?= _("Adding User") ?></h1>
 			<?php show_alert_message($_SESSION);?>
 			<div class="u-mb10">
-				<label for="v_username" class="form-label"><?=_('Username');?></label>
+				<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">
 			</div>
 			<div class="u-mb10">
-				<label for="v_name" class="form-label"><?=_('Contact');?></label>
+				<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">
 			</div>
 			<div class="u-mb10">
-				<label for="v_email" class="form-label"><?=_('Email');?></label>
+				<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">
 			</div>
 			<div class="u-mb10">
 				<label for="v_password" class="form-label">
-					<?=_('Password');?>
-					<a href="javascript:applyRandomString();" title="<?=_('generate');?>" class="u-ml5"><i class="fas fa-arrows-rotate status-icon green icon-large"></i></a>
+					<?= _("Password") ?>
+					<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">
 					<meter max="4" class="password-meter"></meter>
 				</div>
 			</div>
-			<p class="u-mb10"><?=_('Your password must have at least');?>:</p>
+			<p class="u-mb10"><?= _("Your password must have at least") ?>:</p>
 			<ul class="u-list-bulleted u-mb10">
-				<li><?=_('8 characters long');?></li>
-				<li><?=_('1 uppercase & 1 lowercase character');?></li>
-				<li><?=_('1 number');?></li>
+				<li><?= _("8 characters long") ?></li>
+				<li><?= _("1 uppercase & 1 lowercase character") ?></li>
+				<li><?= _("1 number") ?></li>
 			</ul>
 			<div class="form-check u-mb10">
 				<input x-model="sendWelcomeMail" class="form-check-input" type="checkbox" name="v_login_disabled" id="v_login_disabled">
 				<label for="v_login_disabled">
-					<?=_('Do not allow user to log in to Control Panel');?>
+					<?= _("Do not allow user to log in to Control Panel") ?>
 				</label>
 			</div>
 			<div x-cloak x-show="sendWelcomeMail" id="send-welcome">
 				<div class="form-check u-mb10">
 					<input class="form-check-input" type="checkbox" name="v_email_notice" id="v_email_notify" tabindex="5">
 					<label for="v_email_notify">
-						<?=_('Send welcome email');?>
+						<?= _("Send welcome email") ?>
 					</label>
 				</div>
 			</div>
 			<div class="u-mb10">
-				<label for="v_language" class="form-label"><?=_('Language');?></label>
+				<label for="v_language" class="form-label"><?= _("Language") ?></label>
 				<select class="form-select" name="v_language" id="v_language" tabindex="6">
 					<?php
 						foreach ($languages as $key => $value) {
@@ -93,15 +93,15 @@
 				</select>
 			</div>
 			<div class="u-mb10">
-				<label for="v_role" class="form-label"><?=_('Role');?></label>
+				<label for="v_role" class="form-label"><?= _("Role") ?></label>
 				<select class="form-select" name="v_role" id="v_role">
-					<option value="user"><?=_('User');?>
-					<option value="admin" <?php if($v_role == "admin" ){ echo "selected"; } ?>><?=_('Administrator');?>
-					<option value="dns-cluster" <?php if($v_role == "dns-cluster" ){ echo "selected"; } ?>><?=_('DNS Sync user');?>
+					<option value="user"><?= _("User") ?>
+					<option value="admin" <?php if($v_role == "admin" ){ echo "selected"; } ?>><?= _("Administrator") ?>
+					<option value="dns-cluster" <?php if($v_role == "dns-cluster" ){ echo "selected"; } ?>><?= _("DNS Sync user") ?>
 				</select>
 			</div>
 			<div class="u-mb10">
-				<label for="v_package" class="form-label"><?=_('Package');?></label>
+				<label for="v_package" class="form-label"><?= _("Package") ?></label>
 				<select class="form-select" name="v_package" id="v_package" tabindex="8">
 					<?php
 						foreach ($data as $key => $value) {
@@ -120,7 +120,7 @@
 			</div>
 			<div class="u-mb10">
 				<label for="v_notify" class="form-label">
-					<?=_('Send login credentials to email address') ?>
+					<?= _("Send login credentials to email address") ?>
 				</label>
 				<input type="email" class="form-control" name="v_notify" id="v_notify" value="<?=htmlentities(trim($v_notify, "'"))?>" tabindex="8">
 			</div>

web/templates/pages/add_web.php

@@ -3,13 +3,13 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/web/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
-			<?php if (($user_plain == 'admin') && (($_GET['accept'] === "true")) || ($user_plain !== "admin")) {?>
+			<?php if (($user_plain == "admin" && $_GET["accept"] === "true") || $user_plain !== "admin") { ?>
 				<button class="button" type="submit" form="vstobjects">
-					<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+					<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 				</button>
 			<?php } ?>
 		</div>
@@ -24,27 +24,27 @@
 		<input type="hidden" name="ok" value="Add">
 
 		<div class="form-container">
-			<h1 class="form-title"><?=_('Add Web Domain');?></h1>
+			<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">
 					<i class="fas fa-exclamation"></i>
-					<p><?=_('Avoid adding web domains on admin account');?></p>
+					<p><?= _("Avoid adding web domains on admin account") ?></p>
 				</div>
 			<?php } ?>
 			<?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>
+					<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")) {?>
 				<div class="u-mb10">
-					<label for="v_domain" class="form-label"><?=_('Domain');?></label>
+					<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, "'"))?>">
 				</div>
 				<div class="u-mb20">
-					<label for="v_ip" class="form-label"><?=_('IP Address');?></label>
+					<label for="v_ip" class="form-label"><?= _("IP Address") ?></label>
 					<select class="form-select" name="v_ip" id="v_ip">
 						<?php
 							foreach ($ips as $ip => $value) {
@@ -60,7 +60,7 @@
 						<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") ?>>
 							<label for="v_dns">
-								<?=_('DNS Support');?>
+								<?= _("DNS Support") ?>
 							</label>
 						</div>
 					<?php } ?>
@@ -70,7 +70,7 @@
 						<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") ?>>
 							<label for="v_mail">
-								<?=_('Mail Support');?>
+								<?= _("Mail Support") ?>
 							</label>
 						</div>
 					<?php } ?>

web/templates/pages/edit_backup_exclusions.php

@@ -3,12 +3,12 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/backup/exclusions/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -17,28 +17,28 @@
 
 <div class="container animate__animated animate__fadeIn">
 
-	<form id="vstobjects" name="v_edit_backup_exclusions" method="post" class="<?=_($v_status)?>">
-		<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+	<form id="vstobjects" name="v_edit_backup_exclusions" 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 Backup Exclusions');?></h1>
-			<?php show_alert_message($_SESSION);?>
+			<h1 class="form-title"><?= _("Editing Backup Exclusions") ?></h1>
+			<?php show_alert_message($_SESSION); ?>
 			<div class="u-mb10">
-				<label for="v_web" class="form-label"><?=_('Web Domains');?></label>
-				<textarea class="form-control" name="v_web" id="v_web" placeholder="<?=_('WEB_EXCLUSIONS') ?>"><?=htmlentities(trim($v_web, "'"))?></textarea>
+				<label for="v_web" class="form-label"><?= _("Web Domains") ?></label>
+				<textarea class="form-control" name="v_web" id="v_web" placeholder="<?= _("WEB_EXCLUSIONS") ?>"><?= htmlentities(trim($v_web, "'")) ?></textarea>
 			</div>
 			<div class="u-mb10">
-				<label for="v_mail" class="form-label"><?=_('Mail Domains');?></label>
-				<textarea class="form-control" name="v_mail" id="v_mail" placeholder="<?=_('MAIL_EXCLUSIONS') ?>"><?=htmlentities(trim($v_mail, "'"))?></textarea>
+				<label for="v_mail" class="form-label"><?= _("Mail Domains") ?></label>
+				<textarea class="form-control" name="v_mail" id="v_mail" placeholder="<?= _("MAIL_EXCLUSIONS") ?>"><?= htmlentities(trim($v_mail, "'")) ?></textarea>
 			</div>
 			<div class="u-mb10">
-				<label for="v_db" class="form-label"><?=_('Databases');?></label>
-				<textarea class="form-control" name="v_db" id="v_db" placeholder="<?=_('DB_EXCLUSIONS') ?>"><?=htmlentities(trim($v_db, "'"))?></textarea>
+				<label for="v_db" class="form-label"><?= _("Databases") ?></label>
+				<textarea class="form-control" name="v_db" id="v_db" placeholder="<?= _("DB_EXCLUSIONS") ?>"><?= htmlentities(trim($v_db, "'")) ?></textarea>
 			</div>
 			<div class="u-mb10">
-				<label for="v_userdir" class="form-label"><?=_('User Directories');?></label>
-				<textarea class="form-control" name="v_userdir" id="v_userdir" placeholder="<?=_('USER_EXCLUSIONS') ?>"><?=htmlentities(trim($v_userdir, "'"))?></textarea>
+				<label for="v_userdir" class="form-label"><?= _("User Directories") ?></label>
+				<textarea class="form-control" name="v_userdir" id="v_userdir" placeholder="<?= _("USER_EXCLUSIONS") ?>"><?= htmlentities(trim($v_userdir, "'")) ?></textarea>
 			</div>
 		</div>
 

web/templates/pages/edit_cron.php

@@ -3,12 +3,12 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/cron/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -20,11 +20,11 @@
 	<div class="helper-container">
 		<div id="tabs" class="cron-helper-tabs">
 			<ul>
-				<li><a href="#tabs-1"><?=_('Minutes');?></a></li>
-				<li><a href="#tabs-2"><?=_('Hourly');?></a></li>
-				<li><a href="#tabs-3"><?=_('Daily');?></a></li>
-				<li><a href="#tabs-4"><?=_('Weekly');?></a></li>
-				<li><a href="#tabs-5"><?=_('Monthly');?></a></li>
+				<li><a href="#tabs-1"><?= _("Minutes") ?></a></li>
+				<li><a href="#tabs-2"><?= _("Hourly") ?></a></li>
+				<li><a href="#tabs-3"><?= _("Daily") ?></a></li>
+				<li><a href="#tabs-4"><?= _("Weekly") ?></a></li>
+				<li><a href="#tabs-5"><?= _("Monthly") ?></a></li>
 			</ul>
 			<div id="tabs-1">
 				<form>
@@ -33,19 +33,19 @@
 					<input type="hidden" name="h_month" value="*">
 					<input type="hidden" name="h_wday" value="*">
 					<div class="u-mt10 u-mb20">
-						<label for="h_min_1" class="form-label first"><?=_('Run Command');?>:</label>
+						<label for="h_min_1" class="form-label first"><?= _("Run Command") ?>:</label>
 						<select class="form-select" name="h_min" id="h_min_1">
-							<option value="*" selected="selected"><?=_('every minute');?></option>
-							<option value="*/2"><?=_('every two minutes');?></option>
-							<option value="*/5"><?=_('every');?> 5</option>
-							<option value="*/10"><?=_('every');?> 10</option>
-							<option value="*/15"><?=_('every');?> 15</option>
-							<option value="*/30"><?=_('every');?> 30</option>
+							<option value="*" selected="selected"><?= _("every minute") ?></option>
+							<option value="*/2"><?= _("every two minutes") ?></option>
+							<option value="*/5"><?= _("every") ?> 5</option>
+							<option value="*/10"><?= _("every") ?> 10</option>
+							<option value="*/15"><?= _("every") ?> 15</option>
+							<option value="*/30"><?= _("every") ?> 30</option>
 						</select>
 					</div>
 					<div class="u-pt10">
 						<button type="submit" class="button button-secondary">
-							<?=_('generate');?>
+							<?= _("generate") ?>
 						</button>
 					</div>
 				</form>
@@ -57,16 +57,16 @@
 					<input type="hidden" name="h_month" value="*">
 					<input type="hidden" name="h_wday" value="*">
 					<div class="u-mt10 u-mb10">
-						<label for="h_hour_2" class="form-label first"><?=_('Run Command');?>:</label>
+						<label for="h_hour_2" class="form-label first"><?= _("Run Command") ?>:</label>
 						<select class="form-select" name="h_hour" id="h_hour_2">
-							<option value="*" selected="selected"><?=_('every hour');?></option>
-							<option value="*/2"><?=_('every two hours');?></option>
-							<option value="*/6"><?=_('every');?> 6</option>
-							<option value="*/12"><?=_('every');?> 12</option>
+							<option value="*" selected="selected"><?= _("every hour") ?></option>
+							<option value="*/2"><?= _("every two hours") ?></option>
+							<option value="*/6"><?= _("every") ?> 6</option>
+							<option value="*/12"><?= _("every") ?> 12</option>
 						</select>
 					</div>
 					<div class="u-mb20">
-						<label for="h_min_2" class="form-label first"><?=_('Minute');?>:</label>
+						<label for="h_min_2" class="form-label first"><?= _("Minute") ?>:</label>
 						<select class="form-select" name="h_min" id="h_min_2" style="width:70px;">
 							<option value="0" selected="selected">00</option>
 							<option value="15">15</option>
@@ -76,7 +76,7 @@
 					</div>
 					<div class="u-pt10">
 						<button type="submit" class="button button-secondary">
-							<?=_('generate');?>
+							<?= _("generate") ?>
 						</button>
 					</div>
 				</form>
@@ -87,19 +87,19 @@
 					<input type="hidden" name="h_month" value="*">
 					<input type="hidden" name="h_wday" value="*">
 					<div class="u-mt10 u-mb10">
-						<label for="h_day_3" class="form-label first"><?=_('Run Command');?>:</label>
+						<label for="h_day_3" class="form-label first"><?= _("Run Command") ?>:</label>
 						<select class="form-select" name="h_day" id="h_day_3">
-							<option value="*" selected="selected"><?=_('every day');?></option>
-							<option value="1-31/2"><?=_('every odd day');?></option>
-							<option value="*/2"><?=_('every even day');?></option>
-							<option value="*/3"><?=_('every');?> 3</option>
-							<option value="*/5"><?=_('every');?> 5</option>
-							<option value="*/10"><?=_('every');?> 10</option>
-							<option value="*/15"><?=_('every');?> 15</option>
+							<option value="*" selected="selected"><?= _("every day") ?></option>
+							<option value="1-31/2"><?= _("every odd day") ?></option>
+							<option value="*/2"><?= _("every even day") ?></option>
+							<option value="*/3"><?= _("every") ?> 3</option>
+							<option value="*/5"><?= _("every") ?> 5</option>
+							<option value="*/10"><?= _("every") ?> 10</option>
+							<option value="*/15"><?= _("every") ?> 15</option>
 						</select>
 					</div>
 					<div class="u-mb20">
-						<label for="h_hour_3" class="form-label first"><?=_('Hour');?>:</label>
+						<label for="h_hour_3" class="form-label first"><?= _("Hour") ?>:</label>
 						<select class="form-select" name="h_hour" id="h_hour_3" style="width:70px;">
 							<option value="0">00</option>
 							<option value="1">01</option>
@@ -126,7 +126,7 @@
 							<option value="22">22</option>
 							<option value="23">23</option>
 						</select>
-						<label for="h_min_3" class="form-label"><?=_('Minute');?>:</label>
+						<label for="h_min_3" class="form-label"><?= _("Minute") ?>:</label>
 						<select class="form-select" name="h_min" id="h_min_3" style="width:70px;">
 							<option value="0" selected="selected">00</option>
 							<option value="1">01</option>
@@ -146,7 +146,7 @@
 					</div>
 					<div class="u-pt10">
 						<button type="submit" class="button button-secondary">
-							<?=_('generate');?>
+							<?= _("generate") ?>
 						</button>
 					</div>
 				</form>
@@ -157,22 +157,22 @@
 					<input type="hidden" name="h_month" value="*">
 					<input type="hidden" name="h_day" value="*">
 					<div class="u-mt10 u-mb10">
-						<label for="h_wday_4" class="form-label first"><?=_('Run Command');?>:</label>
+						<label for="h_wday_4" class="form-label first"><?= _("Run Command") ?>:</label>
 						<select class="form-select" name="h_wday" id="h_wday_4">
-							<option value="*" selected="selected"><?=_('every day');?></option>
-							<option value="1,2,3,4,5"><?=_('weekdays (5 days)');?></option>
-							<option value="0,6"><?=_('weekend (2 days)');?></option>
-							<option value="1"><?=_('Monday');?></option>
-							<option value="2"><?=_('Tuesday');?></option>
-							<option value="3"><?=_('Wednesday');?></option>
-							<option value="4"><?=_('Thursday');?></option>
-							<option value="5"><?=_('Friday');?></option>
-							<option value="6"><?=_('Saturday');?></option>
-							<option value="0"><?=_('Sunday');?></option>
+							<option value="*" selected="selected"><?= _("every day") ?></option>
+							<option value="1,2,3,4,5"><?= _("weekdays (5 days)") ?></option>
+							<option value="0,6"><?= _("weekend (2 days)") ?></option>
+							<option value="1"><?= _("Monday") ?></option>
+							<option value="2"><?= _("Tuesday") ?></option>
+							<option value="3"><?= _("Wednesday") ?></option>
+							<option value="4"><?= _("Thursday") ?></option>
+							<option value="5"><?= _("Friday") ?></option>
+							<option value="6"><?= _("Saturday") ?></option>
+							<option value="0"><?= _("Sunday") ?></option>
 						</select>
 					</div>
 					<div class="u-mb20">
-						<label for="h_hour_4" class="form-label first"><?=_('Hour');?>:</label>
+						<label for="h_hour_4" class="form-label first"><?= _("Hour") ?>:</label>
 						<select class="form-select" name="h_hour" id="h_hour_4" style="width:70px;">
 							<option value="0">00</option>
 							<option value="1">01</option>
@@ -199,7 +199,7 @@
 							<option value="22">22</option>
 							<option value="23">23</option>
 						</select>
-						<label for="h_min_4" class="form-label"><?=_('Minute');?>:</label>
+						<label for="h_min_4" class="form-label"><?= _("Minute") ?>:</label>
 						<select class="form-select" name="h_min" id="h_min_4" style="width:70px;">
 							<option value="0" selected="selected">00</option>
 							<option value="1">01</option>
@@ -219,7 +219,7 @@
 					</div>
 					<div class="u-pt10">
 						<button type="submit" class="button button-secondary">
-							<?=_('generate');?>
+							<?= _("generate") ?>
 						</button>
 					</div>
 				</form>
@@ -229,29 +229,29 @@
 				<form>
 					<input type="hidden" name="h_wday" value="*">
 					<div class="u-mt10 u-mb10">
-						<label for="h_month_5" class="form-label first"><?=_('Run Command');?>:</label>
+						<label for="h_month_5" class="form-label first"><?= _("Run Command") ?>:</label>
 						<select class="form-select" name="h_month" id="h_month_5">
-							<option value="*" selected="selected"><?=_('every month');?></option>
-							<option value="1-11/2"><?=_('every odd month');?></option>
-							<option value="*/2"><?=_('every even month');?></option>
-							<option value="*/3"><?=_('every');?> 3</option>
-							<option value="*/6"><?=_('every');?> 6</option>
-							<option value="1"><?=_('Jan');?></option>
-							<option value="2"><?=_('Feb');?></option>
-							<option value="3"><?=_('Mar');?></option>
-							<option value="4"><?=_('Apr');?></option>
-							<option value="5"><?=_('May');?></option>
-							<option value="6"><?=_('Jun');?></option>
-							<option value="7"><?=_('Jul');?></option>
-							<option value="8"><?=_('Aug');?></option>
-							<option value="9"><?=_('Sep');?></option>
-							<option value="10"><?=_('Oct');?></option>
-							<option value="11"><?=_('Nov');?></option>
-							<option value="12"><?=_('Dec');?></option>
+							<option value="*" selected="selected"><?= _("every month") ?></option>
+							<option value="1-11/2"><?= _("every odd month") ?></option>
+							<option value="*/2"><?= _("every even month") ?></option>
+							<option value="*/3"><?= _("every") ?> 3</option>
+							<option value="*/6"><?= _("every") ?> 6</option>
+							<option value="1"><?= _("Jan") ?></option>
+							<option value="2"><?= _("Feb") ?></option>
+							<option value="3"><?= _("Mar") ?></option>
+							<option value="4"><?= _("Apr") ?></option>
+							<option value="5"><?= _("May") ?></option>
+							<option value="6"><?= _("Jun") ?></option>
+							<option value="7"><?= _("Jul") ?></option>
+							<option value="8"><?= _("Aug") ?></option>
+							<option value="9"><?= _("Sep") ?></option>
+							<option value="10"><?= _("Oct") ?></option>
+							<option value="11"><?= _("Nov") ?></option>
+							<option value="12"><?= _("Dec") ?></option>
 						</select>
 					</div>
 					<div class="u-mb20">
-						<label for="h_day_5" class="form-label first"><?=_('Date');?>:</label>
+						<label for="h_day_5" class="form-label first"><?= _("Date") ?>:</label>
 						<select class="form-select" name="h_day" id="h_day_5" style="width:70px;">
 							<option value="1" selected="selected">1</option>
 							<option value="2">2</option>
@@ -285,7 +285,7 @@
 							<option value="30">30</option>
 							<option value="31">31</option>
 						</select>
-						<label for="h_hour_5" class="form-label"><?=_('Hour');?>:</label>
+						<label for="h_hour_5" class="form-label"><?= _("Hour") ?>:</label>
 						<select class="form-select" name="h_hour" id="h_hour_5" style="width:70px;">
 							<option value="0">00</option>
 							<option value="1">01</option>
@@ -312,7 +312,7 @@
 							<option value="22">22</option>
 							<option value="23">23</option>
 						</select>
-						<label for="h_min_5" class="form-label"><?=_('Minute');?>:</label>
+						<label for="h_min_5" class="form-label"><?= _("Minute") ?>:</label>
 						<select class="form-select" name="h_min" id="h_min_5" style="width:70px;">
 							<option value="0" selected="selected">00</option>
 							<option value="1">01</option>
@@ -332,7 +332,7 @@
 					</div>
 					<div class="u-pt10">
 						<button type="submit" class="button button-secondary">
-							<?=_('generate');?>
+							<?= _("generate") ?>
 						</button>
 					</div>
 				</form>
@@ -340,36 +340,36 @@
 		</div>
 	</div>
 
-	<form id="vstobjects" name="v_edit_cron" method="post" class="<?=$v_status?>">
-		<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+	<form id="vstobjects" name="v_edit_cron" method="post" class="<?= $v_status ?>">
+		<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 Cron Job');?></h1>
-			<?php show_alert_message($_SESSION);?>
+			<h1 class="form-title"><?= _("Editing Cron Job") ?></h1>
+			<?php show_alert_message($_SESSION); ?>
 			<div class="u-mb20">
-				<label for="v_cmd" class="form-label"><?=_('Command');?></label>
-				<input type="text" class="form-control" name="v_cmd" id="v_cmd" value="<?=htmlentities(trim($v_cmd, "'"))?>">
+				<label for="v_cmd" class="form-label"><?= _("Command") ?></label>
+				<input type="text" class="form-control" name="v_cmd" id="v_cmd" value="<?= htmlentities(trim($v_cmd, "'")) ?>">
 			</div>
 			<div class="u-mb10">
-				<label for="v_min" class="form-label"><?=_('Minute');?></label>
-				<input type="text" class="form-control" name="v_min" id="v_min" style="width:220px;" value="<?=htmlentities(trim($v_min, "'"))?>">
+				<label for="v_min" class="form-label"><?= _("Minute") ?></label>
+				<input type="text" class="form-control" name="v_min" id="v_min" style="width:220px;" value="<?= htmlentities(trim($v_min, "'")) ?>">
 			</div>
 			<div class="u-mb10">
-				<label for="v_hour" class="form-label"><?=_('Hour');?></label>
-				<input type="text" class="form-control" name="v_hour" id="v_hour" style="width:220px;" value="<?=htmlentities(trim($v_hour, "'"))?>">
+				<label for="v_hour" class="form-label"><?= _("Hour") ?></label>
+				<input type="text" class="form-control" name="v_hour" id="v_hour" style="width:220px;" value="<?= htmlentities(trim($v_hour, "'")) ?>">
 			</div>
 			<div class="u-mb10">
-				<label for="v_day" class="form-label"><?=_('Day');?></label>
-				<input type="text" class="form-control" name="v_day" id="v_day" style="width:220px;" value="<?=htmlentities(trim($v_day, "'"))?>">
+				<label for="v_day" class="form-label"><?= _("Day") ?></label>
+				<input type="text" class="form-control" name="v_day" id="v_day" style="width:220px;" value="<?= htmlentities(trim($v_day, "'")) ?>">
 			</div>
 			<div class="u-mb10">
-				<label for="v_month" class="form-label"><?=_('Month');?></label>
-				<input type="text" class="form-control" name="v_month" id="v_month" style="width:220px;" value="<?=htmlentities(trim($v_month, "'"))?>">
+				<label for="v_month" class="form-label"><?= _("Month") ?></label>
+				<input type="text" class="form-control" name="v_month" id="v_month" style="width:220px;" value="<?= htmlentities(trim($v_month, "'")) ?>">
 			</div>
 			<div class="u-mb10">
-				<label for="v_wday" class="form-label"><?=_('Day of week');?></label>
-				<input type="text" class="form-control" name="v_wday" id="v_wday" style="width:220px;" value="<?=htmlentities(trim($v_wday, "'"))?>">
+				<label for="v_wday" class="form-label"><?= _("Day of week") ?></label>
+				<input type="text" class="form-control" name="v_wday" id="v_wday" style="width:220px;" value="<?= htmlentities(trim($v_wday, "'")) ?>">
 			</div>
 		</div>
 

web/templates/pages/edit_db.php

@@ -3,12 +3,12 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/db/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -17,53 +17,53 @@
 
 <div class="container animate__animated animate__fadeIn">
 
-	<form id="vstobjects" name="v_edit_db" method="post" class="<?=$v_status?>">
-		<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+	<form id="vstobjects" name="v_edit_db" 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 Database');?></h1>
-			<?php show_alert_message($_SESSION);?>
+			<h1 class="form-title"><?= _("Editing Database") ?></h1>
+			<?php show_alert_message($_SESSION); ?>
 			<div class="u-mb10">
-				<label for="v_database" class="form-label"><?=_('Database');?></label>
-				<input type="text" class="form-control" name="v_database" id="v_database" value="<?=htmlentities(trim($v_database, "'"))?>" disabled>
+				<label for="v_database" class="form-label"><?= _("Database") ?></label>
+				<input type="text" class="form-control" name="v_database" id="v_database" value="<?= htmlentities(trim($v_database, "'")) ?>" disabled>
 				<small class="hint"></small>
 			</div>
 			<div class="u-mb10">
 				<label for="v_dbuser" class="form-label u-side-by-side">
-					<?=_('Username');?>
-					<em><small>(<?=sprintf(_('maximum characters length, including prefix'), 32);?>)</small></em>
+					<?= _("Username") ?>
+					<em><small>(<?= sprintf(_("maximum characters length, including prefix"), 32) ?>)</small></em>
 				</label>
-				<input type="text" class="form-control" name="v_dbuser" id="v_dbuser" value="<?=htmlentities(trim($v_dbuser, "'"))?>">
+				<input type="text" class="form-control" name="v_dbuser" id="v_dbuser" value="<?= htmlentities(trim($v_dbuser, "'")) ?>">
 				<small class="hint"></small>
 			</div>
 			<div class="u-mb10">
 				<label for="v_password" class="form-label">
-					<?=_('Password');?>
-					<a href="javascript:applyRandomString();" title="<?=_('generate');?>" class="u-ml5"><i class="fas fa-arrows-rotate status-icon green icon-large"></i></a>
+					<?= _("Password") ?>
+					<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>
-			<p class="u-mb10"><?=_('Your password must have at least');?>:</p>
+			<p class="u-mb10"><?= _("Your password must have at least") ?>:</p>
 			<ul class="u-list-bulleted u-mb10">
-				<li><?=_('8 characters long');?></li>
-				<li><?=_('1 uppercase & 1 lowercase character');?></li>
-				<li><?=_('1 number');?></li>
+				<li><?= _("8 characters long") ?></li>
+				<li><?= _("1 uppercase & 1 lowercase character") ?></li>
+				<li><?= _("1 number") ?></li>
 			</ul>
 			<div class="u-mb10">
-				<label for="v_type" class="form-label"><?=_('Type');?></label>
-				<input type="text" class="form-control" name="v_type" id="v_type" value="<?=htmlentities(trim($v_type, "'"))?>" disabled>
+				<label for="v_type" class="form-label"><?= _("Type") ?></label>
+				<input type="text" class="form-control" name="v_type" id="v_type" value="<?= htmlentities(trim($v_type, "'")) ?>" disabled>
 			</div>
 			<div class="u-mb10">
-				<label for="v_host" class="form-label"><?=_('Host');?></label>
-				<input type="text" class="form-control" name="v_host" id="v_host" value="<?=htmlentities(trim($v_host, "'"))?>" disabled>
+				<label for="v_host" class="form-label"><?= _("Host") ?></label>
+				<input type="text" class="form-control" name="v_host" id="v_host" value="<?= htmlentities(trim($v_host, "'")) ?>" disabled>
 			</div>
 			<div class="u-mb10">
-				<label for="v_charset" class="form-label"><?=_('Charset');?></label>
-				<input type="text" class="form-control" name="v_charset" id="v_charset" value="<?=htmlentities(trim($v_charset, "'"))?>" disabled>
+				<label for="v_charset" class="form-label"><?= _("Charset") ?></label>
+				<input type="text" class="form-control" name="v_charset" id="v_charset" value="<?= htmlentities(trim($v_charset, "'")) ?>" disabled>
 			</div>
 		</div>
 

web/templates/pages/edit_dns.php

@@ -3,12 +3,12 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/dns/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -22,15 +22,15 @@
 		<input type="hidden" name="save" value="save">
 
 		<div class="form-container">
-			<h1 class="form-title"><?=_('Editing DNS Domain');?></h1>
+			<h1 class="form-title"><?= _("Editing DNS Domain") ?></h1>
 			<?php show_alert_message($_SESSION);?>
 			<div class="u-mb10">
-				<label for="v_domain" class="form-label"><?=_('Domain');?></label>
+				<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, "'"))?>">
 			</div>
 			<div class="u-mb10">
-				<label for="v_ip" class="form-label"><?=_('IP address');?></label>
+				<label for="v_ip" class="form-label"><?= _("IP address") ?></label>
 				<div class="u-pos-relative">
 					<select class="form-select" tabindex="-1" onchange="this.nextElementSibling.value=this.value">
 						<option value="">clear</option>
@@ -48,7 +48,7 @@
 			<?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
@@ -67,21 +67,21 @@
 			<div class="form-check u-mb10">
 				<input class="form-check-input" type="checkbox" name="v_dnssec" id="v_dnssec" value="yes" <?php if($v_dnssec === 'yes'){ echo ' checked'; } ?>>
 				<label for="v_dnssec">
-					<?=_('Enable DNSSEC');?>
+					<?= _("Enable DNSSEC") ?>
 				</label>
 			</div>
 			<div class="u-mb10">
 				<label for="v_exp" class="form-label">
-					<?=_('Expiration Date');?><span class="optional">(<?=_('YYYY-MM-DD');?>)</span>
+					<?= _("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, "'"))?>">
 			</div>
 			<div class="u-mb10">
-				<label for="v_soa" class="form-label"><?=_('SOA');?></label>
+				<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, "'"))?>">
 			</div>
 			<div class="u-mb10">
-				<label for="v_ttl" class="form-label"><?=_('TTL');?></label>
+				<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, "'"))?>">
 			</div>
 		</div>

web/templates/pages/edit_dns_rec.php

@@ -2,13 +2,13 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/list/dns/?domain=<?=htmlentities(trim($v_domain, "'"))?>&token=<?=$_SESSION['token']?>">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+			<a class="button button-secondary" id="btn-back" href="/list/dns/?domain=<?= htmlentities(trim($v_domain, "'")) ?>&token=<?= $_SESSION["token"] ?>">
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -22,21 +22,21 @@
 		<input type="hidden" name="save" value="save">
 
 		<div class="form-container">
-			<h1 class="form-title"><?=_('Editing DNS Record');?></h1>
+			<h1 class="form-title"><?= _("Editing DNS Record") ?></h1>
 			<?php show_alert_message($_SESSION);?>
 			<div class="u-mb10">
-				<label for="v_domain" class="form-label"><?=_('Domain');?></label>
+				<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, "'"))?>">
 			</div>
 			<div class="u-mb10">
-				<label for="v_rec" class="form-label"><?=_('Record');?></label>
+				<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, "'"))?>">
 				<small class="hint"></small>
 			</div>
 			<div class="u-mb10">
-				<label for="v_type" class="form-label"><?=_('Type');?></label>
+				<label for="v_type" class="form-label"><?= _("Type") ?></label>
 				<select class="form-select" name="v_type" id="v_type">
 					<option value="A" <?php if ($v_type == 'A') echo "selected"; ?>>A</option>
 					<option value="AAAA" <?php if ($v_type == 'AAAA') echo "selected"; ?>>AAAA</option>
@@ -56,7 +56,7 @@
 				</select>
 			</div>
 			<div class="u-mb10">
-				<label for="v_val" class="form-label"><?=_('IP or Value');?></label>
+				<label for="v_val" class="form-label"><?= _("IP or Value") ?></label>
 				<div class="u-pos-relative">
 					<select class="form-select" tabindex="-1" onchange="this.nextElementSibling.value=this.value">
 						<option value="">&nbsp;</option>
@@ -72,13 +72,13 @@
 			</div>
 			<div class="u-mb10">
 				<label for="v_priority" class="form-label">
-					<?=_('Priority');?> <span class="optional">(<?=_('optional');?>)</span>
+					<?= _("Priority") ?> <span class="optional">(<?= _("optional") ?>)</span>
 				</label>
 				<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>
+					<?= _("TTL") ?> <span class="optional">(<?= _("optional") ?>)</span>
 				</label>
 				<input type="text" class="form-control" name="v_ttl" id="v_ttl" value="<?=htmlentities(trim($v_ttl, "'"))?>">
 			</div>

web/templates/pages/edit_firewall.php

@@ -3,12 +3,12 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/firewall/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -22,32 +22,32 @@
 		<input type="hidden" name="save" value="save">
 
 		<div class="form-container">
-			<h1 class="form-title"><?=_('Editing Firewall Rule');?></h1>
+			<h1 class="form-title"><?= _("Editing Firewall Rule") ?></h1>
 			<?php show_alert_message($_SESSION);?>
 			<div class="u-mb10">
-				<label for="v_action" class="form-label"><?=_('Action') ?></label>
+				<label for="v_action" class="form-label"><?= _("Action") ?></label>
 				<select class="form-select" name="v_action" id="v_action">
-					<option value="DROP" <?php if ((!empty($v_action)) && ( $v_action == "DROP" )) echo 'selected'?>><?=_('DROP');?></option>
-					<option value="ACCEPT" <?php if ((!empty($v_action)) && ( $v_action == "ACCEPT" )) echo 'selected'?>><?=_('ACCEPT');?></option>
+					<option value="DROP" <?php if ((!empty($v_action)) && ( $v_action == "DROP" )) echo 'selected'?>><?= _("DROP") ?></option>
+					<option value="ACCEPT" <?php if ((!empty($v_action)) && ( $v_action == "ACCEPT" )) echo 'selected'?>><?= _("ACCEPT") ?></option>
 				</select>
 			</div>
 			<div class="u-mb10">
-				<label for="v_protocol" class="form-label"><?=_('Protocol') ?></label>
+				<label for="v_protocol" class="form-label"><?= _("Protocol") ?></label>
 				<select class="form-select" name="v_protocol" id="v_protocol">
-					<option value="TCP" <?php if ((!empty($v_protocol)) && ( $v_protocol == "TCP" )) echo 'selected'?>><?=_('TCP');?></option>
-					<option value="UDP" <?php if ((!empty($v_protocol)) && ( $v_protocol == "UDP" )) echo 'selected'?>><?=_('UDP');?></option>
-					<option value="ICMP" <?php if ((!empty($v_protocol)) && ( $v_protocol == "ICMP" )) echo 'selected'?>><?=_('ICMP');?></option>
+					<option value="TCP" <?php if ((!empty($v_protocol)) && ( $v_protocol == "TCP" )) echo 'selected'?>><?= _("TCP") ?></option>
+					<option value="UDP" <?php if ((!empty($v_protocol)) && ( $v_protocol == "UDP" )) echo 'selected'?>><?= _("UDP") ?></option>
+					<option value="ICMP" <?php if ((!empty($v_protocol)) && ( $v_protocol == "ICMP" )) echo 'selected'?>><?= _("ICMP") ?></option>
 				</select>
 			</div>
 			<div class="u-mb10">
 				<label for="v_port" class="form-label">
-					<?=_('Port');?> <span class="optional">(<?=_('Ranges and Lists are acceptable');?>)</span>
+					<?= _("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">
-					<?=_('IP address / IPset');?> <span class="optional">(<?=_('CIDR format is supported');?>)</span>
+					<?= _("IP address / IPset") ?> <span class="optional">(<?= _("CIDR format is supported") ?>)</span>
 				</label>
 				<div class="u-pos-relative">
 					<select class="form-select" tabindex="-1" id="quickips_list" onchange="this.nextElementSibling.value=this.value">
@@ -58,7 +58,7 @@
 			</div>
 			<div class="u-mb10">
 				<label for="v_comment" class="form-label">
-					<?=_('Comment');?> <span class="optional">(<?=_('optional');?>)</span>
+					<?= _("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, "'"))?>">
 			</div>
@@ -69,7 +69,7 @@
 </div>
 
 <script>
-	var ipLists = JSON.parse('<?=$ipset_lists_json?>');
+	var ipLists = JSON.parse('<?= $ipset_lists_json ?>');
 	ipLists.sort(function (a, b) {
 		return a.name > b.name;
 	});

web/templates/pages/edit_ip.php

@@ -3,12 +3,12 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/ip/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -29,30 +29,30 @@
 		<input type="hidden" name="save" value="save">
 
 		<div class="form-container">
-			<h1 class="form-title"><?=_('Editing IP Address');?></h1>
+			<h1 class="form-title"><?= _("Editing IP Address") ?></h1>
 			<?php show_alert_message($_SESSION);?>
 			<div class="u-mb10">
-				<label for="v_ip" class="form-label"><?=_('IP address') ?></label>
+				<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, "'"))?>">
 			</div>
 			<div class="u-mb10">
-				<label for="v_netmask" class="form-label"><?=_('Netmask');?></label>
+				<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>
 			</div>
 			<div class="u-mb10">
-				<label for="v_interface" class="form-label"><?=_('Interface');?></label>
+				<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>
 			</div>
 			<div class="form-check u-mb10">
 				<input x-model="showUserTable" class="form-check-input" type="checkbox" name="v_shared" id="v_shared">
 				<label for="v_shared">
-					<?=_('Shared');?>
+					<?= _("Shared") ?>
 				</label>
 			</div>
 			<div x-cloak x-show="showUserTable" id="usrtable">
 				<div class="u-mb10">
-					<label for="v_owner" class="form-label"><?=_('Assigned user');?></label>
+					<label for="v_owner" class="form-label"><?= _("Assigned user") ?></label>
 					<select class="form-select" name="v_owner" id="v_owner">
 						<?php
 							foreach ($users as $key => $value) {
@@ -66,13 +66,13 @@
 			</div>
 			<div class="u-mb10">
 				<label for="v_name" class="form-label">
-					<?=_('Assigned domain');?> <span class="optional">(<?=_('optional');?>)</span>
+					<?= _("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, "'"))?>">
 			</div>
 			<div class="u-mb10">
 				<label for="v_nat" class="form-label">
-					<?=_('NAT IP association');?> <span class="optional">(<?=_('optional');?>)</span>
+					<?= _("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, "'"))?>">
 			</div>

web/templates/pages/edit_mail.php

@@ -3,12 +3,12 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/mail/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -32,16 +32,16 @@
 		<input type="hidden" name="save" value="save">
 
 		<div class="form-container">
-			<h1 class="form-title"><?=_('Editing Mail Domain');?></h1>
+			<h1 class="form-title"><?= _("Editing Mail Domain") ?></h1>
 			<?php show_alert_message($_SESSION);?>
 			<div class="u-mb20">
-				<label for="v_domain" class="form-label"><?=_('Domain');?></label>
+				<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, "'"))?>">
 			</div>
 			<?php if($_SESSION['WEBMAIL_SYSTEM']) {?>
 				<div class="u-mb10">
-					<label for="v_webmail" class="form-label"><?=_('Webmail Client');?></label>
+					<label for="v_webmail" class="form-label"><?= _("Webmail Client") ?></label>
 					<select class="form-select" name="v_webmail" id="v_webmail" tabindex="6">
 						<?php foreach ($webmail_clients as $client){
 							echo "\t\t\t\t<option value=\"".htmlentities($client)."\"";
@@ -51,17 +51,17 @@
 							echo ">".htmlentities(ucfirst($client))."</option>\n";
 							}
 						?>
-						<option value="disabled" <?php if (htmlentities(trim($v_webmail,"'")) == 'disabled') { echo "selected";}?>><?=_('Disabled');?></option>
+						<option value="disabled" <?php if (htmlentities(trim($v_webmail,"'")) == 'disabled') { echo "selected";}?>><?= _("Disabled") ?></option>
 					</select>
 				</div>
 			<?php } ?>
 			<div class="u-mb10">
-				<label for="v_catchall" class="form-label"><?=_('Catchall email');?></label>
+				<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, "'"))?>">
 			</div>
 			<div class="u-mb20">
 				<label for="v_rate" class="form-label">
-					<?=_('Rate limit');?> <span class="optional">(<?=_('Email / hour / account');?>)</span>
+					<?= _("Rate limit") ?> <span class="optional">(<?= _("Email / hour / account") ?>)</span>
 				</label>
 				<input type="text" class="form-control" name="v_rate" id="v_rate" value="<?=htmlentities(trim($v_rate, "'"))?>" <?php if($_SESSION['userContext'] != "admin"){ echo "disabled";}?>>
 			</div>
@@ -69,13 +69,13 @@
 				<div class="form-check u-mb10">
 					<input class="form-check-input" type="checkbox" name="v_antispam" id="v_antispam" <?php if ($v_antispam == 'yes') echo 'checked'; ?>>
 					<label for="v_antispam">
-						<?=_('AntiSpam Support');?>
+						<?= _("AntiSpam Support") ?>
 					</label>
 				</div>
 				<div class="form-check u-mb10">
 					<input class="form-check-input" type="checkbox" name="v_reject" id="v_reject" <?php if ($v_reject == 'yes') echo 'checked'; ?>>
 					<label for="v_reject">
-						<?=_('Reject spam');?>
+						<?= _("Reject spam") ?>
 					</label>
 				</div>
 			<?php } ?>
@@ -83,27 +83,27 @@
 				<div class="form-check u-mb10">
 					<input class="form-check-input" type="checkbox" name="v_antivirus" id="v_antivirus" <?php if ($v_antivirus == 'yes') echo 'checked'; ?>>
 					<label for="v_antivirus">
-						<?=_('AntiVirus Support');?>
+						<?= _("AntiVirus Support") ?>
 					</label>
 				</div>
 			<?php } ?>
 			<div class="form-check u-mb10">
 				<input class="form-check-input" type="checkbox" name="v_dkim" id="v_dkim" <?php if ($v_dkim == 'yes') echo 'checked'; ?>>
 				<label for="v_dkim">
-					<?=_('DKIM Support');?>
+					<?= _("DKIM Support") ?>
 				</label>
 			</div>
 			<div class="form-check u-mb10">
 				<input x-model="sslEnabled" class="form-check-input" type="checkbox" name="v_ssl" id="v_ssl">
 				<label for="v_ssl">
-					<?=_('SSL Support');?>
+					<?= _("SSL Support") ?>
 				</label>
 			</div>
 			<div x-cloak x-show="sslEnabled" id="ssltable" class="u-pl30">
 				<div class="form-check u-mb10">
 					<input x-model="letsEncryptEnabled" class="form-check-input" type="checkbox" name="v_letsencrypt" id="v_letsencrypt">
 					<label for="v_letsencrypt">
-						<?=_('Lets Encrypt Support');?>
+						<?= _("Lets Encrypt Support") ?>
 					</label>
 				</div>
 				<div id="le-warning" class="u-mb20">
@@ -116,18 +116,18 @@
 				<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>
+							<?= _("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>
 						</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>
 					</div>
 					<div class="u-mb10">
-						<label for="v_ssl_key" class="form-label"><?=_('SSL Key');?></label>
+						<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>
 					</div>
 					<div class="u-mb20">
 						<label for="v_ssl_ca" class="form-label">
-							<?=_('SSL Certificate Authority / Intermediate');?> <span class="optional">(<?=_('optional');?>)</span>
+							<?= _("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>
 					</div>
@@ -135,33 +135,33 @@
 				<?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-label"><?= _("SUBJECT") ?></span>
 							<span class="values-list-value"><?=htmlentities($v_ssl_subject);?></span>
 						</li>
 						<?php if ($v_ssl_aliases) {?>
 							<li class="values-list-item">
-								<span class="values-list-label"><?=_('Aliases');?></span>
+								<span class="values-list-label"><?= _("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-label"><?= _("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-label"><?= _("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-label"><?= _("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-label"><?= _("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-label"><?= _("ISSUER") ?></span>
 							<span class="values-list-value"><?=htmlentities($v_ssl_issuer)?></span>
 						</li>
 					</ul>
@@ -170,24 +170,24 @@
 			<div class="form-check u-mb10">
 				<input x-model="hasSmtpRelay" class="form-check-input" type="checkbox" name="v_smtp_relay" id="v_smtp_relay">
 				<label for="v_smtp_relay">
-					<?=_('SMTP Relay');?>
+					<?= _("SMTP Relay") ?>
 				</label>
 			</div>
 			<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, "'"))?>">
+					<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, "'")) ?>">
 				</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, "'"))?>">
+					<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, "'")) ?>">
 				</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, "'"))?>">
+					<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, "'")) ?>">
 				</div>
 				<div class="u-mb10">
-					<label for="v_smtp_relay_pass" class="form-label"><?=_('Password');?></label>
+					<label for="v_smtp_relay_pass" class="form-label"><?= _("Password") ?></label>
 					<input type="text" class="form-control" name="v_smtp_relay_pass" id="v_smtp_relay_pass">
 				</div>
 			</div>

web/templates/pages/edit_mail_acc.php

@@ -2,13 +2,13 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/list/mail/?domain=<?=htmlentities(trim($v_domain, "'"))?>&token=<?=$_SESSION['token']?>">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+			<a class="button button-secondary" id="btn-back" href="/list/mail/?domain=<?= htmlentities(trim($v_domain, "'")) ?>&token=<?= $_SESSION["token"] ?>">
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -30,173 +30,173 @@
 		<input type="hidden" name="save" value="save">
 
 		<div class="form-container form-container-wide">
-			<h1 class="form-title"><?=_('Editing Mail Account');?></h1>
+			<h1 class="form-title"><?= _("Editing Mail Account") ?></h1>
 			<?php show_alert_message($_SESSION);?>
 			<div class="sidebar-container">
 				<div>
 					<div class="u-mb10">
-						<label for="v_email" class="form-label"><?=_('Account');?></label>
+						<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, "'"))?>">
 					</div>
 					<div class="u-mb10">
 						<label for="v_password" class="form-label">
-							<?=_('Password');?>
-							<a href="javascript:applyRandomString();" title="<?=_('generate');?>" class="u-ml5"><i class="fas fa-arrows-rotate status-icon green icon-large"></i></a>
+							<?= _("Password") ?>
+							<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, "'"))?>">
 							<meter max="4" class="password-meter"></meter>
 						</div>
 					</div>
-					<p class="u-mb10"><?=_('Your password must have at least');?>:</p>
+					<p class="u-mb10"><?= _("Your password must have at least") ?>:</p>
 					<ul class="u-list-bulleted">
-						<li><?=_('8 characters long');?></li>
-						<li><?=_('1 uppercase & 1 lowercase character');?></li>
-						<li><?=_('1 number');?></li>
+						<li><?= _("8 characters long") ?></li>
+						<li><?= _("1 uppercase & 1 lowercase character") ?></li>
+						<li><?= _("1 number") ?></li>
 					</ul>
 					<div class="u-pt18 u-mb10">
 						<label for="v_send_email" class="form-label">
-							<?=_('Send login credentials to email address') ?>
+							<?= _("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="hidden" name="v_credentials" class="js-hidden-credentials">
 					</div>
 					<div class="u-mb10">
 						<label for="v_quota" class="form-label">
-							<?=_('Quota');?> <span class="optional">(<?=_('in megabytes');?>)</span>
+							<?= _("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="<?php if (!empty($v_quota)) {echo htmlentities(trim($v_quota, "'"));} else { echo "0"; } ?>">
-							<i class="unlim-trigger fas fa-infinity" title="<?=_('Unlimited');?>"></i>
+							<i class="unlim-trigger fas fa-infinity" title="<?= _("Unlimited") ?>"></i>
 						</div>
 					</div>
 					<div class="u-mb10">
 						<label for="v_aliases" class="form-label">
-							<?=_('Aliases');?> <span class="optional">(<?=_('use local-part');?>)</span>
+							<?= _("Aliases") ?> <span class="optional">(<?= _("use local-part") ?>)</span>
 						</label>
 						<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' ?>>
 						<label for="v_blackhole">
-							<?=_('Discard all mail');?>
+							<?= _("Discard all mail") ?>
 						</label>
 					</div>
 					<div id="id_fwd_for" style="display:<?php if ($v_blackhole == 'yes') {echo 'none';} else {echo 'block';}?> ;">
 						<div class="form-check">
 							<input class="form-check-input" type="checkbox" name="v_fwd_only" id="v_fwd_for" <?php if ($v_fwd_only == 'yes') echo 'checked' ?>>
 							<label for="v_fwd_for">
-								<?=_('Do not store forwarded mail');?>
+								<?= _("Do not store forwarded mail") ?>
 							</label>
 						</div>
 					</div>
 					<div class="form-check u-mb10">
 						<input x-model="hasAutoReply" class="form-check-input" type="checkbox" name="v_autoreply" id="v_autoreply">
 						<label for="v_autoreply">
-							<?=_('Autoreply');?>
+							<?= _("Autoreply") ?>
 						</label>
 					</div>
 					<div x-cloak x-show="hasAutoReply" id="autoreplytable">
 						<div class="u-mb10">
-							<label for="v_autoreply_message" class="form-label"><?=_('Message');?></label>
+							<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>
 						</div>
 					</div>
 					<div id="v-fwd-opt">
 						<div class="u-mb10">
 							<label for="v_fwd" class="form-label">
-								<?=_('Forward to');?> <span class="optional">(<?=_('one or more email addresses');?>)</span>
+								<?= _("Forward to") ?> <span class="optional">(<?= _("one or more email addresses") ?>)</span>
 							</label>
 							<textarea class="form-control" name="v_fwd" id="v_fwd" <?php if($v_blackhole == 'yes') echo "disabled";?>><?=htmlentities(trim($v_fwd, "'"))?></textarea>
 						</div>
 					</div>
 					<div class="u-mb20">
 						<label for="v_rate" class="form-label">
-							<?=_('Rate limit');?> <span class="optional">(<?=_('Email / hour');?>)</span>
+							<?= _("Rate limit") ?> <span class="optional">(<?= _("Email / hour") ?>)</span>
 						</label>
 						<input type="text" class="form-control" name="v_rate" id="v_rate" value="<?=htmlentities(trim($v_rate, "'"))?>" <?php if($_SESSION['userContext'] != "admin"){ echo "disabled";}?>>
 					</div>
 				</div>
 				<div>
 					<div class="panel js-mail-info">
-						<h2 class="u-text-H3 u-mb10"><?=_('Common account settings');?></h2>
+						<h2 class="u-text-H3 u-mb10"><?= _("Common account settings") ?></h2>
 						<ul class="values-list u-mb20">
 							<li class="values-list-item">
-								<span class="values-list-label"><?=_('Username');?></span>
+								<span class="values-list-label"><?= _("Username") ?></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-label"><?= _("Password") ?></span>
 								<span class="values-list-value"><span class="js-password-output"></span></span>
 							</li>
 							<?php if ($_SESSION['WEBMAIL_SYSTEM']) {?>
 								<li class="values-list-item">
-									<span class="values-list-label"><?=_('Webmail');?></span>
+									<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>
 								</li>
 							<?php } ?>
 							<li class="values-list-item">
-								<span class="values-list-label"><?=_('Hostname');?></span>
+								<span class="values-list-label"><?= _("Hostname") ?></span>
 								<span class="values-list-value">mail.<?=htmlentities($v_domain)?></span>
 							</li>
 						</ul>
-						<h2 class="u-text-H3 u-mb10"><?=_('IMAP settings');?></h2>
+						<h2 class="u-text-H3 u-mb10"><?= _("IMAP settings") ?></h2>
 						<ul class="values-list u-mb20">
 							<li class="values-list-item">
-								<span class="values-list-label"><?=_('Authentication');?></span>
-								<span class="values-list-value"><?=_('Normal password');?></span>
+								<span class="values-list-label"><?= _("Authentication") ?></span>
+								<span class="values-list-value"><?= _("Normal password") ?></span>
 							</li>
 							<li class="values-list-item">
-								<span class="values-list-label"><?=_('SSL/TLS');?></span>
-								<span class="values-list-value"><?=_('Port');?> 993</span>
+								<span class="values-list-label"><?= _("SSL/TLS") ?></span>
+								<span class="values-list-value"><?= _("Port") ?> 993</span>
 							</li>
 							<li class="values-list-item">
-								<span class="values-list-label"><?=_('STARTTLS');?></span>
-								<span class="values-list-value"><?=_('Port');?> 143</span>
+								<span class="values-list-label"><?= _("STARTTLS") ?></span>
+								<span class="values-list-value"><?= _("Port") ?> 143</span>
 							</li>
 							<li class="values-list-item">
-								<span class="values-list-label"><?=_('No encryption');?></span>
-								<span class="values-list-value"><?=_('Port');?> 143</span>
+								<span class="values-list-label"><?= _("No encryption") ?></span>
+								<span class="values-list-value"><?= _("Port") ?> 143</span>
 							</li>
 						</ul>
-						<h2 class="u-text-H3 u-mb10"><?=_('POP3 settings');?></h2>
+						<h2 class="u-text-H3 u-mb10"><?= _("POP3 settings") ?></h2>
 						<ul class="values-list u-mb20">
 							<li class="values-list-item">
-								<span class="values-list-label"><?=_('Authentication');?></span>
-								<span class="values-list-value"><?=_('Normal password');?></span>
+								<span class="values-list-label"><?= _("Authentication") ?></span>
+								<span class="values-list-value"><?= _("Normal password") ?></span>
 							</li>
 							<li class="values-list-item">
-								<span class="values-list-label"><?=_('SSL/TLS');?></span>
-								<span class="values-list-value"><?=_('Port');?> 995</span>
+								<span class="values-list-label"><?= _("SSL/TLS") ?></span>
+								<span class="values-list-value"><?= _("Port") ?> 995</span>
 							</li>
 							<li class="values-list-item">
-								<span class="values-list-label"><?=_('STARTTLS');?></span>
-								<span class="values-list-value"><?=_('Port');?> 110</span>
+								<span class="values-list-label"><?= _("STARTTLS") ?></span>
+								<span class="values-list-value"><?= _("Port") ?> 110</span>
 							</li>
 							<li class="values-list-item">
-								<span class="values-list-label"><?=_('No encryption');?></span>
-								<span class="values-list-value"><?=_('Port');?> 110</span>
+								<span class="values-list-label"><?= _("No encryption") ?></span>
+								<span class="values-list-value"><?= _("Port") ?> 110</span>
 							</li>
 						</ul>
-						<h2 class="u-text-H3 u-mb10"><?=_('SMTP settings');?></h2>
+						<h2 class="u-text-H3 u-mb10"><?= _("SMTP settings") ?></h2>
 						<ul class="values-list">
 							<li class="values-list-item">
-								<span class="values-list-label"><?=_('Authentication');?></span>
-								<span class="values-list-value"><?=_('Normal password');?></span>
+								<span class="values-list-label"><?= _("Authentication") ?></span>
+								<span class="values-list-value"><?= _("Normal password") ?></span>
 							</li>
 							<li class="values-list-item">
-								<span class="values-list-label"><?=_('SSL/TLS');?></span>
-								<span class="values-list-value"><?=_('Port');?> 465</span>
+								<span class="values-list-label"><?= _("SSL/TLS") ?></span>
+								<span class="values-list-value"><?= _("Port") ?> 465</span>
 							</li>
 							<li class="values-list-item">
-								<span class="values-list-label"><?=_('STARTTLS');?></span>
-								<span class="values-list-value"><?=_('Port');?> 587</span>
+								<span class="values-list-label"><?= _("STARTTLS") ?></span>
+								<span class="values-list-value"><?= _("Port") ?> 587</span>
 							</li>
 							<li class="values-list-item">
-								<span class="values-list-label"><?=_('No encryption');?></span>
-								<span class="values-list-value"><?=_('Port');?> 25</span>
+								<span class="values-list-label"><?= _("No encryption") ?></span>
+								<span class="values-list-value"><?= _("Port") ?> 25</span>
 							</li>
 						</ul>
 					</div>

web/templates/pages/edit_package.php

@@ -3,12 +3,12 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/package/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -28,43 +28,43 @@
 		id="vstobjects"
 		name="v_edit_package"
 		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 Package');?></h1>
-			<?php show_alert_message($_SESSION);?>
+			<h1 class="form-title"><?= _("Editing Package") ?></h1>
+			<?php show_alert_message($_SESSION); ?>
 			<div class="u-mb10">
-				<label for="v_package_new" class="form-label"><?=_('Package Name');?></label>
-				<input type="text" class="form-control" name="v_package_new" id="v_package_new" value="<?=htmlentities(trim($v_package_new, "'"))?>">
-				<input type="hidden" name="v_package" value="<?=htmlentities(trim($v_package, "'"))?>">
+				<label for="v_package_new" class="form-label"><?= _("Package Name") ?></label>
+				<input type="text" class="form-control" name="v_package_new" id="v_package_new" value="<?= htmlentities(trim($v_package_new, "'")) ?>">
+				<input type="hidden" name="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>
+					<?= _("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, "'"))?>">
-					<i class="unlim-trigger fas fa-infinity" title="<?=_('Unlimited');?>"></i>
+					<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>
 			<div class="u-mb10">
 				<label for="v_bandwidth" class="form-label">
-					<?=_('Bandwidth');?> <span class="optional">(<?=_('in megabytes');?>)</span>
+					<?= _("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, "'"))?>">
-					<i class="unlim-trigger fas fa-infinity" title="<?=_('Unlimited');?>"></i>
+					<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, "'"))?>">
+				<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, "'")) ?>">
 			</div>
 			<h2 x-on:click="showWebOptions = !showWebOptions" class="section-title">
-				<?=_('Web');?>
+				<?= _("Web") ?>
 				<i
 					x-bind:class="showWebOptions ? 'fa-square-minus' : 'fa-square-plus'"
 					class="fas status-icon dim maroon js-section-toggle-icon"
@@ -72,24 +72,24 @@
 			</h2>
 			<div x-cloak x-show="showWebOptions" id="web-options">
 				<div class="u-mt15 u-mb10">
-					<label for="v_web_domains" class="form-label"><?=_('Web Domains');?></label>
+					<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, "'"))?>">
-						<i class="unlim-trigger fas fa-infinity" title="<?=_('Unlimited');?>"></i>
+						<i class="unlim-trigger fas fa-infinity" title="<?= _("Unlimited") ?>"></i>
 					</div>
 				</div>
 				<div class="u-mb10">
 					<label for="v_web_aliases" class="form-label">
-						<?=_('Web Aliases');?> <span class="optional">(<?=_('per domain');?>)</span>
+						<?= _("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, "'"))?>">
-						<i class="unlim-trigger fas fa-infinity" title="<?=_('Unlimited');?>"></i>
+						<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
@@ -141,7 +141,7 @@
 				<?=""; }?>
 			</div>
 			<h2 x-on:click="showDnsOptions = !showDnsOptions" class="section-title">
-				<?=_('DNS');?>
+				<?= _("DNS") ?>
 				<i
 					x-bind:class="showDnsOptions ? 'fa-square-minus' : 'fa-square-plus'"
 					class="fas status-icon dim maroon js-section-toggle-icon"
@@ -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
@@ -168,23 +168,23 @@
 					</select>
 				</div>
 				<div class="u-mb10">
-					<label for="v_dns_domains" class="form-label"><?=_('DNS domains');?></label>
+					<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, "'"))?>">
-						<i class="unlim-trigger fas fa-infinity" title="<?=_('Unlimited');?>"></i>
+						<i class="unlim-trigger fas fa-infinity" title="<?= _("Unlimited") ?>"></i>
 					</div>
 				</div>
 				<div class="u-mb10">
 					<label for="v_dns_records" class="form-label">
-						<?=_('DNS records');?> <span class="optional">(<?=_('per domain');?>)</span>
+						<?= _("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, "'"))?>">
-						<i class="unlim-trigger fas fa-infinity" title="<?=_('Unlimited');?>"></i>
+						<i class="unlim-trigger fas fa-infinity" title="<?= _("Unlimited") ?>"></i>
 					</div>
 				</div>
 				<?php if ((isset($_SESSION['DNS_SYSTEM'])) && (!empty($_SESSION['DNS_SYSTEM']))) {?>
-					<p class="form-label u-mb10"><?=_('Name servers');?></p>
+					<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, "'"))?>">
 					</div>
@@ -230,12 +230,12 @@
 						}
 					?>
 					<div class="u-pt18 js-add-ns" <?php if ($v_ns8) echo 'style="display:none;"'; ?>>
-						<span class="js-add-ns-button additional-control add"><?=_('Add one more Name Server');?></span>
+						<span class="js-add-ns-button additional-control add"><?= _("Add one more Name Server") ?></span>
 					</div>
 				<?php } ?>
 			</div>
 			<h2 x-on:click="showMailOptions = !showMailOptions" class="section-title">
-				<?=_('Mail');?>
+				<?= _("Mail") ?>
 				<i
 					x-bind:class="showMailOptions ? 'fa-square-minus' : 'fa-square-plus'"
 					class="fas status-icon dim maroon js-section-toggle-icon"
@@ -243,30 +243,30 @@
 			</h2>
 			<div x-cloak x-show="showMailOptions" id="mail-options">
 				<div class="u-mt15 u-mb10">
-					<label for="v_mail_domains" class="form-label"><?=_('Mail Domains');?></label>
+					<label for="v_mail_domains" class="form-label"><?= _("Mail Domains") ?></label>
 					<div class="u-pos-relative">
-						<input type="text" class="form-control" name="v_mail_domains" id="v_mail_domains" value="<?=htmlentities(trim($v_mail_domains, "'"))?>">
-						<i class="unlim-trigger fas fa-infinity" title="<?=_('Unlimited');?>"></i>
+						<input type="text" class="form-control" name="v_mail_domains" id="v_mail_domains" value="<?= htmlentities(trim($v_mail_domains, "'")) ?>">
+						<i class="unlim-trigger fas fa-infinity" title="<?= _("Unlimited") ?>"></i>
 					</div>
 				</div>
 				<div class="u-mb10">
 					<label for="v_mail_accounts" class="form-label">
-						<?=_('Mail Accounts');?> <span class="optional">(<?=_('per domain');?>)</span>
+						<?= _("Mail Accounts") ?> <span class="optional">(<?= _("per domain") ?>)</span>
 					</label>
 					<div class="u-pos-relative">
-						<input type="text" class="form-control" name="v_mail_accounts" id="v_mail_accounts" value="<?=htmlentities(trim($v_mail_accounts, "'"))?>">
-						<i class="unlim-trigger fas fa-infinity" title="<?=_('Unlimited');?>"></i>
+						<input type="text" class="form-control" name="v_mail_accounts" id="v_mail_accounts" value="<?= htmlentities(trim($v_mail_accounts, "'")) ?>">
+						<i class="unlim-trigger fas fa-infinity" title="<?= _("Unlimited") ?>"></i>
 					</div>
 				</div>
 				<div class="u-mb10">
 					<label for="v_ratelimit" class="form-label">
-						<?=_('Rate limit');?> <span class="optional">(<?=_('per account / hour');?>)</span>
+						<?= _("Rate limit") ?> <span class="optional">(<?= _("per account / hour") ?>)</span>
 					</label>
-					<input type="text" class="form-control" name="v_ratelimit" id="v_ratelimit" value="<?=htmlentities(trim($v_ratelimit, "'"))?>">
+					<input type="text" class="form-control" name="v_ratelimit" id="v_ratelimit" value="<?= htmlentities(trim($v_ratelimit, "'")) ?>">
 				</div>
 			</div>
 			<h2 x-on:click="showDatabaseOptions = !showDatabaseOptions" class="section-title">
-				<?=_('Databases');?>
+				<?= _("Databases") ?>
 				<i
 					x-bind:class="showDatabaseOptions ? 'fa-square-minus' : 'fa-square-plus'"
 					class="fas status-icon dim maroon js-section-toggle-icon"
@@ -274,15 +274,15 @@
 			</h2>
 			<div x-cloak x-show="showDatabaseOptions" id="database-options">
 				<div class="u-mt15 u-mb10">
-					<label for="v_databases" class="form-label"><?=_('Databases');?></label>
+					<label for="v_databases" class="form-label"><?= _("Databases") ?></label>
 					<div class="u-pos-relative">
-						<input type="text" class="form-control" name="v_databases" id="v_databases" value="<?=htmlentities(trim($v_databases, "'"))?>">
-						<i class="unlim-trigger fas fa-infinity" title="<?=_('Unlimited');?>"></i>
+						<input type="text" class="form-control" name="v_databases" id="v_databases" value="<?= htmlentities(trim($v_databases, "'")) ?>">
+						<i class="unlim-trigger fas fa-infinity" title="<?= _("Unlimited") ?>"></i>
 					</div>
 				</div>
 			</div>
 			<h2 x-on:click="showSystemOptions = !showSystemOptions" class="section-title">
-				<?=_('System');?>
+				<?= _("System") ?>
 				<i
 					x-bind:class="showSystemOptions ? 'fa-square-minus' : 'fa-square-plus'"
 					class="fas status-icon dim maroon js-section-toggle-icon"
@@ -290,14 +290,14 @@
 			</h2>
 			<div x-cloak x-show="showSystemOptions" id="system-options">
 				<div class="u-mt15 u-mb10">
-					<label for="v_cron_jobs" class="form-label"><?=_('Cron Jobs');?></label>
+					<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, "'"))?>">
-						<i class="unlim-trigger fas fa-infinity" title="<?=_('Unlimited');?>"></i>
+						<i class="unlim-trigger fas fa-infinity" title="<?= _("Unlimited") ?>"></i>
 					</div>
 				</div>
 				<div class="u-mb10">
-					<label for="v_shell" class="form-label"><?=_('SSH Access');?></label>
+					<label for="v_shell" class="form-label"><?= _("SSH Access") ?></label>
 					<select class="form-select" name="v_shell" id="v_shell">
 						<?php
 							foreach ($shells as $key => $value) {

web/templates/pages/edit_server.php

@@ -3,20 +3,20 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/server/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 			<a href="/list/ip/" class="button button-secondary">
-				<i class="fas fa-ethernet status-icon blue"></i><?=_('IP');?>
+				<i class="fas fa-ethernet status-icon blue"></i><?= _("IP") ?>
 			</a>
-			<?php if ((isset($_SESSION['FIREWALL_SYSTEM'])) && (!empty($_SESSION['FIREWALL_SYSTEM']))) {?>
+			<?php if (isset($_SESSION["FIREWALL_SYSTEM"]) && !empty($_SESSION["FIREWALL_SYSTEM"])) { ?>
 				<a href="/list/firewall/" class="button button-secondary">
-					<i class="fas fa-shield-halved status-icon red"></i><?=_('Firewall');?>
+					<i class="fas fa-shield-halved status-icon red"></i><?= _("Firewall") ?>
 				</a>
-			<?php }?>
+			<?php } ?>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -38,21 +38,21 @@
 		<input type="hidden" name="save" value="save">
 
 		<div class="form-container">
-			<h1 class="form-title"><?=_('Configuring Server');?></h1>
+			<h1 class="form-title"><?= _("Configuring Server") ?></h1>
 			<?php show_alert_message($_SESSION);?>
 
 			<!-- Basic options tab -->
 			<details class="collapse u-mb10">
 				<summary class="collapse-header">
-					<i class="fas fa-gear u-mr15"></i><?=_('Basic options');?>
+					<i class="fas fa-gear u-mr15"></i><?= _("Basic options") ?>
 				</summary>
 				<div class="collapse-content">
 					<div class="u-mb10">
-						<label for="v_hostname" class="form-label"><?=_('Hostname');?></label>
+						<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, "'"))?>">
 					</div>
 					<div class="u-mb10">
-						<label for="v_timezone" class="form-label"><?=_('Time Zone');?></label>
+						<label for="v_timezone" class="form-label"><?= _("Time Zone") ?></label>
 						<select class="form-select" name="v_timezone" id="v_timezone">
 							<?php
 								foreach ($v_timezones as $key => $value) {
@@ -66,7 +66,7 @@
 						</select>
 					</div>
 					<div class="u-mb10">
-						<label for="v_theme" class="form-label"><?=_('Theme');?></label>
+						<label for="v_theme" class="form-label"><?= _("Theme") ?></label>
 						<select class="form-select" name="v_theme" id="v_theme">
 							<?php
 								foreach ($theme as $key => $value) {
@@ -82,11 +82,11 @@
 					<div class="form-check u-mb20">
 						<input class="form-check-input" type="checkbox" name="v_policy_user_change_theme" id="v_policy_user_change_theme" <?php if ((isset($_SESSION['POLICY_USER_CHANGE_THEME'])) && (!empty($_SESSION['POLICY_USER_CHANGE_THEME'])) && ($_SESSION['POLICY_USER_CHANGE_THEME'] == "no")) echo 'checked' ?>>
 						<label for="v_policy_user_change_theme">
-							<?=_('Set as selected theme for all users');?>
+							<?= _("Set as selected theme for all users") ?>
 						</label>
 					</div>
 					<div class="u-mb10">
-						<label for="v_language" class="form-label"><?=_('Default Language');?></label>
+						<label for="v_language" class="form-label"><?= _("Default Language") ?></label>
 						<select class="form-select" name="v_language" id="v_language">
 							<?php
 								foreach ($languages as $key => $value) {
@@ -102,7 +102,7 @@
 					<div class="form-check">
 						<input class="form-check-input" type="checkbox" name="v_language_update" id="v_language_update">
 						<label for="v_language_update">
-							<?=_('Set as default language for all users');?>
+							<?= _("Set as default language for all users") ?>
 						</label>
 					</div>
 				</div>
@@ -111,39 +111,39 @@
 			<!-- Updates tab -->
 			<details class="collapse u-mb10">
 				<summary class="collapse-header">
-					<i class="fas fa-code-branch u-mr15"></i><?=_('Updates');?>
+					<i class="fas fa-code-branch u-mr15"></i><?= _("Updates") ?>
 				</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>
+						<p><?= _("Release") ?>: <span class="optional"><?=$_SESSION['RELEASE_BRANCH'];?></span></p>
 					<?php } ?>
-					<p class="u-mb5"><?=_('Options');?></p>
+					<p class="u-mb5"><?= _("Options") ?></p>
 					<div class="form-check">
 						<input class="form-check-input" type="checkbox" name="v_debug_mode" id="v_debug_mode" <?php if ((isset($_SESSION['DEBUG_MODE'])) && (!empty($_SESSION['DEBUG_MODE'])) && ($_SESSION['DEBUG_MODE'] == "true")) echo 'checked' ?>>
 						<label for="v_debug_mode">
-							<?=_('Enable debug mode');?>
+							<?= _("Enable debug mode") ?>
 						</label>
 					</div>
 					<div class="form-check">
 						<input class="form-check-input" type="checkbox" name="v_experimental_features" id="v_experimental_features" <?php if ((isset($_SESSION['POLICY_SYSTEM_ENABLE_BACON'])) && (!empty($_SESSION['POLICY_SYSTEM_ENABLE_BACON'])) && ($_SESSION['POLICY_SYSTEM_ENABLE_BACON'] == "true")) echo 'checked' ?>>
 						<label for="v_experimental_features">
-							<?=_('Enable preview features');?>
+							<?= _("Enable preview features") ?>
 						</label>
-						<span class="hint">(<a href="/list/server/preview/"><?=_('View');?></a>)</span>
+						<span class="hint">(<a href="/list/server/preview/"><?= _("View") ?></a>)</span>
 					</div>
 					<div class="form-check">
 						<input class="form-check-input" type="checkbox" name="v_upgrade_send_notification_email" id="v_upgrade_send_notification_email" <?php if ((isset($_SESSION['UPGRADE_SEND_EMAIL'])) && (!empty($_SESSION['UPGRADE_SEND_EMAIL'])) && ($_SESSION['UPGRADE_SEND_EMAIL'] == "true")) echo 'checked' ?>>
 						<label for="v_upgrade_send_notification_email">
-							<?=_('SYSTEM_UPGRADE_SEND_NOTIFICATION_EMAIL');?>
+							<?= _("SYSTEM_UPGRADE_SEND_NOTIFICATION_EMAIL") ?>
 						</label>
 					</div>
 					<div class="form-check">
 						<input class="form-check-input" type="checkbox" name="v_upgrade_send_email_log" id="v_upgrade_send_email_log" <?php if ((isset($_SESSION['UPGRADE_SEND_EMAIL_LOG'])) && (!empty($_SESSION['UPGRADE_SEND_EMAIL_LOG'])) && ($_SESSION['UPGRADE_SEND_EMAIL_LOG'] == "true")) echo 'checked' ?>>
 						<label for="v_upgrade_send_email_log">
-							<?=_('SYSTEM_UPGRADE_SEND_EMAIL_LOG');?>
+							<?= _("SYSTEM_UPGRADE_SEND_EMAIL_LOG") ?>
 						</label>
 					</div>
 				</div>
@@ -152,12 +152,12 @@
 			<!-- Web Server tab -->
 			<details class="collapse u-mb10">
 				<summary class="collapse-header">
-					<i class="fas fa-earth-americas u-mr15"></i><?=_('Web Server');?>
+					<i class="fas fa-earth-americas u-mr15"></i><?= _("Web Server") ?>
 				</summary>
 				<div class="collapse-content">
 					<?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>
@@ -165,7 +165,7 @@
 					<?php } ?>
 					<?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>
@@ -173,7 +173,7 @@
 					<?php } ?>
 					<?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>
@@ -181,15 +181,15 @@
 					<?php } ?>
 					<?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)): ?>
 						<div class="u-mt15">
-							<p class="u-mb10"><?=_('Enabled multi PHP versions');?></p>
+							<p class="u-mb10"><?= _("Enabled multi PHP versions") ?></p>
 							<div class="alert alert-info alert-with-icon u-mb10" role="alert">
 								<i class="fas fa-info"></i>
-								<p><?=_('Please wait while php is installed or removed');?></p>
+								<p><?= _("Please wait while php is installed or removed") ?></p>
 							</div>
 						</div>
 						<?php foreach($v_php_versions as $php_version): ?>
@@ -218,7 +218,7 @@
 					<?php endif; ?>
 					<?php if(!empty($_SESSION['WEB_BACKEND'])){ ?>
 						<div class="u-mt10">
-							<label for="v_php_default_version" class="form-label"><?=_('System PHP version');?></label>
+							<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">
 								<?php
 									foreach ($v_php_versions as $php_version) {
@@ -239,17 +239,17 @@
 			<?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');?>
+						<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>
 						</p>
 						<p>
-							<?=_('DNS Cluster');?>: <span class="u-ml5"><?php if ($v_dns_cluster == 'yes') { echo _('Yes'); } else { echo _('No'); } ?></span>
+							<?= _("DNS Cluster") ?>: <span class="u-ml5"><?php if ($v_dns_cluster == 'yes') { echo _('Yes'); } else { echo _('No'); } ?></span>
 						</p>
 						<?php if ($v_dns_cluster == 'yes') {
 							$i = 0;
@@ -257,7 +257,7 @@
 								$i++;
 							?>
 							<div>
-								<label for="v_dns_remote_host" class="form-label"><?=_('Host'). ' #'.$i ?></label>
+								<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 } } ?>
@@ -269,18 +269,18 @@
 			<?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');?>
+						<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'])) { ?>
 							<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>
@@ -288,7 +288,7 @@
 						<?php } ?>
 						<?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>
@@ -297,7 +297,7 @@
 						<?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']; ?>">
 							</div>
@@ -305,24 +305,24 @@
 						<div class="form-check u-mt20">
 							<input x-model="hasSmtpRelay" class="form-check-input" type="checkbox" name="v_smtp_relay" id="v_smtp_relay">
 							<label for="v_smtp_relay">
-								<?=_('Global SMTP Relay');?>
+								<?= _("Global SMTP Relay") ?>
 							</label>
 						</div>
 						<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>
+								<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, "'"))?>">
 							</div>
 							<div class="u-mb10">
-								<label for="v_smtp_relay_port" class="form-label"><?=_('Port');?></label>
+								<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, "'"))?>">
 							</div>
 							<div class="u-mb10">
-								<label for="v_smtp_relay_user" class="form-label"><?=_('Username');?></label>
+								<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, "'"))?>">
 							</div>
 							<div class="u-mb10">
-								<label for="v_smtp_relay_pass" class="form-label"><?=_('Password');?></label>
+								<label for="v_smtp_relay_pass" class="form-label"><?= _("Password") ?></label>
 								<div class="u-pos-relative">
 									<input type="text" class="form-control js-password-input" name="v_smtp_relay_pass" id="v_smtp_relay_pass">
 								</div>
@@ -336,31 +336,31 @@
 			<?php if (!empty($_SESSION['DB_SYSTEM'])) { ?>
 				<details class="collapse u-mb10">
 					<summary class="collapse-header">
-						<i class="fas fa-database u-mr15"></i><?=_('Databases');?>
+						<i class="fas fa-database u-mr15"></i><?= _("Databases") ?>
 					</summary>
 					<div class="collapse-content">
 						<div class="u-mb10">
 							<label for="v_mysql" class="form-label">
-								<?=_('MySQL Support');?> <a href="/edit/server/mysql/" class="u-ml5"><i class="fas fa-pencil status-icon orange"></i></a>
+								<?= _("MySQL Support") ?> <a href="/edit/server/mysql/" class="u-ml5"><i class="fas fa-pencil status-icon orange"></i></a>
 							</label>
 							<select class="form-select" name="v_mysql" id="v_mysql" disabled>
-								<option value="no"><?=_('No');?></option>
-								<option value="yes" <?php if($v_mysql == 'yes') echo 'selected' ?>><?=_('Yes');?></option>
+								<option value="no"><?= _("No") ?></option>
+								<option value="yes" <?php if($v_mysql == 'yes') echo 'selected' ?>><?= _("Yes") ?></option>
 							</select>
 						</div>
 						<!-- MySQL / MariaDB Options-->
 						<?php if ($v_mysql == 'yes') { ?>
 							<div class="u-mb20">
-								<label for="v_mysql_url" class="form-label"><?=_('phpMyAdmin URL');?></label>
+								<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']; ?>">
 							</div>
 							<div class="u-mb10">
 								<label for="v_phpmyadmin_key" class="form-label">
-									<?=_('phpMyAdmin Single Sign On');?><span class="hint">(<a href="https://docs.hestiacp.com/admin_docs/database/phpmyadmin-sso.html" target="_blank"><?=_('More info');?></a>)</span>
+									<?= _("phpMyAdmin Single Sign On") ?><span class="hint">(<a href="https://docs.hestiacp.com/admin_docs/database/phpmyadmin-sso.html" target="_blank"><?= _("More info") ?></a>)</span>
 								</label>
 								<select class="form-select" name="v_phpmyadmin_key" id="v_phpmyadmin_key" <?php if ($_SESSION['API'] != 'yes'){ echo "disabled"; }?>>
-									<option value="no"><?=_('Disabled');?></option>
-									<option value='yes' <?php if($_SESSION['PHPMYADMIN_KEY'] != ''){ echo 'selected="selected"'; }; ?>><?=_('Enabled');?></option>
+									<option value="no"><?= _("Disabled") ?></option>
+									<option value='yes' <?php if($_SESSION['PHPMYADMIN_KEY'] != ''){ echo 'selected="selected"'; }; ?>><?= _("Enabled") ?></option>
 								</select>
 							</div>
 						<?php } ?>
@@ -371,24 +371,24 @@
 							?>
 							<div class="u-pl30">
 								<div class="u-mb10">
-									<label for="v_mysql_host" class="form-label"><?=_('Host'). ' #'.$i ?></label>
+									<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>
+									<label for="v_mysql_password" class="form-label"><?= _("Password") ?></label>
 									<div class="u-pos-relative">
 										<input type="text" class="form-control js-password-input" name="v_mysql_password" id="v_mysql_password">
 									</div>
 								</div>
 								<div class="u-mb10">
 									<label for="v_mysql_max" class="form-label">
-										<?=_('Maximum Number Of Databases');?>
+										<?= _("Maximum Number Of Databases") ?>
 									</label>
 									<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');?>
+										<?= _("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>
 								</div>
@@ -398,16 +398,16 @@
 						<?php if ($v_pgsql == 'yes') { ?>
 							<div class="u-mb10">
 								<label for="v_pgsql" class="form-label">
-									<?=_('PostgreSQL Support');?> <a href="/edit/server/postgresql/" class="u-ml5"><i class="fas fa-pencil status-icon orange"></i></a>
+									<?= _("PostgreSQL Support") ?> <a href="/edit/server/postgresql/" class="u-ml5"><i class="fas fa-pencil status-icon orange"></i></a>
 								</label>
 								<select class="form-select" name="v_pgsql" id="v_pgsql" disabled>
-									<option value="no"><?=_('No');?></option>
-									<option value='yes' <?php if($v_pgsql == 'yes') echo 'selected' ?>><?=_('Yes');?></option>
+									<option value="no"><?= _("No") ?></option>
+									<option value='yes' <?php if($v_pgsql == 'yes') echo 'selected' ?>><?= _("Yes") ?></option>
 								</select>
 							</div>
 							<div class="u-mb20">
 								<label for="v_pgsql_url" class="form-label">
-									<?=_('phpPgAdmin URL');?>
+									<?= _("phpPgAdmin URL") ?>
 								</label>
 								<input type="text" class="form-control" name="v_pgsql_url" id="v_pgsql_url" value="<?=$_SESSION['DB_PGA_ALIAS']; ?>">
 							</div>
@@ -419,18 +419,18 @@
 							?>
 							<div class="u-pl30">
 								<div class="u-mb10">
-									<label for="v_pgsql_host" class="form-label"><?=_('Host'). ' #'.$i ?></label>
+									<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');?>
+										<?= _("Maximum Number Of Databases") ?>
 									</label>
 									<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');?>
+										<?= _("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>
 								</div>
@@ -443,19 +443,19 @@
 			<!-- Backups tab -->
 			<details class="collapse u-mb10">
 				<summary class="collapse-header">
-					<i class="fas fa-arrow-rotate-left u-mr15"></i><?=_('Backups');?>
+					<i class="fas fa-arrow-rotate-left u-mr15"></i><?= _("Backups") ?>
 				</summary>
 				<div class="collapse-content">
 					<div class="u-mb10">
-						<label for="v_backup" class="form-label"><?=_('Local backup');?></label>
+						<label for="v_backup" class="form-label"><?= _("Local backup") ?></label>
 						<select class="form-select" name="v_backup" id="v_backup">
-							<option value="no"><?=_('No');?></option>
-							<option value="yes" <?php if($v_backup == 'yes') echo 'selected' ?>><?=_('Yes');?></option>
+							<option value="no"><?= _("No") ?></option>
+							<option value="yes" <?php if($v_backup == 'yes') echo 'selected' ?>><?= _("Yes") ?></option>
 						</select>
 					</div>
 					<div class="u-mb10">
 						<label for="v_backup_mode" class="form-label">
-							<?=_('Compression');?>
+							<?= _("Compression") ?>
 							<a target="_blank" class="u-ml5" href="http://docs.hestiacp.com/admin_docs/backups.html#what-is-the-difference-between-zstd-and-gzip">
 								<i class="fas fa-circle-question"></i>
 							</a>
@@ -467,7 +467,7 @@
 					</div>
 					<div class="u-mb10">
 						<label for="v_backup_gzip" class="form-label">
-							<?=_('Compression level');?>
+							<?= _("Compression level") ?>
 							<a target="_blank" class="u-ml5" href="http://docs.hestiacp.com/admin_docs/backups.html#what-is-the-optimal-compression-ratio">
 								<i class="fas fa-circle-question"></i>
 							</a>
@@ -480,7 +480,7 @@
 					</div>
 					<div class="u-mb20">
 						<label for="v_backup_dir" class="form-label">
-							<?=_('Directory');?>
+							<?= _("Directory") ?>
 							<a target="_blank" class="u-ml5" href="https://docs.hestiacp.com/admin_docs/backups.html#how-to-change-default-backup-folder">
 								<i class="fas fa-circle-question"></i>
 							</a>
@@ -490,69 +490,69 @@
 					<div class="form-check">
 						<input x-model="remoteBackupEnabled" class="form-check-input" type="checkbox" name="v_backup_remote_adv" id="v_backup_remote_adv">
 						<label for="v_backup_remote_adv">
-							<?=_('Remote backup');?>
+							<?= _("Remote backup") ?>
 						</label>
 					</div>
 					<div x-cloak x-show="remoteBackupEnabled" id="remote_backup" class="u-pl30 u-mt20">
 						<div class="u-mb10">
 							<label for="backup_type" class="form-label">
-								<?=_('Protocol');?>
+								<?= _("Protocol") ?>
 								<a target="_blank" class="u-ml5" href="http://docs.hestiacp.com/admin_docs/backups.html#what-kind-of-protocols-are-currently-supported">
 									<i class="fas fa-circle-question"></i>
 								</a>
 							</label>
 							<select class="form-select" name="v_backup_type" id="backup_type">
-								<option value='ftp'><?=_('ftp');?></option>
-								<option value='sftp' <?php if((!empty($v_backup_type)) && (trim($v_backup_type,"'")	== 'sftp' )) echo 'selected="selected"'; ?>><?=_('sftp');?></option>
-								<option value="b2" <?php if((!empty($v_backup_type)) && (trim($v_backup_type,"'")	== 'b2' )) echo 'selected="selected"'; ?>><?=_('Backblaze');?>
-								<option value="rclone" <?php if((!empty($v_backup_type)) && (trim($v_backup_type,"'")	== 'rclone' )) echo 'selected="selected"'; ?>><?=_('Rclone');?>
+								<option value='ftp'><?= _("ftp") ?></option>
+								<option value='sftp' <?php if((!empty($v_backup_type)) && (trim($v_backup_type,"'")	== 'sftp' )) echo 'selected="selected"'; ?>><?= _("sftp") ?></option>
+								<option value="b2" <?php if((!empty($v_backup_type)) && (trim($v_backup_type,"'")	== 'b2' )) echo 'selected="selected"'; ?>><?= _("Backblaze") ?>
+								<option value="rclone" <?php if((!empty($v_backup_type)) && (trim($v_backup_type,"'")	== 'rclone' )) echo 'selected="selected"'; ?>><?= _("Rclone") ?>
 							</select>
 						</div>
 						<div id="backup_sftp" style="display: <?php if ((!empty($v_backup_type)) && !in_array(trim($v_backup_type, "'"),array('ftp','sftp'))){ echo 'none';} else {echo 'block';} ?>">
 							<div class="u-mb10">
-								<label for="v_backup_host" class="form-label"><?=_('Host');?></label>
+								<label for="v_backup_host" class="form-label"><?= _("Host") ?></label>
 								<input type="text" class="form-control" name="v_backup_host" id="v_backup_host" value="<?=trim($v_backup_host, "'")?>">
 							</div>
 							<div class="u-mb20">
-								<label for="v_backup_port" class="form-label"><?=_('Port');?></label>
+								<label for="v_backup_port" class="form-label"><?= _("Port") ?></label>
 								<input type="text" class="form-control" name="v_backup_port" id="v_backup_port" value="<?=trim($v_backup_port, "'")?>">
 							</div>
 							<div class="u-mb10">
-								<label for="v_backup_username" class="form-label"><?=_('Username');?></label>
+								<label for="v_backup_username" class="form-label"><?= _("Username") ?></label>
 								<input type="text" class="form-control" name="v_backup_username" id="v_backup_username" value="<?=trim($v_backup_username, "'")?>">
 							</div>
 							<div class="u-mb20">
-								<label for="v_backup_password" class="form-label"><?=_('Password');?></label>
+								<label for="v_backup_password" class="form-label"><?= _("Password") ?></label>
 								<div class="u-pos-relative">
 									<input type="text" class="form-control js-password-input" name="v_backup_password" id="v_backup_password" value="<?=trim($v_backup_password, "'")?>">
 								</div>
 							</div>
 							<div class="u-mb10">
-								<label for="v_backup_bpath" class="form-label"><?=_('Directory');?></label>
+								<label for="v_backup_bpath" class="form-label"><?= _("Directory") ?></label>
 								<input type="text" class="form-control" name="v_backup_bpath" id="v_backup_bpath" value="<?=trim($v_backup_bpath, "'")?>">
 							</div>
 						</div>
 						<div id="backup_bucket" style="display: <?php if ((empty($v_backup_type)) || !in_array(trim($v_backup_type, "'"),array('b2'))){ echo 'none';} else {echo 'block';} ?>">
 							<div class="u-mb10">
-								<label for="v_backup_bucket" class="form-label"><?=_('Bucket');?></label>
+								<label for="v_backup_bucket" class="form-label"><?= _("Bucket") ?></label>
 								<input type="text" class="form-control" name="v_backup_bucket" id="v_backup_bucket" value="<?=trim($v_backup_bucket, "'")?>">
 							</div>
 							<div class="u-mb10">
-								<label for="v_backup_application_id" class="form-label"><?=_('Key ID');?></label>
+								<label for="v_backup_application_id" class="form-label"><?= _("Key ID") ?></label>
 								<input type="text" class="form-control" name="v_backup_application_id" id="v_backup_application_id" value="<?=trim($v_backup_application_id, "'")?>">
 							</div>
 							<div class="u-mb10">
-								<label for="v_backup_application_key" class="form-label"><?=_('Application Key');?></label>
+								<label for="v_backup_application_key" class="form-label"><?= _("Application Key") ?></label>
 								<input type="text" class="form-control" name="v_backup_application_key" id="v_backup_application_key" value="<?=trim($v_backup_application_key, "'")?>">
 							</div>
 						</div>
 						<div id="backup_rclone" style="display: <?php if ((empty($v_backup_type)) || !in_array(trim($v_backup_type, "'"),array('rclone'))){ echo 'none';} else {echo 'block';} ?>">
 							<div class="u-mb10">
-								<label for="v_rclone_host" class="form-label"><?=_('Host');?></label>
+								<label for="v_rclone_host" class="form-label"><?= _("Host") ?></label>
 								<input type="text" class="form-control" name="v_rclone_host" id="v_rclone_host" value="<?=trim($v_rclone_host, "'")?>">
 							</div>
 							<div class="u-mb10">
-								<label for="v_rclone_path" class="form-label"><?=_('Directory');?></label>
+								<label for="v_rclone_path" class="form-label"><?= _("Directory") ?></label>
 								<input type="text" class="form-control" name="v_rclone_path" id="v_rclone_path" value="<?=trim($v_rclone_path, "'")?>">
 							</div>
 						</div>
@@ -563,50 +563,50 @@
 			<!-- SSL tab -->
 			<details class="collapse u-mb10">
 				<summary class="collapse-header">
-					<i class="fas fa-lock u-mr15"></i><?=_('SSL');?>
+					<i class="fas fa-lock u-mr15"></i><?= _("SSL") ?>
 				</summary>
 				<div class="collapse-content">
 					<div class="u-mb20">
 						<label for="v_ssl_crt" class="form-label">
-							<?=_('SSL Certificate');?>
-							<span id="generate-csr"> / <a class="generate" target="_blank" href="/generate/ssl/?domain=<?=htmlentities(trim($v_hostname,'"'));?>"><?=_('Generate CSR');?></a></span>
+							<?= _("SSL Certificate") ?>
+							<span id="generate-csr"> / <a class="generate" target="_blank" href="/generate/ssl/?domain=<?= htmlentities(trim($v_hostname, '"')) ?>"><?= _("Generate CSR") ?></a></span>
 						</label>
-						<textarea class="form-control u-min-height100 u-console" name="v_ssl_crt" id="v_ssl_crt"><?=htmlentities(trim($v_ssl_crt, "'"))?></textarea>
+						<textarea 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-mb20">
-						<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>
+						<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>
 					</div>
 					<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-label"><?= _("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-label"><?= _("Aliases") ?></span>
+								<span class="values-list-value"><?= $v_ssl_aliases ?></span>
 							</li>
 						<?php } ?>
 						<li class="values-list-item">
-							<span class="values-list-label"><?=_('NOT_BEFORE');?></span>
-							<span class="values-list-value"><?=$v_ssl_not_before?></span>
+							<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>
+							<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>
+							<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>
+							<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>
+							<span class="values-list-label"><?= _("ISSUER") ?></span>
+							<span class="values-list-value"><?= $v_ssl_issuer ?></span>
 						</li>
 					</ul>
 				</div>
@@ -622,11 +622,11 @@
 				class="collapse u-mb10"
 			>
 				<summary class="collapse-header">
-					<i class="fas fa-key u-mr15"></i><?=_('Security');?>
+					<i class="fas fa-key u-mr15"></i><?= _("Security") ?>
 				</summary>
 				<div class="collapse-content">
 					<h3 x-on:click="showSystemOptions = !showSystemOptions" class="section-title">
-						<?=_('System');?>
+						<?= _("System") ?>
 						<i
 							x-bind:class="showSystemOptions ? 'fa-square-minus' : 'fa-square-plus'"
 							class="fas status-icon dim maroon js-section-toggle-icon"
@@ -634,27 +634,27 @@
 					</h3>
 					<div x-cloak x-show="showSystemOptions" id="security-system-table">
 						<p class="u-pt18" style="font-size:1rem;padding-bottom:12px;">
-							<?=_('API');?>
+							<?= _("API") ?>
 						</p>
 						<div class="u-mb10">
-							<label for="api-system" class="form-label"><?=_('Enable API access');?></label>
+							<label for="api-system" class="form-label"><?= _("Enable API access") ?></label>
 							<select class="form-select" name="v_api_system" id="api-system">
-								<option value='0' <?php if(empty($_SESSION['API_SYSTEM']) || $_SESSION['API_SYSTEM'] == '0') echo 'selected' ?>><?=_('Disabled');?></option>
-								<option value='1' <?php if($_SESSION['API_SYSTEM'] == '1') echo 'selected' ?>><?=_('Enabled for admin');?></option>
-								<option value='2' <?php if($_SESSION['API_SYSTEM'] == '2') echo 'selected' ?>><?=_('Enabled for all users');?></option>
+								<option value='0' <?php if(empty($_SESSION['API_SYSTEM']) || $_SESSION['API_SYSTEM'] == '0') echo 'selected' ?>><?= _("Disabled") ?></option>
+								<option value='1' <?php if($_SESSION['API_SYSTEM'] == '1') echo 'selected' ?>><?= _("Enabled for admin") ?></option>
+								<option value='2' <?php if($_SESSION['API_SYSTEM'] == '2') echo 'selected' ?>><?= _("Enabled for all users") ?></option>
 							</select>
 						</div>
 						<div class="u-mb10">
-							<label for="api" class="form-label"><?=_('Enable legacy API access');?></label>
+							<label for="api" class="form-label"><?= _("Enable legacy API access") ?></label>
 							<select class="form-select" name="v_api" id="api">
-								<option value="yes"><?=_('Yes');?></option>
-								<option value="no" <?php if($_SESSION['API'] == 'no') echo 'selected' ?>><?=_('No');?></option>
+								<option value="yes"><?= _("Yes") ?></option>
+								<option value="no" <?php if($_SESSION['API'] == 'no') echo 'selected' ?>><?= _("No") ?></option>
 							</select>
 						</div>
 						<div id="security_ip" style="<?php if ($_SESSION['API'] == "no" && $_SESSION['API_SYSTEM'] == '0') echo 'display:none;';?>">
 							<div class="u-mb10">
 								<label for="v_api_allowed_ip" class="form-label u-side-by-side">
-									<?=_('Allowed IP addresses for API');?> <span class="optional">1 IP address per line</span>
+									<?= _("Allowed IP addresses for API") ?> <span class="optional">1 IP address per line</span>
 								</label>
 								<textarea class="form-control" name="v_api_allowed_ip" id="v_api_allowed_ip"><?php
 										foreach(explode(',',$_SESSION['API_ALLOWED_IP']) as $ip ){
@@ -664,40 +664,40 @@
 							</div>
 						</div>
 						<p class="u-pt18" style="font-size:1rem;padding-bottom:12px;">
-							<?=_('Login');?>
+							<?= _("Login") ?>
 						</p>
 						<div class="u-mb10">
-							<label for="v_login_style" class="form-label"><?=_('Login screen style');?></label>
+							<label for="v_login_style" class="form-label"><?= _("Login screen style") ?></label>
 							<select class="form-select" name="v_login_style" id="v_login_style">
-								<option value="default"><?=_('Default');?></option>
-								<option value="old" <?php if($_SESSION['LOGIN_STYLE'] == 'old') echo 'selected' ?>><?=_('Old Style');?></option>
+								<option value="default"><?= _("Default") ?></option>
+								<option value="old" <?php if($_SESSION['LOGIN_STYLE'] == 'old') echo 'selected' ?>><?= _("Old Style") ?></option>
 							</select>
 						</div>
 						<div class="u-mb10">
-							<label for="v_policy_system_password_reset" class="form-label"><?=_('Allow users to reset their passwords');?></label>
+							<label for="v_policy_system_password_reset" class="form-label"><?= _("Allow users to reset their passwords") ?></label>
 							<select class="form-select" name="v_policy_system_password_reset" id="v_policy_system_password_reset">
-								<option value="yes"><?=_('Yes');?></option>
-								<option value="no" <?php if($_SESSION['POLICY_SYSTEM_PASSWORD_RESET'] == 'no') echo 'selected' ?>><?=_('No');?></option>
+								<option value="yes"><?= _("Yes") ?></option>
+								<option value="no" <?php if($_SESSION['POLICY_SYSTEM_PASSWORD_RESET'] == 'no') echo 'selected' ?>><?= _("No") ?></option>
 							</select>
 						</div>
 						<div class="u-mb20">
 							<label for="v_inactive_session_timeout" class="form-label">
-								<?=_('Inactive session timeout');?> (<?=_('Minutes');?>)
+								<?= _("Inactive session timeout") ?> (<?= _("Minutes") ?>)
 							</label>
 							<input type="text" class="form-control" name="v_inactive_session_timeout" id="v_inactive_session_timeout" value="<?=trim($_SESSION['INACTIVE_SESSION_TIMEOUT'], "'")?>">
 						</div>
 						<div class="u-mb10">
-							<label for="v_policy_csrf_strictness" class="form-label"><?=_('Prevent CSRF');?></label>
+							<label for="v_policy_csrf_strictness" class="form-label"><?= _("Prevent CSRF") ?></label>
 							<select class="form-select" name="v_policy_csrf_strictness" id="v_policy_csrf_strictness">
-								<option value="0"	<?php if($_SESSION['POLICY_CSRF_STRICTNESS'] == '0') echo 'selected' ?>><?=_('Disabled');?></option>
-								<option value="1"	<?php if($_SESSION['POLICY_CSRF_STRICTNESS'] == '1') echo 'selected' ?>><?=_('Enabled');?></option>
-								<option value="2"	<?php if($_SESSION['POLICY_CSRF_STRICTNESS'] == '2') echo 'selected' ?>><?=_('Strict');?></option>
+								<option value="0"	<?php if($_SESSION['POLICY_CSRF_STRICTNESS'] == '0') echo 'selected' ?>><?= _("Disabled") ?></option>
+								<option value="1"	<?php if($_SESSION['POLICY_CSRF_STRICTNESS'] == '1') echo 'selected' ?>><?= _("Enabled") ?></option>
+								<option value="2"	<?php if($_SESSION['POLICY_CSRF_STRICTNESS'] == '2') echo 'selected' ?>><?= _("Strict") ?></option>
 							</select>
 						</div>
 					</div>
 					<?php if (($_SESSION['userContext'] === "admin") && ($_SESSION['user'] === 'admin')) {?>
 						<h3 x-on:click="showProtectionOptions = !showProtectionOptions" class="section-title">
-							<?=_('System Protection');?>
+							<?= _("System Protection") ?>
 							<i
 								x-bind:class="showProtectionOptions ? 'fa-square-minus' : 'fa-square-plus'"
 								class="fas status-icon dim maroon js-section-toggle-icon"
@@ -705,33 +705,33 @@
 						</h3>
 						<div x-cloak x-show="showProtectionOptions" id="security-sysadminprotect-table">
 							<p class="u-pt18" style="font-size:1rem;padding-bottom:12px;">
-								<?=_('System Administrator account');?>
+								<?= _("System Administrator account") ?>
 							</p>
 							<div class="u-mb10">
-								<label for="v_policy_system_protected_admin" class="form-label"><?=_('Restrict access to read-only for other administrators');?></label>
+								<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">
-									<option value="yes"><?=_('Yes');?></option>
-									<option value="no" <?php if($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] !== 'yes') echo 'selected' ?>><?=_('No');?></option>
+									<option value="yes"><?= _("Yes") ?></option>
+									<option value="no" <?php if($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] !== 'yes') echo 'selected' ?>><?= _("No") ?></option>
 								</select>
 							</div>
 							<div class="u-mb10">
-								<label for="v_policy_system_hide_admin" class="form-label"><?=_('Hide account from other administrators');?></label>
+								<label for="v_policy_system_hide_admin" class="form-label"><?= _("Hide account from other administrators") ?></label>
 								<select class="form-select" name="v_policy_system_hide_admin" id="v_policy_system_hide_admin">
-									<option value="yes"><?=_('Yes');?></option>
-									<option value="no" <?php if($_SESSION['POLICY_SYSTEM_HIDE_ADMIN'] !== 'yes') echo 'selected' ?>><?=_('No');?></option>
+									<option value="yes"><?= _("Yes") ?></option>
+									<option value="no" <?php if($_SESSION['POLICY_SYSTEM_HIDE_ADMIN'] !== 'yes') echo 'selected' ?>><?= _("No") ?></option>
 								</select>
 							</div>
 							<div class="u-mb10">
-								<label for="v_policy_system_hide_services" class="form-label"><?=_('Do not allow other administrators to access Server Settings');?></label>
+								<label for="v_policy_system_hide_services" class="form-label"><?= _("Do not allow other administrators to access Server Settings") ?></label>
 								<select class="form-select" name="v_policy_system_hide_services" id="v_policy_system_hide_services">
-									<option value="yes"><?=_('Yes');?></option>
-									<option value="no" <?php if($_SESSION['POLICY_SYSTEM_HIDE_SERVICES'] !== 'yes') echo 'selected' ?>><?=_('No');?></option>
+									<option value="yes"><?= _("Yes") ?></option>
+									<option value="no" <?php if($_SESSION['POLICY_SYSTEM_HIDE_SERVICES'] !== 'yes') echo 'selected' ?>><?= _("No") ?></option>
 								</select>
 							</div>
 						</div>
 					<?php } ?>
 					<h3 x-on:click="showPolicyOptions = !showPolicyOptions" class="section-title">
-						<?=_('Policies');?>
+						<?= _("Policies") ?>
 						<i
 							x-bind:class="showPolicyOptions ? 'fa-square-minus' : 'fa-square-plus'"
 							class="fas status-icon dim maroon js-section-toggle-icon"
@@ -739,62 +739,62 @@
 					</h3>
 					<div x-cloak x-show="showPolicyOptions" id="security-policies-table">
 						<p class="u-pt18" style="font-size:1rem;padding-bottom:12px;">
-							<?=_('Users');?>
+							<?= _("Users") ?>
 						</p>
 						<?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>
+									<?= _("Allow suspended users to log in with read-only access") ?> <span class="hint">(<?= _("Preview") ?>)</span>
 								</label>
 								<select class="form-select" name="v_policy_user_view_suspended" id="v_policy_user_view_suspended">
-									<option value="yes" <?php if($_SESSION['POLICY_USER_VIEW_SUSPENDED'] !== 'no') echo 'selected' ?>><?=_('Yes');?></option>
-									<option value="no" <?php if($_SESSION['POLICY_USER_VIEW_SUSPENDED'] == 'no') echo 'selected' ?>><?=_('No');?></option>
+									<option value="yes" <?php if($_SESSION['POLICY_USER_VIEW_SUSPENDED'] !== 'no') echo 'selected' ?>><?= _("Yes") ?></option>
+									<option value="no" <?php if($_SESSION['POLICY_USER_VIEW_SUSPENDED'] == 'no') echo 'selected' ?>><?= _("No") ?></option>
 								</select>
 							</div>
 						<?php } ?>
 						<div class="u-mb10">
-							<label for="v_policy_user_edit_details" class="form-label"><?=_('Allow users to edit their account details');?></label>
+							<label for="v_policy_user_edit_details" class="form-label"><?= _("Allow users to edit their account details") ?></label>
 							<select class="form-select" name="v_policy_user_edit_details" id="v_policy_user_edit_details">
-								<option value="yes" <?php if($_SESSION['POLICY_USER_EDIT_DETAILS'] !== 'no') echo 'selected' ?>><?=_('Yes');?></option>
-								<option value="no" <?php if($_SESSION['POLICY_USER_EDIT_DETAILS'] == 'no') echo 'selected' ?>><?=_('No');?></option>
+								<option value="yes" <?php if($_SESSION['POLICY_USER_EDIT_DETAILS'] !== 'no') echo 'selected' ?>><?= _("Yes") ?></option>
+								<option value="no" <?php if($_SESSION['POLICY_USER_EDIT_DETAILS'] == 'no') echo 'selected' ?>><?= _("No") ?></option>
 							</select>
 						</div>
 						<div class="u-mb10">
-							<label for="v_policy_user_edit_web_templates" class="form-label"><?=_('Allow users to change templates when editing web domains');?></label>
+							<label for="v_policy_user_edit_web_templates" class="form-label"><?= _("Allow users to change templates when editing web domains") ?></label>
 							<select class="form-select" name="v_policy_user_edit_web_templates" id="v_policy_user_edit_web_templates">
-								<option value="yes" <?php if($_SESSION['POLICY_USER_EDIT_WEB_TEMPLATES'] !== 'no') echo 'selected' ?>><?=_('Yes');?></option>
-								<option value="no" <?php if($_SESSION['POLICY_USER_EDIT_WEB_TEMPLATES'] == 'no') echo 'selected' ?>><?=_('No');?></option>
+								<option value="yes" <?php if($_SESSION['POLICY_USER_EDIT_WEB_TEMPLATES'] !== 'no') echo 'selected' ?>><?= _("Yes") ?></option>
+								<option value="no" <?php if($_SESSION['POLICY_USER_EDIT_WEB_TEMPLATES'] == 'no') echo 'selected' ?>><?= _("No") ?></option>
 							</select>
 						</div>
 						<div class="u-mb10">
-							<label for="v_policy_user_edit_dns_templates" class="form-label"><?=_('Allow users to change templates when editing DNS zones');?></label>
+							<label for="v_policy_user_edit_dns_templates" class="form-label"><?= _("Allow users to change templates when editing DNS zones") ?></label>
 							<select class="form-select" name="v_policy_user_edit_dns_templates" id="v_policy_user_edit_dns_templates">
-								<option value="yes" <?php if($_SESSION['POLICY_USER_EDIT_DNS_TEMPLATES'] !== 'no') echo 'selected' ?>><?=_('Yes');?></option>
-								<option value="no" <?php if($_SESSION['POLICY_USER_EDIT_DNS_TEMPLATES'] == 'no') echo 'selected' ?>><?=_('No');?></option>
+								<option value="yes" <?php if($_SESSION['POLICY_USER_EDIT_DNS_TEMPLATES'] !== 'no') echo 'selected' ?>><?= _("Yes") ?></option>
+								<option value="no" <?php if($_SESSION['POLICY_USER_EDIT_DNS_TEMPLATES'] == 'no') echo 'selected' ?>><?= _("No") ?></option>
 							</select>
 						</div>
 						<div class="u-mb10">
-							<label for="v_policy_user_view_logs" class="form-label"><?=_('Allow users to view action and login history logs');?></label>
+							<label for="v_policy_user_view_logs" class="form-label"><?= _("Allow users to view action and login history logs") ?></label>
 							<select class="form-select" name="v_policy_user_view_logs" id="v_policy_user_view_logs">
-								<option value="yes" <?php if($_SESSION['POLICY_USER_VIEW_LOGS'] !== 'no') echo 'selected' ?>><?=_('Yes');?></option>
-								<option value="no" <?php if($_SESSION['POLICY_USER_VIEW_LOGS'] == 'no') echo 'selected' ?>><?=_('No');?></option>
+								<option value="yes" <?php if($_SESSION['POLICY_USER_VIEW_LOGS'] !== 'no') echo 'selected' ?>><?= _("Yes") ?></option>
+								<option value="no" <?php if($_SESSION['POLICY_USER_VIEW_LOGS'] == 'no') echo 'selected' ?>><?= _("No") ?></option>
 							</select>
 						</div>
 						<div class="u-mb10">
-							<label for="v_policy_user_delete_logs" class="form-label"><?=_('Allow users to delete log history');?></label>
+							<label for="v_policy_user_delete_logs" class="form-label"><?= _("Allow users to delete log history") ?></label>
 							<select class="form-select" name="v_policy_user_delete_logs" id="v_policy_user_delete_logs">
-								<option value="yes" <?php if($_SESSION['POLICY_USER_DELETE_LOGS'] !== 'no') echo 'selected' ?>><?=_('Yes');?></option>
-								<option value="no" <?php if($_SESSION['POLICY_USER_DELETE_LOGS'] == 'no') echo 'selected' ?>><?=_('No');?></option>
+								<option value="yes" <?php if($_SESSION['POLICY_USER_DELETE_LOGS'] !== 'no') echo 'selected' ?>><?= _("Yes") ?></option>
+								<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;">
-							<?=_('Domains');?>
+							<?= _("Domains") ?>
 						</p>
 						<div class="u-mb10">
-							<label for="v_enforce_subdomain_ownership" class="form-label"><?=_('Enforce subdomain ownership');?></label>
+							<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">
-								<option value="yes"><?=_('Yes');?></option>
-								<option value="no" <?php if($_SESSION['ENFORCE_SUBDOMAIN_OWNERSHIP'] == 'no') echo 'selected' ?>><?=_('No');?></option>
+								<option value="yes"><?= _("Yes") ?></option>
+								<option value="no" <?php if($_SESSION['ENFORCE_SUBDOMAIN_OWNERSHIP'] == 'no') echo 'selected' ?>><?= _("No") ?></option>
 							</select>
 						</div>
 					</div>
@@ -804,35 +804,35 @@
 			<!-- Plugins tab -->
 			<details class="collapse u-mb10">
 				<summary class="collapse-header">
-					<i class="fas fa-puzzle-piece u-mr15"></i><?=_('Hestia Control Panel Plugins');?>
+					<i class="fas fa-puzzle-piece u-mr15"></i><?= _("Hestia Control Panel Plugins") ?>
 				</summary>
 				<div class="collapse-content">
 					<div class="u-mb10">
-						<label for="v_plugin_app_installer" class="form-label"><?=_('Quick App Installer');?></label>
+						<label for="v_plugin_app_installer" class="form-label"><?= _("Quick App Installer") ?></label>
 						<select class="form-select" name="v_plugin_app_installer" id="v_plugin_app_installer">
-							<option value="false"><?=_('No');?></option>
-							<option value="true" <?php if($_SESSION['PLUGIN_APP_INSTALLER'] == 'true') echo 'selected' ?>><?=_('Yes');?></option>
+							<option value="false"><?= _("No") ?></option>
+							<option value="true" <?php if($_SESSION['PLUGIN_APP_INSTALLER'] == 'true') echo 'selected' ?>><?= _("Yes") ?></option>
 						</select>
 					</div>
 					<div class="u-mb10">
-						<label for="v_filemanager" class="form-label"><?=_('Filemanager');?></label>
+						<label for="v_filemanager" class="form-label"><?= _("Filemanager") ?></label>
 						<select class="form-select" name="v_filemanager" id="v_filemanager">
-							<option value="false"><?=_('No');?></option>
-							<option value="true" <?php if($_SESSION['FILE_MANAGER'] == 'true') echo 'selected' ?>><?=_('Yes');?></option>
+							<option value="false"><?= _("No") ?></option>
+							<option value="true" <?php if($_SESSION['FILE_MANAGER'] == 'true') echo 'selected' ?>><?= _("Yes") ?></option>
 						</select>
 					</div>
 					<div class="u-mb10">
-						<label for="v_quota" class="form-label"><?=_('FileSystem Disk Quota');?></label>
+						<label for="v_quota" class="form-label"><?= _("FileSystem Disk Quota") ?></label>
 						<select class="form-select" name="v_quota" id="v_quota">
-							<option value="no"><?=_('No');?></option>
-							<option value="yes" <?php if($_SESSION['DISK_QUOTA'] == 'yes') echo 'selected' ?>><?=_('Yes');?></option>
+							<option value="no"><?= _("No") ?></option>
+							<option value="yes" <?php if($_SESSION['DISK_QUOTA'] == 'yes') echo 'selected' ?>><?= _("Yes") ?></option>
 						</select>
 					</div>
 					<div class="u-mb10">
-						<label for="v_firewall" class="form-label"><?=_('Firewall');?></label>
+						<label for="v_firewall" class="form-label"><?= _("Firewall") ?></label>
 						<select class="form-select" name="v_firewall" id="v_firewall">
-							<option value="no"><?=_('No');?></option>
-							<option value="yes" <?php if($_SESSION['FIREWALL_SYSTEM'] == 'iptables') echo 'selected' ?>><?=_('Yes');?></option>
+							<option value="no"><?= _("No") ?></option>
+							<option value="yes" <?php if($_SESSION['FIREWALL_SYSTEM'] == 'iptables') echo 'selected' ?>><?= _("Yes") ?></option>
 						</select>
 					</div>
 				</div>

web/templates/pages/edit_server_bind9.php

@@ -3,12 +3,12 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/server/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -18,24 +18,24 @@
 <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 class="u-mb20">
-				<label for="v_options" class="form-label"><?=$v_options_path;?></label>
-				<textarea class="form-control u-min-height300 u-allow-resize u-console" name="v_options" id="v_options"><?=$v_options;?></textarea>
+				<label for="v_options" class="form-label"><?= $v_options_path ?></label>
+				<textarea class="form-control u-min-height300 u-allow-resize u-console" name="v_options" id="v_options"><?= $v_options ?></textarea>
 			</div>
 			<div class="u-mb20">
-				<label for="v_config" class="form-label"><?=$v_config_path;?></label>
-				<textarea class="form-control u-min-height300 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-height300 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>
 				<label for="v_restart">
-					<?=_('restart');?>
+					<?= _("restart") ?>
 				</label>
 			</div>
 		</div>

web/templates/pages/edit_server_dovecot.php

@@ -3,12 +3,12 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/server/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -18,54 +18,54 @@
 <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 class="u-mb20">
-				<label for="v_config" class="form-label"><?=$v_config_path;?></label>
-				<textarea class="form-control u-min-height300 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-height300 u-allow-resize u-console" name="v_config" id="v_config"><?= $v_config ?></textarea>
 			</div>
 			<?php if (!empty($v_config_path1)) { ?>
 				<div class="u-mb20">
-					<label for="v_config1" class="form-label"><?=$v_config_path1;?></label>
-					<textarea class="form-control u-min-height300 u-allow-resize u-console" name="v_config1" id="v_config1"><?=$v_config1?></textarea>
+					<label for="v_config1" class="form-label"><?= $v_config_path1 ?></label>
+					<textarea class="form-control u-min-height300 u-allow-resize u-console" name="v_config1" id="v_config1"><?= $v_config1 ?></textarea>
 				</div>
 				<div class="u-mb20">
-					<label for="v_config2" class="form-label"><?=$v_config_path2;?></label>
-					<textarea class="form-control u-min-height300 u-allow-resize u-console" name="v_config2" id="v_config2"><?=$v_config2?></textarea>
+					<label for="v_config2" class="form-label"><?= $v_config_path2 ?></label>
+					<textarea class="form-control u-min-height300 u-allow-resize u-console" name="v_config2" id="v_config2"><?= $v_config2 ?></textarea>
 				</div>
 				<div class="u-mb20">
-					<label for="v_config3" class="form-label"><?=$v_config_path3;?></label>
-					<textarea class="form-control u-min-height300 u-allow-resize u-console" name="v_config3" id="v_config3"><?=$v_config3?></textarea>
+					<label for="v_config3" class="form-label"><?= $v_config_path3 ?></label>
+					<textarea class="form-control u-min-height300 u-allow-resize u-console" name="v_config3" id="v_config3"><?= $v_config3 ?></textarea>
 				</div>
 				<div class="u-mb20">
-					<label for="v_config4" class="form-label"><?=$v_config_path4;?></label>
-					<textarea class="form-control u-min-height300 u-allow-resize u-console" name="v_config4" id="v_config4"><?=$v_config4?></textarea>
+					<label for="v_config4" class="form-label"><?= $v_config_path4 ?></label>
+					<textarea class="form-control u-min-height300 u-allow-resize u-console" name="v_config4" id="v_config4"><?= $v_config4 ?></textarea>
 				</div>
 				<div class="u-mb20">
-					<label for="v_config5" class="form-label"><?=$v_config_path5;?></label>
-					<textarea class="form-control u-min-height300 u-allow-resize u-console" name="v_config5" id="v_config5"><?=$v_config5?></textarea>
+					<label for="v_config5" class="form-label"><?= $v_config_path5 ?></label>
+					<textarea class="form-control u-min-height300 u-allow-resize u-console" name="v_config5" id="v_config5"><?= $v_config5 ?></textarea>
 				</div>
 				<div class="u-mb20">
-					<label for="v_config6" class="form-label"><?=$v_config_path6;?></label>
-					<textarea class="form-control u-min-height300 u-allow-resize u-console" name="v_config6" id="v_config6"><?=$v_config6?></textarea>
+					<label for="v_config6" class="form-label"><?= $v_config_path6 ?></label>
+					<textarea class="form-control u-min-height300 u-allow-resize u-console" name="v_config6" id="v_config6"><?= $v_config6 ?></textarea>
 				</div>
 				<div class="u-mb20">
-					<label for="v_config7" class="form-label"><?=$v_config_path7;?></label>
-					<textarea class="form-control u-min-height300 u-allow-resize u-console" name="v_config7" id="v_config7"><?=$v_config7?></textarea>
+					<label for="v_config7" class="form-label"><?= $v_config_path7 ?></label>
+					<textarea class="form-control u-min-height300 u-allow-resize u-console" name="v_config7" id="v_config7"><?= $v_config7 ?></textarea>
 				</div>
 				<div class="u-mb20">
-					<label for="v_config8" class="form-label"><?=$v_config_path8;?></label>
-					<textarea class="form-control u-min-height300 u-allow-resize u-console" name="v_config8" id="v_config8"><?=$v_config8?></textarea>
+					<label for="v_config8" class="form-label"><?= $v_config_path8 ?></label>
+					<textarea class="form-control u-min-height300 u-allow-resize u-console" name="v_config8" id="v_config8"><?= $v_config8 ?></textarea>
 				</div>
 			<?php } ?>
 			<div class="form-check">
 				<input class="form-check-input" type="checkbox" name="v_restart" id="v_restart" checked>
 				<label for="v_restart">
-					<?=_('restart');?>
+					<?= _("restart") ?>
 				</label>
 			</div>
 		</div>

web/templates/pages/edit_server_httpd.php

@@ -3,15 +3,15 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/server/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 			<a href="/edit/server/php/" class="button button-secondary">
-				<i class="fas fa-pencil status-icon orange"></i><?=_('Configure');?> PHP
+				<i class="fas fa-pencil status-icon orange"></i><?= _("Configure") ?> PHP
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -21,20 +21,20 @@
 <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 class="u-mb20">
-				<label for="v_config" class="form-label"><?=$v_config_path;?></label>
-				<textarea class="form-control u-min-height300 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-height300 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>
 				<label for="v_restart">
-					<?=_('restart');?>
+					<?= _("restart") ?>
 				</label>
 			</div>
 		</div>

web/templates/pages/edit_server_mysql.php

@@ -3,12 +3,12 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/server/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -22,7 +22,7 @@
 		<input type="hidden" name="save" value="save">
 
 		<div class="form-container">
-			<h1 class="form-title"><?=_('Configuring Server');?>: <?=$v_service_name;?></h1>
+			<h1 class="form-title"><?= _("Configuring Server") ?>: <?=$v_service_name;?></h1>
 			<?php show_alert_message($_SESSION);?>
 			<div id="basic-options">
 				<div class="u-mb10">
@@ -46,12 +46,12 @@
 					<input type="text" class="form-control" regexp="max_allowed_packet" prev_value="<?=htmlentities($v_max_allowed_packet)?>" name="v_display_errors" id="v_display_errors" value="<?=htmlentities($v_max_allowed_packet)?>">
 				</div>
 				<div class="u-mb20">
-					<a href="javascript:toggleOptions();" class="button button-secondary"><?=_('Advanced options');?></a>
+					<a href="javascript:toggleOptions();" class="button button-secondary"><?= _("Advanced options") ?></a>
 				</div>
 			</div>
 			<div id="advanced-options" style="display:<?php if (empty($v_adv)) echo 'none';?> ;">
 				<div class="u-mb20">
-					<a href="javascript:toggleOptions();" class="button button-secondary"><?=_('Basic options');?></a>
+					<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>
@@ -60,7 +60,7 @@
 				<div class="form-check">
 					<input class="form-check-input" type="checkbox" name="v_restart" id="v_restart" checked>
 					<label for="v_restart">
-						<?=_('restart');?>
+						<?= _("restart") ?>
 					</label>
 				</div>
 			</div>

web/templates/pages/edit_server_nginx.php

@@ -3,15 +3,15 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/server/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 			<a href="/edit/server/php/" class="button button-secondary">
-				<i class="fas fa-pencil status-icon orange"></i> <?=_('Configure');?> PHP
+				<i class="fas fa-pencil status-icon orange"></i> <?= _("Configure") ?> PHP
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -25,7 +25,7 @@
 		<input type="hidden" name="save" value="save">
 
 		<div class="form-container">
-			<h1 class="form-title"><?=_('Configuring Server');?>: <?=$v_service_name;?></h1>
+			<h1 class="form-title"><?= _("Configuring Server") ?>: <?=$v_service_name;?></h1>
 			<?php show_alert_message($_SESSION);?>
 			<div id="basic-options">
 				<div class="u-mb10">
@@ -69,12 +69,12 @@
 					<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>
+					<a href="javascript:toggleOptions();" class="button button-secondary"><?= _("Advanced options") ?></a>
 				</div>
 			</div>
 			<div id="advanced-options" style="display:<?php if (empty($v_adv)) echo 'none';?> ;">
 				<div class="u-mb20">
-					<a href="javascript:toggleOptions();" class="button button-secondary"><?=_('Basic options');?></a>
+					<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>
@@ -83,7 +83,7 @@
 				<div class="form-check">
 					<input class="form-check-input" type="checkbox" name="v_restart" id="v_restart" checked>
 					<label for="v_restart">
-						<?=_('restart');?>
+						<?= _("restart") ?>
 					</label>
 				</div>
 			</div>

web/templates/pages/edit_server_pgsql.php

@@ -3,12 +3,12 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/server/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -18,24 +18,24 @@
 <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 class="u-mb20">
-				<label for="v_options" class="form-label"><?=$v_options_path;?></label>
-				<textarea class="form-control u-min-height300 u-allow-resize u-console" name="v_options" id="v_options"><?=$v_options;?></textarea>
+				<label for="v_options" class="form-label"><?= $v_options_path ?></label>
+				<textarea class="form-control u-min-height300 u-allow-resize u-console" name="v_options" id="v_options"><?= $v_options ?></textarea>
 			</div>
 			<div class="u-mb20">
-				<label for="v_config" class="form-label"><?=$v_config_path;?></label>
-				<textarea class="form-control u-min-height300 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-height300 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>
 				<label for="v_restart">
-					<?=_('restart');?>
+					<?= _("restart") ?>
 				</label>
 			</div>
 		</div>

web/templates/pages/edit_server_php.php

@@ -3,12 +3,12 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/server/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -22,7 +22,7 @@
 		<input type="hidden" name="save" value="save">
 
 		<div class="form-container">
-			<h1 class="form-title"><?=_('Configuring Server');?>: PHP</h1>
+			<h1 class="form-title"><?= _("Configuring Server") ?>: PHP</h1>
 			<?php show_alert_message($_SESSION);?>
 			<div id="basic-options">
 				<div class="u-mb10">
@@ -54,12 +54,12 @@
 					<input type="text" class="form-control" regexp="upload_max_filesize" prev_value="<?=htmlentities($v_upload_max_filesize)?>" name="v_upload_max_filesize" id="v_upload_max_filesize" value="<?=htmlentities($v_upload_max_filesize)?>">
 				</div>
 				<div class="u-mb20">
-					<a href="javascript:toggleOptions();" class="button button-secondary"><?=_('Advanced options');?></a>
+					<a href="javascript:toggleOptions();" class="button button-secondary"><?= _("Advanced options") ?></a>
 				</div>
 			</div>
 			<div id="advanced-options" style="display:<?php if (empty($v_adv)) echo 'none';?> ;">
 				<div class="u-mb20">
-					<a href="javascript:toggleOptions();" class="button button-secondary"><?=_('Basic options');?></a>
+					<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>
@@ -68,7 +68,7 @@
 				<div class="form-check">
 					<input class="form-check-input" type="checkbox" name="v_restart" id="v_restart" checked>
 					<label for="v_restart">
-						<?=_('restart');?>
+						<?= _("restart") ?>
 					</label>
 				</div>
 			</div>

web/templates/pages/edit_server_service.php

@@ -3,12 +3,12 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/server/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -18,20 +18,20 @@
 <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 class="u-mb20">
-				<label for="v_config" class="form-label"><?=$v_config_path;?></label>
-				<textarea class="form-control u-min-height300 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-height300 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>
 				<label for="v_restart">
-					<?=_('restart');?>
+					<?= _("restart") ?>
 				</label>
 			</div>
 		</div>

web/templates/pages/edit_user.php

@@ -3,7 +3,7 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/user/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 			<?php
 				if (($_SESSION['userContext'] === 'admin') && (!isset($_SESSION['look'])) && ($_SESSION['user'] !== $v_username)) {
@@ -16,19 +16,19 @@
 					$keys_url = "/list/access-key/";
 				}
 			?>
-			<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 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');?>">
-					<i class="fas fa-clock-rotate-left status-icon maroon"></i><?=_('Logs');?>
+				<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 } ?>
 			<?php
 				$api_status = (!empty($_SESSION['API_SYSTEM']) && is_numeric($_SESSION['API_SYSTEM'])) ? $_SESSION['API_SYSTEM'] : 0;
 				if (($user_plain == 'admin' && $api_status > 0) || ($user_plain != 'admin' && $api_status > 1)) { ?>
-				<a href="<?=$keys_url; ?>" class="button button-secondary" id="btn-create" title="<?=_('Access Keys');?>">
-					<i class="fas fa-key status-icon purple"></i><?=_('Access Keys');?>
+				<a href="<?=$keys_url; ?>" class="button button-secondary" id="btn-create" title="<?= _("Access Keys") ?>">
+					<i class="fas fa-key status-icon purple"></i><?= _("Access Keys") ?>
 				</a>
 			<?php } ?>
 		</div>
@@ -36,20 +36,20 @@
 			<?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');?>">
-					<i class="fas fa-right-to-bracket status-icon maroon"></i><?=_('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');?>
+					<?= _("Delete") ?>
 					<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');?>">
+					<div class="dialog js-confirm-dialog-delete" title="<?= _("Confirmation") ?>">
 						<p><?=sprintf(_('DELETE_USER_CONFIRMATION'),htmlentities($v_username))?></p>
 					</div>
 				</a>
 			<?php } ?>
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -73,22 +73,22 @@
 		<input type="hidden" name="save" value="save">
 
 		<div class="form-container">
-			<h1 class="form-title"><?=_('Editing User');?></h1>
+			<h1 class="form-title"><?= _("Editing User") ?></h1>
 			<?php show_alert_message($_SESSION);?>
 			<div class="u-mb10">
-				<label for="v_user" class="form-label"><?=_('Username');?></label>
+				<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, "'"))?>">
 			</div>
 			<div class="u-mb10">
-				<label for="v_name" class="form-label"><?=_('Contact');?></label>
+				<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, "'"))?>" <?php if (($_SESSION['userContext'] !=='admin' ) && ($_SESSION['POLICY_USER_EDIT_DETAILS'] !=='yes' )) { echo 'disabled' ; }?> >
 				<?php if (($_SESSION['userContext'] !== 'admin') && ($_SESSION['POLICY_USER_EDIT_DETAILS'] !== 'yes')) {?>
 					<input type="hidden" name="v_name" value="<?=htmlentities(trim($v_name, "'"))?>">
 				<?php } ?>
 			</div>
 			<div class="u-mb10">
-				<label for="v_email" class="form-label"><?=_('Email');?></label>
+				<label for="v_email" class="form-label"><?= _("Email") ?></label>
 				<input type="email" class="form-control" name="v_email" id="v_email" value="<?=htmlentities(trim($v_email, "'"))?>" <?php if (($_SESSION['userContext'] !=='admin' ) && ($_SESSION['POLICY_USER_EDIT_DETAILS'] !=='yes' )) { echo 'disabled' ; }?>>
 				<?php if (($_SESSION['userContext'] !== 'admin') && ($_SESSION['POLICY_USER_EDIT_DETAILS'] !== 'yes')) {?>
 					<input type="hidden" name="v_email" value="<?=htmlentities(trim($v_email, "'"))?>">
@@ -96,8 +96,8 @@
 			</div>
 			<div class="u-mb10">
 				<label for="v_password" class="form-label">
-					<?=_('Password');?>
-					<a href="javascript:applyRandomString();" title="<?=_('generate');?>" class="u-ml5"><i class="fas fa-arrows-rotate status-icon green icon-large"></i></a>
+					<?= _("Password") ?>
+					<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, "'"))?>">
@@ -105,17 +105,17 @@
 				</div>
 			</div>
 			<div id="password-details" class="u-mb20">
-				<p class="u-mb10"><?=_('Your password must have at least');?>:</p>
+				<p class="u-mb10"><?= _("Your password must have at least") ?>:</p>
 				<ul class="u-list-bulleted u-mb10">
-					<li><?=_('8 characters long');?></li>
-					<li><?=_('1 uppercase & 1 lowercase character');?></li>
-					<li><?=_('1 number');?></li>
+					<li><?= _("8 characters long") ?></li>
+					<li><?= _("1 uppercase & 1 lowercase character") ?></li>
+					<li><?= _("1 number") ?></li>
 				</ul>
 				<?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">
-							<?=_('Do not allow user to log in to Control Panel');?>
+							<?= _("Do not allow user to log in to Control Panel") ?>
 						</label>
 					</div>
 				<?php } ?>
@@ -123,12 +123,12 @@
 					<div class="form-check u-mt15">
 						<input class="form-check-input" type="checkbox" name="v_twofa" id="v_twofa" <?php if(!empty($v_twofa)) echo 'checked' ?>>
 						<label for="v_twofa">
-							<?=_('Enable 2FA');?>
+							<?= _("Enable 2FA") ?>
 						</label>
 					</div>
 					<?php if (!empty($v_twofa)) { ?>
-						<p class="u-mb10"><?=_('2FA Reset Code:').' '.$v_twofa; ?></p>
-						<p class="u-mb10"><?=_('Please scan the code below in your 2FA application:');?></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>
 					<?php } ?>
 				</div>
@@ -136,16 +136,16 @@
 					<div class="form-check">
 						<input x-model="useIpAllowList" class="form-check-input" type="checkbox" name="v_login_use_iplist" id="v_login_use_iplist">
 						<label for="v_login_use_iplist">
-							<?=_('Use IP address allow list for login attempts');?>
+							<?= _("Use IP address allow list for login attempts") ?>
 						</label>
 					</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">
-				<label for="v_language" class="form-label"><?=_('Language');?></label>
+				<label for="v_language" class="form-label"><?= _("Language") ?></label>
 				<select class="form-select" name="v_language" id="v_language">
 					<?php
 						foreach ($languages as $key => $value) {
@@ -167,18 +167,18 @@
 			<?php } else { ?>
 				<?php if (($_SESSION['userContext'] === 'admin') && ($_SESSION['user'] != $v_username)) {?>
 					<div class="u-mb10">
-						<label for="v_role" class="form-label"><?=_('Role');?></label>
+						<label for="v_role" class="form-label"><?= _("Role") ?></label>
 						<select class="form-select" name="v_role" id="v_role">
-							<option value="user"><?=_('User');?>
-							<option value="admin" <?php if($v_role == "admin" ){ echo "selected"; } ?>><?=_('Administrator');?>
-							<option value="dns-cluster" <?php if($v_role == "dns-cluster" ){ echo "selected"; } ?>><?=_('DNS Sync user');?>
+							<option value="user"><?= _("User") ?>
+							<option value="admin" <?php if($v_role == "admin" ){ echo "selected"; } ?>><?= _("Administrator") ?>
+							<option value="dns-cluster" <?php if($v_role == "dns-cluster" ){ echo "selected"; } ?>><?= _("DNS Sync user") ?>
 						</select>
 					</div>
 				<?php } ?>
 			<?php } ?>
 			<?php if ($_SESSION['POLICY_USER_CHANGE_THEME'] !== 'no') {?>
 			<div class="u-mb10">
-				<label for="v_user_theme" class="form-label"><?=_('Theme') ?></label>
+				<label for="v_user_theme" class="form-label"><?= _("Theme") ?></label>
 				<select class="form-select" name="v_user_theme" id="v_user_theme">
 					<?php
 						foreach ($themes as $key => $value) {
@@ -196,15 +196,15 @@
 			</div>
 			<?php } ?>
 				<div class="u-mb10">
-					<label for="v_sort_order" class="form-label"><?=_('Default list sort order');?></label>
+					<label for="v_sort_order" class="form-label"><?= _("Default list sort order") ?></label>
 					<select class="form-select" name="v_sort_order" id="v_sort_order">
-						<option value='date' <?php if($v_sort_order === 'date') echo 'selected' ?>><?=_('Date');?></option>
-						<option value='name' <?php if($v_sort_order === 'name') echo 'selected' ?>><?=_('Name');?></option>
+						<option value='date' <?php if($v_sort_order === 'date') echo 'selected' ?>><?= _("Date") ?></option>
+						<option value='name' <?php if($v_sort_order === 'name') echo 'selected' ?>><?= _("Name") ?></option>
 					</select>
 				</div>
 			<?php if ($_SESSION['userContext'] === 'admin') {?>
 				<div class="u-mb20">
-					<label for="v_package" class="form-label"><?=_('Package');?></label>
+					<label for="v_package" class="form-label"><?= _("Package") ?></label>
 					<select class="form-select" name="v_package" id="v_package">
 						<?php
 							foreach ($packages as $key => $value) {
@@ -219,11 +219,11 @@
 					</select>
 				</div>
 				<div class="u-mb20">
-					<a x-on:click="showAdvanced = !showAdvanced"href="#" class="button button-secondary"><?=_('Advanced options');?></a>
+					<a x-on:click="showAdvanced = !showAdvanced"href="#" class="button button-secondary"><?= _("Advanced options") ?></a>
 				</div>
 				<div x-cloak x-show="showAdvanced" id="advanced-opts">
 					<div class="u-mb10">
-						<label for="v_shell" class="form-label"><?=_('SSH Access');?></label>
+						<label for="v_shell" class="form-label"><?= _("SSH Access") ?></label>
 						<select class="form-select" name="v_shell" id="v_shell">
 							<?php
 								foreach ($shells as $key => $value) {
@@ -238,7 +238,7 @@
 						</select>
 					</div>
 					<div class="u-mb10">
-						<label for="v_phpcli" class="form-label"><?=_('PHP CLI Version');?></label>
+						<label for="v_phpcli" class="form-label"><?= _("PHP CLI Version") ?></label>
 						<select class="form-select" name="v_phpcli" id="v_phpcli">
 							<?php
 								foreach ($php_versions as $key => $value) {
@@ -257,7 +257,7 @@
 						</select>
 					</div>
 					<?php if ((isset($_SESSION['DNS_SYSTEM'])) && (!empty($_SESSION['DNS_SYSTEM']))) {?>
-						<p class="form-label u-mb10"><?=_('Default Name Servers');?></p>
+						<p class="form-label u-mb10"><?= _("Default Name Servers") ?></p>
 						<div class="u-mb5">
 							<input type="text" class="form-control" name="v_ns1" value="<?=htmlentities(trim($v_ns1, "'"))?>">
 						</div>
@@ -303,7 +303,7 @@
 							}
 						?>
 						<div class="u-pt18 js-add-ns" <?php if ($v_ns8) echo 'style="display:none;"'; ?>>
-							<span class="js-add-ns-button additional-control add"><?=_('Add one more Name Server');?></span>
+							<span class="js-add-ns-button additional-control add"><?= _("Add one more Name Server") ?></span>
 						</div>
 					<?php } ?>
 				</div>

web/templates/pages/edit_web.php

@@ -3,20 +3,20 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/web/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<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');?>
+				<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">
-					<i class="fas fa-magic status-icon blue"></i> <?=_('Quick Install App');?>
+					<i class="fas fa-magic status-icon blue"></i> <?= _("Quick Install App") ?>
 				</a>
 			<?php } ?>
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -46,27 +46,27 @@
 		<input type="hidden" name="save" value="save">
 
 		<div class="form-container">
-			<h1 class="form-title"><?=_('Editing Domain');?></h1>
+			<h1 class="form-title"><?= _("Editing Domain") ?></h1>
 			<?php show_alert_message($_SESSION);?>
 			<div class="u-mb10">
-				<label for="v_domain" class="form-label"><?=_('Domain');?></label>
+				<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, "'"))?>">
 			</div>
 			<div class="u-mb10">
-				<label for="v_aliases" class="form-label"><?=_('Aliases');?></label>
+				<label for="v_aliases" class="form-label"><?= _("Aliases") ?></label>
 				<textarea class="form-control" name="v_aliases" id="v_aliases"><?=htmlentities(trim($v_aliases, "'"))?></textarea>
 			</div>
 			<?php if ($v_letsencrypt == 'yes' || $v_letsencrypt == 'on') {?>
 				<div class="u-mb10">
 					<div class="alert alert-info alert-with-icon" role="alert">
 						<i class="fas fa-exclamation"></i>
-						<p><?=_('Lets Encrypt will obtain a new SSL certificate if web domain aliases are changed.');?></p>
+						<p><?= _("Lets Encrypt will obtain a new SSL certificate if web domain aliases are changed.") ?></p>
 					</div>
 				</div>
 			<?php } ?>
 			<div class="u-mb20">
-				<label for="v_ip" class="form-label"><?=_('IP Address');?></label>
+				<label for="v_ip" class="form-label"><?= _("IP Address") ?></label>
 				<select class="form-select" name="v_ip" id="v_ip">
 					<?php
 						foreach ($ips as $ip => $value) {
@@ -78,7 +78,7 @@
 				</select>
 			</div>
 			<div class="u-mb10">
-				<label for="v_stats" class="form-label"><?=_('Web Statistics');?></label>
+				<label for="v_stats" class="form-label"><?= _("Web Statistics") ?></label>
 				<select class="form-select" name="v_stats" id="v_stats">
 					<?php
 						foreach ($stats as $key => $value) {
@@ -97,7 +97,7 @@
 				<div class="form-check">
 					<input x-model="statsAuthEnabled" class="form-check-input" type="checkbox" name="v_stats_auth" id="v_stats_auth">
 					<label for="v_stats_auth">
-						<?=_('Statistics Authorization');?>
+						<?= _("Statistics Authorization") ?>
 					</label>
 				</div>
 			</div>
@@ -105,15 +105,15 @@
 				<div class="u-pl30">
 					<div x-cloak x-show="statsAuthEnabled" id="statstable" name="v-add-web-domain-stats-user">
 						<div class="u-mb10">
-							<label for="v_stats_user" class="form-label"><?=_('Username');?></label>
-							<input type="text" class="form-control" name="v_stats_user" id="v_stats_user" value="<?=htmlentities(trim($v_stats_user, "'"))?>">
+							<label for="v_stats_user" class="form-label"><?= _("Username") ?></label>
+							<input type="text" class="form-control" name="v_stats_user" id="v_stats_user" value="<?= htmlentities(trim($v_stats_user, "'")) ?>">
 						</div>
 						<div class="u-mb20">
 							<label for="v_password" class="form-label">
-								<?=_('Password');?> / <a href="javascript:WEBrandom();" class="generate"><?=_('generate');?></a>
+								<?= _("Password") ?> / <a href="javascript:WEBrandom();" class="generate"><?= _("generate") ?></a>
 							</label>
 							<div class="u-pos-relative">
-								<input type="text" class="form-control js-password-input" name="v_stats_password" id="v_password" value="<?=trim($v_stats_password, "'")?>">
+								<input type="text" class="form-control js-password-input" name="v_stats_password" id="v_password" value="<?= trim($v_stats_password, "'") ?>">
 							</div>
 						</div>
 					</div>
@@ -122,7 +122,7 @@
 			<div class="form-check u-mb10">
 				<input x-model="redirectEnabled" class="form-check-input" type="checkbox" name="v-redirect-checkbox" id="v-redirect-checkbox">
 				<label for="v-redirect-checkbox">
-					<?=_('Enable domain redirection');?>
+					<?= _("Enable domain redirection") ?>
 				</label>
 			</div>
 			<div x-cloak x-show="redirectEnabled" id="v_redirect" class="u-pl30 u-mb10">
@@ -141,16 +141,16 @@
 				<div class="form-check">
 					<input class="form-check-input v-redirect-custom-value" type="radio" name="v-redirect" id="v-redirect-radio-3" value="custom" <?php if( !empty($v_redirect_custom)) echo 'checked';?>>
 					<label for="v-redirect-radio-3">
-						<?=_("Redirect visitors to a custom domain or web address");?>
+						<?= _("Redirect visitors to a custom domain or web address") ?>
 					</label>
 				</div>
 				<div id="custom_redirect" class="u-pl30" style="display:<?php if (empty($v_redirect_custom)) { echo 'none';} else {echo 'block';}?> ;">
 					<div class="u-mt15 u-mb10">
-						<label for="v-redirect-custom" class="form-label"><?=_('Target domain or URL');?></label>
+						<label for="v-redirect-custom" class="form-label"><?= _("Target domain or URL") ?></label>
 						<input type="text" class="form-control" name="v-redirect-custom" id="v-redirect-custom" value="<?=$v_redirect_custom;?>">
 					</div>
 					<div class="u-mb20">
-						<label for="v-redirect-code" class="form-label"><?=_('Status code');?>:</label>
+						<label for="v-redirect-code" class="form-label"><?= _("Status code") ?>:</label>
 						<select class="form-select" name="v-redirect-code" id="v-redirect-code">
 							<?php foreach ($redirect_code_options as $status_code): ?>
 							<option value="<?=$status_code;?>"
@@ -165,43 +165,43 @@
 			<div class="form-check u-mb10">
 				<input x-model="sslEnabled" class="form-check-input" type="checkbox" name="v_ssl" id="v_ssl">
 				<label for="v_ssl">
-					<?=_('SSL Support');?>
+					<?= _("SSL Support") ?>
 				</label>
 			</div>
 			<div x-cloak x-show="sslEnabled" id="ssltable" class="u-pl30">
 				<div class="form-check u-mb10">
 					<input x-model="letsEncryptEnabled" class="form-check-input" type="checkbox" name="v_letsencrypt" id="letsencrypt">
 					<label for="letsencrypt">
-						<?=_('Lets Encrypt Support');?>
+						<?= _("Lets Encrypt Support") ?>
 					</label>
 				</div>
 				<div class="form-check u-mb10">
 					<input class="form-check-input" type="checkbox" name="v_ssl_forcessl" id="v_ssl_forcessl" <?php if($v_ssl_forcessl == 'yes') echo 'checked' ?>>
 					<label for="v_ssl_forcessl">
-						<?=_('Force SSL/HTTPS');?>
+						<?= _("Force SSL/HTTPS") ?>
 					</label>
 				</div>
 				<div class="form-check u-mb20">
 					<input class="form-check-input" type="checkbox" name="v_ssl_hsts" id="ssl_hsts" <?php if($v_ssl_hsts == 'yes') echo 'checked' ?>>
 					<label for="ssl_hsts">
-						<?=_('Enable SSL HSTS');?>
+						<?= _("Enable SSL HSTS") ?>
 					</label>
 				</div>
 				<div x-cloak x-show="showCertificates" id="ssl-details">
 					<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>
+							<?= _("SSL Certificate") ?>
+							<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>
 					</div>
 					<div class="u-mb10">
-						<label for="v_ssl_key" class="form-label"><?=_('SSL Key');?></label>
+						<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>
 					</div>
 					<div class="u-mb20">
 						<label for="v_ssl_ca" class="form-label">
-							<?=_('SSL Certificate Authority / Intermediate');?> <span class="optional">(<?=_('optional');?>)</span>
+							<?= _("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>
 					</div>
@@ -209,18 +209,18 @@
 				<?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-label"><?= _("SUBJECT") ?></span>
 							<span class="values-list-value"><?=$v_ssl_subject?></span>
 						</li>
 						<?php if ($v_ssl_aliases) {?>
 							<li class="values-list-item">
-								<span class="values-list-label"><?=_('ALIASES');?></span>
+								<span class="values-list-label"><?= _("ALIASES") ?></span>
 								<span class="values-list-value"><?=$v_ssl_aliases?></span>
 							</li>
 						<?php } ?>
 						<tr>
 							<td>
-								<b><?=_('NOT_BEFORE');?>:</b>
+								<b><?= _("NOT_BEFORE") ?>:</b>
 							</td>
 							<td class="details">
 								<?=$v_ssl_not_before?>
@@ -228,7 +228,7 @@
 						</tr>
 						<tr>
 							<td>
-								<b><?=_('NOT_AFTER');?>:</b>
+								<b><?= _("NOT_AFTER") ?>:</b>
 							</td>
 							<td class="details">
 								<?=$v_ssl_not_after?>
@@ -236,7 +236,7 @@
 						</tr>
 						<tr>
 							<td>
-								<b><?=_('SIGNATURE');?>:</b>
+								<b><?= _("SIGNATURE") ?>:</b>
 							</td>
 							<td class="details">
 								<?=$v_ssl_signature?>
@@ -244,7 +244,7 @@
 						</tr>
 						<tr>
 							<td>
-								<b><?=_('PUB_KEY');?>:</b>
+								<b><?= _("PUB_KEY") ?>:</b>
 							</td>
 							<td class="details">
 								<?=$v_ssl_pub_key?>
@@ -252,26 +252,26 @@
 						</tr>
 						<tr>
 							<td>
-								<b><?=_('ISSUER');?>:</b>
+								<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>
+							<td><a x-on:click="showCertificates = !showCertificates" href="#" class="generate"><?= _("Show Certificate") ?></a></td>
 						</tr>
 					</table>
 				<?php } ?>
 			</div>
 			<div class="u-mt15 u-mb20">
-				<a x-on:click="showAdvanced = !showAdvanced" href="#" class="button button-secondary"><?=_('Advanced options');?></a>
+				<a x-on:click="showAdvanced = !showAdvanced" href="#" class="button button-secondary"><?= _("Advanced options") ?></a>
 			</div>
 			<div x-cloak x-show="showAdvanced" id="advanced-opts">
 				<?php if (($_SESSION['userContext'] === 'admin') || ($_SESSION['userContext'] === 'user') && ($_SESSION['POLICY_USER_EDIT_WEB_TEMPLATES'] === 'yes')) { ?>
 					<div class="u-mb10">
 						<label for="v_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_template" id="v_template">
 							<?php
@@ -290,7 +290,7 @@
 						<div class="form-check u-mb10">
 							<input x-model="nginxCacheEnabled" class="form-check-input" type="checkbox" name="v_nginx_cache_check" id="v_nginx_cache_check">
 							<label for="v_nginx_cache_check">
-								<?=_('Enable FastCGI Cache');?>
+								<?= _("Enable FastCGI Cache") ?>
 								<a href="https://docs.hestiacp.com/admin_docs/web/fastcgi.html#nginx-fastcgi-cache" target="_blank" class="u-ml5">
 									<i class="fas fa-circle-question"></i>
 								</a>
@@ -299,7 +299,7 @@
 						<div x-cloak x-show="nginxCacheEnabled" id="v_nginx_duration" class="u-pl30">
 							<div class="u-mb10">
 								<label for="v_nginx_cache_duration" class="form-label">
-									<?=_('Cache Duration');?> <span class="optional"><?=_('For example: 30s, 10m or 1d');?>
+									<?= _("Cache Duration") ?> <span class="optional"><?= _("For example: 30s, 10m or 1d") ?>
 								</label>
 								<input type="text" class="form-control" name="v_nginx_cache_duration" id="v_nginx_cache_duration" value="<?=htmlentities(trim($v_nginx_cache_duration, "'"))?>">
 							</div>
@@ -308,7 +308,7 @@
 					<?php if (!empty($_SESSION['WEB_BACKEND'])) { ?>
 						<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
@@ -332,13 +332,13 @@
 							<div class="form-check u-mb10">
 								<input x-model="proxySupportEnabled" class="form-check-input" type="checkbox" name="v_proxy" id="v_proxy">
 								<label for="v_proxy">
-									<?=_('Proxy Support') . "<span class='optional'>" . strtoupper($_SESSION['PROXY_SYSTEM']) . "</span>";?>
+									<?= _("Proxy Support") . "<span class='optional'>" . strtoupper($_SESSION['PROXY_SYSTEM']) . "</span>";?>
 								</label>
 							</div>
 						</div>
 						<div x-cloak x-show="proxySupportEnabled" id="proxytable">
 							<div class="u-mb10">
-								<label for="v_proxy_template" class="form-label"><?=_('Proxy Template');?></label>
+								<label for="v_proxy_template" class="form-label"><?= _("Proxy Template") ?></label>
 								<select class="form-select" name="v_proxy_template" id="v_proxy_template">
 									<?php
 										foreach ($proxy_templates as $key => $value) {
@@ -356,7 +356,7 @@
 								</select>
 							</div>
 							<div class="u-mb10">
-								<label for="v_proxy_ext" class="form-label"><?=_('Proxy Extensions');?></label>
+								<label for="v_proxy_ext" class="form-label"><?= _("Proxy Extensions") ?></label>
 								<textarea class="form-control" name="v_proxy_ext" id="v_proxy_ext"><?php if (!empty($v_proxy_ext)) { echo htmlentities(trim($v_proxy_ext, "'"));} else { echo 'jpg, jpeg, gif, png, ico, svg, css, zip, tgz, gz, rar, bz2, exe, pdf, doc, xls, ppt, txt, odt, ods, odp, odf, tar, bmp, rtf, js, mp3, avi, mpeg, flv, html, htm'; } ?></textarea>
 							</div>
 						</div>
@@ -365,12 +365,12 @@
 				<div class="form-check u-mb10">
 					<input x-model="customDocumentRootEnabled" class="form-check-input" type="checkbox" name="v_custom_doc_root_check" id="v_custom_doc_root_check">
 					<label for="v_custom_doc_root_check">
-						<?=_('Custom document root');?>
+						<?= _("Custom document root") ?>
 					</label>
 				</div>
 				<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>
+						<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;?>">
 						<select class="form-select" name="v-custom-doc-domain" id="v-custom-doc-domain">
 							<?php foreach ($user_domains as $domain): ?>
@@ -383,7 +383,7 @@
 					</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, "'"))?>">
 						<small class="custom_docroot_hint"></small>
@@ -393,7 +393,7 @@
 					<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">
-							<?=_('Additional FTP Account');?>
+							<?= _("Additional FTP Account") ?>
 						</label>
 					</div>
 					<div id="ftp_users">
@@ -407,13 +407,13 @@
 						?>
 						<div class="js-ftp-account js-ftp-account-nrm" name="v_add_domain_ftp" style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;">
 							<div class="u-mb10">
-								<?=_('FTP');?> #<span class="ftp-user-number"><?=$i + 1; ?></span> <a class="additional-control delete" onclick="App.Actions.WEB.remove_ftp_user(this)"><?=_('delete');?></a>
+								<?= _("FTP") ?> #<span class="ftp-user-number"><?=$i + 1; ?></span> <a class="additional-control delete" onclick="App.Actions.WEB.remove_ftp_user(this)"><?= _("delete") ?></a>
 								<input type="hidden" class="v-ftp-user-deleted" name="v_ftp_user[<?=$i ?>][delete]" value="0">
 								<input type="hidden" class="v-ftp-user-is-new" name="v_ftp_user[<?=$i ?>][is_new]" value="<?=htmlentities($ftp_user['is_new']) ?>">
 							</div>
 							<div class="u-pl30 u-mb10">
 								<label for="v_ftp_user[<?=$i ?>][v_ftp_user]" class="form-label">
-									<?=_('Username');?><br>
+									<?= _("Username") ?><br>
 									<span style="color:#777;"><?=sprintf(_('Prefix %s will be added to username automatically'),$user_plain."_");?></span>
 								</label>
 								<input type="text" class="form-control v-ftp-user" <?=$ftp_user['is_new'] != 1 ? 'disabled="disabled"' : '' ?>
@@ -423,12 +423,12 @@
 							</div>
 							<div class="u-pl30 u-mb10">
 								<label for="v_ftp_user[<?=$i ?>][v_ftp_password]" class="form-label">
-									<?=_('Password');?> / <a href="javascript:void(0);" onclick="FTPrandom(this)" ; class="generate"><?=_('generate');?></a>
+									<?= _("Password") ?> / <a href="javascript:void(0);" onclick="FTPrandom(this)" ; class="generate"><?= _("generate") ?></a>
 								</label>
 								<input type="text" class="form-control v-ftp-user-psw" name="v_ftp_user[<?=$i ?>][v_ftp_password]" id="v_ftp_user[<?=$i ?>][v_ftp_password]" value="<?=htmlentities(trim($v_ftp_password, "'"))?>">
 							</div>
 							<div class="u-pl30 u-mb10">
-								<label for="v_ftp_user[<?=$i ?>][v_ftp_path]" class="form-label"><?=_('Path');?></label>
+								<label for="v_ftp_user[<?=$i ?>][v_ftp_path]" class="form-label"><?= _("Path") ?></label>
 								<input type="hidden" name="v_ftp_pre_path" value="<?=!empty($v_ftp_pre_path) ? htmlentities(trim($v_ftp_pre_path, "'")) : '/'; ?>">
 								<input type="hidden" name="v_ftp_user[<?=$i ?>][v_ftp_path_prev]" value="<?php if (!empty($v_ftp_path)) echo ($v_ftp_path[0] != '/' ? '/' : '').htmlentities(trim($v_ftp_path, "'")) ?>">
 								<input type="text" class="form-control js-ftp-path" name="v_ftp_user[<?=$i ?>][v_ftp_path]" id="v_ftp_user[<?=$i ?>][v_ftp_path]" value="<?php if (!empty($v_ftp_path)) echo ($v_ftp_path[0] != '/' ? '/' : '').htmlentities(trim($v_ftp_path, "'")) ?>">
@@ -436,7 +436,7 @@
 							</div>
 							<?php if ($ftp_user['is_new'] == 1): ?>
 								<div class="u-pl30 u-mb10">
-									<label for="v_ftp_user[<?=$i ?>][v_ftp_email]" class="form-label"><?=_('Send FTP credentials to email');?></label>
+									<label for="v_ftp_user[<?=$i ?>][v_ftp_email]" class="form-label"><?= _("Send FTP credentials to email") ?></label>
 									<input type="email" class="form-control js-email-alert-on-psw" name="v_ftp_user[<?=$i ?>][v_ftp_email]" id="v_ftp_user[<?=$i ?>][v_ftp_email]" value="<?=htmlentities(trim($v_ftp_email, "'"))?>">
 								</div>
 							<?php endif; ?>
@@ -446,7 +446,7 @@
 
 					<div class="js-add-new-ftp-user-button" style="<?=!empty($v_ftp_user) ? '' : 'display:none;' ?>">
 						<div class="u-pt18 v-add-new-user">
-							<a class="additional-control add" onclick="App.Actions.WEB.add_ftp_user_form()"><?=_('Add one more FTP Account');?></a>
+							<a class="additional-control add" onclick="App.Actions.WEB.add_ftp_user_form()"><?= _("Add one more FTP Account") ?></a>
 						</div>
 					</div>
 				<?php } ?>
@@ -460,32 +460,32 @@
 <div id="templates" class="u-hidden">
 	<div class="js-ftp-account js-ftp-account-nrm" name="v_add_domain_ftp">
 		<div class="u-mb10">
-			<?=_('FTP') ?> #<span class="ftp-user-number"></span> <a class="additional-control delete" onclick="App.Actions.WEB.remove_ftp_user(this)"><?=_('delete');?></a>
+			<?= _("FTP") ?> #<span class="ftp-user-number"></span> <a class="additional-control delete" onclick="App.Actions.WEB.remove_ftp_user(this)"><?= _("delete") ?></a>
 			<input type="hidden" class="v-ftp-user-deleted" name="v_ftp_user[%INDEX%][delete]" value="0">
 			<input type="hidden" class="v-ftp-user-is-new" name="v_ftp_user[%INDEX%][is_new]" value="1">
 		</div>
 		<div class="u-pl30 u-mb10">
 			<label for="v_ftp_user[%INDEX%][v_ftp_user]" class="form-label">
-				<?=_('Username');?><br>
-				<span style="color:#777;"><?=sprintf(_('Prefix %s will be added to username automatically'),$user_plain."_");?></span>
+				<?= _("Username") ?><br>
+				<span style="color:#777;"><?= sprintf(_("Prefix %s will be added to username automatically"), $user_plain . "_") ?></span>
 			</label>
 			<input type="text" class="form-control v-ftp-user" name="v_ftp_user[%INDEX%][v_ftp_user]" id="v_ftp_user[%INDEX%][v_ftp_user]" value="">
 			<small class="hint"></small>
 		</div>
 		<div class="u-pl30 u-mb10">
 			<label for="v_ftp_user[%INDEX%][v_ftp_password]" class="form-label">
-				<?=_('Password');?> / <a href="javascript:void(0);" onclick="FTPrandom(this)" ; class="generate"><?=_('generate');?></a>
+				<?= _("Password") ?> / <a href="javascript:void(0);" onclick="FTPrandom(this)" ; class="generate"><?= _("generate") ?></a>
 			</label>
 			<input type="text" class="form-control v-ftp-user-psw" name="v_ftp_user[%INDEX%][v_ftp_password]" id="v_ftp_user[%INDEX%][v_ftp_password]">
 		</div>
 		<div class="u-pl30 u-mb10">
-			<label for="v_ftp_user[%INDEX%][v_ftp_path]" class="form-label"><?=_('Path');?></label>
+			<label for="v_ftp_user[%INDEX%][v_ftp_path]" class="form-label"><?= _("Path") ?></label>
 			<input type="hidden" name="v_ftp_pre_path" value="">
 			<input type="text" class="form-control js-ftp-path" name="v_ftp_user[%INDEX%][v_ftp_path]" id="v_ftp_user[%INDEX%][v_ftp_path]" value="">
-			<span class="hint-prefix js-ftp-path-prefix"><?=htmlentities(trim($v_ftp_pre_path_new_user, "'"))?></span><span class="hint js-ftp-path-hint"></span>
+			<span class="hint-prefix js-ftp-path-prefix"><?= htmlentities(trim($v_ftp_pre_path_new_user, "'")) ?></span><span class="hint js-ftp-path-hint"></span>
 		</div>
 		<div class="u-pl30 u-mb10">
-			<label for="v_ftp_user[%INDEX%][v_ftp_email]" class="form-label"><?=_('Send FTP credentials to email');?></label>
+			<label for="v_ftp_user[%INDEX%][v_ftp_email]" class="form-label"><?= _("Send FTP credentials to email") ?></label>
 			<input type="email" class="form-control js-email-alert-on-psw" name="v_ftp_user[%INDEX%][v_ftp_email]" id="v_ftp_user[%INDEX%][v_ftp_email]" value="">
 		</div>
 	</div>

web/templates/pages/generate_ssl.php

@@ -1,7 +1,7 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-right">
-			<?php show_alert_message($_SESSION);?>
+			<?php show_alert_message($_SESSION); ?>
 		</div>
 	</div>
 </div>
@@ -9,57 +9,57 @@
 <div class="container animate__animated animate__fadeIn">
 
 	<form id="vstobjects" name="v_generate_csr" method="post">
-		<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 		<input type="hidden" name="generate" value="generate">
 
 		<div class="form-container">
-			<h1 class="form-title"><?=_('Generating CSR');?></h1>
+			<h1 class="form-title"><?= _("Generating CSR") ?></h1>
 			<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, "'")) ?>">
+				<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, "'")) ?>">
 			</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>
+				<label for="v_aliases" class="form-label"><?= _("Aliases") ?></label>
+				<textarea class="form-control" name="v_aliases" id="v_aliases"><?= htmlentities(trim($v_aliases, "'")) ?></textarea>
 			</div>
 			<div class="u-mb10">
 				<label for="v_email" class="form-label">
-					<?=_('Email');?>
-					<span class="optional">(<?php print _('optional');?>)</span>
+					<?= _("Email") ?>
+					<span class="optional">(<?php print _("optional"); ?>)</span>
 				</label>
-				<input type="email" class="form-control" name="v_email" id="v_email" value="<?=htmlentities(trim($v_email, "'")) ?>">
+				<input type="email" class="form-control" name="v_email" id="v_email" value="<?= htmlentities(trim($v_email, "'")) ?>">
 			</div>
 			<div class="u-mb10">
 				<label for="v_country" class="form-label">
-					<?=_('Country');?>
-					<span class="optional">(<?=_('2 letter code');?>)</span>
+					<?= _("Country") ?>
+					<span class="optional">(<?= _("2 letter code") ?>)</span>
 				</label>
-				<input type="text" class="form-control" name="v_country" id="v_country" value="<?=htmlentities(trim($v_country, "'")) ?>">
+				<input type="text" class="form-control" name="v_country" id="v_country" value="<?= htmlentities(trim($v_country, "'")) ?>">
 			</div>
 			<div class="u-mb10">
 				<label for="v_state" class="form-label">
-					<?=_('State / Province');?>
+					<?= _("State / Province") ?>
 				</label>
-				<input type="text" class="form-control" name="v_state" id="v_state" value="<?=htmlentities(trim($v_state, "'")) ?>">
+				<input type="text" class="form-control" name="v_state" id="v_state" value="<?= htmlentities(trim($v_state, "'")) ?>">
 			</div>
 			<div class="u-mb10">
 				<label for="v_locality" class="form-label">
-					<?=_('City / Locality');?>
+					<?= _("City / Locality") ?>
 				</label>
-				<input type="text" class="form-control" name="v_locality" id="v_locality" value="<?=htmlentities(trim($v_locality, "'")) ?>">
+				<input type="text" class="form-control" name="v_locality" id="v_locality" value="<?= htmlentities(trim($v_locality, "'")) ?>">
 			</div>
 			<div class="u-mb20">
 				<label for="v_org" class="form-label">
-					<?=_('Organization');?>
+					<?= _("Organization") ?>
 				</label>
-				<input type="text" class="form-control" name="v_org" id="v_org" value="<?=htmlentities(trim($v_org, "'")) ?>">
+				<input type="text" class="form-control" name="v_org" id="v_org" value="<?= htmlentities(trim($v_org, "'")) ?>">
 			</div>
 			<div class="u-side-by-side">
 				<button type="submit" class="button" name="generate">
-					<?=_('Ok');?>
+					<?= _("Ok") ?>
 				</button>
-				<button type="button" class="button button-secondary" onclick="<?=$back?>">
-					<?=_('Back');?>
+				<button type="button" class="button button-secondary" onclick="<?= $back ?>">
+					<?= _("Back") ?>
 				</button>
 			</div>
 		</div>

web/templates/pages/list_access_key.php

@@ -1,7 +1,6 @@
 <?php
 // Prevent resubmit form on page refresh
-if (!empty($_POST['ok'])) {
-	?>
+if (!empty($_POST["ok"])) { ?>
 	<script>
 		if (window.history.replaceState) {
 			window.history.replaceState(null, null, window.location.href);
@@ -14,7 +13,7 @@ if (!empty($_POST['ok'])) {
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/list/access-key/">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 	</div>
@@ -25,34 +24,34 @@ if (!empty($_POST['ok'])) {
 	<form id="vstobjects">
 
 		<div class="form-container">
-			<h1 class="form-title"><?=_("Access Key"); ?></h1>
-			<?php show_alert_message($_SESSION);?>
-			<?php if (!empty($key_data['ACCESS_KEY_ID'])) { ?>
+			<h1 class="form-title"><?= _("Access Key") ?></h1>
+			<?php show_alert_message($_SESSION); ?>
+			<?php if (!empty($key_data["ACCESS_KEY_ID"])) { ?>
 				<div class="u-mt15 u-mb10">
-					<label for="access_key_id" class="form-label"><?=_('Access Key Id');?></label>
-					<input type="text" class="form-control" id="access_key_id" maxlength="255" readonly value="<?= htmlentities(trim($key_data['ACCESS_KEY_ID'], "'")) ?>">
+					<label for="access_key_id" class="form-label"><?= _("Access Key Id") ?></label>
+					<input type="text" class="form-control" id="access_key_id" maxlength="255" readonly value="<?= htmlentities(trim($key_data["ACCESS_KEY_ID"], "'")) ?>">
 				</div>
 			<?php } ?>
-			<?php if (!empty($_SESSION['ok_msg'])) { ?>
-				<?php if (!empty($key_data['ACCESS_KEY_ID']) && !empty($key_data['SECRET_ACCESS_KEY'])) { ?>
+			<?php if (!empty($_SESSION["ok_msg"])) { ?>
+				<?php if (!empty($key_data["ACCESS_KEY_ID"]) && !empty($key_data["SECRET_ACCESS_KEY"])) { ?>
 					<div class="u-mb20">
 						<label for="secret_key" class="form-label">
-							<?=_('Secret Key');?><br>
-							<span style="color:#ffd500;"><?=_('Warning! Last chance to save secret access key!');?></span>
+							<?= _("Secret Key") ?><br>
+							<span style="color:#ffd500;"><?= _("Warning! Last chance to save secret access key!") ?></span>
 						</label>
-						<input type="text" class="form-control" id="secret_key" maxlength="255" readonly value="<?= htmlentities(trim($key_data['SECRET_ACCESS_KEY'], "'")) ?>">
+						<input type="text" class="form-control" id="secret_key" maxlength="255" readonly value="<?= htmlentities(trim($key_data["SECRET_ACCESS_KEY"], "'")) ?>">
 					</div>
 				<?php } ?>
 			<?php } ?>
-			<p class="u-mb10"><?=_('Permissions');?></p>
+			<p class="u-mb10"><?= _("Permissions") ?></p>
 			<ul class="u-list-bulleted u-mb10">
-				<?php foreach ($key_data['PERMISSIONS'] as $api_name) { ?>
-					<li><?=_($api_name); ?></li>
+				<?php foreach ($key_data["PERMISSIONS"] as $api_name) { ?>
+					<li><?= _($api_name) ?></li>
 				<?php } ?>
 			</ul>
 			<div class="u-mb10">
-				<label for="service" class="form-label"><?=_('Comment');?></label>
-				<input type="text" class="form-control" id="service" maxlength="255" readonly value="<?= htmlentities(trim($key_data['COMMENT'], "'")) ?>">
+				<label for="service" class="form-label"><?= _("Comment") ?></label>
+				<input type="text" class="form-control" id="service" maxlength="255" readonly value="<?= htmlentities(trim($key_data["COMMENT"], "'")) ?>">
 			</div>
 		</div>
 

web/templates/pages/list_access_keys.php

@@ -2,26 +2,26 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/edit/user/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
-			<a href="/add/access-key/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus status-icon green"></i><?=_('Add Access Key');?></a>
+			<a class="button button-secondary" id="btn-back" href="/edit/user/"><i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?></a>
+			<a href="/add/access-key/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus status-icon green"></i><?= _("Add Access Key") ?></a>
 		</div>
 		<div class="toolbar-right">
 			<div class="toolbar-sorting">
-				<a href="#" class="toolbar-sorting-toggle" title="<?=_('Sort items');?>">
-					<?=_('sort by');?>: <b><?=_('Date');?> <i class="fas fa-arrow-down-a-z"></i></b>
+				<a href="#" class="toolbar-sorting-toggle" title="<?= _("Sort items") ?>">
+					<?= _("sort by") ?>: <b><?= _("Date") ?> <i class="fas fa-arrow-down-a-z"></i></b>
 				</a>
 				<ul class="toolbar-sorting-menu animate__animated animate__fadeIn u-hidden">
-					<li entity="sort-date" sort_as_int="1"><span class="name <?php if ($_SESSION['userSortOrder'] === 'date') { echo 'active'; } ?>"><?=_('Date');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-key"><span class="name"><?=_('Access Key');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-comment"><span class="name"><?=_('Comment');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-date" sort_as_int="1"><span class="name <?php if ($_SESSION['userSortOrder'] === 'date') { echo 'active'; } ?>"><?= _("Date") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-key"><span class="name"><?= _("Access Key") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-comment"><span class="name"><?= _("Comment") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
 				</ul>
 				<form x-bind="BulkEdit" action="/bulk/access-key/" method="post">
 					<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
 					<select class="form-select" name="action">
-						<option value=""><?=_('apply to selected');?></option>
-						<option value="delete"><?=_('delete');?></option>
+						<option value=""><?= _("apply to selected") ?></option>
+						<option value="delete"><?= _("delete") ?></option>
 					</select>
-					<button type="submit" class="toolbar-input-submit" title="<?=_('apply to selected');?>">
+					<button type="submit" class="toolbar-input-submit" title="<?= _("apply to selected") ?>">
 						<i class="fas fa-arrow-right"></i>
 					</button>
 				</form>
@@ -37,13 +37,13 @@
 		<div class="l-unit__col l-unit__col--right">
 			<div>
 				<div class="clearfix l-unit__stat-col--left super-compact">
-					<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" title="<?=_('Select all');?>">
+					<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 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 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>
 		</div>
 	</div>
@@ -66,10 +66,10 @@
 
 			<div class="l-unit__col l-unit__col--right">
 				<div class="clearfix l-unit__stat-col--left super-compact">
-					<input id="check<?=$i ?>" class="ch-toggle" type="checkbox" title="<?=_('Select');?>" name="key[]" value="<?=$key?>">
+					<input id="check<?=$i ?>" class="ch-toggle" type="checkbox" title="<?= _("Select") ?>" name="key[]" value="<?=$key?>">
 				</div>
 				<div class="clearfix l-unit__stat-col--left wide-6">
-					<b><a href="/list/access-key/?key=<?=htmlentities($key);?>&token=<?=$_SESSION['token']?>" title="<?=_('Access Key');?>: <?=$key;?>"><?=$key;?></a></b>
+					<b><a href="/list/access-key/?key=<?=htmlentities($key);?>&token=<?=$_SESSION['token']?>" title="<?= _("Access Key") ?>: <?=$key;?>"><?=$key;?></a></b>
 				</div>
 
 				<!-- START QUICK ACTION TOOLBAR AREA -->
@@ -77,11 +77,11 @@
 					<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">
-								<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?=_('delete');?>">
+								<a id="delete_link_<?= $i ?>" class="data-controls do_delete" title="<?= _("delete") ?>">
 									<i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
-									<input type="hidden" name="delete_url" value="/delete/access-key/?key=<?=$key?>&token=<?=$_SESSION['token']?>">
-									<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?=_('Confirmation');?>">
-										<p><?=sprintf(_('DELETE_ACCESS_KEY_CONFIRMATION'),$key)?></p>
+									<input type="hidden" name="delete_url" value="/delete/access-key/?key=<?= $key ?>&token=<?= $_SESSION["token"] ?>">
+									<div id="delete_dialog_<?= $i ?>" class="dialog js-confirm-dialog-delete" title="<?= _("Confirmation") ?>">
+										<p><?= sprintf(_("DELETE_ACCESS_KEY_CONFIRMATION"), $key) ?></p>
 									</div>
 								</a>
 							</div>
@@ -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 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>
 		</div>
 	<?php } ?>
@@ -101,7 +101,7 @@
 	<div class="container">
 		<div class="l-unit-ft">
 			<div class="l-unit__col l-unit__col--right">
-				<?php printf(ngettext('%d Access Key', '%d Access Keys', $i),$i); ?>
+				<?php printf(ngettext("%d Access Key", "%d Access Keys", $i), $i); ?>
 			</div>
 		</div>
 	</div>

web/templates/pages/list_backup.php

@@ -2,29 +2,29 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<?php if ($read_only !== 'true') {?>
-				<a href="/schedule/backup/?token=<?=$_SESSION['token']?>" class="button button-secondary"><i class="fas fa-circle-plus status-icon green"></i><?=_('Create Backup');?></a>
-				<a href="/list/backup/exclusions/" class="button button-secondary"><i class="fas fa-folder-minus status-icon orange"></i><?=_('backup exclusions');?></a>
+			<?php if ($read_only !== "true") { ?>
+				<a href="/schedule/backup/?token=<?= $_SESSION["token"] ?>" class="button button-secondary"><i class="fas fa-circle-plus status-icon green"></i><?= _("Create Backup") ?></a>
+				<a href="/list/backup/exclusions/" class="button button-secondary"><i class="fas fa-folder-minus status-icon orange"></i><?= _("backup exclusions") ?></a>
 			<?php } ?>
 		</div>
 		<div class="toolbar-right">
-			<?php if ($read_only !== 'true') {?>
+			<?php if ($read_only !== "true") { ?>
 				<form x-bind="BulkEdit" action="/bulk/backup/" method="post">
-					<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+					<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 					<select class="form-select" name="action">
-						<option value=""><?=_('apply to selected');?></option>
-						<option value="delete"><?=_('delete') ?></option>
+						<option value=""><?= _("apply to selected") ?></option>
+						<option value="delete"><?= _("delete") ?></option>
 					</select>
-					<button type="submit" class="toolbar-input-submit" title="<?=_('apply to selected');?>">
+					<button type="submit" class="toolbar-input-submit" title="<?= _("apply to selected") ?>">
 						<i class="fas fa-arrow-right"></i>
 					</button>
 				</form>
 			<?php } ?>
 			<div class="toolbar-search">
 				<form action="/search/" method="get">
-					<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
-					<input type="search" class="form-control js-search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" title="<?=_('Search');?>">
-					<button type="submit" class="toolbar-input-submit" title="<?=_('Search');?>">
+					<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
+					<input type="search" class="form-control js-search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" title="<?= _("Search") ?>">
+					<button type="submit" class="toolbar-input-submit" title="<?= _("Search") ?>">
 						<i class="fas fa-magnifying-glass"></i>
 					</button>
 				</form>
@@ -39,14 +39,14 @@
 		<div class="l-unit__col l-unit__col--right">
 			<div>
 				<div class="clearfix l-unit__stat-col--left super-compact">
-					<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" title="<?=_('Select all');?>" <?=$display_mode;?>>
+					<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 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 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>
 		</div>
 	</div>
@@ -73,14 +73,14 @@
 			<div class="l-unit__col l-unit__col--right">
 				<div>
 					<div class="clearfix l-unit__stat-col--left super-compact">
-						<input id="check<?=$i ?>" class="ch-toggle" type="checkbox" title="<?=_('Select');?>" name="backup[]" value="<?=$key?>" <?=$display_mode;?>>
+						<input id="check<?=$i ?>" class="ch-toggle" type="checkbox" title="<?= _("Select") ?>" name="backup[]" value="<?=$key?>" <?=$display_mode;?>>
 					</div>
 					<div class="clearfix l-unit__stat-col--left wide-4 truncate">
 						<b>
 							<?php if ($read_only === 'true') {?>
 								<?=$key?>
 							<?php } else { ?>
-								<a href="/list/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('restore');?>"><?=$key?></a>
+								<a href="/list/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("restore") ?>"><?=$key?></a>
 							<?php } ?>
 						</b>
 					</div>
@@ -92,14 +92,14 @@
 									<!-- Restrict ability to restore or delete backups when impersonating 'admin' account -->
 									&nbsp;
 								<?php } else { ?>
-									<div class="actions-panel__col actions-panel__download shortcut-d" key-action="href"><a href="/download/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('download');?>"><i class="fas fa-file-arrow-down status-icon lightblue status-icon dim"></i></a></div>
+									<div class="actions-panel__col actions-panel__download shortcut-d" key-action="href"><a href="/download/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("download") ?>"><i class="fas fa-file-arrow-down status-icon lightblue status-icon dim"></i></a></div>
 									<?php if ($read_only !== 'true') {?>
-										<div class="actions-panel__col actions-panel__list shortcut-enter" key-action="href"><a href="/list/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('restore');?>"><i class="fas fa-arrow-rotate-left status-icon green status-icon dim"></i></a></div>
+										<div class="actions-panel__col actions-panel__list shortcut-enter" key-action="href"><a href="/list/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("restore") ?>"><i class="fas fa-arrow-rotate-left status-icon green status-icon dim"></i></a></div>
 										<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-											<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?=_('delete');?>">
+											<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?= _("delete") ?>">
 												<i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
 												<input type="hidden" name="delete_url" value="/delete/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>">
-												<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?=_('Confirmation');?>">
+												<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?= _("Confirmation") ?>">
 													<p><?=sprintf(_('DELETE_BACKUP_CONFIRMATION'),$key)?></p>
 												</div>
 											</a>
@@ -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 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>
 			</div>
 		</div>
@@ -124,7 +124,7 @@
 	<div class="container">
 		<div class="l-unit-ft">
 			<div class="l-unit__col l-unit__col--right">
-				<?php printf(ngettext('%d backup', '%d backups', $i),$i); ?>
+				<?php printf(ngettext("%d backup", "%d backups", $i), $i); ?>
 			</div>
 		</div>
 	</div>

web/templates/pages/list_backup_detail.php

@@ -2,16 +2,16 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/list/backup/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
-			<a href="/schedule/restore/?token=<?=$_SESSION['token']?>&backup=<?=htmlentities($_GET['backup'])?>" class="button button-secondary"><i class="fas fa-arrow-rotate-left status-icon green"></i><?=_('Restore All');?></a>
+			<a class="button button-secondary" id="btn-back" href="/list/backup/"><i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?></a>
+			<a href="/schedule/restore/?token=<?= $_SESSION["token"] ?>&backup=<?= htmlentities($_GET["backup"]) ?>" class="button button-secondary"><i class="fas fa-arrow-rotate-left status-icon green"></i><?= _("Restore All") ?></a>
 		</div>
 		<div class="toolbar-right">
 			<form x-bind="BulkEdit" action="/bulk/restore/" method="post">
-				<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
-				<input type="hidden" name="backup" value="<?=htmlentities($_GET['backup']); ?>">
+				<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
+				<input type="hidden" name="backup" value="<?= htmlentities($_GET["backup"]) ?>">
 				<select class="form-select" name="action">
-					<option value=""><?=_('apply to selected');?></option>
-					<option value="restore"><?=_('restore') ?></option>
+					<option value=""><?= _("apply to selected") ?></option>
+					<option value="restore"><?= _("restore") ?></option>
 				</select>
 				<button type="submit" class="toolbar-input-submit">
 					<i class="fas fa-arrow-right"></i>
@@ -19,7 +19,7 @@
 			</form>
 			<div class="toolbar-search">
 				<form action="/search/" method="get">
-					<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+					<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 					<input type="search" class="form-control js-search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>">
 					<button type="submit" class="toolbar-input-submit" value=""><i class="fas fa-magnifying-glass"></i></button>
 				</form>
@@ -36,9 +36,9 @@
 				<div class="clearfix l-unit__stat-col--left super-compact">
 					<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all">
 				</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 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>
 		</div>
 	</div>
@@ -57,7 +57,7 @@
 					<input id="check<?=$i?>" class="ch-toggle" type="checkbox" name="web[]" value="<?=$key?>">
 				</div>
 				<div class="clearfix l-unit__stat-col--left compact-4">
-					<div class="l-unit__stat-col l-unit__stat-col--left"><?=_('Web domain');?></div>
+					<div class="l-unit__stat-col l-unit__stat-col--left"><?= _("Web domain") ?></div>
 				</div>
 				<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>
@@ -66,7 +66,7 @@
 					<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">
-								<a href="/schedule/restore/?backup=<?=$backup?>&type=web&object=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Restore');?>">
+								<a href="/schedule/restore/?backup=<?=$backup?>&type=web&object=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Restore") ?>">
 									<i class="fas fa-arrow-rotate-left status-icon green status-icon dim icon-pad-right"></i>
 								</a>
 							</div>
@@ -89,7 +89,7 @@
 					<input id="check2<?=$i?>" class="ch-toggle" type="checkbox" name="mail[]" value="<?=$key?>">
 				</div>
 				<div class="clearfix l-unit__stat-col--left compact-4">
-					<div class="l-unit__stat-col l-unit__stat-col--left"><?=_('Mail domain');?></div>
+					<div class="l-unit__stat-col l-unit__stat-col--left"><?= _("Mail domain") ?></div>
 				</div>
 				<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>
@@ -98,7 +98,7 @@
 					<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">
-								<a href="/schedule/restore/?backup=<?=$backup?>&type=mail&object=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Restore');?>">
+								<a href="/schedule/restore/?backup=<?=$backup?>&type=mail&object=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Restore") ?>">
 									<i class="fas fa-arrow-rotate-left status-icon green status-icon dim"></i>
 								</a>
 							</div>
@@ -121,7 +121,7 @@
 					<input id="check3<?=$i?>" class="ch-toggle" type="checkbox" name="dns[]" value="<?=$key?>">
 				</div>
 				<div class="clearfix l-unit__stat-col--left compact-4">
-					<div class="l-unit__stat-col l-unit__stat-col--left"><?=_('DNS domain');?></div>
+					<div class="l-unit__stat-col l-unit__stat-col--left"><?= _("DNS domain") ?></div>
 				</div>
 				<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>
@@ -130,7 +130,7 @@
 					<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">
-								<a href="/schedule/restore/?backup=<?=$backup?>&type=dns&object=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Restore');?>">
+								<a href="/schedule/restore/?backup=<?=$backup?>&type=dns&object=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Restore") ?>">
 									<i class="fas fa-arrow-rotate-left status-icon green status-icon dim"></i>
 								</a>
 							</div>
@@ -153,7 +153,7 @@
 					<input id="check4<?=$i?>" class="ch-toggle" type="checkbox" name="db[]" value="<?=$key?>">
 				</div>
 				<div class="clearfix l-unit__stat-col--left compact-4">
-					<div class="l-unit__stat-col l-unit__stat-col--left"><?=_('Database');?></div>
+					<div class="l-unit__stat-col l-unit__stat-col--left"><?= _("Database") ?></div>
 				</div>
 				<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>
@@ -162,7 +162,7 @@
 					<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">
-								<a href="/schedule/restore/?backup=<?=$backup?>&type=db&object=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Restore');?>">
+								<a href="/schedule/restore/?backup=<?=$backup?>&type=db&object=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Restore") ?>">
 									<i class="fas fa-arrow-rotate-left status-icon green status-icon dim"></i>
 								</a>
 							</div>
@@ -174,26 +174,24 @@
 	<?php }} ?>
 
 	<!-- List Cron Jobs -->
-	<?php
-		if (!empty($data[$backup]['CRON'])) {
-			if (!empty($key)) {
-		?>
+	<?php if (!empty($data[$backup]["CRON"])) {
+ 	if (!empty($key)) { ?>
 		<div class="l-unit">
 			<div class="l-unit__col l-unit__col--right">
 				<div class="clearfix l-unit__stat-col--left super-compact">
-					<input id="check5<?=$i?>" class="ch-toggle" type="checkbox" name="check" value="<?=$key?>">
+					<input id="check5<?= $i ?>" class="ch-toggle" type="checkbox" name="check" value="<?= $key ?>">
 				</div>
 				<div class="clearfix l-unit__stat-col--left compact-4">
-					<div class="l-unit__stat-col l-unit__stat-col--left"><?=_('Cron Records');?></div>
+					<div class="l-unit__stat-col l-unit__stat-col--left"><?= _("Cron Records") ?></div>
 				</div>
 				<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 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="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">
-								<a href="/schedule/restore/?backup=<?=$backup?>&type=cron&object=records&token=<?=$_SESSION['token']?>" title="<?=_('Restore');?>">
+								<a href="/schedule/restore/?backup=<?= $backup ?>&type=cron&object=records&token=<?= $_SESSION["token"] ?>" title="<?= _("Restore") ?>">
 									<i class="fas fa-arrow-rotate-left status-icon green status-icon dim"></i>
 								</a>
 							</div>
@@ -216,7 +214,7 @@
 					<input id="check6<?=$i?>" class="ch-toggle" type="checkbox" name="udir[]" value="<?=$key?>">
 				</div>
 				<div class="clearfix l-unit__stat-col--left compact-4">
-					<div class="l-unit__stat-col l-unit__stat-col--left"><?=_('user dir');?></div>
+					<div class="l-unit__stat-col l-unit__stat-col--left"><?= _("user dir") ?></div>
 				</div>
 				<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>
@@ -225,7 +223,7 @@
 					<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">
-								<a href="/schedule/restore/?backup=<?=$backup?>&type=udir&object=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Restore');?>">
+								<a href="/schedule/restore/?backup=<?=$backup?>&type=udir&object=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Restore") ?>">
 									<i class="fas fa-arrow-rotate-left status-icon green status-icon dim"></i>
 								</a>
 							</div>

web/templates/pages/list_backup_exclusions.php

@@ -2,15 +2,15 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/list/backup/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
-			<a href="/edit/backup/exclusions/" class="button button-secondary"><i class="fas fa-pencil status-icon orange"></i><?=_('Editing Backup Exclusions');?></a>
+			<a class="button button-secondary" id="btn-back" href="/list/backup/"><i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?></a>
+			<a href="/edit/backup/exclusions/" class="button button-secondary"><i class="fas fa-pencil status-icon orange"></i><?= _("Editing Backup Exclusions") ?></a>
 		</div>
 		<div class="toolbar-right">
 			<div class="toolbar-search">
 				<form action="/search/" method="get">
-					<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
-					<input type="search" class="form-control js-search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" title="<?=_('Search');?>">
-					<button type="submit" class="toolbar-input-submit" title="<?=_('Search');?>">
+					<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
+					<input type="search" class="form-control js-search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" title="<?= _("Search") ?>">
+					<button type="submit" class="toolbar-input-submit" title="<?= _("Search") ?>">
 						<i class="fas fa-magnifying-glass"></i>
 					</button>
 				</form>
@@ -24,21 +24,19 @@
 	<div class="header table-header">
 		<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 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 wide-3"><b><?=_('Value');?></b></div>
+			<div class="clearfix l-unit__stat-col--left wide-3"><b><?= _("Value") ?></b></div>
 		</div>
 	</div>
 
 	<div class="container units animate__animated animate__fadeIn">
 		<!-- Begin list of backup exclusions by type -->
-		<?php
-			foreach ($data as $key => $value) {
-			?>
+		<?php foreach ($data as $key => $value) { ?>
 			<div class="l-unit header">
 				<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 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 wide-3">
 						<?php

web/templates/pages/list_cron.php

@@ -3,39 +3,39 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<?php if ($read_only !== 'true') {?>
-				<a href="/add/cron/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus status-icon green"></i><?=_('Add Cron Job');?></a>
+				<a href="/add/cron/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus status-icon green"></i><?= _("Add Cron Job") ?></a>
 				<?php if($panel[$user_plain]['CRON_REPORTS'] == 'yes') { ?>
-					<a class="button button-secondary" href="/delete/cron/reports/?token=<?=$_SESSION['token'];?>"><i class="fas fa-toggle-off status-icon green"></i><?=_('turn off notifications');?></a>
+					<a class="button button-secondary" href="/delete/cron/reports/?token=<?=$_SESSION['token'];?>"><i class="fas fa-toggle-off status-icon green"></i><?= _("turn off notifications") ?></a>
 				<?php } else { ?>
-					<a class="button button-secondary" href="/add/cron/reports/?token=<?=$_SESSION['token'];?>"><i class="fas fa-toggle-off status-icon grey"></i><?=_('turn on notifications');?></a>
+					<a class="button button-secondary" href="/add/cron/reports/?token=<?=$_SESSION['token'];?>"><i class="fas fa-toggle-off status-icon grey"></i><?= _("turn on notifications") ?></a>
 				<?php } ?>
 			<?php } ?>
 		</div>
 		<div class="toolbar-right">
 			<div class="toolbar-sorting">
-				<a href="#" class="toolbar-sorting-toggle" title="<?=_('Sort items');?>">
-					<?=_('sort by');?>:
+				<a href="#" class="toolbar-sorting-toggle" title="<?= _("Sort items") ?>">
+					<?= _("sort by") ?>:
 					<b>
 						<?php if ($_SESSION['userSortOrder'] === 'name') { $label = _('Name'); } else { $label = _('Date'); } ?>
 						<?=$label;?> <i class="fas fa-arrow-down-a-z"></i>
 					</b>
 				</a>
 				<ul class="toolbar-sorting-menu animate__animated animate__fadeIn u-hidden">
-					<li entity="sort-name"><span class="name <?php if ($_SESSION['userSortOrder'] === 'name') { echo 'active'; } ?>"><?=_('Command');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-date" sort_as_int="1"><span class="name <?php if ($_SESSION['userSortOrder'] === 'date') { echo 'active'; } ?>"><?=_('Date');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-name"><span class="name <?php if ($_SESSION['userSortOrder'] === 'name') { echo 'active'; } ?>"><?= _("Command") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-date" sort_as_int="1"><span class="name <?php if ($_SESSION['userSortOrder'] === 'date') { echo 'active'; } ?>"><?= _("Date") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
 				</ul>
 				<?php if ($read_only !== 'true') {?>
 					<form x-bind="BulkEdit" action="/bulk/cron/" method="post">
 						<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
 						<select class="form-select" name="action">
-							<option value=""><?=_('apply to selected');?></option>
+							<option value=""><?= _("apply to selected") ?></option>
 							<?php if($panel[$user_plain]['CRON_REPORTS'] == 'yes') echo '<option value="delete-cron-reports">'._('turn off notifications').'</option>'; ?>
 							<?php if($panel[$user_plain]['CRON_REPORTS'] == 'no') echo '<option value="add-cron-reports">'._('turn on notifications').'</option>'; ?>
-							<option value="suspend"><?=_('suspend');?></option>
-							<option value="unsuspend"><?=_('unsuspend');?></option>
-							<option value="delete"><?=_('delete');?></option>
+							<option value="suspend"><?= _("suspend") ?></option>
+							<option value="unsuspend"><?= _("unsuspend") ?></option>
+							<option value="delete"><?= _("delete") ?></option>
 						</select>
-						<button type="submit" class="toolbar-input-submit" title="<?=_('apply to selected');?>">
+						<button type="submit" class="toolbar-input-submit" title="<?= _("apply to selected") ?>">
 							<i class="fas fa-arrow-right"></i>
 						</button>
 					</form>
@@ -43,9 +43,9 @@
 			</div>
 			<div class="toolbar-search">
 				<form action="/search/" method="get">
-					<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
-					<input type="search" class="form-control js-search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" title="<?=_('Search');?>">
-					<button type="submit" class="toolbar-input-submit" title="<?=_('Search');?>">
+					<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
+					<input type="search" class="form-control js-search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" title="<?= _("Search") ?>">
+					<button type="submit" class="toolbar-input-submit" title="<?= _("Search") ?>">
 						<i class="fas fa-magnifying-glass"></i>
 					</button>
 				</form>
@@ -59,15 +59,15 @@
 	<div class="header table-header">
 		<div class="l-unit__col l-unit__col--right">
 			<div class="clearfix l-unit__stat-col--left super-compact">
-				<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" title="<?=_('Select all');?>" <?=$display_mode;?>>
+				<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 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-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>
 	</div>
 
@@ -91,13 +91,13 @@
 			sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?>">
 			<div class="l-unit__col l-unit__col--right">
 				<div class="clearfix l-unit__stat-col--left super-compact">
-					<input id="check<?=$i ?>" class="ch-toggle" type="checkbox" title="<?=_('Select');?>" name="job[]" value="<?=$key?>" <?=$display_mode;?>>
+					<input id="check<?=$i ?>" class="ch-toggle" type="checkbox" title="<?= _("Select") ?>" name="job[]" value="<?=$key?>" <?=$display_mode;?>>
 				</div>
 				<div class="clearfix l-unit__stat-col--left wide-5 truncate">
 					<?php if (($read_only === 'true') || ($data[$key]['SUSPENDED'] == 'yes')) {?>
 						<b><?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?></b>
 					<?php } else { ?>
-						<b><a href="/edit/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Cron Job');?>: <?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?>"><?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?></a></b>
+						<b><a href="/edit/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" title="<?= _("Editing Cron Job") ?>: <?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?>"><?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?></a></b>
 					<?php } ?>
 				</div>
 				<!-- START QUICK ACTION TOOLBAR AREA -->
@@ -109,22 +109,22 @@
 								&nbsp;
 							<?php } else { ?>
 								<?php if ($data[$key]['SUSPENDED'] == 'no') {?>
-									<div class="actions-panel__col actions-panel__download shortcut-enter" key-action="href"><a href="/edit/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Cron Job');?>"><i class="fas fa-pencil status-icon orange status-icon dim"></i></a></div>
+									<div class="actions-panel__col actions-panel__download shortcut-enter" key-action="href"><a href="/edit/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" title="<?= _("Editing Cron Job") ?>"><i class="fas fa-pencil status-icon orange status-icon dim"></i></a></div>
 								<?php } ?>
 								<div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
 									<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>" title="<?=_($spnd_action)?>">
 										<i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
 										<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>">
-										<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="dialog js-confirm-dialog-suspend" title="<?=_('Confirmation');?>">
+										<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="dialog js-confirm-dialog-suspend" title="<?= _("Confirmation") ?>">
 											<p><?=sprintf($spnd_confirmation,$key)?></p>
 										</div>
 									</a>
 								</div>
 								<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-									<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?=_('delete');?>">
+									<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?= _("delete") ?>">
 										<i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
 										<input type="hidden" name="delete_url" value="/delete/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>">
-										<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?=_('Confirmation');?>">
+										<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?= _("Confirmation") ?>">
 											<p><?=sprintf(_('DELETE_CRON_CONFIRMATION'),$key)?></p>
 										</div>
 									</a>
@@ -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 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>
 		</div>
 	<?php } ?>
@@ -148,7 +148,7 @@
 	<div class="container">
 		<div class="l-unit-ft">
 			<div class="l-unit__col l-unit__col--right">
-				<?php printf(ngettext('%d cron job', '%d cron jobs', $i),$i); ?>
+				<?php printf(ngettext("%d cron job", "%d cron jobs", $i), $i); ?>
 			</div>
 		</div>
 	</div>

web/templates/pages/list_db.php

@@ -1,35 +1,35 @@
 <?php
-	list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
-	$db_myadmin_link = "//".$http_host."/phpmyadmin/";
-	$db_pgadmin_link = "//".$http_host."/phppgadmin/";
+[$http_host, $port] = explode(":", $_SERVER["HTTP_HOST"] . ":");
+$db_myadmin_link = "//" . $http_host . "/phpmyadmin/";
+$db_pgadmin_link = "//" . $http_host . "/phppgadmin/";
 
-	if (!empty($_SESSION['DB_PMA_ALIAS'])) {
-		$db_myadmin_link = "//".$http_host."/".$_SESSION['DB_PMA_ALIAS']."/";
-	}
-	if (!empty($_SESSION['DB_PGA_ALIAS'])) {
-		$db_pgadmin_link = "//".$http_host."/".$_SESSION['DB_PGA_ALIAS']."/";
-	}
+if (!empty($_SESSION["DB_PMA_ALIAS"])) {
+	$db_myadmin_link = "//" . $http_host . "/" . $_SESSION["DB_PMA_ALIAS"] . "/";
+}
+if (!empty($_SESSION["DB_PGA_ALIAS"])) {
+	$db_pgadmin_link = "//" . $http_host . "/" . $_SESSION["DB_PGA_ALIAS"] . "/";
+}
 ?>
 
 <!-- Begin toolbar -->
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<?php if ($read_only !== 'true') {?>
+			<?php if ($read_only !== "true") { ?>
 				<a href="/add/db/" class="button button-secondary" id="btn-create">
-					<i class="fas fa-circle-plus status-icon green"></i><?=_('Add Database');?>
+					<i class="fas fa-circle-plus status-icon green"></i><?= _("Add Database") ?>
 				</a>
-				<?php if (($_SESSION['DB_SYSTEM'] === 'mysql') || ($_SESSION['DB_SYSTEM'] === 'mysql,pgsql') || ($_SESSION['DB_SYSTEM'] === 'pgsql,mysql')) {?>
-					<a class="button button-secondary <?=(ipUsed() ? 'button-suspended':'');?>" href="<?=$db_myadmin_link; ?>" target="_blank">
+				<?php if ($_SESSION["DB_SYSTEM"] === "mysql" || $_SESSION["DB_SYSTEM"] === "mysql,pgsql" || $_SESSION["DB_SYSTEM"] === "pgsql,mysql") { ?>
+					<a class="button button-secondary <?= ipUsed() ? "button-suspended" : "" ?>" href="<?= $db_myadmin_link ?>" target="_blank">
 						<i class="fas fa-database status-icon orange"></i>phpMyAdmin
 					</a>
 				<?php } ?>
-				<?php if (($_SESSION['DB_SYSTEM'] === 'pgsql') || ($_SESSION['DB_SYSTEM'] === 'mysql,pgsql') || ($_SESSION['DB_SYSTEM'] === 'pgsql,mysql')) {?>
-					<a class="button button-secondary <?=(ipUsed() ? 'button-suspended':'');?>" href="<?=$db_pgadmin_link; ?>" target="_blank">
+				<?php if ($_SESSION["DB_SYSTEM"] === "pgsql" || $_SESSION["DB_SYSTEM"] === "mysql,pgsql" || $_SESSION["DB_SYSTEM"] === "pgsql,mysql") { ?>
+					<a class="button button-secondary <?= ipUsed() ? "button-suspended" : "" ?>" href="<?= $db_pgadmin_link ?>" target="_blank">
 						<i class="fas fa-database status-icon orange"></i>phpPgAdmin
 					</a>
 				<?php } ?>
-				<?php if (ipUsed()) {?>
+				<?php if (ipUsed()) { ?>
 					<a target="_blank" href="https://docs.hestiacp.com/admin_docs/database.html#why-i-can-t-use-http-ip-phpmyadmin">
 						<i class="fas fa-circle-question"></i>
 					</a>
@@ -38,34 +38,34 @@
 		</div>
 		<div class="toolbar-right">
 			<div class="toolbar-sorting">
-				<a href="#" class="toolbar-sorting-toggle" title="<?=_('Sort items');?>">
-					<?=_('sort by');?>:
+				<a href="#" class="toolbar-sorting-toggle" title="<?= _("Sort items") ?>">
+					<?= _("sort by") ?>:
 					<b>
 						<?php if ($_SESSION['userSortOrder'] === 'name') { $label = _('Name'); } else { $label = _('Date'); } ?>
 						<?=$label;?> <i class="fas fa-arrow-down-a-z"></i>
 					</b>
 				</a>
 				<ul class="toolbar-sorting-menu animate__animated animate__fadeIn u-hidden">
-					<li entity="sort-charset"><span class="name"><?=_('Charset');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-date" sort_as_int="1"><span class="name <?php if ($_SESSION['userSortOrder'] === 'date') { echo 'active'; } ?>"><?=_('Date');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-disk" sort_as_int="1"><span class="name"><?=_('Disk');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-name"><span class="name <?php if ($_SESSION['userSortOrder'] === 'name') { echo 'active'; } ?>"><?=_('Name');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-server"><span class="name"><?=_('Host');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-user"><span class="name"><?=_('Username');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-charset"><span class="name"><?= _("Charset") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-date" sort_as_int="1"><span class="name <?php if ($_SESSION['userSortOrder'] === 'date') { echo 'active'; } ?>"><?= _("Date") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-disk" sort_as_int="1"><span class="name"><?= _("Disk") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-name"><span class="name <?php if ($_SESSION['userSortOrder'] === 'name') { echo 'active'; } ?>"><?= _("Name") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-server"><span class="name"><?= _("Host") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-user"><span class="name"><?= _("Username") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
 				</ul>
 				<?php if ($read_only !== 'true') {?>
 					<form x-bind="BulkEdit" action="/bulk/db/" method="post">
 						<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
 						<select class="form-select" name="action">
-							<option value=""><?=_('apply to selected');?></option>
+							<option value=""><?= _("apply to selected") ?></option>
 							<?php if ($_SESSION['userContext'] === 'admin') {?>
-								<option value="rebuild"><?=_('rebuild');?></option>
-								<option value="suspend"><?=_('suspend');?></option>
-								<option value="unsuspend"><?=_('unsuspend');?></option>
+								<option value="rebuild"><?= _("rebuild") ?></option>
+								<option value="suspend"><?= _("suspend") ?></option>
+								<option value="unsuspend"><?= _("unsuspend") ?></option>
 							<?php } ?>
-							<option value="delete"><?=_('delete');?></option>
+							<option value="delete"><?= _("delete") ?></option>
 						</select>
-						<button type="submit" class="toolbar-input-submit" title="<?=_('apply to selected');?>">
+						<button type="submit" class="toolbar-input-submit" title="<?= _("apply to selected") ?>">
 							<i class="fas fa-arrow-right"></i>
 						</button>
 					</form>
@@ -73,9 +73,9 @@
 			</div>
 			<div class="toolbar-search">
 				<form action="/search/" method="get">
-					<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
-					<input type="search" class="form-control js-search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" title="<?=_('Search');?>">
-					<button type="submit" class="toolbar-input-submit" title="<?=_('Search');?>">
+					<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
+					<input type="search" class="form-control js-search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" title="<?= _("Search") ?>">
+					<button type="submit" class="toolbar-input-submit" title="<?= _("Search") ?>">
 						<i class="fas fa-magnifying-glass"></i>
 					</button>
 				</form>
@@ -89,15 +89,15 @@
 	<div class="header table-header">
 		<div class="l-unit__col l-unit__col--right">
 			<div class="clearfix l-unit__stat-col--left super-compact">
-				<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" title="<?=_('Select all');?>" <?=$display_mode;?>>
+				<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 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 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>
 	</div>
 
@@ -131,13 +131,13 @@
 			<div class="l-unit__col l-unit__col--right">
 				<div>
 					<div class="clearfix l-unit__stat-col--left super-compact">
-						<input id="check<?=$i ?>" class="ch-toggle" type="checkbox" title="<?=_('Select');?>" name="database[]" value="<?=$key?>" <?=$display_mode;?>>
+						<input id="check<?=$i ?>" class="ch-toggle" type="checkbox" title="<?= _("Select") ?>" name="database[]" value="<?=$key?>" <?=$display_mode;?>>
 					</div>
 					<div class="clearfix l-unit__stat-col--left wide-3 truncate">
 						<?php if (($read_only === 'true') || ($data[$key]['SUSPENDED'] == 'yes')) {?>
 							<b><?=$key?></b>
 						<?php } else { ?>
-							<b><a href="/edit/db/?database=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Database');?>: <?=$key?>"><?=$key?></a></b>
+							<b><a href="/edit/db/?database=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Editing Database") ?>: <?=$key?>"><?=$key?></a></b>
 						<?php } ?>
 					</div>
 					<!-- START QUICK ACTION TOOLBAR AREA -->
@@ -149,25 +149,25 @@
 									&nbsp;
 								<?php } else { ?>
 									<?php if ($data[$key]['SUSPENDED'] == 'no') {?>
-										<div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/db/?database=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Database');?>"><i class="fas fa-pencil status-icon orange status-icon dim"></i></a></div>
+										<div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/db/?database=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Editing Database") ?>"><i class="fas fa-pencil status-icon orange status-icon dim"></i></a></div>
 									<?php } ?>
 									<?php if ($data[$key]['TYPE'] == 'mysql' && isset($_SESSION['PHPMYADMIN_KEY']) && $_SESSION['PHPMYADMIN_KEY'] != '' && !ipUsed()) { $time = time(); ?>
-										<div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a target="_blank" href="<?=$db_myadmin_link;?>/hestia-sso.php?database=<?=$key;?>&user=<?=$user_plain;?>&exp=<?=$time;?>&hestia_token=<?=password_hash($key.$user_plain.$_SESSION['user_combined_ip'].$time.$_SESSION['PHPMYADMIN_KEY'], PASSWORD_DEFAULT)?>" title="<?=_('phpMyAdmin');?>"><i class="fas fa-right-to-bracket status-icon orange status-icon dim"></i></a></div>
+										<div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a target="_blank" href="<?=$db_myadmin_link;?>/hestia-sso.php?database=<?=$key;?>&user=<?=$user_plain;?>&exp=<?=$time;?>&hestia_token=<?=password_hash($key.$user_plain.$_SESSION['user_combined_ip'].$time.$_SESSION['PHPMYADMIN_KEY'], PASSWORD_DEFAULT)?>" title="<?= _("phpMyAdmin") ?>"><i class="fas fa-right-to-bracket status-icon orange status-icon dim"></i></a></div>
 									<?php } ?>
 									<div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
 										<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>" title="<?=_($spnd_action)?>">
 											<i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
 											<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/db/?database=<?=$key?>&token=<?=$_SESSION['token']?>">
-											<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="dialog js-confirm-dialog-suspend" title="<?=_('Confirmation');?>">
+											<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="dialog js-confirm-dialog-suspend" title="<?= _("Confirmation") ?>">
 												<p><?=sprintf($spnd_confirmation,$key)?></p>
 											</div>
 										</a>
 									</div>
 									<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-										<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?=_('delete');?>">
+										<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?= _("delete") ?>">
 											<i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
 											<input type="hidden" name="delete_url" value="/delete/db/?database=<?=$key?>&token=<?=$_SESSION['token']?>">
-											<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?=_('Confirmation');?>">
+											<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?= _("Confirmation") ?>">
 												<p><?=sprintf(_('DELETE_DATABASE_CONFIRMATION'),$key)?></p>
 											</div>
 										</a>
@@ -177,11 +177,11 @@
 						</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 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>
 			</div>
 		</div>
@@ -192,7 +192,7 @@
 	<div class="container">
 		<div class="l-unit-ft">
 			<div class="l-unit__col l-unit__col--right">
-				<?php printf(ngettext('%d SQL database', '%d SQL databases', $i),$i); ?>
+				<?php printf(ngettext("%d SQL database", "%d SQL databases", $i), $i); ?>
 			</div>
 		</div>
 	</div>

web/templates/pages/list_dns.php

@@ -3,38 +3,38 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<?php if ($read_only !== 'true') {?>
-				<a href="/add/dns/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus status-icon green"></i><?=_('Add DNS Domain');?></a>
+				<a href="/add/dns/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus status-icon green"></i><?= _("Add DNS Domain") ?></a>
 			<?php } ?>
 		</div>
 		<div class="toolbar-right">
 			<div class="toolbar-sorting">
-				<a href="#" class="toolbar-sorting-toggle" title="<?=_('Sort items');?>">
-					<?=_('sort by');?>:
+				<a href="#" class="toolbar-sorting-toggle" title="<?= _("Sort items") ?>">
+					<?= _("sort by") ?>:
 					<b>
 						<?php if ($_SESSION['userSortOrder'] === 'name') { $label = _('Name'); } else { $label = _('Date'); } ?>
 						<?=$label;?> <i class="fas fa-arrow-down-a-z"></i>
 					</b>
 				</a>
 				<ul class="toolbar-sorting-menu animate__animated animate__fadeIn u-hidden">
-					<li entity="sort-date" sort_as_int="1"><span class="name <?php if ($_SESSION['userSortOrder'] === 'date') { echo 'active'; } ?>"><?=_('Date');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-expire" sort_as_int="1"><span class="name"><?=_('Expire');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-ip"><span class="name"><?=_('IP address');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-name"><span class="name <?php if ($_SESSION['userSortOrder'] === 'name') { echo 'active'; } ?>"><?=_('Name');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-records"><span class="name"><?=_('Records');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-date" sort_as_int="1"><span class="name <?php if ($_SESSION['userSortOrder'] === 'date') { echo 'active'; } ?>"><?= _("Date") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-expire" sort_as_int="1"><span class="name"><?= _("Expire") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-ip"><span class="name"><?= _("IP address") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-name"><span class="name <?php if ($_SESSION['userSortOrder'] === 'name') { echo 'active'; } ?>"><?= _("Name") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-records"><span class="name"><?= _("Records") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
 				</ul>
 				<?php if ($read_only !== 'true') {?>
 					<form x-bind="BulkEdit" action="/bulk/dns/" method="post">
 						<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
 						<select class="form-select" name="action">
-							<option value=""><?=_('apply to selected');?></option>
+							<option value=""><?= _("apply to selected") ?></option>
 							<?php if ($_SESSION['userContext'] === 'admin') {?>
-								<option value="rebuild"><?=_('rebuild');?></option>
+								<option value="rebuild"><?= _("rebuild") ?></option>
 							<?php } ?>
-							<option value="suspend"><?=_('suspend');?></option>
-							<option value="unsuspend"><?=_('unsuspend');?></option>
-							<option value="delete"><?=_('delete');?></option>
+							<option value="suspend"><?= _("suspend") ?></option>
+							<option value="unsuspend"><?= _("unsuspend") ?></option>
+							<option value="delete"><?= _("delete") ?></option>
 						</select>
-						<button type="submit" class="toolbar-input-submit" title="<?=_('apply to selected');?>">
+						<button type="submit" class="toolbar-input-submit" title="<?= _("apply to selected") ?>">
 							<i class="fas fa-arrow-right"></i>
 						</button>
 					</form>
@@ -42,9 +42,9 @@
 			</div>
 			<div class="toolbar-search">
 				<form action="/search/" method="get">
-					<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
-					<input type="search" class="form-control js-search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" title="<?=_('Search');?>">
-					<button type="submit" class="toolbar-input-submit" title="<?=_('Search');?>">
+					<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
+					<input type="search" class="form-control js-search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" title="<?= _("Search") ?>">
+					<button type="submit" class="toolbar-input-submit" title="<?= _("Search") ?>">
 						<i class="fas fa-magnifying-glass"></i>
 					</button>
 				</form>
@@ -58,16 +58,16 @@
 	<div class="header table-header">
 		<div class="l-unit__col l-unit__col--right">
 			<div class="clearfix l-unit__stat-col--left super-compact">
-				<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" title="<?=_('Select all');?>" <?=$display_mode;?>>
+				<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 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 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>
 	</div>
 
@@ -97,10 +97,10 @@
 			sort-expire="<?=strtotime($data[$key]['EXP'])?>" sort-records="<?=(int)$data[$key]['RECORDS']?>">
 			<div class="l-unit__col l-unit__col--right">
 				<div class="clearfix l-unit__stat-col--left super-compact">
-					<input id="check<?=$i ?>" class="ch-toggle" type="checkbox" title="<?=_('Select');?>" name="domain[]" value="<?=$key?>" <?=$display_mode;?>>
+					<input id="check<?=$i ?>" class="ch-toggle" type="checkbox" title="<?= _("Select") ?>" name="domain[]" value="<?=$key?>" <?=$display_mode;?>>
 				</div>
 				<div class="clearfix l-unit__stat-col--left wide-3 truncate">
-					<b><a href="/list/dns/?domain=<?=htmlentities($key);?>&token=<?=$_SESSION['token']?>" title="<?=_('DNS records');?>: <?=htmlentities($key);?>"><?=htmlentities($key);?></a></b>
+					<b><a href="/list/dns/?domain=<?=htmlentities($key);?>&token=<?=$_SESSION['token']?>" title="<?= _("DNS records") ?>: <?=htmlentities($key);?>"><?=htmlentities($key);?></a></b>
 					<?=empty($data[$key]['SRC'])? '' : '<br>⇢ <span style="font-size:11px;">' . htmlspecialchars($data[$key]['SRC'], ENT_QUOTES) . '</span>'; ?>
 				</div>
 				<!-- START QUICK ACTION TOOLBAR AREA -->
@@ -112,26 +112,26 @@
 								&nbsp;
 							<?php } else { ?>
 								<?php if ($data[$key]['SUSPENDED'] == 'no') {?>
-									<div class="actions-panel__col actions-panel__logs shortcut-n" key-action="href"><a href="/add/dns/?domain=<?=htmlentities($key);?>&token=<?=$_SESSION['token']?>" title="<?=_('Add DNS Record');?>"><i class="fas fa-circle-plus status-icon green status-icon dim"></i></a></div>
-									<div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/dns/?domain=<?=htmlentities($key);?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing DNS Domain');?>"><i class="fas fa-pencil status-icon orange status-icon dim"></i></a></div>
-									<?php if($data[$key]['DNSSEC'] == "yes"){?><div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/list/dns/?domain=<?=htmlentities($key);?>&action=dnssec&token=<?=$_SESSION['token']?>" title="<?=_('View Public DNSSEC key');?>"><i class="fas fa-key status-icon orange status-icon dim"></i></a></div>
+									<div class="actions-panel__col actions-panel__logs shortcut-n" key-action="href"><a href="/add/dns/?domain=<?=htmlentities($key);?>&token=<?=$_SESSION['token']?>" title="<?= _("Add DNS Record") ?>"><i class="fas fa-circle-plus status-icon green status-icon dim"></i></a></div>
+									<div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/dns/?domain=<?=htmlentities($key);?>&token=<?=$_SESSION['token']?>" title="<?= _("Editing DNS Domain") ?>"><i class="fas fa-pencil status-icon orange status-icon dim"></i></a></div>
+									<?php if($data[$key]['DNSSEC'] == "yes"){?><div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/list/dns/?domain=<?=htmlentities($key);?>&action=dnssec&token=<?=$_SESSION['token']?>" title="<?= _("View Public DNSSEC key") ?>"><i class="fas fa-key status-icon orange status-icon dim"></i></a></div>
 									<?php } ?>
 								<?php } ?>
-								<div class="actions-panel__col actions-panel__edit shortcut-l" key-action="href"><a href="/list/dns/?domain=<?=htmlentities($key);?>&token=<?=$_SESSION['token']?>" title="<?=_('DNS records');?>"><i class="fas fa-list status-icon lightblue status-icon dim"></i></a></div>
+								<div class="actions-panel__col actions-panel__edit shortcut-l" key-action="href"><a href="/list/dns/?domain=<?=htmlentities($key);?>&token=<?=$_SESSION['token']?>" title="<?= _("DNS records") ?>"><i class="fas fa-list status-icon lightblue status-icon dim"></i></a></div>
 								<div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
 									<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>" title="<?=_($spnd_action)?>">
 										<i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
 										<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/dns/?domain=<?=htmlentities($key);?>&token=<?=$_SESSION['token']?>">
-										<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="dialog js-confirm-dialog-suspend" title="<?=_('Confirmation');?>">
+										<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="dialog js-confirm-dialog-suspend" title="<?= _("Confirmation") ?>">
 											<p><?=sprintf($spnd_confirmation,$key)?></p>
 										</div>
 									</a>
 								</div>
 								<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-									<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?=_('delete');?>">
+									<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?= _("delete") ?>">
 										<i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
 										<input type="hidden" name="delete_url" value="/delete/dns/?domain=<?=htmlentities($key);?>&token=<?=$_SESSION['token']?>">
-										<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?=_('Confirmation');?>">
+										<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?= _("Confirmation") ?>">
 											<p><?=sprintf(_('DELETE_DOMAIN_CONFIRMATION'),$key)?></p>
 										</div>
 									</a>

web/templates/pages/list_dns_public.php

@@ -4,39 +4,39 @@
 		<div class="toolbar-buttons">
 			<?php if ($read_only !== 'true') {?>
 				<a href="/add/dns/" class="button button-secondary" id="btn-create">
-					<i class="fas fa-circle-plus status-icon green"></i><?=_('Add DNS Domain');?>
+					<i class="fas fa-circle-plus status-icon green"></i><?= _("Add DNS Domain") ?>
 				</a>
 			<?php } ?>
 		</div>
 		<div class="toolbar-right">
 			<div class="toolbar-sorting">
-				<a href="#" class="toolbar-sorting-toggle" title="<?=_('Sort items');?>">
-					<?=_('sort by');?>:
+				<a href="#" class="toolbar-sorting-toggle" title="<?= _("Sort items") ?>">
+					<?= _("sort by") ?>:
 					<b>
 						<?php if ($_SESSION['userSortOrder'] === 'name') { $label = _('Name'); } else { $label = _('Date'); } ?>
 						<?=$label;?> <i class="fas fa-arrow-down-a-z"></i>
 					</b>
 				</a>
 				<ul class="toolbar-sorting-menu animate__animated animate__fadeIn u-hidden">
-					<li entity="sort-date" sort_as_int="1"><span class="name <?php if ($_SESSION['userSortOrder'] === 'date') { echo 'active'; } ?>"><?=_('Date');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-expire" sort_as_int="1"><span class="name"><?=_('Expire');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-ip"><span class="name"><?=_('IP address');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-name"><span class="name <?php if ($_SESSION['userSortOrder'] === 'name') { echo 'active'; } ?>"><?=_('Name');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-records"><span class="name"><?=_('Records');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-date" sort_as_int="1"><span class="name <?php if ($_SESSION['userSortOrder'] === 'date') { echo 'active'; } ?>"><?= _("Date") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-expire" sort_as_int="1"><span class="name"><?= _("Expire") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-ip"><span class="name"><?= _("IP address") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-name"><span class="name <?php if ($_SESSION['userSortOrder'] === 'name') { echo 'active'; } ?>"><?= _("Name") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-records"><span class="name"><?= _("Records") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
 				</ul>
 				<?php if ($read_only !== 'true') {?>
 					<form x-bind="BulkEdit" action="/bulk/dns/" method="post">
 						<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
 						<select class="form-select" name="action">
-							<option value=""><?=_('apply to selected');?></option>
+							<option value=""><?= _("apply to selected") ?></option>
 							<?php if ($_SESSION['userContext'] === 'admin') {?>
-								<option value="rebuild"><?=_('rebuild');?></option>
+								<option value="rebuild"><?= _("rebuild") ?></option>
 							<?php } ?>
-							<option value="suspend"><?=_('suspend');?></option>
-							<option value="unsuspend"><?=_('unsuspend');?></option>
-							<option value="delete"><?=_('delete');?></option>
+							<option value="suspend"><?= _("suspend") ?></option>
+							<option value="unsuspend"><?= _("unsuspend") ?></option>
+							<option value="delete"><?= _("delete") ?></option>
 						</select>
-						<button type="submit" class="toolbar-input-submit" title="<?=_('apply to selected');?>">
+						<button type="submit" class="toolbar-input-submit" title="<?= _("apply to selected") ?>">
 							<i class="fas fa-arrow-right"></i>
 						</button>
 					</form>
@@ -44,9 +44,9 @@
 			</div>
 			<div class="toolbar-search">
 				<form action="/search/" method="get">
-					<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
-					<input type="search" class="form-control js-search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" title="<?=_('Search');?>">
-					<button type="submit" class="toolbar-input-submit" title="<?=_('Search');?>">
+					<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>" />
+					<input type="search" class="form-control js-search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" title="<?= _("Search") ?>">
+					<button type="submit" class="toolbar-input-submit" title="<?= _("Search") ?>">
 						<i class="fas fa-magnifying-glass"></i>
 					</button>
 				</form>
@@ -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 wide-3"><b><input type="text" class="form-control" value="<?php echo $data[$domain]['RECORD'];?>"></b></div>
+		<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 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 wide-3"><b><input type="text" class="form-control" value="<?php echo $data[$domain]['DS'];?>"></b></div>
+		<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 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 wide-3"><b><input type="text" class="form-control" value="<?php echo $data[$domain]['KEY'];?>"></b></div>
+		<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 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 wide-3"><b><input type="text" class="form-control" value="<?php echo $flag;?>"></b></div>
+		<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 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 wide-3"><b><input type="text" class="form-control" value="<?php echo $algorithm;?>"></b></div>
+		<div class="clearfix l-unit__stat-col--left 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

@@ -2,39 +2,39 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/list/dns/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
+			<a class="button button-secondary" id="btn-back" href="/list/dns/"><i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?></a>
 			<?php if ($read_only !== 'true') {?>
-				<a href="/add/dns/?domain=<?=htmlentities($_GET['domain'])?>" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus status-icon green"></i> <?=_('Add Record');?></a>
-				<a href="/edit/dns/?domain=<?=htmlentities($_GET['domain'])?>" class="button button-secondary" id="btn-create"><i class="fas fa-pencil status-icon blue"></i> <?=_('Editing DNS Domain');?></a>
+				<a href="/add/dns/?domain=<?=htmlentities($_GET['domain'])?>" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus status-icon green"></i> <?= _("Add Record") ?></a>
+				<a href="/edit/dns/?domain=<?=htmlentities($_GET['domain'])?>" class="button button-secondary" id="btn-create"><i class="fas fa-pencil status-icon blue"></i> <?= _("Editing DNS Domain") ?></a>
 			<?php } ?>
 		</div>
 		<div class="toolbar-right">
 			<div class="toolbar-sorting">
-				<a href="#" class="toolbar-sorting-toggle" title="<?=_('Sort items');?>">
-					<?=_('sort by');?>:
+				<a href="#" class="toolbar-sorting-toggle" title="<?= _("Sort items") ?>">
+					<?= _("sort by") ?>:
 					<b>
 						<?php if ($_SESSION['userSortOrder'] === 'name') { $label = _('Record'); } else { $label = _('Date'); } ?>
 						<?=$label;?> <i class="fas fa-arrow-down-a-z"></i>
 					</b>
 				</a>
 				<ul class="toolbar-sorting-menu animate__animated animate__fadeIn u-hidden">
-					<li entity="sort-date" sort_as_int="1"><span class="name <?php if ($_SESSION['userSortOrder'] === 'date') { echo 'active'; } ?>"><?=_('Date');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-value"><span class="name"><?=_('IP or Value');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-record"><span class="name"><?=_('Record');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-ttl" sort_as_int="1"><span class="name"><?=_('TTL');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-type"><span class="name"><?=_('Type');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-date" sort_as_int="1"><span class="name <?php if ($_SESSION['userSortOrder'] === 'date') { echo 'active'; } ?>"><?= _("Date") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-value"><span class="name"><?= _("IP or Value") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-record"><span class="name"><?= _("Record") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-ttl" sort_as_int="1"><span class="name"><?= _("TTL") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-type"><span class="name"><?= _("Type") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
 				</ul>
 				<?php if ($read_only !== 'true') {?>
 					<form x-bind="BulkEdit" action="/bulk/dns/" method="post">
 						<input type="hidden" name="domain" value="<?=htmlentities($_GET['domain'])?>">
 						<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
 						<select class="form-select" name="action">
-							<option value=""><?=_('apply to selected');?></option>
-							<option value="suspend"><?=_('suspend');?></option>
-							<option value="unsuspend"><?=_('unsuspend');?></option>
-							<option value="delete"><?=_('delete');?></option>
+							<option value=""><?= _("apply to selected") ?></option>
+							<option value="suspend"><?= _("suspend") ?></option>
+							<option value="unsuspend"><?= _("unsuspend") ?></option>
+							<option value="delete"><?= _("delete") ?></option>
 						</select>
-						<button type="submit" class="toolbar-input-submit" title="<?=_('apply to selected');?>">
+						<button type="submit" class="toolbar-input-submit" title="<?= _("apply to selected") ?>">
 							<i class="fas fa-arrow-right"></i>
 						</button>
 					</form>
@@ -42,9 +42,9 @@
 			</div>
 			<div class="toolbar-search">
 				<form action="/search/" method="get">
-					<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
-					<input type="search" class="form-control js-search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" title="<?=_('Search');?>">
-					<button type="submit" class="toolbar-input-submit" title="<?=_('Search');?>">
+					<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
+					<input type="search" class="form-control js-search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" title="<?= _("Search") ?>">
+					<button type="submit" class="toolbar-input-submit" title="<?= _("Search") ?>">
 						<i class="fas fa-magnifying-glass"></i>
 					</button>
 				</form>
@@ -58,15 +58,15 @@
 	<div class="header table-header">
 		<div class="l-unit__col l-unit__col--right">
 			<div class="clearfix l-unit__stat-col--left super-compact">
-				<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" title="<?=_('Select all');?>" <?=$display_mode;?>>
+				<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"><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 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"><b>&nbsp;</b></div>
-			<div class="clearfix l-unit__stat-col--left wide-6"><b><?=_('IP or Value');?></b></div>
+			<div class="clearfix l-unit__stat-col--left wide-6"><b><?= _("IP or Value") ?></b></div>
 		</div>
 	</div>
 
@@ -90,14 +90,14 @@
 			v_unit_id="<?=htmlentities($key);?>" v_section="dns_rec" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-record="<?=$data[$key]['RECORD']?>" sort-type="<?=$data[$key]['TYPE']?>" sort-ttl="<?=$data[$key]['TTL']?>" sort-value="<?=$data[$key]['VALUE']?>">
 			<div class="l-unit__col l-unit__col--right">
 				<div class="clearfix l-unit__stat-col--left super-compact">
-					<input id="check<?=$data[$key]['ID']?>" class="ch-toggle" type="checkbox" title="<?=_('Select');?>" name="record[]" value="<?=$data[$key]['ID']?>" <?=$display_mode;?>>
+					<input id="check<?=$data[$key]['ID']?>" class="ch-toggle" type="checkbox" title="<?= _("Select") ?>" name="record[]" value="<?=$data[$key]['ID']?>" <?=$display_mode;?>>
 				</div>
 				<div class="clearfix l-unit__stat-col--left u-truncate">
 					<b>
 					<?php if (($read_only === 'true') || ($data[$key]['SUSPENDED'] == 'yes')) {?>
 						<?=substr($data[$key]['RECORD'], 0, 12); if(strlen($data[$key]['RECORD']) > 12 ) echo '...'; ?>
 					<?php } else { ?>
-						<a href="/edit/dns/?domain=<?=htmlspecialchars($_GET['domain'])?>&record_id=<?=$data[$key]['ID']?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing DNS Record').': '.htmlspecialchars($data[$key]['RECORD'])?>"><? echo substr($data[$key]['RECORD'], 0, 12); if(strlen($data[$key]['RECORD']) > 12 ) echo '...'; ?></a>
+						<a href="/edit/dns/?domain=<?=htmlspecialchars($_GET['domain'])?>&record_id=<?=$data[$key]['ID']?>&token=<?=$_SESSION['token']?>" title="<?= _("Editing DNS Record") . ': '.htmlspecialchars($data[$key]['RECORD'])?>"><? echo substr($data[$key]['RECORD'], 0, 12); if(strlen($data[$key]['RECORD']) > 12 ) echo '...'; ?></a>
 					<?php } ?>
 					</b>
 				</div>
@@ -110,13 +110,13 @@
 							&nbsp;
 						<?php } else { ?>
 							<?php if ($data[$key]['SUSPENDED'] == 'no') {?>
-								<div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/dns/?domain=<?=htmlspecialchars($_GET['domain'])?>&record_id=<?=$data[$key]['ID']?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing DNS Record');?>"><i class="fas fa-pencil status-icon orange status-icon dim"></i></a></div>
+								<div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/dns/?domain=<?=htmlspecialchars($_GET['domain'])?>&record_id=<?=$data[$key]['ID']?>&token=<?=$_SESSION['token']?>" title="<?= _("Editing DNS Record") ?>"><i class="fas fa-pencil status-icon orange status-icon dim"></i></a></div>
 							<?php } ?>
 							<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-								<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?=_('delete');?>">
+								<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?= _("delete") ?>">
 									<i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
 									<input type="hidden" name="delete_url" value="/delete/dns/?domain=<?=htmlspecialchars($_GET['domain'])?>&record_id=<?=$data[$key]['ID']?>&token=<?=$_SESSION['token']?>">
-									<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?=_('Confirmation');?>">
+									<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?= _("Confirmation") ?>">
 										<p><?=sprintf(_('DELETE_RECORD_CONFIRMATION'),$key)?></p>
 									</div>
 								</a>
@@ -130,7 +130,7 @@
 			<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 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 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>
 	</div>
 <?php } ?>
@@ -141,7 +141,7 @@
 	<div class="container">
 		<div class="l-unit-ft">
 			<div class="l-unit__col l-unit__col--right total clearfix">
-				<?php printf(ngettext('%d DNS record', '%d DNS records', $i),$i); ?>
+				<?php printf(ngettext("%d DNS record", "%d DNS records", $i), $i); ?>
 			</div>
 			<div class="l-unit__col l-unit__col--right back clearfix">
 			</div>

web/templates/pages/list_firewall.php

@@ -2,32 +2,32 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/edit/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
-			<a href="/add/firewall/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus status-icon green"></i><?=_('Add Rule');?></a>
-			<?php if(!empty($_SESSION['FIREWALL_EXTENSION'])): ?>
-				<a class="button button-secondary" href="/list/firewall/banlist/"><i class="fas fa-eye status-icon red"></i><?=_('list fail2ban');?></a>
-				<a class="button button-secondary" href="/list/firewall/ipset/"><i class="fas fa-list status-icon blue"></i><?=_('list ipset');?></a>
+			<a class="button button-secondary" id="btn-back" href="/edit/server/"><i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?></a>
+			<a href="/add/firewall/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus status-icon green"></i><?= _("Add Rule") ?></a>
+			<?php if (!empty($_SESSION["FIREWALL_EXTENSION"])): ?>
+				<a class="button button-secondary" href="/list/firewall/banlist/"><i class="fas fa-eye status-icon red"></i><?= _("list fail2ban") ?></a>
+				<a class="button button-secondary" href="/list/firewall/ipset/"><i class="fas fa-list status-icon blue"></i><?= _("list ipset") ?></a>
 			<?php endif; ?>
 		</div>
 		<div class="toolbar-right">
 			<div class="toolbar-sorting">
-				<a href="#" class="toolbar-sorting-toggle" title="<?=_('Sort items');?>">
-					<?=_('sort by');?>: <b><?=_('Action');?> <i class="fas fa-arrow-up-a-z"></i></b>
+				<a href="#" class="toolbar-sorting-toggle" title="<?= _("Sort items") ?>">
+					<?= _("sort by") ?>: <b><?= _("Action") ?> <i class="fas fa-arrow-up-a-z"></i></b>
 				</a>
 				<ul class="toolbar-sorting-menu animate__animated animate__fadeIn u-hidden">
-					<li entity="sort-action"><span class="name"><?=_('Action');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up active"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-protocol"><span class="name"><?=_('Protocol');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-port"><span class="name"><?=_('Port');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-ip" sort_as_int="1"><span class="name"><?=_('IP address');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-comment"><span class="name"><?=_('Comment');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-action"><span class="name"><?= _("Action") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up active"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-protocol"><span class="name"><?= _("Protocol") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-port"><span class="name"><?= _("Port") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-ip" sort_as_int="1"><span class="name"><?= _("IP address") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-comment"><span class="name"><?= _("Comment") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
 				</ul>
 				<form x-bind="BulkEdit" action="/bulk/firewall/" method="post">
-					<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+					<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 					<select class="form-select" name="action">
-						<option value=""><?=_('apply to selected');?></option>
-						<option value="delete"><?=_('delete') ?></option>
+						<option value=""><?= _("apply to selected") ?></option>
+						<option value="delete"><?= _("delete") ?></option>
 					</select>
-					<button type="submit" class="toolbar-input-submit" title="<?=_('apply to selected');?>">
+					<button type="submit" class="toolbar-input-submit" title="<?= _("apply to selected") ?>">
 						<i class="fas fa-arrow-right"></i>
 					</button>
 				</form>
@@ -41,14 +41,14 @@
 	<div class="header table-header">
 		<div class="l-unit__col l-unit__col--right">
 			<div class="clearfix l-unit__stat-col--left super-compact">
-				<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" title="<?=_('Select all');?>">
+				<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 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 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 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>
 	</div>
 
@@ -74,11 +74,11 @@
 			<div class="l-unit__col l-unit__col--right">
 				<div>
 					<div class="clearfix l-unit__stat-col--left super-compact">
-						<input id="check<?=$i ?>" class="ch-toggle" type="checkbox" title="<?=_('Select');?>" name="rule[]" value="<?=$key?>">
+						<input id="check<?=$i ?>" class="ch-toggle" type="checkbox" title="<?= _("Select") ?>" name="rule[]" value="<?=$key?>">
 					</div>
 					<div class="clearfix l-unit__stat-col--left wide-1">
 						<b>
-							<a href="/edit/firewall/?rule=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Firewall Rule');?>">
+							<a href="/edit/firewall/?rule=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Editing Firewall Rule") ?>">
 							<?php if ($data[$key]['SUSPENDED'] == 'no') { ?>
 								<?php if ($data[$key]['ACTION'] == 'DROP') { ?>
 									<i class="fas fa-circle-minus status-icon red icon-pad-right"></i> <?=_($data[$key]['ACTION'])?>
@@ -99,21 +99,21 @@
 					<div class="clearfix l-unit__stat-col--left compact-2 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>
+								<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>
 								<div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
 									<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>" title="<?=_($spnd_action)?>">
 										<i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
 										<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/firewall/?rule=<?=$key?>&token=<?=$_SESSION['token']?>">
-										<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="dialog js-confirm-dialog-suspend" title="<?=_('Confirmation');?>">
+										<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="dialog js-confirm-dialog-suspend" title="<?= _("Confirmation") ?>">
 											<p><?=sprintf($spnd_confirmation,$key)?></p>
 										</div>
 									</a>
 								</div>
 								<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-									<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?=_('delete');?>">
+									<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?= _("delete") ?>">
 										<i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
 										<input type="hidden" name="delete_url" value="/delete/firewall/?rule=<?=$key?>&token=<?=$_SESSION['token']?>">
-										<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?=_('Confirmation');?>">
+										<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?= _("Confirmation") ?>">
 											<p><?=sprintf(_('DELETE_RULE_CONFIRMATION'),$key)?></p>
 										</div>
 									</a>

web/templates/pages/list_firewall_banlist.php

@@ -2,17 +2,17 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/list/firewall/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
-			<a href="/add/firewall/banlist/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus status-icon green"></i><?=_('Ban IP Address');?></a>
+			<a class="button button-secondary" id="btn-back" href="/list/firewall/"><i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?></a>
+			<a href="/add/firewall/banlist/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus status-icon green"></i><?= _("Ban IP Address") ?></a>
 		</div>
 		<div class="toolbar-right">
 			<form x-bind="BulkEdit" action="/bulk/firewall/banlist/" method="post">
-				<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+				<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 				<select class="form-select" name="action">
-					<option value=""><?=_('apply to selected');?></option>
-					<option value="delete"><?=_('delete') ?></option>
+					<option value=""><?= _("apply to selected") ?></option>
+					<option value="delete"><?= _("delete") ?></option>
 				</select>
-				<button type="submit" class="toolbar-input-submit" title="<?=_('apply to selected');?>">
+				<button type="submit" class="toolbar-input-submit" title="<?= _("apply to selected") ?>">
 					<i class="fas fa-arrow-right"></i>
 				</button>
 			</form>
@@ -25,13 +25,13 @@
 	<div class="header table-header">
 		<div class="l-unit__col l-unit__col--right">
 			<div class="clearfix l-unit__stat-col--left super-compact">
-				<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" title="<?=_('Select all');?>">
+				<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 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 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>
 	</div>
 
@@ -44,7 +44,7 @@
 		<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 super-compact">
-					<input id="check<?=$i ?>" class="ch-toggle" type="checkbox" title="<?=_('Select');?>" name="ipchain[]" value="<?=$ip . ':' . $value['CHAIN'] ?>">
+					<input id="check<?=$i ?>" class="ch-toggle" type="checkbox" title="<?= _("Select") ?>" name="ipchain[]" value="<?=$ip . ':' . $value['CHAIN'] ?>">
 				</div>
 				<div class="clearfix l-unit__stat-col--left wide-3"><b><?=$ip?></b></div>
 				<!-- START QUICK ACTION TOOLBAR AREA -->
@@ -55,7 +55,7 @@
 								<a id="delete_link_<?=$i?>" class="data-controls do_delete">
 									<i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
 									<input type="hidden" name="delete_url" value="/delete/firewall/banlist/?ip=<?=$ip?>&chain=<?=$value['CHAIN']?>&token=<?=$_SESSION['token']?>">
-									<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?=_('Confirmation');?>">
+									<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?= _("Confirmation") ?>">
 										<p><?=sprintf(_('DELETE_IP_CONFIRMATION'),$key)?></p>
 									</div>
 								</a>

web/templates/pages/list_firewall_ipset.php

@@ -2,17 +2,17 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/list/firewall/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
-			<a href="/add/firewall/ipset/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus status-icon green"></i><?=_('Add IP list');?></a>
+			<a class="button button-secondary" id="btn-back" href="/list/firewall/"><i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?></a>
+			<a href="/add/firewall/ipset/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus status-icon green"></i><?= _("Add IP list") ?></a>
 		</div>
 		<div class="toolbar-right">
 			<form x-bind="BulkEdit" action="/bulk/firewall/ipset/" method="post">
-				<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+				<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 				<select class="form-select" name="action">
-					<option value=""><?=_('apply to selected');?></option>
-					<option value="delete"><?=_('delete') ?></option>
+					<option value=""><?= _("apply to selected") ?></option>
+					<option value="delete"><?= _("delete") ?></option>
 				</select>
-				<button type="submit" class="toolbar-input-submit" title="<?=_('apply to selected');?>">
+				<button type="submit" class="toolbar-input-submit" title="<?= _("apply to selected") ?>">
 					<i class="fas fa-arrow-right"></i>
 				</button>
 			</form>
@@ -25,38 +25,36 @@
 	<div class="header table-header">
 		<div class="l-unit__col l-unit__col--right">
 			<div class="clearfix l-unit__stat-col--left super-compact">
-				<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" title="<?=_('Select all');?>">
+				<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 List Name');?></b></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 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>
 	</div>
 
 	<!-- Begin firewall IP address list item loop -->
-	<?php
-		foreach ($data as $key => $value) {
-			$listname = $key;
-		?>
+	<?php foreach ($data as $key => $value) {
+ 	$listname = $key; ?>
 		<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 super-compact">
-					<input id="check<?=$i ?>" class="ch-toggle" type="checkbox" title="<?=_('Select');?>" name="setname[]" value="<?=$listname ?>">
+					<input id="check<?= $i ?>" class="ch-toggle" type="checkbox" title="<?= _("Select") ?>" name="setname[]" value="<?= $listname ?>">
 				</div>
-				<div class="clearfix l-unit__stat-col--left wide-3"><b><?=$listname?></b></div>
+				<div class="clearfix l-unit__stat-col--left wide-3"><b><?= $listname ?></b></div>
 				<!-- START QUICK ACTION TOOLBAR AREA -->
 				<div class="clearfix l-unit__stat-col--left compact-4">
 					<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">
-								<a id="delete_link_<?=$i?>" class="data-controls do_delete">
+								<a id="delete_link_<?= $i ?>" class="data-controls do_delete">
 									<i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
-									<input type="hidden" name="delete_url" value="/delete/firewall/ipset/?listname=<?=$listname?>&token=<?=$_SESSION['token']?>">
-									<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?=_('Confirmation');?>">
-										<p><?=sprintf(_('DELETE_IPSET_CONFIRMATION'), $key)?></p>
+									<input type="hidden" name="delete_url" value="/delete/firewall/ipset/?listname=<?= $listname ?>&token=<?= $_SESSION["token"] ?>">
+									<div id="delete_dialog_<?= $i ?>" class="dialog js-confirm-dialog-delete" title="<?= _("Confirmation") ?>">
+										<p><?= sprintf(_("DELETE_IPSET_CONFIRMATION"), $key) ?></p>
 									</div>
 								</a>
 							</div>
@@ -65,16 +63,16 @@
 				</div>
 				<!-- END QUICK ACTION TOOLBAR AREA -->
 				<div class="clearfix l-unit__stat-col--left text-center compact-5"><b>
-						<?php if ($data[$key]['AUTOUPDATE'] == 'no') { ?>
+						<?php if ($data[$key]["AUTOUPDATE"] == "no") { ?>
 							<i class="fas fa-circle-xmark status-icon red"></i>
 						<?php } else { ?>
 							<i class="fas fa-circle-check status-icon green"></i>
 						<?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 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>
 		</div>
 	<?php } ?>

web/templates/pages/list_ip.php

@@ -2,30 +2,30 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/edit/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
-			<a href="/add/ip/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus status-icon green"></i><?=_('Add IP');?></a>
+			<a class="button button-secondary" id="btn-back" href="/edit/server/"><i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?></a>
+			<a href="/add/ip/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus status-icon green"></i><?= _("Add IP") ?></a>
 		</div>
 		<div class="toolbar-right">
 			<div class="toolbar-sorting">
-				<a href="#" class="toolbar-sorting-toggle" title="<?=_('Sort items');?>">
-					<?=_('sort by');?>: <b><?=_('Date');?> <i class="fas fa-arrow-down-a-z"></i></b>
+				<a href="#" class="toolbar-sorting-toggle" title="<?= _("Sort items") ?>">
+					<?= _("sort by") ?>: <b><?= _("Date") ?> <i class="fas fa-arrow-down-a-z"></i></b>
 				</a>
 				<ul class="toolbar-sorting-menu animate__animated animate__fadeIn u-hidden">
-					<li entity="sort-date" sort_as_int="1"><span class="name <?php if ($_SESSION['userSortOrder'] === 'date') { echo 'active'; } ?>"><?=_('Date');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-ip"><span class="name"><?=_('ip');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-netmask"><span class="name"><?=_('Netmask');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-interface"><span class="name"><?=_('Interface');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-domains" sort_as_int="1"><span class="name"><?=_('Domains');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-owner"><span class="name"><?=_('Owner');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-date" sort_as_int="1"><span class="name <?php if ($_SESSION['userSortOrder'] === 'date') { echo 'active'; } ?>"><?= _("Date") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-ip"><span class="name"><?= _("ip") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-netmask"><span class="name"><?= _("Netmask") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-interface"><span class="name"><?= _("Interface") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-domains" sort_as_int="1"><span class="name"><?= _("Domains") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-owner"><span class="name"><?= _("Owner") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
 				</ul>
 				<form x-bind="BulkEdit" action="/bulk/ip/" method="post">
 					<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
 					<select class="form-select" name="action">
-						<option value=""><?=_('apply to selected');?></option>
-						<option value="reread IP"><?=_('reread IP');?></option>
-						<option value="delete"><?=_('delete');?></option>
+						<option value=""><?= _("apply to selected") ?></option>
+						<option value="reread IP"><?= _("reread IP") ?></option>
+						<option value="delete"><?= _("delete") ?></option>
 					</select>
-					<button type="submit" class="toolbar-input-submit" title="<?=_('apply to selected');?>">
+					<button type="submit" class="toolbar-input-submit" title="<?= _("apply to selected") ?>">
 						<i class="fas fa-arrow-right"></i>
 					</button>
 				</form>
@@ -40,15 +40,15 @@
 		<div class="l-unit__col l-unit__col--right">
 			<div>
 				<div class="clearfix l-unit__stat-col--left super-compact">
-					<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" title="<?=_('Select all');?>">
+					<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 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 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>
 		</div>
 	</div>
@@ -65,20 +65,20 @@
 
 			<div class="l-unit__col l-unit__col--right">
 				<div class="clearfix l-unit__stat-col--left super-compact">
-					<input id="check<?=$i ?>" class="ch-toggle" type="checkbox" title="<?=_('Select');?>" name="ip[]" value="<?=$key?>">
+					<input id="check<?=$i ?>" class="ch-toggle" type="checkbox" title="<?= _("Select") ?>" name="ip[]" value="<?=$key?>">
 				</div>
-				<div class="clearfix l-unit__stat-col--left wide-3"><b><a href="/edit/ip/?ip=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing IP Address');?>"><?=$key?> <?php if (!empty($data[$key]['NAT'])) echo ' → ' . $data[$key]['NAT'] . ''; ?></a></b>
+				<div class="clearfix l-unit__stat-col--left wide-3"><b><a href="/edit/ip/?ip=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("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="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>
+							<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>
 							<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-								<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?=_('delete');?>">
+								<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?= _("delete") ?>">
 									<i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
 									<input type="hidden" name="delete_url" value="/delete/ip/?ip=<?=$key?>&token=<?=$_SESSION['token']?>">
-									<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?=_('Confirmation');?>">
+									<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?= _("Confirmation") ?>">
 										<p><?=sprintf(_('DELETE_IP_CONFIRMATION'),$key)?></p>
 									</div>
 								</a>
@@ -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 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>
 		</div>
 	<?php } ?>
@@ -101,7 +101,7 @@
 	<div class="container">
 		<div class="l-unit-ft">
 			<div class="l-unit__col l-unit__col--right">
-				<?php printf(ngettext('%d IP address', '%d IP addresses', $i),$i); ?>
+				<?php printf(ngettext("%d IP address", "%d IP addresses", $i), $i); ?>
 			</div>
 		</div>
 	</div>

web/templates/pages/list_key.php

@@ -2,11 +2,11 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/edit/user/?token=<?=$_SESSION['token']?>"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
-						<?php if (($_SESSION['userContext'] === 'admin') && (isset($_GET['user'])) && ($_GET['user'] !== 'admin')) { ?>
-						<a href="/add/key/?user=<?=htmlentities($_GET['user']);?>" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus status-icon green"></i><?=_('Add SSH Key');?></a>
+			<a class="button button-secondary" id="btn-back" href="/edit/user/?token=<?= $_SESSION["token"] ?>"><i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?></a>
+						<?php if ($_SESSION["userContext"] === "admin" && isset($_GET["user"]) && $_GET["user"] !== "admin") { ?>
+						<a href="/add/key/?user=<?= htmlentities($_GET["user"]) ?>" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus status-icon green"></i><?= _("Add SSH Key") ?></a>
 						<?php } else { ?>
-			<a href="/add/key/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus status-icon green"></i><?=_('Add SSH Key');?></a>
+			<a href="/add/key/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus status-icon green"></i><?= _("Add SSH Key") ?></a>
 						<?php } ?>
 		</div>
 	</div>
@@ -16,11 +16,11 @@
 <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 wide-3"><b><?=_('SSH_ID');?></b></div>
+			<div class="clearfix l-unit__stat-col--left wide-3"><b><?= _("SSH_ID") ?></b></div>
 			<div class="clearfix l-unit__stat-col--left compact-2">
 				&nbsp;
 			</div>
-			<div class="clearfix l-unit__stat-col--left wide-7"><b><?=_('SSH KEY');?></b></div>
+			<div class="clearfix l-unit__stat-col--left wide-7"><b><?= _("SSH KEY") ?></b></div>
 		</div>
 	</div>
 
@@ -37,14 +37,14 @@
 					<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">
-								<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?=_('delete');?>">
+								<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?= _("delete") ?>">
 									<i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
 									<?php if (($_SESSION['userContext'] === 'admin') && (isset($_GET['user'])) && ($_GET['user'] !== 'admin')) { ?>
 										<input type="hidden" name="delete_url" value="/delete/key/?user=<?=htmlentities($_GET['user']);?>&key=<?=$key?>&token=<?=$_SESSION['token']?>">
 									<?php } else { ?>
 										<input type="hidden" name="delete_url" value="/delete/key/?key=<?=$key?>&token=<?=$_SESSION['token']?>">
 									<?php } ?>
-									<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?=_('Confirmation');?>">
+									<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?= _("Confirmation") ?>">
 										<p><?=sprintf(_('DELETE_KEY_CONFIRM'),$key)?></p>
 									</div>
 								</a>

web/templates/pages/list_log.php

@@ -3,47 +3,47 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<?php if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin')) {?>
-				<a href="/list/user/" class="button button-secondary" id="btn-back"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
+				<a href="/list/user/" class="button button-secondary" id="btn-back"><i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?></a>
 			<?php } else if (($_SESSION['userContext'] === 'admin') && (htmlentities($_GET['user']) === 'system')) { ?>
-				<a href="/list/server/" class="button button-secondary" id="btn-back"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
+				<a href="/list/server/" class="button button-secondary" id="btn-back"><i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?></a>
 			<?php } else { ?>
 				<?php if (($_SESSION['userContext'] === 'admin') && (isset($_GET['user'])) && ($_GET['user'] !== 'admin')) { ?>
-					<a href="/edit/user/?user=<?=htmlentities($_GET['user']); ?>&token=<?=$_SESSION['token']?>" class="button button-secondary" id="btn-back"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
+					<a href="/edit/user/?user=<?=htmlentities($_GET['user']); ?>&token=<?=$_SESSION['token']?>" class="button button-secondary" id="btn-back"><i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?></a>
 				<?php } else { ?>
-					<a href="/edit/user/?token=<?=$_SESSION['token']?>" class="button button-secondary" id="btn-back"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
+					<a href="/edit/user/?token=<?=$_SESSION['token']?>" class="button button-secondary" id="btn-back"><i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?></a>
 				<?php } ?>
 			<?php } ?>
 			<?php if ($_SESSION['DEMO_MODE'] != "yes"){
 			if (($_SESSION['userContext'] === 'admin') && (htmlentities($_GET['user']) !== 'admin')) { ?>
 				<?php if (($_SESSION['userContext'] === 'admin') && ($_GET['user'] != '') && (htmlentities($_GET['user']) !== 'admin')) { ?>
 					<?php if (htmlentities($_GET['user']) !== 'system') {?>
-						<a href="/list/log/auth/?user=<?=htmlentities($_GET['user']); ?>&token=<?=$_SESSION['token']?>" class="button button-secondary" id="btn-back" title="<?=_('Login history');?>"><i class="fas fa-binoculars status-icon green"></i><?=_('Login history');?></a>
+						<a href="/list/log/auth/?user=<?=htmlentities($_GET['user']); ?>&token=<?=$_SESSION['token']?>" class="button button-secondary" id="btn-back" title="<?= _("Login history") ?>"><i class="fas fa-binoculars status-icon green"></i><?= _("Login history") ?></a>
 					<?php } ?>
 				<?php } else { ?>
-					<a href="/list/log/auth/" class="button button-secondary" id="btn-back" title="<?=_('Login history');?>"><i class="fas fa-binoculars status-icon green"></i><?=_('Login history');?></a>
+					<a href="/list/log/auth/" class="button button-secondary" id="btn-back" title="<?= _("Login history") ?>"><i class="fas fa-binoculars status-icon green"></i><?= _("Login history") ?></a>
 				<?php } ?>
 			<?php } ?>
 			<?php if ($_SESSION['userContext'] === 'user') {?>
-				<a href="/list/log/auth/" class="button button-secondary" id="btn-back" title="<?=_('Login history');?>"><i class="fas fa-binoculars status-icon green"></i><?=_('Login history');?></a>
+				<a href="/list/log/auth/" class="button button-secondary" id="btn-back" title="<?= _("Login history") ?>"><i class="fas fa-binoculars status-icon green"></i><?= _("Login history") ?></a>
 			<?php }
 			} ?>
 		</div>
 		<div class="toolbar-buttons">
-			<a href="javascript:location.reload();" class="button button-secondary"><i class="fas fa-arrow-rotate-right status-icon green"></i><?=_('Refresh');?></a>
+			<a href="javascript:location.reload();" class="button button-secondary"><i class="fas fa-arrow-rotate-right status-icon green"></i><?= _("Refresh") ?></a>
 			<?php if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] === 'yes')) {?>
 				<!-- Hide delete buttons-->
 			<?php } else { ?>
 				<?php if (($_SESSION['userContext'] === 'admin') || (($_SESSION['userContext'] === 'user') && ($_SESSION['POLICY_USER_DELETE_LOGS'] !== 'no'))) {?>
 					<div class="actions-panel" key-action="js">
 						<a class="data-controls do_delete button button-secondary button-danger">
-							<i class="do_delete fas fa-circle-xmark status-icon red"></i><?=_('Delete');?>
+							<i class="do_delete fas fa-circle-xmark status-icon red"></i><?= _("Delete") ?>
 							<?php if (($_SESSION['userContext'] === 'admin') && (isset($_GET['user']))) {?>
 								<input type="hidden" name="delete_url" value="/delete/log/?user=<?=htmlentities($_GET['user']);?>&token=<?=$_SESSION['token']?>">
 							<?php } else { ?>
 								<input type="hidden" name="delete_url" value="/delete/log/?token=<?=$_SESSION['token']?>">
 							<?php } ?>
-							<div class="dialog js-confirm-dialog-delete" title="<?=_('Confirmation');?>">
-								<p><?=_('DELETE_LOGS_CONFIRMATION');?></p>
+							<div class="dialog js-confirm-dialog-delete" title="<?= _("Confirmation") ?>">
+								<p><?= _("DELETE_LOGS_CONFIRMATION") ?></p>
 							</div>
 						</a>
 					</div>
@@ -59,10 +59,10 @@
 	<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"><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>
-			<div class="clearfix l-unit__stat-col--left"><b><?=_('Message');?></b></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>
+			<div class="clearfix l-unit__stat-col--left"><b><?= _("Message") ?></b></div>
 		</div>
 	</div>
 

web/templates/pages/list_log_auth.php

@@ -2,28 +2,28 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<?php if (($_SESSION['userContext'] === 'admin') && (isset($_GET['user'])) && (htmlentities($_GET['user']) !== 'admin')) { ?>
-				<a href="/list/log/?user=<?=htmlentities($_GET['user']); ?>&token=<?=$_SESSION['token']?>" class="button button-secondary" id="btn-back"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
+			<?php if ($_SESSION["userContext"] === "admin" && isset($_GET["user"]) && htmlentities($_GET["user"]) !== "admin") { ?>
+				<a href="/list/log/?user=<?= htmlentities($_GET["user"]) ?>&token=<?= $_SESSION["token"] ?>" class="button button-secondary" id="btn-back"><i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?></a>
 			<?php } else { ?>
-				<a href="/list/log/" class="button button-secondary" id="btn-back"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
+				<a href="/list/log/" class="button button-secondary" id="btn-back"><i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?></a>
 			<?php } ?>
 		</div>
 		<div class="toolbar-buttons">
-			<a href="javascript:location.reload();" class="button button-secondary"><i class="fas fa-arrow-rotate-right status-icon green"></i><?=_('Refresh');?></a>
-			<?php if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] === 'yes')) {?>
+			<a href="javascript:location.reload();" class="button button-secondary"><i class="fas fa-arrow-rotate-right status-icon green"></i><?= _("Refresh") ?></a>
+			<?php if ($_SESSION["userContext"] === "admin" && $_SESSION["look"] === "admin" && $_SESSION["POLICY_SYSTEM_PROTECTED_ADMIN"] === "yes") { ?>
 				<!-- Hide delete buttons-->
 			<?php } else { ?>
-				<?php if (($_SESSION['userContext'] === 'admin') || (($_SESSION['userContext'] === 'user') && ($_SESSION['POLICY_USER_DELETE_LOGS'] !== 'no'))) {?>
+				<?php if ($_SESSION["userContext"] === "admin" || ($_SESSION["userContext"] === "user" && $_SESSION["POLICY_USER_DELETE_LOGS"] !== "no")) { ?>
 					<div class="actions-panel" key-action="js">
 						<a class="data-controls do_delete button button-secondary button-danger">
-							<i class="do_delete fas fa-circle-xmark status-icon red"></i><?=_('Delete');?>
-							<?php if (($_SESSION['userContext'] === 'admin') && (isset($_GET['user']))) {?>
-								<input type="hidden" name="delete_url" value="/delete/log/auth/?user=<?=htmlentities($_GET['user']);?>&token=<?=$_SESSION['token']?>">
+							<i class="do_delete fas fa-circle-xmark status-icon red"></i><?= _("Delete") ?>
+							<?php if ($_SESSION["userContext"] === "admin" && isset($_GET["user"])) { ?>
+								<input type="hidden" name="delete_url" value="/delete/log/auth/?user=<?= htmlentities($_GET["user"]) ?>&token=<?= $_SESSION["token"] ?>">
 							<?php } else { ?>
-								<input type="hidden" name="delete_url" value="/delete/log/auth/?token=<?=$_SESSION['token']?>">
+								<input type="hidden" name="delete_url" value="/delete/log/auth/?token=<?= $_SESSION["token"] ?>">
 							<?php } ?>
-							<div class="dialog js-confirm-dialog-delete" title="<?=_('Confirmation');?>">
-								<p><?=_('DELETE_LOGS_CONFIRMATION');?></p>
+							<div class="dialog js-confirm-dialog-delete" title="<?= _("Confirmation") ?>">
+								<p><?= _("DELETE_LOGS_CONFIRMATION") ?></p>
 							</div>
 						</a>
 					</div>
@@ -38,12 +38,12 @@
 	<div class="header table-header">
 		<div class="l-unit__col l-unit__col--right">
 			<div class="clearfix l-unit__stat-col--left text-center">
-				<b><?=_('Status');?></b>
+				<b><?= _("Status") ?></b>
 			</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><?=_('IP address');?></b></div>
-			<div class="clearfix l-unit__stat-col--left wide-7"><b><?=_('Browser');?></b></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><?= _("IP address") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left wide-7"><b><?= _("Browser") ?></b></div>
 		</div>
 	</div>
 
@@ -86,7 +86,7 @@
 	<div class="container">
 		<div class="l-unit-ft">
 			<div class="l-unit_col l-unit_col--right clearfix">
-				<?php printf(ngettext('%d log record', '%d log records', $i),$i); ?>
+				<?php printf(ngettext("%d log record", "%d log records", $i), $i); ?>
 			</div>
 		</div>
 	</div>

web/templates/pages/list_mail.php

@@ -3,37 +3,37 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<?php if ($read_only !== 'true') {?>
-				<a href="/add/mail/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus status-icon green"></i><?=_('Add Mail Domain');?></a>
+				<a href="/add/mail/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus status-icon green"></i><?= _("Add Mail Domain") ?></a>
 			<?php } ?>
 		</div>
 		<div class="toolbar-right">
 			<div class="toolbar-sorting">
-				<a href="#" class="toolbar-sorting-toggle" title="<?=_('Sort items');?>">
-					<?=_('sort by');?>:
+				<a href="#" class="toolbar-sorting-toggle" title="<?= _("Sort items") ?>">
+					<?= _("sort by") ?>:
 					<b>
 						<?php if ($_SESSION['userSortOrder'] === 'name') { $label = _('Name'); } else { $label = _('Date'); } ?>
 						<?=$label;?> <i class="fas fa-arrow-down-a-z"></i>
 					</b>
 				</a>
 				<ul class="toolbar-sorting-menu animate__animated animate__fadeIn u-hidden">
-					<li entity="sort-accounts" sort_as_int="1"><span class="name"><?=_('Accounts');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-date" sort_as_int="1"><span class="name <?php if ($_SESSION['userSortOrder'] === 'date') { echo 'active'; } ?>"><?=_('Date');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-disk" sort_as_int="1"><span class="name"><?=_('Disk');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-name"><span class="name <?php if ($_SESSION['userSortOrder'] === 'name') { echo 'active'; } ?>"><?=_('Name');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-accounts" sort_as_int="1"><span class="name"><?= _("Accounts") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-date" sort_as_int="1"><span class="name <?php if ($_SESSION['userSortOrder'] === 'date') { echo 'active'; } ?>"><?= _("Date") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-disk" sort_as_int="1"><span class="name"><?= _("Disk") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-name"><span class="name <?php if ($_SESSION['userSortOrder'] === 'name') { echo 'active'; } ?>"><?= _("Name") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
 				</ul>
 				<?php if ($read_only !== 'true') {?>
 					<form x-bind="BulkEdit" action="/bulk/mail/" method="post">
 						<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
 						<select class="form-select" name="action">
-							<option value=""><?=_('apply to selected');?></option>
+							<option value=""><?= _("apply to selected") ?></option>
 							<?php if ($_SESSION['userContext'] === 'admin') {?>
-								<option value="rebuild"><?=_('rebuild');?></option>
+								<option value="rebuild"><?= _("rebuild") ?></option>
 							<?php } ?>
-							<option value="suspend"><?=_('suspend');?></option>
-							<option value="unsuspend"><?=_('unsuspend');?></option>
-							<option value="delete"><?=_('delete');?></option>
+							<option value="suspend"><?= _("suspend") ?></option>
+							<option value="unsuspend"><?= _("unsuspend") ?></option>
+							<option value="delete"><?= _("delete") ?></option>
 						</select>
-						<button type="submit" class="toolbar-input-submit" title="<?=_('apply to selected');?>">
+						<button type="submit" class="toolbar-input-submit" title="<?= _("apply to selected") ?>">
 							<i class="fas fa-arrow-right"></i>
 						</button>
 					</form>
@@ -41,9 +41,9 @@
 			</div>
 			<div class="toolbar-search">
 				<form action="/search/" method="get">
-					<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
-					<input type="search" class="form-control js-search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" title="<?=_('Search');?>">
-					<button type="submit" class="toolbar-input-submit" title="<?=_('Search');?>">
+					<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
+					<input type="search" class="form-control js-search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" title="<?= _("Search") ?>">
+					<button type="submit" class="toolbar-input-submit" title="<?= _("Search") ?>">
 						<i class="fas fa-magnifying-glass"></i>
 					</button>
 				</form>
@@ -57,16 +57,16 @@
 	<div class="header table-header">
 		<div class="l-unit__col l-unit__col--right">
 			<div class="clearfix l-unit__stat-col--left super-compact">
-				<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" title="<?=_('Select all');?>" <?=$display_mode;?>>
+				<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 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 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>
 	</div>
 
@@ -138,45 +138,45 @@
 			<div class="l-unit__col l-unit__col--right">
 				<div>
 					<div class="clearfix l-unit__stat-col--left super-compact">
-						<input id="check<?=$i ?>" class="ch-toggle" type="checkbox" title="<?=_('Select');?>" name="domain[]" value="<?=$key?>" <?=$display_mode;?>>
+						<input id="check<?=$i ?>" class="ch-toggle" type="checkbox" title="<?= _("Select") ?>" name="domain[]" value="<?=$key?>" <?=$display_mode;?>>
 					</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>
+					<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="l-unit-toolbar__col l-unit-toolbar__col--right u-noselect">
 							<div class="actions-panel clearfix">
 								<?php if ($read_only === 'true') {?>
 									<!-- Restrict ability to edit, delete, or suspend domain items when impersonating 'admin' account -->
-									<div class="actions-panel__col actions-panel__edit shortcut-l" key-action="href"><a href="?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('mail accounts');?>"><i class="fas fa-users status-icon blue status-icon dim"></i></a></div>
-									<div class="actions-panel__col actions-panel__edit shortcut-l" key-action="href"><a href="?domain=<?=$key?>&dns=1&token=<?=$_SESSION['token']?>" title="<?=_('DNS records mail');?>"><i class="fas fa-book-atlas status-icon blue status-icon dim"></i></a></div>
+									<div class="actions-panel__col actions-panel__edit shortcut-l" key-action="href"><a href="?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("mail accounts") ?>"><i class="fas fa-users status-icon blue status-icon dim"></i></a></div>
+									<div class="actions-panel__col actions-panel__edit shortcut-l" key-action="href"><a href="?domain=<?=$key?>&dns=1&token=<?=$_SESSION['token']?>" title="<?= _("DNS records mail") ?>"><i class="fas fa-book-atlas status-icon blue status-icon dim"></i></a></div>
 									<?php if ($data[$key]['SUSPENDED'] == 'no') {?>
-										<div class="actions-panel__col actions-panel__edit" key-action="href"><a href="http://<?=$webmail;?>.<?=$key?>/" target="_blank" title="<?=_('open webmail');?>"><i class="fas fa-paper-plane status-icon lightblue status-icon dim"></i></a></div>
+										<div class="actions-panel__col actions-panel__edit" key-action="href"><a href="http://<?=$webmail;?>.<?=$key?>/" target="_blank" title="<?= _("open webmail") ?>"><i class="fas fa-paper-plane status-icon lightblue status-icon dim"></i></a></div>
 									<?php } ?>
 								<?php } else { ?>
 									<?php if ($data[$key]['SUSPENDED'] == 'no') {?>
-										<div class="actions-panel__col actions-panel__logs shortcut-n" key-action="href"><a href="/add/mail/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Add Mail Account');?>"><i class="fas fa-circle-plus status-icon green status-icon dim"></i></a></div>
+										<div class="actions-panel__col actions-panel__logs shortcut-n" key-action="href"><a href="/add/mail/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Add Mail Account") ?>"><i class="fas fa-circle-plus status-icon green status-icon dim"></i></a></div>
 										<?php if($_SESSION['WEBMAIL_SYSTEM']){?>
 											<?php if (!empty($data[$key]['WEBMAIL'])) {?>
-												<div class="actions-panel__col actions-panel__edit" key-action="href"><a href="http://<?=$webmail;?>.<?=$key?>/" target="_blank" title="<?=_('open webmail');?>"><i class="fas fa-paper-plane status-icon lightblue status-icon dim"></i></a></div>
+												<div class="actions-panel__col actions-panel__edit" key-action="href"><a href="http://<?=$webmail;?>.<?=$key?>/" target="_blank" title="<?= _("open webmail") ?>"><i class="fas fa-paper-plane status-icon lightblue status-icon dim"></i></a></div>
 											<?php } ?>
 										<?php } ?>
-										<div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/mail/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Mail Domain');?>"><i class="fas fa-pencil status-icon orange status-icon dim"></i></a></div>
+										<div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/mail/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Editing Mail Domain") ?>"><i class="fas fa-pencil status-icon orange status-icon dim"></i></a></div>
 									<?php } ?>
-									<div class="actions-panel__col actions-panel__edit shortcut-l" key-action="href"><a href="?domain=<?=$key?>&dns=1&token=<?=$_SESSION['token']?>" title="<?=_('DNS records');?>"><i class="fas fa-book-atlas status-icon blue status-icon dim"></i></a></div>
+									<div class="actions-panel__col actions-panel__edit shortcut-l" key-action="href"><a href="?domain=<?=$key?>&dns=1&token=<?=$_SESSION['token']?>" title="<?= _("DNS records") ?>"><i class="fas fa-book-atlas status-icon blue status-icon dim"></i></a></div>
 									<div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
 										<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>" title="<?=_($spnd_action)?>">
 											<i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
 											<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/mail/?domain=<?=$key?>&token=<?=$_SESSION['token']?>">
-											<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="dialog js-confirm-dialog-suspend" title="<?=_('Confirmation');?>">
+											<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="dialog js-confirm-dialog-suspend" title="<?= _("Confirmation") ?>">
 												<p><?=sprintf($spnd_confirmation,$key)?></p>
 											</div>
 										</a>
 									</div>
 									<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-										<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?=_('delete');?>">
+										<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?= _("delete") ?>">
 											<i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
 											<input type="hidden" name="delete_url" value="/delete/mail/?domain=<?=$key?>&token=<?=$_SESSION['token']?>">
-											<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?=_('Confirmation');?>">
+											<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?= _("Confirmation") ?>">
 												<p><?=sprintf(_('DELETE_DOMAIN_CONFIRMATION'),$key)?></p>
 											</div>
 										</a>

web/templates/pages/list_mail_acc.php

@@ -6,38 +6,38 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/list/mail/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
+			<a class="button button-secondary" id="btn-back" href="/list/mail/"><i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?></a>
 			<?php if ($read_only !== 'true') { ?>
-				<a href="/add/mail/?domain=<?=htmlentities($_GET['domain'])?>" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus status-icon green"></i><?=_('Add Mail Account');?></a>
-				<a href="/edit/mail/?domain=<?=htmlentities($_GET['domain'])?>" class="button button-secondary" id="btn-create"><i class="fas fa-pencil status-icon blue"></i><?=_('Editing Mail Domain');?></a>
+				<a href="/add/mail/?domain=<?=htmlentities($_GET['domain'])?>" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus status-icon green"></i><?= _("Add Mail Account") ?></a>
+				<a href="/edit/mail/?domain=<?=htmlentities($_GET['domain'])?>" class="button button-secondary" id="btn-create"><i class="fas fa-pencil status-icon blue"></i><?= _("Editing Mail Domain") ?></a>
 			<?php } ?>
 		</div>
 		<div class="toolbar-right">
 			<div class="toolbar-sorting">
-				<a href="#" class="toolbar-sorting-toggle" title="<?=_('Sort items');?>">
-					<?=_('sort by');?>:
+				<a href="#" class="toolbar-sorting-toggle" title="<?= _("Sort items") ?>">
+					<?= _("sort by") ?>:
 					<b>
 						<?php if ($_SESSION['userSortOrder'] === 'name') { $label = _('Name'); } else { $label = _('Date'); } ?>
 						<?=$label;?> <i class="fas fa-arrow-down-a-z"></i>
 					</b>
 				</a>
 				<ul class="toolbar-sorting-menu animate__animated animate__fadeIn u-hidden">
-					<li entity="sort-date" sort_as_int="1"><span class="name <?php if ($_SESSION['userSortOrder'] === 'date') { echo 'active'; } ?>"><?=_('Date');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-disk" sort_as_int="1"><span class="name"><?=_('Disk');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-name"><span class="name <?php if ($_SESSION['userSortOrder'] === 'name') { echo 'active'; } ?>"><?=_('Name');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-quota" sort_as_int="1"><span class="name"><?=_('Quota');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-date" sort_as_int="1"><span class="name <?php if ($_SESSION['userSortOrder'] === 'date') { echo 'active'; } ?>"><?= _("Date") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-disk" sort_as_int="1"><span class="name"><?= _("Disk") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-name"><span class="name <?php if ($_SESSION['userSortOrder'] === 'name') { echo 'active'; } ?>"><?= _("Name") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-quota" sort_as_int="1"><span class="name"><?= _("Quota") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
 				</ul>
 				<?php if ($read_only !== 'true') { ?>
 					<form x-bind="BulkEdit" action="/bulk/mail/" method="post">
 						<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
 						<input type="hidden" value="<?=htmlspecialchars($_GET['domain']); ?>" name="domain">
 						<select class="form-select" name="action">
-							<option value=""><?=_('apply to selected');?></option>
-							<option value="suspend"><?=_('suspend');?></option>
-							<option value="unsuspend"><?=_('unsuspend');?></option>
-							<option value="delete"><?=_('delete');?></option>
+							<option value=""><?= _("apply to selected") ?></option>
+							<option value="suspend"><?= _("suspend") ?></option>
+							<option value="unsuspend"><?= _("unsuspend") ?></option>
+							<option value="delete"><?= _("delete") ?></option>
 						</select>
-						<button type="submit" class="toolbar-input-submit" title="<?=_('apply to selected');?>">
+						<button type="submit" class="toolbar-input-submit" title="<?= _("apply to selected") ?>">
 							<i class="fas fa-arrow-right"></i>
 						</button>
 					</form>
@@ -45,9 +45,9 @@
 			</div>
 			<div class="toolbar-search">
 				<form action="/search/" method="get">
-					<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
-					<input type="search" class="form-control js-search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" title="<?=_('Search');?>">
-					<button type="submit" class="toolbar-input-submit" title="<?=_('Search');?>">
+					<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
+					<input type="search" class="form-control js-search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" title="<?= _("Search") ?>">
+					<button type="submit" class="toolbar-input-submit" title="<?= _("Search") ?>">
 						<i class="fas fa-magnifying-glass"></i>
 					</button>
 				</form>
@@ -62,15 +62,15 @@
 		<div class="l-unit__col l-unit__col--right">
 			<div>
 				<div class="clearfix l-unit__stat-col--left super-compact">
-					<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" title="<?=_('Select all');?>" <?=$display_mode;?>>
+					<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 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 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>
 		</div>
 	</div>
@@ -126,13 +126,13 @@
 			sort-quota="<?=$data[$key]['QUOTA']?>" >
 			<div class="l-unit__col l-unit__col--right">
 				<div class="clearfix l-unit__stat-col--left super-compact">
-					<input id="check<?=$i ?>" class="ch-toggle" type="checkbox" title="<?=_('Select');?>" name="account[]" value="<?=$key?>" <?=$display_mode;?>>
+					<input id="check<?=$i ?>" class="ch-toggle" type="checkbox" title="<?= _("Select") ?>" name="account[]" value="<?=$key?>" <?=$display_mode;?>>
 				</div>
 				<div class="clearfix l-unit__stat-col--left wide-3 truncate">
 					<?php if (($read_only === 'true') || ($data[$key]['SUSPENDED'] == 'yes')) { ?>
 						<b><?=$key."@".htmlentities($_GET['domain']);?></b>
 					<?php } else { ?>
-						<b><a href="/edit/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Mail Account');?>: <?=$key?>@<?=htmlspecialchars($_GET['domain'])?>"><?=$key."@".htmlentities($_GET['domain']);?></a></b>
+						<b><a href="/edit/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Editing Mail Account") ?>: <?=$key?>@<?=htmlspecialchars($_GET['domain'])?>"><?=$key."@".htmlentities($_GET['domain']);?></a></b>
 					<?php } ?>
 				</div>
 				<!-- START QUICK ACTION TOOLBAR AREA -->
@@ -144,31 +144,31 @@
 								<?php if ($data[$key]['SUSPENDED'] == 'yes') { ?>
 									&nbsp;
 								<?php } else { ?>
-									<div class="actions-panel__col actions-panel__edit" key-action="href"><a href="http://<?=$v_webmail_alias;?>.<?=htmlspecialchars($_GET['domain'])?>/?_user=<?=$key?>@<?=htmlspecialchars($_GET['domain'])?>" target="_blank" title="<?=_('open webmail');?>"><i class="fas fa-envelope-open-text status-icon maroon status-icon dim"></i></a></div>
+									<div class="actions-panel__col actions-panel__edit" key-action="href"><a href="http://<?=$v_webmail_alias;?>.<?=htmlspecialchars($_GET['domain'])?>/?_user=<?=$key?>@<?=htmlspecialchars($_GET['domain'])?>" target="_blank" title="<?= _("open webmail") ?>"><i class="fas fa-envelope-open-text status-icon maroon status-icon dim"></i></a></div>
 								<?php } ?>
 							<?php } else { ?>
 								<?php if ($data[$key]['SUSPENDED'] == 'no') { ?>
 									<?php if($_SESSION['WEBMAIL_SYSTEM']){?>
 										<?php if (!empty($data[$key]['WEBMAIL'])) { ?>
-											<div class="actions-panel__col actions-panel__edit" key-action="href"><a href="http://<?=$v_webmail_alias;?>.<?=htmlspecialchars($_GET['domain'])?>/?_user=<?=$key?>@<?=htmlspecialchars($_GET['domain'])?>" target="_blank" title="<?=_('open webmail');?>"><i class="fas fa-envelope-open-text status-icon maroon status-icon dim"></i></a></div>
+											<div class="actions-panel__col actions-panel__edit" key-action="href"><a href="http://<?=$v_webmail_alias;?>.<?=htmlspecialchars($_GET['domain'])?>/?_user=<?=$key?>@<?=htmlspecialchars($_GET['domain'])?>" target="_blank" title="<?= _("open webmail") ?>"><i class="fas fa-envelope-open-text status-icon maroon status-icon dim"></i></a></div>
 										<?php } ?>
 									<?php } ?>
-								<div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Mail Account');?>"><i class="fas fa-pencil status-icon orange status-icon dim"></i></a></div>
+								<div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Editing Mail Account") ?>"><i class="fas fa-pencil status-icon orange status-icon dim"></i></a></div>
 								<?php } ?>
 								<div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
 									<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>" title="<?=_($spnd_action)?>">
 										<i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
 										<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?=$key?>&token=<?=$_SESSION['token']?>">
-										<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="dialog js-confirm-dialog-suspend" title="<?=_('Confirmation');?>">
+										<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="dialog js-confirm-dialog-suspend" title="<?= _("Confirmation") ?>">
 											<p><?=sprintf($spnd_confirmation,$key)?></p>
 										</div>
 									</a>
 								</div>
 								<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-									<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?=_('delete');?>">
+									<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?= _("delete") ?>">
 										<i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
 										<input type="hidden" name="delete_url" value="/delete/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?=$key?>&token=<?=$_SESSION['token']?>">
-										<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?=_('Confirmation');?>">
+										<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?= _("Confirmation") ?>">
 											<p><?=sprintf(_('DELETE_MAIL_ACCOUNT_CONFIRMATION'),$key)?></p>
 										</div>
 									</a>
@@ -179,16 +179,16 @@
 					<!-- 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 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">
-					<i class="fas <?=$alias_icon;?>"></i>
+					<i class="fas <?= $alias_icon ?>"></i>
 				</div>
 				<div class="clearfix l-unit__stat-col--left text-center">
-					<i class="fas <?=$fwd_icon;?>"></i>
+					<i class="fas <?= $fwd_icon ?>"></i>
 				</div>
 				<div class="clearfix l-unit__stat-col--left text-center">
-					<i class="fas <?=$autoreply_icon;?>"></i>
+					<i class="fas <?= $autoreply_icon ?>"></i>
 				</div>
 			</div>
 		</div>
@@ -199,7 +199,7 @@
 	<div class="container">
 		<div class="l-unit-ft">
 			<div class="l-unit__col l-unit__col--right">
-				<?php printf(ngettext('%d mail account', '%d mail accounts', $i),$i); ?>
+				<?php printf(ngettext("%d mail account", "%d mail accounts", $i), $i); ?>
 			</div>
 			<div class="l-unit__col l-unit__col--right back clearfix">
 			</div>

web/templates/pages/list_mail_dns.php

@@ -1,11 +1,13 @@
 <?php
-	$v_webmail_alias = "webmail";
-	if (!empty($_SESSION['WEBMAIL_ALIAS'])) $v_webmail_alias = $_SESSION['WEBMAIL_ALIAS'];
+$v_webmail_alias = "webmail";
+if (!empty($_SESSION["WEBMAIL_ALIAS"])) {
+	$v_webmail_alias = $_SESSION["WEBMAIL_ALIAS"];
+}
 ?>
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/list/mail/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
+			<a class="button button-secondary" id="btn-back" href="/list/mail/"><i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?></a>
 		</div>
 		<div class="toolbar-right">
 		</div>
@@ -16,11 +18,11 @@
 	<div class="header table-header">
 		<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 wide-3"><b><?=_('IP or Value');?></b></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 wide-3"><b><?= _("IP or Value") ?></b></div>
 			</div>
 		</div>
 	</div>
@@ -28,27 +30,27 @@
 	<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 wide-3">
-				<input type="text" class="form-control" style="width:260px;" value="mail.<?=htmlspecialchars($_GET['domain']);?>">
+				<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 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'];?>">
+				<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>
 		</div>
 	</div>
-	<?php if($_SESSION['WEBMAIL_SYSTEM']){?>
+	<?php if ($_SESSION["WEBMAIL_SYSTEM"]) { ?>
 		<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 wide-3">
-					<input type="text" class="form-control" style="width:260px;" value="<?=$v_webmail_alias;?>.<?=htmlspecialchars($_GET['domain']);?>">
+					<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 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'];?>">
+					<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>
 			</div>
 		</div>
@@ -56,27 +58,27 @@
 	<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 wide-3">
-				<input type="text" class="form-control" style="width:260px;" value="<?=htmlspecialchars($_GET['domain']);?>">
+				<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 wide-3">
-				<input type="text" class="form-control" style="width:400px;" value="mail.<?=htmlspecialchars($_GET['domain']);?>.">
+				<input type="text" class="form-control" style="width:400px;" value="mail.<?= htmlspecialchars($_GET["domain"]) ?>.">
 			</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 wide-3">
-				<input type="text" class="form-control" style="width:260px;" value="<?=htmlspecialchars($_GET['domain']);?>">
+				<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>
-			<?php $ip = (empty($ips[array_key_first($ips)]['NAT'])) ? array_key_first($ips) : $ips[array_key_first($ips)]['NAT'];?>
+			<?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');?>">
+				<input type="text" class="form-control" style="width:400px;" value="<?= htmlspecialchars("v=spf1 a mx ip4:" . $ip . " -all") ?>">
 			</div>
 		</div>
 	</div>
@@ -89,21 +91,21 @@
 			<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 wide-3">
-				<input type="text" class="form-control" style="width:400px;" value="<?=htmlspecialchars('v=DMARC1; p=quarantine; pct=100');?>">
+				<input type="text" class="form-control" style="width:400px;" value="<?= htmlspecialchars("v=DMARC1; p=quarantine; pct=100") ?>">
 			</div>
 		</div>
 	</div>
-	<?php foreach($dkim as $key => $value){ ?>
+	<?php foreach ($dkim as $key => $value) { ?>
 		<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 wide-3">
-					<input type="text" class="form-control" style="width:260px;" value="<?=htmlspecialchars($key);?>">
+					<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 wide-3">
-					<input type="text" class="form-control" style="width:400px;" value="<?=htmlspecialchars(str_replace(array('"',"'"),'',$dkim[$key]['TXT']));?>">
+					<input type="text" class="form-control" style="width:400px;" value="<?= htmlspecialchars(str_replace(['"', "'"], "", $dkim[$key]["TXT"])) ?>">
 				</div>
 			</div>
 		</div>

web/templates/pages/list_packages.php

@@ -2,29 +2,29 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/list/user/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
-			<a href="/add/package/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus status-icon green"></i><?=_('Add Package');?></a>
+			<a class="button button-secondary" id="btn-back" href="/list/user/"><i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?></a>
+			<a href="/add/package/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus status-icon green"></i><?= _("Add Package") ?></a>
 		</div>
 		<div class="toolbar-right">
 			<div class="toolbar-sorting">
-				<a href="#" class="toolbar-sorting-toggle" title="<?=_('Sort items');?>">
-					<?=_('sort by');?>:
+				<a href="#" class="toolbar-sorting-toggle" title="<?= _("Sort items") ?>">
+					<?= _("sort by") ?>:
 					<b>
 						<?php if ($_SESSION['userSortOrder'] === 'name') { $label = _('Name'); } else { $label = _('Date'); } ?>
 						<?=$label;?> <i class="fas fa-arrow-down-a-z"></i>
 					</b>
 				</a>
 				<ul class="toolbar-sorting-menu animate__animated animate__fadeIn u-hidden">
-					<li entity="sort-date" sort_as_int="1"><span class="name <?php if ($_SESSION['userSortOrder'] === 'date') { echo 'active'; } ?>"><?=_('Date');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-name"><span class="name <?php if ($_SESSION['userSortOrder'] === 'name') { echo 'active'; } ?>"><?=_('Name');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-date" sort_as_int="1"><span class="name <?php if ($_SESSION['userSortOrder'] === 'date') { echo 'active'; } ?>"><?= _("Date") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-name"><span class="name <?php if ($_SESSION['userSortOrder'] === 'name') { echo 'active'; } ?>"><?= _("Name") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
 				</ul>
 				<form x-bind="BulkEdit" action="/bulk/package/" method="post">
 					<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
 					<select class="form-select" name="action">
-						<option value=""><?=_('apply to selected');?></option>
-						<option value="delete"><?=_('delete');?></option>
+						<option value=""><?= _("apply to selected") ?></option>
+						<option value="delete"><?= _("delete") ?></option>
 					</select>
-					<button type="submit" class="toolbar-input-submit" title="<?=_('apply to selected');?>">
+					<button type="submit" class="toolbar-input-submit" title="<?= _("apply to selected") ?>">
 						<i class="fas fa-arrow-right"></i>
 					</button>
 				</form>
@@ -38,22 +38,22 @@
 	<div class="table-header">
 		<div class="l-unit__col l-unit__col--right">
 			<div class="clearfix l-unit__stat-col--left super-compact">
-				<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" title="<?=_('Select all');?>">
+				<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 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 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>
 	</div>
 
@@ -67,12 +67,12 @@
 			sort-bandwidth="<?=$data[$key]['BANDWIDTH']?>" sort-disk="<?=$data[$key]['DISK_QUOTA']?>">
 			<div class="l-unit__col l-unit__col--right">
 				<div class="clearfix l-unit__stat-col--left super-compact">
-					<input id="check<?=$i?>" class="ch-toggle" type="checkbox" title="<?=_('Select');?>" name="user[]" value="<?=$key?>">
+					<input id="check<?=$i?>" class="ch-toggle" type="checkbox" title="<?= _("Select") ?>" name="user[]" value="<?=$key?>">
 				</div>
 				<?php if ($key == 'system'){ ?>
 					<div class="clearfix l-unit__stat-col--left wide-2 truncate"><b><?=$key?></b></div>
 				<?php } else {?>
-					<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>
+					<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">
@@ -81,17 +81,17 @@
 							<?php if (($key == 'system')) { ?>
 								<!-- Restrict editing system package -->
 							<?php } else {?>
-								<div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="/edit/package/?package=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Package');?>"><i class="fas fa-pencil status-icon orange status-icon dim"></i></a></div>
+								<div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="/edit/package/?package=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Editing Package") ?>"><i class="fas fa-pencil status-icon orange status-icon dim"></i></a></div>
 							<?php } ?>
-							<div class="actions-panel__col actions-panel__edit" key-action="href"><a href="/copy/package/?package=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Copy');?>"><i class="fas fa-clone status-icon teal status-icon dim"></i></a></div>
+							<div class="actions-panel__col actions-panel__edit" key-action="href"><a href="/copy/package/?package=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Copy") ?>"><i class="fas fa-clone status-icon teal status-icon dim"></i></a></div>
 							<?php if ($key == 'system') { ?>
 								<!-- Restrict deleting system package -->
 							<?php } else {?>
 								<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-									<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?=_('Delete');?>">
+									<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?= _("Delete") ?>">
 										<i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
 										<input type="hidden" name="delete_url" value="/delete/package/?package=<?=$key?>&token=<?=$_SESSION['token']?>">
-										<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?=_('Confirmation');?>">
+										<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?= _("Confirmation") ?>">
 											<p><?=sprintf(_('DELETE_PACKAGE_CONFIRMATION'),$key)?></p>
 										</div>
 									</a>
@@ -102,108 +102,108 @@
 				</div>
 				<!-- END QUICK ACTION TOOLBAR AREA -->
 				<div class="clearfix l-unit__stat-col--left 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 {?>
+					<?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">
-					<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'])): ?>
+					<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>
 						<?php else: ?>
-							<b><?=humanize_usage_size($data[$key]['DISK_QUOTA'])?></b> <span class="u-text-small"><?=humanize_usage_measure($data[$key]['DISK_QUOTA'])?></span>
+							<b><?= humanize_usage_size($data[$key]["DISK_QUOTA"]) ?></b> <span class="u-text-small"><?= humanize_usage_measure($data[$key]["DISK_QUOTA"]) ?></span>
 						<?php endif; ?>
 					</span>
 				</div>
 				<div class="clearfix l-unit__stat-col--left text-center compact">
-					<span title="<?=_('Bandwidth');?>: <?=humanize_usage_size($data[$key]['BANDWIDTH'])?> <?=humanize_usage_measure($data[$key]['BANDWIDTH'])?>">
-						<?php if ($data[$key]['BANDWIDTH'] == 'unlimited'){ ?>
+					<span title="<?= _("Bandwidth") ?>: <?= humanize_usage_size($data[$key]["BANDWIDTH"]) ?> <?= humanize_usage_measure($data[$key]["BANDWIDTH"]) ?>">
+						<?php if ($data[$key]["BANDWIDTH"] == "unlimited") { ?>
 							<b>&infin;</b>
-						<?php } else {?>
-							<b><?=humanize_usage_size($data[$key]['BANDWIDTH'])?></b> <span class="u-text-small"><?=humanize_usage_measure($data[$key]['BANDWIDTH'])?></span>
+						<?php } else { ?>
+							<b><?= humanize_usage_size($data[$key]["BANDWIDTH"]) ?></b> <span class="u-text-small"><?= humanize_usage_measure($data[$key]["BANDWIDTH"]) ?></span>
 						<?php } ?>
 					</span>
 				</div>
 				<div class="clearfix l-unit__stat-col--left 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'){ ?>
+					<span class="jump-top badge gray raised" title="<?= _("Web Domains") ?>: <?= $data[$key]["WEB_DOMAINS"] ?>">
+						<?php if ($data[$key]["WEB_DOMAINS"] == "unlimited") { ?>
 							<b>&infin;</b>
-						<?php } else {?>
-							<b><?=$data[$key]['WEB_DOMAINS']?></b>
+						<?php } else { ?>
+							<b><?= $data[$key]["WEB_DOMAINS"] ?></b>
 						<?php } ?>
 					</span>
 				</div>
 				<div class="clearfix l-unit__stat-col--left 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'){ ?>
+					<span class="jump-top badge gray raised" title="<?= _("Web Aliases") ?>: <?= $data[$key]["WEB_ALIASES"] ?>">
+						<?php if ($data[$key]["WEB_ALIASES"] == "unlimited") { ?>
 							<b>&infin;</b>
-						<?php } else {?>
-							<b><?=$data[$key]['WEB_ALIASES']?></b>
+						<?php } else { ?>
+							<b><?= $data[$key]["WEB_ALIASES"] ?></b>
 						<?php } ?>
 					</span>
 				</div>
 				<div class="clearfix l-unit__stat-col--left 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'){ ?>
+					<span class="jump-top badge gray raised" title="<?= _("DNS Domains") ?>: <?= $data[$key]["DNS_DOMAINS"] ?>">
+						<?php if ($data[$key]["DNS_DOMAINS"] == "unlimited") { ?>
 							<b>&infin;</b>
-						<?php } else {?>
-							<b><?=$data[$key]['DNS_DOMAINS']?></b>
+						<?php } else { ?>
+							<b><?= $data[$key]["DNS_DOMAINS"] ?></b>
 						<?php } ?>
 					</span>
 				</div>
 				<div class="clearfix l-unit__stat-col--left 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'){ ?>
+					<span class="jump-top badge gray raised" title="<?= _("DNS Records") ?>: <?= $data[$key]["DNS_RECORDS"] ?>">
+						<?php if ($data[$key]["DNS_RECORDS"] == "unlimited") { ?>
 							<b>&infin;</b>
-						<?php } else {?>
-							<b><?=$data[$key]['DNS_RECORDS']?></b>
+						<?php } else { ?>
+							<b><?= $data[$key]["DNS_RECORDS"] ?></b>
 						<?php } ?>
 					</span>
 				</div>
 				<div class="clearfix l-unit__stat-col--left 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'){ ?>
+					<span class="jump-top badge gray raised" title="<?= _("Mail Domains") ?>: <?= $data[$key]["MAIL_DOMAINS"] ?>">
+						<?php if ($data[$key]["MAIL_DOMAINS"] == "unlimited") { ?>
 							<b>&infin;</b>
-						<?php } else {?>
-							<b><?=$data[$key]['MAIL_DOMAINS']?></b>
+						<?php } else { ?>
+							<b><?= $data[$key]["MAIL_DOMAINS"] ?></b>
 						<?php } ?>
 					</span>
 				</div>
 				<div class="clearfix l-unit__stat-col--left 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'){ ?>
+					<span class="jump-top badge gray raised" title="<?= _("Mail Accounts") ?>: <?= $data[$key]["MAIL_ACCOUNTS"] ?>">
+						<?php if ($data[$key]["MAIL_ACCOUNTS"] == "unlimited") { ?>
 							<b>&infin;</b>
-						<?php } else {?>
-							<b><?=$data[$key]['MAIL_ACCOUNTS']?></b>
+						<?php } else { ?>
+							<b><?= $data[$key]["MAIL_ACCOUNTS"] ?></b>
 						<?php } ?>
 					</span>
 				</div>
 				<div class="clearfix l-unit__stat-col--left text-center super-compact">
-					<span class="jump-top badge gray raised" title="<?=_('Databases');?>: <?=$data[$key]['DATABASES']?>">
-						<?php if ($data[$key]['DATABASES'] == 'unlimited'){ ?>
+					<span class="jump-top badge gray raised" title="<?= _("Databases") ?>: <?= $data[$key]["DATABASES"] ?>">
+						<?php if ($data[$key]["DATABASES"] == "unlimited") { ?>
 							<b>&infin;</b>
-						<?php } else {?>
-							<b><?=$data[$key]['DATABASES']?></b>
+						<?php } else { ?>
+							<b><?= $data[$key]["DATABASES"] ?></b>
 						<?php } ?>
 					</span>
 				</div>
 				<div class="clearfix l-unit__stat-col--left 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'){ ?>
+					<span class="jump-top badge gray raised" title="<?= _("Cron Jobs") ?>: <?= $data[$key]["CRON_JOBS"] ?>">
+						<?php if ($data[$key]["CRON_JOBS"] == "unlimited") { ?>
 							<b>&infin;</b>
-						<?php } else {?>
-							<b><?=$data[$key]['CRON_JOBS']?></b>
+						<?php } else { ?>
+							<b><?= $data[$key]["CRON_JOBS"] ?></b>
 						<?php } ?>
 					</span>
 				</div>
 				<div class="clearfix l-unit__stat-col--left text-center super-compact">
-					<span class="jump-top badge gray raised" title="<?=_('Backups');?>: <?=$data[$key]['BACKUPS']?>">
-						<?php if ($data[$key]['BACKUPS'] == 'unlimited'){ ?>
+					<span class="jump-top badge gray raised" title="<?= _("Backups") ?>: <?= $data[$key]["BACKUPS"] ?>">
+						<?php if ($data[$key]["BACKUPS"] == "unlimited") { ?>
 							<b>&infin;</b>
-						<?php } else {?>
-							<b><?=$data[$key]['BACKUPS']?></b>
+						<?php } else { ?>
+							<b><?= $data[$key]["BACKUPS"] ?></b>
 						<?php } ?>
 					</span>
 				</div>
@@ -216,7 +216,7 @@
 	<div class="container">
 		<div class="l-unit-ft">
 			<div class="l-unit__col l-unit__col--right">
-				<?php printf(ngettext('%d package', '%d packages', $i),$i); ?>
+				<?php printf(ngettext("%d package", "%d packages", $i), $i); ?>
 			</div>
 		</div>
 	</div>

web/templates/pages/list_rrd.php

@@ -2,14 +2,14 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
-			<a href="/list/server/?cpu" class="button button-secondary"><i class="fas fa-chart-pie status-icon green"></i><?=_('show: CPU / MEM / NET / DISK');?></a>
+			<a class="button button-secondary" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?></a>
+			<a href="/list/server/?cpu" class="button button-secondary"><i class="fas fa-chart-pie status-icon green"></i><?= _("show: CPU / MEM / NET / DISK") ?></a>
 		</div>
 		<div class="toolbar-right">
-			<a class="toolbar-link<?php if ((empty($period)) || ($period == 'day')) echo " selected" ?>" href="?period=day"><?=_('Daily');?></a>
-			<a class="toolbar-link<?php if ((!empty($period)) && ($period == 'week')) echo " selected" ?>" href="?period=week"><?=_('Weekly');?></a>
-			<a class="toolbar-link<?php if ((!empty($period)) && ($period == 'month')) echo " selected" ?>" href="?period=month"><?=_('Monthly');?></a>
-			<a class="toolbar-link<?php if ((!empty($period)) && ($period == 'year')) echo " selected" ?>" href="?period=year"><?=_('Yearly');?></a>
+			<a class="toolbar-link<?php if ((empty($period)) || ($period == 'day')) echo " selected" ?>" href="?period=day"><?= _("Daily") ?></a>
+			<a class="toolbar-link<?php if ((!empty($period)) && ($period == 'week')) echo " selected" ?>" href="?period=week"><?= _("Weekly") ?></a>
+			<a class="toolbar-link<?php if ((!empty($period)) && ($period == 'month')) echo " selected" ?>" href="?period=month"><?= _("Monthly") ?></a>
+			<a class="toolbar-link<?php if ((!empty($period)) && ($period == 'year')) echo " selected" ?>" href="?period=year"><?= _("Yearly") ?></a>
 		</div>
 	</div>
 </div>
@@ -21,12 +21,12 @@
 		<?php foreach ($data as $key => $value) { ?>
 			<div class="u-mb20">
 				<h2 class="l-unit__name separate">
-					<?=_($data[$key]['TITLE'])?>
+					<?= _($data[$key]["TITLE"]) ?>
 				</h2>
-				<?php if($data[$key]['TYPE'] != 'net'){?>
-				<canvas id="<?=$data[$key]['RRD'];?>" class="js-chart" width="800" height="200" period="<?php echo htmlentities($period);?>"></canvas>
-				<?php }else{?>
-				<canvas id="net_<?=$data[$key]['RRD'];?>" class="js-chart" width="800" height="200" period="<?php echo htmlentities($period);?>"></canvas>
+				<?php if ($data[$key]["TYPE"] != "net") { ?>
+				<canvas id="<?= $data[$key]["RRD"] ?>" class="js-chart" width="800" height="200" period="<?php echo htmlentities($period); ?>"></canvas>
+				<?php } else { ?>
+				<canvas id="net_<?= $data[$key]["RRD"] ?>" class="js-chart" width="800" height="200" period="<?php echo htmlentities($period); ?>"></canvas>
 				<?php } ?>
 			</div>
 		<?php } ?>

web/templates/pages/list_search.php

@@ -2,23 +2,23 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a href="javascript:window.history.back();" class="button button-secondary" id="btn-back"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
-			<a href="javascript:location.reload();" class="button button-secondary"><i class="fas fa-arrows-rotate status-icon green"></i> <?=_('Refresh');?></a>
+			<a href="javascript:window.history.back();" class="button button-secondary" id="btn-back"><i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?></a>
+			<a href="javascript:location.reload();" class="button button-secondary"><i class="fas fa-arrows-rotate status-icon green"></i> <?= _("Refresh") ?></a>
 		</div>
 		<div class="toolbar-right">
 			<div class="toolbar-sorting">
-				<a href="#" class="toolbar-sorting-toggle" title="<?=_('Sort items');?>">
-					<?=_('sort by');?>: <b><?=_('Date');?> <i class="fas fa-arrow-down-a-z"></i></b>
+				<a href="#" class="toolbar-sorting-toggle" title="<?= _("Sort items") ?>">
+					<?= _("sort by") ?>: <b><?= _("Date") ?> <i class="fas fa-arrow-down-a-z"></i></b>
 				</a>
 				<ul class="toolbar-sorting-menu animate__animated animate__fadeIn u-hidden">
-					<li entity="sort-date" sort_as_int="1"><span class="name <?php if ($_SESSION['userSortOrder'] === 'date') { echo 'active'; } ?>"><?=_('Date');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-name"><span class="name <?php if ($_SESSION['userSortOrder'] === 'name') { echo 'active'; } ?>"><?=_('Name');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-date" sort_as_int="1"><span class="name <?php if ($_SESSION['userSortOrder'] === 'date') { echo 'active'; } ?>"><?= _("Date") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-name"><span class="name <?php if ($_SESSION['userSortOrder'] === 'name') { echo 'active'; } ?>"><?= _("Name") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
 				</ul>
 				<div class="toolbar-search">
 					<form action="/search/" method="get">
 						<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
-						<input type="search" class="form-control js-search-input" name="q" value="<? echo isset($_GET['q']) ? htmlspecialchars($_GET['q']) : '' ?>" title="<?=_('Search');?>">
-						<button type="submit" class="toolbar-input-submit" title="<?=_('Search');?>">
+						<input type="search" class="form-control js-search-input" name="q" value="<? echo isset($_GET['q']) ? htmlspecialchars($_GET['q']) : '' ?>" title="<?= _("Search") ?>">
+						<button type="submit" class="toolbar-input-submit" title="<?= _("Search") ?>">
 							<i class="fas fa-magnifying-glass"></i>
 						</button>
 					</form>
@@ -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 wide-5"><b><?=_('Search Results');?></b></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 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 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>
 	</div>
 
@@ -145,7 +145,7 @@
 						<?php if (!($_SESSION['POLICY_SYSTEM_HIDE_ADMIN'] === 'yes' && $value['USER'] !== 'admin')){
 						if ($_SESSION['userContext'] === 'admin'){
 						?>
-							<a href="/login/?loginas=<?=$value['USER']?>&token=<?=$_SESSION['token']?>" title="<?=_('login as');?> <?=$value['USER']?>"><i class="fas fa-right-to-bracket status-icon green status-icon dim icon-large"></i></a>
+							<a href="/login/?loginas=<?=$value['USER']?>&token=<?=$_SESSION['token']?>" title="<?= _("login as") ?> <?=$value['USER']?>"><i class="fas fa-right-to-bracket status-icon green status-icon dim icon-large"></i></a>
 						<?php
 						}
 						}

web/templates/pages/list_server_info.php

@@ -3,9 +3,9 @@
 
 <head>
 	<!-- Load necessary CSS and JavaScript from source -->
-	<?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/title.php'; ?>
-	<?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/css.php'; ?>
-	<?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/js.php'; ?>
+	<?php require "" . $_SERVER["HESTIA"] . "/web/templates/includes/title.php"; ?>
+	<?php require "" . $_SERVER["HESTIA"] . "/web/templates/includes/css.php"; ?>
+	<?php require "" . $_SERVER["HESTIA"] . "/web/templates/includes/js.php"; ?>
 </head>
 
 <body>
@@ -13,52 +13,52 @@
 		<div class="top-bar">
 			<div class="container top-bar-inner">
 				<div class="top-bar-left">
-					<a href="/list/web/" class="top-bar-logo" title="<?=_('Hestia Control Panel');?>">
-						<img src="/images/logo-header.svg" alt="<?=_('Hestia Control Panel');?>" width="54" height="29">
+					<a href="/" class="top-bar-logo" title="<?= _("Hestia Control Panel") ?>">
+						<img src="/images/logo-header.svg" alt="<?= _("Hestia Control Panel") ?>" width="54" height="29">
 					</a>
 				</div>
 				<div class="top-bar-right">
 					<nav x-data="{ open: false }" class="top-bar-menu">
-						<button x-on:click="open = !open" type="button" class="top-bar-menu-link u-hide-tablet" title="<?=_('Toggle menu');?>">
+						<button x-on:click="open = !open" type="button" class="top-bar-menu-link u-hide-tablet" title="<?= _("Toggle menu") ?>">
 							<i class="fas fa-bars"></i>
-							<span class="u-hidden"><?=_('Toggle menu');?></span>
+							<span class="u-hidden"><?= _("Toggle menu") ?></span>
 						</button>
 						<ul x-cloak x-show="open" class="top-bar-menu-list animate__animated animate__fadeIn">
 							<li class="top-bar-menu-item">
-								<a class="top-bar-menu-link" href="/list/rrd/" title="<?=_('Back');?>">
+								<a class="top-bar-menu-link" href="/list/rrd/" title="<?= _("Back") ?>">
 									<i class="fas fa-circle-left"></i>
-									<span class="top-bar-menu-link-label"><?=_('Back');?></span>
+									<span class="top-bar-menu-link-label"><?= _("Back") ?></span>
 								</a>
 							</li>
 							<li class="top-bar-menu-item">
 								<a class="top-bar-menu-link <?php if(isset($_GET['cpu'])) echo 'active' ?>" href="/list/server/?cpu">
 									<i class="fas fa-microchip"></i>
-									<span class="top-bar-menu-link-label"><?=_('CPU');?></span>
+									<span class="top-bar-menu-link-label"><?= _("CPU") ?></span>
 								</a>
 							</li>
 							<li class="top-bar-menu-item">
 								<a class="top-bar-menu-link <?php if(isset($_GET['mem'])) echo 'active' ?>" href="/list/server/?mem">
 									<i class="fas fa-memory"></i>
-									<span class="top-bar-menu-link-label"><?=_('RAM');?></span>
+									<span class="top-bar-menu-link-label"><?= _("RAM") ?></span>
 								</a>
 							</li>
 							<li class="top-bar-menu-item">
 								<a class="top-bar-menu-link <?php if(isset($_GET['disk'])) echo 'active' ?>" href="/list/server/?disk">
 									<i class="fas fa-hard-drive"></i>
-									<span class="top-bar-menu-link-label"><?=_('Disk');?></span>
+									<span class="top-bar-menu-link-label"><?= _("Disk") ?></span>
 								</a>
 							</li>
 							<li class="top-bar-menu-item">
 								<a class="top-bar-menu-link <?php if(isset($_GET['net'])) echo 'active' ?>" href="/list/server/?net">
 									<i class="fas fa-hard-drive"></i>
-									<span class="top-bar-menu-link-label"><?=_('Network');?></span>
+									<span class="top-bar-menu-link-label"><?= _("Network") ?></span>
 								</a>
 							</li>
 							<?php if ((isset($_SESSION['WEB_SYSTEM'])) && (!empty($_SESSION['WEB_SYSTEM']))) {?>
 								<li class="top-bar-menu-item">
 									<a class="top-bar-menu-link <?php if(isset($_GET['web'])) echo 'active' ?>" href="/list/server/?web">
 										<i class="fas fa-earth-europe"></i>
-										<span class="top-bar-menu-link-label"><?=_('Web');?></span>
+										<span class="top-bar-menu-link-label"><?= _("Web") ?></span>
 									</a>
 								</li>
 							<?php }?>
@@ -66,7 +66,7 @@
 								<li class="top-bar-menu-item">
 									<a class="top-bar-menu-link <?php if(isset($_GET['dns'])) echo 'active' ?>" href="/list/server/?dns">
 										<i class="fas fa-book-atlas"></i>
-										<span class="top-bar-menu-link-label"><?=_('DNS');?></span>
+										<span class="top-bar-menu-link-label"><?= _("DNS") ?></span>
 									</a>
 								</li>
 							<?php }?>
@@ -74,7 +74,7 @@
 								<li class="top-bar-menu-item">
 									<a class="top-bar-menu-link <?php if(isset($_GET['mail'])) echo 'active' ?>" href="/list/server/?mail">
 										<i class="fas fa-envelopes-bulk"></i>
-										<span class="top-bar-menu-link-label"><?=_('Mail');?></span>
+										<span class="top-bar-menu-link-label"><?= _("Mail") ?></span>
 									</a>
 								</li>
 							<?php }?>
@@ -82,20 +82,20 @@
 								<li class="top-bar-menu-item">
 									<a class="top-bar-menu-link <?php if(isset($_GET['db'])) echo 'active' ?>" href="/list/server/?db">
 										<i class="fas fa-database"></i>
-										<span class="top-bar-menu-link-label"><?=_('DB');?></span>
+										<span class="top-bar-menu-link-label"><?= _("DB") ?></span>
 									</a>
 								</li>
 							<?php }?>
 							<li class="top-bar-menu-item">
-								<a class="top-bar-menu-link" href="javascript:location.reload();" title="<?=_('Refresh');?>">
+								<a class="top-bar-menu-link" href="javascript:location.reload();" title="<?= _("Refresh") ?>">
 									<i class="fas fa-arrow-rotate-right"></i>
-									<span class="u-hidden"><?=_('Refresh');?></span>
+									<span class="u-hidden"><?= _("Refresh") ?></span>
 								</a>
 							</li>
 							<li class="top-bar-menu-item">
-								<a class="top-bar-menu-link top-bar-menu-link-logout" href="/logout/?token=<?=$_SESSION['token']?>" title="<?=_('Log out');?>">
+								<a class="top-bar-menu-link top-bar-menu-link-logout" href="/logout/?token=<?=$_SESSION['token']?>" title="<?= _("Log out") ?>">
 									<i class="fas fa-right-from-bracket"></i>
-									<span class="u-hidden"><?=_('Log out');?></span>
+									<span class="u-hidden"><?= _("Log out") ?></span>
 								</a>
 							</li>
 						</ul>
@@ -108,10 +108,10 @@
 	<a
 		href="#top"
 		class="button button-secondary button-circle button-floating button-floating-top "
-		title="<?=_('Top');?>"
+		title="<?= _("Top") ?>"
 	>
 		<i class="fas fa-arrow-up"></i>
-		<span class="u-hidden"><?=_('Top');?></span>
+		<span class="u-hidden"><?= _("Top") ?></span>
 	</a>
 
 	<div class="server-console-output">.</div>

web/templates/pages/list_server_preview.php

@@ -2,7 +2,7 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a href="/edit/server/" class="button button-secondary" id="btn-back"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
+			<a href="/edit/server/" class="button button-secondary" id="btn-back"><i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?></a>
 		</div>
 		<div class="toolbar-buttons">
 		</div>
@@ -15,9 +15,9 @@
 	<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"><b><?=_('Category');?></b></div>
-			<div class="clearfix l-unit__stat-col--left wide-6"><b><?=_('Name');?></b></div>
-			<div class="clearfix l-unit__stat-col--left wide-2"><b><?=_('Status');?></b></div>
+			<div class="clearfix l-unit__stat-col--left"><b><?= _("Category") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left wide-6"><b><?= _("Name") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left wide-2"><b><?= _("Status") ?></b></div>
 
 		</div>
 	</div>
@@ -27,8 +27,8 @@
 			<div class="clearfix l-unit__stat-col--left super-compact text-center">
 				<i class="fas fa-gear status-icon blue"></i>
 			</div>
-			<div class="clearfix l-unit__stat-col--left"><b><?=_('System');?></b></div>
-			<div class="clearfix l-unit__stat-col--left wide-6"><b><?=_('Policy');?>: <?=_('Allow suspended users to log in with read-only access');?></b></div>
+			<div class="clearfix l-unit__stat-col--left"><b><?= _("System") ?></b></div>
+			<div class="clearfix l-unit__stat-col--left wide-6"><b><?= _("Policy") ?>: <?= _("Allow suspended users to log in with read-only access") ?></b></div>
 			<div class="clearfix l-unit__stat-col--left wide-2">Partially implemented.</div>
 		</div>
 	</div>

web/templates/pages/list_services.php

@@ -3,42 +3,42 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a href="/edit/server/" class="button button-secondary">
-				<i class="fas fa-gear status-icon maroon"></i><?=_('Configure');?>
+				<i class="fas fa-gear status-icon maroon"></i><?= _("Configure") ?>
 			</a>
 			<a href="/list/rrd/" class="button button-secondary">
-				<i class="fas fa-chart-area status-icon blue"></i><?=_('Graphs');?>
+				<i class="fas fa-chart-area status-icon blue"></i><?= _("Graphs") ?>
 			</a>
 			<a href="/list/updates/" class="button button-secondary">
-				<i class="fas fa-arrows-rotate status-icon green"></i><?=_('Updates');?>
+				<i class="fas fa-arrows-rotate status-icon green"></i><?= _("Updates") ?>
 			</a>
-			<?php if (!empty($_SESSION['FIREWALL_SYSTEM']) && $_SESSION['FIREWALL_SYSTEM'] == "iptables" ) {?>
+			<?php if (!empty($_SESSION["FIREWALL_SYSTEM"]) && $_SESSION["FIREWALL_SYSTEM"] == "iptables") { ?>
 				<a href="/list/firewall/" class="button button-secondary">
-					<i class="fas fa-shield-halved status-icon red"></i><?=_('Firewall');?>
+					<i class="fas fa-shield-halved status-icon red"></i><?= _("Firewall") ?>
 				</a>
-			<?php }?>
-			<a href="/list/log/?user=system&token=<?=$_SESSION['token']?>" class="button button-secondary">
-				<i class="fas fa-binoculars status-icon orange"></i><?=_('Logs');?>
+			<?php } ?>
+			<a href="/list/log/?user=system&token=<?= $_SESSION["token"] ?>" class="button button-secondary">
+				<i class="fas fa-binoculars status-icon orange"></i><?= _("Logs") ?>
 			</a>
 			<div class="actions-panel" key-action="js">
 				<a class="data-controls do_servicerestart button button-secondary button-danger">
-					<i class="do_servicerestart fas fa-arrow-rotate-left status-icon red"></i><?=_('Restart');?>
-					<input type="hidden" name="servicerestart_url" value="/restart/system/?hostname=<?=$sys['sysinfo']['HOSTNAME'] ?>&token=<?=$_SESSION['token']?>&system_reset_token=<?=time(); ?>">
-					<div class="dialog js-confirm-dialog-servicerestart" title="<?=_('Confirmation');?>">
-						<p><?=sprintf(_('RESTART_CONFIRMATION'), 'Server');?></p>
+					<i class="do_servicerestart fas fa-arrow-rotate-left status-icon red"></i><?= _("Restart") ?>
+					<input type="hidden" name="servicerestart_url" value="/restart/system/?hostname=<?= $sys["sysinfo"]["HOSTNAME"] ?>&token=<?= $_SESSION["token"] ?>&system_reset_token=<?= time() ?>">
+					<div class="dialog js-confirm-dialog-servicerestart" title="<?= _("Confirmation") ?>">
+						<p><?= sprintf(_("RESTART_CONFIRMATION"), "Server") ?></p>
 					</div>
 				</a>
 			</div>
 		</div>
 		<div class="toolbar-right">
 			<form x-bind="BulkEdit" action="/bulk/service/" method="post">
-				<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+				<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 				<select class="form-select" name="action">
-					<option value=""><?=_('apply to selected');?></option>
-					<option value="stop"><?=_('stop');?></option>
-					<option value="start"><?=_('start');?></option>
-					<option value="restart"><?=_('restart');?></option>
+					<option value=""><?= _("apply to selected") ?></option>
+					<option value="stop"><?= _("stop") ?></option>
+					<option value="start"><?= _("start") ?></option>
+					<option value="restart"><?= _("restart") ?></option>
 				</select>
-				<button type="submit" class="toolbar-input-submit" title="<?=_('apply to selected');?>">
+				<button type="submit" class="toolbar-input-submit" title="<?= _("apply to selected") ?>">
 					<i class="fas fa-arrow-right"></i>
 				</button>
 			</form>
@@ -54,36 +54,36 @@
 			<i class="fas fa-server"></i>
 		</div>
 		<div class="server-summary-content">
-			<h1 class="server-summary-title"><?=$sys['sysinfo']['HOSTNAME']?></h1>
+			<h1 class="server-summary-title"><?= $sys["sysinfo"]["HOSTNAME"] ?></h1>
 			<ul class="server-summary-list">
 				<li class="server-summary-item">
-					<span class="server-summary-list-label"><?=_('Hestia Control Panel');?></span>
+					<span class="server-summary-list-label"><?= _("Hestia Control Panel") ?></span>
 					<span class="server-summary-list-value">
-						<?php if ($sys['sysinfo']['RELEASE'] != 'release') { ?>
-							<i class="fas fa-flask icon-large status-icon red" title="<?=$sys['sysinfo']['RELEASE'];?>"></i>
+						<?php if ($sys["sysinfo"]["RELEASE"] != "release") { ?>
+							<i class="fas fa-flask icon-large status-icon red" title="<?= $sys["sysinfo"]["RELEASE"] ?>"></i>
 						<?php } ?>
-						<?php if ($sys['sysinfo']['RELEASE'] == 'release') { ?>
-							<i class="fas fa-cube icon-large status-icon" title="<?=_('Production release');?>"></i>
+						<?php if ($sys["sysinfo"]["RELEASE"] == "release") { ?>
+							<i class="fas fa-cube icon-large status-icon" title="<?= _("Production release") ?>"></i>
 						<?php } ?>
-						&nbsp;v<?=$sys['sysinfo']['HESTIA']?>
+						&nbsp;v<?= $sys["sysinfo"]["HESTIA"] ?>
 					</span>
 				</li>
 				<li class="server-summary-item">
-					<span class="server-summary-list-label"><?=_('Operating System');?></span>
+					<span class="server-summary-list-label"><?= _("Operating System") ?></span>
 					<span class="server-summary-list-value">
-						<?=$sys['sysinfo']['OS']?> <?=$sys['sysinfo']['VERSION']?> (<?=$sys['sysinfo']['ARCH']?>)
+						<?= $sys["sysinfo"]["OS"] ?> <?= $sys["sysinfo"]["VERSION"] ?> (<?= $sys["sysinfo"]["ARCH"] ?>)
 					</span>
 				</li>
 				<li class="server-summary-item">
-					<span class="server-summary-list-label"><?=_('Load Average');?></span>
+					<span class="server-summary-list-label"><?= _("Load Average") ?></span>
 					<span class="server-summary-list-value">
-						<?=$sys['sysinfo']['LOADAVERAGE']?>
+						<?= $sys["sysinfo"]["LOADAVERAGE"] ?>
 					</span>
 				</li>
 				<li class="server-summary-item">
-					<span class="server-summary-list-label"><?=_('Uptime');?></span>
+					<span class="server-summary-list-label"><?= _("Uptime") ?></span>
 					<span class="server-summary-list-value">
-						<?=humanize_time($sys['sysinfo']['UPTIME'])?>
+						<?= humanize_time($sys["sysinfo"]["UPTIME"]) ?>
 					</span>
 				</li>
 			</ul>
@@ -95,15 +95,15 @@
 		<div class="table-header">
 			<div class="l-unit__col l-unit__col--right">
 				<div class="clearfix l-unit__stat-col--left super-compact">
-					<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" title="<?=_('Select all');?>">
+					<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><?=_('Service');?></b></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 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 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>
 		</div>
 
@@ -136,22 +136,22 @@
 				sort-memory="<?=$data[$key]['MEM']?>" sort-cpu="<?=$cpu;?>" sort-uptime="<?=$data[$key]['RTIME']?>">
 				<div class="l-unit__col l-unit__col--right">
 					<div class="clearfix l-unit__stat-col--left super-compact">
-						<input id="check<?=$i ?>" class="ch-toggle" type="checkbox" title="<?=_('Select');?>" name="service[]" value="<?=$key?>">
+						<input id="check<?=$i ?>" class="ch-toggle" type="checkbox" title="<?= _("Select") ?>" name="service[]" value="<?=$key?>">
 					</div>
 					<div class="clearfix l-unit__stat-col--left wide-2">
 						<i class="fas <?=$state_icon;?> icon-pad-right"></i>
-						<b><a href="/edit/server/<? echo $edit_url ?>/" title="<?=_('edit');?>: <?=$key?>"><?=$key?></a></b>
+						<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="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>
+								<a href="/edit/server/<? echo $edit_url ?>/" title="<?= _("edit") ?>"><i class="fas fa-pencil status-icon orange status-icon dim icon-large"></i></a>
 							</div>
 							<div class="actions-panel__col actions-panel__stop shortcut-s" key-action="js">
-								<a id="restart_link_<?=$i?>" class="data-controls do_servicerestart" title="<?=_('restart');?>">
+								<a id="restart_link_<?=$i?>" class="data-controls do_servicerestart" title="<?= _("restart") ?>">
 									<i class="do_servicerestart data-controls fas fa-arrow-rotate-left status-icon highlight status-icon dim icon-large"></i>
 									<input type="hidden" name="servicerestart_url" value="/restart/service/?srv=<?=$key?>&token=<?=$_SESSION['token']?>">
-									<div id="restart_link_dialog_<?=$i?>" class="dialog js-confirm-dialog-servicerestart" title="<?=_('Confirmation');?>">
+									<div id="restart_link_dialog_<?=$i?>" class="dialog js-confirm-dialog-servicerestart" title="<?= _("Confirmation") ?>">
 										<p><?=sprintf(_('RESTART_CONFIRMATION'),$key); ?></p>
 									</div>
 								</a>
@@ -160,7 +160,7 @@
 								<a id="delete_link_<?=$i?>" class="data-controls do_servicestop" title="<?=_($action)?>">
 									<i class="do_servicestop fas <?=$spnd_icon?> status-icon red status-icon dim icon-large"></i>
 									<input type="hidden" name="servicestop_url" value="/<?=$action ?>/service/?srv=<?=$key?>&token=<?=$_SESSION['token']?>">
-									<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-servicestop" title="<?=_('Confirmation');?>">
+									<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-servicestop" title="<?= _("Confirmation") ?>">
 										<p><?php if($action == 'stop'){ echo sprintf(_('Are you sure you want to stop service'),$key); }else{ echo sprintf(_('Are you sure you want to start service'),$key); }?></p>
 									</div>
 								</a>
@@ -170,7 +170,7 @@
 					<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 text-center"><b><?=$data[$key]['MEM']?> <?= _("mb") ?></b></div>
 				</div>
 			</div>
 		<?php } ?>

web/templates/pages/list_ssl.php

@@ -11,35 +11,35 @@
 <div class="container animate__animated animate__fadeIn">
 
 	<form id="vstobjects" name="v_generate_csr" method="post">
-		<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
+		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 
 		<div class="form-container">
-			<h1 class="form-title"><?=_('Generating CSR');?></h1>
-			<?php show_alert_message($_SESSION);?>
+			<h1 class="form-title"><?= _("Generating CSR") ?></h1>
+			<?php show_alert_message($_SESSION); ?>
 			<div class="u-mb20">
 				<label for="v_crt" class="form-label">
-					<?=_('SSL Certificate');?>
-					<a href="javascript:saveTextToBlob('<?php echo htmlentities($v_domain);?>.crt', 'v_crt');"><i class="fas fa-download"></i></a>
+					<?= _("SSL Certificate") ?>
+					<a href="javascript:saveTextToBlob('<?php echo htmlentities($v_domain); ?>.crt', 'v_crt');"><i class="fas fa-download"></i></a>
 				</label>
-				<textarea class="form-control u-min-height100" name="v_crt" id="v_crt"><?=$v_crt ?></textarea>
+				<textarea class="form-control u-min-height100" name="v_crt" id="v_crt"><?= $v_crt ?></textarea>
 			</div>
 			<div class="u-mb20">
 				<label for="v_key" class="form-label">
-					<?=_('SSL Key');?>
-					<a href="javascript:saveTextToBlob('<?php echo htmlentities($v_domain);?>.key', 'v_key');"><i class="fas fa-download"></i></a>
+					<?= _("SSL Key") ?>
+					<a href="javascript:saveTextToBlob('<?php echo htmlentities($v_domain); ?>.key', 'v_key');"><i class="fas fa-download"></i></a>
 				</label>
-				<textarea class="form-control u-min-height100" name="v_key" id="v_key"><?=$v_key ?></textarea>
+				<textarea class="form-control u-min-height100" name="v_key" id="v_key"><?= $v_key ?></textarea>
 			</div>
 			<div class="u-mb20">
 				<label for="v_csr" class="form-label">
-					<?=_('SSL CSR');?>
-					<a href="javascript:saveTextToBlob('<?php echo htmlentities($v_domain);?>.csr', 'v_crt');"><i class="fas fa-download"></i></a>
+					<?= _("SSL CSR") ?>
+					<a href="javascript:saveTextToBlob('<?php echo htmlentities($v_domain); ?>.csr', 'v_crt');"><i class="fas fa-download"></i></a>
 				</label>
-				<textarea class="form-control u-min-height100" name="v_csr" id="v_csr"><?=$v_csr ?></textarea>
+				<textarea class="form-control u-min-height100" name="v_csr" id="v_csr"><?= $v_csr ?></textarea>
 			</div>
 			<div>
-				<button type="button" class="button button-secondary" onclick="<?=$back?>">
-					<?=_('Back');?>
+				<button type="button" class="button button-secondary" onclick="<?= $back ?>">
+					<?= _("Back") ?>
 				</button>
 			</div>
 		</div>

web/templates/pages/list_stats.php

@@ -3,7 +3,7 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<?php if (($_SESSION['userContext'] === 'admin') && (!isset($_SESSION['look']))) { ?>
-				<a class="button button-secondary" href='/list/stats/'><i class="fas fa-binoculars status-icon lightblue"></i><?=_('Overall Statistics');?></a>
+				<a class="button button-secondary" href='/list/stats/'><i class="fas fa-binoculars status-icon lightblue"></i><?= _("Overall Statistics") ?></a>
 			<?php } ?>
 		</div>
 		<div class="toolbar-right">
@@ -11,7 +11,7 @@
 				<form x-bind="BulkEdit" action="/list/stats/" method="get">
 					<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
 					<select class="form-select" name="user">
-						<option value=""><?=_('show per user');?></option>
+						<option value=""><?= _("show per user") ?></option>
 						<?php
 							foreach ($users as $key => $value) {
 								if (($_SESSION['POLICY_SYSTEM_HIDE_ADMIN'] === 'yes') && ($value === 'admin')) {
@@ -26,7 +26,7 @@
 							}
 						?>
 					</select>
-					<button type="submit" class="toolbar-input-submit" title="<?=_('apply to selected');?>">
+					<button type="submit" class="toolbar-input-submit" title="<?= _("apply to selected") ?>">
 						<i class="fas fa-arrow-right"></i>
 					</button>
 				</form>
@@ -34,8 +34,8 @@
 			<div class="toolbar-search">
 				<form action="/search/" method="get">
 					<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
-					<input type="search" class="form-control js-search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" title="<?=_('Search');?>">
-					<button type="submit" class="toolbar-input-submit" title="<?=_('Search');?>">
+					<input type="search" class="form-control js-search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" title="<?= _("Search") ?>">
+					<button type="submit" class="toolbar-input-submit" title="<?= _("Search") ?>">
 						<i class="fas fa-magnifying-glass"></i>
 					</button>
 				</form>
@@ -48,10 +48,8 @@
 <div class="container units">
 
 	<!-- Begin statistics list item loop -->
-	<?php
-		foreach ($data as $key => $value) {
-		++$i;
-		?>
+	<?php foreach ($data as $key => $value) {
+ 	++$i; ?>
 		<div class="header animate__animated animate__fadeIn">
 			<div class="l-unit">
 				<div class="l-unit-toolbar clearfix">
@@ -68,7 +66,7 @@
 				<div class="l-unit__col l-unit__col--right">
 					<div class="l-unit__name separate">
 						<?php $date = new DateTime($key);
-						echo _($date -> format('M')) .' '.$date -> format('Y');?>
+						echo _($date -> format('M')) .' '.$date -> format('Y') ?>
 					</div>
 					<div class="l-unit__stats">
 						<table>
@@ -77,30 +75,30 @@
 									<div class="l-unit__stat-cols clearfix">
 										<div class="l-unit__stat-cols clearfix graph">
 											<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>
+												<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">
-												<b><?=humanize_usage_size($data[$key]['U_BANDWIDTH'])?></b> <?=humanize_usage_measure($data[$key]['U_BANDWIDTH'])?>
+												<b><?= humanize_usage_size($data[$key]["U_BANDWIDTH"]) ?></b> <?= humanize_usage_measure($data[$key]["U_BANDWIDTH"]) ?>
 											</div>
 										</div>
 										<div class="l-percent">
-											<div class="l-percent__fill" style="width: <?=get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH'])?>%"></div>
+											<div class="l-percent__fill" style="width: <?= get_percentage($data[$key]["U_BANDWIDTH"], $data[$key]["BANDWIDTH"]) ?>%"></div>
 										</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"><?=_('Web Domains');?>:</div>
+										<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--right statistics-count">
-											<b><?=$data[$key]['U_WEB_DOMAINS']?></b>
+											<b><?= $data[$key]["U_WEB_DOMAINS"] ?></b>
 										</div>
 									</div>
 								</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 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>
+											<b><?= $data[$key]["U_MAIL_DOMAINS"] ?></b>
 										</div>
 									</div>
 								</td>
@@ -109,25 +107,25 @@
 								<td>
 									<div class="l-unit__stat-cols clearfix u-text-small">
 										<div class="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 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 } ?>
 										</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"><?=_('SSL Domains');?>:</div>
+										<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--right statistics-count">
-											<b><?=$data[$key]['U_WEB_SSL']?></b>
+											<b><?= $data[$key]["U_WEB_SSL"] ?></b>
 										</div>
 									</div>
 								</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 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>
+											<b><?= $data[$key]["U_MAIL_ACCOUNTS"] ?></b>
 										</div>
 									</div>
 								</td>
@@ -135,28 +133,28 @@
 							<tr>
 								<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--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">
-											<b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK'])?>
+											<b><?= humanize_usage_size($data[$key]["U_DISK"]) ?></b> <?= humanize_usage_measure($data[$key]["U_DISK"]) ?>
 										</div>
 									</div>
 									<div class="l-percent">
-										<div class="l-percent__fill" style="width: <?=get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA'])?>%"></div>
+										<div class="l-percent__fill" style="width: <?= get_percentage($data[$key]["U_DISK"], $data[$key]["DISK_QUOTA"]) ?>%"></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"><?=_('Web Aliases');?>:</div>
+										<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--right statistics-count">
-											<b><?=$data[$key]['U_WEB_ALIASES']?></b>
+											<b><?= $data[$key]["U_WEB_ALIASES"] ?></b>
 										</div>
 									</div>
 								</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 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>
+											<b><?= $data[$key]["U_DATABASES"] ?></b>
 										</div>
 									</div>
 								</td>
@@ -165,26 +163,26 @@
 								<td>
 									<div class="l-unit__stat-cols clearfix u-text-small">
 										<div class="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'])?>
+											<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">
-											<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'])?>
+											<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 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>
+											<b><?= $data[$key]["U_DNS_DOMAINS"] ?></b>
 										</div>
 									</div>
 								</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 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>
+											<b><?= $data[$key]["U_CRON_JOBS"] ?></b>
 										</div>
 									</div>
 								</td>
@@ -193,26 +191,26 @@
 								<td>
 									<div class="l-unit__stat-cols clearfix u-text-small">
 										<div class="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'])?>
+											<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">
-											<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'])?>
+											<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 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>
+											<b><?= $data[$key]["U_DNS_RECORDS"] ?></b>
 										</div>
 									</div>
 								</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 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>
+											<b><?= $data[$key]["U_BACKUPS"] ?></b>
 										</div>
 									</div>
 								</td>
@@ -229,7 +227,7 @@
 	<div class="container">
 		<div class="l-unit-ft">
 			<div class="l-unit__col l-unit__col--right">
-				<?php printf(ngettext('%d month', '%d months', $i),$i); ?>
+				<?php printf(ngettext("%d month", "%d months", $i), $i); ?>
 			</div>
 		</div>
 	</div>

web/templates/pages/list_updates.php

@@ -2,7 +2,7 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
+			<a class="button button-secondary" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?></a>
 			<?php
 				if($autoupdate == 'Enabled') {
 					$btn_url = '/delete/cron/autoupdate/?token='.$_SESSION['token'].'';
@@ -25,12 +25,12 @@
 		<div class="l-unit__col l-unit__col--right">
 			<div>
 				<div class="clearfix l-unit__stat-col--left super-compact center">
-					<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" title="<?=_('Select all');?>">
+					<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"><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 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>
 		</div>
 	</div>
@@ -57,7 +57,7 @@
 			<div class="l-unit__col l-unit__col--right">
 				<div>
 					<div class="clearfix l-unit__stat-col--left super-compact center">
-						<input id="check<?=$i ?>" class="ch-toggle" type="checkbox" title="<?=_('Select');?>" name="pkg[]" value="<?=$key?>">
+						<input id="check<?=$i ?>" class="ch-toggle" type="checkbox" title="<?= _("Select") ?>" name="pkg[]" value="<?=$key?>">
 					</div>
 					<div class="clearfix l-unit__stat-col--left wide"><b><?=$key?></b></div>
 					<div class="clearfix l-unit__stat-col--left wide-5"><?=_($data[$key]['DESCR'])?></div>

web/templates/pages/list_user.php

@@ -2,41 +2,41 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a href="/add/user/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus status-icon green"></i><?=_('Add User');?></a>
-			<a href="/list/package/" class="button button-secondary"><i class="fas fa-box-open status-icon orange"></i><?=_('Packages');?></a>
+			<a href="/add/user/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus status-icon green"></i><?= _("Add User") ?></a>
+			<a href="/list/package/" class="button button-secondary"><i class="fas fa-box-open status-icon orange"></i><?= _("Packages") ?></a>
 		</div>
 		<div class="toolbar-right">
 			<div class="toolbar-sorting">
-				<a href="#" class="toolbar-sorting-toggle" title="<?=_('Sort items');?>">
-					<?=_('sort by');?>:
+				<a href="#" class="toolbar-sorting-toggle" title="<?= _("Sort items") ?>">
+					<?= _("sort by") ?>:
 					<b>
 						<?php if ($_SESSION['userSortOrder'] === 'name') { $label = _('Name'); } else { $label = _('Date'); } ?>
 						<?=$label;?> <i class="fas fa-arrow-down-a-z"></i>
 					</b>
 				</a>
 				<ul class="toolbar-sorting-menu animate__animated animate__fadeIn u-hidden">
-					<li entity="sort-bandwidth" sort_as_int="1"><span class="name"><?=_('Bandwidth');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-date" sort_as_int="1"><span class="name <?php if ($_SESSION['userSortOrder'] === 'date') { echo 'active'; } ?>"><?=_('Date');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-disk" sort_as_int="1"><span class="name"><?=_('Disk');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-name"><span class="name <?php if ($_SESSION['userSortOrder'] === 'name') { echo 'active'; } ?>"><?=_('Name');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-bandwidth" sort_as_int="1"><span class="name"><?= _("Bandwidth") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-date" sort_as_int="1"><span class="name <?php if ($_SESSION['userSortOrder'] === 'date') { echo 'active'; } ?>"><?= _("Date") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-disk" sort_as_int="1"><span class="name"><?= _("Disk") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-name"><span class="name <?php if ($_SESSION['userSortOrder'] === 'name') { echo 'active'; } ?>"><?= _("Name") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
 				</ul>
 				<form x-bind="BulkEdit" action="/bulk/user/" method="post">
 					<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
 					<select class="form-select" name="action">
-						<option value=""><?=_('apply to selected');?></option>
-						<option value="rebuild"><?=_('rebuild');?></option>
-						<option value="rebuild user"><?=_('rebuild user');?></option>
-						<option value="rebuild web"><?=_('rebuild web');?></option>
-						<option value="rebuild dns"><?=_('rebuild dns');?></option>
-						<option value="rebuild mail"><?=_('rebuild mail');?></option>
-						<option value="rebuild db"><?=_('rebuild db');?></option>
-						<option value="rebuild cron"><?=_('rebuild cron');?></option>
-						<option value="update counters"><?=_('update counters');?></option>
-						<option value="suspend"><?=_('suspend');?></option>
-						<option value="unsuspend"><?=_('unsuspend');?></option>
-						<option value="delete"><?=_('delete');?></option>
+						<option value=""><?= _("apply to selected") ?></option>
+						<option value="rebuild"><?= _("rebuild") ?></option>
+						<option value="rebuild user"><?= _("rebuild user") ?></option>
+						<option value="rebuild web"><?= _("rebuild web") ?></option>
+						<option value="rebuild dns"><?= _("rebuild dns") ?></option>
+						<option value="rebuild mail"><?= _("rebuild mail") ?></option>
+						<option value="rebuild db"><?= _("rebuild db") ?></option>
+						<option value="rebuild cron"><?= _("rebuild cron") ?></option>
+						<option value="update counters"><?= _("update counters") ?></option>
+						<option value="suspend"><?= _("suspend") ?></option>
+						<option value="unsuspend"><?= _("unsuspend") ?></option>
+						<option value="delete"><?= _("delete") ?></option>
 					</select>
-					<button type="submit" class="toolbar-input-submit" title="<?=_('apply to selected');?>">
+					<button type="submit" class="toolbar-input-submit" title="<?= _("apply to selected") ?>">
 						<i class="fas fa-arrow-right"></i>
 					</button>
 				</form>
@@ -44,8 +44,8 @@
 			<div class="toolbar-search">
 				<form action="/search/" method="get">
 					<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
-					<input type="search" class="form-control js-search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" title="<?=_('Search');?>">
-					<button type="submit" class="toolbar-input-submit" title="<?=_('Search');?>">
+					<input type="search" class="form-control js-search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" title="<?= _("Search") ?>">
+					<button type="submit" class="toolbar-input-submit" title="<?= _("Search") ?>">
 						<i class="fas fa-magnifying-glass"></i>
 					</button>
 				</form>
@@ -61,20 +61,20 @@
 	<div class="table-header">
 		<div class="l-unit__col l-unit__col--right">
 			<div class="clearfix l-unit__stat-col--left super-compact">
-				<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" title="<?=_('Select all');?>">
+				<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><?=_('Name');?></b></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 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>
 	</div>
 
@@ -99,16 +99,16 @@
 			sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DISK']?>">
 			<div class="l-unit__col l-unit__col--right" style="<?php if (($_SESSION['POLICY_SYSTEM_HIDE_ADMIN'] === 'yes') && ($_SESSION['user'] !== 'admin') && ($key === 'admin')) { echo 'display: none';} else {echo 'display: table-cell';}?>">
 				<div class="clearfix l-unit__stat-col--left super-compact">
-					<input id="check<?=$i?>" class="ch-toggle" type="checkbox" title="<?=_('Select');?>" name="user[]" value="<?=$key?>">
+					<input id="check<?=$i?>" class="ch-toggle" type="checkbox" title="<?= _("Select") ?>" name="user[]" value="<?=$key?>">
 				</div>
 				<div class="clearfix l-unit__stat-col--left wide-3 userlist-username">
 					<?php if ($key == $user_plain) { ?>
-						<b><a href="/edit/user/?user=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing User');?>"><?=$key?> <span style="font-weight: normal !important;">(<?=$data[$key]['NAME'];?>)</span></a></b>
+						<b><a href="/edit/user/?user=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Editing User") ?>"><?=$key?> <span style="font-weight: normal !important;">(<?=$data[$key]['NAME'];?>)</span></a></b>
 					<?php } else { ?>
-						<b><a href="/login/?loginas=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('login as');?> <?=$key?>"><?=$key?> <span style="font-weight: normal !important;">(<?=$data[$key]['NAME'];?>)</span></a></b>
+						<b><a href="/login/?loginas=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("login as") ?> <?=$key?>"><?=$key?> <span style="font-weight: normal !important;">(<?=$data[$key]['NAME'];?>)</span></a></b>
 					<?php } ?>
 					<br>
-					<div class="userlist-email"><b><?=_('Email');?>:</b> <?=$data[$key]['CONTACT']?></div>
+					<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">
@@ -117,13 +117,13 @@
 							<?php if ($key == $user_plain) { ?>
 								<i class="fas fa-user-check status-icon status-icon dim icon-large" title="<?=$key?> (<?=$data[$key]['NAME']?>)"></i>
 							<?php } else { ?>
-								<a href="/login/?loginas=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('login as');?> <?=$key?>"><i class="fas fa-right-to-bracket status-icon green status-icon dim icon-large"></i></a>
+								<a href="/login/?loginas=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("login as") ?> <?=$key?>"><i class="fas fa-right-to-bracket status-icon green status-icon dim icon-large"></i></a>
 							<?php } ?>
 							<?php if (($_SESSION['userContext'] === 'admin') && ($key == 'admin') && ($_SESSION['user'] != 'admin')) { ?>
 								<!-- Hide edit button from admin user when logged in with another admin user -->
 								&nbsp;
 							<?php } else { ?>
-								<div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="/edit/user/?user=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing User');?>"><i class="fas fa-pencil status-icon orange status-icon dim"></i></a></div>
+								<div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="/edit/user/?user=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Editing User") ?>"><i class="fas fa-pencil status-icon orange status-icon dim"></i></a></div>
 							<?php } ?>
 							<?php if ($key == 'admin') { ?>
 								<!-- Hide suspend and delete buttons in the user list for primary 'admin' account -->
@@ -135,16 +135,16 @@
 									<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>" title="<?=_($spnd_action)?>">
 										<i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
 										<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/user/?user=<?=$key?>&token=<?=$_SESSION['token']?>">
-										<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="dialog js-confirm-dialog-suspend" title="<?=_('Confirmation');?>">
+										<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="dialog js-confirm-dialog-suspend" title="<?= _("Confirmation") ?>">
 											<p><?=sprintf($spnd_confirmation,$key)?></p>
 										</div>
 									</a>
 								</div>
 								<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-									<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?=_('delete');?>">
+									<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?= _("delete") ?>">
 										<i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
 										<input type="hidden" name="delete_url" value="/delete/user/?user=<?=$key?>&token=<?=$_SESSION['token']?>">
-										<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?=_('Confirmation');?>">
+										<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?= _("Confirmation") ?>">
 											<p><?=sprintf(_('DELETE_USER_CONFIRMATION'),$key)?></p>
 										</div>
 									</a>
@@ -157,22 +157,22 @@
 				<!-- END QUICK ACTION TOOLBAR AREA -->
 				<div class="clearfix l-unit__stat-col--left text-center">
 					<b>
-						<?php if ($data[$key]['PACKAGE'] === 'default' ){?>
-							<?=$data[$key]['PACKAGE']?>
+						<?php if ($data[$key]["PACKAGE"] === "default") { ?>
+							<?= $data[$key]["PACKAGE"] ?>
 						<?php } else { ?>
-							<a href="/edit/package/?package=<?=$data[$key]['PACKAGE']?>&token=<?=$_SESSION['token']?>" title="<?=_('Edit Package');?>"><?=$data[$key]['PACKAGE']?></a>
+							<a href="/edit/package/?package=<?= $data[$key]["PACKAGE"] ?>&token=<?= $_SESSION["token"] ?>" title="<?= _("Edit Package") ?>"><?= $data[$key]["PACKAGE"] ?></a>
 						<?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 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>
 		</div>
 	<?php } ?>
@@ -182,7 +182,7 @@
 	<div class="container">
 		<div class="l-unit-ft">
 			<div class="l-unit__col l-unit__col--right">
-				<?php printf(ngettext('%d user account', '%d user accounts', $i),$i); ?>
+				<?php printf(ngettext("%d user account", "%d user accounts", $i), $i); ?>
 			</div>
 		</div>
 	</div>

web/templates/pages/list_web.php

@@ -4,39 +4,39 @@
 		<div class="toolbar-buttons">
 			<?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');?>
+					<i class="fas fa-circle-plus status-icon green"></i><?= _("Add Web Domain") ?>
 				</a>
 			<?php } ?>
 		</div>
 		<div class="toolbar-right">
 			<div class="toolbar-sorting">
-				<a href="#" class="toolbar-sorting-toggle" title="<?=_('Sort items');?>">
-					<?=_('sort by');?>:
+				<a href="#" class="toolbar-sorting-toggle" title="<?= _("Sort items") ?>">
+					<?= _("sort by") ?>:
 					<b>
 						<?php if ($_SESSION['userSortOrder'] === 'name') { $label = ('Name'); } else { $label = _('Date'); } ?>
 						<?=$label?> <i class="fas fa-arrow-down-a-z"></i>
 					</b>
 				</a>
 				<ul class="toolbar-sorting-menu animate__animated animate__fadeIn u-hidden">
-					<li entity="sort-bandwidth" sort_as_int="1"><span class="name"><?=_('Bandwidth');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-date" sort_as_int="1"><span class="name <?php if ($_SESSION['userSortOrder'] === 'date') { echo 'active'; } ?>"><?=_('Date');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-disk" sort_as_int="1"><span class="name"><?=_('Disk');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-name"><span class="name <?php if ($_SESSION['userSortOrder'] === 'name') { echo 'active'; } ?>"><?=_('Name');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
-					<li entity="sort-ip" sort_as_int="1"><span class="name"><?=_('IP address');?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-bandwidth" sort_as_int="1"><span class="name"><?= _("Bandwidth") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-date" sort_as_int="1"><span class="name <?php if ($_SESSION['userSortOrder'] === 'date') { echo 'active'; } ?>"><?= _("Date") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-disk" sort_as_int="1"><span class="name"><?= _("Disk") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-name"><span class="name <?php if ($_SESSION['userSortOrder'] === 'name') { echo 'active'; } ?>"><?= _("Name") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
+					<li entity="sort-ip" sort_as_int="1"><span class="name"><?= _("IP address") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
 				</ul>
 				<?php if ($read_only !== 'true') {?>
 					<form x-bind="BulkEdit" action="/bulk/web/" method="post">
 						<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
 						<select class="form-select" name="action">
-							<option value=""><?=_('apply to selected');?></option>
+							<option value=""><?= _("apply to selected") ?></option>
 							<?php if ($_SESSION['userContext'] === 'admin') {?>
-								<option value="rebuild"><?=_('rebuild');?></option>
+								<option value="rebuild"><?= _("rebuild") ?></option>
 							<?php } ?>
-							<option value="suspend"><?=_('suspend');?></option>
-							<option value="unsuspend"><?=_('unsuspend');?></option>
-							<option value="delete"><?=_('delete');?></option>
+							<option value="suspend"><?= _("suspend") ?></option>
+							<option value="unsuspend"><?= _("unsuspend") ?></option>
+							<option value="delete"><?= _("delete") ?></option>
 						</select>
-						<button type="submit" class="toolbar-input-submit" title="<?=_('apply to selected');?>">
+						<button type="submit" class="toolbar-input-submit" title="<?= _("apply to selected") ?>">
 							<i class="fas fa-arrow-right"></i>
 						</button>
 					</form>
@@ -44,9 +44,9 @@
 			</div>
 			<div class="toolbar-search">
 				<form action="/search/" method="get">
-					<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
-					<input type="search" class="form-control js-search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" title="<?=_('Search');?>">
-					<button type="submit" class="toolbar-input-submit" title="<?=_('Search');?>">
+					<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
+					<input type="search" class="form-control js-search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" title="<?= _("Search") ?>">
+					<button type="submit" class="toolbar-input-submit" title="<?= _("Search") ?>">
 						<i class="fas fa-magnifying-glass"></i>
 					</button>
 				</form>
@@ -62,15 +62,15 @@
 	<div class="header table-header">
 		<div class="l-unit__col l-unit__col--right">
 			<div class="clearfix l-unit__stat-col--left super-compact">
-				<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" title="<?=_('Select all');?>" <?=$display_mode;?>>
+				<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 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 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>
 	</div>
 
@@ -168,7 +168,7 @@
 				sort-name="<?=$key?>" sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DISK']?>">
 				<div class="l-unit__col l-unit__col--right">
 					<div class="clearfix l-unit__stat-col--left super-compact">
-						<input id="check<?=$i?>" class="ch-toggle" type="checkbox" title="<?=_('Select');?>" name="domain[]" value="<?=$key?>" <?=$display_mode;?>>
+						<input id="check<?=$i?>" class="ch-toggle" type="checkbox" title="<?= _("Select") ?>" name="domain[]" value="<?=$key?>" <?=$display_mode;?>>
 					</div>
 					<div class="clearfix l-unit__stat-col--left wide-4 truncate">
 						<b>
@@ -183,7 +183,7 @@
 									}
 								}
 								?>
-								<a href="/edit/web/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Domain');?>: <?=$key?>"><?=$key?><?php if( !empty($alias_new) && !empty($data[$key]['ALIAS']) ){ echo " <span class=\"hint\">(".implode(',',$alias_new).")"; } ?></a>
+								<a href="/edit/web/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Editing Domain") ?>: <?=$key?>"><?=$key?><?php if( !empty($alias_new) && !empty($data[$key]['ALIAS']) ){ echo " <span class=\"hint\">(".implode(',',$alias_new).")"; } ?></a>
 							<?php } ?>
 						</b>
 					</div>
@@ -192,7 +192,7 @@
 						<div class="l-unit-toolbar__col l-unit-toolbar__col--right u-noselect">
 							<div class="actions-panel clearfix">
 								<?php if (!empty($data[$key]['STATS'])) { ?>
-									<div class="actions-panel__col actions-panel__logs shortcut-w" key-action="href"><a href="http://<?=$key?>/vstats/" rel="noopener" target="_blank" rel="noopener" title="<?=_('Statistics');?>"><i class="fas fa-chart-bar status-icon maroon status-icon dim"></i></a></div>
+									<div class="actions-panel__col actions-panel__logs shortcut-w" key-action="href"><a href="http://<?=$key?>/vstats/" rel="noopener" target="_blank" rel="noopener" title="<?= _("Statistics") ?>"><i class="fas fa-chart-bar status-icon maroon status-icon dim"></i></a></div>
 								<?php } ?>
 									<div class="actions-panel__col actions-panel__view" key-action="href"><a href="http://<?=$key?>/" rel="noopener" target="_blank"><i class="fas fa-square-up-right status-icon lightblue status-icon dim"></i></a></div>
 								<?php if ($read_only === 'true') {?>
@@ -200,23 +200,23 @@
 									&nbsp;
 								<?php } else { ?>
 									<?php if ($data[$key]['SUSPENDED'] == 'no') {?>
-										<div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="/edit/web/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Domain');?>"><i class="fas fa-pencil status-icon orange status-icon dim"></i></a></div>
+										<div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="/edit/web/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Editing Domain") ?>"><i class="fas fa-pencil status-icon orange status-icon dim"></i></a></div>
 									<?php } ?>
-									<div class="actions-panel__col actions-panel__logs shortcut-l" key-action="href"><a href="/list/web-log/?domain=<?=$key?>&type=access#" title="<?=_('AccessLog');?>"><i class="fas fa-binoculars status-icon purple status-icon dim"></i></a></div>
+									<div class="actions-panel__col actions-panel__logs shortcut-l" key-action="href"><a href="/list/web-log/?domain=<?=$key?>&type=access#" title="<?= _("AccessLog") ?>"><i class="fas fa-binoculars status-icon purple status-icon dim"></i></a></div>
 									<div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
 										<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>" title="<?=_($spnd_action)?>">
 											<i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
 											<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/web/?domain=<?=$key?>&token=<?=$_SESSION['token']?>">
-											<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="dialog js-confirm-dialog-suspend" title="<?=_('Confirmation');?>">
+											<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="dialog js-confirm-dialog-suspend" title="<?= _("Confirmation") ?>">
 												<p><?=sprintf($spnd_confirmation,$key)?></p>
 											</div>
 										</a>
 									</div>
 									<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-										<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?=_('delete');?>">
+										<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?= _("delete") ?>">
 											<i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
 											<input type="hidden" name="delete_url" value="/delete/web/?domain=<?=$key?>&token=<?=$_SESSION['token']?>">
-											<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?=_('Confirmation');?>">
+											<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?= _("Confirmation") ?>">
 												<p><?=sprintf(_('DELETE_DOMAIN_CONFIRMATION'),$key)?></p>
 											</div>
 										</a>
@@ -245,7 +245,7 @@
 	<div class="container">
 		<div class="l-unit-ft">
 			<div class="l-unit__col l-unit__col--right">
-				<?php printf(ngettext('%d web domain', '%d web domains', $i),$i); ?>
+				<?php printf(ngettext("%d web domain", "%d web domains", $i), $i); ?>
 			</div>
 		</div>
 	</div>

web/templates/pages/list_webapps.php

@@ -2,8 +2,8 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/edit/web/?domain=<?=htmlentities($v_domain)?>">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+			<a class="button button-secondary" id="btn-back" href="/edit/web/?domain=<?= htmlentities($v_domain) ?>">
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
@@ -15,7 +15,7 @@
 <div class="container animate__animated animate__fadeIn">
 
 	<div class="form-container form-container-wide">
-		<h1 class="form-title"><?=_('Quick Install App');?></h1>
+		<h1 class="form-title"><?= _("Quick Install App") ?></h1>
 		<?php
 			if (!empty($_SESSION['error_msg'])) {
 				$msg_icon = 'fa-circle-exclamation status-icon red';
@@ -35,14 +35,14 @@
 		<div class="cards">
 			<!-- List available web apps -->
 			<?php foreach($v_web_apps as $webapp):?>
-				<div class="card <?=($webapp['enabled'] ? '' : 'disabled');?>">
+				<div class="card <?=($webapp['enabled'] ? '' : 'disabled') ?>">
 					<div class="card-thumb">
 						<img src="/src/app/WebApp/Installers/<?=$webapp['name'];?>/<?=$webapp['thumbnail'];?>" alt="<?=$webapp['name'];?>">
 					</div>
 					<div class="card-content">
 						<p class="card-title"><?=$webapp['name'];?></p>
-						<p class="u-mb10"><?=_('version');?>: <?=$webapp['version'];?></p>
-						<a href="/add/webapp/?app=<?=$webapp['name'];?>&domain=<?=htmlentities($v_domain)?>" class="button"><?=_('Setup');?></a>
+						<p class="u-mb10"><?= _("version") ?>: <?=$webapp['version'];?></p>
+						<a href="/add/webapp/?app=<?=$webapp['name'];?>&domain=<?=htmlentities($v_domain)?>" class="button"><?= _("Setup") ?></a>
 					</div>
 				</div>
 			<?php endforeach; ?>

web/templates/pages/list_weblog.php

@@ -3,9 +3,9 @@
 
 <head>
 	<!-- Load necessary CSS and JavaScript from source -->
-	<?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/title.php'; ?>
-	<?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/css.php'; ?>
-	<?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/js.php'; ?>
+	<?php require "" . $_SERVER["HESTIA"] . "/web/templates/includes/title.php"; ?>
+	<?php require "" . $_SERVER["HESTIA"] . "/web/templates/includes/css.php"; ?>
+	<?php require "" . $_SERVER["HESTIA"] . "/web/templates/includes/js.php"; ?>
 </head>
 
 <body>
@@ -13,51 +13,51 @@
 		<div class="top-bar">
 			<div class="container top-bar-inner">
 				<div class="top-bar-left">
-					<a href="/" class="top-bar-logo" title="<?=_('Hestia Control Panel');?>">
-						<img src="/images/logo-header.svg" alt="<?=_('Hestia Control Panel');?>" width="54" height="29">
+					<a href="/" class="top-bar-logo" title="<?= _("Hestia Control Panel") ?>">
+						<img src="/images/logo-header.svg" alt="<?= _("Hestia Control Panel") ?>" width="54" height="29">
 					</a>
 				</div>
 				<div class="top-bar-right">
 					<nav x-data="{ open: false }" class="top-bar-menu">
-						<button x-on:click="open = !open" type="button" class="top-bar-menu-link u-hide-tablet" title="<?=_('Toggle menu');?>">
+						<button x-on:click="open = !open" type="button" class="top-bar-menu-link u-hide-tablet" title="<?= _("Toggle menu") ?>">
 							<i class="fas fa-bars"></i>
-							<span class="u-hidden"><?=_('Toggle menu');?></span>
+							<span class="u-hidden"><?= _("Toggle menu") ?></span>
 						</button>
 						<ul x-cloak x-show="open" class="top-bar-menu-list animate__animated animate__fadeIn">
 							<li class="top-bar-menu-item">
 								<a class="top-bar-menu-link" href="/list/web/">
 									<i class="fas fa-circle-left"></i>
-									<span class="top-bar-menu-link-label"><?=_('Back');?></span>
+									<span class="top-bar-menu-link-label"><?= _("Back") ?></span>
 								</a>
 							</li>
 							<li class="top-bar-menu-item">
 								<a class="top-bar-menu-link <?php if($_GET['type'] == 'access') echo 'active' ?>" href="/list/web-log/?domain=<?=htmlentities($_GET['domain'])?>&type=access&token=<?=$_SESSION['token']?>">
 									<i class="fas fa-eye"></i>
-									<span class="top-bar-menu-link-label"><?=_('Access Log');?></span>
+									<span class="top-bar-menu-link-label"><?= _("Access Log") ?></span>
 								</a>
 							</li>
 							<li class="top-bar-menu-item">
-								<a class="top-bar-menu-link <?php if($_GET['type'] == 'access') echo 'active' ?>" href="/download/web-log/?domain=<?=htmlentities($_GET['domain'])?>&type=access&&token=<?=$_SESSION['token']?>" title="<?=_('Download');?>">
+								<a class="top-bar-menu-link <?php if($_GET['type'] == 'access') echo 'active' ?>" href="/download/web-log/?domain=<?=htmlentities($_GET['domain'])?>&type=access&&token=<?=$_SESSION['token']?>" title="<?= _("Download") ?>">
 									<i class="fas fa-download"></i>
-									<span class="u-hidden"><?=_('Download');?></span>
+									<span class="u-hidden"><?= _("Download") ?></span>
 								</a>
 							</li>
 							<li class="top-bar-menu-item">
 								<a class="top-bar-menu-link <?php if($_GET['type'] == 'error') echo 'active' ?>" href="/list/web-log/?domain=<?=htmlentities($_GET['domain'])?>&type=error&token=<?=$_SESSION['token']?>">
 									<i class="fas fa-circle-exclamation"></i>
-									<span class="top-bar-menu-link-label"><?=_('Error Log');?></span>
+									<span class="top-bar-menu-link-label"><?= _("Error Log") ?></span>
 								</a>
 							</li>
 							<li class="top-bar-menu-item">
-								<a class="top-bar-menu-link <?php if($_GET['type'] == 'error') echo 'active' ?>" href="/download/web-log/?domain=<?=htmlentities($_GET['domain'])?>&type=error&token=<?=$_SESSION['token']?>" title="<?=_('Download');?>">
+								<a class="top-bar-menu-link <?php if($_GET['type'] == 'error') echo 'active' ?>" href="/download/web-log/?domain=<?=htmlentities($_GET['domain'])?>&type=error&token=<?=$_SESSION['token']?>" title="<?= _("Download") ?>">
 									<i class="fas fa-download"></i>
-									<span class="u-hidden"><?=_('Download');?></span>
+									<span class="u-hidden"><?= _("Download") ?></span>
 								</a>
 							</li>
 							<li class="top-bar-menu-item">
-								<a class="top-bar-menu-link" href="javascript:location.reload();" title="<?=_('Refresh');?>">
+								<a class="top-bar-menu-link" href="javascript:location.reload();" title="<?= _("Refresh") ?>">
 									<i class="fas fa-arrow-rotate-right"></i>
-									<span class="u-hidden"><?=_('Refresh');?></span>
+									<span class="u-hidden"><?= _("Refresh") ?></span>
 								</a>
 							</li>
 							<li class="top-bar-menu-item">
@@ -67,9 +67,9 @@
 								</a>
 							</li>
 							<li class="top-bar-menu-item">
-								<a class="top-bar-menu-link top-bar-menu-link-logout" href="/logout/?token=<?=$_SESSION['token']?>" title="<?=_('Log out');?>">
+								<a class="top-bar-menu-link top-bar-menu-link-logout" href="/logout/?token=<?=$_SESSION['token']?>" title="<?= _("Log out") ?>">
 									<i class="fas fa-right-from-bracket"></i>
-									<span class="u-hidden"><?=_('Log out');?></span>
+									<span class="u-hidden"><?= _("Log out") ?></span>
 								</a>
 							</li>
 						</ul>
@@ -82,11 +82,11 @@
 	<a
 		href="#top"
 		class="button button-secondary button-circle button-floating button-floating-top "
-		title="<?=_('Top');?>"
+		title="<?= _("Top") ?>"
 	>
 		<i class="fas fa-arrow-up"></i>
-		<span class="u-hidden"><?=_('Top');?></span>
+		<span class="u-hidden"><?= _("Top") ?></span>
 	</a>
 
-	<div class="container" style="padding-top: 80px;"><?=sprintf(_('Last 70 lines of %s.%s.log'),htmlentities($_GET['domain']),htmlentities($type)) ;?></div>
+	<div class="container" style="padding-top: 80px;"><?= sprintf(_("Last 70 lines of %s.%s.log"), htmlentities($_GET["domain"]), htmlentities($type)) ?></div>
 	<pre class="container console-output">

web/templates/pages/setup_webapp.php

@@ -3,7 +3,7 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a class="button button-secondary" id="btn-back" href="/add/webapp/?domain=<?=htmlentities($v_domain);?>">
-				<i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?>
+				<i class="fas fa-arrow-left status-icon blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
@@ -17,7 +17,7 @@
 				}
 			?>
 			<button class="button" type="submit" form="vstobjects">
-				<i class="fas fa-floppy-disk status-icon purple"></i><?=_('Save');?>
+				<i class="fas fa-floppy-disk status-icon purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -36,8 +36,8 @@
 				<?php if( !$WebappInstaller->isDomainRootClean()): ?>
 					<div class="alert alert-info alert-with-icon" 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 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>
 				<?php endif; ?>
@@ -68,7 +68,7 @@
 							<?php if($f_type != 'boolean'): ?>
 								<label for="<?=$f_name?>" class="form-label">
 									<?=$f_label?>
-									<?php if ($f_type === 'password'):?> / <a href="javascript:applyRandomStringToTarget('<?=$f_name?>');" class="generate"><?=_('generate');?></a> <?php endif?>
+									<?php if ($f_type === 'password'):?> / <a href="javascript:applyRandomStringToTarget('<?=$f_name?>');" class="generate"><?= _("generate") ?></a> <?php endif?>
 								</label>
 							<?php endif; ?>
 							<?php if (in_array($f_type, ['select']) && count($form_control['options']) ):?>

yarn.lock

@@ -2699,10 +2699,10 @@ __metadata:
     normalize.css: ^8.0.1
     postcss: ^8.4.19
     postcss-cli: ^10.1.0
-    postcss-import: ^15.0.1
+    postcss-import: ^15.1.0
     postcss-preset-env: ^7.8.3
     postcss-size: ^4.0.1
-    prettier: ^2.8.0
+    prettier: ^2.8.1
     prettier-plugin-nginx: ^1.0.2
     prettier-plugin-sh: ^0.12.8
     prettier-plugin-sql: ^0.12.1
@@ -3559,6 +3559,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"minipass@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "minipass@npm:4.0.0"
+  dependencies:
+    yallist: ^4.0.0
+  checksum: 7a609afbf394abfcf9c48e6c90226f471676c8f2a67f07f6838871afb03215ede431d1433feffe1b855455bcb13ef0eb89162841b9796109d6fed8d89790f381
+  languageName: node
+  linkType: hard
+
 "minizlib@npm:^2.1.1, minizlib@npm:^2.1.2":
   version: 2.1.2
   resolution: "minizlib@npm:2.1.2"
@@ -4271,16 +4280,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-import@npm:^15.0.1":
-  version: 15.0.1
-  resolution: "postcss-import@npm:15.0.1"
+"postcss-import@npm:^15.1.0":
+  version: 15.1.0
+  resolution: "postcss-import@npm:15.1.0"
   dependencies:
     postcss-value-parser: ^4.0.0
     read-cache: ^1.0.0
     resolve: ^1.1.7
   peerDependencies:
     postcss: ^8.0.0
-  checksum: c673a0247525b3ad9f29d40605866968f2d2525cd107f287171c3baad496385618419d0e0565a792eefb7192311d54d40b2837409cfe2451371a7ef1d0da5125
+  checksum: 7bd04bd8f0235429009d0022cbf00faebc885de1d017f6d12ccb1b021265882efc9302006ba700af6cab24c46bfa2f3bc590be3f9aee89d064944f171b04e2a3
   languageName: node
   linkType: hard
 
@@ -4831,12 +4840,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:^2.8.0":
-  version: 2.8.0
-  resolution: "prettier@npm:2.8.0"
+"prettier@npm:^2.8.1":
+  version: 2.8.1
+  resolution: "prettier@npm:2.8.1"
   bin:
     prettier: bin-prettier.js
-  checksum: 72004ce0cc9bb097daf3e3833f62495768724392c1d5b178dd47372337616e9e50ecbb0804f236596223f7b5eb1bbe69cefc8957dca21112c5777e77ef73a564
+  checksum: 4f21a0f1269f76fb36f54e9a8a1ea4c11e27478958bf860661fb4b6d7ac69aac1581f8724fa98ea3585e56d42a2ea317a17ff6e3324f40cb11ff9e20b73785cc
   languageName: node
   linkType: hard
 
@@ -5636,16 +5645,16 @@ __metadata:
   linkType: hard
 
 "tar@npm:^6.1.11, tar@npm:^6.1.2":
-  version: 6.1.12
-  resolution: "tar@npm:6.1.12"
+  version: 6.1.13
+  resolution: "tar@npm:6.1.13"
   dependencies:
     chownr: ^2.0.0
     fs-minipass: ^2.0.0
-    minipass: ^3.0.0
+    minipass: ^4.0.0
     minizlib: ^2.1.1
     mkdirp: ^1.0.3
     yallist: ^4.0.0
-  checksum: 49d72e4420944e7ede2782d6b0826a6ede6cdab23c7de63470917e7a78166bc4d5b1a96279d3d79a85f1ba5a17cd37c0acbb3cbff19a07447691445b8b051c55
+  checksum: 8a278bed123aa9f53549b256a36b719e317c8b96fe86a63406f3c62887f78267cea9b22dc6f7007009738509800d4a4dccc444abd71d762287c90f35b002eb1c
   languageName: node
   linkType: hard