tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

2013-04-17 Miguel de Dios <miguel.dedios@artica.es>

Browse Source 
* operation/visual_console/render_view.php,
	godmode/reporting/visual_console_builder.php,
	include/functions_events.php: some fixes about PHP warnings.
	
	Fixes: #3611022




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8009 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-04-18 09:25:23 +00:00
parent aebb74d46c
commit c6bacd7403
5 changed files with 169 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2013-04-17 Miguel de Dios <miguel.dedios@artica.es>
* operation/visual_console/render_view.php,
godmode/reporting/visual_console_builder.php,
include/functions_events.php: some fixes about PHP warnings.
Fixes: #3611022
2013-04-17 Miguel de Dios <miguel.dedios@artica.es> 2013-04-17 Miguel de Dios <miguel.dedios@artica.es>
* include/ajax/module.php: fixed the PHP warnings. * include/ajax/module.php: fixed the PHP warnings.

5
pandora_console/godmode/reporting/visual_console_builder.php
View File

@ -37,6 +37,8 @@ else {
$idVisualConsole = get_parameter('id_visual_console', 0); $idVisualConsole = get_parameter('id_visual_console', 0);
} }
$id_layout = 0;
if (!defined('METACONSOLE')) { if (!defined('METACONSOLE')) {
$action = get_parameterBetweenListValues('action', array('new', 'save', 'edit', 'update', 'delete'), 'new'); $action = get_parameterBetweenListValues('action', array('new', 'save', 'edit', 'update', 'delete'), 'new');
} }
@ -46,6 +48,7 @@ else {
$activeTab = get_parameterBetweenListValues('tab', array('data', 'list_elements', 'wizard', 'editor'), 'data'); $activeTab = get_parameterBetweenListValues('tab', array('data', 'list_elements', 'wizard', 'editor'), 'data');
$refr = (int) get_parameter ('refr', $config['vc_refr']);
//Save/Update data in DB //Save/Update data in DB
$statusProcessInDB = null; $statusProcessInDB = null;
@ -402,7 +405,7 @@ else {
} }
// Hash for auto-auth in public link // Hash for auto-auth in public link
$hash = md5($config["dbpass"]. $id_layout. $config["id_user"]); $hash = md5($config["dbpass"] . $id_layout . $config["id_user"]);
$buttons = array( $buttons = array(
'consoles_list' => array('active' => false, 'consoles_list' => array('active' => false,

6
pandora_console/include/functions.php
View File

@ -1229,10 +1229,10 @@ function return_graphtype ($id_module_type) {
case 24: case 24:
return "log4x"; return "log4x";
break; break;
} default:
return "sparse"; return "sparse";
break;
}
} }
/** /**

109
pandora_console/include/functions_events.php
View File

@ -749,14 +749,14 @@ function events_create_event ($event, $id_group, $id_agent, $status = 0, $id_use
function events_print_event_table ($filter = "", $limit = 10, $width = 440, $return = false, $agent_id = 0) { function events_print_event_table ($filter = "", $limit = 10, $width = 440, $return = false, $agent_id = 0) {
global $config; global $config;
if($agent_id == 0) { if ($agent_id == 0) {
$agent_condition = ''; $agent_condition = '';
} }
else { else {
$agent_condition = "id_agente = $agent_id AND"; $agent_condition = "id_agente = $agent_id AND";
} }
if($filter == '') { if ($filter == '') {
$filter = '1 = 1'; $filter = '1 = 1';
} }
@ -844,19 +844,19 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret
switch ($event["criticity"]) { switch ($event["criticity"]) {
default: default:
case 0: case EVENT_CRIT_MAINTENANCE:
$img = "images/status_sets/default/severity_maintenance.png"; $img = "images/status_sets/default/severity_maintenance.png";
break; break;
case 1: case EVENT_CRIT_INFORMATIONAL:
$img = "images/status_sets/default/severity_informational.png"; $img = "images/status_sets/default/severity_informational.png";
break; break;
case 2: case EVENT_CRIT_NORMAL:
$img = "images/status_sets/default/severity_normal.png"; $img = "images/status_sets/default/severity_normal.png";
break; break;
case 3: case EVENT_CRIT_WARNING:
$img = "images/status_sets/default/severity_warning.png"; $img = "images/status_sets/default/severity_warning.png";
break; break;
case 4: case EVENT_CRIT_CRITICAL:
$img = "images/status_sets/default/severity_critical.png"; $img = "images/status_sets/default/severity_critical.png";
break; break;
} }
@ -906,7 +906,7 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret
$out = '<table width="98%"><tr><td style="width: 90%; padding-right: 10px; vertical-align: top; padding-top: 0px;">'; $out = '<table width="98%"><tr><td style="width: 90%; padding-right: 10px; vertical-align: top; padding-top: 0px;">';
$out .= $events_table; $out .= $events_table;
if($agent_id != 0) { if ($agent_id != 0) {
$out .= '</td><td style="width: 200px; vertical-align: top;">'; $out .= '</td><td style="width: 200px; vertical-align: top;">';
$out .= '<table cellpadding=0 cellspacing=0 class="databox"><tr><td>'; $out .= '<table cellpadding=0 cellspacing=0 class="databox"><tr><td>';
$out .= '<fieldset class="databox tactical_set" style="width:93%;"> $out .= '<fieldset class="databox tactical_set" style="width:93%;">
@ -936,7 +936,7 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret
unset ($table); unset ($table);
if($return) { if ($return) {
return $out; return $out;
} }
else { else {
@ -1301,31 +1301,44 @@ function events_get_event_types ($type_id){
$type_desc = ''; $type_desc = '';
switch($type_id) { switch($type_id) {
case 'unknown': $type_desc = __('Unknown'); case 'unknown':
$type_desc = __('Unknown');
break; break;
case 'critical': $type_desc = __('Monitor Critical'); case 'critical':
$type_desc = __('Monitor Critical');
break; break;
case 'warning': $type_desc = __('Monitor Warning'); case 'warning':
$type_desc = __('Monitor Warning');
break; break;
case 'normal': $type_desc = __('Monitor Normal'); case 'normal':
$type_desc = __('Monitor Normal');
break; break;
case 'alert_fired': $type_desc = __('Alert fired'); case 'alert_fired':
$type_desc = __('Alert fired');
break; break;
case 'alert_recovered': $type_desc = __('Alert recovered'); case 'alert_recovered':
$type_desc = __('Alert recovered');
break; break;
case 'alert_ceased': $type_desc = __('Alert ceased'); case 'alert_ceased':
$type_desc = __('Alert ceased');
break; break;
case 'alert_manual_validation': $type_desc = __('Alert manual validation'); case 'alert_manual_validation':
$type_desc = __('Alert manual validation');
break; break;
case 'recon_host_detected': $type_desc = __('Recon host detected'); case 'recon_host_detected':
$type_desc = __('Recon host detected');
break; break;
case 'system': $type_desc = __('System'); case 'system':
$type_desc = __('System');
break; break;
case 'error': $type_desc = __('Error'); case 'error':
$type_desc = __('Error');
break; break;
case 'configuration_change': $type_desc = __('Configuration change'); case 'configuration_change':
$type_desc = __('Configuration change');
break; break;
case 'not_normal': $type_desc = __('Not normal'); case 'not_normal':
$type_desc = __('Not normal');
break; break;
default: default:
if (isset($config['text_char_long'])) { if (isset($config['text_char_long'])) {
@ -1355,19 +1368,19 @@ function events_get_severity_types ($severity_id){
$severity_desc = ''; $severity_desc = '';
switch ($severity_id) { switch ($severity_id) {
case 0: case EVENT_CRIT_MAINTENANCE:
$severity_desc = __('Maintenance'); $severity_desc = __('Maintenance');
break; break;
case 1: case EVENT_CRIT_INFORMATIONAL:
$severity_desc = __('Informational'); $severity_desc = __('Informational');
break; break;
case 2: case EVENT_CRIT_NORMAL:
$severity_desc = __('Normal'); $severity_desc = __('Normal');
break; break;
case 3: case EVENT_CRIT_WARNING:
$severity_desc = __('Warning'); $severity_desc = __('Warning');
break; break;
case 4: case EVENT_CRIT_CRITICAL:
$severity_desc = __('Critical'); $severity_desc = __('Critical');
break; break;
default: default:
@ -1389,7 +1402,7 @@ function events_get_severity_types ($severity_id){
* *
* @return array Status description array. * @return array Status description array.
*/ */
function events_get_all_status (){ function events_get_all_status () {
$fields = array (); $fields = array ();
$fields[-1] = __('All event'); $fields[-1] = __('All event');
$fields[0] = __('Only new'); $fields[0] = __('Only new');
@ -1446,7 +1459,7 @@ function events_check_event_filter_group ($id_filter) {
$groups_id = array(); $groups_id = array();
$has_permission = false; $has_permission = false;
foreach($groups_user as $key => $groups){ foreach ($groups_user as $key => $groups) {
if ($groups['id_grupo'] == $id_group) if ($groups['id_grupo'] == $id_group)
return true; return true;
} }
@ -1460,7 +1473,9 @@ function events_check_event_filter_group ($id_filter) {
* @return array * @return array
*/ */
function events_get_macros() { function events_get_macros() {
return array('_agent_address_' => __('Agent address'), '_agent_id_' => __('Agent id'), '_event_id_' => __('Event id')); return array('_agent_address_' => __('Agent address'),
'_agent_id_' => __('Agent id'),
'_event_id_' => __('Event id'));
} }
/** /**
@ -1474,11 +1489,11 @@ function events_get_macros() {
*/ */
function events_get_event_filter ($id_filter, $filter = false, $fields = false) { function events_get_event_filter ($id_filter, $filter = false, $fields = false) {
if (empty($id_filter)){ if (empty($id_filter)) {
return false; return false;
} }
if (! is_array ($filter)){ if (! is_array ($filter)) {
$filter = array (); $filter = array ();
$filter['id_filter'] = (int) $id_filter; $filter['id_filter'] = (int) $id_filter;
} }
@ -1502,10 +1517,10 @@ function events_get_event_filter_select(){
$event_filters = db_get_all_rows_sql($sql); $event_filters = db_get_all_rows_sql($sql);
if ($event_filters === false){ if ($event_filters === false) {
return array(); return array();
} }
else{ else {
$result = array(); $result = array();
foreach ($event_filters as $event_filter){ foreach ($event_filters as $event_filter){
$result[$event_filter['id_filter']] = $event_filter['id_name']; $result[$event_filter['id_filter']] = $event_filter['id_name'];
@ -1893,11 +1908,19 @@ function events_page_details ($event, $server = "") {
$data = array(); $data = array();
$data[0] = '<div style="font-weight:normal; margin-left: 20px;">'.__('Graph').'</div>'; $data[0] = '<div style="font-weight:normal; margin-left: 20px;">'.__('Graph').'</div>';
$graph_type = return_graphtype ($module["module_type"]); $module_module_type = -1;
if (isset($module["module_type"])) {
$module_module_type = $module["module_type"];
}
$graph_type = return_graphtype ($module_module_type);
$win_handle=dechex(crc32($module["id_agente_modulo"].$module["module_name"])); $win_handle=dechex(crc32($module["id_agente_modulo"].$module["module_name"]));
$link ="winopeng('".$serverstring."operation/agentes/stat_win.php?type=".$graph_type."&period=86400&id=" . $module["id_agente_modulo"] . "&label=" . base64_encode($module["module_name"].$hashstring) . "&refresh=600','day_".$win_handle."')"; $module_module_name = '';
if (isset($module["module_name"])) {
$module_module_name = $module["module_name"];
}
$link ="winopeng('" . $serverstring . "operation/agentes/stat_win.php?type=" . $graph_type."&period=86400&id=" . $module["id_agente_modulo"] . "&label=" . base64_encode($module_module_name . $hashstring) . "&refresh=600','day_".$win_handle."')";
$data[1] = '<a href="javascript:'.$link.'">'; $data[1] = '<a href="javascript:'.$link.'">';
$data[1] .= html_print_image('images/chart_curve.png',true); $data[1] .= html_print_image('images/chart_curve.png',true);
@ -1910,7 +1933,7 @@ function events_page_details ($event, $server = "") {
$data[1] = $event["id_alert_am"] == 0 ? '<i>' . __('N/A') . '</i>' : ''; $data[1] = $event["id_alert_am"] == 0 ? '<i>' . __('N/A') . '</i>' : '';
$table_details->data[] = $data; $table_details->data[] = $data;
if($event["id_alert_am"] != 0) { if ($event["id_alert_am"] != 0) {
$data = array(); $data = array();
$data[0] = '<div style="font-weight:normal; margin-left: 20px;">'.__('Source').'</div>'; $data[0] = '<div style="font-weight:normal; margin-left: 20px;">'.__('Source').'</div>';
$data[1] = '<a href="'.$serverstring.'index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$event["id_agente"].'&amp;tab=alert'.$hashstring.'">'; $data[1] = '<a href="'.$serverstring.'index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$event["id_agente"].'&amp;tab=alert'.$hashstring.'">';
@ -2023,9 +2046,9 @@ function events_page_general ($event) {
//$group_rep = $event['similar_ids'] == -1 ? 1 : count(explode(',',$event['similar_ids'])); //$group_rep = $event['similar_ids'] == -1 ? 1 : count(explode(',',$event['similar_ids']));
global $group_rep; global $group_rep;
///////// ////////////////////////////////////////////////////////////////////
// General // General
///////// ////////////////////////////////////////////////////////////////////
$table_general->width = '100%'; $table_general->width = '100%';
$table_general->data = array (); $table_general->data = array ();
@ -2056,7 +2079,7 @@ function events_page_general ($event) {
$data = array(); $data = array();
$data[0] = __('Owner'); $data[0] = __('Owner');
if(empty($event["owner_user"])) { if (empty($event["owner_user"])) {
$data[1] = '<i>'.__('N/A').'</i>'; $data[1] = '<i>'.__('N/A').'</i>';
} }
else { else {
@ -2125,7 +2148,7 @@ function events_page_general ($event) {
$data = array(); $data = array();
$data[0] = __('Acknowledged by'); $data[0] = __('Acknowledged by');
if($event['estado'] == 1) { if ($event['estado'] == 1) {
$user_ack = db_get_value('fullname', 'tusuario', 'id_user', $event['id_usuario']); $user_ack = db_get_value('fullname', 'tusuario', 'id_user', $event['id_usuario']);
if(empty($user_ack)) { if(empty($user_ack)) {
$user_ack = $event['id_usuario']; $user_ack = $event['id_usuario'];
@ -2163,9 +2186,9 @@ function events_page_general ($event) {
} }
function events_page_comments ($event) { function events_page_comments ($event) {
///////// ////////////////////////////////////////////////////////////////////
// Comments // Comments
///////// ////////////////////////////////////////////////////////////////////
global $config; global $config;
$table_comments->width = '100%'; $table_comments->width = '100%';

20
pandora_console/operation/visual_console/render_view.php
View File

@ -25,9 +25,27 @@ if (!defined('METACONSOLE'))
else else
$id_layout = (int) get_parameter ('id_visualmap'); $id_layout = (int) get_parameter ('id_visualmap');
if (!defined('METACONSOLE')) {
if ($id_layout) {
$default_action = 'edit';
}
else {
$default_action = 'new';
}
$action = get_parameterBetweenListValues('action', array('new', 'save', 'edit', 'update', 'delete'), $default_action);
}
else {
$action = get_parameterBetweenListValues('action2', array('new', 'save', 'edit', 'update', 'delete'), $default_action);
}
$refr = (int) get_parameter ('refr', $config['vc_refr']); $refr = (int) get_parameter ('refr', $config['vc_refr']);
$vc_refr = false; $vc_refr = false;
if (isset($config['vc_refr']) and $config['vc_refr'] != 0)
$view_refresh = $config['vc_refr'];
else
$view_refresh = '60';
// Get input parameter for layout id // Get input parameter for layout id
if (! $id_layout) { if (! $id_layout) {
db_pandora_audit("ACL Violation","Trying to access visual console without id layout"); db_pandora_audit("ACL Violation","Trying to access visual console without id layout");
@ -50,7 +68,7 @@ $background = $layout["background"];
$bwidth = $layout["width"]; $bwidth = $layout["width"];
$bheight = $layout["height"]; $bheight = $layout["height"];
$pure_url = "&pure=".$config["pure"]; $pure_url = "&pure=" . $config["pure"];
if (! check_acl ($config["id_user"], $id_group, "RR")) { if (! check_acl ($config["id_user"], $id_group, "RR")) {
db_pandora_audit("ACL Violation", "Trying to access visual console without group access"); db_pandora_audit("ACL Violation", "Trying to access visual console without group access");