Merge branch 'master' of http://git.roojs.com:8081/Pman.Core

[Pman.Core] / DataObjects / Core_person.php

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index b93c6c1..f38343a 100644 (file)
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -307,10 +307,10 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
             ($_SERVER['SERVER_ADDR'] == '127.0.0.1') &&
             ($_SERVER['REMOTE_ADDR'] == '127.0.0.1')  
         ) {
-            $group = DB_DataObject::factory('Groups');
+            $group = DB_DataObject::factory('core_group');
             $group->get('name', 'Administrators');
             
-            $member = DB_DataObject::factory('group_members');
+            $member = DB_DataObject::factory('core_group_member');
             $member->autoJoin();
             $member->group_id = $group->id;
             $member->whereAdd("
@@ -425,7 +425,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
             $u->id = -1;
             
             // if a company has been created fill that in in company_id_id
-            $c = DB_DAtaObject::factory('Companies')->lookupOwner();
+            $c = DB_DAtaObject::factory('core_company')->lookupOwner();
             if ($c) {
                 $u->company_id_id = $c->pid();
                 $u->company_id = $c->pid();
@@ -449,13 +449,13 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
          
         // refresh admin group if we are logged in as one..
         //DB_DataObject::debugLevel(1);
-        $g = DB_DataObject::factory('Groups');
+        $g = DB_DataObject::factory('core_group');
         $g->type = 0;
         $g->get('name', 'Administrators');
-        $gm = DB_DataObject::Factory('group_members');
+        $gm = DB_DataObject::Factory('core_group_member');
         if (in_array($g->id,$gm->listGroupMembership($this))) {
             // refresh admin groups.
-            $gr = DB_DataObject::Factory('group_rights');
+            $gr = DB_DataObject::Factory('core_group_right');
             $gr->applyDefs($g, 0);
         }
         
@@ -532,7 +532,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
     
     function company()
     {
-        $x = DB_DataObject::factory('Companies');
+        $x = DB_DataObject::factory('core_company');
         $x->autoJoin();
         $x->get($this->company_id);
         return $x;
@@ -579,7 +579,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         
         
         //DB_DataObject::debugLevel(1);
-        $c = DB_Dataobject::factory('Companies');
+        $c = DB_Dataobject::factory('core_company');
         $im = DB_Dataobject::factory('Images');
         $c->joinAdd($im, 'LEFT');
         $c->selectAdd();
@@ -594,7 +594,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         if (empty($c->company_id_logo_id_id))  {
                  
             $im = DB_Dataobject::factory('Images');
-            $im->ontable = 'Companies';
+            $im->ontable = DB_DataObject::factory('core_company')->tableName();
             $im->onid = $c->id;
             $im->imgtype = 'LOGO';
             $im->limit(1);
@@ -801,7 +801,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
             
             // specific to project directory which is single comp. login
             //
-            $owncomp = DB_DataObject::Factory('Companies');
+            $owncomp = DB_DataObject::Factory('core_company');
             $owncomp->get('comptype', 'OWNER');
             if ($q['company_id'] == $owncomp->id) {
                 $this->active =1;
@@ -1029,7 +1029,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         }
         
         // determine if it's staff!!!
-        $owncomp = DB_DataObject::Factory('Companies');
+        $owncomp = DB_DataObject::Factory('core_company');
         $owncomp->get('comptype', 'OWNER');
         $isStaff = ($au->company_id ==  $owncomp->id);
        
@@ -1085,7 +1085,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         if ($roo->authUser->id > -1 ||  $p->count() > 1) {
             return;
         }
-        $c = DB_DAtaObject::Factory('Companies');
+        $c = DB_DAtaObject::Factory('core_company');
         $tc =$c->count();
         if (!$tc || $tc> 1) {
             $roo->jerr("can not create initial user as multiple companies already exist");