Added picture

[gosa.git] / include / class_MultiSelectWindow.inc

diff --git a/include/class_MultiSelectWindow.inc b/include/class_MultiSelectWindow.inc
index 7bea177b2cb02bf816c0d8a1d9c4f7701d3939a0..542d8c18c8fab59debc3d8410f1ea8651cd3928c 100644 (file)
--- a/include/class_MultiSelectWindow.inc
+++ b/include/class_MultiSelectWindow.inc
@@ -9,29 +9,27 @@ class MultiSelectWindow{
        var $bool_DisplaySaveButton = true;     
 
        var $SaveButtonString           = "";
-       var $CloseButtonString          = "";
+       var $CloseButtonString  = "";
 
-       var $string_Title                       = "";
-       var $string_ListHeader          = "";
+       var $string_Title                         = "";
+       var $string_ListHeader  = "";
        var $string_Summary                     = "";
-       var $string_Information         = "";
+       var $string_Information = "";
 
-       var $array_Header                       = array();
+       var $array_Header                         = array();
        var $array_Elements                     = array();      
        var $array_Checkboxes           = array();      
        var $array_Regexes                      = array();      
 
-       var $config                                     = array("");
-
-       var $is_closed                          = false;
-       var $is_saved                           = false;
-
-       var $is_headpage                        = false;        // if true the design changes
-
-       var $filterName                         = "Liste";
-
+       var $config                                         = array("");
+       var $is_closed                            = false;
+       var $is_saved                               = false;
+       var $is_headpage                          = false;      // if true the design changes
+       var $filterName                           = "Liste";
        var $DepartmentsAdded           = false;
-       var $selectedBase               = "";
+       var $selectedBase       = "";
+
+  var $SaveAdditionalVars = array();  // Additional Post vars to store 
 
 
        function ClearElementsList()
@@ -69,11 +67,21 @@ class MultiSelectWindow{
                $this->CloseButtonString        = _("Close");
                $this->filterName                       = $filterName;
 
-               /* Set default base */
+               /* Set default base, to users base  */
+    $ui   = get_userinfo();
+    $base = get_base_from_people($ui->dn);
                if(!isset($_SESSION['CurrentMainBase'])){
-                       $_SESSION['CurrentMainBase'] = $this->config->current['BASE'];
+                       $_SESSION['CurrentMainBase'] = $base;
                }
                $this->selectedBase = $_SESSION['CurrentMainBase'];
+
+    /* Check default values for SaveAdditionalVars */
+    foreach($this->SaveAdditionalVars as $name){
+      if(isset($_SESSION['MultiDialogFilters'][$this->filterName][$name])){
+        $this->$name = $_SESSION['MultiDialogFilters'][$this->filterName][$name];
+      }
+    }
+    
        }
 
        /* Enables the headpage mode, which changes the list look */
@@ -153,18 +161,19 @@ class MultiSelectWindow{
                                $arr['default'] = $_SESSION['MultiDialogFilters'][$this->filterName][$name];
                                $this->$name = $arr['default'];
                        }else{
-                               $arr['default'] = $default;
+                               $arr['default'] = $default; 
+        $this->$name = $default;
                        }
                        $arr['name']          = $name;
                        $arr['string']      = $string;
                        $arr['value']         = $value;
                        $arr['enabled']     = true;
 
-      $this->$name = $default;
                }
                $this->array_Checkboxes[] = $arr;
        }
 
+
        /* Hides or unhides the checkbox with the given name */
        function DisableCheckBox($name,$HideShow = false)
        {
@@ -176,7 +185,6 @@ class MultiSelectWindow{
        }
 
 
-
        /* Returns true if the close button was pressed */
        function isClosed()
        {
@@ -364,7 +372,11 @@ class MultiSelectWindow{
                           this is posted by the parent class MultiSelectWindow */
                        if(isset($_GET['act'])&& ($_GET['act'] == "dep_open")){
                                $s_entry = base64_decode($_GET['dep_id']);
-                               $this->selectedBase = $this->config->departments[trim($s_entry)];
+        if (!isset($this->config->departments[$s_entry])){
+          print_red(_("Error: The requested subtree has an inconsistent DN encoding, check your LDAP!"));
+        } else {
+                               $this->selectedBase = $this->config->departments[$s_entry];
+        }
                        }
 
                        /* back to the roots ^^ */
@@ -395,6 +407,16 @@ class MultiSelectWindow{
 
                if(isset($_POST['MultiSelectWindow'.$this->filterName])){
 
+      /* Save some additional vars */
+      foreach($this->SaveAdditionalVars as $name){
+        if(isset($_POST[$name])){
+          if(isset($this->$name)){
+            $this->$name = $_POST[$name];
+            $_SESSION['MultiDialogFilters'][$this->filterName][$name] = $_POST[$name];
+          }
+        }
+      }
+
                        /* Check posts from checkboxes 
                         */
                        foreach($this->array_Checkboxes as $key => $box){
@@ -500,19 +522,18 @@ class MultiSelectWindow{
                                }
                        }
 
-
                        /* Add to divlist */
                        $row = array();
-                       $row[] = $field1 = array("string" => "<img src='images/".$non_empty."folder.png' alt='department'>", "attach" => "style='text-align:center;width:20px;'");
-                       $row[] = $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''");
+                       $row[]=$field1=array("string"=>"<img src='images/".$non_empty."folder.png' alt='department'>","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($i ==($numtabs-1)){
-                                               $row[] = array("string"=>"&nbsp;","attach" => "style='width:60px;border-right:0px;text-align:right;'");
-                                       }else{
-                                               $row[] = array("string"=>"&nbsp;");
-                                       }
+          if(isset( $this->array_Header[$i]['attach'])){
+            $row[] = array("string"=>"&nbsp;","attach" => $this->array_Header[$i]['attach']);
+          }else{
+            $row[] = array("string"=>"&nbsp;");
+          }
                                }
                        }