From 75ebb65f59b3b36a3c9c3fb3fc593f958ca48138 Mon Sep 17 00:00:00 2001 From: hickert Date: Mon, 31 Aug 2009 13:16:16 +0000 Subject: [PATCH] Updated gotomasses -Added a new col to display periadical info git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14172 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../goto/addons/goto/class_gotomasses.inc | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/gosa-plugins/goto/addons/goto/class_gotomasses.inc b/gosa-plugins/goto/addons/goto/class_gotomasses.inc index ad278eaba..8efbd99df 100644 --- a/gosa-plugins/goto/addons/goto/class_gotomasses.inc +++ b/gosa-plugins/goto/addons/goto/class_gotomasses.inc @@ -408,6 +408,8 @@ class gotomasses extends plugin $divlist->AddHeader(array("string"=>""._("Target").$sort_img_1."")); $divlist->AddHeader(array("string"=>""._("Task").$sort_img_2."", "attach"=>"style='width:120px;'")); + $divlist->AddHeader(array("string"=>_("Period"), + "attach"=>"style='width:60px;'")); $divlist->AddHeader(array("string"=>""._("Schedule").$sort_img_3."", "attach"=>"style='width:140px;'")); $divlist->AddHeader(array("string"=>""._("Status").$sort_img_4."", @@ -496,8 +498,10 @@ class gotomasses extends plugin $display = $task['PLAINNAME']; $tooltip = " title='".$task['MACADDRESS']."' "; } + + $display2= $task['HEADERTAG']; - + /* Check if this event exists as Daemon class * In this case, display a more accurate entry. */ @@ -552,6 +556,15 @@ class gotomasses extends plugin } } + // Check whether this is a periodical job or not. + $period = ""; + if(isset($task['PERIODIC']) && !preg_match("/none/i",$task['PERIODIC'])){ + $tmp = split("_", $task['PERIODIC']); + if(count($tmp) == 2){ + $period= $tmp[0]." "._($tmp[1]); + } + } + /* Create each field */ $field0 = array("string" => "" , "attach" => "style='width:20px;".$color."'"); @@ -559,6 +572,8 @@ class gotomasses extends plugin "attach" => $tooltip."style='".$color."'"); $field1a= array("string" => $display2, "attach" => "style='".$color.";width:120px;'"); + $field1b= array("string" => $period, + "attach" => "style='".$color.";width:60px;'"); if ($task['TIMESTAMP'] == "19700101000000"){ $field2 = array("string" => _("immediately"),"attach" => "style='".$color.";width:140px;'"); } else { @@ -566,7 +581,7 @@ class gotomasses extends plugin } $field3 = array("string" => $status,"attach" => "style='".$color.";width:80px;'"); $field4 = array("string" => $prio_actions.$action,"attach" => "style='".$color.";text-align:right;width:140px;border-right:0px;'"); - $divlist->AddElement(array($field0,$field1,$field1a,$field2,$field3,$field4)); + $divlist->AddElement(array($field0,$field1,$field1a,$field1b,$field2,$field3,$field4)); } $smarty = get_smarty(); -- 2.30.2