mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show "cannot delete alias" message as error

Browse Source 
If I try to delete an alias that is in use, the "cannot delete alias" message was being displayed as the "success" color.
This commit is contained in:
Phil Davis 2016-07-07 16:09:48 +09:30 committed by GitHub
parent a9b6c19aeb
commit 04b571e836
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/usr/local/www/firewall_aliases.php
View File

@ -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')) {