![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc
index 8946d061e58b6fce3a24bfe1972c114d11b37078..bb67e2698dade915e3d81e45c054eb95260c9384 100644 (file)
var $string_Title = "";
var $string_ListHeader = "";
- var $string_ListDropDown= "";
+ var $string_ListDropDown= "";
var $string_Summary = "";
var $string_Information = "";
var $is_headpage = false; // if true the design changes
var $filterName = "Liste";
var $DepartmentsAdded = false;
- var $Added_Departments = array();
+ var $Added_Departments = array();
var $selectedBase = "";
+ private $departments= array();
+
var $DivHeight = "";
var $HideFilterPart = false;
function ClearElementsList()
{
+ $ui =get_userinfo();
+ $deps = $ui->get_module_departments($this->module);
+ if(!in_array($this->selectedBase, $deps)){
+ $this->selectedBase = array_shift($deps);
+ }
$this->array_Elements = array();
}
/* Open selected department
this is posted by the parent class MultiSelectWindow */
if(isset($_GET['act'])&& ($_GET['act'] == "dep_open")){
- $s_entry = base64_decode($_GET['dep_id']);
- if (!isset($this->config->departments[$s_entry])){
+ $s_entry = $_GET['dep_id'];
+ if (!isset($this->departments[$s_entry])){
msg_dialog::display(_("LDAP error"), sprintf(_("Inconsistent DN encoding detected: '%s'"), LDAP::fix($s_entry)), ERROR_DIALOG);
} else {
- $this->selectedBase = $this->config->departments[$s_entry];
+ $this->selectedBase = $this->departments[$s_entry]['dn'];
}
}
$base_back= preg_replace("/^[^,]+,/", "", session::get('CurrentMainBase'));
$dep_id = $this->ui->get_module_departments($this->module);
if(in_array_ics($base_back,$dep_id)){
-
- /* The department array keeps non DN entries as index. We need to convert
- it before checking the existance. */
- $base_back= trim(convert_department_dn($base_back));
-
- /* Check if the department exists, otherwise revert to the configure base DN */
- if(isset($this->config->departments[$base_back])){
- $this->selectedBase= $this->config->departments[$base_back];
- }else{
- $this->selectedBase= $this->config->departments['/'];
+ if(in_array($base_back,$this->config->departments)){
+ $this->selectedBase = $base_back;
}
}
}
/* Get all departments within this subtree */
$deps= get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base,
- array("ou", "description"), GL_SIZELIMIT | GL_CONVERT);
+ array("ou", "description","objectClass"), GL_SIZELIMIT );
/* Edit delete link for system types
*/
$linkopen = "<a href='?plug=".$_GET['plug']."&act=dep_open&dep_id=%s'>%s</a>";
/* Create an array with all visible (in the list) departments */
+ $types = departmentManagement::get_support_departments();
+
$departments = array();
foreach($deps as $value){
- if(isset($value['description'][0])){
- $this->departments[$value['dn']]= get_sub_department($value['dn'])." - [".$value["description"][0]."]";
- }else{
- $this->departments[$value['dn']]= get_sub_department($value['dn']);
- }
+ $name = $value['ou'][0]." -".$value['dn'];
+ foreach($types as $type){
+ if(in_array($type['OC'],$value['objectClass'])){
+ $value['type'] = $type;
+ break;
+ }
+ }
+ $this->departments[$name]= $value;
}
- natcasesort($this->departments);
+ uksort($this->departments, 'strnatcasecmp');
-
- if($empty_tabs_in_front){
-# $numtabs -= $empty_tabs_in_front;
- }
+ $ui = get_userinfo();
+ $module_deps = $ui->get_module_departments($this->module);
/* Add deps to this dialog object list */
+ $this->departments = array_values($this->departments);
foreach($this->departments as $key=> $val){
- /* Add missing entries ... */
- if(!isset($this->config->departments[trim($key)])){
- $this->config->departments[trim($key)]="";
- }
+ if(!in_array($val['dn'],$module_deps)) continue;
- /* check if this department contains sub-departments
- Display different image in this case
- */
- $non_empty="";
- $nkey= normalizePreg($key);
- foreach($this->config->departments as $keyd=>$vald ){
- if(preg_match('/$nkey\/.*/',$keyd)){
- $non_empty="-full";
- }
- }
+ /* Check if this department contains sub-departments
+ Display different image in this case
+ */
+ $img = $val['type']['IMG'];
+ foreach($this->config->departments as $keyd){
+ if(preg_match("/,".normalizePreg($val['dn'])."$/",$keyd)){
+ $img = $val['type']['IMG_FULL'];
+ }
+ }
- /* Add to divlist */
- $row = array();
+ $img = "<image src='".$img."' class='center'>";
+ /* Add spacer cols to divlist
+ */
+ $row = array();
if($empty_tabs_in_front){
for($i = 0; $i < $empty_tabs_in_front ; $i ++){
$row[] = array("string"=>" ", "attach" => "style='text-align:center;width:20px;'");
}
}
- $row[]=$field1=array("string"=>"<img src='images/lists/folder".$non_empty.".png' alt='department'>","attach"=>"style='text-align:center;width:20px;'");
- $row[]=$field2=array("string"=>sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''");
+ /* Create entry name
+ */
+ $name = $val['ou'][0];
+ if(isset($val['description'])){
+ $name .= " - [".$val["description"][0]."]";
+ }
+
+ /* Add departments
+ */
+ $row[]=$field1=array("string"=> $img,"attach"=>"style='text-align:center;width:20px;'");
+ $row[]=$field2=array("string"=>sprintf($linkopen,$key,$name), "attach" => "style=''");
+ /* Add spacer tabs
+ */
if($numtabs > 2){
for($i = 2 ; $i < $numtabs;$i++){
if(isset( $this->array_Header[$i + $empty_tabs_in_front]['attach'])){
}
}
+
+ function create_department_list($modules)
+ {
+ /* Load possible departments */
+ $ui= get_userinfo();
+ $first = "";
+ $found = FALSE;
+
+ if(!is_array($modules)){
+ $modules = array($modules);
+ }
+
+ $department = $departments = array();
+ $ids = $this->config->idepartments;
+ foreach($modules as $module){
+ $d = $ui->get_module_departments($module);
+
+ foreach($ids as $department => $desc){
+ if(in_array($department,$d)){
+ $departments[$department] = $department;
+ }
+ }
+ }
+
+ $first = "";
+ $found = FALSE;
+ $options ="";
+ foreach($departments as $dep => $name){
+
+ /* Keep first base dn in mind, we could need this
+ * info if no valid base was found
+ */
+ if(empty($first)) {
+ $first = $dep['dn'];
+ }
+
+ $value = $ids[$dep];
+ if ($this->selectedBase == $dep){
+ $found = TRUE;
+ $options.= "<option selected='selected' value='".$dep."'>$value</option>";
+ } else {
+ $options.= "<option value='".$dep."'>$value</option>";
+ }
+ }
+
+ /* The currently used base is not visible with your acl setup.
+ * Set base to first useable base.
+ */
+ if(!$found){
+ $this->selectedBase = $first;
+ }
+
+ return($options);
+ }
+
function set_List_Bottom_Info($str)
{
$this->List_Bottom_Info = $str;