DataObjects/Core_event_audit.php

[Pman.Core] / DataObjects / Person.php

diff --git a/DataObjects/Person.php b/DataObjects/Person.php
index 5d4a896..08f805f 100644 (file)
--- a/DataObjects/Person.php
+++ b/DataObjects/Person.php
@@ -115,21 +115,18 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
     function toEventString() 
     {
         return empty($this->name) ? $this->email : $this->name;
-    }
-    
-    /// check config 'auth_comptype' to see if we restrict access ..
+    } 
     function verifyAuth()
     { 
         $ff= HTML_FlexyFramework::get();
-        echo '<PRE>';print_r($this->company());exit;
-         if (!empty($ff->Pman['auth_comptype']) && $ff->Pman['auth_comptype'] != $this->company()->comptype) {
+        if (!empty($ff->Pman['auth_comptype']) && $ff->Pman['auth_comptype'] != $this->company()->comptype) {
             $ff->page->jerr("Login not permited to outside companies");
         }
         return true;
         
     }    
-    
-    
+   
+   
     //   ---------------- authentication / passwords and keys stuff  ----------------
     function isAuth()
     {
@@ -141,8 +138,9 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
             $a = unserialize($_SESSION[__CLASS__][$sesPrefix .'-auth']);
             $u = DB_DataObject::factory('Person');
             if ($u->get($a->id)) { //&& strlen($u->passwd)) {
-                return $u->verifyAuth();
-                 
+                $u->verifyAuth();
+                
+                return true;
             }
             
             $_SESSION[__CLASS__][$sesPrefix .'-auth'] = '';
@@ -340,10 +338,14 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
     {
          //DB_DataObject::debugLevel(1);
         // find out all the groups they are a member of.. + Default..
+        
+        // ------ INIITIALIZE IF NO GROUPS ARE SET UP.
+        
         $g = DB_DataObject::Factory('Group_Rights');
         if (!$g->count()) {
             $g->genDefault();
         }
+        
         if ($this->id < 0) {
             return $g->adminRights(); // system is not set up - so they get full rights.
         }
@@ -361,8 +363,11 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
             
         }
         
+        // ------ STANDARD PERMISSION HANDLING.
+        
         $g = DB_DataObject::Factory('Group_Members');
         $grps = $g->listGroupMembership($this);
+       // print_r($grps);
         $isAdmin = $g->inAdmin;
         //echo '<PRE>'; print_r($grps);var_dump($isAdmin);
         // the load all the perms for those groups, and add them all together..