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

Removed the the event checkboxes 

(cherry picked from commit aad9e08700)
This commit is contained in:
Alejandro Gallardo Escobar 2015-03-17 14:20:09 +01:00
parent 9512be8483
commit f0dc044d37
3 changed files with 3 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pandora_console/godmode/reporting/graph_builder.graph_editor.php
View File

@ -64,7 +64,6 @@ if ($editGraph) {
$graphInTgraph = db_get_row_sql("SELECT * FROM tgraph WHERE id_graph = " . $id);
$stacked = $graphInTgraph['stacked'];
$events = $graphInTgraph['events'];
$period = $graphInTgraph['period'];
$width = $graphInTgraph['width'];
$height = $graphInTgraph['height'];
@ -129,41 +128,7 @@ echo "<td style='vertical-align: top;'>".__('Agents')."</td>";
echo "<td></td>";
echo "<td style='vertical-align: top;'>".__('Modules')."</td>";
echo "</tr><tr>";
// If metaconsole is activated
/*if ($config['metaconsole'] == 1) {
enterprise_include_once('include/functions_metaconsole.php');
$connection_names = enterprise_hook('metaconsole_get_connection_names');
if ($connection_names === false)
$connection_names = array();
$agents_tmp = array();
$agents = array();
foreach ($connection_names as $connection) {
$connection_data = enterprise_hook('metaconsole_get_connection', array($connection));
$connection_result = enterprise_hook('metaconsole_load_external_db', array($connection_data));
if ($connection_result == NOERR) {
$agents_tmp = agents_get_group_agents ();
if ($agents_tmp === false)
$agents_tmp = array();
foreach ($agents_tmp as $agent_key => $agent_name) {
$agents[$connection_data['server_name'] . '|' . $agent_key] = $agent_name;
}
}
enterprise_hook('metaconsole_restore_db');
}
echo "<td>".html_print_select ($agents, 'id_agents[]', 0, false, '', '', true, true, true, '', false, 'width:200px;')."</td>";
}
else {*/
echo "<td>".html_print_select (agents_get_group_agents(), 'id_agents[]', 0, false, '', '', true, true, true, '', false, 'width:300px;')."</td>";
//}
echo "<td>".html_print_select (agents_get_group_agents(), 'id_agents[]', 0, false, '', '', true, true, true, '', false, 'width:300px;')."</td>";
echo "<td style='vertical-align: center; text-align: center;'>" . html_print_image("images/darrowright.png", true) . "</td>";
echo "<td>".html_print_select (array (), 'module[]', 0, false, '', 0, true, true, true, '', false, 'width:300px;')."</td>";
echo "</tr><tr>";

18
pandora_console/godmode/reporting/graph_builder.main.php
View File

@ -58,7 +58,6 @@ if (! check_acl ($config['id_user'], 0, "RW")) {
if ($edit_graph) {
$graphInTgraph = db_get_row_sql("SELECT * FROM tgraph WHERE id_graph = " . $id_graph);
$stacked = $graphInTgraph['stacked'];
$events = $graphInTgraph['events'];
$period = $graphInTgraph['period'];
$name = $graphInTgraph['name'];
$description = $graphInTgraph['description'];
@ -74,8 +73,6 @@ else {
$width = 550;
$height = 210;
$period = SECONDS_1DAY;
//$alerts= "";
$events = 0;
$factor = 1;
$stacked = 0;
}
@ -147,21 +144,6 @@ $stackeds = array(
html_print_select ($stackeds, 'stacked', $stacked);
echo "</td>";
echo "<tr>";
echo "<td class='datos'>";
echo "<b>".__('View events')."</b></td>";
echo "<td class='datos'>";
html_print_checkbox('events', 1, $events);
echo "</td>";
echo "<td></td><td></td>";
/*echo "<td class='datos'>";
echo "<b>".__('View alerts')."</b></td>";
echo "<td class='datos'>";
html_print_checkbox('alerts', 1, $alerts);
echo "</td>";*/
echo "</tr>";
echo "<tr><td colspan='4' align='right'>";
if ($edit_graph) {
echo "<input type=submit name='store' class='sub upd' value='".__('Update')."'>";

7
pandora_console/godmode/reporting/graph_builder.php
View File

@ -71,7 +71,6 @@ if ($add_graph) {
$idGroup = get_parameter_post ('graph_id_group');
$width = get_parameter_post ("width");
$height = get_parameter_post ("height");
$events = get_parameter_post ("events");
$stacked = get_parameter ("stacked", 0);
$period = get_parameter_post ("period");
@ -79,13 +78,12 @@ if ($add_graph) {
$values = array(
'id_user' => $config['id_user'],
'name' => $name,
'description' => $description,
'description' => $description,
'period' => $period,
'width' => $width,
'height' => $height,
'private' => 0,
'id_group' => $idGroup,
'events' => $events,
'stacked' => $stacked);
if (trim($name) != "") {
@ -112,13 +110,12 @@ if ($update_graph) {
$height = get_parameter('height');
$period = get_parameter('period');
$stacked = get_parameter('stacked');
$events = get_parameter('events');
$alerts = get_parameter('alerts');
if (trim($name) != "") {
$success = db_process_sql_update('tgraph',
array('name' => $name, 'id_group' => $id_group, 'description' => $description, 'width' => $width, 'height' => $height, 'period' => $period, 'stacked' => $stacked, 'events' => $events),
array('name' => $name, 'id_group' => $id_group, 'description' => $description, 'width' => $width, 'height' => $height, 'period' => $period, 'stacked' => $stacked),
array('id_graph' => $id_graph));
if ($success !== false)
db_pandora_audit("Report management", "Update graph #$id_graph");