X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fclass_MultiSelectWindow.inc;h=bbba65eeeaf44d469bd63722a0e49c08779e8171;hb=895712accc11cf9defc13cdbc64a6b3c7e7e548a;hp=0697fc4f965add55fb5fbde1647219026cc693e5;hpb=80c40c6d11df4b3a2d935feac0b723c017ffd935;p=gosa.git diff --git a/include/class_MultiSelectWindow.inc b/include/class_MultiSelectWindow.inc index 0697fc4f9..bbba65eee 100644 --- a/include/class_MultiSelectWindow.inc +++ b/include/class_MultiSelectWindow.inc @@ -34,6 +34,7 @@ class MultiSelectWindow{ var $HideFilterPart = false; var $SaveAdditionalVars = array(); // Additional Post vars to store + var $module= ""; function ClearElementsList() { @@ -72,9 +73,10 @@ class MultiSelectWindow{ } /* Contrucktion */ - function MultiSelectWindow($config,$filterName) + function MultiSelectWindow($config, $filterName, $module) { $this->config = $config; + $this->module = $module; $this->SaveButtonString = _("Save"); $this->CloseButtonString = _("Close"); $this->filterName = $filterName; @@ -273,7 +275,7 @@ class MultiSelectWindow{ if($box['default'] == true){ $boxes .=" ".$box['string']."
"; }else{ - $boxes .=" ".$box['string']."
"; + $boxes .=" ".$box['string']."
"; } } $smarty->assign("CheckBoxes", $boxes); @@ -361,7 +363,9 @@ class MultiSelectWindow{ function save_object() { /* Get up to date config */ - $this->config = $this->parent->config; + if(isset($this->parent->config)){ + $this->config = $this->parent->config; + } /* Update current base */ if($this->DepartmentsAdded){ @@ -500,10 +504,10 @@ class MultiSelectWindow{ title='"._("Restore snapshopts of already deleted objects")."' alt='"._("Restore")."' name='RestoreDeletedSnapShot'> "; }else{ - $str = " "; + $str = " "; } - $str .= " "; +# $str .= " "; } return($str); } @@ -518,7 +522,7 @@ class MultiSelectWindow{ $str.= " "; } else { - $str = " "; + $str = " "; } $str.= "departments = array(); /* Get all departments within this subtree */ - $deps= get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->ui->subtreeACL, - $base, array("ou", "description"), GL_SIZELIMIT | GL_CONVERT); + $deps= get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base, + array("ou", "description"), GL_SIZELIMIT | GL_CONVERT); /* Edit delete link for system types */ @@ -570,6 +574,7 @@ class MultiSelectWindow{ /* Add deps to this dialog object list */ foreach($this->departments as $key=> $val){ + /* Add missing entries ... */ if(!isset($this->config->departments[trim($key)])){ $this->config->departments[trim($key)]="";