copyright update

[squirrelmail.git] / class / error.class.php

diff --git a/class/error.class.php b/class/error.class.php
index 18a2de0db920301adc0e03c704f24db9f1733b36..cef939bdad5f3b0875d93753ab16387822c8d51d 100644 (file)
--- a/class/error.class.php
+++ b/class/error.class.php
@@ -1,20 +1,22 @@
 <?php
+
 /**
  * error.class.php
  *
- * Copyright (c) 2005 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
  * This contains the custom error handler for SquirrelMail.
  *
+ * @copyright &copy; 2005-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  */
 
+/** Used defines */
 define('SQM_NOTICE',0);
 define('SQM_WARNING',1);
 define('SQM_ERROR',2);
 define('SQM_STRICT',3);
+
 // php5 E_STRICT constant (compatibility with php4)
 if (! defined('E_STRICT')) define('E_STRICT',2048);
 // Set docref_root (fixes URLs that link to php manual)
@@ -68,13 +70,23 @@ class ErrorHandler {
         $iType = NULL;
         $aErrorCategory = array();
 
+        /**
+         * Get current error reporting level.
+         *
+         * PHP 4.1.2 does not return current error reporting level in ini_get (php 5.1b3 and
+         * 4.3.10 does). Retrieve current error reporting level while setting error reporting
+         * to ini value and reset it to retrieved value.
+         */
+        $iCurErrLevel = error_reporting(ini_get('error_reporting'));
+        error_reporting($iCurErrLevel);
+
         /**
          * Check error_reporting value before logging error.
          * Don't log errors that are disabled by @ (error_reporting = 0). Some SquirrelMail scripts
          * (sq_mb_list_encodings(), ldap function calls in functions/abook_ldap_server.php)
          * handle errors themselves and @ is used to disable generic php error messages.
          */
-        if ((bool) ini_get('error_reporting')) {
+        if ($iErrNo & $iCurErrLevel) {
             /*
              * The following errors cannot be handled by a user defined error handler:
              * E_ERROR, E_PARSE, E_CORE_ERROR, E_CORE_WARNING, E_COMPILE_ERROR, E_COMPILE_WARNING