Updated gotomasses.

-Updated error message

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9166 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-plugins/goto/addons/gotomasses/class_gotomasses.inc b/gosa-plugins/goto/addons/gotomasses/class_gotomasses.inc
index eb34a8feb560233df7a1ea0076aa411777aed15a..28c23e2d7ab1e198e0039c969e88ce773bb304fd 100644 (file)
--- 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']." ".$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']." ".$task['MACADDRESS'];
+            }else{
+              $tmp.= "\n".$task['ID']." - ".$task['HEADERTAG']." ".$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 023142f975b76ec1ea7ede3d4d55d0a3aaa16f8a..6113ae3be71477c0a458d774e8e9768b04fe32a0 100644 (file)
--- 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>