DataObjects/pman.links.ini

[Pman.Core] / DataObjects / Events.php

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index a627843..7595f8a 100644 (file)
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -7,7 +7,7 @@
  *
  * 
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Events extends DB_DataObject 
 {
@@ -40,7 +40,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         if(!empty($q['person_table'])){
             $jt = DB_DataObject::factory($q['person_table']);
             
-            if(!array_key_exists("{$jt->tableName()}_id", $this->table())){ // coz we have triiger on mysql...
+            if(!array_key_exists("{$jt->tableName()}_id", $this->tableColumns())){ // coz we have triiger on mysql...
                 
                 $keys = $jt->keys();
             
@@ -61,7 +61,8 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             }
         
         } else {
-            $person = 'Person';
+            
+            $person = $au->tableName(); //'Person';  -- projects may not use person as the auth table...
             $cfg = HTML_FlexyFramework::get()->Pman;
             if (!empty($cfg['authTable'])) {
                 $person =$cfg['authTable'];
@@ -163,7 +164,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
                     LEFT JOIN {$jtn} as join_on_id_{$jtn} ON {$tn}.on_id = join_on_id_{$jtn}.{$jk}
                         AND on_table = '{$jtn}'
                 ";
-                $keys = array_keys($x->table());
+                $keys = array_keys($x->tableColumns());
                 if (isset($q['_join_cols'])) {
                     $jcs = explode(',',$q['_join_cols'] );
                     //DB_DataObject::DebugLevel(1);
@@ -311,7 +312,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         } else {
             $col = $au->tableName() == "Person" ? 'person_id' : $au->tableName() . '_id';
             // does $col exist?
-            $cols = $this->table();
+            $cols = $this->tableColumns();
             $col = isset($cols[$col]) ? $col : 'person_id'; // for BC.... - revert to using person_id
             $this->{$col} = $au->pid();
             //$this->person_id = $au ? (!empty($au->id) ? $au->id : $au->pid()) : -1;
@@ -353,7 +354,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         }
          
         $ret = 0;
-        foreach(array_keys($new->table()) as $k) {
+        foreach(array_keys($new->tableColumns()) as $k) {
             // should we JSON serialize this?
             $n = empty($new->$k) ? '' : $new->$k;
             $o = empty($old->$k) || empty($old->$k) ? '' : $old->$k;
@@ -493,7 +494,11 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         //print_r($this);
         $file = $logdir.  date('/Y/m/d/'). $this->id . ".json";
         if (!file_exists(dirname($file))) {
-            mkdir(dirname($file),0700,true); // this might fail if it does not have correct permissions..
+            
+            @mkdir(dirname($file),0700,true); // this might fail if it does not have correct permissions..
+            if (!file_exists(dirname($file))) {
+                die("could not create $file - permissons are not correct"); // fatal, otherwise we loop!?
+            }
             
         }
         
@@ -687,7 +692,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
     }
     function selectAddPersonEmail()
     {
-        $this->selectAdd($this->tableName() . '.email as email');
+        $this->selectAdd('join_person_id_id.email as email');
         
     }
 }