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

2013-05-16 Miguel de Dios <miguel.dedios@artica.es> 

* operation/agentes/stat_win.php: disabled show events when the
	pandora node is set replication events.
	
	Fixes: #2216
	
	* operation/events/events.php: improve the source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8139 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-05-16 08:58:18 +00:00
parent 249f0b38f9
commit d3d36ae09e
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,3 +1,12 @@
2013-05-16 Miguel de Dios <miguel.dedios@artica.es>
* operation/agentes/stat_win.php: disabled show events when the
pandora node is set replication events.
Fixes: #2216
* operation/events/events.php: improve the source code style.
2013-05-16 Miguel de Dios <miguel.dedios@artica.es> 2013-05-16 Miguel de Dios <miguel.dedios@artica.es>
* ajax.php: fixed PHP warning when the HTTP_REFERER not set. * ajax.php: fixed PHP warning when the HTTP_REFERER not set.

13
pandora_console/operation/agentes/stat_win.php
View File

@ -281,7 +281,18 @@ $label = base64_decode(get_parameter('label', ''));
$data = array(); $data = array();
$data[0] = __('Show events'); $data[0] = __('Show events');
$data[1] = html_print_checkbox ("draw_events", 1, (bool) $draw_events, true); $disabled = false;
if (isset($config['event_replication'])) {
if ($config['event_replication']) {
$disabled = true;
}
}
$data[1] = html_print_checkbox ("draw_events", 1,
(bool)$draw_events, true, $disabled);
if ($disabled) {
$data[1] .= ui_print_help_tip(
__('Show events is disabled because this Pandora node is set the event replication.'), true);
}
$table->data[] = $data; $table->data[] = $data;
$table->rowclass[] = ''; $table->rowclass[] = '';

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

@ -46,8 +46,8 @@ $readonly = false;
if (!$meta) { if (!$meta) {
if (isset($config['event_replication']) && if (isset($config['event_replication']) &&
$config['event_replication'] == 1) { $config['event_replication'] == 1) {
if($config['show_events_in_local'] == 0) { if ($config['show_events_in_local'] == 0) {
db_pandora_audit("ACL Violation", db_pandora_audit("ACL Violation",
"Trying to access event viewer. View disabled due event replication."); "Trying to access event viewer. View disabled due event replication.");
ui_print_info_message('Event viewer is disabled due event replication. For more information, please contact with the administrator'); ui_print_info_message('Event viewer is disabled due event replication. For more information, please contact with the administrator');