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

Merge branch 'ent-6250-Errores-log-consola' into 'develop' 

Ent 6250 errores log consola

Closes pandora_enterprise#6250

See merge request artica/pandorafms!3436
This commit is contained in:
Daniel Rodriguez 2020-09-15 15:30:07 +02:00
parent 56c79c8024 18a993145e
commit aceedbe795
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/ajax/module.php
View File

@ -150,6 +150,9 @@ if (check_login()) {
$date_to = (string) get_parameter('date_to', date(DATE_FORMAT, $utimestamp));
$time_to = (string) get_parameter('time_to', date(TIME_FORMAT, $utimestamp));
// Definition of new table.
$formtable = new stdClass();
$formtable->width = '98%';
$formtable->class = 'databox';
$formtable->data = [];
@ -327,6 +330,9 @@ if (check_login()) {
$result = array_slice($module_data, $offset, $block_size);
}
// Definition of new class.
$table = new stdClass();
$table->width = '100%';
$table->class = 'databox data';
$table->data = [];

4
pandora_console/include/functions_api.php
View File

@ -267,6 +267,10 @@ function isInACL($ip)
{
global $config;
if (! is_array($config['list_ACL_IPs_for_API'])) {
$config['list_ACL_IPs_for_API'] = explode(';', $config['list_ACL_IPs_for_API']);
}
if (in_array($ip, $config['list_ACL_IPs_for_API'])) {
return true;
}

8
pandora_console/include/functions_events.php
View File

@ -1042,7 +1042,13 @@ function events_get_all(
$tags = json_decode($tag_with, true);
if (is_array($tags) && !in_array('0', $tags)) {
if (!$user_is_admin) {
$user_tags = array_flip(tags_get_tags_for_module_search());
$getUserTags = tags_get_tags_for_module_search();
// Prevent false value for array_flip
if ($getUserTags === false) {
$getUserTags = [];
}
$user_tags = array_flip($getUserTags);
if ($user_tags != null) {
foreach ($tags as $id_tag) {
// User cannot filter with those tags.

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

@ -475,16 +475,16 @@ $tag_without = json_decode(base64_decode($tag_without), true);
foreach ($tags as $id_tag => $tag) {
if ((array_search($id_tag, $tag_with) === false)
|| (array_search($id_tag, $tag_with) === null)
if (is_array($tag_with) === true
&& ((array_search($id_tag, $tag_with) === false) || (array_search($id_tag, $tag_with) === null))
) {
$tags_select_with[$id_tag] = ui_print_truncate_text($tag, 50, true);
} else {
$tag_with_temp[$id_tag] = ui_print_truncate_text($tag, 50, true);
}
if ((array_search($id_tag, $tag_without) === false)
|| (array_search($id_tag, $tag_without) === null)
if (is_array($tag_without) === true
&& ((array_search($id_tag, $tag_without) === false) || (array_search($id_tag, $tag_without) === null))
) {
$tags_select_without[$id_tag] = ui_print_truncate_text($tag, 50, true);
} else {