diff --git a/pandora_console/include/rest-api/models/VisualConsole/Items/BarsGraph.php b/pandora_console/include/rest-api/models/VisualConsole/Items/BarsGraph.php index fab4c5a9e2..4482b4d53d 100644 --- a/pandora_console/include/rest-api/models/VisualConsole/Items/BarsGraph.php +++ b/pandora_console/include/rest-api/models/VisualConsole/Items/BarsGraph.php @@ -137,12 +137,12 @@ final class BarsGraph extends Item global $config; // Load side libraries. + include_once $config['homedir'].'/include/functions_ui.php'; include_once $config['homedir'].'/include/functions_visual_map.php'; include_once $config['homedir'].'/include/graphs/fgraph.php'; if (is_metaconsole()) { \enterprise_include_once('include/functions_metaconsole.php'); - \enterprise_include_once('meta/include/functions_ui_meta.php'); } // Extract needed properties. @@ -262,7 +262,12 @@ final class BarsGraph extends Item $waterMark = [ 'file' => $config['homedir'].'/images/logo_vertical_water.png', - 'url' => \ui_get_full_url(false, false, false, false).'images/logo_vertical_water.png', + 'url' => \ui_get_full_url( + 'images/logo_vertical_water.png', + false, + false, + false + ), ]; if ((int) $data['width'] === 0 || (int) $data['height'] === 0) { diff --git a/pandora_console/include/rest-api/models/VisualConsole/Items/ColorCloud.php b/pandora_console/include/rest-api/models/VisualConsole/Items/ColorCloud.php index 062f2cc746..807d8fb3e9 100644 --- a/pandora_console/include/rest-api/models/VisualConsole/Items/ColorCloud.php +++ b/pandora_console/include/rest-api/models/VisualConsole/Items/ColorCloud.php @@ -205,7 +205,6 @@ final class ColorCloud extends Item include_once $config['homedir'].'/include/functions_modules.php'; if (is_metaconsole()) { \enterprise_include_once('include/functions_metaconsole.php'); - \enterprise_include_once('meta/include/functions_ui_meta.php'); } // Get the linked module Id. diff --git a/pandora_console/include/rest-api/models/VisualConsole/Items/DonutGraph.php b/pandora_console/include/rest-api/models/VisualConsole/Items/DonutGraph.php index 82d769e22f..1adc948da2 100644 --- a/pandora_console/include/rest-api/models/VisualConsole/Items/DonutGraph.php +++ b/pandora_console/include/rest-api/models/VisualConsole/Items/DonutGraph.php @@ -101,6 +101,9 @@ final class DonutGraph extends Item global $config; include_once $config['homedir'].'/include/functions_visual_map.php'; include_once $config['homedir'].'/include/graphs/functions_d3.php'; + if (is_metaconsole()) { + \enterprise_include_once('include/functions_metaconsole.php'); + } // Extract needed properties. $legendBackGroundColor = static::extractLegendBackgroundColor($data); diff --git a/pandora_console/include/rest-api/models/VisualConsole/Items/Group.php b/pandora_console/include/rest-api/models/VisualConsole/Items/Group.php index 0969f2a032..54570db018 100644 --- a/pandora_console/include/rest-api/models/VisualConsole/Items/Group.php +++ b/pandora_console/include/rest-api/models/VisualConsole/Items/Group.php @@ -152,7 +152,6 @@ final class Group extends Item include_once $config['homedir'].'/include/functions_users.php'; if (is_metaconsole()) { \enterprise_include_once('include/functions_metaconsole.php'); - \enterprise_include_once('meta/include/functions_ui_meta.php'); } $groupId = static::extractGroupId($data); diff --git a/pandora_console/include/rest-api/models/VisualConsole/Items/ModuleGraph.php b/pandora_console/include/rest-api/models/VisualConsole/Items/ModuleGraph.php index 73b90814d2..0465c3cb50 100644 --- a/pandora_console/include/rest-api/models/VisualConsole/Items/ModuleGraph.php +++ b/pandora_console/include/rest-api/models/VisualConsole/Items/ModuleGraph.php @@ -166,7 +166,6 @@ final class ModuleGraph extends Item include_once $config['homedir'].'/include/functions_modules.php'; if (is_metaconsole()) { \enterprise_include_once('include/functions_metaconsole.php'); - \enterprise_include_once('meta/include/functions_ui_meta.php'); } $imageOnly = false; diff --git a/pandora_console/include/rest-api/models/VisualConsole/Items/Percentile.php b/pandora_console/include/rest-api/models/VisualConsole/Items/Percentile.php index d54ef74294..3ce365195b 100644 --- a/pandora_console/include/rest-api/models/VisualConsole/Items/Percentile.php +++ b/pandora_console/include/rest-api/models/VisualConsole/Items/Percentile.php @@ -187,7 +187,6 @@ final class Percentile extends Item 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'); } // Get the linked module Id. diff --git a/pandora_console/include/rest-api/models/VisualConsole/Items/SimpleValue.php b/pandora_console/include/rest-api/models/VisualConsole/Items/SimpleValue.php index 8a7c0ab6a4..2dd1685319 100644 --- a/pandora_console/include/rest-api/models/VisualConsole/Items/SimpleValue.php +++ b/pandora_console/include/rest-api/models/VisualConsole/Items/SimpleValue.php @@ -179,6 +179,9 @@ final class SimpleValue extends Item // Load side libraries. global $config; include_once $config['homedir'].'/include/functions_visual_map.php'; + if (is_metaconsole()) { + \enterprise_include_once('include/functions_metaconsole.php'); + } // Get the linked module Id. $linkedModule = static::extractLinkedModule($data); diff --git a/pandora_console/include/rest-api/models/VisualConsole/Items/StaticGraph.php b/pandora_console/include/rest-api/models/VisualConsole/Items/StaticGraph.php index ed0ae89568..0f68841686 100644 --- a/pandora_console/include/rest-api/models/VisualConsole/Items/StaticGraph.php +++ b/pandora_console/include/rest-api/models/VisualConsole/Items/StaticGraph.php @@ -155,10 +155,8 @@ final class StaticGraph extends Item include_once $config['homedir'].'/include/functions_io.php'; include_once $config['homedir'].'/include/functions_visual_map.php'; include_once $config['homedir'].'/include/functions_modules.php'; - \enterprise_include_once('godmode/agentes/module_manager.php'); if (is_metaconsole()) { \enterprise_include_once('include/functions_metaconsole.php'); - \enterprise_include_once('meta/include/functions_ui_meta.php'); } // Get the linked module Id. @@ -232,7 +230,7 @@ final class StaticGraph extends Item if (!$isBooleanModule || ($isBooleanModule && $showLastValueTooltip !== 'default') ) { - if (\is_numeric($value)) { + if (is_numeric($value)) { $imgTitle .= __('Last value: ').\remove_right_zeros($value); } else { $imgTitle .= __('Last value: ').$value;