sycn

[Pman.Core] / DataObjects / Core_group.php

diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php
index 1343436..49b9c3c 100644 (file)
--- a/DataObjects/Core_group.php
+++ b/DataObjects/Core_group.php
@@ -14,12 +14,12 @@
  */
 require_once 'DB/DataObject.php';
 
-class Pman_Core_DataObjects_Core_groups extends DB_DataObject 
+class Pman_Core_DataObjects_Core_group extends DB_DataObject 
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
 
-    public $__table = 'core_groups';                          // table name
+    public $__table = 'core_group';                          // table name
     public $id;                              // int(11)  not_null primary_key auto_increment
     public $name;                            // string(64)  not_null
     public $type;                            // int(11)  
@@ -29,19 +29,11 @@ class Pman_Core_DataObjects_Core_groups extends DB_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
     
-    
-    function memberTable()
-    {
-        return 'core_group_members';
-    }
-    function rightsTable()
-    {
-        return 'core_group_rights';
-    }
+      
     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'];
     }
     
     
@@ -60,9 +52,10 @@ class Pman_Core_DataObjects_Core_groups extends DB_DataObject
     
     function beforeDelete()
     {
-        $x = DB_DataObject::factory($this->tableName());
-        $x->query("DELETE FROM {$this->rightsTable()} WHERE group_id = {$this->id}");
-        $x->query("DELETE FROM {$this->membersTable()} WHERE group_id = {$this->id}");
+        $x = DB_DataObject::factory('core_group_right');
+        $x->query("DELETE FROM {$x->tableName()} WHERE group_id = {$this->id}");
+        $x = DB_DataObject::factory('core_group_member');
+        $x->query("DELETE FROM {$x->tableName()} WHERE group_id = {$this->id}");
     }
     /**
      * check who is trying to access this. false == access denied..
@@ -88,10 +81,10 @@ class Pman_Core_DataObjects_Core_groups 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; //???????
@@ -106,14 +99,14 @@ class Pman_Core_DataObjects_Core_groups 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');
         
@@ -122,7 +115,7 @@ class Pman_Core_DataObjects_Core_groups 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()) {
@@ -145,7 +138,7 @@ class Pman_Core_DataObjects_Core_groups 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;
@@ -205,7 +198,7 @@ class Pman_Core_DataObjects_Core_groups extends DB_DataObject
             return;
         }
         $g->insert();
-        $gr = DB_DataObject::factory($this->rightsTable());
+        $gr = DB_DataObject::factory('core_group_right');
         $gr->genDefault();
     }