DataObjects/Core_group.php

[Pman.Core] / DataObjects / Core_person.php

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 953953e..13b93c4 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');
@@ -823,10 +826,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
                 // list all staff who are not in a group.
                 $this->whereAdd("{$this->tableName()}.id NOT IN (
                     SELECT distinct(user_id) FROM $tn_gm LEFT JOIN
-                        $tn_g ON $tn_g.id = $tn_gm.group_id
-                        WHERE $tn_g.type = ".$q['query']['type']."
-                    )");
-                
+                        $tn_g ON $tn_g.id = $tn_gm.group_id)");
                 
             } else {
                 
@@ -1043,19 +1043,6 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
             ");
         }
         
-        $cgm = DB_DataObject::Factory('core_group_member')->tableName();
-        
-        $this->selectAdd("
-           (
-            SELECT GROUP_CONCAT({$cgm}.group_id) 
-                FROM 
-                    {$cgm}
-                WHERE 
-                    {$cgm}.user_id = {$this->tableName()}.id
-                ) AS membership_list    
-            
-        ");    
-        
         
     }
     
@@ -1131,23 +1118,22 @@ 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($p);
-        
+        $e->logDeletedRecord($mem);
+                
         foreach($mem as $p) { 
             $p->delete();
         }  
         
-        $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();
         }  
         
         
-        
         // anything else?  
         
     }
@@ -1238,6 +1224,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         }
         $c->find(true);
         $this->company_id = $c->id;
+        $this->email = trim($this->email);
         
     }
     
@@ -1383,8 +1370,6 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
     
     function beforeUpdate($old, $q, $roo)
     {
-       
-        
         if(!empty($q['_generate_oath_key'])){
             $o = clone($this);
             $this->generateOathKey();
@@ -1402,56 +1387,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
             $roo->jok($qrcode);
         }
         
-        if(!empty($q['membership_list'])){
-            
-             
-            if ($roo->authUser->id == $old->id) {
-                // you are editing yourself...
-                
-                // if was admin before....
-                   // -if new membership does not icnlude  admin id
-                      // -- then show error
-                
-                
-            }
-            
-            
-            
-            
-         
-            $x = PDO_DataObject::factory('core_group_member');
-            $x->select('group_id');
-            $x->user_id = $q['id'];
-            
-            $ar = $x->fetchAll('group_id');
-            
-            $group_id_arr = explode(",", $q['membership_list']);
-            
-            $result_del = array_diff($ar, $group_id_arr);
-            
-            // check if id needs to be deleted
-            if(!empty($result_del)){
-                foreach($result_del as $group_id){
-                    
-                    $x = PDO_DataObject::factory('core_group_member');
-                    $x->user_id = $q['id'];
-                    $x->group_id = $group_id;
-                    $x->find(true);
-                    $x->delete();
-                }
-            }
-            
-            $result_add = array_diff($group_id_arr, $ar);
-            
-            
-            // insert data into core_person_member...
-            //PDO_DataObject::Factory('coremytable_group_member')->set([ 'group_id' => 'test', 'user_id' => "{$this->tableName()}.id"])->insert();
-            if(!empty($result_add)){
-                foreach($result_add as $gid){
-                    PDO_DataObject::Factory('core_group_member')->set([ 'group_id'=> $gid, 'user_id' => $pid])->insert();
-                }
-            }
-        }
+        $this->email = trim($this->email);
     }
     
     function generateOathKey()