X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fapplications%2Fclass_applicationGeneric.inc;h=58895c8eabd0283a5bf7e83a1084ac2220ecde25;hb=969b5c3e6fb3643d2b9b77bcb92b7c329f22512b;hp=cb2fe6009045c35ce9bbce9e6d77651d276f5dd3;hpb=87dfe6c910c444c76d489b5d27f0f3cb58279f2e;p=gosa.git

diff --git a/plugins/admin/applications/class_applicationGeneric.inc b/plugins/admin/applications/class_applicationGeneric.inc
index cb2fe6009..58895c8ea 100644
--- a/plugins/admin/applications/class_applicationGeneric.inc
+++ b/plugins/admin/applications/class_applicationGeneric.inc
@@ -16,7 +16,6 @@ class application extends plugin
   var $gosaApplicationIcon= "";
   var $gotoLogonScript	="";
   var $iconData;
-  var $Categories = array();
 
   /* Headpage attributes */
   var $last_sorting= "invalid";
@@ -31,25 +30,6 @@ class application extends plugin
   {
   	plugin::plugin ($config, $dn);
 
-	$tmp = new xmlParse();
-	
-	$this->Categories= array();
-	if(!isset($this->config->data['MAIN']['KDE_APPLICATIONS_MENU']))	{
-		print_red(_("There is no value for 'KDE_APPLICATIONS_MENU' specified in your gosa.conf."));
-	}else{
-		$path = $this->config->data['MAIN']['KDE_APPLICATIONS_MENU'];
-		if(file_exists($path)){
-			if(is_readable($path)){
-				$tmp->parseMenu($path);
-				$this->Categories = $tmp->GetData();
-			}else{
-				print_red(sprintf(_("The specified file '%s' for 'KDE_APPLICATIONS_MENU' in your gosa.conf is not accessable."),$path));
-			}
-		}else{
-			print_red(sprintf(_("The specified file '%s' for 'KDE_APPLICATIONS_MENU' in your gosa.conf is not accessable."),$path));
-		}
-	}
-
 	/* Load icon */
 	$ldap= $config->get_ldap_link();
 	if ($dn != 'new'){
@@ -119,7 +99,6 @@ class application extends plugin
 	plugin::execute();
 
 	$smarty= get_smarty();
-	$smarty->assign("categories",array_flip($this->Categories));
 
  	/* Do we represent a valid group? */
 	if (!$this->is_account && $this->parent == NULL){
@@ -162,13 +141,14 @@ class application extends plugin
 	$smarty->assign("rand", rand(0, 10000));
 
 	/* Variables */
-	foreach(array("description", "gosaApplicationExecute", "gosaApplicationName") as $val){
+	foreach(array("description", "gosaApplicationExecute", "gosaApplicationName","cn") as $val){
 		$smarty->assign($val, $this->$val);
 		$smarty->assign($val."ACL", chkacl($this->acl, $val));
 	}
 
 	/* Checkboxes */
 	foreach (array("G" => "exec_for_groupmembers", "O" => "overwrite_config",
+		        "L" => "place_on_kicker",
 			"D" => "place_on_desktop", "M" => "place_in_startmenu") as $key => $val){
 		if (preg_match("/$key/", $this->gosaApplicationFlags)){
 			$smarty->assign("$val", "checked");
@@ -226,6 +206,9 @@ class application extends plugin
 		if (isset($_POST['place_on_desktop']) && $_POST['place_on_desktop'] == 1){
 			$flag.= "D";
 		}
+		if (isset($_POST['place_on_kicker']) && $_POST['place_on_kicker'] == 1){
+			$flag.= "L";
+		}
 		if (isset($_POST['place_in_startmenu']) && $_POST['place_in_startmenu'] == 1){
 			$flag.= "M";
 		}