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 e0c24f77bcc8d99ad88c74fb1da4c1d0f0efbcef..c35c91a860e9a5abf99734b25649415bf9c989db 100644 (file)
--- 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 fe7f472cdee440461b7ce21d11ec29378cce995f..7483454182c3e4c8f03def11cc9c572144b978ff 100755 (executable)
--- a/include/sieve/templates/element_header.tpl
+++ b/include/sieve/templates/element_header.tpl
@@ -26,11 +26,6 @@
         </td>
     </tr>
     <tr>
-        <td>
-            <select name='address_part_{$ID}' title='{t}Boolean value{/t}'>
-                {html_options options=$address_parts selected=$address_part}
-            </select>
-        </td>
         <td>
             {t}Comparator{/t}
         </td>