Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones

This commit is contained in:
Jonathan 2023-03-02 14:35:05 +01:00
commit 1c057773aa
37 changed files with 513 additions and 450 deletions

View File

@ -76,10 +76,6 @@ function dbmgr_extension_main()
global $config; global $config;
if (is_metaconsole() === true) {
open_meta_frame();
}
if (!is_user_admin($config['id_user'])) { if (!is_user_admin($config['id_user'])) {
db_pandora_audit( db_pandora_audit(
AUDIT_LOG_ACL_VIOLATION, AUDIT_LOG_ACL_VIOLATION,
@ -92,7 +88,21 @@ function dbmgr_extension_main()
$sql = (string) get_parameter('sql'); $sql = (string) get_parameter('sql');
$node_id = (int) get_parameter('node_id', -1); $node_id = (int) get_parameter('node_id', -1);
ui_print_page_header(__('Database interface'), 'images/gm_db.png', false, false, true); // Header.
ui_print_standard_header(
__('Database interface'),
'images/gm_db.png',
false,
'',
true,
[],
[
[
'link' => '',
'label' => __('Extensions'),
],
]
);
if (is_metaconsole() === true) { if (is_metaconsole() === true) {
$img = '../../images/warning_modern.png'; $img = '../../images/warning_modern.png';
@ -285,10 +295,6 @@ function dbmgr_extension_main()
html_print_table($table); html_print_table($table);
echo '</div>'; echo '</div>';
if (is_metaconsole()) {
close_meta_frame();
}
} }

View File

@ -36,10 +36,6 @@ enterprise_include_once('meta/include/functions_alerts_meta.php');
check_login(); check_login();
enterprise_hook('open_meta_frame');
if (! check_acl($config['id_user'], 0, 'LM')) { if (! check_acl($config['id_user'], 0, 'LM')) {
db_pandora_audit( db_pandora_audit(
AUDIT_LOG_ACL_VIOLATION, AUDIT_LOG_ACL_VIOLATION,
@ -473,5 +469,3 @@ if (is_management_allowed() === true) {
echo '</form>'; echo '</form>';
echo '</div>'; echo '</div>';
} }
enterprise_hook('close_meta_frame');

View File

@ -566,8 +566,6 @@ tyle='display:none;'>";
echo '</div>'; echo '</div>';
} }
enterprise_hook('open_meta_frame');
if ($update_command) { if ($update_command) {
include_once 'configure_alert_command.php'; include_once 'configure_alert_command.php';
return; return;
@ -836,8 +834,6 @@ if (users_is_admin() === true) {
echo '</div>'; echo '</div>';
} }
enterprise_hook('close_meta_frame');
?> ?>
<script type="text/javascript"> <script type="text/javascript">

View File

@ -21,8 +21,6 @@ enterprise_include_once('meta/include/functions_alerts_meta.php');
check_login(); check_login();
enterprise_hook('open_meta_frame');
if (is_ajax()) { if (is_ajax()) {
$get_template_tooltip = (bool) get_parameter('get_template_tooltip'); $get_template_tooltip = (bool) get_parameter('get_template_tooltip');
@ -124,7 +122,7 @@ $sec = (is_metaconsole() === true) ? 'advanced' : 'galertas';
// case delete_templete action is performed. // case delete_templete action is performed.
if (!$delete_template) { if (!$delete_template) {
// Header. // Header.
if (defined('METACONSOLE')) { if (is_metaconsole() === true) {
alerts_meta_print_header(); alerts_meta_print_header();
} else { } else {
ui_print_page_header( ui_print_page_header(
@ -485,5 +483,3 @@ if (is_management_allowed() === true) {
echo '</form>'; echo '</form>';
echo '</div>'; echo '</div>';
} }
enterprise_hook('close_meta_frame');

View File

@ -48,8 +48,6 @@ if (is_ajax()) {
} }
} }
enterprise_hook('open_meta_frame');
if (defined('METACONSOLE')) { if (defined('METACONSOLE')) {
$sec = 'advanced'; $sec = 'advanced';
} else { } else {
@ -412,8 +410,6 @@ if ($is_management_allowed === true) {
echo '</form>'; echo '</form>';
enterprise_hook('close_meta_frame');
ui_require_javascript_file('pandora_alerts'); ui_require_javascript_file('pandora_alerts');
ui_require_javascript_file('tiny_mce', 'include/javascript/tiny_mce/'); ui_require_javascript_file('tiny_mce', 'include/javascript/tiny_mce/');
?> ?>

View File

@ -36,8 +36,6 @@ enterprise_include_once('meta/include/functions_alerts_meta.php');
check_login(); check_login();
enterprise_hook('open_meta_frame');
if (! check_acl($config['id_user'], 0, 'PM')) { if (! check_acl($config['id_user'], 0, 'PM')) {
db_pandora_audit( db_pandora_audit(
AUDIT_LOG_ACL_VIOLATION, AUDIT_LOG_ACL_VIOLATION,
@ -392,7 +390,6 @@ if ($is_management_allowed === true) {
echo '</form>'; echo '</form>';
enterprise_hook('close_meta_frame');
?> ?>
<script type="text/javascript"> <script type="text/javascript">

View File

@ -32,8 +32,6 @@ global $config;
// Check login and ACLs. // Check login and ACLs.
check_login(); check_login();
enterprise_hook('open_meta_frame');
if (!check_acl($config['id_user'], 0, 'PM') && !is_user_admin($config['id_user'])) { if (!check_acl($config['id_user'], 0, 'PM') && !is_user_admin($config['id_user'])) {
db_pandora_audit( db_pandora_audit(
AUDIT_LOG_ACL_VIOLATION, AUDIT_LOG_ACL_VIOLATION,
@ -70,30 +68,24 @@ $buttons = [
$buttons[$tab]['active'] = true; $buttons[$tab]['active'] = true;
// Header. ui_print_standard_header(
if (is_metaconsole() === true) { __('Categories configuration'),
ui_meta_print_header(__('Categories configuration'), __('List'), $buttons); 'images/gm_modules.png',
} else { false,
ui_print_standard_header( '',
__('Categories configuration'), true,
'images/gm_modules.png', $buttons,
false, [
'',
true,
$buttons,
[ [
[ 'link' => '',
'link' => '', 'label' => __('Resources'),
'label' => __('Resources'), ],
], [
[ 'link' => '',
'link' => '', 'label' => __('Module categories'),
'label' => __('Module categories'), ],
], ]
] );
);
}
$is_management_allowed = true; $is_management_allowed = true;
if (is_management_allowed() === false) { if (is_management_allowed() === false) {
@ -277,6 +269,4 @@ if ($is_management_allowed === true) {
); );
echo '</form>'; echo '</form>';
enterprise_hook('close_meta_frame');
} }

View File

@ -274,8 +274,6 @@ if (is_ajax() === true) {
return; return;
} }
enterprise_hook('open_meta_frame');
$tab = (string) get_parameter('tab', 'groups'); $tab = (string) get_parameter('tab', 'groups');
if ($tab !== 'credbox' if ($tab !== 'credbox'
@ -990,7 +988,6 @@ if ($is_management_allowed === true
ui_require_javascript_file('TreeController', 'include/javascript/tree/'); ui_require_javascript_file('TreeController', 'include/javascript/tree/');
enterprise_hook('close_meta_frame');
$tab = 'group_edition'; $tab = 'group_edition';
?> ?>

View File

@ -33,7 +33,6 @@ $management_allowed = is_management_allowed();
if (is_metaconsole() === true) { if (is_metaconsole() === true) {
$sec = 'advanced'; $sec = 'advanced';
enterprise_include_once('meta/include/functions_components_meta.php'); enterprise_include_once('meta/include/functions_components_meta.php');
enterprise_hook('open_meta_frame');
components_meta_print_header(); components_meta_print_header();
if ($management_allowed === false) { if ($management_allowed === false) {
@ -375,7 +374,6 @@ if ($result === false) {
} }
if (is_metaconsole() === true) { if (is_metaconsole() === true) {
enterprise_hook('close_meta_frame');
echo '<div id="deploy_messages" class="invisible">'; echo '<div id="deploy_messages" class="invisible">';
echo '<span>'.__( echo '<span>'.__(
'The configurations of inventory modules from the nodes have been unified. 'The configurations of inventory modules from the nodes have been unified.

View File

@ -31,8 +31,6 @@ global $config;
check_login(); check_login();
enterprise_hook('open_meta_frame');
if (! check_acl($config['id_user'], 0, 'PM') && ! check_acl($config['id_user'], 0, 'AW')) { if (! check_acl($config['id_user'], 0, 'PM') && ! check_acl($config['id_user'], 0, 'AW')) {
db_pandora_audit( db_pandora_audit(
AUDIT_LOG_ACL_VIOLATION, AUDIT_LOG_ACL_VIOLATION,
@ -380,8 +378,6 @@ html_print_action_buttons(
['type' => 'form_action'] ['type' => 'form_action']
); );
enterprise_hook('close_meta_frame');
?> ?>
<script type="text/javascript"> <script type="text/javascript">
$( document ).ready(function() { $( document ).ready(function() {

View File

@ -30,8 +30,6 @@ global $config;
check_login(); check_login();
enterprise_hook('open_meta_frame');
if (! check_acl($config['id_user'], 0, 'PM') && ! check_acl($config['id_user'], 0, 'AW')) { if (! check_acl($config['id_user'], 0, 'PM') && ! check_acl($config['id_user'], 0, 'AW')) {
db_pandora_audit( db_pandora_audit(
AUDIT_LOG_ACL_VIOLATION, AUDIT_LOG_ACL_VIOLATION,
@ -934,8 +932,6 @@ html_print_action_buttons(
] ]
); );
enterprise_hook('close_meta_frame');
?> ?>
<script type="text/javascript"> <script type="text/javascript">
$( document ).ready(function() { $( document ).ready(function() {

View File

@ -14,7 +14,7 @@
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______| * |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
* *
* ============================================================================ * ============================================================================
* Copyright (c) 2007-2021 Artica Soluciones Tecnologicas * Copyright (c) 2007-2023 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list * Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -62,18 +62,18 @@ if ($is_metaconsole === false) {
$pure = (int) get_parameter('pure', 0); $pure = (int) get_parameter('pure', 0);
$hack_metaconsole = ''; $hack_metaconsole = '';
if (defined('METACONSOLE')) { if (is_metaconsole() === true) {
$hack_metaconsole = '../../'; $hack_metaconsole = '../../';
} }
$buttons['visual_console'] = [ $buttons['visual_console'] = [
'active' => true, 'active' => true,
'text' => '<a href="'.$url_visual_console.'">'.html_print_image( 'text' => '<a href="'.$url_visual_console.'">'.html_print_image(
'images/visual_console.png', 'images/logs@svg.svg',
true, true,
[ [
'title' => __('Visual Console List'), 'title' => __('Visual Console List'),
'class' => 'invert_filter', 'class' => 'main_menu_icon invert_filter',
] ]
).'</a>', ).'</a>',
]; ];
@ -81,11 +81,11 @@ $buttons['visual_console'] = [
$buttons['visual_console_favorite'] = [ $buttons['visual_console_favorite'] = [
'active' => false, 'active' => false,
'text' => '<a href="'.$url_visual_console_favorite.'">'.html_print_image( 'text' => '<a href="'.$url_visual_console_favorite.'">'.html_print_image(
'images/list.png', 'images/star@svg.svg',
true, true,
[ [
'title' => __('Visual Favourite Console'), 'title' => __('Visual Favourite Console'),
'class' => 'invert_filter', 'class' => 'main_menu_icon invert_filter',
] ]
).'</a>', ).'</a>',
]; ];
@ -94,11 +94,11 @@ if ($is_enterprise !== ENTERPRISE_NOT_HOOK && $vconsoles_manage) {
$buttons['visual_console_template'] = [ $buttons['visual_console_template'] = [
'active' => false, 'active' => false,
'text' => '<a href="'.$url_visual_console_template.'">'.html_print_image( 'text' => '<a href="'.$url_visual_console_template.'">'.html_print_image(
'images/templates.png', 'images/groups@svg.svg',
true, true,
[ [
'title' => __('Visual Console Template'), 'title' => __('Visual Console Template'),
'class' => 'invert_filter', 'class' => 'main_menu_icon invert_filter',
] ]
).'</a>', ).'</a>',
]; ];
@ -106,11 +106,11 @@ if ($is_enterprise !== ENTERPRISE_NOT_HOOK && $vconsoles_manage) {
$buttons['visual_console_template_wizard'] = [ $buttons['visual_console_template_wizard'] = [
'active' => false, 'active' => false,
'text' => '<a href="'.$url_visual_console_template_wizard.'">'.html_print_image( 'text' => '<a href="'.$url_visual_console_template_wizard.'">'.html_print_image(
'images/wand.png', 'images/wizard@svg.svg',
true, true,
[ [
'title' => __('Visual Console Template Wizard'), 'title' => __('Visual Console Template Wizard'),
'class' => 'invert_filter', 'class' => 'main_menu_icon invert_filter',
] ]
).'</a>', ).'</a>',
]; ];
@ -328,24 +328,6 @@ if ($ag_group > 0) {
} }
} }
echo "<table class='databox filters bolder mrgn_btn_10px' width='100%'>
<tr>";
if (is_metaconsole() === false) {
echo "<form method='post'
action='index.php?sec=network&amp;sec2=godmode/reporting/map_builder'>";
} else {
echo "<form method='post'
action='index.php?sec=screen&sec2=screens/screens&action=visualmap'>";
}
echo "<td class='w33p'>";
echo __('Search').'&nbsp;';
html_print_input_text('search', $search, '', 50);
echo '</td>';
echo "<td class='w25p'>";
echo __('Group').'&nbsp;';
$own_info = get_user_info($config['id_user']); $own_info = get_user_info($config['id_user']);
if (!$own_info['is_admin'] && !check_acl($config['id_user'], 0, 'VR')) { if (!$own_info['is_admin'] && !check_acl($config['id_user'], 0, 'VR')) {
$return_all_group = false; $return_all_group = false;
@ -353,26 +335,69 @@ if (!$own_info['is_admin'] && !check_acl($config['id_user'], 0, 'VR')) {
$return_all_group = true; $return_all_group = true;
} }
echo '<div class="w250px inline">'; $filterTable = new stdClass();
html_print_select_groups(false, 'AR', $return_all_group, 'ag_group', $ag_group, 'this.form.submit();', '', 0, false, false, true, '', false); $filterTable->id = 'map_buider_filter';
echo '</div>'; $filterTable->class = 'filter-table-adv';
echo "<td class='w25p'>"; $filterTable->width = '100%';
echo __('Group Recursion').'&nbsp;'; $filterTable->size = [];
html_print_checkbox('recursion', 1, $recursion, false, false, 'this.form.submit()'); $filterTable->size[0] = '33%';
$filterTable->size[1] = '33%';
echo "</td><td class='w22p'>"; $filterTable->data = [];
html_print_submit_button(
$filterTable->data[0][] = html_print_label_input_block(
__('Search'), __('Search'),
'search_visual_console', html_print_input_text('search', $search, '', 50, 255, true)
false, );
[
'icon' => 'search', $filterTable->data[0][] = html_print_label_input_block(
'mode' => 'secondary mini', __('Group'),
] html_print_select_groups(false, 'AR', $return_all_group, 'ag_group', $ag_group, 'this.form.submit();', '', 0, true, false, true, '', false)
);
$filterTable->data[0][] = html_print_label_input_block(
__('Group Recursion'),
html_print_checkbox_switch('recursion', 1, $recursion, true, false, 'this.form.submit()')
);
if (is_metaconsole() === false) {
$actionUrl = 'index.php?sec=network&amp;sec2=godmode/reporting/map_builder';
} else {
$actionUrl = 'index.php?sec=screen&sec2=screens/screens&action=visualmap';
}
$searchForm = [];
$searchForm[] = '<form method="POST" action="'.$actionUrl.'">';
$searchForm[] = html_print_table($filterTable, true);
$searchForm[] = html_print_div(
[
'class' => 'action-buttons',
'content' => html_print_submit_button(
__('Filter'),
'search_visual_console',
false,
[
'icon' => 'search',
'mode' => 'mini',
],
true
),
],
true
);
$searchForm[] = '</form>';
ui_toggle(
implode('', $searchForm),
'<span class="subsection_header_title">'.__('Filters').'</span>',
'filter_form',
'',
true,
false,
'',
'white-box-content',
'box-flat white_table_graph fixed_filter_bar'
); );
echo '</form>';
echo '</td>';
echo '</tr></table>';
$table = new stdClass(); $table = new stdClass();
$table->width = '100%'; $table->width = '100%';
@ -471,7 +496,6 @@ if (!$maps && is_metaconsole() === false) {
); );
} }
} else { } else {
ui_pagination($total_maps, $url, $offset, $pagination);
foreach ($maps as $map) { foreach ($maps as $map) {
// ACL for the visual console permission. // ACL for the visual console permission.
$vconsole_write = false; $vconsole_write = false;
@ -505,25 +529,25 @@ if (!$maps && is_metaconsole() === false) {
4 => 'table_action_buttons', 4 => 'table_action_buttons',
]; ];
$data[3] = '<a class="copy_visualmap" href="index.php?sec=network&amp;sec2=godmode/reporting/map_builder&amp;id_layout='.$map['id'].'&amp;copy_layout=1">'.html_print_image( $data[3] = '<a class="copy_visualmap" href="index.php?sec=network&amp;sec2=godmode/reporting/map_builder&amp;id_layout='.$map['id'].'&amp;copy_layout=1">'.html_print_image(
'images/copy.png', 'images/copy.svg',
true, true,
['class' => 'invert_filter'] ['class' => 'main_menu_icon invert_filter']
).'</a>'; ).'</a>';
$data[4] = '<a class="delete_visualmap" href="index.php?sec=network&amp;sec2=godmode/reporting/map_builder&amp;id_layout='.$map['id'].'&amp;delete_layout=1" onclick="javascript: if (!confirm(\''.__('Are you sure?').'\n'.__('Delete').': '.$map['name'].'\')) return false;">'.html_print_image( $data[4] = '<a class="delete_visualmap" href="index.php?sec=network&amp;sec2=godmode/reporting/map_builder&amp;id_layout='.$map['id'].'&amp;delete_layout=1" onclick="javascript: if (!confirm(\''.__('Are you sure?').'\n'.__('Delete').': '.$map['name'].'\')) return false;">'.html_print_image(
'images/cross.png', 'images/delete.svg',
true, true,
['class' => 'invert_filter'] ['class' => 'main_menu_icon invert_filter']
).'</a>'; ).'</a>';
} else { } else {
$data[3] = '<a class="copy_visualmap" href="index.php?sec=screen&sec2=screens/screens&action=visualmap&pure='.$pure.'&id_layout='.$map['id'].'&amp;copy_layout=1">'.html_print_image( $data[3] = '<a class="copy_visualmap" href="index.php?sec=screen&sec2=screens/screens&action=visualmap&pure='.$pure.'&id_layout='.$map['id'].'&amp;copy_layout=1">'.html_print_image(
'images/copy.png', 'images/copy.svg',
true, true,
['class' => 'invert_filter'] ['class' => 'main_menu_icon invert_filter']
).'</a>'; ).'</a>';
$data[4] = '<a class="delete_visualmap" href="index.php?sec=screen&sec2=screens/screens&action=visualmap&pure='.$pure.'&id_layout='.$map['id'].'&amp;delete_layout=1" onclick="javascript: if (!confirm(\''.__('Are you sure?').'\n'.__('Delete').': '.$map['name'].'\')) return false;">'.html_print_image( $data[4] = '<a class="delete_visualmap" href="index.php?sec=screen&sec2=screens/screens&action=visualmap&pure='.$pure.'&id_layout='.$map['id'].'&amp;delete_layout=1" onclick="javascript: if (!confirm(\''.__('Are you sure?').'\n'.__('Delete').': '.$map['name'].'\')) return false;">'.html_print_image(
'images/cross.png', 'images/delete.svg',
true, true,
['class' => 'invert_filter'] ['class' => 'main_menu_icon invert_filter']
).'</a>'; ).'</a>';
} }
} else { } else {
@ -535,42 +559,31 @@ if (!$maps && is_metaconsole() === false) {
} }
html_print_table($table); html_print_table($table);
ui_pagination($total_maps, $url, $offset, $pagination, false, 'offset', true, 'pagination-bottom'); $tablePagination = ui_pagination($total_maps, $url, $offset, $pagination, true, 'offset', false);
}
if ($maps) {
if (is_metaconsole() === false) {
echo '<div class="action-buttons w100p right_align">';
} else {
echo '<div class="w100p right right_align mrgn_btn_20px">';
}
} }
if ($maps || is_metaconsole() === true) { if ($maps || is_metaconsole() === true) {
if ($vconsoles_write || $vconsoles_manage) { if ($vconsoles_write || $vconsoles_manage) {
if (is_metaconsole() === false) { if (is_metaconsole() === false) {
echo '<form action="index.php?sec=network&amp;sec2=godmode/reporting/visual_console_builder" method="post">'; $actionUrl = 'index.php?sec=network&amp;sec2=godmode/reporting/visual_console_builder';
} else { } else {
echo '<form action="index.php?sec=screen&sec2=screens/screens&action=visualmap&action2=new&operation=new_visualmap&tab=data&pure='.$pure.'" method="post">'; $actionUrl = 'index.php?sec=screen&sec2=screens/screens&action=visualmap&action2=new&operation=new_visualmap&tab=data&pure='.$pure;
} }
echo '<form action="'.$actionUrl.'" method="post">';
html_print_input_hidden('edit_layout', 1); html_print_input_hidden('edit_layout', 1);
html_print_div( html_print_action_buttons(
[ html_print_submit_button(
'class' => 'action-buttons', __('Create'),
'content' => html_print_submit_button( '',
__('Create'), false,
'', [ 'icon' => 'next'],
false, true
[ 'icon' => 'next'], ),
true [ 'right_content' => $tablePagination ]
),
]
); );
echo '</form>'; echo '</form>';
} }
echo '</div>';
} }

View File

@ -15,7 +15,7 @@
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______| * |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
* *
* ============================================================================ * ============================================================================
* Copyright (c) 2005-2021 Artica Soluciones Tecnologicas * Copyright (c) 2005-2023 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list * Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License

View File

@ -82,7 +82,7 @@ require_once $config['homedir'].'/include/functions_agents.php';
$table = new stdClass(); $table = new stdClass();
$table->id = 'wizard_table'; $table->id = 'wizard_table';
$table->head = []; $table->head = [];
if (!is_metaconsole()) { if (is_metaconsole() === false) {
$metaconsole_hack = ''; $metaconsole_hack = '';
$table->width = '100%'; $table->width = '100%';
$table->class = 'databox filters'; $table->class = 'databox filters';

View File

@ -14,7 +14,7 @@
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______| * |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
* *
* ============================================================================ * ============================================================================
* Copyright (c) 2007-2022 Artica Soluciones Tecnologicas * Copyright (c) 2007-2023 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list * Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -33,15 +33,14 @@ require_once $config['homedir'].'/include/functions_visual_map.php';
// Breadcrumb. // Breadcrumb.
require_once $config['homedir'].'/include/class/HTML.class.php'; require_once $config['homedir'].'/include/class/HTML.class.php';
ui_require_css_file('discovery'); ui_require_css_file('discovery');
// ACL for the general permission // ACL for the general permission.
$vconsoles_read = check_acl($config['id_user'], 0, 'VR'); $vconsoles_read = (bool) check_acl($config['id_user'], 0, 'VR');
$vconsoles_write = check_acl($config['id_user'], 0, 'VW'); $vconsoles_write = (bool) check_acl($config['id_user'], 0, 'VW');
$vconsoles_manage = check_acl($config['id_user'], 0, 'VM'); $vconsoles_manage = (bool) check_acl($config['id_user'], 0, 'VM');
$is_enterprise = enterprise_include_once('include/functions_policies.php'); $is_enterprise = enterprise_include_once('include/functions_policies.php');
$is_metaconsole = is_metaconsole();
if (!$vconsoles_read && !$vconsoles_write && !$vconsoles_manage) { if ($vconsoles_read === false && $vconsoles_write === false && $vconsoles_manage === false) {
db_pandora_audit( db_pandora_audit(
AUDIT_LOG_ACL_VIOLATION, AUDIT_LOG_ACL_VIOLATION,
'Trying to access map builder' 'Trying to access map builder'
@ -50,8 +49,7 @@ if (!$vconsoles_read && !$vconsoles_write && !$vconsoles_manage) {
exit; exit;
} }
if (is_metaconsole() === false) {
if ($is_metaconsole === false) {
$url_visual_console = 'index.php?sec=network&sec2=godmode/reporting/map_builder'; $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_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 = 'index.php?sec=network&sec2=enterprise/godmode/reporting/visual_console_template';
@ -63,14 +61,16 @@ if ($is_metaconsole === false) {
$url_visual_console_template_wizard = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_wizard'; $url_visual_console_template_wizard = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_wizard';
} }
$buttons = [];
$buttons['visual_console'] = [ $buttons['visual_console'] = [
'active' => false, 'active' => false,
'text' => '<a href="'.$url_visual_console.'">'.html_print_image( 'text' => '<a href="'.$url_visual_console.'">'.html_print_image(
'images/visual_console.png', 'images/logs@svg.svg',
true, true,
[ [
'title' => __('Visual Console List'), 'title' => __('Visual Console List'),
'class' => 'invert_filter', 'class' => 'main_menu_icon invert_filter',
] ]
).'</a>', ).'</a>',
]; ];
@ -78,11 +78,11 @@ $buttons['visual_console'] = [
$buttons['visual_console_favorite'] = [ $buttons['visual_console_favorite'] = [
'active' => true, 'active' => true,
'text' => '<a href="'.$url_visual_console_favorite.'">'.html_print_image( 'text' => '<a href="'.$url_visual_console_favorite.'">'.html_print_image(
'images/list.png', 'images/star@svg.svg',
true, true,
[ [
'title' => __('Visual Favourite Console'), 'title' => __('Visual Favourite Console'),
'class' => 'invert_filter', 'class' => 'main_menu_icon invert_filter',
] ]
).'</a>', ).'</a>',
]; ];
@ -91,11 +91,11 @@ if ($is_enterprise !== ENTERPRISE_NOT_HOOK && $vconsoles_manage) {
$buttons['visual_console_template'] = [ $buttons['visual_console_template'] = [
'active' => false, 'active' => false,
'text' => '<a href="'.$url_visual_console_template.'">'.html_print_image( 'text' => '<a href="'.$url_visual_console_template.'">'.html_print_image(
'images/templates.png', 'images/groups@svg.svg',
true, true,
[ [
'title' => __('Visual Console Template'), 'title' => __('Visual Console Template'),
'class' => 'invert_filter', 'class' => 'main_menu_icon invert_filter',
] ]
).'</a>', ).'</a>',
]; ];
@ -103,11 +103,11 @@ if ($is_enterprise !== ENTERPRISE_NOT_HOOK && $vconsoles_manage) {
$buttons['visual_console_template_wizard'] = [ $buttons['visual_console_template_wizard'] = [
'active' => false, 'active' => false,
'text' => '<a href="'.$url_visual_console_template_wizard.'">'.html_print_image( 'text' => '<a href="'.$url_visual_console_template_wizard.'">'.html_print_image(
'images/wand.png', 'images/wizard@svg.svg',
true, true,
[ [
'title' => __('Visual Console Template Wizard'), 'title' => __('Visual Console Template Wizard'),
'class' => 'invert_filter', 'class' => 'main_menu_icon invert_filter',
] ]
).'</a>', ).'</a>',
]; ];
@ -136,115 +136,132 @@ $search = (string) get_parameter('search', '');
$ag_group = (int) get_parameter('ag_group', 0); $ag_group = (int) get_parameter('ag_group', 0);
$recursion = (int) get_parameter('recursion', 0); $recursion = (int) get_parameter('recursion', 0);
$returnAllGroups = 0;
if (is_metaconsole() === false) { $filters = [];
echo "<form method='post' if (empty($search) === false) {
action='index.php?sec=network&amp;sec2=godmode/reporting/visual_console_favorite'>"; $filters['name'] = io_safe_input($search);
} else {
echo "<form method='post'
action='index.php?sec=screen&sec2=screens/screens&action=visualmap_favorite'>";
} }
echo "<ul class='form_flex'><li class='first_elements'>"; if ($ag_group > 0) {
echo '<ul><li>'; $ag_groups = [];
echo __('Search').'&nbsp;'; $ag_groups = (array) $ag_group;
html_print_input_text('search', $search, '', 50); if ($recursion) {
echo '</li><li>'; $ag_groups = groups_get_children_ids($ag_group, true);
echo __('Group').'&nbsp;'; }
$own_info = get_user_info($config['id_user']); } else if ($own_info['is_admin']) {
$returnAllGroups = 1;
}
if ($ag_group) {
$filters['group'] = array_flip($ag_groups);
}
$own_info = get_user_info($config['id_user']);
if (!$own_info['is_admin'] && !check_acl($config['id_user'], 0, 'AW')) { if (!$own_info['is_admin'] && !check_acl($config['id_user'], 0, 'AW')) {
$return_all_group = false; $return_all_group = false;
} else { } else {
$return_all_group = true; $return_all_group = true;
} }
html_print_select_groups( $filterTable = new stdClass();
false, $filterTable->id = 'visual_console_favorite_filter';
'AR', $filterTable->class = 'filter-table-adv';
$return_all_group, $filterTable->width = '100%';
'ag_group', $filterTable->size = [];
$ag_group, $filterTable->size[0] = '33%';
'', $filterTable->size[1] = '33%';
'',
0, $filterTable->data = [];
false,
false, $filterTable->data[0][] = html_print_label_input_block(
true, __('Search'),
'', html_print_input_text('search', $search, '', 50, 255, true)
false );
);
echo "</li></ul></li><li class='second_elements'><ul><li>"; $filterTable->data[0][] = html_print_label_input_block(
echo __('Group Recursion'); __('Group'),
html_print_checkbox('recursion', 1, $recursion, false, false, ''); html_print_select_groups(false, 'AR', $return_all_group, 'ag_group', $ag_group, '', '', 0, true, false, true, '', false)
echo '</li><li>'; );
html_print_submit_button(
__('Search'), $filterTable->data[0][] = html_print_label_input_block(
__('Group Recursion'),
html_print_checkbox_switch('recursion', 1, $recursion, true, false, '')
);
if (is_metaconsole() === false) {
$actionUrl = 'index.php?sec=network&amp;sec2=godmode/reporting/visual_console_favorite';
} else {
$actionUrl = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_favorite';
}
// exit;
$searchForm = '<form method="POST" action="'.$actionUrl.'">';
$searchForm .= html_print_table($filterTable, true);
$searchForm .= html_print_div(
[
'class' => 'action-buttons',
'content' => html_print_submit_button(
__('Filter'),
'search_visual_console', 'search_visual_console',
false, false,
[ [
'icon' => 'search', 'icon' => 'search',
'mode' => 'secondary mini', 'mode' => 'mini',
] ],
);
echo '</li></ul></li></ul>';
echo '</form>';
$returnAllGroups = 0;
$filters = [];
if (!empty($search)) {
$filters['name'] = io_safe_input($search);
}
if ($ag_group > 0) {
$ag_groups = [];
$ag_groups = (array) $ag_group;
if ($recursion) {
$ag_groups = groups_get_children_ids($ag_group, true);
}
} else if ($own_info['is_admin']) {
$returnAllGroups = 1;
}
if ($ag_group) {
$filters['group'] = array_flip($ag_groups);
}
$favorite_array = visual_map_get_user_layouts(
$config['id_user'],
false,
$filters,
$returnAllGroups,
true true
); ),
],
true
);
$searchForm .= '</form>';
echo "<div id='is_favourite'>"; ui_toggle(
if ($favorite_array == false) { $searchForm,
ui_print_info_message(__('No favourite consoles defined')); '<span class="subsection_header_title">'.__('Filters').'</span>',
'filter_form',
'',
true,
false,
'',
'white-box-content',
'box-flat white_table_graph fixed_filter_bar'
);
$favorite_array = visual_map_get_user_layouts(
$config['id_user'],
false,
$filters,
$returnAllGroups,
true
);
echo "<div id='is_favourite'>";
if ($favorite_array == false) {
ui_print_info_message(__('No favourite consoles defined'));
} else {
echo "<ul class='container'>";
foreach ($favorite_array as $favorite_k => $favourite_v) {
if (is_metaconsole() === true) {
$url = 'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure=0&id_visualmap='.$favourite_v['id'];
} else { } else {
echo "<ul class='container'>"; $url = 'index.php?sec=network&sec2=operation/visual_console/render_view&id='.$favourite_v['id'];
foreach ($favorite_array as $favorite_k => $favourite_v) {
if (is_metaconsole() === true) {
$url = 'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure=0&id_visualmap='.$favourite_v['id'];
} else {
$url = 'index.php?sec=network&sec2=operation/visual_console/render_view&id='.$favourite_v['id'];
}
echo "<a href='".$url."' title='Visual console".$favourite_v['name']."' alt='".$favourite_v['name']."'><li>";
echo "<div class='icon_img'>";
echo html_print_image(
'images/'.groups_get_icon($favourite_v['id_group']).'.png',
true,
['style' => '']
);
echo '</div>';
echo "<div class='text'>";
echo $favourite_v['name'];
echo '</div>';
echo '</li></a>';
}
echo '</ul>';
} }
echo '</div>'; echo "<a href='".$url."' title='Visual console".$favourite_v['name']."' alt='".$favourite_v['name']."'><li>";
echo "<div class='icon_img'>";
echo html_print_image(
'images/'.groups_get_icon($favourite_v['id_group']).'.png',
true,
['style' => '']
);
echo '</div>';
echo "<div class='text'>";
echo $favourite_v['name'];
echo '</div>';
echo '</li></a>';
}
echo '</ul>';
}
echo '</div>';

View File

@ -332,8 +332,6 @@ if ($filemanager) {
$sec = 'gservers'; $sec = 'gservers';
if (empty($create) === false || empty($view) === false) { if (empty($create) === false || empty($view) === false) {
enterprise_hook('open_meta_frame');
$management_allowed = is_management_allowed(); $management_allowed = is_management_allowed();
if (is_metaconsole() === true) { if (is_metaconsole() === true) {
@ -708,11 +706,7 @@ if (empty($create) === false || empty($view) === false) {
if (defined('METACONSOLE')) { if (defined('METACONSOLE')) {
echo '</td></tr>'; echo '</td></tr>';
} }
enterprise_hook('close_meta_frame');
} else { } else {
enterprise_hook('open_meta_frame');
if (defined('METACONSOLE')) { if (defined('METACONSOLE')) {
components_meta_print_header(); components_meta_print_header();
$sec = 'advanced'; $sec = 'advanced';
@ -1087,8 +1081,6 @@ if (empty($create) === false || empty($view) === false) {
// The '%s' will be replaced in the javascript code of the function 'show_locked_dialog'. // The '%s' will be replaced in the javascript code of the function 'show_locked_dialog'.
echo "<div id='dialog_locked' title='".__('List of modules and components created by "%s" ')."' class='invisible left'>"; echo "<div id='dialog_locked' title='".__('List of modules and components created by "%s" ')."' class='invisible left'>";
echo '</div>'; echo '</div>';
enterprise_hook('close_meta_frame');
} }
ui_require_javascript_file('pandora_modules'); ui_require_javascript_file('pandora_modules');

View File

@ -50,7 +50,6 @@ ui_require_css_file('first_task');
if (is_metaconsole() === true) { if (is_metaconsole() === true) {
enterprise_include_once('meta/include/functions_components_meta.php'); enterprise_include_once('meta/include/functions_components_meta.php');
enterprise_hook('open_meta_frame');
components_meta_print_header(); components_meta_print_header();
$sec = 'advanced'; $sec = 'advanced';
$management_allowed = is_management_allowed(); $management_allowed = is_management_allowed();
@ -565,7 +564,3 @@ if ($error !== null && $error !== '') {
) )
); );
} }
if (is_metaconsole() === true) {
enterprise_hook('close_meta_frame');
}

View File

@ -42,22 +42,24 @@ if (! check_acl($config['id_user'], 0, 'PM')) {
$update_settings = (bool) get_parameter_post('update_settings'); $update_settings = (bool) get_parameter_post('update_settings');
if (is_metaconsole()) { ui_require_javascript_file_enterprise('load_enterprise', is_metaconsole() === true);
// Metaconsole. enterprise_include_once('include/functions_license.php');
ui_require_javascript_file_enterprise('load_enterprise', true);
enterprise_include_once('include/functions_license.php');
} else {
ui_print_page_header(
__('License management'),
'images/extensions.png',
false,
'',
true
);
ui_require_javascript_file_enterprise('load_enterprise'); // Header.
enterprise_include_once('include/functions_license.php'); ui_print_standard_header(
} __('License management'),
'images/extensions.png',
false,
'',
true,
[],
[
[
'link' => '',
'label' => __('License'),
],
]
);
enterprise_include_once('include/functions_crypto.php'); enterprise_include_once('include/functions_crypto.php');
@ -135,81 +137,201 @@ if (enterprise_installed()) {
</script> </script>
<?php <?php
echo '<form method="post" id="form-license">'; echo '<form method="post" id="form-license" class="max_floating_element_size">';
// Retrieve UM url configured (or default). // Retrieve UM url configured (or default).
$url = get_um_url(); $url = get_um_url();
$table = new stdClass(); $table = new stdClass();
$table->width = '100%'; $table->width = '100%';
$table->class = 'databox filters'; $table->class = 'databox filter-table-adv';
$table->size = [];
if (is_metaconsole()) { $table->size[0] = '50%';
$table->head[0] = __('Licence'); $table->size[1] = '50%';
$table->head_colspan[0] = 3;
$table->headstyle[0] = 'text-align: center';
$table->style[0] = 'font-weight: bold;';
}
$table->data = []; $table->data = [];
$table->colspan = [];
$table->data[0][0] = '<strong>'.__('Customer key').'</strong>'; $table->colspan[0][0] = 2;
$table->data[0][1] = html_print_textarea('keys[customer_key]', 10, 255, $settings->customer_key, 'style="width: 450px" class="height_50px w450px"', true); $table->data[-1][0] = '<div class="section_table_title">'.__('Licence').'</div>';
$table->data[1][0] = '<strong>'.__($license['expiry_caption']).'</strong>'; $table->colspan[0][0] = 2;
$table->data[1][1] = html_print_input_text('expires', $license['expiry_date'], '', 10, 255, true, true); $table->data[0][0] = html_print_label_input_block(
__('Customer key'),
$table->data[2][0] = '<strong>'.__('Platform Limit').'</strong>'; html_print_textarea(
$table->data[2][1] = html_print_input_text('expires', $license['limit'], '', 10, 255, true, true).' '.($license['limit_mode'] == 0 ? __('agents') : __('modules')); 'keys[customer_key]',
10,
$table->data[3][0] = '<strong>'.__('Current Platform Count').'</strong>'; 255,
$table->data[3][1] = html_print_input_text('expires', $license['count'], '', 10, 255, true, true).' '.($license['limit_mode'] == 0 ? __('agents') : __('modules')); $settings->customer_key,
'style="width: 100%; height:80px;"',
$table->data[4][0] = '<strong>'.__('Current Platform Count (enabled: items)').'</strong>';
$table->data[4][1] = html_print_input_text('expires', $license['count_enabled'], '', 10, 255, true, true).' '.($license['limit_mode'] == 0 ? __('agents') : __('modules'));
$table->data[5][0] = '<strong>'.__('Current Platform Count (disabled: items)').'</strong>';
$table->data[5][1] = html_print_input_text('expires', $license['count_disabled'], '', 10, 255, true, true).' '.($license['limit_mode'] == 0 ? __('agents') : __('modules'));
$table->data[6][0] = '<strong>'.__('License Mode').'</strong>';
$table->data[6][1] = html_print_input_text('expires', $license['license_mode'], '', 10, 255, true, true);
$table->data[7][0] = '<strong>'.__('NMS').'</strong>';
$table->data[7][1] = html_print_input_text('expires', ($license['nms'] == 1 ? __('enabled') : __('disabled')), '', 10, 255, true, true);
$table->data[8][0] = '<strong>'.__('Satellite').'</strong>';
$table->data[8][1] = html_print_input_text('expires', ($license['dhpm'] == 1 ? __('enabled') : __('disabled')), '', 10, 255, true, true);
if ($license['dhpm'] == 1) {
$table->data[9][0] = '<strong>'.__('License encryption key').'</strong>'.ui_print_help_tip(
__('This key is used to encrypt your Pandora FMS license when it is shared with other Pandora FMS components'),
true true
); )
$table->data[9][1] = html_print_input_password( );
'license_encryption_key',
io_safe_output($settings->license_encryption_key), $table->data[1][0] = html_print_label_input_block(
__($license['expiry_caption']),
html_print_input_text(
'expires',
$license['expiry_date'],
'', '',
10, 10,
255, 255,
true, true,
false true
)
);
$table->data[1][1] = html_print_label_input_block(
__('Platform Limit'),
html_print_input_text(
'expires',
$license['limit'],
'',
10,
255,
true,
true
).' '.($license['limit_mode'] == 0 ? __('agents') : __('modules'))
);
$table->data[2][0] = html_print_label_input_block(
__('Current Platform Count'),
html_print_input_text(
'expires',
$license['count'],
'',
10,
255,
true,
true
).' '.($license['limit_mode'] == 0 ? __('agents') : __('modules'))
);
$table->data[2][1] = html_print_label_input_block(
__('Current Platform Count (enabled: items)'),
html_print_input_text(
'expires',
$license['count_enabled'],
'',
10,
255,
true,
true
).' '.($license['limit_mode'] == 0 ? __('agents') : __('modules'))
);
$table->data[3][0] = html_print_label_input_block(
__('Current Platform Count (disabled: items)'),
html_print_input_text(
'expires',
$license['count_disabled'],
'',
10,
255,
true,
true
).' '.($license['limit_mode'] == 0 ? __('agents') : __('modules'))
);
$table->data[3][1] = html_print_label_input_block(
__('License Mode'),
html_print_input_text(
'expires',
$license['license_mode'],
'',
10,
255,
true,
true
)
);
$table->data[4][0] = html_print_label_input_block(
__('NMS'),
html_print_input_text(
'expires',
($license['nms'] == 1 ? __('enabled') : __('disabled')),
'',
10,
255,
true,
true
)
);
$table->data[4][1] = html_print_label_input_block(
__('Satellite'),
html_print_input_text(
'expires',
($license['dhpm'] == 1 ? __('enabled') : __('disabled')),
'',
10,
255,
true,
true
)
);
$table->data[5][0] = html_print_label_input_block(
__('Licensed to'),
html_print_input_text(
'licensed_to',
$license['licensed_to'],
'',
64,
255,
true,
true
)
);
if ($license['dhpm'] == 1) {
$table->data[5][1] = html_print_label_input_block(
__('License encryption key').'</strong>'.ui_print_help_tip(
__('This key is used to encrypt your Pandora FMS license when it is shared with other Pandora FMS components'),
true
),
html_print_input_password(
'license_encryption_key',
io_safe_output($settings->license_encryption_key),
'',
10,
255,
true,
false
)
); );
} }
$table->data[10][0] = '<strong>'.__('Licensed to').'</strong>';
$table->data[10][1] = html_print_input_text('licensed_to', $license['licensed_to'], '', 64, 255, true, true);
html_print_table($table); html_print_table($table);
// If DESTDIR is defined the enterprise license is expired. // If DESTDIR is defined the enterprise license is expired.
if (enterprise_installed() || defined('DESTDIR')) { if (enterprise_installed() || defined('DESTDIR')) {
echo '<div class="action-buttons" style="width: '.$table->width.'">'; $buttons = html_print_input_hidden('update_settings', 1, true);
html_print_input_hidden('update_settings', 1); $buttons .= html_print_submit_button(
html_print_submit_button(__('Validate'), 'update_button', false, 'class="sub upd"'); __('Validate'),
echo '&nbsp;&nbsp;'; 'update_button',
html_print_button(__('Request new license'), 'license', false, 'generate_request_code()', [ 'fixed_id' => 'button-', 'icon' => 'next']); false,
echo '</div>'; ['icon' => 'next'],
true
);
$buttons .= html_print_button(
__('Request new license'),
'license',
false,
'generate_request_code()',
[
'fixed_id' => 'button-',
'icon' => 'next',
'mode' => 'secondary',
],
true
);
html_print_action_buttons(
$buttons
);
} }
echo '</form>';
if (is_metaconsole()) { if (is_metaconsole()) {
ui_require_css_file('pandora_enterprise', ENTERPRISE_DIR.'/include/styles/'); ui_require_css_file('pandora_enterprise', ENTERPRISE_DIR.'/include/styles/');
ui_require_css_file('register', 'include/styles/'); ui_require_css_file('register', 'include/styles/');
@ -220,7 +342,6 @@ if (is_metaconsole()) {
} }
if (enterprise_hook('print_activate_licence_dialog') == ENTERPRISE_NOT_HOOK) { if (enterprise_hook('print_activate_licence_dialog') == ENTERPRISE_NOT_HOOK) {
echo '</form>';
echo '<div id="code_license_dialog" class="invisible left" title="'.__('Request new license').'">'; echo '<div id="code_license_dialog" class="invisible left" title="'.__('Request new license').'">';
echo '<div id="logo">'; echo '<div id="logo">';
html_print_image(ui_get_custom_header_logo(true)); html_print_image(ui_get_custom_header_logo(true));

View File

@ -27,8 +27,6 @@ global $config;
check_login(); check_login();
enterprise_hook('open_meta_frame');
if (! check_acl($config['id_user'], 0, 'UM')) { if (! check_acl($config['id_user'], 0, 'UM')) {
db_pandora_audit( db_pandora_audit(
AUDIT_LOG_ACL_VIOLATION, AUDIT_LOG_ACL_VIOLATION,
@ -437,8 +435,6 @@ if ($id_profile || $new_profile) {
echo '</form>'; echo '</form>';
} }
enterprise_hook('close_meta_frame');
?> ?>
<script type="text/javascript" language="javascript"> <script type="text/javascript" language="javascript">

View File

@ -222,8 +222,6 @@ if (is_ajax() === true) {
} }
} }
enterprise_hook('open_meta_frame');
$tab = get_parameter('tab', 'user'); $tab = get_parameter('tab', 'user');
// Save autorefresh list. // Save autorefresh list.
@ -1886,8 +1884,6 @@ html_print_action_buttons(implode('', $actionButtons), ['type' => 'form_action']
echo '</div>'; echo '</div>';
enterprise_hook('close_meta_frame');
// This is an image generated for JS. // This is an image generated for JS.
$delete_image = html_print_input_image( $delete_image = html_print_input_image(
'del', 'del',

View File

@ -31,8 +31,6 @@ global $config;
check_login(); check_login();
enterprise_hook('open_meta_frame');
require_once $config['homedir'].'/include/functions_profile.php'; require_once $config['homedir'].'/include/functions_profile.php';
require_once $config['homedir'].'/include/functions_users.php'; require_once $config['homedir'].'/include/functions_users.php';
require_once $config['homedir'].'/include/functions_groups.php'; require_once $config['homedir'].'/include/functions_groups.php';
@ -495,5 +493,3 @@ if ($is_management_allowed === true) {
} }
unset($table); unset($table);
enterprise_hook('close_meta_frame');

View File

@ -132,8 +132,6 @@ if (is_ajax()) {
} }
} }
enterprise_hook('open_meta_frame');
$sortField = get_parameter('sort_field'); $sortField = get_parameter('sort_field');
$sort = get_parameter('sort', 'none'); $sort = get_parameter('sort', 'none');
$tab = get_parameter('tab', 'user'); $tab = get_parameter('tab', 'user');
@ -1051,8 +1049,6 @@ if ($is_management_allowed === true) {
); );
} }
enterprise_hook('close_meta_frame');
?> ?>
<script type="text/javascript"> <script type="text/javascript">
function showGroups(id_user) { function showGroups(id_user) {

View File

@ -132,32 +132,24 @@ class AuditLog extends HTML
$this->tableId = 'audit_logs'; $this->tableId = 'audit_logs';
// Header (only in Node). ui_print_standard_header(
if (is_metaconsole() === false) { __('%s audit', get_product_name()).' &raquo; '.__('Review Logs'),
ui_print_standard_header( 'images/gm_log.png',
__('%s audit', get_product_name()).' &raquo; '.__('Review Logs'), false,
'images/gm_log.png', '',
false, false,
'', [],
false, [
[],
[ [
[ 'link' => '',
'link' => '', 'label' => __('Admin Tools'),
'label' => __('Admin Tools'), ],
], [
[ 'link' => '',
'link' => '', 'label' => __('System Audit log'),
'label' => __('System Audit log'), ],
], ]
] );
);
}
if (is_metaconsole() === true) {
// Only in case of Metaconsole, format the frame.
open_meta_frame();
}
$buttons = []; $buttons = [];
@ -265,11 +257,6 @@ class AuditLog extends HTML
echo $e->getMessage(); echo $e->getMessage();
} }
if (is_metaconsole() === true) {
// Close the frame.
close_meta_frame();
}
// Load own javascript file. // Load own javascript file.
echo $this->loadJS(); echo $this->loadJS();

View File

@ -583,7 +583,7 @@ function initialiceLayout(data) {
success: function(data) { success: function(data) {
$("#modal-add-widget").empty(); $("#modal-add-widget").empty();
$("#modal-add-widget").append(data); $("#modal-add-widget").append(data);
$("a.pagination").click(function() { $("a.pandora_pagination").click(function() {
var offset = $(this) var offset = $(this)
.attr("href") .attr("href")
.split("=") .split("=")

View File

@ -28,6 +28,10 @@ ul.mn {
justify-content: center; justify-content: center;
} }
#menu_tab {
margin: 0px;
}
#menu_tab li.nomn.tab_operation img, #menu_tab li.nomn.tab_operation img,
#menu_tab li.nomn.tab_godmode img, #menu_tab li.nomn.tab_godmode img,
#menu_tab li.nomn_high.tab_operation img, #menu_tab li.nomn_high.tab_operation img,
@ -111,8 +115,6 @@ h1 {
} }
.grid-stack-item .grid-stack-item-content .header-widget { .grid-stack-item .grid-stack-item-content .header-widget {
background-color: black;
color: #fff;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;

View File

@ -138,13 +138,13 @@ div.arrow_box:before {
#menu_tab_frame_view_bc .breadcrumbs_container { #menu_tab_frame_view_bc .breadcrumbs_container {
align-self: flex-start; align-self: flex-start;
} }
/*
.breadcrumbs_container { .breadcrumbs_container {
padding-top: 4px; padding-top: 4px;
text-indent: 0.25em; text-indent: 0.25em;
padding-left: 2.5em; padding-left: 2.5em;
} }
*/
.breadcrumb_link { .breadcrumb_link {
color: #848484; color: #848484;
font-size: 10pt; font-size: 10pt;

View File

@ -8294,7 +8294,6 @@ div.graph div.legend table {
.report_info { .report_info {
border: 1px dashed #999; border: 1px dashed #999;
padding: 10px 15px; padding: 10px 15px;
margin-top: 20px;
margin-bottom: 20px; margin-bottom: 20px;
} }
@ -10640,12 +10639,14 @@ table tr td:first-child {
input[type="color"] { input[type="color"] {
background: transparent; background: transparent;
padding: 0 10px;
width: 50px;
box-sizing: initial; box-sizing: initial;
border: 2px solid #14524f; height: 25px;
box-shadow: 0px 3px 6px #c7c7c7; width: 50px;
border-radius: 16px; padding: 0px;
margin: 0px;
border: 0px;
border-radius: 0px;
box-shadow: none;
} }
span.ColorPickerDivSample { span.ColorPickerDivSample {

View File

@ -324,7 +324,7 @@ ui_toggle(
'<span class="subsection_header_title">'.__('Filters').'</span>', '<span class="subsection_header_title">'.__('Filters').'</span>',
'filter_form', 'filter_form',
'', '',
false, true,
false, false,
'', '',
'white-box-content', 'white-box-content',

View File

@ -1052,8 +1052,6 @@ if (!empty($table->data)) {
// Close edit_user_profiles. // Close edit_user_profiles.
echo '</div>'; echo '</div>';
enterprise_hook('close_meta_frame');
if (is_metaconsole() === false) { if (is_metaconsole() === false) {
?> ?>

View File

@ -14,7 +14,7 @@
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______| * |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
* *
* ============================================================================ * ============================================================================
* Copyright (c) 2005-2021 Artica Soluciones Tecnologicas * Copyright (c) 2005-2023 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list * Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -121,11 +121,11 @@ if ($aclRead === false && $aclWrite === false && $aclManage === false) {
$options = []; $options = [];
$options['consoles_list']['text'] = '<a href="index.php?sec=network&sec2=godmode/reporting/map_builder">'.html_print_image( $options['consoles_list']['text'] = '<a href="index.php?sec=network&sec2=godmode/reporting/map_builder">'.html_print_image(
'images/visual_console.png', 'images/logs@svg.svg',
true, true,
[ [
'title' => __('Visual consoles list'), 'title' => __('Visual consoles list'),
'class' => 'invert_filter', 'class' => 'main_menu_icon invert_filter',
] ]
).'</a>'; ).'</a>';
@ -149,29 +149,29 @@ if ($aclWrite === true || $aclManage === true) {
$options['public_link']['text'] = '<a href="'.ui_get_full_url( $options['public_link']['text'] = '<a href="'.ui_get_full_url(
'operation/visual_console/public_console.php?hash='.$hash.'&id_layout='.$visualConsoleId.'&refr='.$refr.'&id_user='.$config['id_user'] 'operation/visual_console/public_console.php?hash='.$hash.'&id_layout='.$visualConsoleId.'&refr='.$refr.'&id_user='.$config['id_user']
).'" target="_blank">'.html_print_image( ).'" target="_blank">'.html_print_image(
'images/camera_mc.png', 'images/item-icon.svg',
true, true,
[ [
'title' => __('Show link to public Visual Console'), 'title' => __('Show link to public Visual Console'),
'class' => 'invert_filter', 'class' => 'main_menu_icon invert_filter',
] ]
).'</a>'; ).'</a>';
$options['public_link']['active'] = false; $options['public_link']['active'] = false;
$options['data']['text'] = '<a href="'.$baseUrl.'&tab=data&id_visual_console='.$visualConsoleId.'">'.html_print_image( $options['data']['text'] = '<a href="'.$baseUrl.'&tab=data&id_visual_console='.$visualConsoleId.'">'.html_print_image(
'images/op_reporting.png', 'images/bars-graph.svg',
true, true,
[ [
'title' => __('Main data'), 'title' => __('Main data'),
'class' => 'invert_filter', 'class' => 'main_menu_icon invert_filter',
] ]
).'</a>'; ).'</a>';
$options['list_elements']['text'] = '<a href="'.$baseUrl.'&tab=list_elements&id_visual_console='.$visualConsoleId.'">'.html_print_image( $options['list_elements']['text'] = '<a href="'.$baseUrl.'&tab=list_elements&id_visual_console='.$visualConsoleId.'">'.html_print_image(
'images/list.png', 'images/edit_columns@svg.svg',
true, true,
[ [
'title' => __('List elements'), 'title' => __('List elements'),
'class' => 'invert_filter', 'class' => 'main_menu_icon invert_filter',
] ]
).'</a>'; ).'</a>';
@ -181,27 +181,27 @@ if ($aclWrite === true || $aclManage === true) {
true, true,
[ [
'title' => __('Services wizard'), 'title' => __('Services wizard'),
'class' => 'invert_filter', 'class' => 'main_menu_icon invert_filter',
] ]
).'</a>'; ).'</a>';
} }
$options['wizard']['text'] = '<a href="'.$baseUrl.'&tab=wizard&id_visual_console='.$visualConsoleId.'">'.html_print_image( $options['wizard']['text'] = '<a href="'.$baseUrl.'&tab=wizard&id_visual_console='.$visualConsoleId.'">'.html_print_image(
'images/wand.png', 'images/wizard@svg.svg',
true, true,
[ [
'title' => __('Wizard'), 'title' => __('Wizard'),
'class' => 'invert_filter', 'class' => 'main_menu_icon invert_filter',
] ]
).'</a>'; ).'</a>';
} }
$options['view']['text'] = '<a href="index.php?sec=network&sec2=operation/visual_console/render_view&id='.$visualConsoleId.'&refr='.$refr.'">'.html_print_image( $options['view']['text'] = '<a href="index.php?sec=network&sec2=operation/visual_console/render_view&id='.$visualConsoleId.'&refr='.$refr.'">'.html_print_image(
'images/eye.png', 'images/enable.svg',
true, true,
[ [
'title' => __('View'), 'title' => __('View'),
'class' => 'invert_filter', 'class' => 'main_menu_icon invert_filter',
] ]
).'</a>'; ).'</a>';
$options['view']['active'] = true; $options['view']['active'] = true;
@ -209,11 +209,11 @@ $options['view']['active'] = true;
if (is_metaconsole() === false) { if (is_metaconsole() === false) {
if (!$config['pure']) { if (!$config['pure']) {
$options['pure']['text'] = '<a id ="full_screen" href="index.php?sec=network&sec2=operation/visual_console/render_view&id='.$visualConsoleId.'&pure=1&refr='.$refr.'">'.html_print_image( $options['pure']['text'] = '<a id ="full_screen" href="index.php?sec=network&sec2=operation/visual_console/render_view&id='.$visualConsoleId.'&pure=1&refr='.$refr.'">'.html_print_image(
'images/full_screen.png', 'images/fullscreen@svg.svg',
true, true,
[ [
'title' => __('Full screen mode'), 'title' => __('Full screen mode'),
'class' => 'invert_filter', 'class' => 'main_menu_icon invert_filter',
] ]
).'</a>'; ).'</a>';

View File

@ -29,7 +29,6 @@
// Extras required. // Extras required.
\ui_require_css_file('wizard'); \ui_require_css_file('wizard');
\enterprise_include_once('meta/include/functions_alerts_meta.php'); \enterprise_include_once('meta/include/functions_alerts_meta.php');
\enterprise_hook('open_meta_frame');
if (\is_metaconsole() === true) { if (\is_metaconsole() === true) {
\alerts_meta_print_header($tabs); \alerts_meta_print_header($tabs);
@ -142,5 +141,3 @@ HTML::printForm(
false, false,
true true
); );
\enterprise_hook('close_meta_frame');

View File

@ -28,7 +28,6 @@
\ui_require_css_file('wizard'); \ui_require_css_file('wizard');
\enterprise_include_once('meta/include/functions_alerts_meta.php'); \enterprise_include_once('meta/include/functions_alerts_meta.php');
\enterprise_hook('open_meta_frame');
if (\is_metaconsole() === true) { if (\is_metaconsole() === true) {
\alerts_meta_print_header($tabs); \alerts_meta_print_header($tabs);
@ -150,5 +149,3 @@ if ((bool) check_acl($config['id_user'], 0, 'LM') === true) {
] ]
); );
} }
\enterprise_hook('close_meta_frame');

View File

@ -30,7 +30,6 @@ global $config;
\ui_require_css_file('wizard'); \ui_require_css_file('wizard');
\enterprise_include_once('meta/include/functions_alerts_meta.php'); \enterprise_include_once('meta/include/functions_alerts_meta.php');
\enterprise_hook('open_meta_frame');
if (\is_metaconsole() === true) { if (\is_metaconsole() === true) {
\alerts_meta_print_header($tabs); \alerts_meta_print_header($tabs);
@ -491,7 +490,6 @@ if ((bool) check_acl($config['id_user'], 0, 'LM') === true) {
echo '<div id="modal-alert-templates" class="invisible"></div>'; echo '<div id="modal-alert-templates" class="invisible"></div>';
ui_require_javascript_file('pandora_alerts'); ui_require_javascript_file('pandora_alerts');
\enterprise_hook('close_meta_frame');
?> ?>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready (function () { $(document).ready (function () {

View File

@ -29,7 +29,6 @@
// Extras required. // Extras required.
\ui_require_css_file('wizard'); \ui_require_css_file('wizard');
\enterprise_include_once('meta/include/functions_alerts_meta.php'); \enterprise_include_once('meta/include/functions_alerts_meta.php');
\enterprise_hook('open_meta_frame');
if (\is_metaconsole() === true) { if (\is_metaconsole() === true) {
\alerts_meta_print_header($tabs); \alerts_meta_print_header($tabs);
@ -186,7 +185,6 @@ echo '<div id="modal-alert-templates" class="invisible"></div>';
ui_require_javascript_file('calendar'); ui_require_javascript_file('calendar');
ui_require_javascript_file('pandora_alerts'); ui_require_javascript_file('pandora_alerts');
\enterprise_hook('close_meta_frame');
?> ?>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready (function () { $(document).ready (function () {

View File

@ -49,7 +49,7 @@ if ($manageDashboards !== 0 || $writeDashboards !== 0) {
if ((int) $cellData['id_widget'] !== 0) { if ((int) $cellData['id_widget'] !== 0) {
$output .= '<a id="configure-widget-'.$cellData['id'].'" class="">'; $output .= '<a id="configure-widget-'.$cellData['id'].'" class="">';
$output .= html_print_image( $output .= html_print_image(
'images/input_cog_white.png', 'images/configuration@svg.svg',
true, true,
[ [
'width' => '16px', 'width' => '16px',
@ -61,7 +61,7 @@ if ($manageDashboards !== 0 || $writeDashboards !== 0) {
$output .= '<a id="delete-widget-'.$cellData['id'].'" class="">'; $output .= '<a id="delete-widget-'.$cellData['id'].'" class="">';
$output .= html_print_image( $output .= html_print_image(
'images/input_delete_white.png', 'images/delete.svg',
true, true,
[ [
'width' => '16px', 'width' => '16px',

View File

@ -273,22 +273,20 @@ if (isset($config['public_dashboard']) === true
} }
if ($publicLink === false) { if ($publicLink === false) {
if ((bool) is_metaconsole() === true) { ui_print_standard_header(
ui_meta_print_header( $dashboardName,
__('Dashboards').' » '.__('List'), '',
false, false,
$buttons '',
); true,
} else { $buttons,
ui_print_page_header( [
$dashboardName, [
'', 'link' => '',
false, 'label' => __('Dashboard'),
'', ],
false, ]
$buttons );
);
}
} else { } else {
$output = '<div id="dashboard-controls">'; $output = '<div id="dashboard-controls">';
foreach ($buttons as $key => $value) { foreach ($buttons as $key => $value) {

View File

@ -36,7 +36,10 @@ if ((int) $cellData['id_widget'] !== 0 || $widgetId !== 0) {
'add-widget-'.$cellData['id'], 'add-widget-'.$cellData['id'],
false, false,
'', '',
'class="sub cog add-widget"', [
'icon' => 'cog',
'mode' => 'secondary mini',
],
true true
); );