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

2012-12-18 Sergio Martin <sergio.martin@artica.es> 

* operation/events/events_list.php
	godmode/events/custom_events.php: Fixed
	a couple of bugs of style and event viewer
	normal



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7301 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2012-12-18 12:16:26 +00:00
parent e6c3925f36
commit f801b1bc75
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2012-12-18 Sergio Martin <sergio.martin@artica.es>
* operation/events/events_list.php
godmode/events/custom_events.php: Fixed
a couple of bugs of style and event viewer
normal
2012-12-18 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 2012-12-18 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_reporting.php: Resize URL item report to make it * include/functions_reporting.php: Resize URL item report to make it

2
pandora_console/godmode/events/custom_events.php
View File

@ -113,7 +113,7 @@ if ($fields_selected[0]!='') {
$result = __('ACK Timestamp'); $result = __('ACK Timestamp');
break; break;
case 'server_name': case 'server_name':
$result = __('Server'); $result = __('Server name');
break; break;
} }
$result_selected[$field_selected] = $result; $result_selected[$field_selected] = $result;

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

@ -797,7 +797,7 @@ foreach ($result as $event) {
$data[$i] = db_get_value('server_name','tmetaconsole_setup','id',$event["server_id"]); $data[$i] = db_get_value('server_name','tmetaconsole_setup','id',$event["server_id"]);
} }
else { else {
$data[$i] = db_get_value('name','tserver','id_server',$event["server_id"]); $data[$i] = db_get_value('name','tserver');
} }
$i++; $i++;
} }
@ -850,7 +850,7 @@ 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 class="'.$myclass.'">';
if ($event["id_agente"] > 0) { if ($event["id_agente"] > 0) {
// Agent name // Agent name