X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_MultiSelectWindow.inc;h=a98004cedfd15a298497412d85422d838906a140;hb=faf9cabfa60510b6cccc9a6a2719856c85d9f3a2;hp=adcb53ef3792ed2b0729d8642928ffdc28c60d70;hpb=5c175d7d7d49a74eadb375979bc60dac021a69c2;p=gosa.git diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc index adcb53ef3..a98004ced 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'); @@ -211,7 +221,7 @@ class MultiSelectWindow{ /* Return default header part. With back, home and root icons and department selection */ - function get_default_header() + function get_default_header($seperator= TRUE) { $enable_back = TRUE; $enable_root = TRUE; @@ -260,9 +270,10 @@ class MultiSelectWindow{ /* And at least draw reload button, this button is enabled everytime */ $listhead .= "  ". - " - "; - + title='"._("Reload list")."' name='submit_department' alt='"._("Submit")."'> "; + if ($seperator){ + $listhead.= " - "; + } return ($listhead); } @@ -363,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()); } @@ -402,9 +413,9 @@ class MultiSelectWindow{ /* Check if box is checked */ if($box['default'] == true){ - $boxes .=" ".$box['string']."
"; + $boxes .=" ".$box['string']."
"; }else{ - $boxes .=" ".$box['string']."
"; + $boxes .=" ".$box['string']."
"; } } $smarty->assign("CheckBoxes", $boxes); @@ -422,7 +433,7 @@ class MultiSelectWindow{ + value=\"".htmlspecialchars($regex['value'])."\" title=\"".htmlspecialchars($regex['string'])."\"> "; @@ -446,18 +457,19 @@ 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()); $smarty->assign("DivList" , $divlist->DrawList()."\n\n\n\n\n".$this->footer."\n\n\n\n\n"); if($this->is_headpage){ - $smarty->assign("tree_image", get_template_path('images/tree.png')); + $smarty->assign("tree_image", get_template_path('images/lists/search-subtree.png')); $smarty->assign("infoimage", get_template_path('images/info.png')); $smarty->assign("launchimage", get_template_path('images/launch.png')); $smarty->assign("apply", apply_filter()); }else{ - $smarty->assign("tree_image", get_template_path('images/tree.png')); + $smarty->assign("tree_image", get_template_path('images/lists/search-subtree.png')); $smarty->assign("infoimage", get_template_path('images/info_small.png')); $smarty->assign("launchimage", get_template_path('images/rocket.png')); $smarty->assign("apply", apply_filter()); @@ -492,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; @@ -524,11 +544,12 @@ class MultiSelectWindow{ /* 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']; } } @@ -541,28 +562,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])){ @@ -631,57 +643,10 @@ class MultiSelectWindow{ } } } - } - - /* Create header snapshot value */ - function get_snapshot_header($layer_menu = FALSE) - { - $str = ""; - if($this->parent->snapshotEnabled()){ - $ok = false; - foreach($this->parent->get_used_snapshot_bases() as $base){ - $ok |= count($this->parent->getAllDeletedSnapshots($base)) >= 1 ; - } - if($ok){ - if($layer_menu){ - $str = "..|"._("Restore")." "._("Restore")."|RestoreDeletedSnapShot|\n"; - }else{ - $str = " "; - } - }else{ - if($layer_menu){ - $str = "..| "._("Restore")."||\n"; - }else{ - $str = " "; - } - } -# $str .= " "; - } - return($str); - } - - - function GetSnapShotActions($dn) - { - $str= ""; - if($this->parent->snapshotEnabled()){ - - if(count($this->parent->Available_SnapsShots($dn))){ - $str.= " "; - } else { - $str = " "; - } - - $str.= " "; - } - - return($str); - } + /* Save currenlty selected base in session */ + session::set("CurrentMainBase",$this->selectedBase); + } /* this function adds the sub-departments of the current tree to the list */ @@ -692,10 +657,7 @@ class MultiSelectWindow{ /* 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*/ @@ -707,59 +669,77 @@ class MultiSelectWindow{ /* 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 = "%s"; + $linkopen = "%s"; /* Create an array with all visible (in the list) 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']); - } - } - natcasesort($this->departments); + $types = departmentManagement::get_support_departments(); + + + /* Create search filter + */ + $this->departments = array(); + foreach($types as $name => $data){ + $filter = "(&(objectClass=gosaDepartment)(objectClass=".$data['OC'].") + (".$data['ATTR']."=".$this->base_selection_regex."))"; + $tmp = get_list($filter,"department/".$data['ACL'],$this->selectedBase,array($data['ATTR'],"description"),GL_NONE); + foreach($tmp as $attrs){ + $attrs['NAME'] = $attrs[$data['ATTR']][0]; + $attrs['TYPE'] = $data; + $name = $attrs['NAME']." -".$attrs['dn']; + $this->departments[$name] = $attrs; + } + } + 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 = ""; + /* 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"=>"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['NAME']; + 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'])){ @@ -774,6 +754,61 @@ class MultiSelectWindow{ } } + + 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.= ""; + } 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;