Udpated body format

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

diff --git a/include/functions.inc b/include/functions.inc
index 4cac0b7c7580ce08eae29e9f90d9c5742344011c..94164fbf81b40cbe1100dfb4786a2f5ef7ec507f 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -2454,13 +2454,14 @@ function get_base_from_hook($dn, $attrib)
 
 function prepare4mailbody($string)
 {
-  $string = $string;
+  $string = html_entity_decode($string);
 
   $from = array("/\n/" , "/&/" ,"/(\'|\")/");
-  $to   = array("%0A"  , "%26" ,"");
+  $to   = array("%0A"  , "%26" ,"%22");
 
   $string = preg_replace($from,$to,$string);
 
+  echo "<pre>".$string."</pre>";
   return($string);
 }
 

diff --git a/plugins/admin/fai/class_faiScript.inc b/plugins/admin/fai/class_faiScript.inc
index 537c35318581a4a114a813f821fa46af558921b0..1645191953480fcdb2039d28cabe8720127ddb76 100644 (file)
--- a/plugins/admin/fai/class_faiScript.inc
+++ b/plugins/admin/fai/class_faiScript.inc
@@ -123,6 +123,8 @@ class faiScript extends plugin
     /* Call parent execute */
     plugin::execute();
 
+    $as[$bd][d] =2;
+
     /* Fill templating stuff */
     $smarty= get_smarty();
     $display= "";