From 1a51b661fb0c3e04e125de03efba239e07fb5029 Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 4 Mar 2008 09:36:39 +0000 Subject: [PATCH] Updated gotomasses git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9294 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../goto/addons/gotomasses/class_gotomasses.inc | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gosa-plugins/goto/addons/gotomasses/class_gotomasses.inc b/gosa-plugins/goto/addons/gotomasses/class_gotomasses.inc index 3354a89cd..4d609392c 100644 --- a/gosa-plugins/goto/addons/gotomasses/class_gotomasses.inc +++ b/gosa-plugins/goto/addons/gotomasses/class_gotomasses.inc @@ -17,6 +17,7 @@ class gotomasses extends plugin var $divlist = NULL; var $events = array(); + var $event_tags = array(); var $sort_by = "Schedule"; var $sort_dir = "down"; @@ -30,6 +31,13 @@ class gotomasses extends plugin $this->config= &$config; $this->o_queue = new gosaSupportDaemon(TRUE,10); $this->events = DaemonEvent::get_event_types( USER_EVENT | SYSTEM_EVENT); + + /* Get tags that will be used in queue searches */ + foreach($this->events['BY_CLASS'] as $evt){ + if(isset($evt['s_Queued_Action'])){ + $this->event_tags[] = $evt['s_Queued_Action']; + } + } } @@ -430,9 +438,9 @@ class gotomasses extends plugin public function update_priority($id,$type = "up") { if($type == "up"){ - $tmp = $this->o_queue->get_queued_entries(-1,-1,"timestamp DESC"); + $tmp = $this->o_queue->get_queued_entries($this->event_tags,-1,-1,"timestamp DESC"); }else{ - $tmp = $this->o_queue->get_queued_entries(-1,-1,"timestamp ASC"); + $tmp = $this->o_queue->get_queued_entries($this->event_tags,-1,-1,"timestamp ASC"); } $last = array(); foreach($tmp as $entry){ @@ -640,7 +648,7 @@ class gotomasses extends plugin /* Get entries. */ $start = $this->start; $stop = $this->range; - $entries = $this->o_queue->get_queued_entries($start,$stop,$sort); + $entries = $this->o_queue->get_queued_entries($this->event_tags,$start,$stop,$sort); if ($this->o_queue->is_error()){ msg_dialog::display(_("Error"), sprintf(_("Cannot load queue entries: %s"), "

".$this->o_queue->get_error()), ERROR_DIALOG); } -- 2.30.2