From c78ac2f4d54d26efea7bef6e1f759721f5afc0eb Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 2 Aug 2018 13:07:40 +0200 Subject: [PATCH] fixed minor error --- .../godmode/reporting/map_builder.php | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php index 5e9a64f75e..03e49e2769 100644 --- a/pandora_console/godmode/reporting/map_builder.php +++ b/pandora_console/godmode/reporting/map_builder.php @@ -23,6 +23,7 @@ $vconsoles_write = check_acl ($config['id_user'], 0, "VW"); $vconsoles_manage = check_acl ($config['id_user'], 0, "VM"); $is_enterprise = enterprise_include_once('include/functions_policies.php'); +$is_metaconsole = is_metaconsole(); if (!$vconsoles_read && !$vconsoles_write && !$vconsoles_manage) { db_pandora_audit("ACL Violation", @@ -31,6 +32,19 @@ if (!$vconsoles_read && !$vconsoles_write && !$vconsoles_manage) { exit; } +if(!$is_metaconsole){ + $url_visual_console = 'index.php?sec=network&sec2=godmode/reporting/map_builder'; + $url_visual_console_favorite = 'index.php?sec=network&sec2=godmode/reporting/visual_console_favorite'; + $url_visual_console_template = 'index.php?sec=network&sec2=enterprise/godmode/reporting/visual_console_template'; + $url_visual_console_template_wizard = 'index.php?sec=network&sec2=enterprise/godmode/reporting/visual_console_template_wizard'; +} +else{ + $url_visual_console = 'index.php?sec=screen&sec2=screens/screens&action=visualmap'; + $url_visual_console_favorite = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_favorite'; + $url_visual_console_template = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_template'; + $url_visual_console_template_wizard = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_wizard'; +} + $pure = (int)get_parameter('pure', 0); $hack_metaconsole = ''; if (defined('METACONSOLE')) @@ -38,31 +52,31 @@ if (defined('METACONSOLE')) $buttons['visual_console'] = array( 'active' => true, - 'text' => '' . + 'text' => '' . html_print_image ("images/visual_console.png", true, array ("title" => __('Visual Console List'))) .'' ); $buttons['visual_console_favorite'] = array( 'active' => false, - 'text' => '' . + 'text' => '' . html_print_image ("images/list.png", true, array ("title" => __('Visual Favourite Console'))) .'' ); if($is_enterprise){ $buttons['visual_console_template'] = array( 'active' => false, - 'text' => '' . + 'text' => '' . html_print_image ("images/templates.png", true, array ("title" => __('Visual Console Template'))) .'' ); $buttons['visual_console_template_wizard'] = array( 'active' => false, - 'text' => '' . + 'text' => '' . html_print_image ("images/wand.png", true, array ("title" => __('Visual Console Template Wizard'))) .'' ); } -if (!defined('METACONSOLE')) { +if (!$is_metaconsole) { ui_print_page_header( __('Reporting') .' » ' . __('Visual Console'), "images/op_reporting.png", @@ -72,6 +86,11 @@ if (!defined('METACONSOLE')) { $buttons ); } +else{ + ui_meta_print_header( + __('Visual console') . " » " . $visualConsoleName, "", + $buttons); +} $id_layout = (int) get_parameter ('id_layout'); $copy_layout = (bool) get_parameter ('copy_layout');