X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-plugins%2Ffai%2Fadmin%2Ffai%2FtabsPartition.inc;h=3ac0e2257d92261f9e529183851860b777e61893;hb=8f7080e4d548a1257a13753c0881a2baf4ff45ed;hp=9d409e6c73090f429d6641a3ff07b1c348fdd03b;hpb=b27dce8b0c43c73a52c85320e3a2086828b43af3;p=gosa.git

diff --git a/gosa-plugins/fai/admin/fai/tabsPartition.inc b/gosa-plugins/fai/admin/fai/tabsPartition.inc
index 9d409e6c7..3ac0e2257 100644
--- a/gosa-plugins/fai/admin/fai/tabsPartition.inc
+++ b/gosa-plugins/fai/admin/fai/tabsPartition.inc
@@ -3,13 +3,14 @@
 class tabsPartition extends tabs
 {
   var $base= "";
+  var $parent ="";
 
   function tabsPartition($config, $data, $dn,$category)
   {
 	tabs::tabs($config, $data, $dn,$category);
 
 	/* Add references/acls/snapshots */
-	$this->addSpecialTabs();
+#	$this->addSpecialTabs();
   }
 
   function check($ignore_account= FALSE)
@@ -22,18 +23,13 @@ class tabsPartition extends tabs
   {
   	$baseobject= $this->by_object['faiPartitionTable'];
 
-	$new_dn= 'cn='.$baseobject->cn.",".get_ou('faipartitionou').get_ou('faiou').session::get('CurrentMainBase');
-
-	$faifilter = session::get('faifilter');	
-	if($faifilter['branch']!="main"){
-		$new_dn ='cn='.$baseobject->cn.",".get_ou('faipartitionou').$faifilter['branch'];
-	}
+	$new_dn ='cn='.$baseobject->cn.",".get_ou('faiPartitionRDN').$this->parent->fai_release;
 
  	if ($this->dn != $new_dn && $this->dn != "new"){
 		
 		/* if( new_dn is subtree of this->dn ) */
-		$cnt1 = count(split(",",$this->dn));
-		$cnt2 = count(split(",",$new_dn));
+		$cnt1 = count(explode(",",$this->dn));
+		$cnt2 = count(explode(",",$new_dn));
 		if((strstr($new_dn,$this->dn))&&($cnt1<$cnt2)){
 			msg_dialog::display(_("Error"), _("Moving the tree failed. Destination tree is subtree of source tree."), ERROR_DIALOG);
 		}else{