Beautified FAI templates

[gosa.git] / gosa-plugins / fai / admin / fai / tabsScript.inc

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