From 9367dcce460ca81884ae59ff16494ab5a3e5fe30 Mon Sep 17 00:00:00 2001
From: Alan <alan@roojs.com>
Date: Wed, 6 Sep 2023 11:52:33 +0800
Subject: [PATCH] refinements on logigng events

---
 Pman.php | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/Pman.php b/Pman.php
index ddbb4ae..214a532 100644
--- a/Pman.php
+++ b/Pman.php
@@ -507,7 +507,11 @@ class Pman extends HTML_FlexyFramework_Page
         }
         $pman = HTML_FlexyFramework::get();
         
-        if ($type !== false && empty($pman->nodatabase)) {
+       
+        
+
+        
+        if ($type !== false  &&  empty($pman->nodatabase)) {
             
             if(!empty($errors)){
                 DB_DataObject::factory('Events')->writeEventLogExtra($errors);
@@ -1145,17 +1149,21 @@ class Pman extends HTML_FlexyFramework_Page
     function addEvent($act, $obj = false, $remarks = '') 
     {
         
-        if (!empty(HTML_FlexyFramework::get()->Pman['disable_events'])
-         || !empty(HTML_FlexyFramework::get()->database_is_readonly)
+        $ff = HTML_FlexyFramework::get();
+        
+      
+        if (!empty($ff->Pman['disable_events'])
+         || !empty($ff->database_is_readonly)
+         || substr($act, 0, 7) === 'NOTICE-'
         ) {
             $str = $obj !== false ? "{$obj->tableName()}:{$obj->id} " : '';
             $de = ini_set('display_errors', 0);
-            trigger_error("$act {$str}{$remarks}" , E_USER_NOTICE);
+            trigger_error("{$act} {$str} {$remarks}" , E_USER_NOTICE);
             ini_set('display_errors', $de );
-            
-            
-            return;
+        
+              return false;
         }
+        
         $au = $this->getAuthUser();
        
         $e = DB_DataObject::factory('Events');
@@ -1174,7 +1182,11 @@ class Pman extends HTML_FlexyFramework_Page
         
         $e->onInsert(isset($_REQUEST) ? $_REQUEST : array() , $this);
         
-       
+        $str = $obj !== false ? "{$obj->tableName()}:{$obj->id} " : '';
+        $de = ini_set('display_errors', 0);
+        trigger_error("{$act} [event_id={$e->id}] {$str} {$remarks}" , E_USER_NOTICE);
+        ini_set('display_errors', $de );
+     
         return $e;
         
     }
-- 
2.39.2