![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/admin/fai/class_faiPartitionTable.inc b/plugins/admin/fai/class_faiPartitionTable.inc
index 50a9bb1cd63dfab112d54238721f30477a33f066..59a1cc5d390304dffc56cebd1ee777b891aaefd1 100644 (file)
$ldap->cd ($this->dn);
$ldap->search("(&(objectClass=FAIclass)(objectClass=FAIpartitionDisk))",array("*"));
while($object = $ldap->fetch()){
+
+ /* Skip objects, that are tagged as removed */
+ if(isset($object['FAIstate'][0])){
+ if(preg_match("/removed$/",$object['FAIstate'][0])){
+ continue;
+ }
+ }
+
$this->disks[$object['cn'][0]]['status'] = "edited";
$this->disks[$object['cn'][0]]['dn'] = $object['dn'];
$this->disks[$object['cn'][0]]['cn'] = $object['cn'][0];
$ldap->search("(&(objectClass=FAIclass)(objectClass=FAIpartitionEntry))",array("*"));
while($partition = $ldap->fetch()){
+ /* Skip objects, that are tagged as removed */
+ if(isset($partition['FAIstate'][0])){
+ if(preg_match("/removed$/",$partition['FAIstate'][0])){
+ continue;
+ }
+ }
+
/* remove count ... from ldap result
*/
foreach($partition as $key=>$val){
{
$ldap = $this->config->get_ldap_link();
$ldap->cd ($this->dn);
- $ldap->rmdir_recursive($this->dn);
- $this->handle_post_events("remove");
-
- /* This cannot be removed... */
+
+ $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->disks as $disk){
+
+ $disk_dn = "cn=".$disk['cn'].",".$this->dn;
+ $use_dn = str_ireplace( get_release_dn($this->dn), $_SESSION['faifilter']['branch'], $disk_dn);
+ if($_SESSION['faifilter']['branch'] == "main"){
+ $use_dn = $disk_dn;
+ }
+ prepare_to_save_FAI_object($use_dn,array(),true);
+
+ foreach($disk['partitions'] as $key => $partition){
+
+ $partition_dn= "FAIpartitionNr=".$partition['FAIpartitionNr'].",".$disk_dn;
+ $use_dn = str_ireplace( get_release_dn($this->dn), $_SESSION['faifilter']['branch'], $partition_dn);
+ if($_SESSION['faifilter']['branch'] == "main"){
+ $use_dn = $disk_dn;
+ }
+ prepare_to_save_FAI_object($use_dn,array(),true);
+ }
+ }
}
$ldap = $this->config->get_ldap_link();
- if($this->new){
- $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());
- }else{
- /* Add partition table to ldap
- */
- $ldap->cd($this->dn);
- $this->cleanup();
-$ldap->modify ($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/partition table with dn '%s' failed."),$this->dn));
/* Do object tagging */
$this->handle_object_tagging();
- show_ldap_error($ldap->get_error());
/* Sort entries, because we must delete entries with status="delete" first */
$order = array();
$disk_attrs['objectClass'] = array("top","FAIclass","FAIpartitionDisk");
if($disk['status']=="new"){
- $ldap->cat($disk_dn);
+ $ldap->cat($disk_dn,array("objectClass"));
if($ldap->count()){
$disk['status']="edited";
}
}
-
- if($disk['status'] == "delete"){
- $ldap->cd($disk_dn);
- $ldap->rmdir_recursive($disk_dn);
- }elseif($disk['status']== "edited"){
- if(empty($disk_attrs['description'])){
- $disk_attrs['description']=array();
- }
- $ldap->cd($disk_dn);
- $this->cleanup();
- $ldap->modify ($disk_attrs);
- }elseif($disk['status']== "new"){
- if(empty($disk_attrs['description'])){
- unset($disk_attrs['description']);
- }
- $ldap->cd($this->config->current['BASE']);
- $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $disk_dn));
- $ldap->cd($disk_dn);
- $ldap->add($disk_attrs);
- }else{
- print_red("unknown status while saving disks");
+ /* Fix problem with missing objectClass "gosaAdministrativeUnitTag" for disks */
+ $ldap->cat($disk_dn,array("objectClass"));
+ $attrs = $ldap->fetch();
+ if(isset($attrs['objectClass']) && in_array_ics("gosaAdministrativeUnitTag",$attrs['objectClass'])){
+ $disk_attrs['objectClass'][] = "gosaAdministrativeUnitTag";
+ }
+
+ if($disk['status'] == "delete"){
+ prepare_to_save_FAI_object($disk_dn,array(),true);
+ $this->handle_post_events("remove");
+ }elseif($disk['status'] == "edited"){
+ prepare_to_save_FAI_object($disk_dn,$disk_attrs);
+ $this->handle_post_events("modify");
+ }elseif($disk['status']=="new"){
+ prepare_to_save_FAI_object($disk_dn,$disk_attrs);
+ $this->handle_post_events("add");
}
- show_ldap_error($ldap->get_error());
$this->handle_object_tagging($disk_dn, $this->gosaUnitTag);
- show_ldap_error($ldap->get_error());
if($disk['status']!="delete")
/* Add all partitions */
unset($partition_attrs['old_cn']);
if($partition['status']=="new"){
- $ldap->cat($partition_dn);
+ $ldap->cat($partition_dn,array("objectClass"));
if($ldap->count()){
$partition['status']="edited";
}
$partition_attrs['FAImountPoint']="swap";
}
- if(($partition['status'] == "delete")&&($disk['status']!="new")){
- $ldap->cd($partition_dn);
- $ldap->rmdir_recursive($partition_dn);
- }elseif($partition['status'] == "new"){
- if(empty($partition_attrs['description'])){
- unset($partition_attrs['description']);
- }
- $ldap->cd($this->config->current['BASE']);
- $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $partition_dn));
- $ldap->cd($partition_dn);
- $ldap->add($partition_attrs);
- }elseif($partition['status'] == "edited"){
- if(empty($partition_attrs['description'])){
- $partition_attrs['description']=array();
- }
- $ldap->cd($partition_dn);
- $this->cleanup();
-$ldap->modify ($partition_attrs);
+ /* Fix problem with missing objectClass "gosaAdministrativeUnitTag" for partitions */
+ $ldap->cat($partition_dn,array("objectClass"));
+ $attrs = $ldap->fetch();
+ if(isset($attrs['objectClass']) && in_array_ics("gosaAdministrativeUnitTag",$attrs['objectClass'])){
+ $partition_attrs['objectClass'][] = "gosaAdministrativeUnitTag";
+ }
- }
- show_ldap_error($ldap->get_error());
+ if($partition['status'] == "delete"){
+ prepare_to_save_FAI_object($partition_dn,array(),true);
+ $this->handle_post_events("remove");
+ }elseif($partition['status'] == "edited"){
+ prepare_to_save_FAI_object($partition_dn,$partition_attrs);
+ $this->handle_post_events("modify");
+ }elseif($partition['status']=="new"){
+ prepare_to_save_FAI_object($partition_dn,$partition_attrs);
+ $this->handle_post_events("add");
+ }
$this->handle_object_tagging($partition_dn, $this->gosaUnitTag);
- show_ldap_error($ldap->get_error());
}
}
$this->handle_post_events("add");
}
+
+
+ /* Return plugin informations for acl handling */
+ function plInfo()
+ {
+ return (array(
+ "plShortName" => _("Partition table"),
+ "plDescription" => _("FAI partition table"),
+ "plSelfModify" => FALSE,
+ "plDepends" => array(),
+ "plPriority" => 0,
+ "plSection" => array("administration"),
+ "plCategory" => array("fai"),
+ "plProvidedAcls" => array(
+ "cn" => _("Name"),
+ "FAIpartitionType" => _("Partition type"),
+ "FAIpartitionNr" => _("Partition no."),
+ "FAIfsType" => _("File system type"),
+ "FAImountPoint" => _("Mount point"),
+ "FAIpartitionSize" => _("Partition size"),
+ "FAImountOptions" => _("Mount options"),
+ "FAIfsOptions" => _("File system options"),
+ "FAIpartitionFlags" => _("Partition flags"))
+ ));
+ }
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: