Move code to delete users and add/remove users from groups into the

model.

2 files changed, 9 insertions, 1 deletions

diff --git a/modules/user/models/group.php b/modules/user/models/group.php
index 794c0549..55b5ea97 100644
--- a/modules/user/models/group.php
+++ b/modules/user/models/group.php
@@ -22,4 +22,12 @@ class Group_Model extends ORM {
 
   var $rules = array(
     "name" => "required|length[4,255]");
+
+  /**
+   * @see ORM::delete()
+   */
+  public function delete($id=null) {
+    module::event("group_before_delete", $this);
+    parent::delete($id);
+  }
 }
\ No newline at end of file
diff --git a/modules/user/models/user.php b/modules/user/models/user.php
index bb01fd49..82834930 100644
--- a/modules/user/models/user.php
+++ b/modules/user/models/user.php
@@ -39,7 +39,7 @@ class User_Model extends ORM {
    * @see ORM::delete()
    */
   public function delete($id=null) {
+    module::event("user_before_delete", $this);
     parent::delete($id);
-    module::event("user_deleted", $user);
   }
 }
\ No newline at end of file