Tidy copy and fix PHP syntax (#4242)

docs/docs/user-guide/notifications.md

@@ -2,4 +2,4 @@
 
 To view your notifications, click the <i class="fas fa-lg fa-fw fa-bell"><span class="visually-hidden">notification</span></i> icon in the top right.
 
-You can delete a notification by clicking the small red "X" on the top right.
+You can delete a notification by clicking the <i class="fas fa-lg fa-fw fa-xmark"></i><span class="visually-hidden">delete</span></i> icon on the top right.

web/templates/pages/add_cron.php

@@ -25,7 +25,7 @@
 			<div class="u-side-by-side-tablet u-mb20">
 				<h1><?= _("Add Cron Job") ?></h1>
 				<p>
-					<?= _('System time') ?>:
+					<?= _("System time") ?>:
 					<time datetime="<?= date("c", $current_timestamp) ?>" class="u-text-bold">
 						<?= date("d M Y, H:i", $current_timestamp) ?>
 					</time>

web/templates/pages/add_firewall_ipset.php

@@ -73,7 +73,7 @@
 			</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

web/templates/pages/edit_cron.php

@@ -25,7 +25,7 @@
 			<div class="u-side-by-side-tablet u-mb20">
 				<h1><?= _("Edit Cron Job") ?></h1>
 				<p>
-					<?= _('System time') ?>:
+					<?= _("System time") ?>:
 					<time datetime="<?= date("c", $current_timestamp) ?>" class="u-text-bold">
 						<?= date("d M Y, H:i", $current_timestamp) ?>
 					</time>

web/templates/pages/list_firewall.php

@@ -149,7 +149,7 @@
 								href="/delete/firewall/?rule=<?= $key ?>&token=<?= $_SESSION["token"] ?>"
 								title="<?= _("Delete") ?>"
 								data-confirm-title="<?= _("Delete") ?>"
-								data-confirm-message="<?= sprintf(_("Are you sure you want to delete rule %s"), $key) ?>"
+								data-confirm-message="<?= sprintf(_("Are you sure you want to delete rule #%s?"), $key) ?>"
 							>
 								<i class="fas fa-trash icon-red"></i>
 								<span class="u-hide-desktop"><?= _("Delete") ?></span>

web/templates/pages/list_services.php

@@ -23,7 +23,7 @@
 				class="button button-secondary button-danger data-controls js-confirm-action"
 				href="/restart/system/?hostname=<?= $sys["sysinfo"]["HOSTNAME"] ?>&token=<?= $_SESSION["token"] ?>&system_reset_token=<?= time() ?>"
 				data-confirm-title="<?= _("Restart") ?>"
-				data-confirm-message="<?= sprintf(_("Are you sure you want to restart %s?"), "Server") ?>"
+				data-confirm-message="<?= _("Are you sure you want to restart the server?") ?>"
 			>
 				<i class="fas fa-arrow-rotate-left icon-red"></i><?= _("Restart") ?>
 			</a>
@@ -168,7 +168,7 @@
 								href="/restart/service/?srv=<?= $key ?>&token=<?= $_SESSION["token"] ?>"
 								title="<?= _("Restart") ?>"
 								data-confirm-title="<?= _("Restart") ?>"
-								data-confirm-message="<?= sprintf(_("Are you sure you want to restart %s?"), $key) ?>"
+								data-confirm-message="<?= sprintf(_("Are you sure you want to restart the %s service?"), $key) ?>"
 							>
 								<i class="fas fa-arrow-rotate-left icon-highlight"></i>
 								<span class="u-hide-desktop"><?= _("Restart") ?></span>
@@ -178,11 +178,12 @@
 							<a
 								class="units-table-row-action-link data-controls js-confirm-action"
 								href="/<?= $action ?>/service/?srv=<?= $key ?>&token=<?= $_SESSION["token"] ?>"
-								title="<?=$action_text ?>"
-								data-confirm-message="<?php if ($action == 'stop'){ echo sprintf(_('Are you sure you want to stop service %s?'), $key); } else { echo sprintf(_('Are you sure you want to start service %s?'), $key); }?>"
+								title="<?= $action_text ?>"
+								data-confirm-title="<?= $action_text ?>"
+								data-confirm-message="<?php if ($action == 'stop') { echo sprintf(_('Are you sure you want to stop the %s service?'), $key); } else { echo sprintf(_('Are you sure you want to start the %s service?'), $key); }?>"
 							>
 								<i class="fas <?= $spnd_icon ?> <?= $spnd_icon_class ?>"></i>
-								<span class="u-hide-desktop"><?=$action_text ?></span>
+								<span class="u-hide-desktop"><?= $action_text ?></span>
 							</a>
 						</li>
 					</ul>

web/templates/pages/list_updates.php

@@ -30,7 +30,7 @@
 
 	<div class="units-table js-units-container">
 		<div class="units-table-header">
-			<div class="units-table-cell"><?= _("Package Names") ?></div>
+			<div class="units-table-cell"><?= _("Package Name") ?></div>
 			<div class="units-table-cell"><?= _("Description") ?></div>
 			<div class="units-table-cell u-text-center"><?= _("Version") ?></div>
 			<div class="units-table-cell u-text-center"><?= _("Status") ?></div>

web/templates/pages/list_web.php

@@ -44,9 +44,9 @@
 							<?php } ?>
 							<option value="suspend"><?= _("Suspend") ?></option>
 							<option value="unsuspend"><?= _("Unsuspend") ?></option>
-							<?php if (($_SESSION['PROXY_SYSTEM'] == 'nginx') || ($_SESSION['WEB_SYSTEM'] == 'nginx')){?>}
-								<option value="purge"><?= _('Purge Nginx Cache');?></option>
-							<? } ?>
+							<?php if ($_SESSION["PROXY_SYSTEM"] == "nginx" || $_SESSION["WEB_SYSTEM"] == "nginx") { ?>}
+								<option value="purge"><?= _("Purge Nginx Cache") ?></option>
+							<?php } ?>
 							<option value="delete"><?= _("Delete") ?></option>
 						</select>
 						<button type="submit" class="toolbar-input-submit" title="<?= _("Apply to selected") ?>">
@@ -187,11 +187,11 @@
 				}
 			?>
 			<div class="units-table-row <?php if ($data[$key]['SUSPENDED'] == 'yes') echo 'disabled'; ?> js-unit"
-				data-sort-ip="<?= str_replace('.', '', $data[$key]['IP']) ?>"
-				data-sort-date="<?= strtotime($data[$key]['DATE'].' '.$data[$key]['TIME']) ?>"
+				data-sort-ip="<?= str_replace(".", "", $data[$key]["IP"]) ?>"
+				data-sort-date="<?= strtotime($data[$key]["DATE"] . " " . $data[$key]["TIME"]) ?>"
 				data-sort-name="<?= $key ?>"
-				data-sort-bandwidth="<?= $data[$key]['U_BANDWIDTH'] ?>"
-				data-sort-disk="<?= $data[$key]['U_DISK'] ?>">
+				data-sort-bandwidth="<?= $data[$key]["U_BANDWIDTH"] ?>"
+				data-sort-disk="<?= $data[$key]["U_DISK"] ?>">
 				<div class="units-table-cell">
 					<div>
 						<input id="check<?= $i ?>" class="js-unit-checkbox" type="checkbox" title="<?= _("Select") ?>" name="domain[]" value="<?= $key ?>" <?= $display_mode ?>>
@@ -265,7 +265,7 @@
 								<li class="units-table-row-action" data-key-action="href">
 									<a
 										class="units-table-row-action-link"
-										href="/download/site/?site=<?=$key?>&token=<?= $_SESSION['token'] ?>"
+										href="/download/site/?site=<?= $key ?>&token=<?= $_SESSION["token"] ?>"
 										title="<?= _("Download Site") ?>"
 									>
 										<i class="fas fa-download icon-orange"></i>