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

2012-02-16 Vanessa Gil <vanessa.gil@artica.es> 

* include/functions_events.php 
	  operation/events/events_list: In event list: display always user name, 
	changed buttons, changed event type.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5609 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
vgilc 2012-02-16 09:38:03 +00:00
parent 69c84e8efc
commit 8e0f58dc32
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2012-02-16 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_events.php
operation/events/events_list: In event list: display always user name,
changed buttons, changed event type.
2012-02-16 Sergio Martin <sergio.martin@artica.es> 2012-02-16 Sergio Martin <sergio.martin@artica.es>
* godmode/alerts/alert_list.builder.php: Fixed creation alerts * godmode/alerts/alert_list.builder.php: Fixed creation alerts

11
pandora_console/include/functions_events.php
View File

@ -631,6 +631,15 @@ function events_print_type_description ($type, $return = false) {
case "new_agent"; case "new_agent";
$output .= __('New agent created'); $output .= __('New agent created');
break; break;
case "configuration_change";
$output .= __('Configuration change');
break;
case "alert_ceased";
$output .= __('Alert ceased');
break;
case "error";
$output .= __('Error');
break;
case "unknown": case "unknown":
default: default:
$output .= __('Unknown type:').': '.$type; $output .= __('Unknown type:').': '.$type;
@ -769,6 +778,8 @@ function events_get_event_types ($type_id){
break; break;
case 'error': $type_desc = __('Error'); case 'error': $type_desc = __('Error');
break; break;
case 'configuration_change': $type_desc = __('Configuration change');
break;
case 'not_normal': $type_desc = __('Not normal'); case 'not_normal': $type_desc = __('Not normal');
break; break;
default: default:

13
pandora_console/operation/events/events_list.php
View File

@ -19,6 +19,7 @@ global $config;
require_once ("include/functions_events.php"); //Event processing functions require_once ("include/functions_events.php"); //Event processing functions
require_once ("include/functions_alerts.php"); //Alerts processing functions require_once ("include/functions_alerts.php"); //Alerts processing functions
require_once ("include/functions.php");
require_once($config['homedir'] . "/include/functions_agents.php"); //Agents funtions require_once($config['homedir'] . "/include/functions_agents.php"); //Agents funtions
require_once($config['homedir'] . "/include/functions_users.php"); //Users functions require_once($config['homedir'] . "/include/functions_users.php"); //Users functions
require_once ($config['homedir'] . '/include/functions_groups.php'); require_once ($config['homedir'] . '/include/functions_groups.php');
@ -701,10 +702,8 @@ foreach ($result as $event) {
if (in_array('id_agente', $show_fields)) { if (in_array('id_agente', $show_fields)) {
$data[$i] = '<span style="color: #000000">'; $data[$i] = '<span style="color: #000000">';
if ($event["event_type"] == "system") {
$data[$i] .= __('System'); if ($event["id_agente"] > 0) {
}
elseif ($event["id_agente"] > 0) {
// Agent name // Agent name
$data[$i] .= ui_print_agent_name ($event["id_agente"], true); $data[$i] .= ui_print_agent_name ($event["id_agente"], true);
} }
@ -860,7 +859,7 @@ foreach ($result as $event) {
$string .= '<a class="validate_event" href="javascript: toggleCommentForm(' . $event['id_evento'] . ')" id="validate-'.$event["id_evento"].'">'; $string .= '<a class="validate_event" href="javascript: toggleCommentForm(' . $event['id_evento'] . ')" id="validate-'.$event["id_evento"].'">';
$string .= html_print_button (__('Change status'), 'validate', false, '', 'class="sub ok validate_event" id="validate-'.$event["id_evento"].'"', true).'</div>'; $string .= html_print_button (__('Update'), 'validate', false, '', 'class="sub ok validate_event" id="validate-'.$event["id_evento"].'"', true).'</div>';
$string .= '</a>'; $string .= '</a>';
$string .= '</td><td width="400px">'; $string .= '</td><td width="400px">';
if($event["id_alert_am"] != 0) { if($event["id_alert_am"] != 0) {
@ -1087,7 +1086,7 @@ foreach ($result as $event) {
$odd = ($odd == '')? 'rowOdd' : ''; $odd = ($odd == '')? 'rowOdd' : '';
$string .= '<tr class="' . $odd . '"><td align="left" valign="top">' . '<b>' . __('User name') . '</td><td align="left">'; $string .= '<tr class="' . $odd . '"><td align="left" valign="top">' . '<b>' . __('User name') . '</td><td align="left">';
if ($event["id_usuario"]!= '0') { if ($event["id_usuario"]!= 0) {
$string .= $event["id_usuario"]; $string .= $event["id_usuario"];
} }
else { else {
@ -1120,7 +1119,7 @@ if (!empty ($table->data)) {
echo '<div style="width:'.$table->width.';" class="action-buttons">'; echo '<div style="width:'.$table->width.';" class="action-buttons">';
if (check_acl ($config["id_user"], 0, "IW") == 1) { if (check_acl ($config["id_user"], 0, "IW") == 1) {
html_print_submit_button (__('Change status'), 'validate_btn', false, 'class="sub ok"'); html_print_submit_button (__('Update'), 'validate_btn', false, 'class="sub ok"');
} }
if (check_acl ($config["id_user"], 0,"IM") == 1) { if (check_acl ($config["id_user"], 0,"IM") == 1) {