X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fclass_MultiSelectWindow.inc;h=c344e537e7961cbeda8c7fc44c8fcf49ce63d75f;hb=fb38340768fa2e1acda91cc51b692da05d2d6295;hp=105f6ab7d709ef3d9b93314ddf7f967150f21214;hpb=8d25a981707ac7e708aca0ed6216c5379a1228f8;p=gosa.git

diff --git a/include/class_MultiSelectWindow.inc b/include/class_MultiSelectWindow.inc
index 105f6ab7d..c344e537e 100644
--- a/include/class_MultiSelectWindow.inc
+++ b/include/class_MultiSelectWindow.inc
@@ -27,12 +27,13 @@ class MultiSelectWindow{
 	var $is_headpage			  = false;	// if true the design changes
 	var $filterName				  = "Liste";
 	var $DepartmentsAdded		= false;
+  var $Added_Departments  = array();
 	var $selectedBase       = "";
 
   var $DivHeight          = "";
 
   var $HideFilterPart     = false;
-
+  var $List_Bottom_Info   = "";
   var $SaveAdditionalVars = array();  // Additional Post vars to store 
 
 	function ClearElementsList()
@@ -154,11 +155,11 @@ class MultiSelectWindow{
 	}
 
 
-  function get_default_header()
+  function get_default_header($navigation= TRUE)
   {
-    $enable_back = TRUE;
-    $enable_root = TRUE;
-    $enable_home = TRUE;
+    $enable_back = $navigation;
+    $enable_root = $navigation;
+    $enable_home = $navigation;
 
     $ui = get_userinfo();
 
@@ -297,7 +298,12 @@ class MultiSelectWindow{
 
 		$divlist = new divlist($this->string_Title);
 		$divlist->SetSummary($this->string_Summary);
-		$divlist->SetEntriesPerPage(0); // 0 for scrollable list 
+		$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'])){
+      $divlist->SetFooter($this->get_List_Bottom_Info());
+    }
   
     if($this->DivHeight != ""){
       $divlist->SetHeight($this->DivHeight);
@@ -353,7 +359,7 @@ class MultiSelectWindow{
 				</label>
 				</td>
 				<td width=\"99%\">
-				<input type='text' style='width:99%' name='".$regex['name']."' maxlength='20'
+				<input id='".$regex['name']."' type='text' style='width:99%' name='".$regex['name']."' maxlength='20'
 				value='".$regex['value']."' title=\"".$regex['string']."\"> 
 				</td>
 				</tr>
@@ -423,67 +429,65 @@ class MultiSelectWindow{
 	   Store data also into a session var, to keep the checkboxes check after reload  */
 	function save_object()
 	{
-		/* Update current base */
-		if($this->DepartmentsAdded){
-			$s_action ="";
-			foreach($_POST as $key => $value){
-				if(preg_match("/^dep_back.*/i",$key)){
-					$s_action="back";
-				}elseif(preg_match("/^dep_root.*/",$key)){
-					$s_action="root";
-				}elseif(preg_match("/^dep_home.*/i",$key)){
-					$s_action="home";
-				}
-			}
+    /* Save base selection from headpage selectbox*/
+    if(isset($_POST['CurrentMainBase'])){
+      $this->selectedBase = $_POST['CurrentMainBase'];
+    }
 
-			/* Save base selection from headpage selectbox*/
-			if(isset($_POST['CurrentMainBase'])){
-				$this->selectedBase = $_POST['CurrentMainBase'];
-			}
+    /* Update current base */
+    $s_action ="";
+    foreach($_POST as $key => $value){
+      if(preg_match("/^dep_back.*/i",$key)){
+        $s_action="back";
+      }elseif(preg_match("/^dep_root.*/",$key)){
+        $s_action="root";
+      }elseif(preg_match("/^dep_home.*/i",$key)){
+        $s_action="home";
+      }
+    }
 
-			/* Homebutton is posted */
-			if($s_action=="home"){
-        $ui= get_userinfo();
-        $base = get_base_from_people($ui->dn);
-				$this->selectedBase= $base;
-			}
+    /* Homebutton is posted */
+    if($s_action=="home"){
+      $ui= get_userinfo();
+      $base = get_base_from_people($ui->dn);
+      $this->selectedBase= $base;
+    }
 
-			/* 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!"));
-        } else {
-  				$this->selectedBase = $this->config->departments[$s_entry];
-        }
-			}
+    /* 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!"));
+      } else {
+        $this->selectedBase = $this->config->departments[$s_entry];
+      }
+    }
 
-			/* back to the roots ^^ */
-			if($s_action=="root"){
-				$this->selectedBase=($this->config->current['BASE']);
-			}
+    /* back to the roots ^^ */
+    if($s_action=="root"){
+      $this->selectedBase=($this->config->current['BASE']);
+    }
 
 
-			/* 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"){
+      //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']);
 
-				/* 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));
+      /* 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;
-		}
+      /* 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;
 
 		if(isset($_POST['MultiSelectWindow'.$this->filterName])){
 
@@ -550,6 +554,7 @@ class MultiSelectWindow{
 	function AddDepartments($base = false,$numtabs = 3)
 	{
 		$this->DepartmentsAdded = true;
+    $this->Added_Departments = array();
 
 		/* check for a valid base */
 		if(!$base){
@@ -619,8 +624,19 @@ class MultiSelectWindow{
 			}
 
 			$this->AddElement($row);
+      $this->Added_Departments[] = $row;
 		}
 	}
+
+  function set_List_Bottom_Info($str)
+  {
+    $this->List_Bottom_Info = $str;
+  }
+
+  function get_List_Bottom_Info()
+  {
+    return($this->List_Bottom_Info); 
+  }
 }
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>