X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fclass_MultiSelectWindow.inc;h=18d1558d46a595ba4d086b4f5d4181fbde5126a3;hb=b81f51cb52430b93fd61792dbe704ef02d33f8d3;hp=c1faef3600058bae7d03ef429d015b294b214662;hpb=27ee4fd22dd98b154c19ded281e08a275d0f7ebe;p=gosa.git
diff --git a/include/class_MultiSelectWindow.inc b/include/class_MultiSelectWindow.inc
index c1faef360..18d1558d4 100644
--- a/include/class_MultiSelectWindow.inc
+++ b/include/class_MultiSelectWindow.inc
@@ -154,6 +154,64 @@ class MultiSelectWindow{
$this->array_Elements[] = $arr;
}
+
+ /* Return default header part. With back, home and root icons and department selection */
+ function get_default_header()
+ {
+ $enable_back = TRUE;
+ $enable_root = TRUE;
+ $enable_home = TRUE;
+
+ $ui = get_userinfo();
+
+ /* Check if selectedBase = first available base */
+ $deps = $ui->get_module_departments($this->module);
+
+ if(!count($deps) || $deps[0] == $this->selectedBase){
+ $enable_back = FALSE;
+ $enable_root = FALSE;
+ }
+
+ /* Check if we are in users home department */
+ if(!count($deps) ||$this->selectedBase == get_base_from_people($ui->dn)){
+ $enable_home = FALSE;
+ }
+
+ /* Create header with selected base */
+ $listhead = "
";
+
+ /* Draw root button */
+ if($enable_root){
+ $listhead .= "
";
+ }else{
+ $listhead .= "
";
+ }
+
+ /* Draw back button */
+ if($enable_back){
+ $listhead .= "
";
+ }else{
+ $listhead .= "
";
+ }
+
+ /* Draw home button */
+ if($enable_home){
+ $listhead .= "
";
+ }else{
+ $listhead .= "
";
+ }
+
+ /* And at least draw reload button, this button is enabled everytime */
+ $listhead .= "
".
+ "
";
+
+ return ($listhead);
+ }
+
/* Add a checkbox to the filter element,
the name specifies an existing class var to store the 'selection' */
function AddCheckBox($name,$value="Unset",$string="Unset",$default=false)
@@ -273,9 +331,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);
@@ -292,8 +350,8 @@ class MultiSelectWindow{
-
+
|
";
@@ -406,25 +464,30 @@ class MultiSelectWindow{
/* back to the roots ^^ */
if($s_action=="root"){
$this->selectedBase=($this->config->current['BASE']);
- }
+ $dep_id = $this->ui->get_module_departments($this->module);
+ $this->selectedBase = $dep_id[key($dep_id)];
+ }
- /* If Back-button is pressed, move back one step in DN */
- if($s_action=="back"){
- //FIXME: This is not 100% correct. We'll only display ou's, but there may be
- // a step between. You'll stumble in a "hidden" department in this case.
- $base_back= preg_replace("/^[^,]+,/", "", $_SESSION['CurrentMainBase']);
+ /* If Back-button is pressed, move back one step in DN */
+ if($s_action=="back"){
- /* 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));
+ /* Get parent deprtment and check if we are allowed to step in it */
+ $base_back= preg_replace("/^[^,]+,/", "", $_SESSION['CurrentMainBase']);
+ $dep_id = $this->ui->get_module_departments($this->module);
+ if(in_array_ics($base_back,$dep_id)){
- /* 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['/'];
- }
+ /* 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['/'];
+ }
+ }
}
$_SESSION['CurrentMainBase'] = $this->selectedBase;
}
@@ -504,10 +567,10 @@ class MultiSelectWindow{
title='"._("Restore snapshopts of already deleted objects")."'
alt='"._("Restore")."' name='RestoreDeletedSnapShot'> ";
}else{
- $str = "
";
+ $str = "
";
}
- $str .= "
";
+# $str .= "
";
}
return($str);
}
@@ -522,7 +585,7 @@ class MultiSelectWindow{
$str.= "
";
} else {
- $str = "
";
+ $str = "
";
}
$str.= "
DepartmentsAdded = true;
@@ -572,8 +635,14 @@ class MultiSelectWindow{
}
natcasesort($this->departments);
+
+ if($empty_tabs_in_front){
+# $numtabs -= $empty_tabs_in_front;
+ }
+
/* 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)]="";
@@ -592,19 +661,25 @@ class MultiSelectWindow{
/* Add 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"=>"
","attach"=>"style='text-align:center;width:20px;'");
$row[]=$field2=array("string"=>sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''");
if($numtabs > 2){
- for($i = 2 ; $i <$numtabs;$i++){
- if(isset( $this->array_Header[$i]['attach'])){
- $row[] = array("string"=>" ","attach" => $this->array_Header[$i]['attach']);
+ for($i = 2 ; $i < $numtabs;$i++){
+ if(isset( $this->array_Header[$i + $empty_tabs_in_front]['attach'])){
+ $row[] = array("string"=>" ","attach" => $this->array_Header[$i + $empty_tabs_in_front]['attach']);
}else{
$row[] = array("string"=>" ");
}
}
}
-
$this->AddElement($row);
}
}