From: hickert Date: Mon, 14 Jan 2008 07:40:51 +0000 (+0000) Subject: Several gotomasses changes. X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=95df816b8bd24312257c0e5f200aacf807d60597;p=gosa.git Several gotomasses changes. -Not working yet. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8317 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-core/plugins/addons/gotomasses/class_divListMasses.inc b/gosa-core/plugins/addons/gotomasses/class_divListMasses.inc index f32f76b51..615c333c4 100644 --- a/gosa-core/plugins/addons/gotomasses/class_divListMasses.inc +++ b/gosa-core/plugins/addons/gotomasses/class_divListMasses.inc @@ -16,13 +16,13 @@ class divListMasses extends MultiSelectWindow { MultiSelectWindow::MultiSelectWindow($config, "gotoMasses", array("gotomasses")); - $this->parent = $parent; - $this->ui = get_userinfo(); - $this->SetSummary(_("List of system deployment tasks")); + $this->parent = $parent; + $this->ui = get_userinfo(); + $this->SetSummary(_("List of queued deamon jobs.")); $this->SetHeadpageMode(); $this->EnableCloseButton(FALSE); $this->EnableSaveButton(FALSE); - $this->SetInformation(_("This menu allows you to add, remove and change the properties of system deployment tasks.")); + $this->SetInformation(_("This menu allows you to remove and change the properties of GOsa deamon tasks.")); foreach($this->parent->get_actions() as $name => $desc){ $this->$name = TRUE; @@ -43,7 +43,7 @@ class divListMasses extends MultiSelectWindow ""._("Task")."")); $this->AddHeader(array("string"=>""._("Schedule")."", "attach"=>"style='width:100px;'")); - $this->AddHeader(array("string"=>""._("Type")."", + $this->AddHeader(array("string"=>""._("Status")."", "attach"=>"style='width:80px;'")); $this->AddHeader(array("string"=>_("Action"), "attach"=>"style='border-right:0px;width:120px;'")); @@ -54,14 +54,14 @@ class divListMasses extends MultiSelectWindow /* Display add button if allowed */ $header = "
"; - if($this->parent->acl_is_createable()){ - $header .= " "; - } +# if($this->parent->acl_is_createable()){ +# $header .= " "; +# } - /* Display add button if allowed */ - if($this->parent->acl_is_removeable()){ - $header .= " "; - } +# /* Display remove button if allowed */ +# if($this->parent->acl_is_removeable()){ +# $header .= " "; +# } /* Add priority options */ if(preg_match("/w/",$this->parent->getacl(""))){ @@ -74,9 +74,9 @@ class divListMasses extends MultiSelectWindow /* Create divlist */ $this->SetListHeader($header); - } + function execute() { $this->ClearElementsList(); @@ -88,7 +88,8 @@ class divListMasses extends MultiSelectWindow { /* Create edit link */ $plug = $_GET['plug']; - $edit_link = "
%str%
"; +# $edit_link = "
%str%
"; + $edit_link = "%str%"; /* Create action filter array, to sort out those actions we do not want to see */ $allowed_action = array(); @@ -108,10 +109,11 @@ class divListMasses extends MultiSelectWindow foreach($tasks as $key => $task){ + /* Skip unchecked actions */ - if(!in_array($task['Action'],$allowed_action)){ - continue; - } +# if(!in_array($task['Action'],$allowed_action)){ +# continue; +# } /* Handle coloring */ $color=""; @@ -124,7 +126,7 @@ class divListMasses extends MultiSelectWindow } /* Create actions */ - $id = $task['ID']; + $id = $task['ROWID']; $queue_pos = $task['Queue_Position']; $prio_actions = " "; $prio_actions.= " "; @@ -135,8 +137,8 @@ class divListMasses extends MultiSelectWindow $action.= ""; } - $display = preg_replace(array("/%id%/","/%str%/"),array($id,$this->parent->target_to_string($task)),$edit_link); - $display2= $this->parent->get_additional_entry_informations($task); + $display = preg_replace(array("/%id%/","/%str%/"),array($id,$task['MACADDRESS']),$edit_link); + $display2= $task['HEADERTAG']; /* Create each field */ $field0 = array("string" => "" , @@ -146,14 +148,20 @@ class divListMasses extends MultiSelectWindow "attach" => "style='".$color."'"); $field1a= array("string" => $display2, "attach" => "style='".$color.";width:80px;'"); - $field2 = array("string" => $this->parent->time_to_string($task),"attach" => "style='".$color.";width:100px;'"); - $field3 = array("string" => $this->parent->action_to_string($task),"attach" => "style='".$color.";width:80px;'"); + $field2 = array("string" => $this->stamp_to_date($task['TIMESTAMP']),"attach" => "style='".$color.";width:100px;'"); + $field3 = array("string" => $task['STATUS'],"attach" => "style='".$color.";width:80px;'"); $field4 = array("string" => $prio_actions.$action,"attach" => "style='".$color.";text-align:right;width:120px;border-right:0px;'"); $this->AddElement(array($field0,$field0a,$field1,$field1a,$field2,$field3,$field4)); } } + function stamp_to_date($stamp) + { + return(date("d.m.Y H:i:s",strtotime($stamp))); + } + + function Save() { MultiSelectWindow :: Save(); diff --git a/gosa-core/plugins/addons/gotomasses/class_gotomasses.inc b/gosa-core/plugins/addons/gotomasses/class_gotomasses.inc index adf221859..775a28483 100644 --- a/gosa-core/plugins/addons/gotomasses/class_gotomasses.inc +++ b/gosa-core/plugins/addons/gotomasses/class_gotomasses.inc @@ -11,26 +11,27 @@ class gotomasses extends plugin var $objectclasses= array(); /* Queue tasks */ - var $current =false; - var $dialog = FALSE; - var $ids_to_remove = array(); - var $divlist = NULL; + var $current = FALSE; + var $dialog = FALSE; + var $ids_to_remove = array(); + var $divlist = NULL; - var $sort_by = "QueuePosition"; - var $sort_dir= "up"; + var $sort_by = "QueuePosition"; + var $sort_dir = "up"; function gotomasses(&$config, $dn= NULL) { /* Include config object */ $this->config= &$config; $this->divlist = new divListMasses($this->config,$this); - $this->o_queue = new hostActionQueue(&$config); + $this->o_queue = new gosaSupportDaemon("10.3.67.111","20082","secret-gosa-password",FALSE,2); } function execute() { $smarty = get_smarty(); + /************ * Handle posts ************/ @@ -47,8 +48,11 @@ class gotomasses extends plugin "/^multiple_prio_decrease_/" => "mprio_decrease", "/^multiple_prio_bottom_/" => "mprio_bottom", - "/^edit_task_/"=>"edit","/^remove_task_/"=>"remove", - "/^new_task_/"=>"new_task","/^remove_multiple_task_/" => "remove_multiple"); + "/^edit_task_/" => "edit", + "/^remove_task_/" => "remove", + "/^new_task_/" => "new_task", + "/^remove_multiple_task_/" => "remove_multiple"); + foreach($arr as $regex => $action){ foreach($_POST as $name => $value){ if(preg_match($regex,$name)){ @@ -122,7 +126,7 @@ class gotomasses extends plugin foreach($this->ids_to_remove as $key => $id){ if($this->o_queue->id_exists($id)){ $task = $this->o_queue->get_entry($id); - $tmp.= "\n".$this->target_to_string($task); + $tmp.= "\n".$task['ROWID']; }else{ unset($this->ids_to_remove[$key]); } @@ -150,68 +154,68 @@ class gotomasses extends plugin } - /************ - * EDIT - ************/ - - /* Edit selected entry */ - if($s_action == "edit"){ - $entry = $this->o_queue->get_entry($s_entry); - if($entry){ - $this->dialog = new goto_task($this->config,$this,$entry); - $this->current = $s_entry; - } - } - - /* New entry */ - if($s_action== "new_task" && $this->acl_is_createable()){ - $this->dialog = new goto_task($this->config,$this); - $this->current = -1; - } - - /* Close dialog */ - if(isset($_POST['close_goto_task'])){ - $this->dialog = FALSE; - $this->current = -1; - } - - /* Close dialog */ - if((isset($_POST['save_goto_task']) || isset($_POST['apply_goto_task'])) && is_object($this->dialog) ){ - $this->dialog->save_object(); - $msgs = $this->dialog->check(); - if(count($msgs)){ - foreach($msgs as $msg){ - print_red($msg); - } - }else{ - - if($this->o_queue->id_exists($this->current)){ - $this->o_queue->update_entry($this->current,$this->dialog->save()); - }else{ - $tmp = $this->dialog->save(); - $tmp2= array(); - $targets =$tmp['Target']; - foreach($targets as $target){ - $tmp['Target'] = array($target); - $tmp2[] = $tmp; - } - if(!$this->o_queue->add_multiple($tmp2)){ - print_red($this->o_queue->get_error()); - } - } - if(!isset($_POST['apply_goto_task'])){ - $this->dialog = FALSE; - $this->current = -1; - } - $this->save(); - } - } - - /* Display dialogs if currently opened */ - if(is_object($this->dialog)){ - $this->dialog->save_object(); - return($this->dialog->execute()); - } +# /************ +# * EDIT +# ************/ +# +# /* Edit selected entry */ +# if($s_action == "edit"){ +# $entry = $this->o_queue->get_entry($s_entry); +# if($entry){ +# $this->dialog = new goto_task($this->config,$this,$entry); +# $this->current = $s_entry; +# } +# } +# +# /* New entry */ +# if($s_action== "new_task" && $this->acl_is_createable()){ +# $this->dialog = new goto_task($this->config,$this); +# $this->current = -1; +# } +# +# /* Close dialog */ +# if(isset($_POST['close_goto_task'])){ +# $this->dialog = FALSE; +# $this->current = -1; +# } +# +# /* Close dialog */ +# if((isset($_POST['save_goto_task']) || isset($_POST['apply_goto_task'])) && is_object($this->dialog) ){ +# $this->dialog->save_object(); +# $msgs = $this->dialog->check(); +# if(count($msgs)){ +# foreach($msgs as $msg){ +# print_red($msg); +# } +# }else{ +# +# if($this->o_queue->id_exists($this->current)){ +# $this->o_queue->update_entry($this->current,$this->dialog->save()); +# }else{ +# $tmp = $this->dialog->save(); +# $tmp2= array(); +# $targets =$tmp['Target']; +# foreach($targets as $target){ +# $tmp['Target'] = array($target); +# $tmp2[] = $tmp; +# } +# if(!$this->o_queue->add_multiple($tmp2)){ +# print_red($this->o_queue->get_error()); +# } +# } +# if(!isset($_POST['apply_goto_task'])){ +# $this->dialog = FALSE; +# $this->current = -1; +# } +# $this->save(); +# } +# } +# +# /* Display dialogs if currently opened */ +# if(is_object($this->dialog)){ +# $this->dialog->save_object(); +# return($this->dialog->execute()); +# } /************ * Handle Divlist @@ -219,127 +223,32 @@ class gotomasses extends plugin $this->divlist->execute(); $this->divlist->SetEntries($this->get_queue_entries()); - $str = - ""; - return($str.$this->divlist->Draw()); + return($this->divlist->Draw()); } - + + /*! \brief Request list of queued jobs. + * @return Returns an array of all queued jobs. + */ function get_queue_entries() { if(!$this->o_queue->load()){ - print_red("ERROR:".$this->o_queue->get_error()); + print_red(sprintf(_("An error occurred while requesting queue entries. Error was '%s'."),$this->o_queue->get_error())); return(array()); } - - $queue_pos = 1; $tasks = array(); $ret = array(); while($entry = $this->o_queue->fetch()){ - $task = $entry['TASK_ID']; - if(!isset($tasks[$task])){ - $tasks[$task] = dechex(rand(100,240)).dechex(rand(100,240)).dechex(rand(100,240)); - } - $entry['Queue_Position'] = $queue_pos; - $entry['color'] = $tasks[$task]; + $task = $entry['ROWID']; + $entry['Queue_Position'] = $task; $ret[]= $entry; - $queue_pos ++; - } - - /* Sort entries */ - $simple_map = array("QueuePosition" => "Queue_Position", - "Action" => "Action", - "TaskID" => "TASK_ID"); - $sort_arr = array(); - if(isset($simple_map[$this->sort_by])){ - foreach($ret as $id => $entry){ - $sort_arr[$entry[$simple_map[$this->sort_by]]][] = $id; - } } - if($this->sort_by == "TargetName"){ - foreach($ret as $id => $entry){ - $name = $this->target_to_string($entry); - $sort_arr[$name][] = $id; - } - } - if($this->sort_by == "Schedule"){ - foreach($ret as $id => $entry){ - $name = $entry['Minute'].$entry['Hour'].$entry['Day'].$entry['Month'].$entry['Weekday']; - $sort_arr[$name][] = $id; - } - } - if($this->sort_dir == "up"){ - ksort($sort_arr); - }else{ - krsort($sort_arr); - } - $ret2 = array(); - foreach($sort_arr as $key => $entries){ - foreach($entries as $entry_id){ - $ret2[] = $ret[$entry_id]; - } - } - return($ret2); - } - - - function get_additional_entry_informations($data) - { - $i = rand(0,3); - if($i == 0){ - return("
 
"); - } - if($i == 1){ - return("Failed"); - } - if($i == 1){ - return("OK"); - } - return("-"); - } - - - function target_to_string($data) - { - $ret = ""; - if($data['Action'] == "initial_install"){ - foreach($data['Initial_Target'] as $target){ - $ret .= $target['MAC'].", "; - } - }else{ - foreach($data['Target'] as $target){ - $ret .= $target.", "; - } - } - return(preg_replace("/, $/","",$ret)); + return($ret); } - - function time_to_string($data) - { - return($data['Minute']." ".$data['Hour']." ".$data['Day']." ".$data['Month']." ".$data['Weekday']); - } - - function action_to_string($data) - { - $tmp = $this->get_actions(); - if(isset($tmp[$data['Action']])){ - return($tmp[$data['Action']]); - }else{ - return(_("Unknown")); - } - } - - + /*! \brief Handle post jobs, like sorting. + */ function save_object() { $this->divlist->save_object(); @@ -374,9 +283,13 @@ class gotomasses extends plugin function save() { + // We do not save anything here. } + /*! \brief Return a list of all selected items. + @return Array Returns an array containing all selected item ids. + */ function list_get_selected_items() { $ids = array(); @@ -390,20 +303,22 @@ class gotomasses extends plugin } - function get_actions() - { - /* Prepare list of available actions */ - $actions = array( "reboot" => _("Reboot"), - "localboot" => _("Localboot"), - "halt" => _("Halt system"), - "initial_install" => _("Initial installation"), - "update" => _("Update"), - "reinstall" => _("(Re)Install"), - "rescan" => _("Rescan"), - "wake" => _("Wake"), - "memcheck" => _("Memory check")); - return($actions); - } + function get_actions() + { + /* Prepare list of available actions */ + $actions = array( + "Dummy." => "!!!!!!!! Update", + "reboot" => _("Reboot"), + "localboot" => _("Localboot"), + "halt" => _("Halt system"), + "initial_install" => _("Initial installation"), + "update" => _("Update"), + "reinstall" => _("(Re)Install"), + "rescan" => _("Rescan"), + "wake" => _("Wake"), + "memcheck" => _("Memory check")); + return($actions); + } static function plInfo()