From 41a91e11c2a78e488dad9355f42dc4d0bf8292b4 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 27 Feb 2008 10:55:46 +0000
Subject: [PATCH] Updated gotomasses. -Updated error message

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9166 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../goto/addons/gotomasses/class_gotomasses.inc       | 11 ++++++++---
 gosa-plugins/goto/addons/gotomasses/remove.tpl        |  1 -
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/gosa-plugins/goto/addons/gotomasses/class_gotomasses.inc b/gosa-plugins/goto/addons/gotomasses/class_gotomasses.inc
index eb34a8feb..28c23e2d7 100644
--- a/gosa-plugins/goto/addons/gotomasses/class_gotomasses.inc
+++ b/gosa-plugins/goto/addons/gotomasses/class_gotomasses.inc
@@ -158,10 +158,15 @@ class gotomasses extends plugin
 
           $tmp = "";
           foreach($ret as $task){
-            $tmp.= "\n".$task['ID']." - ".$task['HEADERTAG']."&nbsp;".$task['MACADDRESS'];
+            if(isset($this->events['BY_QUEUED_ACTION'][$task['HEADERTAG']])){
+              $evt = $this->events['BY_QUEUED_ACTION'][$task['HEADERTAG']];
+              $tmp.= "\n".$task['ID']." - ".$evt['s_Menu_Name']."&nbsp;".$task['MACADDRESS'];
+            }else{
+              $tmp.= "\n".$task['ID']." - ".$task['HEADERTAG']."&nbsp;".$task['MACADDRESS'];
+            }
           }
           $smarty->assign("multiple", TRUE); 
-          $smarty->assign("info",sprintf(_("Your are about to delete the following tasks: %s"),"<pre>".$tmp."</pre>"));
+          $smarty->assign("info",sprintf(_("You are about to remove the following actions from the GOsa support Daemon: %s"),"<pre>".$tmp."</pre>"));
           $this->current = $s_entry;
           return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
         }
@@ -236,7 +241,7 @@ class gotomasses extends plugin
 
     $divlist = new MultiSelectWindow($this->config,"gotoMasses",array("gotomasses"));
     $divlist->SetInformation(_("This menu allows you to remove and change the properties of GOsa deamon tasks."));
-    $divlist->SetSummary(_("List of queued deamon jobs."));
+    $divlist->SetSummary(_("List of queued deamon jobs"));
     $divlist->EnableCloseButton(FALSE);
     $divlist->EnableSaveButton(FALSE);
     $divlist->SetHeadpageMode();
diff --git a/gosa-plugins/goto/addons/gotomasses/remove.tpl b/gosa-plugins/goto/addons/gotomasses/remove.tpl
index 023142f97..6113ae3be 100644
--- a/gosa-plugins/goto/addons/gotomasses/remove.tpl
+++ b/gosa-plugins/goto/addons/gotomasses/remove.tpl
@@ -3,7 +3,6 @@
 </div>
 <p>
   {$info}
-  {t}This includes all account data, system access rules, imap settings, etc. for this user. Please double check if your really want to do this since there is no way for GOsa to get your data back.{/t}
 </p>
 
 <p>
-- 
2.30.2