X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Ffai%2Fclass_faiManagement.inc;h=bd5c1fb3b7ec890f60b1e3943a0426ed6dfbbf4c;hb=d1baab4eb6f9e84efe3be655942a898d80165e0f;hp=29ee26c90a515c8d7f6ed57ff249a70dba0d9c88;hpb=1b0f2d09acb33b4b5ea704aef912412b4813b878;p=gosa.git

diff --git a/plugins/admin/fai/class_faiManagement.inc b/plugins/admin/fai/class_faiManagement.inc
index 29ee26c90..bd5c1fb3b 100644
--- a/plugins/admin/fai/class_faiManagement.inc
+++ b/plugins/admin/fai/class_faiManagement.inc
@@ -319,7 +319,7 @@ class faiManagement extends plugin
 				$name = $this->dialog->save();
 
 				$this->dialog = new $a_setup[0]($this->config,
-						$this->config->data['TABS'][$a_setup[2]],$this->dn);
+						$this->config->data['TABS'][$a_setup[2]],$this->dn,$name);
 				$this->dialog->by_object[$a_setup[1]]->cn = $name;
 				$this->is_dialog = true;
 			}		
@@ -396,6 +396,16 @@ class faiManagement extends plugin
 		 * Assign all reguired vars to template engine
 		 */
 
+		/* Prepare departments */
+		$options= "";
+		foreach ($this->config->idepartments as $key => $value){
+			if ($faifilter['base'] == $key){
+				$options.= "<option selected value='$key'>$value</option>";
+			} else {
+				$options.= "<option value='$key'>$value</option>";
+			}
+		}
+
 		/* Create listhead, it will be shown on top of the divlist. 
 		 * It provides general navigation and object creation
 		 */
@@ -435,6 +445,11 @@ class faiManagement extends plugin
 
 			" <input type='image' src='images/fai_new_packages.png' align='middle' 
 			title='"._("New package list")."' name='Create_package' alt='"._("PK")."'>&nbsp;".
+
+			" <img src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
+
+			_("Current base")."&nbsp;<select name='base' onChange='mainform.submit()'>$options</select>".
+			" <input type='image' src='images/list_submit.png' align='middle' title='"._("Submit department")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
 			
 			"</div>";
 
@@ -449,7 +464,7 @@ class faiManagement extends plugin
 					array("string" => "&nbsp;"),
 					array("string" => _("Name of FAI class")),
 					array("string" => _("Class type")),
-					array("string" => _("Actions"), "attach"=>"style='border:none;width:40px;'")));
+					array("string" => _("Actions"), "attach"=>"style='border-right:none;width:40px;'")));
 
 
 		$action  = "<input type='image' src='images/edit.png' 	alt='"._("edit")."'   name='entry_edit_%KEY%' title='"._("Edit class")."'>";
@@ -476,7 +491,7 @@ class faiManagement extends plugin
 			$field0 = array("string" => "<img src='images/".$non_empty."folder.png' title='"._("department")."' alt='department'>",                     "attach"=>"style='width:20px;'");
 			$field1 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "title='".$title."'");
 			$field2 = array("string" => "");
-			$field3 = array("string" => "","attach"=>"style='text-align:right'");
+			$field3 = array("string" => "","attach"=>"style='text-align:right;border-right:none;'");
 
 			$divlist->AddEntry( array($field0,$field1,$field2,$field3));
 
@@ -509,7 +524,7 @@ class faiManagement extends plugin
 						if(!$faifilter['ShowScripts']){ 
 							$abort = true;
 						}
-					$img="<img src='images/fai_script' title='"._("Scripts")."' alt='S'>";
+					$img="<img src='images/fai_script.png' title='"._("Scripts")."' alt='S'>";
 					$info = _("Scripts");
 					break;
 					case "FAIvariable"			: 
@@ -541,7 +556,7 @@ class faiManagement extends plugin
 					$info = _("Templates");
 					break;
 					default 					: 
-					$img="<img src='images/empty.png' >";$info = "";break;
+					$img="<img src='images/empty.png' alt=''>";$info = "";break;
 
 				}
 				
@@ -671,6 +686,15 @@ class faiManagement extends plugin
 		}
 		ksort($this->objects);
 		reset ($this->objects);
+	
+		/* use numeric index, thats a bit more secure */	
+		$tmp0 = array();
+		foreach($this->objects as $obj){
+			$tmp0[]= $obj;
+		}
+		$this->objects = array();
+		$this->objects = $tmp0;
+
 	}
 
 	function remove_lock()