Moved default timezone setting

[gosa.git] / include / php_setup.inc

diff --git a/include/php_setup.inc b/include/php_setup.inc
index 324a6b740d31587455e3d2d3f1acf663cb16a213..94ead09bebfcecdb7f45f64a3130837aced16802 100644 (file)
--- a/include/php_setup.inc
+++ b/include/php_setup.inc
@@ -45,12 +45,7 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
      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)){
+  if (preg_match('/var: Deprecated./', $errstr) || preg_match("/Declaration of.*should be compatible/",$errstr)){
     return;
   }
 
@@ -82,8 +77,6 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
                                 "\n\n".
                                 "*** GOsa bug report ***".
                                 "\nGOsa Version: ".get_gosa_version().
-                                "\nDate: ".date("d.m.Y").
-                                "\nTime: ".date("H:i:s").
                                 "\n\n".
                                 "Please describe what you did to produce this error as detailed as possible. Can you ".
                                 "reproduce this bug using the demo on http://www.gosa-project.org ?".
@@ -222,10 +215,13 @@ function dummy_error_handler()
 }
 
 
+/* Set timezone */
+date_default_timezone_set("GMT");
+
 /* Get base dir for reference */
 $BASE_DIR= dirname(dirname(__FILE__));
 $ROOT_DIR= $BASE_DIR."/html";
-error_reporting (E_ALL);
+error_reporting (E_ALL | E_STRICT);
 
 /* Register error handler */
 $error_collector= "";
@@ -237,7 +233,7 @@ ini_set("register_globals",0);
 ini_set("track_vars",1);
 ini_set("display_errors",1);
 ini_set("report_memleaks",1);
-ini_set("include_path",".:$BASE_DIR/include");
+ini_set("include_path",".:$BASE_DIR/include:$BASE_DIR/include/php_writeexcel");
 
 /* Do smarty setup */
 require("smarty/Smarty.class.php");
@@ -246,10 +242,5 @@ $smarty->template_dir = $BASE_DIR.'/ihtml/';
 $smarty->caching= false;
 $smarty->php_handling= SMARTY_PHP_REMOVE;
 
-/* Set timezone */
-if (function_exists("date_default_timezone_set")){
-  date_default_timezone_set("GMT");
-}
-
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>