Fixed department list

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

diff --git a/plugins/admin/fai/tabsScript.inc b/plugins/admin/fai/tabsScript.inc
index 75f7e39d08f0f598f2eed6b2f723de28d775ad4c..22a34d2c9690ceac786eca76a8caa68a85773dc6 100644 (file)
--- a/plugins/admin/fai/tabsScript.inc
+++ b/plugins/admin/fai/tabsScript.inc
@@ -4,28 +4,26 @@ class tabsScript extends tabs
 {
   var $base= "";
 
-  function tabsScript($config, $data, $dn, $new_cn = "")
+  function tabsScript($config, $data, $dn)
   {
        tabs::tabs($config, $data, $dn);
-
-       /* Directly assign a valid dn 
-     * cn can't be changed anymore, since the object was created
-     */
-       $baseobject= $this->by_object['faiScript'];
-    $use_dn= 'cn='.$new_cn.",ou=scripts,ou=fai,ou=configs,ou=systems,".$_SESSION['faifilter']['base'];
-       $this->by_object['faiScript']->use_dn=$use_dn;
   }
 
   function check()
   {
        return (tabs::check(TRUE));
   }
+  
 
   function save()
   {
        $baseobject= $this->by_object['faiScript'];
 
-       $new_dn= 'cn='.$baseobject->cn.",ou=scripts,ou=fai,ou=configs,ou=systems,".$_SESSION['faifilter']['base'];
+       $new_dn= 'cn='.$baseobject->cn.",ou=scripts,ou=fai,ou=configs,ou=systems,".$_SESSION['CurrentMainBase'];
+
+       if($_SESSION['faifilter']['branch']!="main"){
+               $new_dn ='cn='.$baseobject->cn.",ou=scripts,".$_SESSION['faifilter']['branch'];
+       }
        
        if ($this->dn != $new_dn && $this->dn != "new"){