diff --git a/gosa-plugins/fai/admin/fai/tabsPartition.inc b/gosa-plugins/fai/admin/fai/tabsPartition.inc
index 9d409e6c73090f429d6641a3ff07b1c348fdd03b..3ac0e2257d92261f9e529183851860b777e61893 100644 (file)
class tabsPartition extends tabs
{
var $base= "";
class tabsPartition extends tabs
{
var $base= "";
+ var $parent ="";
function tabsPartition($config, $data, $dn,$category)
{
tabs::tabs($config, $data, $dn,$category);
/* Add references/acls/snapshots */
function tabsPartition($config, $data, $dn,$category)
{
tabs::tabs($config, $data, $dn,$category);
/* Add references/acls/snapshots */
- $this->addSpecialTabs();
+# $this->addSpecialTabs();
}
function check($ignore_account= FALSE)
}
function check($ignore_account= FALSE)
{
$baseobject= $this->by_object['faiPartitionTable'];
{
$baseobject= $this->by_object['faiPartitionTable'];
- $new_dn= 'cn='.$baseobject->cn.",".get_ou('faipartitionou').get_ou('faiou').session::get('CurrentMainBase');
-
- $faifilter = session::get('faifilter');
- if($faifilter['branch']!="main"){
- $new_dn ='cn='.$baseobject->cn.",".get_ou('faipartitionou').$faifilter['branch'];
- }
+ $new_dn ='cn='.$baseobject->cn.",".get_ou('faiPartitionRDN').$this->parent->fai_release;
if ($this->dn != $new_dn && $this->dn != "new"){
/* if( new_dn is subtree of this->dn ) */
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{
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{