DataObjects/Core_group.php

[Pman.Core] / DataObjects / Core_group.php

diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php
index 22ed020..037308f 100644 (file)
--- a/DataObjects/Core_group.php
+++ b/DataObjects/Core_group.php
@@ -59,13 +59,22 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
                 $roo->jerr("missing group id");
 
             }
-            foreach(explode(',', $q['user_ids']) as $uid) {
-                $this->addMember($uid);
+             foreach(explode(',', $q['user_ids']) as $uid) {
+                switch($q['_action']) {
+                    case 'add':
+                        $g->addMember($uid);
+                        break;
+                    case 'sub':
+                        $g->removeMember($uid);
+                        break;
+                    default:
+                        $roo->jerr('invalid action');
+                }
             }
+            $roo->jok('updated');
             
             
             
-            $this->jerr('invalid action');
             
         }
         
@@ -134,11 +143,11 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
         return $gm->fetchAll('user_id');
         
     }
-    function isMember($uid)
+    function isMember($person)
     {
         $gm = DB_Dataobject::factory('core_group_member');
         $gm->group_id = $this->id;
-        $gm->user_id = $uid;
+        $gm->user_id = is_object($person) ? $person->id : $person;
         return $gm->count();
     }
     
@@ -151,6 +160,17 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
             $gm->insert();
         }
     }
+    
+    function removeMember($person)
+    {
+        $gm = DB_Dataobject::factory('core_group_member');
+        $gm->group_id = $this->id;
+        $gm->user_id = is_object($person) ? $person->id : $person;
+        if ($gm->count()) {
+            $gm->delete();
+        }
+    }
+    
     /**
      *
      *  grab a list of members - default is the array of person objects..
@@ -209,7 +229,7 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
     
     function postListFilter($ar, $au, $req)
     {      
-        if(!empty($req['_direct_return'])){
+        if(empty($req['_add_everyone'])){
             return $ar;
         }