Tidy up Ampersand XHTML

Deprecate Ampersand in Anchor tags

9 files changed, 10 insertions, 10 deletions

diff --git a/usr/local/www/help.php b/usr/local/www/help.php
index 83bab6d..387a14e 100644
--- a/usr/local/www/help.php
+++ b/usr/local/www/help.php
@@ -12,7 +12,7 @@ require_once("guiconfig.inc");
 $helppages = array(
 	/* These pages are confirmed to work and have usable content */
 	'index.php' => 'https://doc.pfsense.org/index.php/Dashboard',
-	'license.php' => 'https://www.pfsense.org/index.php@option=com_content&task=view&id=42&Itemid=62.html',
+	'license.php' => 'https://www.pfsense.org/index.php@option=com_content&task=view&id=42&Itemid=62.html',
 	'miniupnpd.xml' => 'https://doc.pfsense.org/index.php/What_is_UPNP%3F',
 	'status_upnp.php' => 'https://doc.pfsense.org/index.php/What_is_UPNP%3F',
 	'firewall_virtual_ip.php' => 'https://doc.pfsense.org/index.php/What_are_Virtual_IP_Addresses%3F',
diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php
index 150f718..8db3eae 100644
--- a/usr/local/www/pkg_edit.php
+++ b/usr/local/www/pkg_edit.php
@@ -237,7 +237,7 @@ if ($_POST) {
 			if($pkg['aftersaveredirect'] <> "") {
 			    pfSenseHeader($pkg['aftersaveredirect']);
 			} elseif(!$pkg['adddeleteeditpagefields']) {
-			    pfSenseHeader("pkg_edit.php?xml={$xml}&id=0");
+			    pfSenseHeader("pkg_edit.php?xml={$xml}&amp;id=0");
 			} elseif(!$pkg['preoutput']) {
 			    pfSenseHeader("pkg.php?xml=" . $xml);
 			}
diff --git a/usr/local/www/services_dnsmasq.php b/usr/local/www/services_dnsmasq.php
index 5fda7ff..5c39178 100644
--- a/usr/local/www/services_dnsmasq.php
+++ b/usr/local/www/services_dnsmasq.php
@@ -391,7 +391,7 @@ function show_advanced_dns() {
 			<table border="0" cellspacing="0" cellpadding="1" summary="icons">
 				<tr>
 					<td valign="middle"><a href="services_dnsmasq_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" alt="edit" /></a></td>
-					<td><a href="services_dnsmasq.php?type=host&act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this host?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /></a></td>
+					<td><a href="services_dnsmasq.php?type=host&amp;act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this host?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /></a></td>
 				</tr>
 			</table>
 	</tr>
@@ -472,7 +472,7 @@ function show_advanced_dns() {
 			<?=htmlspecialchars($doment['descr']);?>&nbsp;
 		</td>
 		<td valign="middle" class="list nowrap"> <a href="services_dnsmasq_domainoverride_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" alt="edit" /></a>
-			&nbsp;<a href="services_dnsmasq.php?act=del&type=doverride&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this domain override?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /></a></td>
+			&nbsp;<a href="services_dnsmasq.php?act=del&amp;type=doverride&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this domain override?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /></a></td>
 	</tr>
 	<?php $i++; endforeach; ?>
 	<tr style="display:none"><td></td></tr>
diff --git a/usr/local/www/shortcuts.inc b/usr/local/www/shortcuts.inc
index c3e454f..d192c74 100644
--- a/usr/local/www/shortcuts.inc
+++ b/usr/local/www/shortcuts.inc
@@ -78,7 +78,7 @@ function get_shortcut_main_link($shortcut_section, $addspace = true, $service =
 	switch ($shortcut_section) {
 		case "openvpn":
 			if (!empty($service['mode']) && is_numeric($service['id']))
-				$link = "vpn_openvpn_{$service['mode']}.php?act=edit&id={$service['id']}";
+				$link = "vpn_openvpn_{$service['mode']}.php?act=edit&amp;id={$service['id']}";
 			else
 				$link = $shortcuts[$shortcut_section]['main'];
 			break;
diff --git a/usr/local/www/shortcuts/pkg_upnp.inc b/usr/local/www/shortcuts/pkg_upnp.inc
index 10213f0..05402a2 100644
--- a/usr/local/www/shortcuts/pkg_upnp.inc
+++ b/usr/local/www/shortcuts/pkg_upnp.inc
@@ -3,7 +3,7 @@
 global $shortcuts;
 
 $shortcuts['upnp'] = array();
-$shortcuts['upnp']['main'] = "pkg_edit.php?xml=miniupnpd.xml&id=0";
+$shortcuts['upnp']['main'] = "pkg_edit.php?xml=miniupnpd.xml&amp;id=0";
 $shortcuts['upnp']['log'] = "diag_logs_routing.php";
 $shortcuts['upnp']['status'] = "status_upnp.php";
 $shortcuts['upnp']['service'] = "miniupnpd";
diff --git a/usr/local/www/system_certmanager.php b/usr/local/www/system_certmanager.php
index f825cde..97968bb 100644
--- a/usr/local/www/system_certmanager.php
+++ b/usr/local/www/system_certmanager.php
@@ -403,7 +403,7 @@ if ($_POST) {
 				write_config();
 
 			if ($userid)
-				pfSenseHeader("system_usermanager.php?act=edit&id={$userid}");
+				pfSenseHeader("system_usermanager.php?act=edit&amp;id={$userid}");
 		}
 	}
 
diff --git a/usr/local/www/system_crlmanager.php b/usr/local/www/system_crlmanager.php
index db13fcd..b66b1ac 100644
--- a/usr/local/www/system_crlmanager.php
+++ b/usr/local/www/system_crlmanager.php
@@ -598,7 +598,7 @@ function method_change() {
 								<img src="/themes/<?= $g['theme'];?>/images/icons/icon_e.gif" title="<?=gettext("Edit CRL") . " " . htmlspecialchars($tmpcrl['descr']);?>" alt="<?=gettext("Edit CRL") . " " . htmlspecialchars($tmpcrl['descr']);?>" width="17" height="17" border="0" />
 							</a>
 							<?php else: ?>
-							<a href="system_crlmanager.php?act=editimported&id=<?=$tmpcrl['refid'];?>">
+							<a href="system_crlmanager.php?act=editimported&amp;id=<?=$tmpcrl['refid'];?>">
 								<img src="/themes/<?= $g['theme'];?>/images/icons/icon_e.gif" title="<?=gettext("Edit CRL") . " " . htmlspecialchars($tmpcrl['descr']);?>" alt="<?=gettext("Edit CRL") . " " . htmlspecialchars($tmpcrl['descr']);?>" width="17" height="17" border="0" />
 							</a>
 							<?php endif; ?>
diff --git a/usr/local/www/system_groupmanager_addprivs.php b/usr/local/www/system_groupmanager_addprivs.php
index a4345c9..d7d1921 100644
--- a/usr/local/www/system_groupmanager_addprivs.php
+++ b/usr/local/www/system_groupmanager_addprivs.php
@@ -110,7 +110,7 @@ if ($_POST) {
 		$retval = write_config();
 		$savemsg = get_std_save_message($retval);
 
-		pfSenseHeader("system_groupmanager.php?act=edit&id={$groupid}");
+		pfSenseHeader("system_groupmanager.php?act=edit&amp;id={$groupid}");
 		exit;
 	}
 }
diff --git a/usr/local/www/system_usermanager_addprivs.php b/usr/local/www/system_usermanager_addprivs.php
index bf4a02e..66b9b7e 100644
--- a/usr/local/www/system_usermanager_addprivs.php
+++ b/usr/local/www/system_usermanager_addprivs.php
@@ -99,7 +99,7 @@ if ($_POST) {
 		$savemsg = get_std_save_message($retval);
 		conf_mount_ro();
 		
-		pfSenseHeader("system_usermanager.php?act=edit&id={$userid}");
+		pfSenseHeader("system_usermanager.php?act=edit&amp;id={$userid}");
 		
 		exit;
 	}