diff --git a/src/mibew/libs/classes/Mibew/Controller/Group/ManagementController.php b/src/mibew/libs/classes/Mibew/Controller/Group/ManagementController.php index b630dd2c..7dd39d7e 100644 --- a/src/mibew/libs/classes/Mibew/Controller/Group/ManagementController.php +++ b/src/mibew/libs/classes/Mibew/Controller/Group/ManagementController.php @@ -97,13 +97,9 @@ class ManagementController extends AbstractController { csrf_check_token($request); - $db = Database::getInstance(); - // Remove the group and all its relations. $group_id = $request->attributes->getInt('group_id'); - $db->query("DELETE FROM {opgroup} WHERE groupid = ?", array($group_id)); - $db->query("DELETE FROM {operatortoopgroup} WHERE groupid = ?", array($group_id)); - $db->query("UPDATE {thread} SET groupid = 0 WHERE groupid = ?", array($group_id)); + delete_group($group_id); // Redirect user to canned messages list. Use only "sortby" and // "sortdirection" get params for the target URL. diff --git a/src/mibew/libs/groups.php b/src/mibew/libs/groups.php index bcf8cb30..b4b7f5c6 100644 --- a/src/mibew/libs/groups.php +++ b/src/mibew/libs/groups.php @@ -444,3 +444,16 @@ function update_group_members($group_id, $new_value) ); } } + +/** + * Deletes a group with specified ID. + * + * @param int $group_id ID of the group that should be deleted. + */ +function delete_group($group_id) +{ + $db = Database::getInstance(); + $db->query("DELETE FROM {opgroup} WHERE groupid = ?", array($group_id)); + $db->query("DELETE FROM {operatortoopgroup} WHERE groupid = ?", array($group_id)); + $db->query("UPDATE {thread} SET groupid = 0 WHERE groupid = ?", array($group_id)); +}