![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f244b8d)
raw | patch | inline | side by side (parent: f244b8d)
| author | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Mon, 14 Jan 2008 07:40:51 +0000 (07:40 +0000) | ||
| committer | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Mon, 14 Jan 2008 07:40:51 +0000 (07:40 +0000) |
-Not working yet.
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8317 594d385d-05f5-0310-b6e9-bd551577e9d8
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8317 594d385d-05f5-0310-b6e9-bd551577e9d8
| gosa-core/plugins/addons/gotomasses/class_divListMasses.inc | patch | blob | history | |
| gosa-core/plugins/addons/gotomasses/class_gotomasses.inc | patch | blob | history |
diff --git a/gosa-core/plugins/addons/gotomasses/class_divListMasses.inc b/gosa-core/plugins/addons/gotomasses/class_divListMasses.inc
index f32f76b514f44a113f813425db52c87f925224ea..615c333c4db0ebc45ecdd8d355d462d86feddc01 100644 (file)
{
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;
"<a href='?plug=".$plug."&sort=TaskID'>"._("Task")."</a>"));
$this->AddHeader(array("string"=>"<a href='?plug=".$plug."&sort=Schedule'>"._("Schedule")."</a>",
"attach"=>"style='width:100px;'"));
- $this->AddHeader(array("string"=>"<a href='?plug=".$plug."&sort=Action'>"._("Type")."</a>",
+ $this->AddHeader(array("string"=>"<a href='?plug=".$plug."&sort=Action'>"._("Status")."</a>",
"attach"=>"style='width:80px;'"));
$this->AddHeader(array("string"=>_("Action"),
"attach"=>"style='border-right:0px;width:120px;'"));
/* Display add button if allowed */
$header = "<div style='padding:5px'>";
- if($this->parent->acl_is_createable()){
- $header .= "<input type='image' src='images/gotomasses_new_task.png' name='new_task' class='center'> ";
- }
+# if($this->parent->acl_is_createable()){
+# $header .= "<input type='image' src='images/gotomasses_new_task.png' name='new_task' class='center'> ";
+# }
- /* Display add button if allowed */
- if($this->parent->acl_is_removeable()){
- $header .= "<input type='image' src='images/edittrash.png' name='remove_multiple_task' class='center'> ";
- }
+# /* Display remove button if allowed */
+# if($this->parent->acl_is_removeable()){
+# $header .= "<input type='image' src='images/edittrash.png' name='remove_multiple_task' class='center'> ";
+# }
/* Add priority options */
if(preg_match("/w/",$this->parent->getacl(""))){
/* Create divlist */
$this->SetListHeader($header);
-
}
+
function execute()
{
$this->ClearElementsList();
{
/* Create edit link */
$plug = $_GET['plug'];
- $edit_link = "<div style='width:100%;overflow:hidden;'><nobr><a href='?plug=".$_GET['plug']."&act=edit&id=%id%'>%str%</nobr></div>";
+# $edit_link = "<div style='width:100%;overflow:hidden;'><nobr><a href='?plug=".$_GET['plug']."&act=edit&id=%id%'>%str%</nobr></div>";
+ $edit_link = "%str%";
/* Create action filter array, to sort out those actions we do not want to see */
$allowed_action = array();
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="";
}
/* Create actions */
- $id = $task['ID'];
+ $id = $task['ROWID'];
$queue_pos = $task['Queue_Position'];
$prio_actions = "<input class='center' type='image' src='images/prio_top.png' name='prio_top_".$id."'> ";
$prio_actions.= "<input class='center' type='image' src='images/prio_increase.png' name='prio_increase_".$id."'> ";
$action.= "<input type='image' src='images/edittrash.png' name='remove_task_".$id."' class='center' alt='"._("Reomve")."'>";
}
- $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" => "<input type='checkbox' id='item_selected_".$id."' name='item_selected_".$id."'>" ,
"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 adf221859cdd6eee5d9ebb197011c5c8d489469f..775a28483864af8e4cefeb8d825d37351f5b09fc 100644 (file)
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
************/
"/^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)){
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]);
}
}
- /************
- * 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
$this->divlist->execute();
$this->divlist->SetEntries($this->get_queue_entries());
- $str =
- "<script type=\"text/javascript\">
- <!--
- var time = null
- function move() {
- window.location = '?plug=".$_GET['plug']."'
- }
- setInterval(\"move()\",20000);
- //-->
- </script>";
- 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("<div style='width:80px;background-color:#999999;'><div style='background-color:#00FF00;width:40%'> </div></div>");
- }
- if($i == 1){
- return("<font style='color: #FF0000;'>Failed</font>");
- }
- if($i == 1){
- return("<font style='color: #00FF00;'>OK</font>");
- }
- 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();
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();
}
- 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()