From 33347318d29220fb1dc375438541f62341656ff6 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 22 Mar 2010 12:44:26 +0000
Subject: [PATCH] Updated spamserver template

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16994 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../admin/systems/services/spam/class_goSpamServer.inc    | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/gosa-plugins/mail/admin/systems/services/spam/class_goSpamServer.inc b/gosa-plugins/mail/admin/systems/services/spam/class_goSpamServer.inc
index 892607e9b..1fe69ec7a 100644
--- a/gosa-plugins/mail/admin/systems/services/spam/class_goSpamServer.inc
+++ b/gosa-plugins/mail/admin/systems/services/spam/class_goSpamServer.inc
@@ -123,7 +123,6 @@ class gospamserver extends goService{
       if(preg_match("/^editRule_/",$name) && $once && $this->acl_is_readable("saRule")){
         $once = false;
         $entry = preg_replace("/^editRule_/","",$name);
-        $entry = preg_replace("/_(x|y)$/","",$entry);
         $rule = $this->Rules[$entry];
         $name = $entry;
         $this->dialog = new goSpamServerRule($this->config,$this->dn,$name,$rule);
@@ -133,7 +132,6 @@ class gospamserver extends goService{
       if(preg_match("/^delRule_/",$name) && $once && $this->acl_is_writeable("saRule")){
         $once = false;
         $entry = preg_replace("/^delRule_/","",$name);
-        $entry = preg_replace("/_(x|y)$/","",$entry);
         unset($this->Rules[$entry]);
       }
     }
@@ -185,15 +183,15 @@ class gospamserver extends goService{
     if(!$this->acl_is_writeable("saTrustedNetworks")){
       $actions = "";
     }else{
-      $actions = "<input type='image' src='images/lists/edit.png'      name='editRule_%s'>";
+      $actions = image('images/lists/edit.png', 'editRule_%s');
       if($this->acl_is_writeable("saRule")){
-        $actions.= "<input type='image' src='images/lists/trash.png' name='delRule_%s'>";
+        $actions.= image('images/lists/trash.png','delRule_%s');
       }
     }
 
     foreach($this->Rules as $key => $net){
       $field1 = array("string" => $key );
-      $field2 = array("string" => sprintf($actions,$key,$key) , "attach" => "style='border-right:0px;width:36px;'");
+      $field2 = array("string" => preg_replace("/%s/",$key,$actions) , "attach" => "style='border-right:0px;width:36px;'");
       $DivRules->AddEntry(array($field1,$field2));
     }
     $smarty->assign("divRules",$DivRules->DrawList()); 
-- 
2.30.2