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

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

* operation/events/events_list: Display all fields including 
	empty values.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5599 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
vgilc 2012-02-14 17:29:40 +00:00
parent 15c42f53e6
commit 4ad6579a08
2 changed files with 121 additions and 85 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-14 Vanessa Gil <vanessa.gil@artica.es>
* operation/events/events_list: Display all fields including
empty values.
2012-02-13 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql: Migrate

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

@ -842,6 +842,7 @@ foreach ($result as $event) {
$data[$i] = html_print_checkbox_extended ("eventid[]", $event["id_evento"], false, false, false, 'class="chk"', true);
array_push ($table->data, $data);
}
//Hiden row with description form
$string = '';//$string = '<form method="post" action="'.$url.'&amp;section=list">';
$string .= '<table border="0" style="width:80%; margin-left: 10%;"><tr><td align="left" valign="top" width="30px">';
@ -916,14 +917,16 @@ foreach ($result as $event) {
$odd = 'rowOdd';
if ($event["id_agente"] != 0) {
$string .= '<td align="left" valign="top" width="15%">';
$string .= '<b>' . __('Agent name') . '</b></td><td align="left">';
if ($event["id_agente"] != 0) {
$string .= ui_print_agent_name ($event["id_agente"], true);
$string .= '</td></tr><tr>';
} else {
$string .= '<i>- ' . __('Empty') . ' -</i>';
}
$string .= '</td></tr><tr class="'. $odd .'">';
//$odd = 'rowOdd';
$odd = ($odd == '')? 'rowOdd' : '';
}
if ($event["id_agentmodule"] != 0) {
$string .= '<td align="left" valign="top" width="15%">';
@ -943,11 +946,23 @@ foreach ($result as $event) {
$string .= '</a></td></tr><tr class="' . $odd . '">';
//$odd = 'rowOdd';
$odd = ($odd == '')? 'rowOdd' : '';
} else {
$string .= '<td align="left" valign="top" width="15%">';
$string .= '<b>' . __('Agent module') . '</b></td><td align="left">';
$string .= '<i>- ' . __('Empty') . ' -</i>';
$string .= '</a></td></tr><tr class="' . $odd . '">';
$odd = ($odd == '')? 'rowOdd' : '';
// Module group
$string .= '<td align="left" valign="top" width="15%">';
$string .= '<b>' . __('Module group') . '</b></td><td align="left">';
$string .= '<i>- ' . __('Empty') . ' -</i>';
$string .= '</a></td></tr><tr class="' . $odd . '">';
$odd = ($odd == '')? 'rowOdd' : '';
}
if ($event["id_alert_am"] != 0) {
$string .= '<td align="left" valign="top" width="15%">';
$string .= '<b>' . __('Alert source') . '</b></td><td align="left">';
if ($event["id_alert_am"] != 0) {
$string .= '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$event["id_agente"].'&amp;tab=alert">';
$standby = db_get_value('standby', 'talert_template_modules', 'id', $event["id_alert_am"]);
if(!$standby) {
@ -979,6 +994,10 @@ foreach ($result as $event) {
$string .= '</td></tr><tr>';
$odd = ($odd == '')? 'rowOdd' : '';
}
} else {
$string .= '<i>- ' . __('Empty') . ' -</i>';
$string .= '</a></td></tr><tr class="' . $odd . '">';
$odd = ($odd == '')? 'rowOdd' : '';
}
$string .= '<td align="left" valign="top" width="15%">';
@ -1034,17 +1053,19 @@ foreach ($result as $event) {
}
$string = rtrim($string, ',');
$odd = ($odd == '')? 'rowOdd' : '';
}
else {
} else {
$string .= '<i>- ' . __('Empty') . ' -</i>';
$odd = ($odd == '')? 'rowOdd' : '';
}
if ($event["criticity"] != 0) {
$string .= '<tr class="' . $odd . '"><td align="left" valign="top">' . '<b>' . __('Criticity') . '</td><td align="left">';
if ($event["criticity"] != 0) {
$string .= $event["criticity"];
} else {
$string .= '<i>- ' . __('Empty') . ' -</i>';
}
$string .= '</td></tr><tr>';
$odd = ($odd == '')? 'rowOdd' : '';
}
$string .= '<tr class="' . $odd . '"><td align="left" valign="top">' . '<b>' . __('Source') . '</td><td align="left">';
if ($event["source"] != '') {
$string .= $event["source"];
@ -1063,6 +1084,17 @@ foreach ($result as $event) {
$string .= '<i>- ' . __('Empty') . ' -</i>';
}
$string .= '</td></tr>';
$odd = ($odd == '')? 'rowOdd' : '';
$string .= '<tr class="' . $odd . '"><td align="left" valign="top">' . '<b>' . __('User name') . '</td><td align="left">';
if ($event["id_usuario"]!= '0') {
$string .= $event["id_usuario"];
}
else {
$string .= '<i>- ' . __('Empty') . ' -</i>';
}
$string .= '</td></tr><tr>';
$string .= '</table>';
$data = array($string);