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

Visual Console Refactor: bugfix 

Former-commit-id: eaef1bbee481e54e96cd55e3b4fef7c5a852e84c
This commit is contained in:
Alejandro Gallardo Escobar 2019-04-22 12:07:48 +02:00
parent 9a186fcb8f
commit b93a016f50
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pandora_console/include/rest-api/models/VisualConsole/Item.php
View File

@ -674,6 +674,11 @@ class Item extends Model
global $config;
include_once $config['homedir'].'/include/functions_io.php';
if (\is_metaconsole()) {
\enterprise_include_once('include/functions_metaconsole.php');
\enterprise_include_once('meta/include/functions_ui_meta.php');
}
// Clean up to two levels of HTML entities.
$row = \io_safe_output(\io_safe_output($row));
@ -888,18 +893,12 @@ class Item extends Model
'pure' => (int) $config['pure'],
]
);
} else if (\is_metaconsole() && can_user_access_node()) {
} else if (\is_metaconsole() && \can_user_access_node()) {
/*
* A Visual Console from a meta node.
* We are in a metaconsole.
*/
\enterprise_include_once(
'include/functions_metaconsole.php'
);
\enterprise_include_once(
'meta/include/functions_ui_meta.php'
);
try {
$node = \metaconsole_get_connection_by_id(
$metaconsoleId
@ -959,19 +958,12 @@ class Item extends Model
}
return $baseUrl.'?'.http_build_query($queryParams);
} else if (\is_metaconsole() && can_user_access_node()) {
} else if (\is_metaconsole() && \can_user_access_node()) {
/*
* A module from a meta node.
* We are in a metaconsole.
*/
// A Visual Console from a meta node.
\enterprise_include_once(
'include/functions_metaconsole.php'
);
\enterprise_include_once(
'meta/include/functions_ui_meta.php'
);
try {
$node = \metaconsole_get_connection_by_id(
$metaconsoleId
@ -1046,18 +1038,12 @@ class Item extends Model
'id_agente' => $agentId,
]
);
} else if (\is_metaconsole() && can_user_access_node()) {
} else if (\is_metaconsole() && \can_user_access_node()) {
/*
* An agent from a meta node.
* We are in a metaconsole.
*/
\enterprise_include_once(
'include/functions_metaconsole.php'
);
\enterprise_include_once(
'meta/include/functions_ui_meta.php'
);
try {
$node = \metaconsole_get_connection_by_id(
$metaconsoleId