tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Delete line of error with cherry-pick and recovery timestamp filter

This commit is contained in:
m-lopez-f 2015-01-27 15:34:47 +01:00
parent f4e1cee998
commit 47b11b97c1
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/ajax/module.php
View File

@ -121,7 +121,7 @@ if ($get_module_detail) {
$formtable->data[0][3] = "<a href='javascript: show_module_detail_dialog(" . $module_id .", ". $agentId.", \"" . $server_name . "\", 0, -1)'>". html_print_image ("images/refresh.png", true, array ("style" => 'vertical-align: middle;', "border" => "0" )) . "</a>"; $formtable->data[0][3] = "<a href='javascript: show_module_detail_dialog(" . $module_id .", ". $agentId.", \"" . $server_name . "\", 0, -1)'>". html_print_image ("images/refresh.png", true, array ("style" => 'vertical-align: middle;', "border" => "0" )) . "</a>";
$formtable->rowspan[0][3] = 2; $formtable->rowspan[0][3] = 2;
$formtable->cellstyle[0][3] = 'vertical-align: middle;'; $formtable->cellstyle[0][3] = 'vertical-align: middle;';
/*
$formtable->data[1][0] = html_print_radio_button_extended( $formtable->data[1][0] = html_print_radio_button_extended(
"selection_mode", 'range','', $selection_mode, false, '', "selection_mode", 'range','', $selection_mode, false, '',
'style="margin-right: 15px;"', true) . __("Specify time range"); 'style="margin-right: 15px;"', true) . __("Specify time range");
@ -140,7 +140,7 @@ if ($get_module_detail) {
'', 10, 10, true); '', 10, 10, true);
$formtable->data[1][2] .= html_print_input_text('time_to', $time_to, $formtable->data[1][2] .= html_print_input_text('time_to', $time_to,
'', 9, 7, true); '', 9, 7, true);
*/
html_print_table($formtable); html_print_table($formtable);
$moduletype_name = modules_get_moduletype_name( $moduletype_name = modules_get_moduletype_name(
@ -352,7 +352,6 @@ if ($get_id_tag) {
echo $tag_id; echo $tag_id;
return; return;
} }
<<<<<<< HEAD
if ($list_modules) { if ($list_modules) {
include_once($config['homedir'] . "/include/functions_modules.php"); include_once($config['homedir'] . "/include/functions_modules.php");
@ -1055,5 +1054,4 @@ if ($list_modules) {
} }
?> ?>