Added toggling of remove flag for packages

[gosa.git] / plugins / admin / fai / class_faiHook.inc

diff --git a/plugins/admin/fai/class_faiHook.inc b/plugins/admin/fai/class_faiHook.inc
index 4caa9d0e2b3aeabbb7adf92029309fab7aab301e..42f7e5feaee73d2b42ac2e63cff8272663de6e9d 100644 (file)
--- a/plugins/admin/fai/class_faiHook.inc
+++ b/plugins/admin/fai/class_faiHook.inc
@@ -261,7 +261,7 @@ class faiHook extends plugin
       if(($this->SubObjects[$key]['status'] == "new") || ($this->SubObjects[$key]['dn'] == "new")){
         $down = "";
       }else{
-        $down = "<a href='getFAIscript.php?id=".base64_encode($name['dn'])."' target='_blank'>
+        $down = "<a href='getFAIscript.php?id=".base64_encode($name['dn'])."'>
           <img src='images/save.png' alt='"._("Download")."' title='"._("Download")."' border=0>
           </a>";
       }
@@ -329,6 +329,7 @@ class faiHook extends plugin
     $ldap = $this->config->get_ldap_link();
     $ldap->cd ($this->dn);
     $ldap->rmdir_recursive($this->dn);
+    show_ldap_error($ldap->get_error(), _("Removing FAI hook base failed")); 
     $this->handle_post_events("remove");    
   }
 
@@ -379,11 +380,10 @@ class faiHook extends plugin
       $ldap->cd($this->dn);
       $ldap->add($this->attrs);
     }
-    show_ldap_error($ldap->get_error()); 
+    show_ldap_error($ldap->get_error(), _("Saving FAI hook base failed")); 
 
     /* Do object tagging */
     $this->handle_object_tagging();
-    show_ldap_error($ldap->get_error()); 
 
     $ldap->cd($this->dn);
 
@@ -429,12 +429,12 @@ class faiHook extends plugin
       if($obj['status']=="new"){
         $ldap->cat($sub_dn,array("objectClass"));
         if($ldap->count()){
-          $obj['status']="modify";
+          $obj['status']="edited";
         }
       }
 
       /* Check if gosaAdministrativeUnitTag is required as object class */
-      if($obj['status'] == "modify"){
+      if($obj['status'] == "edited"){
         $ldap->cat($sub_dn,array("objectClass"));
         $attrs = $ldap->fetch();
         if(isset($attrs['objectClass'])){
@@ -448,11 +448,13 @@ class faiHook extends plugin
         $ldap->cd($sub_dn);
         $ldap->rmdir_recursive($sub_dn);
         $this->handle_post_events("remove");
+        show_ldap_error($ldap->get_error(), _("Removing FAI hook failed")); 
       }elseif($obj['status'] == "edited"){
         $ldap->cd($sub_dn);
         $this->cleanup();
         $ldap->modify ($tmp); 
         $this->handle_post_events("modify");
+        show_ldap_error($ldap->get_error(), _("Saving FAI hook failed")); 
       }elseif($obj['status']=="new"){
         if($tmp['description']==array()){
           unset($tmp['description']);
@@ -462,9 +464,9 @@ class faiHook extends plugin
         $ldap->cd($sub_dn);
         $ldap->add($tmp); 
         $this->handle_post_events("add");
+        show_ldap_error($ldap->get_error(), _("Saving FAI hook failed")); 
       }
       $this->handle_object_tagging($sub_dn, $this->gosaUnitTag);
-      show_ldap_error($ldap->get_error()); 
     }
   }
 }