summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2016-07-07 16:09:48 +0930
committerGitHub <noreply@github.com>2016-07-07 16:09:48 +0930
commit04b571e836077c436d109d982be5a8e710ff8aab (patch)
treeeaa8d2e93f143fab2c4e5f68b7f8aaeb6cec4978
parenta9b6c19aebecc17bcc2f6e793446609325df125e (diff)
downloadpfsense-04b571e836077c436d109d982be5a8e710ff8aab.zip
pfsense-04b571e836077c436d109d982be5a8e710ff8aab.tar.gz
Show "cannot delete alias" message as error
If I try to delete an alias that is in use, the "cannot delete alias" message was being displayed as the "success" color.
-rw-r--r--src/usr/local/www/firewall_aliases.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/usr/local/www/firewall_aliases.php b/src/usr/local/www/firewall_aliases.php
index f5afe68..b6be2ff 100644
--- a/src/usr/local/www/firewall_aliases.php
+++ b/src/usr/local/www/firewall_aliases.php
@@ -85,8 +85,10 @@ if ($_POST) {
if (stristr($retval, "error") <> true) {
$savemsg = get_std_save_message($retval);
+ $class = "success";
} else {
$savemsg = $retval;
+ $class = "danger";
}
if ($retval == 0) {
clear_subsystem_dirty('aliases');
@@ -131,6 +133,7 @@ if ($_GET['act'] == "del") {
find_alias_reference(array('staticroutes', 'route'), array('network'), $alias_name, $is_alias_referenced, $referenced_by);
if ($is_alias_referenced == true) {
$savemsg = sprintf(gettext("Cannot delete alias. Currently in use by %s."), htmlspecialchars($referenced_by));
+ $class = "danger";
} else {
if (preg_match("/urltable/i", $a_aliases[$_GET['id']]['type'])) {
// this is a URL table type alias, delete its file as well
@@ -204,7 +207,7 @@ $shortcut_section = "aliases";
include("head.inc");
if ($savemsg) {
- print_info_box($savemsg, 'success');
+ print_info_box($savemsg, $class);
}
if (is_subsystem_dirty('aliases')) {
OpenPOWER on IntegriCloud