From 260a1496689c03ff16a90921f109409e1035ffdf Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Thu, 25 Apr 2019 10:37:11 +0200 Subject: [PATCH] fixed include_once in items Former-commit-id: e0a7f89a5ead53c8b5cbc49f66e473fa2f77bffa --- .../rest-api/models/VisualConsole/Items/BarsGraph.php | 9 +++++++++ .../rest-api/models/VisualConsole/Items/ColorCloud.php | 5 ++++- .../rest-api/models/VisualConsole/Items/DonutGraph.php | 1 + .../rest-api/models/VisualConsole/Items/Group.php | 5 +++++ .../rest-api/models/VisualConsole/Items/ModuleGraph.php | 4 ++++ .../rest-api/models/VisualConsole/Items/Percentile.php | 5 +++++ .../rest-api/models/VisualConsole/Items/SimpleValue.php | 2 +- .../rest-api/models/VisualConsole/Items/StaticGraph.php | 9 ++++++++- 8 files changed, 37 insertions(+), 3 deletions(-) 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 0f874f280e..fab4c5a9e2 100644 --- a/pandora_console/include/rest-api/models/VisualConsole/Items/BarsGraph.php +++ b/pandora_console/include/rest-api/models/VisualConsole/Items/BarsGraph.php @@ -136,6 +136,15 @@ final class BarsGraph extends Item // Load config. global $config; + // Load side libraries. + 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. $gridColor = static::extractGridColor($data); $backGroundColor = static::extractBackgroundColor($data); 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 fae71d8bdd..062f2cc746 100644 --- a/pandora_console/include/rest-api/models/VisualConsole/Items/ColorCloud.php +++ b/pandora_console/include/rest-api/models/VisualConsole/Items/ColorCloud.php @@ -202,8 +202,11 @@ final class ColorCloud extends Item // Load side libraries. global $config; - include_once $config['homedir'].'/include/functions_graph.php'; 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. $linkedModule = static::extractLinkedModule($data); 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 2b83982600..82d769e22f 100644 --- a/pandora_console/include/rest-api/models/VisualConsole/Items/DonutGraph.php +++ b/pandora_console/include/rest-api/models/VisualConsole/Items/DonutGraph.php @@ -100,6 +100,7 @@ final class DonutGraph extends Item // Load side libraries. global $config; include_once $config['homedir'].'/include/functions_visual_map.php'; + include_once $config['homedir'].'/include/graphs/functions_d3.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 9f176650c1..0969f2a032 100644 --- a/pandora_console/include/rest-api/models/VisualConsole/Items/Group.php +++ b/pandora_console/include/rest-api/models/VisualConsole/Items/Group.php @@ -149,6 +149,11 @@ final class Group extends Item include_once $config['homedir'].'/include/functions_visual_map.php'; include_once $config['homedir'].'/include/functions_ui.php'; include_once $config['homedir'].'/include/functions_agents.php'; + 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); $showStatistics = static::extractShowStatistics($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 0672a825e0..73b90814d2 100644 --- a/pandora_console/include/rest-api/models/VisualConsole/Items/ModuleGraph.php +++ b/pandora_console/include/rest-api/models/VisualConsole/Items/ModuleGraph.php @@ -164,6 +164,10 @@ final class ModuleGraph extends Item global $config; include_once $config['homedir'].'/include/functions_graph.php'; 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 ebfb7e94b6..d54ef74294 100644 --- a/pandora_console/include/rest-api/models/VisualConsole/Items/Percentile.php +++ b/pandora_console/include/rest-api/models/VisualConsole/Items/Percentile.php @@ -184,6 +184,11 @@ final class Percentile extends Item global $config; include_once $config['homedir'].'/include/functions_graph.php'; include_once $config['homedir'].'/include/functions_modules.php'; + 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. $linkedModule = static::extractLinkedModule($data); 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 0bcadb5463..8a7c0ab6a4 100644 --- a/pandora_console/include/rest-api/models/VisualConsole/Items/SimpleValue.php +++ b/pandora_console/include/rest-api/models/VisualConsole/Items/SimpleValue.php @@ -178,7 +178,7 @@ final class SimpleValue extends Item // Load side libraries. global $config; - include_once $config['homedir'].'/include/functions_graph.php'; + include_once $config['homedir'].'/include/functions_visual_map.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 f3bd1126b3..ed0ae89568 100644 --- a/pandora_console/include/rest-api/models/VisualConsole/Items/StaticGraph.php +++ b/pandora_console/include/rest-api/models/VisualConsole/Items/StaticGraph.php @@ -152,7 +152,14 @@ final class StaticGraph extends Item // Load side libraries. global $config; include_once $config['homedir'].'/include/functions_ui.php'; + 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. $linkedModule = static::extractLinkedModule($data); @@ -226,7 +233,7 @@ final class StaticGraph extends Item || ($isBooleanModule && $showLastValueTooltip !== 'default') ) { if (\is_numeric($value)) { - $imgTitle .= __('Last value: ').remove_right_zeros($value); + $imgTitle .= __('Last value: ').\remove_right_zeros($value); } else { $imgTitle .= __('Last value: ').$value; }