summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorColin Fleming <cj_fleming@sky.com>2014-06-23 23:26:59 +0100
committerColin Fleming <cj_fleming@sky.com>2014-06-23 23:26:59 +0100
commitfbe0c5ff5b30c13ed59e5a987b643fb69fa432cb (patch)
tree8490313bdc5619af93e137f0a6663dfda1e58d2a /usr
parent6c87714dc7cd310592dc0134894813b6af6a1b7d (diff)
downloadpfsense-fbe0c5ff5b30c13ed59e5a987b643fb69fa432cb.zip
pfsense-fbe0c5ff5b30c13ed59e5a987b643fb69fa432cb.tar.gz
Tidy up misc. XHTML
"diag_dns.php" Tidy up "equals sign" "services_captiveportal.php" Add space to OPTION tag Update HTML Boolean operator Close INPUT and BR tags "services_captiveportal_hostname.php" Update ALIGN to MIDDLE "services_captiveportal_vouchers.php" Move closing TD tag outside the PHP IF statement "system_crlmanager.php" Close TR tags correctly
Diffstat (limited to 'usr')
-rw-r--r--usr/local/www/diag_dns.php2
-rw-r--r--usr/local/www/services_captiveportal.php6
-rw-r--r--usr/local/www/services_captiveportal_hostname.php4
-rw-r--r--usr/local/www/services_captiveportal_vouchers.php3
-rw-r--r--usr/local/www/system_crlmanager.php4
5 files changed, 10 insertions, 9 deletions
diff --git a/usr/local/www/diag_dns.php b/usr/local/www/diag_dns.php
index bec923a..c217d7f 100644
--- a/usr/local/www/diag_dns.php
+++ b/usr/local/www/diag_dns.php
@@ -187,8 +187,8 @@ include("head.inc"); ?>
<tr><td valign="top">
<input name="host" type="text" class="formfld" id="host" size="20" value="<?=htmlspecialchars($host);?>" /> =
</td>
- <td>
<?php if ($resolved && $type) { ?>
+ <td valign="top">&nbsp;=&nbsp;</td><td>
<font size="+1">
<?php
$found = 0;
diff --git a/usr/local/www/services_captiveportal.php b/usr/local/www/services_captiveportal.php
index efc8f20..441467b 100644
--- a/usr/local/www/services_captiveportal.php
+++ b/usr/local/www/services_captiveportal.php
@@ -968,7 +968,7 @@ function enable_change(enable_change) {
foreach($a_cert as $cert):
$selected = "";
if ($pconfig['certref'] == $cert['refid'])
- $selected = "selected=\"selected\"";
+ $selected = " selected=\"selected\"";
?>
<option value="<?=$cert['refid'];?>"<?=$selected;?>><?=$cert['descr'];?></option>
<?php endforeach; ?>
@@ -981,8 +981,8 @@ function enable_change(enable_change) {
<tr>
<td valign="top" class="vncell"><?=gettext("Disable HTTPS forwards"); ?></td>
<td class="vtable">
- <input name="nohttpsforwards" type="checkbox" class="formfld" id="nohttpsforwards" value="yes" <?php if ($pconfig['nohttpsforwards']) echo "checked"; ?>>
- <strong><?=gettext("Disable HTTPS forwards"); ?></strong><br>
+ <input name="nohttpsforwards" type="checkbox" class="formfld" id="nohttpsforwards" value="yes" <?php if ($pconfig['nohttpsforwards']) echo "checked=\"checked\""; ?> />
+ <strong><?=gettext("Disable HTTPS forwards"); ?></strong><br/>
<?=gettext("If this option is set, attempts to connect to SSL/HTTPS (Port 443) sites will not be forwarded to the captive portal. This prevents certificate errors from being presented to the user even if HTTPS logins are enabled. Users must attempt a connecton to an HTTP (Port 80) site to get forwarded to the captive portal. If HTTPS logins are enabled, the user will be redirected to the HTTPS login page."); ?></td>
</tr>
<tr>
diff --git a/usr/local/www/services_captiveportal_hostname.php b/usr/local/www/services_captiveportal_hostname.php
index 960cb43..b9662f9 100644
--- a/usr/local/www/services_captiveportal_hostname.php
+++ b/usr/local/www/services_captiveportal_hostname.php
@@ -137,11 +137,11 @@ include("head.inc");
echo "any <img src=\"/themes/{$g['theme']}/images/icons/icon_in.gif\" width=\"11\" height=\"11\" align=\"middle\" alt=\"in\" /> ";
}
if($ip['dir'] == "both") {
- echo "<img src=\"/themes/{$g['theme']}/images/icons/icon_pass.gif\" width=\"11\" height=\"11\" align=\"absmiddle\" alt=\"pass\" /> ";
+ echo "<img src=\"/themes/{$g['theme']}/images/icons/icon_pass.gif\" width=\"11\" height=\"11\" align=\"middle\" alt=\"pass\" /> ";
}
echo strtolower($ip['hostname']);
if($ip['dir'] == "from") {
- echo "<img src=\"/themes/{$g['theme']}/images/icons/icon_in.gif\" width=\"11\" height=\"11\" align=\"absmiddle\" alt=\"in\" /> any";
+ echo "<img src=\"/themes/{$g['theme']}/images/icons/icon_in.gif\" width=\"11\" height=\"11\" align=\"middle\" alt=\"in\" /> any";
}
?>
diff --git a/usr/local/www/services_captiveportal_vouchers.php b/usr/local/www/services_captiveportal_vouchers.php
index 28dcfcf..0e1a3a5 100644
--- a/usr/local/www/services_captiveportal_vouchers.php
+++ b/usr/local/www/services_captiveportal_vouchers.php
@@ -513,8 +513,9 @@ function enable_change(enable_change) {
"time, the voucher can be re-used from the same or a different computer. If the voucher " .
"is used again from another computer, the previous session is stopped."); ?>
<?php else: ?>
- <?=gettext("Enable Voucher support first using the checkbox above and hit Save at the bottom."); ?></td>
+ <?=gettext("Enable Voucher support first using the checkbox above and hit Save at the bottom."); ?>
<?php endif;?>
+ </td>
</tr>
<tr>
<td valign="top" class="vncellreq">
diff --git a/usr/local/www/system_crlmanager.php b/usr/local/www/system_crlmanager.php
index b66b1ac..41c623d 100644
--- a/usr/local/www/system_crlmanager.php
+++ b/usr/local/www/system_crlmanager.php
@@ -451,7 +451,7 @@ function method_change() {
&nbsp;&nbsp;&nbsp;&nbsp;<?php echo gettext("No Certificates Found for this CRL."); ?>
</td>
<td class="list">&nbsp;</td>
- </td>
+ </tr>
<?php else:
foreach($crl['cert'] as $i => $cert):
$name = htmlspecialchars($cert['descr']);
@@ -488,7 +488,7 @@ function method_change() {
&nbsp;&nbsp;&nbsp;&nbsp;<?php echo gettext("No Certificates Found for this CA."); ?>
</td>
<td class="list">&nbsp;</td>
- </td>
+ </tr>
<?php else: ?>
<tr>
<td class="listlr" colspan="3" align="center">
OpenPOWER on IntegriCloud