From: hickert Date: Mon, 12 Mar 2007 14:34:22 +0000 (+0000) Subject: Fixed selected comparator in expert ui. X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d073db12aa3ff1f26ccb2480119df56a13964091;p=gosa.git Fixed selected comparator in expert ui. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5768 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/include/sieve/class_sieveElement_If.inc b/include/sieve/class_sieveElement_If.inc index e0c24f77b..c35c91a86 100644 --- a/include/sieve/class_sieveElement_If.inc +++ b/include/sieve/class_sieveElement_If.inc @@ -136,7 +136,7 @@ class sieve_if /* Add comparator */ if(!empty($data['Comparator']) && $data['Comparator'] != ""){ - $script .= ":comparator ".$data['Comparator']." "; + $script .= preg_replace('/\"\"/',"\"", ":comparator \"".$data['Comparator']."\" "); } /* Add match type */ @@ -181,7 +181,7 @@ class sieve_if /* Add comparator */ if(!empty($data['Comparator']) && $data['Comparator'] != ""){ - $script .= ":comparator ".$data['Comparator']." "; + $script .= preg_replace('/\"\"/',"\"", ":comparator \"".$data['Comparator']."\" "); } /* Add match type */ @@ -227,7 +227,7 @@ class sieve_if /* Add comparator */ if(!empty($data['Comparator']) && $data['Comparator'] != ""){ - $script .= ":comparator ".$data['Comparator']." "; + $script .= preg_replace('/\"\"/',"\"", ":comparator \"".$data['Comparator']."\" "); } /* Add match type */ @@ -708,7 +708,7 @@ class sieve_if $smarty->assign("match_type", $data['Match_type']); $smarty->assign("operator" , preg_replace("/\"/","",$data['Match_type_value'])); - $smarty->assign("comparator", $data['Comparator']); + $smarty->assign("comparator", preg_replace("/\"/","",$data['Comparator'])); $keys = ""; @@ -755,7 +755,7 @@ class sieve_if $smarty->assign("match_type", $data['Match_type']); $smarty->assign("operator" , preg_replace("/\"/","",$data['Match_type_value'])); - $smarty->assign("comparator", $data['Comparator']); + $smarty->assign("comparator", preg_replace("/\"/","",$data['Comparator'])); $keys = ""; foreach($data['Key_List'] as $key){ @@ -797,7 +797,7 @@ class sieve_if $smarty->assign("match_type", $data['Match_type']); $smarty->assign("operator" , preg_replace("/\"/","",$data['Match_type_value'])); - $smarty->assign("comparator", $data['Comparator']); + $smarty->assign("comparator", preg_replace("/\"/","",$data['Comparator'])); $smarty->assign("address_part", $data['Address_Part']); $smarty->assign("Expert", $data['Expert']); diff --git a/include/sieve/templates/element_header.tpl b/include/sieve/templates/element_header.tpl index fe7f472cd..748345418 100755 --- a/include/sieve/templates/element_header.tpl +++ b/include/sieve/templates/element_header.tpl @@ -26,11 +26,6 @@ - - - {t}Comparator{/t}