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 09b270d8390f736d3dac3df287c472fe229ad573..42f7e5feaee73d2b42ac2e63cff8272663de6e9d 100644 (file)
--- a/plugins/admin/fai/class_faiHook.inc
+++ b/plugins/admin/fai/class_faiHook.inc
@@ -89,7 +89,7 @@ class faiHook extends plugin
         foreach($this->subAttributes as $attrs){
           $this->SubObjects[$object['cn'][0]][$attrs]=addslashes($this->SubObjects[$object['cn'][0]][$attrs]);
         }
-        $this->SubObjects[$object['cn'][0]]['FAIscript']   = addslashes($this->readBinary("FAIscript",$object['dn']));
+        $this->SubObjects[$object['cn'][0]]['FAIscript']   = addslashes( $ldap->get_attribute($object['dn'], "FAIscript",$r_array=0));
       }
     }
   }
@@ -247,6 +247,7 @@ class faiHook extends plugin
      */
 
     $divlist = new divSelectBox("FAIhooks");
+    $divlist->setHeight(400);
     if((chkacl($this->acl,"cn")!="") || ($this->FAIstate == "freeze")){
       $img_edit = "<input type='image' src='images/edit.png'      name='editscript_%s'    title='"._("edit")."' alt='"._("edit")."'>";
       $img_remo = ""; 
@@ -260,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>";
       }
@@ -275,7 +276,6 @@ class faiHook extends plugin
      */
 
     $smarty->assign("SubObjects",$this->getList());
-    $smarty->assign("SubObjectKeys",array_flip($this->getList()));
 
     /* Magic quotes GPC, escapes every ' " \, to solve some security risks
      * If we post the escaped strings they will be escaped again
@@ -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");    
   }
 
@@ -365,7 +366,7 @@ class faiHook extends plugin
 
     $ldap = $this->config->get_ldap_link();
 
-    $ldap->cat($this->dn);
+    $ldap->cat($this->dn,array("objectClass"));
     if($ldap->count()!=0){     
       /* Write FAIscript to ldap*/ 
       $ldap->cd($this->dn);
@@ -379,7 +380,12 @@ 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();
+
+    $ldap->cd($this->dn);
 
     /* Prepare FAIscriptEntry to write it to ldap
      * First sort array.
@@ -421,9 +427,20 @@ class faiHook extends plugin
       $sub_dn = "cn=".$obj['cn'].",".$this->dn;
 
       if($obj['status']=="new"){
-        $ldap->cat($sub_dn);
+        $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'] == "edited"){
+        $ldap->cat($sub_dn,array("objectClass"));
+        $attrs = $ldap->fetch();
+        if(isset($attrs['objectClass'])){
+          if(in_array_ics("gosaAdministrativeUnitTag",$attrs['objectClass'])){
+            $tmp['objectClass'][] = "gosaAdministrativeUnitTag";
+          }
         }
       }
 
@@ -431,12 +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']);
@@ -446,42 +464,11 @@ 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")); 
       }
-      show_ldap_error($ldap->get_error()); 
-    }
-  }
-
-  function readBinary($attr,$dn){
-    $Data  ="";
-    $ds= ldap_connect($this->config->current['SERVER']);
-    ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
-    if (function_exists("ldap_set_rebind_proc") && isset($this->config->current['RECURSIVE']) && $this->config->current['RECURSIVE'] == "true") {
-      ldap_set_option($this->cid, LDAP_OPT_REFERRALS, 1);
-      ldap_set_rebind_proc($ds, array(&$this, "rebind"));
-    }
-
-    if(isset($this->config->current['TLS']) &&  $this->config->current['TLS'] == "true"){
-      ldap_start_tls($ds);
-    }
-
-    $r  = ldap_bind($ds);
-    $sr = @ldap_read($ds, $dn, $attr."=*", array($attr));
-
-    if ($sr) {
-      $ei=ldap_first_entry($ds, $sr);
-      if ($ei) {
-        if ($info = ldap_get_values_len($ds, $ei, $attr)){
-          $Data= $info[0];
-        }
-      }
+      $this->handle_object_tagging($sub_dn, $this->gosaUnitTag);
     }
-
-    /* close conncetion */
-    ldap_unbind($ds);
-    return($Data);
   }
-
-
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: