From: hickert Date: Thu, 28 Jun 2007 09:37:07 +0000 (+0000) Subject: Udpated body format X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=13a7b8685b30e1b6592dfa8079b96f351059bfdc;p=gosa.git 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 4cac0b7c7..94164fbf8 100644 --- 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 "
".$string."
"; return($string); } diff --git a/plugins/admin/fai/class_faiScript.inc b/plugins/admin/fai/class_faiScript.inc index 537c35318..164519195 100644 --- 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= "";