X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_MultiSelectWindow.inc;h=08e47a82fcdb1cd5730357d2172e513abb0b300d;hb=e79b3cdfb979fd270d2fd1a53d2991f1ec4df5ec;hp=e32eb158cb00390dd1ff911032af806a121030cf;hpb=02bd61f90052ba951b0824e09456d9d9587274ec;p=gosa.git diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc index e32eb158c..08e47a82f 100644 --- a/gosa-core/include/class_MultiSelectWindow.inc +++ b/gosa-core/include/class_MultiSelectWindow.inc @@ -1,4 +1,24 @@ setImgwww("./images/"); $mid->setIcondir("./images/"); - $mid->setDirroot("../include/php_layers_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'); $mid->setMenuStructureString($this->string_ListDropDown); @@ -114,7 +135,7 @@ class MultiSelectWindow{ $this->CloseButtonString = _("Close"); $this->filterName = $filterName; $this->ui = get_userinfo(); - $this->selectedBase = $_SESSION['CurrentMainBase']; + $this->selectedBase = session::get('CurrentMainBase'); /* Check default values for SaveAdditionalVars */ $MultiDialogFilters = session::get('MultiDialogFilters'); @@ -190,7 +211,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; @@ -215,33 +236,34 @@ class MultiSelectWindow{ /* Draw root button */ if($enable_root){ - $listhead .= "  "; }else{ - $listhead .= " "._("Root")." "; + $listhead .= " "._("Root")." "; } /* Draw back button */ if($enable_back){ - $listhead .= "  "; }else{ - $listhead .= " "._("Up")." "; + $listhead .= " "._("Up")." "; } /* Draw home button */ if($enable_home){ - $listhead .= "  "; }else{ - $listhead .= " "._("Home")." "; + $listhead .= " "._("Home")." "; } /* And at least draw reload button, this button is enabled everytime */ - $listhead .= "  ". - " - "; - + $listhead .= "  "; + if ($seperator){ + $listhead.= " - "; + } return ($listhead); } @@ -291,6 +313,12 @@ class MultiSelectWindow{ return($this->is_closed); } + + function SetListFooter($str){ + $this->footer = $str; + } + + /* Enable the close button */ function EnableCloseButton($bool) { @@ -375,9 +403,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); @@ -395,7 +423,7 @@ class MultiSelectWindow{ + value=\"".htmlspecialchars($regex['value'])."\" title=\"".htmlspecialchars($regex['string'])."\"> "; @@ -422,16 +450,15 @@ class MultiSelectWindow{ /* Check for exeeded sizelimit */ $smarty->assign("hint" , print_sizelimit_warning()); - $smarty->assign("DivList" , $divlist->DrawList()); - + $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()); @@ -498,11 +525,11 @@ 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])){ - print_red(_("Error: The requested subtree has an inconsistent DN encoding, check your LDAP!")); + $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']; } } @@ -520,7 +547,7 @@ class MultiSelectWindow{ if($s_action=="back"){ /* Get parent deprtment and check if we are allowed to step in it */ - $base_back= preg_replace("/^[^,]+,/", "", $_SESSION['CurrentMainBase']); + $base_back= preg_replace("/^[^,]+,/", "", session::get('CurrentMainBase')); $dep_id = $this->ui->get_module_departments($this->module); if(in_array_ics($base_back,$dep_id)){ @@ -541,14 +568,16 @@ class MultiSelectWindow{ if(isset($_POST['MultiSelectWindow'.$this->filterName])){ /* Save some additional vars */ + $MultiDialogFilters = session::get('MultiDialogFilters'); foreach($this->SaveAdditionalVars as $name){ if(isset($_POST[$name])){ if(isset($this->$name)){ $this->$name = $_POST[$name]; - $_SESSION['MultiDialogFilters'][$this->filterName][$name] = $_POST[$name]; + $MultiDialogFilters[$this->filterName][$name] = $_POST[$name]; } } } + session::set('MultiDialogFilters',$MultiDialogFilters); /* Check posts from checkboxes */ @@ -560,15 +589,20 @@ class MultiSelectWindow{ $this->array_Checkboxes[$key]['default'] = false; $this->$box['name'] = false; } + /* Save settings in out session */ - $_SESSION['MultiDialogFilters'][$this->filterName][$box['name']] = $this->$box['name']; + $MultiDialogFilters = session::get('MultiDialogFilters'); + $MultiDialogFilters[$this->filterName][$box['name']] = $this->$box['name']; + session::set('MultiDialogFilters',$MultiDialogFilters); } /* Check regex posts */ foreach($this->array_Regexes as $key => $box){ $this->array_Regexes[$key]['value'] = $_POST[$box['name']]; $this->$box['name'] = $_POST[$box['name']]; - $_SESSION['MultiDialogFilters'][$this->filterName][$box['name']] = $this->$box['name']; + $MultiDialogFilters = session::get('MultiDialogFilters'); + $MultiDialogFilters[$this->filterName][$box['name']] = $this->$box['name']; + session::set('MultiDialogFilters',$MultiDialogFilters); } /* call close/save if buttons are pressed */ @@ -592,63 +626,15 @@ class MultiSelectWindow{ $val = preg_replace("/\*\**/","*",$val); $this->array_Regexes[$key]['value'] = $val; $this->$box['name'] = $val; - $_SESSION['MultiDialogFilters'][$this->filterName][$box['name']] = $val; + $MultiDialogFilters = session::get('MultiDialogFilters'); + $MultiDialogFilters[$this->filterName][$box['name']] = $val; + session::set('MultiDialogFilters',$MultiDialogFilters); } } } } - /* 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); - } - - /* this function adds the sub-departments of the current tree to the list */ function AddDepartments($base = false,$numtabs = 3,$empty_tabs_in_front = 0) { @@ -660,7 +646,7 @@ class MultiSelectWindow{ if(!session::is_set('CurrentMainBase')){ session::set('CurrentMainBase',$this->config->current['BASE']); } - $base = $_SESSION['CurrentMainBase']; + $base = session::get('CurrentMainBase'); } /* Create ldap obj and switch into base*/ @@ -672,7 +658,7 @@ 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"), GL_SIZELIMIT ); /* Edit delete link for system types */ @@ -681,50 +667,49 @@ class MultiSelectWindow{ /* 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']); - } + $name = $value['ou'][0]." -".$value['dn']; + $this->departments[$name]= $value; } - natcasesort($this->departments); - - - if($empty_tabs_in_front){ -# $numtabs -= $empty_tabs_in_front; - } + uksort($this->departments, 'strnatcasecmp'); + $this->departments = array_values($this->departments); /* 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)]=""; - } - - /* 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 + */ + $non_empty=""; + foreach($this->config->departments as $keyd){ + if(preg_match("/,".normalizePreg($val['dn'])."$/",$keyd)){ + $non_empty="-full"; + } + } - /* Add to divlist */ + /* 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['ou'][0]; + 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=''"); + /* Add spacer tabs + */ if($numtabs > 2){ for($i = 2 ; $i < $numtabs;$i++){ if(isset( $this->array_Header[$i + $empty_tabs_in_front]['attach'])){