Updated table summary

[gosa.git] / gosa-plugins / mail / personal / mail / sieve / class_sieveManagement.inc

diff --git a/gosa-plugins/mail/personal/mail/sieve/class_sieveManagement.inc b/gosa-plugins/mail/personal/mail/sieve/class_sieveManagement.inc
index 417853e4b60345408c01270f19c458672b46d1af..650c95a2d332c8a0d11e91460c907836ed9043f3 100644 (file)
--- a/gosa-plugins/mail/personal/mail/sieve/class_sieveManagement.inc
+++ b/gosa-plugins/mail/personal/mail/sieve/class_sieveManagement.inc
@@ -143,7 +143,8 @@ class sieveManagement extends plugin
           $cfg["sieve_port"], 
           $this->parent->$uattrib, 
           $cfg["password"], 
-          $cfg["admin"]);
+          $cfg["admin"],
+          $cfg["sieve_option"]);
 
       /* Try to login */
       if (!@$this->sieve_handle->sieve_login()){
@@ -163,6 +164,7 @@ class sieveManagement extends plugin
    */
   function execute()
   {
+    plugin::execute();
     /***************
      * Create a new Script 
      ***************/
@@ -356,9 +358,7 @@ class sieveManagement extends plugin
     /* Display confirm dialog */
     if($this->script_to_delete != -1){
       $smarty = get_smarty();
-      $smarty->assign("Warning",
-          sprintf(_("You are going to remove the sieve script '%s' from your mail server."),
-            $this->scripts[$this->script_to_delete]['NAME']));
+      $smarty->assign("Warning",msgPool::deleteInfo($this->scripts[$this->script_to_delete]['NAME']));
       return($smarty->fetch(get_template_path("templates/remove_script.tpl",TRUE,dirname(__FILE__))));
     }
 
@@ -641,7 +641,7 @@ class sieveManagement extends plugin
       $field4 = array("string" => _("Script length").": ".strlen($script['SCRIPT']));
 
       if($this->parent->acl_is_writeable("sieveManagement")){
-        $del = "<input type='image' name='delscript_".$key."' src='images/edittrash.png'
+        $del = "<input type='image' name='delscript_".$key."' src='images/lists/trash.png'
                   title='"._("Remove script")."'>";
       }else{
         $del = "<img src='images/empty.png' alt=' '>";
@@ -654,7 +654,7 @@ class sieveManagement extends plugin
                        title='"._("Activate script")."'>";
       }
 
-      $field6 = array("string" => $activate."<input type='image' name='editscript_".$key."' src='images/edit.png'
+      $field6 = array("string" => $activate."<input type='image' name='editscript_".$key."' src='images/lists/edit.png'
                         title='"._("Edit script")."'>".$del,
                       "attach" => "style='border-right:0px; width:70px;'");
       $List->AddEntry(array($field1,$field2,$field3,$field4,$field6)); 
@@ -696,8 +696,7 @@ class sieveManagement extends plugin
       trigger_error("Can't add new element, given id is not numeric.");
       return(FALSE);
     }
-    $tmp = get_declared_classes();  
-    if(!in_array($type,$tmp)){
+    if(!class_available($type)){
       if(!empty($type)){
         trigger_error("Can't add new element, given \$class=".$class." does not exists.");
       }