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'];
}
return true;
}
- $pi = DB_DataObject::factory('Person');
+ $pi = DB_DataObject::factory('core_person');
$pi->get($this->leader);
$p = DB_DataObject::factory('core_group_member');
}
//$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;
$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("
}
$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;
}
{
// 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) {
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();
$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)) {
//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)) {
/* 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;
}
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}];
function person()
{
- $p = DB_DAtaObject::factory('Person');
+ $p = DB_DAtaObject::factory('core_person');
$p->get($this->person_id);
return $p;
}
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..");
($_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("
// 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);
}
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');
}
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');
}
// 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..
- $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();
// 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;
foreach($_POST['dataDelete'] as $id => $ac) {
- $m = DB_DataObject::factory('group_members');
+ $m = DB_DataObject::factory('core_group_member');
$m->get($id);
$m->delete();
}
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();
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..
}
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');
// 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']),
{
- $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();
}
- $member = DB_DataObject::factory('group_members');
+ $member = DB_DataObject::factory('core_group_member');
$member->group_id = $group->id;
if ($member->count()) {
return;
// 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();
{
$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) {
// 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;
$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));
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;
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) {
}
- $p = DB_DataObject::factory('Person');
+ $p = DB_DataObject::factory('core_person');
if (!$id || !$p->get($_REQUEST['id'])) {
$this->jerr("Invalid user id");
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();
function updateDataGroups()
{
- $groups = DB_DataObject::factory('groups');
+ $groups = DB_DataObject::factory('core_group');
$groups->initGroups();
$groups->initDatabase($this,array(
{
// 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 != ''");
$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
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");