sycn

[Pman.Core] / DataObjects / Core_group.php

diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php
index 26ae908..49b9c3c 100644 (file)
--- a/DataObjects/Core_group.php
+++ b/DataObjects/Core_group.php
@@ -33,7 +33,7 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
     function personTable()
     {
         $ff = HTML_FlexyFramework::get();
-        return empty($ff->Pman['authTable']) ? 'Person' : $ff->Pman['authTable'];
+        return empty($ff->Pman['authTable']) ? 'core_person' : $ff->Pman['authTable'];
     }
     
     
@@ -81,10 +81,10 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
             return true;
         }
         
-        $pi = DB_DataObject::factory($this->personTable());
+        $pi = DB_DataObject::factory('core_person');
         $pi->get($this->leader);
             
-        $p = DB_DataObject::factory($this->membersTable());
+        $p = DB_DataObject::factory('core_group_member');
         $p->group_id = $this->id;
         $p->user_id = $this->leader;
         //$p->type = 1; //???????
@@ -99,14 +99,14 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
     
     function memberCount()
     {
-        $gm = DB_Dataobject::factory($this->membersTable());
+        $gm = DB_Dataobject::factory('core_group_member');
         $gm->group_id = $this->id;
         return $gm->count();
     }
     
     function memberIds()
     {
-        $gm = DB_Dataobject::factory($this->membersTable());
+        $gm = DB_Dataobject::factory('core_group_member');
         $gm->group_id = $this->id;
         return $gm->fetchAll('user_id');
         
@@ -115,7 +115,7 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
     
     function addMember($person)
     {
-        $gm = DB_Dataobject::factory($this->membersTable());
+        $gm = DB_Dataobject::factory('core_group_member');
         $gm->group_id = $this->id;
         $gm->user_id = $person->id;
         if (!$gm->count()) {
@@ -138,7 +138,7 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
         }
         //$p = DB_Dataobject::factory(empty($ff->Pman['authTable']) ? 'Person' : $ff->Pman['authTable']);
         // groups databse is hard coded to person.. so this should not be used for other tables.????
-        $p = DB_Dataobject::factory( 'Person' );
+        $p = DB_Dataobject::factory( 'core_person' );
         
         $p->whereAdd('id IN ('. implode(',', $ids) .')');
         $p->active = 1;