From e62103b8d9463bf409881d17a4bda93f3ca3208d Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 9 Dec 2008 08:47:30 +0000
Subject: Move code to delete users and add/remove users from groups into the
 model.

---
 core/controllers/welcome.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'core/controllers')

diff --git a/core/controllers/welcome.php b/core/controllers/welcome.php
index ce9d3219..2839b2f1 100644
--- a/core/controllers/welcome.php
+++ b/core/controllers/welcome.php
@@ -456,12 +456,13 @@ class Welcome_Controller extends Template_Controller {
   }
 
   public function delete_group($id) {
-    group::delete($id);
+    ORM::factory("group", $id)->delete();
     url::redirect("welcome");
   }
 
   public function remove_from_group($group_id, $user_id) {
-    group::remove_user($group_id, $user_id);
+    ORM::factory("group", $group_id)->remove(
+      ORM::factory("user", $user_id));
     url::redirect("welcome");
   }
 
@@ -469,7 +470,7 @@ class Welcome_Controller extends Template_Controller {
     $group_name = $this->input->post("group_name");
     $group = ORM::factory("group")->where("name", $group_name)->find();
     if ($group->loaded) {
-      group::add_user($group->id, $user_id);
+      $group->add(ORM::factory("user", $user_id));
     }
     url::redirect("welcome");
   }
-- 
cgit v1.2.3