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

Fixed the event list when it is setted the replication, now the info message show again.

This commit is contained in:
mdtrooper 2015-05-22 13:10:05 +02:00
parent f009758e93
commit 3d32d5645e
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,8 @@ require_once ($config['homedir'].'/include/functions_ui.php');
check_login ();
if (! check_acl ($config["id_user"], 0, "ER")) {
db_pandora_audit("ACL Violation",
"Trying to access event viewer");
@ -46,10 +48,7 @@ if (!$meta) {
if (isset($config['event_replication']) &&
$config['event_replication'] == 1) {
if ($config['show_events_in_local'] == 0) {
return;
}
else {
if ((bool)$config['show_events_in_local']) {
$readonly = true;
}
}
@ -223,6 +222,8 @@ $date_from = (string)get_parameter('date_from', '');
$date_to = (string)get_parameter('date_to', '');
$server_id = (int)get_parameter('server_id', 0);
$text_agent = (string) get_parameter("text_agent");
$id_agent = get_parameter('id_agent', 0);
if ($id_agent != 0) {
@ -243,6 +244,7 @@ if ($id_agent_module != 0) {
}
$tag_with_json = base64_decode(get_parameter("tag_with", '')) ;
$tag_with_json_clean = io_safe_output($tag_with_json);
$tag_with_base64 = base64_encode($tag_with_json_clean);
@ -263,6 +265,8 @@ users_get_groups ($config["id_user"], "ER");
$ids = (array) get_parameter ("eventid", -1);
$params = "search=" . rawurlencode(io_safe_input($search)) .
"&event_type=" . $event_type .
"&severity=" . $severity .
@ -295,6 +299,8 @@ if ($meta) {
$url = "index.php?sec=eventos&sec2=operation/events/events&" . $params;
// Header
if ($config["pure"] == 0 || $meta) {
$pss = get_user_info($config['id_user']);

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

@ -35,12 +35,13 @@ if (! check_acl ($config["id_user"], 0, "ER")) {
return;
}
if(defined('METACONSOLE')){
if (defined('METACONSOLE')) {
$jump = '  ';
}
else{
else {
$jump = "<br>";
}
if (is_ajax()) {
$get_filter_values = get_parameter('get_filter_values', 0);
$save_event_filter = get_parameter('save_event_filter', 0);
@ -141,7 +142,7 @@ $strict_user = db_get_value('strict_acl', 'tusuario', 'id_user', $config['id_use
$tags = tags_get_user_tags($config['id_user'], 'ER');
if ($id_agent == 0 && $text_agent != '') {
if ($id_agent == 0 && $text_agent != __('All')) {
$id_agent = -1;
}