index 5497098cc47842655f61756dedc279566ea0ae98..7659b66550f646c261934ed480f725cf4f381593 100644 (file)
*/
$ldap = $this->config->get_ldap_link();
$ldap->cd ($this->dn);
- $ldap->search("(&(objectClass=FAIclass)(objectClass=".$this->subClass."))",$this->subAttributes);
+ $attrs_to_search = $this->subAttributes;
+ $attrs_to_search[] = "FAIstate";
+ $ldap->search("(&(objectClass=FAIclass)(objectClass=".$this->subClass."))",$attrs_to_search);
while($object = $ldap->fetch()){
- /* Set status for save management */
+ /* Skip objects, that are tagged as removed */
+ if(isset($object['FAIstate'][0])){
+ if(preg_match("/removed$/",$object['FAIstate'][0])){
+ continue;
+ }
+ }
+
+ /* Set status for save management */
foreach($this->subAttributes as $attrs){
if(!isset($object[$attrs][0])){
$this->SubObjects[$object['cn'][0]][$attrs]="";
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>";
}
{
$ldap = $this->config->get_ldap_link();
$ldap->cd ($this->dn);
- $ldap->rmdir_recursive($this->dn);
+
+ $use_dn = str_ireplace( get_release_dn($this->dn), $_SESSION['faifilter']['branch'], $this->dn);
+ if($_SESSION['faifilter']['branch'] == "main"){
+ $use_dn = $this->dn;
+ }
+
+ prepare_to_save_FAI_object($use_dn,array(),true);
+
+ foreach($this->SubObjects as $name => $obj){
+ $use_dn = str_ireplace( get_release_dn($this->dn), $_SESSION['faifilter']['branch'], $obj['dn']);
+ if($_SESSION['faifilter']['branch'] == "main"){
+ $use_dn = $obj['dn'];
+ }
+ prepare_to_save_FAI_object($use_dn,array(),true);
+ }
$this->handle_post_events("remove");
}
$ldap = $this->config->get_ldap_link();
- $ldap->cat($this->dn);
- if($ldap->count()!=0){
- /* Write FAIscript to ldap*/
- $ldap->cd($this->dn);
- $this->cleanup();
- $ldap->modify ($this->attrs);
-
- }else{
- /* Write FAIscript to ldap*/
- $ldap->cd($this->config->current['BASE']);
- $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn));
- $ldap->cd($this->dn);
- $ldap->add($this->attrs);
- }
- show_ldap_error($ldap->get_error());
+ prepare_to_save_FAI_object($this->dn,$this->attrs);
+ show_ldap_error($ldap->get_error(), sprintf(_("Saving of FAI/hook with dn '%s' failed."),$this->dn));
/* Do object tagging */
$this->handle_object_tagging();
- show_ldap_error($ldap->get_error());
$ldap->cd($this->dn);
}
}
-
+ $tmp['objectClass'] = $this->subClasses;
+
$sub_dn = "cn=".$obj['cn'].",".$this->dn;
- plugin::plugin($this->config,$sub_dn);
- $tmp['objectClass'] = $this->attrs['objectClass'];
- foreach($this->subClasses as $class){
- if(!in_array($class,$tmp['objectClass'])){
- $tmp['objectClass'][] = $class;
+ if($obj['status']=="new"){
+ $ldap->cat($sub_dn,array("objectClass"));
+ if($ldap->count()){
+ $obj['status']="edited";
}
}
- if($obj['status']=="new"){
- $ldap->cat($sub_dn);
- if($ldap->count()){
- $obj['status']="modify";
+ /* 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";
+ }
}
}
if($obj['status'] == "delete"){
- $ldap->cd($sub_dn);
- $ldap->rmdir_recursive($sub_dn);
+ prepare_to_save_FAI_object($sub_dn,array(),true);
$this->handle_post_events("remove");
}elseif($obj['status'] == "edited"){
- $ldap->cd($sub_dn);
- $this->cleanup();
- $ldap->modify ($tmp);
-
+ prepare_to_save_FAI_object($sub_dn,$tmp);
$this->handle_post_events("modify");
}elseif($obj['status']=="new"){
- if($tmp['description']==array()){
- unset($tmp['description']);
- }
- $ldap->cd($this->config->current['BASE']);
- $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $sub_dn));
- $ldap->cd($sub_dn);
- $ldap->add($tmp);
+ prepare_to_save_FAI_object($sub_dn,$tmp);
$this->handle_post_events("add");
}
$this->handle_object_tagging($sub_dn, $this->gosaUnitTag);
- show_ldap_error($ldap->get_error());
}
}
}