X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FEvents.php;h=521ead84743c3473390e6487d02514a8ea351591;hp=08499139327c10de476ba5bb654374f703aa7706;hb=5d4ac076dc4f620fbb91944eead3e0af66216a03;hpb=3a6bf94e2f6d0c2dfbcd475b689e094610aeae1f

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index 08499139..521ead84 100644
--- 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 
 {
@@ -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'];
@@ -329,7 +330,9 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         $rem  = array();
         // should this really go in remarks? - 
         if ($obj && method_exists($obj,'toEventString')) {
-            $rem[] = $obj->toEventString() ;
+            if($obj->toEventString() !== false){
+                $rem[] = $obj->toEventString();
+            }
         }
         $rem[] = $remarks;
         $this->remarks = implode(' : ', $rem);
@@ -450,15 +453,15 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         self::$deleted[] = $del;
         return true;
     }
+    static $extra_data = false;
+    
+    static function writeEventLogExtra($data) {
+        self::$extra_data = $data;
+    }
     
-    function writeEventLog($extra_data  = '')
+    function logDir()
     {
         $ff  = HTML_FlexyFramework::get();
-        if (empty($ff->Pman['event_log_dir'])) {
-            return false;
-        }
-        
-        // add user (eg. www-data or local user if not..)
         if (function_exists('posix_getpwuid')) {
             $uinfo = posix_getpwuid( posix_getuid () ); 
          
@@ -466,10 +469,33 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         } else {
             $user = getenv('USERNAME'); // windows.
         }
+        
+        // DEPRICATED...
+        if (!empty($ff->Pman['event_log_dir'])) {
+            return $ff->Pman['event_log_dir'] . '/'.$user;
+        }
+        if (!empty($ff->Pman['storedir'])) {
+            return $ff->Pman['storedir'] .'/Events/'.$user;
+        
+        }
+        return false;
+    }
+    
+    
+    
+    function writeEventLog($extra_data  = false)
+    {
+        $logdir = $this->logDir();
+        if (!$logdir) {
+            return false;
+        }
+        
+         
         //print_r($this);
-        $file = $ff->Pman['event_log_dir']. '/'. $user. date('/Y/m/d/'). $this->id . ".json";
+        $file = $logdir.  date('/Y/m/d/'). $this->id . ".json";
         if (!file_exists(dirname($file))) {
-            mkdir(dirname($file),0700,true);
+            mkdir(dirname($file),0700,true); // this might fail if it does not have correct permissions..
+            
         }
         
         // Remove all the password from logs...
@@ -495,7 +521,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             
              
             $files[$k]['tmp_name'] =  $this->id . '-'. $i;
-            $nf = $ff->Pman['event_log_dir']. '/'. $user. date('/Y/m/d/').   $files[$k]['tmp_name']; 
+            $nf = $logdir .   date('/Y/m/d/').   $files[$k]['tmp_name']; 
             if (!copy($f['tmp_name'], $nf)) {
                 print_r("failed to copy {$f['tmp_name']}...\n");
             }
@@ -511,9 +537,12 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         if (!empty(self::$deleted)) {
             $out['DELETED_DATAOBJECTS'] = self::$deleted;
         }
-        if (!empty($extra_data)) {
+        if ($extra_data !== false) {
             $out['EXTRA'] = $extra_data;
         }
+        if ( self::$extra_data !== false) {
+            $out['EXTRA_DATA'] =  self::$extra_data;
+        }
         
         file_put_contents($file, json_encode($out));
         
@@ -567,22 +596,16 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
     
     function retrieveEventLog()
     {
-        $ff  = HTML_FlexyFramework::get();
-        if (empty($ff->Pman['event_log_dir'])) {
-            return false;
-        }
         
-        if (function_exists('posix_getpwuid')) {
-            $uinfo = posix_getpwuid( posix_getuid () ); 
+        $logdir = $this->logDir();
+        if (!$logdir) {
+            return false;
          
-            $user = $uinfo['name'];
-        } else {
-            $user = getenv('USERNAME'); // windows.
         }
         
         $date = date('/Y/m/d/', strtotime($this->event_when));
         
-        $file = $ff->Pman['event_log_dir']. '/'. $user. $date. $this->id . ".json";
+        $file = $logdir. $date. $this->id . ".json";
         if (!file_exists(dirname($file))) {
             return false;
         }
@@ -630,30 +653,42 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
                 continue;
             }
             
-            $affects  = array();
-        
-            $all_links = $GLOBALS['_DB_DATAOBJECT']['LINKS'][$this->_database];
-
-            foreach($all_links as $tbl => $links) {
-                foreach($links as $col => $totbl_col) {
-                    $to = explode(':', $totbl_col);
-                    if ($to[0] != $this->tableName()) {
-                        continue;
-                    }
-
-                    $affects[$tbl .'.' . $col] = $table->tableName();
-                }
-            }
-            
             unset($d['_table']);
             
             $table->setFrom($d);
             
-            print_R($affects);exit;
+            /*
+             * need to use the old id
+             */
+            $table->id = $d['id'];
             
+            $table->sequenceKey(false,false);
+            
+            $table->insert();
+            
+            if($table->tableName() == 'crm_mailing_list_member'){
+                $ml = DB_DataObject::factory('crm_mailing_list');
+                if(!$ml->get($table->mailing_list_id)){
+                    continue;
+                }
+
+                $mlm = DB_DataObject::factory('crm_mailing_list_member');
+                $mlm->setFrom(array(
+                    'mailing_list_id' => $table->mailing_list_id,
+                    'is_active' => 1
+                ));
+
+                $o = clone($ml);
+                $ml->no_members = $mlm->count();
+                $ml->update($o);
+            }
         }
         
-        print_R($log);exit;
+        $roo->jok('RESTORE');
+    }
+    function selectAddPersonEmail()
+    {
+        $this->selectAdd('join_person_id_id.email as email');
         
     }
 }