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-13063-bug-merging-tool-al-cambiar-orden-de-prioridad' into 'develop' 

fixed mergetool pandora_enterprise#13063

See merge request artica/pandorafms!7147
This commit is contained in:
Rafael Ameijeiras 2024-04-09 13:48:17 +00:00
parent 95d25eab2c 6c4c43daee
commit e826a46a87
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pandora_console/include/api.php
View File

@ -114,6 +114,7 @@ if ($info === 'version') {
exit; exit;
} }
$user_in_db = null;
if (empty($apiPassword) === true if (empty($apiPassword) === true
|| (empty($apiPassword) === false && $api_password === $apiPassword) || (empty($apiPassword) === false && $api_password === $apiPassword)
|| $apiTokenValid === true || $apiTokenValid === true

4
pandora_console/include/class/ConsoleSupervisor.php
View File

@ -3137,7 +3137,7 @@ class ConsoleSupervisor
return; return;
} }
$sync = new PandoraFMS\Enterprise\Metaconsole\Synchronizer(true); $sync = new PandoraFMS\Enterprise\Metaconsole\Synchronizer();
$counts = $sync->getQueues(true); $counts = $sync->getQueues(true);
if (count($counts) === 0) { if (count($counts) === 0) {
@ -3195,7 +3195,7 @@ class ConsoleSupervisor
return; return;
} }
$sync = new PandoraFMS\Enterprise\Metaconsole\Synchronizer(true); $sync = new PandoraFMS\Enterprise\Metaconsole\Synchronizer();
$queues = $sync->getQueues(); $queues = $sync->getQueues();
if (count($queues) === 0) { if (count($queues) === 0) {
// Clean all. // Clean all.

2
pandora_console/include/functions.php
View File

@ -470,7 +470,7 @@ function get_user_language($id_user=null)
if ($id_user !== null) { if ($id_user !== null) {
$userinfo = get_user_info($id_user); $userinfo = get_user_info($id_user);
if ($userinfo['language'] != 'default') { if (isset($userinfo['language']) === true && $userinfo['language'] != 'default') {
return $userinfo['language']; return $userinfo['language'];
} }
} }