summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www/easyrule.php
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2016-01-17 22:41:01 +0545
committerPhil Davis <phil.davis@inf.org>2016-01-17 22:41:01 +0545
commit60d874352513a8ce678c100a1a4d6b8e760fe2cd (patch)
treedadcf89dae23ff0ff6f921c4fd386241fe0e053f /src/usr/local/www/easyrule.php
parentdaf566f10c75cb50458de9c50a50da69e346459f (diff)
downloadpfsense-60d874352513a8ce678c100a1a4d6b8e760fe2cd.zip
pfsense-60d874352513a8ce678c100a1a4d6b8e760fe2cd.tar.gz
Fix easyrule fbegin.inc echoed text
If you manually navigate directly to easyrule.php you get a bit of rubbish text displayed before the actual message about "This is the Easy Rule status page...". That is due to having too many closing PHP tags. Also, fbegin.inc does not need to be included anyway. I also changed the message to be in a print_info_box() warning and sorted the internationalization a bit more. There could be a bit more formatting done here after this - the page has a help icon that looks a bit lonely without the other usual panel-heading panel-title stuff.
Diffstat (limited to 'src/usr/local/www/easyrule.php')
-rw-r--r--src/usr/local/www/easyrule.php29
1 files changed, 16 insertions, 13 deletions
diff --git a/src/usr/local/www/easyrule.php b/src/usr/local/www/easyrule.php
index 5363adc..ceca6f7 100644
--- a/src/usr/local/www/easyrule.php
+++ b/src/usr/local/www/easyrule.php
@@ -87,9 +87,7 @@ if (stristr($retval, "error") == true) {
$message = $retval;
}
-include("head.inc"); ?>
-
-include("fbegin.inc");
+include("head.inc");
?>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
@@ -99,17 +97,22 @@ if ($input_errors) {
print_input_errors($input_errors);
}
-if ($message) { ?>
+if ($message) {
+?>
<br />
<?=gettext("Message"); ?>: <?=$message;?>
<br />
-<?php } else { ?>
-<?=gettext("This is the Easy Rule status page, mainly used to display errors when adding rules. " .
-"If you are seeing this, there apparently was not an error, and you navigated to the " .
-"page directly without telling it what to do"); ?>.<br /><br />
-<?=gettext("This page is meant to be called from the block/pass buttons on the Firewall Logs page"); ?>, <a href="status_logs_filter.php"><?=gettext("Status"); ?> &gt; <?=gettext("System Logs, " .
-"Firewall Tab"); ?></a>.
-<br />
-<?php } ?>
-</td></tr></table>
+<?php
+} else {
+ print_info_box(
+ gettext('This is the Easy Rule status page, mainly used to display errors when adding rules.') . ' ' .
+ gettext('If you are seeing this, there apparently was not an error, and you navigated to the page directly without telling it what to do.') .
+ '<br /><br />' .
+ gettext('This page is meant to be called from the block/pass buttons on the Firewall Logs page') .
+ ', <a href="status_logs_filter.php">' . gettext("Status") . ' &gt; ' . gettext('System Logs') . ', ' . gettext('Firewall Tab') . '</a>.<br />');
+}
+?>
+ </td>
+ </tr>
+</table>
<?php include("foot.inc"); ?>
OpenPOWER on IntegriCloud