diff options
author | jim-p <jimp@pfsense.org> | 2011-06-27 14:06:33 -0400 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2011-06-27 14:06:33 -0400 |
commit | 8a385f42742b9f1da57f53639436f7bea0c5ada1 (patch) | |
tree | 942e8ad24b27423f5ccc418fb3be4721f954f9b2 /usr | |
parent | 84296ca3f75378ae027cd2030d41cc41d68fc901 (diff) | |
parent | 2f3554bba15ceabca965aabb6c9cc3b4e33e88d4 (diff) | |
download | pfsense-8a385f42742b9f1da57f53639436f7bea0c5ada1.zip pfsense-8a385f42742b9f1da57f53639436f7bea0c5ada1.tar.gz |
Merge remote branch 'upstream/master'
Diffstat (limited to 'usr')
-rwxr-xr-x | usr/local/www/firewall_rules_edit.php | 8 | ||||
-rwxr-xr-x | usr/local/www/status_rrd_graph_settings.php | 13 |
2 files changed, 15 insertions, 6 deletions
diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php index 62024e2..e935e15 100755 --- a/usr/local/www/firewall_rules_edit.php +++ b/usr/local/www/firewall_rules_edit.php @@ -646,7 +646,7 @@ include("head.inc"); <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Associated filter rule");?></td> <td width="78%" class="vtable"> - <span class="red"><strong><?=gettext("NOTE: ");?></strong></span><?=gettext("This is associated to a NAT rule.");?><br /> + <span class="red"><strong><?=gettext("Note: ");?></strong></span><?=gettext("This is associated to a NAT rule.");?><br /> <?=gettext("You cannot edit the interface, protocol, source, or destination of associated filter rules.");?><br /> <br /> <?php @@ -1108,7 +1108,7 @@ $i--): ?> <?=gettext("State Timeout in seconds");?> </p> - <p><strong><?=gettext("NOTE: Leave fields blank to disable that feature.");?></strong></p> + <p><strong><?=gettext("Note: Leave fields blank to disable that feature.");?></strong></p> </div> </td> </tr> @@ -1166,7 +1166,7 @@ $i--): ?> <option value="sloppy state" <?php if($pconfig['statetype'] == "sloppy state") echo "selected"; ?>><?=gettext("sloppy state");?></option> <option value="synproxy state"<?php if($pconfig['statetype'] == "synproxy state") echo "selected"; ?>><?=gettext("synproxy state");?></option> <option value="none"<?php if($pconfig['statetype'] == "none") echo "selected"; ?>><?=gettext("none");?></option> - </select><br><?=gettext("HINT: Select which type of state tracking mechanism you would like to use. If in doubt, use keep state.");?> + </select><br><?=gettext("Hint: Select which type of state tracking mechanism you would like to use. If in doubt, use keep state.");?> <p> <table width="90%"> <tr><td width="25%"><ul><li><?=gettext("keep state");?></li></ul></td><td><?=gettext("Works with all IP protocols.");?></td></tr> @@ -1186,7 +1186,7 @@ $i--): ?> </div> <div id="shownoxmlrpcadv" <?php if (empty($pconfig['nosync'])) echo "style='display:none'"; ?>> <input type="checkbox" name="nosync"<?php if($pconfig['nosync']) echo " CHECKED"; ?>><br> - <?=gettext("HINT: This prevents the rule from automatically syncing to other CARP members.");?> + <?=gettext("Hint: This prevents the rule from automatically syncing to other CARP members.");?> </div> </td> </tr> diff --git a/usr/local/www/status_rrd_graph_settings.php b/usr/local/www/status_rrd_graph_settings.php index a4b562e..85061ba 100755 --- a/usr/local/www/status_rrd_graph_settings.php +++ b/usr/local/www/status_rrd_graph_settings.php @@ -62,8 +62,11 @@ $periods = array("absolute" => gettext("Absolute Timespans"), "current" => gettext("Current Period"), "previous" => gettext("Previous Period")); -if ($_POST) { - +if ($_POST['ResetRRD']) { + mwexec('/bin/rm /var/db/rrd/*'); + $retval = enable_rrd_graphing(); + $savemsg = "RRD data has been cleared. New RRD files have been generated."; +} elseif ($_POST) { unset($input_errors); $pconfig = $_POST; @@ -223,6 +226,12 @@ include("head.inc"); </td> </tr> <tr> + <td width="22%" valign="top"> </td> + <td width="78%"> + <input name="ResetRRD" type="submit" class="formbtn" value="<?=gettext("Reset RRD Data");?>" onclick="return confirm('<?=gettext('Do you really want to reset the RRD graphs? This will erase all graph data.');?>')"> + </td> + </tr> + <tr> <td width="22%" height="53" valign="top"> </td> <td width="78%"><strong><span class="red"><?=gettext("Note:");?></span></strong><br> <?=gettext("Graphs will not be allowed to be recreated within a 1 minute interval, please " . |