X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-plugins%2Ffai%2Fadmin%2Ffai%2FtabsPackage.inc;h=835933f79a9617d484b2f48688242ebe11274544;hb=ac00a6eccb7dd4f40043288482e701a3f17fcc6e;hp=e678a835edbf51c32f42b99419654c111818f0a5;hpb=9169b2843e25912293f2c2ef8f96278b52b9fbae;p=gosa.git

diff --git a/gosa-plugins/fai/admin/fai/tabsPackage.inc b/gosa-plugins/fai/admin/fai/tabsPackage.inc
index e678a835e..835933f79 100644
--- a/gosa-plugins/fai/admin/fai/tabsPackage.inc
+++ b/gosa-plugins/fai/admin/fai/tabsPackage.inc
@@ -3,13 +3,14 @@
 class tabsPackage extends tabs
 {
   var $base= "";
+  var $parent ="";
 
   function tabsPackage($config, $data, $dn,$category)
   {
 	tabs::tabs($config, $data, $dn,$category);
 
 	/* Add references/acls/snapshots */
-	$this->addSpecialTabs();
+#	$this->addSpecialTabs();
   }
 
   function check($ignore_account= FALSE)
@@ -21,22 +22,15 @@ class tabsPackage extends tabs
   function save($ignore_account= FALSE)
   {
   	$baseobject= $this->by_object['faiPackage'];
-
-	$new_dn= 'cn='.$baseobject->cn.",".get_ou('faipackageou').get_ou('faiou').session::get('CurrentMainBase');
-
-	$faifilter = session::get('faifilter');
-
-	if($faifilter['branch']!="main"){
-		$new_dn ='cn='.$baseobject->cn.",".get_ou('faipackageou').$faifilter['branch'];
-	}
+	$new_dn ='cn='.$baseobject->cn.",".get_ou('faiPackageRDN').$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)){
-			print_red(_("Try to move tree failed. Destination tree is subtree of source tree."));
+			msg_dialog::display(_("Error"), _("Moving the tree failed. Destination tree is subtree of source tree."), ERROR_DIALOG);
 		}else{
 //			$baseobject->recursive_move($this->dn, $new_dn);
 		}