X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-plugins%2Ffai%2Fadmin%2Ffai%2FtabsScript.inc;h=7cf0a027e2fd887c1991104ba7e07c49f8c16d4f;hb=9dc6ac611bbe02539e5d9326a6106f8160bc56c3;hp=094fbb40502c2b52995d12e6f327923f8f6d27b7;hpb=9169b2843e25912293f2c2ef8f96278b52b9fbae;p=gosa.git diff --git a/gosa-plugins/fai/admin/fai/tabsScript.inc b/gosa-plugins/fai/admin/fai/tabsScript.inc index 094fbb405..7cf0a027e 100644 --- a/gosa-plugins/fai/admin/fai/tabsScript.inc +++ b/gosa-plugins/fai/admin/fai/tabsScript.inc @@ -3,13 +3,14 @@ class tabsScript extends tabs { var $base= ""; + var $parent =""; function tabsScript($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 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)){ - 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); }