mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-28 00:04:37 +02:00
Merge branch 'ent-7228-Errores-en-las-Visual-consoles-de-Metaconsola' into 'develop'
fixed minor error See merge request artica/pandorafms!3967
This commit is contained in:
commit
48b299ba67
@ -122,10 +122,10 @@ if ($action == 'new') {
|
|||||||
src="">';
|
src="">';
|
||||||
} else {
|
} else {
|
||||||
if (defined('METACONSOLE')) {
|
if (defined('METACONSOLE')) {
|
||||||
$table->data[0][2] = '<img id="imagen2"
|
$table->data[0][2] = '<img id="imagen2" style="width:230px;"
|
||||||
src="../../images/console/background/'.$background.'">';
|
src="../../images/console/background/'.$background.'">';
|
||||||
} else {
|
} else {
|
||||||
$table->data[0][2] = '<img id="imagen2"
|
$table->data[0][2] = '<img id="imagen2" style="width:230px;"
|
||||||
src="images/console/background/'.$background.'">';
|
src="images/console/background/'.$background.'">';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -20,10 +20,13 @@ require_once $config['homedir'].'/include/functions_visual_map.php';
|
|||||||
require_once $config['homedir'].'/include/functions_agents.php';
|
require_once $config['homedir'].'/include/functions_agents.php';
|
||||||
enterprise_include_once('include/functions_visual_map.php');
|
enterprise_include_once('include/functions_visual_map.php');
|
||||||
|
|
||||||
// Retrieve the visual console id
|
// Retrieve the visual console id.
|
||||||
set_unless_defined($idVisualConsole, 0);
|
set_unless_defined($idVisualConsole, 0);
|
||||||
// Set default
|
// Set default.
|
||||||
$idVisualConsole = get_parameter('id_visual_console', $idVisualConsole);
|
$idVisualConsole = get_parameter('id_visual_console', $idVisualConsole);
|
||||||
|
if (empty($idVisualConsole) === true) {
|
||||||
|
$idVisualConsole = get_parameter('id_visualmap', 0);
|
||||||
|
}
|
||||||
|
|
||||||
if (!defined('METACONSOLE')) {
|
if (!defined('METACONSOLE')) {
|
||||||
$action_name_parameter = 'action';
|
$action_name_parameter = 'action';
|
||||||
@ -795,7 +798,7 @@ $buttons['view'] = [
|
|||||||
'text' => '<a href="'.$url_view.'">'.html_print_image('images/operation.png', true, ['title' => __('View'), 'class' => 'invert_filter']).'</a>',
|
'text' => '<a href="'.$url_view.'">'.html_print_image('images/operation.png', true, ['title' => __('View'), 'class' => 'invert_filter']).'</a>',
|
||||||
];
|
];
|
||||||
|
|
||||||
if ($action == 'new' || $idVisualConsole === false) {
|
if ($idVisualConsole === false) {
|
||||||
$buttons = ['data' => $buttons['data']];
|
$buttons = ['data' => $buttons['data']];
|
||||||
// Show only the data tab
|
// Show only the data tab
|
||||||
// If it is a fail try, reset the values
|
// If it is a fail try, reset the values
|
||||||
@ -822,7 +825,7 @@ if ($statusProcessInDB !== null) {
|
|||||||
echo $statusProcessInDB['message'];
|
echo $statusProcessInDB['message'];
|
||||||
}
|
}
|
||||||
|
|
||||||
// The source code for PAINT THE PAGE
|
// The source code for PAINT THE PAGE.
|
||||||
switch ($activeTab) {
|
switch ($activeTab) {
|
||||||
case 'wizard':
|
case 'wizard':
|
||||||
include_once $config['homedir'].'/godmode/reporting/visual_console_builder.wizard.php';
|
include_once $config['homedir'].'/godmode/reporting/visual_console_builder.wizard.php';
|
||||||
|
@ -16,7 +16,7 @@ global $config;
|
|||||||
check_login();
|
check_login();
|
||||||
|
|
||||||
// Visual console required.
|
// Visual console required.
|
||||||
if (empty($visualConsole)) {
|
if (empty($visualConsole) === true) {
|
||||||
db_pandora_audit(
|
db_pandora_audit(
|
||||||
'ACL Violation',
|
'ACL Violation',
|
||||||
'Trying to access report builder'
|
'Trying to access report builder'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user