X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Ffai%2Fclass_faiManagement.inc;h=55e8499b1ef067f51692e48c21cb6685af0ca6ba;hb=8e89e901eb67f63011a49553de75353330a3871e;hp=9d11242dc68952db729452bc3f9876000de32431;hpb=bf70914688502c7abee5f0625158d6a47b37de96;p=gosa.git

diff --git a/plugins/admin/fai/class_faiManagement.inc b/plugins/admin/fai/class_faiManagement.inc
index 9d11242dc..55e8499b1 100644
--- a/plugins/admin/fai/class_faiManagement.inc
+++ b/plugins/admin/fai/class_faiManagement.inc
@@ -25,7 +25,6 @@ require "tabsScript.inc";
 require "tabsProfile.inc";
 require "tabsPackage.inc";
 
-
 class faiManagement extends plugin
 {
 	/* Definitions */
@@ -263,6 +262,7 @@ class faiManagement extends plugin
 			$a_setup = ($this->get_type($entry));
 		
 			$this->dn = $entry['dn'];
+			add_lock ($this->dn, $this->ui->dn);
 
 			$this->dialog= new $a_setup[0]($this->config,
 					$this->config->data['TABS'][$a_setup[2]],$this->dn);
@@ -337,7 +337,7 @@ class faiManagement extends plugin
 		}
 
 		/* Department select */
-		if(isset($_POST['base'])){
+		if((isset($_POST['base']))&&($s_action=="")){
 			$faifilter['base']=$_POST['base'];
 		}
 
@@ -353,6 +353,7 @@ class faiManagement extends plugin
 			$this->dialog=NULL;
 			$this->is_dialog = false;
 			unset($_SESSION['objectinfo']);
+			del_lock ($this->dn);
 		}
 
 		/* This check if the given tab could be saved 
@@ -366,6 +367,7 @@ class faiManagement extends plugin
 					print_red($msg);
 				}
 			}else{
+				del_lock ($this->dn);
 				$this->dialog->save();
 				unset($this->dialog);
 				$this->dialog=NULL;
@@ -387,14 +389,14 @@ class faiManagement extends plugin
 				
 			}elseif(((isset($this->dialog->current))&&(!$this->dialog->by_object[$this->dialog->current]->is_dialog))){
 				$display.= "<p style=\"text-align:right\">\n";
-				$display.= "<input type=submit name=\"edit_finish\" value=\""._("Finish")."\">\n";
+				$display.= "<input type=\"submit\" name=\"edit_finish\" value=\""._("Finish")."\">\n";
 				$display.= "&nbsp;\n";
-				$display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
+				$display.= "<input type=\"submit\" name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
 				$display.= "</p>";
 			}elseif(!isset($this->dialog->current)){
 				$display.= "<p style=\"text-align:right\">\n";
-				$display.= "<input type=submit name=\"edit_continue\" value=\""._("Continue")."\">&nbsp;";
-				$display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
+				$display.= "<input type=\"submit\" name=\"edit_continue\" value=\""._("Continue")."\">&nbsp;";
+				$display.= "<input type=\"submit\" name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
 				$display.= "</p>";
 			}
 			return($display);
@@ -410,7 +412,7 @@ class faiManagement extends plugin
 		$options= "";
 		foreach ($this->config->idepartments as $key => $value){
 			if ($faifilter['base'] == $key){
-				$options.= "<option selected value='$key'>$value</option>";
+				$options.= "<option selected='selected' value='$key'>$value</option>";
 			} else {
 				$options.= "<option value='$key'>$value</option>";
 			}
@@ -422,44 +424,44 @@ class faiManagement extends plugin
 		$faihead = 
 			"<div style='background:#F0F0F9;padding:5px;'>&nbsp;".
 
-			"<input type='image' src='images/list_up.png' align='middle' 
+			"<input class='center' type='image' src='images/list_up.png' align='middle' 
 			title='"._("Go up one department")."' name='dep_back' alt='"._("Up"). "'>&nbsp;".
 
-			"<input type='image' src='images/list_root.png' align='middle' 
+			"<input class='center' type='image' src='images/list_root.png' align='middle' 
 			title='"._("Go to root department")."' name='dep_root' alt='".      _("Root")."'>&nbsp;".
 
-			"<input type='image' src='images/list_home.png' align='middle' 
+			"<input class='center' type='image' src='images/list_home.png' align='middle' 
 			title='"._("Go to users home department")."' name='dep_home' alt='"._("Home")."'>&nbsp;".
 
-			"<img src=\"images/list_seperator.png\" alt=\"\" align=\"middle\" height=\"16\" width=\"1\">&nbsp;".
+			"<img class='center' src=\"images/list_seperator.png\" alt=\"\" align=\"middle\" height=\"16\" width=\"1\">&nbsp;".
 			
-			" <input type='image' src='images/fai_new_profile.png' align='middle' 
+			" <input class='center' type='image' src='images/fai_new_profile.png' align='middle' 
 			title='"._("New profile")."' name='Create_profile' alt='"._("P")."'>&nbsp;".
 			
-			"<img src=\"images/list_seperator.png\" alt=\"\" align=\"middle\" height=\"16\" width=\"1\">&nbsp;".
+			"<img class='center' src=\"images/list_seperator.png\" alt=\"\" align=\"middle\" height=\"16\" width=\"1\">&nbsp;".
 				
-			" <input type='image' src='images/fai_new_partitionTable.png' align='middle' 
+			" <input class='center' type='image' src='images/fai_new_partitionTable.png' align='middle' 
 			title='"._("New partition table")."' name='Create_partition' alt='"._("PT")."'>&nbsp;".
 
-			" <input type='image' src='images/fai_new_script.png' align='middle' 
+			" <input class='center' type='image' src='images/fai_new_script.png' align='middle' 
 			title='"._("New scripts")."' name='Create_script' alt='"._("S")."'>&nbsp;".
 
-			" <input type='image' src='images/fai_new_hook.png' align='middle' 
+			" <input class='center' type='image' src='images/fai_new_hook.png' align='middle' 
 			title='"._("New hooks")."' name='Create_hook' alt='"._("H")."'>&nbsp;".
 
-			" <input type='image' src='images/fai_new_variable.png' align='middle' 
+			" <input class='center' type='image' src='images/fai_new_variable.png' align='middle' 
 			title='"._("New variables")."' name='Create_variable' alt='"._("V")."'>&nbsp;".
 			
-			" <input type='image' src='images/fai_new_template.png' align='middle' 
+			" <input class='center' type='image' src='images/fai_new_template.png' align='middle' 
 			title='"._("New templates")."' name='Create_template' alt='"._("T")."'>&nbsp;".
 
-			" <input type='image' src='images/fai_new_packages.png' align='middle' 
+			" <input class='center' 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;".
+			" <img class='center' 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;".
+			_("Current base")."&nbsp;<select name='base' onChange='mainform.submit()' class='center'>$options</select>".
+			" <input class='center' type='image' src='images/list_submit.png' align='middle' title='"._("Submit department")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
 			
 			"</div>";
 
@@ -477,10 +479,10 @@ class faiManagement extends plugin
 					array("string" => _("Actions"), "attach" => "style='width:60px;border-right:0px;text-align:right;'")));
 
 
-		$action  = "<input type='image' src='images/edit.png' 	alt='"._("edit")."'   name='entry_edit_%KEY%' title='"._("Edit class")."'>";
-		$action .= "<input type='image' src='images/edittrash.png' alt='"._("delete")."' name='entry_delete_%KEY%' title='"._("Delete class")."'>";
+		$action  = "<input class='center' type='image' src='images/edit.png' 	alt='"._("edit")."'   name='entry_edit_%KEY%' title='"._("Edit class")."'>";
+		$action .= "<input class='center' type='image' src='images/edittrash.png' alt='"._("delete")."' name='entry_delete_%KEY%' title='"._("Delete class")."'>";
 
-		$editlink ="<a href='?plug=".$_GET['plug']."&edit_entry=%KEY%'>%NAME%</a>"; 		
+		$editlink ="<a href='?plug=".$_GET['plug']."&amp;edit_entry=%KEY%'>%NAME%</a>"; 		
 		$linkopen = "<a href='?plug=".$_GET['plug']."&amp;act=dep_open&amp;dep_id=%s'>%s</a>";
 
 		foreach($this->departments as $key => $val) {
@@ -520,53 +522,53 @@ class faiManagement extends plugin
 						if(!$faifilter['ShowPartitions']){ 
 							$abort = true;
 						}
-					$img="<img src='images/fai_partitionTable.png' title='"._("Partition table")."' alt='PT'>";
+					$img="<img class='center' src='images/fai_partitionTable.png' title='"._("Partition table")."' alt='PT'>";
 					$info = _("Partition table");
 					break;
 					case "FAIpackageList"		: 
 						if(!$faifilter['ShowPackages']){ 
 							$abort = true;
 						}
-					$img="<img src='images/fai_packages.png' title='"._("Package list")."' alt='PL'>";
+					$img="<img class='center' src='images/fai_packages.png' title='"._("Package list")."' alt='PL'>";
 					$info = _("Package list");
 					break;
 					case "FAIscript"			: 
 						if(!$faifilter['ShowScripts']){ 
 							$abort = true;
 						}
-					$img="<img src='images/fai_script.png' title='"._("Scripts")."' alt='S'>";
+					$img="<img class='center' src='images/fai_script.png' title='"._("Scripts")."' alt='S'>";
 					$info = _("Scripts");
 					break;
 					case "FAIvariable"			: 
 						if(!$faifilter['ShowVariables']){ 
 							$abort = true;
 						}
-					$img="<img src='images/fai_variable.png' title='"._("Variables")."' alt='V'>";
+					$img="<img class='center' src='images/fai_variable.png' title='"._("Variables")."' alt='V'>";
 					$info = _("Variables");
 					break;
 					case "FAIhook"				:
 						if(!$faifilter['ShowHooks']){ 
 							$abort = true;
 						}
-					$img="<img src='images/fai_hook.png' title='"._("Hooks")."' alt='H'>";
+					$img="<img class='center' src='images/fai_hook.png' title='"._("Hooks")."' alt='H'>";
 					$info = _("Hooks");
 					break;
 					case "FAIprofile"			: 
 						if(!$faifilter['ShowProfiles']){ 
 							$abort = true;
 						}
-					$img="<img src='images/fai_profile.png' title='"._("Profile")."' alt='P'>";
+					$img="<img class='center' src='images/fai_profile.png' title='"._("Profile")."' alt='P'>";
 					$info = _("Profile");
 					break;
 					case "FAItemplate"			: 
 						if(!$faifilter['ShowTemplates']){ 
 							$abort = true;
 						}
-					$img="<img src='images/fai_template.png' title='"._("Templates")."' alt='T'>";
+					$img="<img class='center' src='images/fai_template.png' title='"._("Templates")."' alt='T'>";
 					$info = _("Templates");
 					break;
 					default 					: 
-					$img="<img src='images/empty.png' alt=''>";$info = "";break;
+					$img="<img class='center' src='images/empty.png' alt=''>";$info = "";break;
 
 				}
 				
@@ -603,6 +605,7 @@ class faiManagement extends plugin
 		$smarty->assign("alphabet"		, generate_alphabet());
 		$smarty->assign("apply"			, apply_filter());
 		$smarty->assign("search_image"	, get_template_path('images/search.png'));
+		$smarty->assign("hint", print_sizelimit_warning());
 
 		$display 	= $smarty->fetch(get_template_path('headpage.tpl', TRUE, dirname(__FILE__)));
 		return ($display);
@@ -643,10 +646,10 @@ class faiManagement extends plugin
 		}
 		ksort($tmp);
 		foreach($tmp as $value){
-			if($value["description"][0]!=".."){
+			if(isset($value["description"][0])){
 				$this->departments[$value['dn']]=convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
 			}else{
-				$this->departments[$value['dn']]=$value["description"][0];
+				$this->departments[$value['dn']]=convert_department_dn2($value['dn']);//$value["description"][0];
 			}
 		}