Changeset 11457 for freepbx/branches

Timestamp:

02/18/11 20:25:42 (2 years ago)

Author:

p_lindheimer

Message:

more format tweaks for PHP errors

Files:

• freepbx/branches/2.9/amp_conf/htdocs/admin/libraries/utility.functions.php (modified) (4 diffs)

freepbx/branches/2.9/amp_conf/htdocs/admin/libraries/utility.functions.php

@@ -45 +45 @@
-    // PHP Error Handler provides it's own formatting
-    //
-] 
+-
-  }
-
@@ -306 +306 @@
-  global $amp_conf;
-
+  $errortype = array (
+    E_ERROR              => 'ERROR',
+    E_WARNING            => 'WARNING',
+    E_PARSE              => 'PARSE_ERROR',
+    E_NOTICE             => 'NOTICE',
+    E_CORE_ERROR         => 'CORE_ERROR',
+    E_CORE_WARNING       => 'CORE_WARNING',
+    E_COMPILE_ERROR      => 'COMPILE_ERROR',
+    E_COMPILE_WARNING    => 'COMPILE_WARNING',
+    E_USER_ERROR         => 'USER_ERROR',
+    E_USER_WARNING       => 'USER_WARNING',
+    E_USER_NOTICE        => 'USER_NOTICE',
+    E_STRICT             => 'RUNTIM_NOTICE',
+    E_RECOVERABLE_ERROR  => 'CATCHABLE_FATAL_ERROR',
+  );
+
-  if (!isset($amp_conf['PHP_ERROR_HANDLER_OUTPUT'])) {
-    $amp_conf['PHP_ERROR_HANDLER_OUTPUT'] = 'dbug';
@@ -312 +328 @@
-  switch($amp_conf['PHP_ERROR_HANDLER_OUTPUT']) {
-  case 'freepbxlog':
-(%s:%s)-ERRNO[%s] - %s", $errfile, $line, $errorno
+%s] (%s:%s) - %s", $errortype[$errno], $errfile, $errline
-    freepbx_log(FPBX_LOG_PHP,$txt);
-  break;
@@ -321 +337 @@
-    $txt = date("Y-M-d H:i:s")
-      . "\t" . $errfile . ':' . $errline 
-\n
-ERROR[' . $errno
+
+[' . $errortype[$errno]
-      . $errstr
-\n
+
-      dbug_write($txt,$check='');
-  break;