diff options
| -rw-r--r-- | packages/openbgpd/openbgpd.inc | 5 | ||||
| -rw-r--r-- | packages/openbgpd/openbgpd_groups.xml | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/packages/openbgpd/openbgpd.inc b/packages/openbgpd/openbgpd.inc index aff02c24..4f73ed71 100644 --- a/packages/openbgpd/openbgpd.inc +++ b/packages/openbgpd/openbgpd.inc @@ -131,6 +131,7 @@ function openbgpd_install_conf() { function deinstall_openbgpd() { exec("rm /usr/local/etc/rc.d/bgpd.sh"); + exec("rm /usr/local/www/openbgpd_status.php"); exec("killall bgpd"); } @@ -144,11 +145,11 @@ function check_group_usage($groupname) { foreach($openbgpd_groups as $group) { foreach($openbgpd_neighbors as $neighbor) { if($neighbor['groupname'] == $group['name']) - return true; + return $neighbor['groupname']; } } } - return false; + return ""; } function grey_out_value_boxes() { diff --git a/packages/openbgpd/openbgpd_groups.xml b/packages/openbgpd/openbgpd_groups.xml index 6e80dbfe..01756311 100644 --- a/packages/openbgpd/openbgpd_groups.xml +++ b/packages/openbgpd/openbgpd_groups.xml @@ -108,7 +108,7 @@ </custom_php_resync_config_command> <custom_php_validation_command> $status = check_group_usage($_POST['groupname']); - if($status) - $input_errors[] = "Sorry this group is in use and cannot be deleted."; + if($status != "") + $input_errors[] = "Sorry this group is in use by {$staus} and cannot be deleted."; </custom_php_validation_command> </packagegui> |