X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_group_right.php;h=36d338ecd8592a19e4d996d8826ea7388f4f164c;hp=b3877d36f0f3f10f1e90a8ad395ff01f330103cd;hb=HEAD;hpb=604cb58c11bd88a8c05d244a1af7e4da32c856a8

diff --git a/DataObjects/Core_group_right.php b/DataObjects/Core_group_right.php
index b3877d36..36d338ec 100755
--- a/DataObjects/Core_group_right.php
+++ b/DataObjects/Core_group_right.php
@@ -13,15 +13,15 @@
  *
  * 
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
  
-class Pman_Core_DataObjects_Group_rights extends DB_DataObject 
+class Pman_Core_DataObjects_Core_group_right extends DB_DataObject 
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
 
-    public $__table = 'group_rights';                    // table name
+    public $__table = 'core_group_right';                    // table name
     public $rightname;                       // string(64)  not_null
     public $group_id;                        // int(11)  not_null
     public $accessmask;                      // string(10)  not_null
@@ -149,7 +149,7 @@ class Pman_Core_DataObjects_Group_rights extends DB_DataObject
         }
         $has_admin = true; ///?? not sure..
         if ($gid) {
-            $g = DB_DataObject::factory('groups');
+            $g = DB_DataObject::factory('core_group');
             $g->get($this->group_id);
             $has_admin = $g->type  == 2 ? false : true;
         }
@@ -214,7 +214,7 @@ class Pman_Core_DataObjects_Group_rights extends DB_DataObject
     {
         // all groups must have the minimum privaligess..
         // admin group must have all the privaliges
-        $g = DB_DataObject::Factory('groups');
+        $g = DB_DataObject::Factory('core_group');
         $g->get($this->group_id);
         $defs = $this->defaultPermData();
         switch($g->name) {
@@ -236,7 +236,7 @@ class Pman_Core_DataObjects_Group_rights extends DB_DataObject
     function genDefault()
     {
         // need to create to special groups, admin & DEFAULT.
-        $g = DB_DataObject::Factory('Groups');
+        $g = DB_DataObject::Factory('core_group');
         //$g->name = 'Default';
         //if (!$g->find(true)) {
         //    $g->insert();
@@ -244,7 +244,7 @@ class Pman_Core_DataObjects_Group_rights extends DB_DataObject
         $g->id = 0;
         $this->applyDefs($g, 1);
     
-        $g = DB_DataObject::Factory('Groups');
+        $g = DB_DataObject::Factory('core_group');
         $g->name = 'Administrators';
         $g->type = 0;
         if (!$g->find(true)) {
@@ -261,7 +261,7 @@ class Pman_Core_DataObjects_Group_rights extends DB_DataObject
         //echo '<PRE>';print_r($defs);
         //$usecol = 1;
         foreach($defs as $rightname => $defdata) {
-            $gr = DB_DataObject::Factory('group_rights');
+            $gr = DB_DataObject::Factory('core_group_right');
             $gr->rightname  = $rightname;
             $gr->group_id = $g->id;
             if (!$gr->find(true)) {