DataObjects/Core_watch.php
[Pman.Core] / DataObjects / Person.php
index ce59ee8..8b16e61 100644 (file)
@@ -4,6 +4,7 @@
  */
 require_once 'DB/DataObject.php';
 
+
 class Pman_Core_DataObjects_Person extends DB_DataObject 
 {
     ###START_AUTOCODE
@@ -216,6 +217,9 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
     
     function getEmailFrom()
     {
+        if (empty($this->name)) {
+            return $this->email;
+        }
         return '"' . addslashes($this->name) . '" <' . $this->email . '>';
     }
     function toEventString() 
@@ -229,6 +233,10 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
             (!$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");
@@ -245,7 +253,8 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
         // 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();
@@ -263,19 +272,44 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
                 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;
         }
            
@@ -293,11 +327,13 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
             $_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');
@@ -320,8 +356,10 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
             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'])) {
@@ -331,17 +369,17 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
             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');
@@ -350,6 +388,14 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
             
             $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;
             
         }
@@ -379,17 +425,24 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
             $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) 
@@ -454,15 +507,19 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
         $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;
     }
             
     
@@ -738,6 +795,12 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
             
         }
         
+        if(!empty($q['query']['name'])){
+            $this->whereAdd("
+                Person.name LIKE '%{$this->escape($q['query']['name'])}%'
+            ");
+        }
+        
         if (!empty($q['query']['search'])) {
             
             // use our magic search builder...
@@ -918,8 +981,12 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
         
     }
     
-    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");
         }
@@ -939,7 +1006,7 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
             $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