error reporting

[Pman.Base] / Pman.php

diff --git a/Pman.php b/Pman.php
index b068439..5aed24b 100644 (file)
--- a/Pman.php
+++ b/Pman.php
@@ -216,7 +216,7 @@ class Pman extends HTML_FlexyFramework_Page
         
         
         if (strlen($base) && $bits[0] != 'PasswordReset') {
-            $this->jerror("BADURL","invalid url: $base");
+            $this->jerror("NOTICE-BADURL","invalid url: $base");
         }
         // deliver template
         if (isset($_GET['onloadTrack'])) {
@@ -464,9 +464,9 @@ class Pman extends HTML_FlexyFramework_Page
         $au = $this->authUser;
         if ($au) {
             // is it an authfailure?
-            $this->jerr("Permission denied to view this resource", array('authFailure' => true));
+            $this->jerror("LOGIN-NOPERM", "Permission denied to view this resource", array('authFailure' => true));
         }
-        $this->jerr("Not authenticated", array('authFailure' => true));
+        $this->jerror("LOGIN-NOAUTH", "Not authenticated", array('authFailure' => true));
     }
      
      
@@ -516,7 +516,9 @@ class Pman extends HTML_FlexyFramework_Page
             if(!empty($errors)){
                 DB_DataObject::factory('Events')->writeEventLogExtra($errors);
             }
-            if (!preg_match('/^(ERROR|NOTICE)/', $type )) {
+            // various codes that are acceptable.
+            // 
+            if (!preg_match('/^(ERROR|NOTICE|LOG)/', $type )) {
                 $type = 'ERROR-' . $type;
             }
             
@@ -1159,12 +1161,14 @@ class Pman extends HTML_FlexyFramework_Page
          || !empty($ff->database_is_readonly)
          || substr($act, 0, 7) === 'NOTICE-'
         ) {
+            if (!preg_match('/^(ERROR|EXCEPTION)/', $act)) {
+               return false;
+            }
             $str = $obj !== false ? "{$obj->tableName()}:{$obj->id} " : '';
             $de = ini_set('display_errors', 0);
             trigger_error("{$act} {$str} {$remarks}" , E_USER_NOTICE);
             ini_set('display_errors', $de );
-        
-              return false;
+            return false;
         }
         
         $au = $this->getAuthUser();
@@ -1184,7 +1188,7 @@ class Pman extends HTML_FlexyFramework_Page
         
         
         $e->onInsert(isset($_REQUEST) ? $_REQUEST : array() , $this);
-        if (substr($act, 0, 5) !== 'ERROR') {
+        if (!preg_match('/^(ERROR|EXCEPTION)/', $act)) {
             return $e;
         }
         $str = $obj !== false ? "{$obj->tableName()}:{$obj->id} " : '';