DataObjects/Core_notify_recur.php

[Pman.Core] / DataObjects / Groups.php

diff --git a/DataObjects/Groups.php b/DataObjects/Groups.php
index 1464b13..98ba7f8 100755 (executable)
--- a/DataObjects/Groups.php
+++ b/DataObjects/Groups.php
@@ -36,7 +36,7 @@ class Pman_Core_DataObjects_Groups extends DB_DataObject
      */
     function checkPerm($lvl, $au) 
     {
-        return $au->hasPerm("Core.".$this->tableName(), $lvl);    
+        return $au->hasPerm("Core.Groups", $lvl);    
     } 
     function onUpdate($old, $req, $roo)
     {
@@ -55,7 +55,7 @@ class Pman_Core_DataObjects_Groups extends DB_DataObject
             return true;
         }
         
-        $pi = DB_DataObject::factory('Person');
+        $pi = DB_DataObject::factory(empty($ff->Pman['authTable']) ? 'Person' : $ff->Pman['authTable']);
         $pi->get($this->leader);
             
         $p = DB_DataObject::factory('Group_Members');
@@ -78,6 +78,17 @@ class Pman_Core_DataObjects_Groups extends DB_DataObject
         
     }
     
+    
+    function addMember($person)
+    {
+        $gm = DB_Dataobject::factory('Group_Members');
+        $gm->group_id = $this->id;
+        $gm->user_id = $person->id;
+        if (!$gm->count()) {
+            $gm->insert();
+        }
+    }
+    
     function members()
     {
         
@@ -86,13 +97,23 @@ class Pman_Core_DataObjects_Groups extends DB_DataObject
         if (!$ids) {
             return array();
         }
-        $p = DB_Dataobject::factory('Person');
+        $p = DB_Dataobject::factory(empty($ff->Pman['authTable']) ? 'Person' : $ff->Pman['authTable']);
         $p->whereAdd('id IN ('. implode(',', $ids) .')');
         return $p->fetchAll();
      
         
         
     }
-    
+    function postListFilter($ar, $au, $req)
+    {      
+        
+        $ret[] = array( 'id' => 0, 'name' => 'EVERYONE');
+        $ret[] = array( 'id' => -1, 'name' => 'NOT_IN_GROUP');
+        return array_merge($ret, $ar);
+            //$ret[] = array( 'id' => 999999, 'name' => 'ADMINISTRATORS');
+
+    }
+        
+     
     
 }