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

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

* operation/events/events_list.php: Show event id in view events.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5462 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
vgilc 2012-02-01 12:49:01 +00:00
parent d1b97ef985
commit 99436b8068
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/ChangeLog
View File

@ -1,3 +1,7 @@
2012-02-01 Vanessa Gil <vanessa.gil@artica.es>
* operation/events/events_list.php: Show event id in view events.
2012-02-01 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 2012-02-01 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* general/shortcut_bar.php: Fixed realtime update of alerts counter. * general/shortcut_bar.php: Fixed realtime update of alerts counter.

2
pandora_console/index.php
View File

@ -21,7 +21,7 @@ if (function_exists ('mb_internal_encoding')) {
// Set to 1 to do not check for installer or config file (for development!). // Set to 1 to do not check for installer or config file (for development!).
// Activate gives more error information, not useful for production sites // Activate gives more error information, not useful for production sites
$develop_bypass = 1; $develop_bypass = 0;
if ($develop_bypass != 1) { if ($develop_bypass != 1) {
// If no config file, automatically try to install // If no config file, automatically try to install

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

@ -583,10 +583,15 @@ foreach ($result as $event) {
//Hiden row with extended description //Hiden row with extended description
$string = '<table width="99%" style="border:solid 1px #D3D3D3;" class="toggle" cellpadding="6"><tr>'; $string = '<table width="99%" style="border:solid 1px #D3D3D3;" class="toggle" cellpadding="6"><tr>';
$string .= '<td align="left" valign="top" width="25%" border="solid 1px">';
$string .= '<b>' . __('Event ID') . '</b></td><td align="left">';
$string .= io_safe_output($event["id_evento"]);
$string .= '</td></tr><tr class="rowOdd">';
$string .= '<td align="left" valign="top" width="25%" border="solid 1px">'; $string .= '<td align="left" valign="top" width="25%" border="solid 1px">';
$string .= '<b>' . __('Event name') . '</b></td><td align="left">'; $string .= '<b>' . __('Event name') . '</b></td><td align="left">';
$string .= io_safe_output($event["evento"]); $string .= io_safe_output($event["evento"]);
$string .= '</td></tr><tr style="border-left: solid 1px; #D3D3D3;" class="rowOdd">'; $string .= '</td></tr><tr>';
$string .= '<td align="left" valign="top" width="15%">'; $string .= '<td align="left" valign="top" width="15%">';
$string .= '<b>' . __('Severity') . '</b></td><td align="left">'; $string .= '<b>' . __('Severity') . '</b></td><td align="left">';
$string .= html_print_image ($img_sev, true, $string .= html_print_image ($img_sev, true,
@ -595,16 +600,16 @@ foreach ($result as $event) {
"height" => 12, "height" => 12,
"title" => get_priority_name ($event["criticity"]))); "title" => get_priority_name ($event["criticity"])));
$string .= ' '.get_priority_name ($event["criticity"]); $string .= ' '.get_priority_name ($event["criticity"]);
$string .= '</td></tr><tr>'; $string .= '</td></tr><tr style="border-left: solid 1px; #D3D3D3;" class="rowOdd">';
$string .= '<td align="left" valign="top" width="15%">'; $string .= '<td align="left" valign="top" width="15%">';
$string .= '<b>' . __('Type') . '</b></td><td align="left">'; $string .= '<b>' . __('Type') . '</b></td><td align="left">';
$string .= events_print_type_img ($event["event_type"], true).' '.events_print_type_description($event["event_type"], true); $string .= events_print_type_img ($event["event_type"], true).' '.events_print_type_description($event["event_type"], true);
$string .= '</td></tr><tr class="rowOdd">'; $string .= '</td></tr><tr>';
$string .= '<td align="left" valign="top" width="15%">'; $string .= '<td align="left" valign="top" width="15%">';
$string .= '<b>' . __('Status') . '</b></td><td align="left">'; $string .= '<b>' . __('Status') . '</b></td><td align="left">';
$string .= $title_st; $string .= $title_st;
$string .= '</td></tr><tr>'; $string .= '</td></tr><tr style="border-left: solid 1px; #D3D3D3;" class="rowOdd">';
$string .= '<td align="left" valign="top" width="15%">'; $string .= '<td align="left" valign="top" width="15%">';
$string .= '<b>' . __('Timestamp') . '</b></td><td align="left">'; $string .= '<b>' . __('Timestamp') . '</b></td><td align="left">';
if ($group_rep == 1) { if ($group_rep == 1) {
$string .= date ($config["date_format"], $event['timestamp_rep']); $string .= date ($config["date_format"], $event['timestamp_rep']);
@ -612,8 +617,9 @@ foreach ($result as $event) {
else { else {
$string .= date ($config["date_format"], strtotime($event["timestamp"])); $string .= date ($config["date_format"], strtotime($event["timestamp"]));
} }
$string .= '</td></tr><tr class="rowOdd">'; $string .= '</td></tr><tr>';
$odd = '';
$odd = 'rowOdd';
if ($event["id_agente"] != 0) { if ($event["id_agente"] != 0) {
$string .= '<td align="left" valign="top" width="15%">'; $string .= '<td align="left" valign="top" width="15%">';