From adaf207cf7aebf8f85f16951471785a9d1f7b130 Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Fri, 7 Oct 2016 16:51:15 +0800
Subject: [PATCH] sycn

---
 DataObjects/Core_group.php        |  6 +++---
 DataObjects/Core_group_member.php |  2 +-
 DataObjects/Core_group_right.php  | 10 +++++-----
 DataObjects/Core_locking.php      |  2 +-
 DataObjects/Core_notify.php       | 10 ++++++----
 DataObjects/Core_notify_recur.php |  2 +-
 DataObjects/Core_office.php       |  2 +-
 DataObjects/Core_person.php       | 10 +++++-----
 GroupCountries.php                |  4 ++--
 GroupMembers.php                  | 14 +++++++-------
 Lock.php                          |  6 +++---
 Pman.php                          |  8 ++++----
 RooPostTrait.php                  |  6 +++---
 SendIntro.php                     |  6 +++---
 UpdateDatabase.php                | 10 +++++-----
 15 files changed, 50 insertions(+), 48 deletions(-)

diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php
index 4537eb39..49b9c3c9 100644
--- 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,7 +81,7 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
             return true;
         }
         
-        $pi = DB_DataObject::factory('Person');
+        $pi = DB_DataObject::factory('core_person');
         $pi->get($this->leader);
             
         $p = DB_DataObject::factory('core_group_member');
@@ -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;
diff --git a/DataObjects/Core_group_member.php b/DataObjects/Core_group_member.php
index 8b33dbc2..cbd96671 100755
--- a/DataObjects/Core_group_member.php
+++ b/DataObjects/Core_group_member.php
@@ -56,7 +56,7 @@ class Pman_Core_DataObjects_Core_group_member extends DB_DataObject
         $t = clone($this);
         //DB_DataObject::debugLevel(1);
          
-        $grp = DB_DataObject::factory('Groups');
+        $grp = DB_DataObject::factory('core_group');
         $t->joinAdd($grp , 'LEFT');
         //$person->id = (int)$person->id;
         $t->whereAdd("
diff --git a/DataObjects/Core_group_right.php b/DataObjects/Core_group_right.php
index 21969840..f0323189 100755
--- a/DataObjects/Core_group_right.php
+++ b/DataObjects/Core_group_right.php
@@ -149,7 +149,7 @@ class Pman_Core_DataObjects_Core_group_right 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_Core_group_right 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_Core_group_right 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_Core_group_right 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_Core_group_right 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_rights');
             $gr->rightname  = $rightname;
             $gr->group_id = $g->id;
             if (!$gr->find(true)) {
diff --git a/DataObjects/Core_locking.php b/DataObjects/Core_locking.php
index 858a5e15..df878ebe 100644
--- a/DataObjects/Core_locking.php
+++ b/DataObjects/Core_locking.php
@@ -20,7 +20,7 @@ class Pman_Core_DataObjects_Core_locking extends DB_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
     function person() {
-        $p = DB_DataObjecT::factory('Person');
+        $p = DB_DataObject::factory('core_person');
         $p->get($this->person_id);
         return $p;
     }
diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index e5c17ee7..b75f47a5 100644
--- a/DataObjects/Core_notify.php
+++ b/DataObjects/Core_notify.php
@@ -53,15 +53,17 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
         if ($set !== false) {
             $this->person_table = is_object($set) ? $set->tableName() : '';
             
-            $person_table = empty($this->person_table) ? 'Person' : $this->person_table;
-            $col = $person_table  == "Person" ? 'person_id' : $person_table . '_id';
+            $def_pt = DB_DataObject::Factory('core_person')->tableName();
+            
+            $person_table = empty($this->person_table) ? $def_pt  : $this->person_table;
+            $col = $person_table  == $def_pt ? 'person_id' : $person_table . '_id';
             
             $this->{$col} = is_object($set) ? $set->id : $set;
             return;
         }
         static $cache  =array();
-        $person_table = empty($this->person_table) ? 'Person' : $this->person_table;
-        $col = $person_table == "Person" ? 'person_id' : $person_table . '_id';
+        $person_table = empty($this->person_table) ? $def_pt  : $this->person_table;
+        $col = $person_table == $def_pt  ? 'person_id' : $person_table . '_id';
         
         if (isset($cache[$person_table .':'. $this->{$col}])) {
             return $cache[$person_table .':'. $this->{$col}];
diff --git a/DataObjects/Core_notify_recur.php b/DataObjects/Core_notify_recur.php
index ca7b3ca5..7940bba5 100644
--- a/DataObjects/Core_notify_recur.php
+++ b/DataObjects/Core_notify_recur.php
@@ -200,7 +200,7 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
     
     function person()
     {
-        $p = DB_DAtaObject::factory('Person');
+        $p = DB_DAtaObject::factory('core_person');
         $p->get($this->person_id);
         return $p;
     }
diff --git a/DataObjects/Core_office.php b/DataObjects/Core_office.php
index a5229b52..e381da5d 100644
--- a/DataObjects/Core_office.php
+++ b/DataObjects/Core_office.php
@@ -58,7 +58,7 @@ class Pman_Core_DataObjects_Core_office extends DB_DataObject
             return true; // standard error message.
         }
         
-        $p = DB_DAtaObject::Factory('Person');
+        $p = DB_DAtaObject::Factory('core_person');
         
         if (!is_a($dependants_array[0], get_class($p))) {
             $roo->jerr("dep is not a person..");
diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 65bfe091..f38343ad 100644
--- 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("
@@ -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);
         }
         
diff --git a/GroupCountries.php b/GroupCountries.php
index 8ba6a62a..f8480c31 100644
--- a/GroupCountries.php
+++ b/GroupCountries.php
@@ -46,7 +46,7 @@ class Pman_Core_GroupCountries extends Pman
     function addPersonToCountry($users)
     {
         foreach($users as $id){
-            $p = DB_DataObject::factory('Person');
+            $p = DB_DataObject::factory('core_person');
             if(!$p->get($id)){
                 $this->jerr('This Person is not exsiting');
             }
@@ -63,7 +63,7 @@ class Pman_Core_GroupCountries extends Pman
     function subPersonToCountry($users)
     {
         foreach($users as $id){
-            $p = DB_DataObject::factory('Person');
+            $p = DB_DataObject::factory('core_person');
             if(!$p->get($id)){
                 $this->jerr('This Person is not exsiting');
             }
diff --git a/GroupMembers.php b/GroupMembers.php
index ace17aad..e1417e0a 100644
--- a/GroupMembers.php
+++ b/GroupMembers.php
@@ -43,7 +43,7 @@ class Pman_Core_GroupMembers extends Pman
         
         // Groups are only usable by owner company!!!
         
-        $u = DB_DataObject::factory('Person');
+        $u = DB_DataObject::factory('core_person');
         $u->company_id = $this->company->id;
         //$this->setFilters($u,$_GET);
         $u->active = 1; // active staff only..
@@ -87,7 +87,7 @@ class Pman_Core_GroupMembers extends Pman
         
         
         
-        $p = DB_DataObject::factory('group_members');
+        $p = DB_DataObject::factory('core_group_member');
         $p->group_id = (int)$_GET['group_id'];
         $p->whereAdd('user_id IN ('. implode(',' ,array_keys($ret) ). ')');
         $p->find();
@@ -119,14 +119,14 @@ class Pman_Core_GroupMembers extends Pman
             // add
             $ar = explode(',', $_POST['user_ids']);
             $ac = $_POST['action'];
-            $g = DB_DataObject::factory('Groups');
+            $g = DB_DataObject::factory('core_group');
             $g->get($_POST['group_id']);
             // check type????
             foreach($ar as $uid) {
-                $pi = DB_DataObject::factory('Person');
+                $pi = DB_DataObject::factory('core_person');
                 $pi->get($uid);
                     
-                $p = DB_DataObject::factory('group_members');
+                $p = DB_DataObject::factory('core_group_member');
                 $p->group_id = (int)$_POST['group_id'];
                 $p->user_id = $uid;
                 
@@ -162,7 +162,7 @@ class Pman_Core_GroupMembers extends Pman
            
             
             foreach($_POST['dataDelete'] as $id => $ac) {
-                $m = DB_DataObject::factory('group_members');
+                $m = DB_DataObject::factory('core_group_member');
                 $m->get($id);
                 $m->delete();
             }
@@ -172,7 +172,7 @@ class Pman_Core_GroupMembers extends Pman
         if (!empty($_POST['dataAdd'])) {
              
             foreach($_POST['dataAdd'] as $id => $ac) {
-                $p = DB_DataObject::factory('group_members');
+                $p = DB_DataObject::factory('core_group_member');
                 $p->group_id = (int)$_POST['group_id'];
                 $p->user_id = $id;
                 $p->insert();
diff --git a/Lock.php b/Lock.php
index 99c41618..53c88ee7 100644
--- a/Lock.php
+++ b/Lock.php
@@ -72,7 +72,7 @@ class Pman_Core_Lock extends Pman
         if (empty($_REQUEST['id'])) {
             $this->jerr("No lock id");
         }
-        $curlock = DB_DataObject::factory('Core_locking');
+        $curlock = DB_DataObject::factory('core_locking');
         if (!$curlock->get($_REQUEST['id'])) {
             $this->jok("No lock exists"); // been deleted before.. probably ok..
         }
@@ -132,7 +132,7 @@ class Pman_Core_Lock extends Pman
         if ($nlocks && empty($_REQUEST['force'])) {
            // DB_DataObjecT::debugLevel(1);
             $ar = $curlock_ex->fetchAll('person_id', 'created');
-            $p = DB_DataObject::factory('Person');
+            $p = DB_DataObject::factory('core_person');
             $p->selectAdd();
             $p->selectAdd('id,name,email');
             
@@ -175,7 +175,7 @@ class Pman_Core_Lock extends Pman
         
         // make a lock..
         
-        $curlock = DB_DataObject::factory('Core_locking');
+        $curlock = DB_DataObject::factory('core_locking');
         $curlock->setFrom(array(
             'on_id' => $_REQUEST['on_id'],
             'on_table' => strtolower($_REQUEST['on_table']),
diff --git a/Pman.php b/Pman.php
index af0e1e0d..4e503ece 100644
--- a/Pman.php
+++ b/Pman.php
@@ -13,13 +13,13 @@ class Pman_Core_Pman {
     {
         
         
-        $group = DB_DataObject::factory('groups');
+        $group = DB_DataObject::factory('core_group');
         
         // group should be auto created - by update-database...
         
         
         if(!$group->get('name', 'core-person-signup-bcc')){
-            $group = DB_DataObject::factory('groups');
+            $group = DB_DataObject::factory('core_group');
             $group->name = 'core-person-signup-bcc';
             $group->insert();
         }
@@ -32,7 +32,7 @@ class Pman_Core_Pman {
         
         
         
-        $member = DB_DataObject::factory('group_members');
+        $member = DB_DataObject::factory('core_group_member');
         $member->group_id = $group->id;
         if ($member->count()) {
             return;
@@ -43,7 +43,7 @@ class Pman_Core_Pman {
         // if we only have one member - then add it .... (it's the admin, and they can modify this later.. - after they get annoyed with it..
         
         $p->find(true);
-        $member = DB_DataObject::factory('group_members');
+        $member = DB_DataObject::factory('core_group_member');
         $member->group_id = $group->id;
         $member->user_id = $p->id;
         $member->insert();
diff --git a/RooPostTrait.php b/RooPostTrait.php
index b71a458e..a2e1d27b 100644
--- a/RooPostTrait.php
+++ b/RooPostTrait.php
@@ -395,7 +395,7 @@ trait Pman_Core_RooPostTrait {
     {
         $this->permitError = true; // allow it to fail without dieing
         
-        $lock = DB_DataObjecT::factory('Core_locking');
+        $lock = DB_DataObjecT::factory('core_locking');
         $this->permitError = false; 
         if (is_a($lock,'DB_DataObject') && $this->authUser)  {
                  
@@ -434,7 +434,7 @@ trait Pman_Core_RooPostTrait {
             // edit it anyways...
             
             // can we find the user's lock.
-            $lock = DB_DataObjecT::factory('Core_locking');
+            $lock = DB_DataObjecT::factory('core_locking');
             $lock->on_id = $x->{$this->key};
             $lock->on_table= strtolower($x->tableName());
             $lock->person_id = $this->authUser->id;
@@ -449,7 +449,7 @@ trait Pman_Core_RooPostTrait {
 	            $x->modified_by != $this->authUser->id 	
                 )
             {
-                $p = DB_DataObject::factory('Person');
+                $p = DB_DataObject::factory('core_person');
                 $p->get($x->modified_by);
                 $this->jerr($p->name . " saved the record since you started editing,\nDo you really want to update it?", array('needs_confirm' => true)); 
                 
diff --git a/SendIntro.php b/SendIntro.php
index cd1cf546..cff184d2 100644
--- a/SendIntro.php
+++ b/SendIntro.php
@@ -44,7 +44,7 @@ class Pman_Core_SendIntro extends Pman
         if (!$this->hasPerm("Core.Person", "A")) {
              $this->jerr("Not Permitted - no permission to add users.");
         }
-        $p = DB_DataObject::factory('Person');
+        $p = DB_DataObject::factory('core_person');
         
         // let's make a password anyway..
         $rawPasswd = false;
@@ -63,7 +63,7 @@ class Pman_Core_SendIntro extends Pman
             if ($p->get('email', $_REQUEST['email'])) {
                 $this->jerr("duplicate email address:" .$_REQUEST['email']);
             }
-            $p = DB_DataObject::factory('Person');
+            $p = DB_DataObject::factory('core_person');
             $p->setFrom($_REQUEST);
             
             if ($rawPasswd == false) {
@@ -81,7 +81,7 @@ class Pman_Core_SendIntro extends Pman
         } 
         
         
-        $p = DB_DataObject::factory('Person');
+        $p = DB_DataObject::factory('core_person');
         
         if (!$id || !$p->get($_REQUEST['id']))  {
             $this->jerr("Invalid user id");
diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index 1b3f1afd..0be39387 100644
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -171,7 +171,7 @@ class Pman_Core_UpdateDatabase extends Pman
         if (!empty($opts['add-company']) && !in_array('Core', $this->disabled)) {
             // make sure we have a good cache...?
            
-            DB_DataObject::factory('companies')->initCompanies($this, $opts);
+            DB_DataObject::factory('core_company')->initCompanies($this, $opts);
         }
         
         $this->runExtensions();
@@ -719,7 +719,7 @@ class Pman_Core_UpdateDatabase extends Pman
     function updateDataGroups()
     {
          
-        $groups = DB_DataObject::factory('groups');
+        $groups = DB_DataObject::factory('core_group');
         $groups->initGroups();
         
         $groups->initDatabase($this,array(
@@ -743,7 +743,7 @@ class Pman_Core_UpdateDatabase extends Pman
     {
          
         // fix comptypes enums..
-        $c = DB_DataObject::Factory('Companies');
+        $c = DB_DataObject::Factory('core_company');
         $c->selectAdd();
         $c->selectAdd('distinct(comptype) as comptype');
         $c->whereAdd("comptype != ''");
@@ -761,7 +761,7 @@ class Pman_Core_UpdateDatabase extends Pman
         $c->initEnums($ctb);
         //DB_DataObject::debugLevel(1);
         // fix comptypeid
-        $c = DB_DataObject::Factory('Companies');
+        $c = DB_DataObject::Factory('core_company');
         $c->query("
             UPDATE Companies 
                 SET
@@ -792,7 +792,7 @@ class Pman_Core_UpdateDatabase extends Pman
                 if (empty($data['bcc_group'])) {
                     $this->jerr("missing bcc_group for template $name");
                 }
-                $g = DB_DataObject::Factory('Groups')->lookup('name',$data['bcc_group']);
+                $g = DB_DataObject::Factory('core_group')->lookup('name',$data['bcc_group']);
                 
                 if (empty($g->id)) {
                     $this->jerr("bcc_group {$data['bcc_group']} does not exist when importing template $name");
-- 
2.39.2