X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_MultiSelectWindow.inc;h=9c9bd5071763836acd638b6201d0f0a983b95fd5;hb=37a863af6c001e5760070adb1d74dc77e4df61f9;hp=08e47a82fcdb1cd5730357d2172e513abb0b300d;hpb=e79b3cdfb979fd270d2fd1a53d2991f1ec4df5ec;p=gosa.git diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc index 08e47a82f..9c9bd5071 100644 --- a/gosa-core/include/class_MultiSelectWindow.inc +++ b/gosa-core/include/class_MultiSelectWindow.inc @@ -33,7 +33,7 @@ class MultiSelectWindow{ var $string_Title = ""; var $string_ListHeader = ""; - var $string_ListDropDown= ""; + var $string_ListDropDown= ""; var $string_Summary = ""; var $string_Information = ""; @@ -48,9 +48,11 @@ class MultiSelectWindow{ 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 = ""; + var $departments= array(); + var $DivHeight = ""; var $HideFilterPart = false; @@ -58,11 +60,19 @@ class MultiSelectWindow{ var $SaveAdditionalVars = array(); // Additional Post vars to store var $module= ""; + var $base_selection_regex = "*"; + var $IgnoreAccount = TRUE; var $footer = ""; + var $post_id = "1 2 3"; 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(); } @@ -108,8 +118,8 @@ class MultiSelectWindow{ { if(!empty($this->string_ListDropDown)){ $mid = new LayersMenu(6, 7, 2, 1); - $mid->setImgwww("./images/"); - $mid->setIcondir("./images/"); + $mid->setImgwww("./images/layer_menu/"); + $mid->setIcondir("./images/layer_menu/"); $mid->setDirroot("../include/utils/layer-menu/"); $mid->setHorizontalMenuTpl("../ihtml/".get_template_path("",FALSE).'GOsa_MultiSelectHeader.ihtml'); $mid->setSubMenuTpl("../ihtml/".get_template_path("",FALSE).'GOsa_MultiSelectHeaderSubEntry.ihtml'); @@ -135,7 +145,7 @@ class MultiSelectWindow{ $this->CloseButtonString = _("Close"); $this->filterName = $filterName; $this->ui = get_userinfo(); - $this->selectedBase = session::get('CurrentMainBase'); + $this->post_id = preg_replace("/[^0-9]/","",microtime(TRUE)); /* Check default values for SaveAdditionalVars */ $MultiDialogFilters = session::get('MultiDialogFilters'); @@ -364,7 +374,7 @@ class MultiSelectWindow{ $divlist->SetEntriesPerPage(0); // 0 for scrollable list /* Display list footer with summary of all listed entries */ - if(isset($this->config->data['MAIN']['LIST_SUMMARY']) && preg_match("/true/i",$this->config->data['MAIN']['LIST_SUMMARY'])){ + if ($this->config->get_cfg_value("listSummary") == "true"){ $divlist->SetFooter($this->get_List_Bottom_Info()); } @@ -447,6 +457,7 @@ class MultiSelectWindow{ $smarty->assign("Title" , $this->string_Title); $smarty->assign("Information" , $this->string_Information); $smarty->assign("IgnoreAccount" , $this->IgnoreAccount); + $smarty->assign("POST_ID", $this->post_id); /* Check for exeeded sizelimit */ $smarty->assign("hint" , print_sizelimit_warning()); @@ -493,6 +504,14 @@ class MultiSelectWindow{ Store data also into a session var, to keep the checkboxes check after reload */ function save_object() { + + /* Ensure that we do not handle posts for other dialogs + */ + if((isset($_POST['POST_ID']) && $_POST['POST_ID'] != $this->post_id) || + (isset($_GET['post_id']) && $_GET['post_id'] != $this->post_id)){ + return; + } + /* Get up to date config */ if(isset($this->parent->config)){ $this->config = $this->parent->config; @@ -510,9 +529,12 @@ class MultiSelectWindow{ } } - /* Save base selection from headpage selectbox*/ + /* Save base selection from headpage selectbox */ if(isset($_POST['CurrentMainBase'])){ - $this->selectedBase = $_POST['CurrentMainBase']; + $this->selectedBase = get_post('CurrentMainBase'); + session::global_set("CurrentMainBase", $this->selectedBase); + } else { + $this->selectedBase= session::global_get("CurrentMainBase"); } /* Homebutton is posted */ @@ -527,6 +549,7 @@ class MultiSelectWindow{ if(isset($_GET['act'])&& ($_GET['act'] == "dep_open")){ $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->departments[$s_entry]['dn']; @@ -542,28 +565,19 @@ class MultiSelectWindow{ } } - /* If Back-button is pressed, move back one step in DN */ if($s_action=="back"){ + /* Get parent deprtment and check if we are allowed to step in it */ - $base_back= preg_replace("/^[^,]+,/", "", session::get('CurrentMainBase')); + $base_back= preg_replace("/^[^,]+,/", "", $this->selectedBase); $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; } } } - session::set('CurrentMainBase',$this->selectedBase); if(isset($_POST['MultiSelectWindow'.$this->filterName])){ @@ -632,6 +646,9 @@ class MultiSelectWindow{ } } } + + /* Save currenlty selected base in session */ + session::global_set("CurrentMainBase",$this->selectedBase); } @@ -640,51 +657,60 @@ class MultiSelectWindow{ { $this->DepartmentsAdded = true; $this->Added_Departments = array(); + $this->departments = array(); + + if(isset($this->Regex)){ + $this->base_selection_regex = $this->Regex; + } + + $linkopen = "%s"; + $types = departmentManagement::get_support_departments(); + $ui = get_userinfo(); + $module_deps = $ui->get_module_departments($this->module); + $found_deps = array(); /* check for a valid base */ if(!$base){ - if(!session::is_set('CurrentMainBase')){ - session::set('CurrentMainBase',$this->config->current['BASE']); - } - $base = session::get('CurrentMainBase'); + $base = $this->selectedBase; } /* Create ldap obj and switch into base*/ $ldap = $this->config->get_ldap_link(); $ldap->cd($base); - /* reset current deps */ - $this->departments = array(); - /* Get all departments within this subtree */ - $deps= get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base, - array("ou", "description"), GL_SIZELIMIT ); - - /* Edit delete link for system types - */ - $linkopen = "%s"; - - /* Create an array with all visible (in the list) departments */ - $departments = array(); - foreach($deps as $value){ - $name = $value['ou'][0]." -".$value['dn']; - $this->departments[$name]= $value; - } - uksort($this->departments, 'strnatcasecmp'); - $this->departments = array_values($this->departments); - - /* Add deps to this dialog object list */ - foreach($this->departments as $key=> $val){ + $s_filter = ""; + $s_attrs = array("description","objectClass"); + $s_acls = $this->module; + foreach($types as $name => $data){ + $s_filter.= "(&(objectClass=gosaDepartment)(objectClass=".$data['OC'].")(".$data['ATTR']."=".$this->base_selection_regex."))"; + $s_attrs[]= $data['ATTR']; + } - /* Check if this department contains sub-departments - Display different image in this case - */ - $non_empty=""; - foreach($this->config->departments as $keyd){ - if(preg_match("/,".normalizePreg($val['dn'])."$/",$keyd)){ - $non_empty="-full"; + $tmp = get_list("(|".$s_filter.")",$s_acls,$this->selectedBase,$s_attrs,GL_NONE); + foreach($tmp as $attrs){ + foreach($types as $name => $data){ + if(in_array($data['OC'],$attrs['objectClass']) && isset($attrs[$data['ATTR']][0])){ + $attrs['NAME'] = $attrs[$data['ATTR']][0]; + $attrs['TYPE'] = $data; + $name = $attrs['NAME']." ".$attrs['dn']; + $departments[$name] = $attrs; + $found_deps[$name] = $attrs['dn']; + break; } } + } + + /* Detect allowed departments + */ + $deps = array_intersect($found_deps,$module_deps); + uksort($deps, 'strnatcasecmp'); + $key = 0; + foreach($deps as $name => $dn){ + $key ++; + $val = $departments[$name]; + $this->departments[$key] = $val; + $img = ""; /* Add spacer cols to divlist */ @@ -697,16 +723,15 @@ class MultiSelectWindow{ /* Create entry name */ - $name = $val['ou'][0]; + $name = $val['NAME']; if(isset($val['description'])){ $name .= " - [".$val["description"][0]."]"; } /* Add departments */ - $img = "department"; - $row[]=$field1=array("string"=> $img,"attach"=>"style='text-align:center;width:20px;'"); - $row[]=$field2=array("string"=>sprintf($linkopen,$key,$name), "attach" => "style=''"); + $row[]=array("string"=> $img,"attach"=>"style='text-align:center;width:20px;'"); + $row[]=array("string"=>sprintf($linkopen,$key,$name), "attach" => "style=''"); /* Add spacer tabs */ @@ -724,6 +749,52 @@ class MultiSelectWindow{ } } + + function create_department_list($modules) + { + $departments = array(); + $ui= get_userinfo(); + $first = ""; + $found = FALSE; + $options =""; + + $ids = $this->config->idepartments; + $d = $ui->get_module_departments($modules); + $k_ids = array_keys($ids); + $deps = array_intersect($d,$k_ids); + foreach($k_ids as $department){ + $departments[$department] = $ids[$department]; + } + + foreach($departments as $value => $name){ + + /* Keep first base dn in mind, we could need this + * info if no valid base was found + */ + if(empty($first)) { + $first = $value; + } + + + $v_value = htmlentities($value,ENT_QUOTES); + if ($this->selectedBase == $value){ + $found = TRUE; + $options.= ""; + } else { + $options.= ""; + } + } + + /* 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;