*/
require_once 'DB/DataObject.php';
+
class Pman_Core_DataObjects_Person extends DB_DataObject
{
###START_AUTOCODE
public $__table = 'Person'; // table name
public $id; // int(11) not_null primary_key auto_increment
public $email; // string(128) not_null
+ public $alt_email;
public $company_id; // int(11)
public $office_id; // int(11)
function getEmailFrom()
{
+ if (empty($this->name)) {
+ return $this->email;
+ }
return '"' . addslashes($this->name) . '" <' . $this->email . '>';
}
function toEventString()
function verifyAuth()
{
$ff= HTML_FlexyFramework::get();
- if (!empty($ff->Pman['auth_comptype']) && $ff->Pman['auth_comptype'] != $this->company()->comptype) {
+ if (!empty($ff->Pman['auth_comptype']) &&
+ (!$this->company_id || ($ff->Pman['auth_comptype'] != $this->company()->comptype))
+ ){
+
+ // force a logout - without a check on the isAuth - as this is called from there..
+ $db = $this->getDatabaseConnection();
+ $sesPrefix = $ff->appNameShort .'-'.get_class($this) .'-'.$db->dsn['database'] ;
+ $_SESSION[__CLASS__][$sesPrefix .'-auth'] = "";
+ return false;
+
$ff->page->jerr("Login not permited to outside companies");
}
return true;
// we combine db + project names,
// otherwise if projects use different 'auth' objects
// then we get unserialize issues.
- $sesPrefix = get_class($this) .'-'.$db->dsn['database'] ;
+ $ff= HTML_FlexyFramework::get();
+ $sesPrefix = $ff->appNameShort .'-' .get_class($this) .'-'.$db->dsn['database'] ;
@session_start();
$u = DB_DataObject::factory('Person');
if ($u->get($a->id)) { //&& strlen($u->passwd)) {
- $u->verifyAuth();
+
+ return $u->verifyAuth();
+
return true;
}
- $_SESSION[__CLASS__][$sesPrefix .'-auth'] = '';
+ unset($_SESSION[__CLASS__][$sesPrefix .'-auth']);
}
// local auth -
+ $default_admin = false;
+ if (!empty($ff->Pman['local_autoauth']) &&
+ ($ff->Pman['local_autoauth'] === true) &&
+ (!empty($_SERVER['SERVER_ADDR'])) &&
+ ($_SERVER['SERVER_ADDR'] == '127.0.0.1') &&
+ ($_SERVER['REMOTE_ADDR'] == '127.0.0.1')
+ ) {
+ $group = DB_DataObject::factory('Groups');
+ $group->get('name', 'Administrators');
+
+ $member = DB_DataObject::factory('group_members');
+ $member->autoJoin();
+ $member->group_id = $group->id;
+ $member->whereAdd("
+ join_user_id_id.id IS NOT NULL
+ ");
+ if($member->find(true)){
+ $default_admin = DB_DataObject::factory('Person');
+ if(!$default_admin->get($member->user_id)){
+ $default_admin = false;
+ }
+ }
+ }
+
+
$u = DB_DataObject::factory('Person');
$ff = HTML_FlexyFramework::get();
if (!empty($ff->Pman['local_autoauth']) &&
(!empty($_SERVER['SERVER_ADDR'])) &&
($_SERVER['SERVER_ADDR'] == '127.0.0.1') &&
($_SERVER['REMOTE_ADDR'] == '127.0.0.1') &&
- $u->get('email', $ff->Pman['local_autoauth'])
+ ($default_admin || $u->get('email', $ff->Pman['local_autoauth']))
) {
- $_SESSION[__CLASS__][$sesPrefix .'-auth'] = serialize($u);
+ $_SESSION[__CLASS__][$sesPrefix .'-auth'] = serialize($default_admin ? $default_admin : $u);
return true;
}
$_SESSION[__CLASS__][$sesPrefix .'-auth'] = serialize($u);
return true;
}
+ //var_dump(session_id());
+ //var_dump($_SESSION[__CLASS__]);
- if (!empty( $_SESSION[__CLASS__][$sesPrefix .'-empty'] )) {
- return false;
- }
-
+ //if (!empty( $_SESSION[__CLASS__][$sesPrefix .'-empty'] )) {
+ // return false;
+ //}
+ //die("got this far?");
// not in session or not matched...
$u = DB_DataObject::factory('Person');
$u->whereAdd(' LENGTH(passwd) > 0');
return false;
}
$db = $this->getDatabaseConnection();
- $sesPrefix = get_class($this) .'-'.$db->dsn['database'] ;
+ $ff= HTML_FlexyFramework::get();
+ $sesPrefix = $ff->appNameShort .'-' .get_class($this) .'-'.$db->dsn['database'] ;
+
if (!empty($_SESSION[__CLASS__][$sesPrefix .'-auth'])) {
if ($u->get($a->id)) { /// && strlen($u->passwd)) {
return clone($u);
}
-
+ unset($_SESSION[__CLASS__][$sesPrefix .'-auth']);
}
if (empty( $_SESSION[__CLASS__][$sesPrefix .'-empty'] )) {
$u = DB_DataObject::factory('Person');
$u->whereAdd(' LENGTH(passwd) > 0');
- $_SESSION[__CLASS__][$sesPrefix .'-empty'] = $u->count();
+ $_SESSION[__CLASS__][$sesPrefix .'-empty'] = $u->count();
}
- if (empty( $_SESSION[__CLASS__][$sesPrefix .'-empty'] )) {
+ if (isset( $_SESSION[__CLASS__][$sesPrefix .'-empty'] ) && $_SESSION[__CLASS__][$sesPrefix .'-empty'] < 1) {
// fake person - open system..
//$ce = DB_DataObject::factory('core_enum');
$u = DB_DataObject::factory('Person');
$u->id = -1;
+
+ // if a company has been created fill that in in company_id_id
+ $c = DB_DAtaObject::factory('Companies')->lookupOwner();
+ if ($c) {
+ $u->company_id_id = $c->pid();
+ $u->company_id = $c->pid();
+ }
+
return $u;
}
function login()
{
$this->isAuth(); // force session start..
- $this->verifyAuth();
+ if (!$this->verifyAuth()) {
+ return false;
+ }
$db = $this->getDatabaseConnection();
$gr = DB_DataObject::Factory('group_rights');
$gr->applyDefs($g, 0);
}
-
- $sesPrefix = get_class($this) .'-'.$db->dsn['database'] ;
+ $ff= HTML_FlexyFramework::get();
+ $sesPrefix = $ff->appNameShort .'-' .get_class($this) .'-'.$db->dsn['database'] ;
+
+
$_SESSION[__CLASS__][$sesPrefix .'-auth'] = serialize($this);
}
function logout()
{
$this->isAuth(); // force session start..
- $db = $this->getDatabaseConnection();
- $sesPrefix = get_class($this) .'-'.$db->dsn['database'] ;
+ $db = $this->getDatabaseConnection();
+ $ff= HTML_FlexyFramework::get();
+ $sesPrefix = $ff->appNameShort .'-' .get_class($this) .'-'.$db->dsn['database'] ;
+
$_SESSION[__CLASS__][$sesPrefix .'-auth'] = "";
+
+
+
}
function genPassKey ($t)
$this->whereAdd('LENGTH(passwd) > 1');
$this->email = $n;
}
- function lang($val)
+ function lang()
{
+ if (!func_num_args()) {
+ return $this->lang;
+ }
+ $val = array_shift(func_get_args());
if ($val == $this->lang) {
return;
}
$uu = clone($this);
$this->lang = $val;
$this->update($uu);
-
+ return $this->lang;
}
}
+ if(!empty($q['query']['name'])){
+ $this->whereAdd("
+ Person.name LIKE '%{$this->escape($q['query']['name'])}%'
+ ");
+ }
+
if (!empty($q['query']['search'])) {
- $s = $this->escape($q['query']['search']);
- $this->whereAdd("
+
+ // use our magic search builder...
+
+ require_once 'Text/SearchParser.php';
+ $x = new Text_SearchParser($q['query']['search']);
+
+ $props = array(
+ "$tn_p.name",
+ "$tn_p.email",
+ "$tn_p.role",
+ "$tn_p.phone",
+ "$tn_p.remarks",
+ "join_company_id_id.name"
+ );
+
+ $str = $x->toSQL(array(
+ 'default' => $props,
+ 'map' => array(
+ 'company' => 'join_company_id_id.name',
+ //'country' => 'Clipping.country',
+ // 'media' => 'Clipping.media_name',
+ ),
+ 'escape' => array($this->getDatabaseConnection(), 'escapeSimple'), /// pear db or mdb object..
+
+ ));
+
+
+ $this->whereAdd($str); /*
$tn_p.name LIKE '%$s%' OR
$tn_p.email LIKE '%$s%' OR
$tn_p.role LIKE '%$s%' OR
$tn_p.phone LIKE '%$s%' OR
$tn_p.remarks LIKE '%$s%'
- ");
+ ");*/
}
//
}
- function importFromArray($roo, $persons, $prefix)
+ function importFromArray($roo, $persons, $opts)
{
+ if (empty($opts['prefix'])) {
+ $roo->jerr("opts[prefix] is empty - you can not just create passwords based on the user names");
+ }
+
+ if (!is_array($persons) || empty($persons)) {
+ $roo->jerr("error in the person data. - empty on not valid");
+ }
+ DB_DataObject::factory('groups')->initGroups();
+
foreach($persons as $person){
$p = DB_DataObject::factory('person');
if($p->get('name', $person['name'])){
}
$p->setFrom($person);
- $companies = DB_DataObject::facotry('companies');
+ $companies = DB_DataObject::factory('companies');
if(!$companies->get('comptype', 'OWNER')){
$roo->jerr("Missing OWNER companies!");
}
$p->company_id = $companies->pid();
// strip the 'spaces etc.. make lowercase..
$name = strtolower(str_replace(' ', '', $person['name']));
- $p->setPassword("$prefix$name");
+ $p->setPassword("{$opts['prefix']}{$name}");
$p->insert();
// set up groups
// if $person->groups is set.. then
projects / Pman.Core / blobdiff