X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-plugins%2Ffai%2Fadmin%2Ffai%2FtabsTemplate.inc;h=e47096fd32b3782c39e208712faca501967f784a;hb=8cd748822ec15f04dd8a97616de7c6ee2c7826e1;hp=3c8576e3c9a9e1a40a8fc4c974f13f1e77a4707a;hpb=0e18d29f78a782f1328668d201313e335ce42c2e;p=gosa.git

diff --git a/gosa-plugins/fai/admin/fai/tabsTemplate.inc b/gosa-plugins/fai/admin/fai/tabsTemplate.inc
index 3c8576e3c..e47096fd3 100644
--- a/gosa-plugins/fai/admin/fai/tabsTemplate.inc
+++ b/gosa-plugins/fai/admin/fai/tabsTemplate.inc
@@ -3,6 +3,7 @@
 class tabsTemplate extends tabs
 {
   var $base= "";
+  var $parent ="";
 
   function tabsTemplate($config, $data, $dn,$category)
   {
@@ -21,19 +22,13 @@ class tabsTemplate extends tabs
   function save($ignore_account= FALSE)
   {
   	$baseobject= $this->by_object['faiTemplate'];
-
-	$new_dn= 'cn='.$baseobject->cn.",".get_ou('faitemplateou').get_ou('faiou').session::get('CurrentMainBase');
-
-	$faifilter = session::get('faifilter');
-	if($faifilter['branch']!="main"){
-		$new_dn ='cn='.$baseobject->cn.",".get_ou('faitemplateou').$faifilter['branch'];
-	}
+	$new_dn ='cn='.$baseobject->cn.",".get_ou('faiTemplateRDN').$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{