Pman/Login.php

[Pman.Base] / Pman.php

diff --git a/Pman.php b/Pman.php
index 1d53c54..881a51e 100644 (file)
--- a/Pman.php
+++ b/Pman.php
@@ -16,7 +16,9 @@
  *  - authentication reset password ?? MOVEME?
  *  ?? arrayClean.. what's it doing here?!? ;)
  * 
- * 
+ * Usefull implemetors
+ * DB_DataObject*:*toEventString (for logging - this is generically prefixed to all database operations.)
+ *   - any data object where this method exists, the result will get prefixed to the log remarks
  */
 
 class Pman extends HTML_FlexyFramework_Page 
@@ -625,18 +627,7 @@ class Pman extends HTML_FlexyFramework_Page
     {
         $au = $this->getAuthUser();
         $e = DB_DataObject::factory('Events');
-        
-        if (is_a($e, 'PEAR_Error')) {
-            return; // no event table!
-        }
-        $e->person_name = $au ? $au->name : '';
-        $e->person_id = $au ? $au->id : '';
-        $e->ipaddr = isset($_SERVER["REMOTE_ADDR"]) ? $_SERVER["REMOTE_ADDR"] : 'cli';
-        $e->action = $act;
-        $e->on_table = $obj ? $obj->tableName() : '';
-        $pk = $obj ? $obj->keys()  : false;
-        $e->on_id  = $obj && $pk ? $obj->{$pk[0]}: 0;
-        $e->remarks = $remarks;
+        $e->init($act,$obj,$remarks); 
         if ($e->find(true)) {
             return;
         }
@@ -655,21 +646,10 @@ class Pman extends HTML_FlexyFramework_Page
     {
         $au = $this->getAuthUser();
         $e = DB_DataObject::factory('Events');
-        
-        if (is_a($e, 'PEAR_Error')) {
-            return; // no event table!
-        }
-        $e->person_name = $au ? $au->name : '';
-        $e->person_id = $au ? $au->id : '';
+        $e->init($act,$obj,$remarks); 
+         
         $e->event_when = date('Y-m-d H:i:s');
-        $e->ipaddr = isset($_SERVER["REMOTE_ADDR"]) ? $_SERVER["REMOTE_ADDR"] : 'cli';
-        $e->action = $act;
-        $e->on_table = $obj ? $obj->tableName() : '';
         
-        $pk = $obj ? $obj->keys()  : false;
-    
-        $e->on_id  = $obj && $pk ? $obj->{$pk[0]}: 0;
-        $e->remarks = $remarks;
         $eid = $e->insert();
         $ff  = HTML_FlexyFramework::get();
         if (empty($ff->Pman['event_log_dir'])) {
@@ -680,7 +660,7 @@ class Pman extends HTML_FlexyFramework_Page
             mkdir(dirname($file),0700,true);
         }
         file_put_contents($file, var_export(array(
-            'REQUEST_URI' => $_SERVER['REQUEST_URI'],
+            'REQUEST_URI' => empty($_SERVER['REQUEST_URI']) ? 'cli' : $_SERVER['REQUEST_URI'],
             'GET' => empty($_GET) ? array() : $_GET,
             'POST' => empty($_POST) ? array() : $_POST,
         ), true));