diff --git a/admin/group_list.php b/admin/group_list.php index 9691f4913..38bbf5732 100644 --- a/admin/group_list.php +++ b/admin/group_list.php @@ -157,14 +157,17 @@ SELECT name WHERE group_id = '.$group.' ;'; pwg_query($query); - + $query = ' - SELECT name + SELECT id, name FROM '.GROUPS_TABLE.' WHERE id = '.$group.' ;'; - list($groupname) = pwg_db_fetch_row(pwg_query($query)); - + + $group_list = query2array($query, 'id', 'name'); + $groupids = array_keys($group_list); + list($groupname) = array_values($group_list); + // destruction of the group $query = ' DELETE @@ -172,7 +175,9 @@ SELECT name WHERE id = '.$group.' ;'; pwg_query($query); - + + trigger_notify('delete_group', $groupids); + $page['infos'][] = l10n('group "%s" deleted', $groupname); } } diff --git a/include/ws_functions/pwg.groups.php b/include/ws_functions/pwg.groups.php index 42a495a1a..f5b71bfd3 100644 --- a/include/ws_functions/pwg.groups.php +++ b/include/ws_functions/pwg.groups.php @@ -135,11 +135,14 @@ DELETE pwg_query($query); $query = ' -SELECT name +SELECT id, name FROM '. GROUPS_TABLE .' WHERE id IN('. $group_id_string .') ;'; - $groupnames = array_from_query($query, 'name'); + + $group_list = query2array($query, 'id', 'name'); + $groupnames = array_values($group_list); + $groupids = array_keys($group_list); // destruction of the group $query = ' @@ -149,6 +152,8 @@ DELETE ;'; pwg_query($query); + trigger_notify('delete_group', $groupids); + include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); invalidate_user_cache(); diff --git a/tools/triggers_list.php b/tools/triggers_list.php index 2a198e10f..8ac7e20ee 100644 --- a/tools/triggers_list.php +++ b/tools/triggers_list.php @@ -83,6 +83,12 @@ array( 'vars' => array('array', 'ids'), 'files' => array('admin\include\functions.inc.php (delete_categories)'), ), +array( + 'name' => 'delete_group', + 'type' => 'trigger_notify', + 'vars' => array('array', 'groupids'), + 'files' => array('admin\group_list.php','admin\include\functions.inc.php (delete_group)'), +), array( 'name' => 'delete_elements', 'type' => 'trigger_notify',