From 5be7a5bffd161b231165c494aa6974711ed50c1d Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Thu, 7 Jul 2016 16:09:48 +0930 Subject: 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. (cherry picked from commit 04b571e836077c436d109d982be5a8e710ff8aab) --- src/usr/local/www/firewall_aliases.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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')) { -- cgit v1.1