- Corrected debian bugnumbers

[gosa.git] / include / php_setup.inc

diff --git a/include/php_setup.inc b/include/php_setup.inc
index b06a46c5789255210b07dc7c8394db3a8940424b..8260e9593c8f680621dc26a0e333be6c6b6c03b2 100644 (file)
--- a/include/php_setup.inc
+++ b/include/php_setup.inc
@@ -66,16 +66,6 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
     }
   }
 
-  /* Hide timezone warnings, gosa */
-  if(preg_match("/date.timezone/",$errstr)){
-    
-    $tmp=  get_default_timezone();
-    echo $tmp['name'];
-    echo $errfile;
-    echo "<br>";
-    return;
-  }
-
 
   /* Create header as needed */
   if ($error_collector == ""){
@@ -111,8 +101,11 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
       $error_collector= "
         <table summary=\"\" width=\"100%\" style='background-color:#E0E0E0;border-bottom:1px solid black;z-index:150;'>
           <tr>
-            <td>
-              <img alt=\"\" align=\"middle\" src='".get_template_path('images/warning.png')."'>&nbsp;
+            <td>";
+      if (function_exists("get_template_path")){
+              $error_collector.= "<img alt=\"\" align=\"middle\" src='".get_template_path('images/warning.png')."'>&nbsp;";
+      }
+      $error_collector.= "
               <font style='font-size:14px;font-weight:bold'>".
                 _("Generating this page caused the PHP interpreter to raise some errors!")."
               </font>
@@ -229,6 +222,50 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
 }
 
 
+function prepare4mailbody($string)
+{
+  $string = html_entity_decode($string);
+
+  $from = array(
+                "/%/",
+                "/ /",
+                "/\n/",  
+                "/\r/",
+                "/!/",
+                "/#/",
+                "/\*/",
+                "/\//",
+                "/</",
+                "/>/",
+                "/\?/",
+                "/\&/",
+                "/\(/",
+                "/\)/",
+                "/\"/");
+  
+  $to = array(  
+                "%25",
+                "%20",
+                "%0A",
+                "%0D",
+                "%21",
+                "%23",
+                "%2A",
+                "%2F",
+                "%3C",
+                "%3E",
+                "%3F",
+                "%38",
+                "%28",
+                "%29",
+                "%22");
+
+  $string = preg_replace($from,$to,$string);
+
+  return($string);
+}
+
+
 function dummy_error_handler()
 {
 }
@@ -260,7 +297,7 @@ $smarty->php_handling= SMARTY_PHP_REMOVE;
 
 /* Set timezone */
 if (function_exists("date_default_timezone_set")){
-#  date_default_timezone_set("GMT");
+  date_default_timezone_set("GMT");
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: