Enabled PHP5 to run nearly error free

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@325 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/include/functions.inc b/include/functions.inc
index a5bbe276fd7652a3fc16eab38712e898bd378f67..613af8c67938443d0d54784cb3f44f4f4636009b 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -1513,16 +1513,25 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
 {
   global $error_collector;
 
-  /* FIXME: workaround for buggy imap_open */
+  /* Workaround for buggy imap_open error outputs */
   if (preg_match('/imap_open/', $errstr)){
     return;
   }
 
-  /* FIXME: workaround for PHP5 */
+  /* FIXME: Workaround for PHP5 error message flooding. The new OOM
+     code want's us to use public/protected/private instead of flat
+     var declarations. For now I can't workaround this - let's ignore
+     the messages till the next major release which may drop support
+     for PHP4. */
   if (preg_match('/var: Deprecated./', $errstr)){
     return;
   }
 
+  /* FIXME: Same as above. Compatibility does error flooding.*/
+  if (preg_match('/zend.ze1_compatibility_mode/', $errstr)){
+    return;
+  }
+
   /* Create header as needed */
   if ($error_collector == ""){
     if ($_SESSION['js']==FALSE){