DataObjects/Core_company.php

[Pman.Core] / DataObjects / Core_person.php

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 282f131..be53672 100644 (file)
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -438,7 +438,10 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         }
                 
              
-        if (isset(   $_SESSION[get_class($this)][$sesPrefix .'-empty'] ) && $_SESSION[get_class($this)][$sesPrefix .'-empty']  < 1) {
+        if (
+            isset(   $_SESSION[get_class($this)][$sesPrefix .'-empty'] ) && 
+            $_SESSION[get_class($this)][$sesPrefix .'-empty']  < 1
+        ) {
             
             // fake person - open system..
             //$ce = DB_DataObject::factory('core_enum');
@@ -1131,23 +1134,20 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         $p = DB_DataObject::Factory('core_group_member');
         $p->user_id = $this->id;
         $mem = $p->fetchAll();  // fetch all the rows and set the $mem variable to the rows data, just like mysqli_fetch_assoc
-   
-        
-        
+        $e->logDeletedRecord($mem);
+                
         foreach($mem as $p) { 
             $p->delete();
         }  
-        $e->logDeletedRecord($mem);
-        
-        $e = DB_DataObject::Factory('events');
         
+        $e = DB_DataObject::Factory('Events');        
         $e->person_id = $this->id;
         $eve = $e->fetchAll();  // fetch all the rows and set the $mem variable to the rows data, just like mysqli_fetch_assoc
-        
+
+        $e->logDeletedRecord($eve);
         foreach($eve as $e) { 
             $e->delete();
         }  
-        $e->logDeletedRecord($eve);
         
         
         // anything else?  
@@ -1240,6 +1240,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         }
         $c->find(true);
         $this->company_id = $c->id;
+        $this->email = trim($this->email);
         
     }
     
@@ -1466,6 +1467,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
                 }
             }
         }
+        $this->email = trim($this->email);
     }
     
     function generateOathKey()