From 1be4948e2d69960c70a9720a8090756b13ac3e6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= Date: Fri, 3 Jun 2022 12:26:15 +0200 Subject: [PATCH] Changed strings and improve code --- pandora_console/godmode/events/events.php | 31 ++- pandora_console/godmode/menu.php | 234 ++++++++++---------- pandora_console/include/functions_menu.php | 13 +- pandora_console/operation/events/events.php | 14 +- 4 files changed, 150 insertions(+), 142 deletions(-) diff --git a/pandora_console/godmode/events/events.php b/pandora_console/godmode/events/events.php index 59d7810454..1c3177482d 100644 --- a/pandora_console/godmode/events/events.php +++ b/pandora_console/godmode/events/events.php @@ -77,7 +77,7 @@ if (check_acl($config['id_user'], 0, 'PM')) { 'images/custom_columns.png', true, [ - 'title' => __('Custom fields'), + 'title' => __('Custom columns'), 'class' => 'invert_filter', ] ).'', @@ -87,18 +87,17 @@ if (check_acl($config['id_user'], 0, 'PM')) { switch ($section) { case 'filter': $buttons['filter']['active'] = true; - $subpage = ' - '.__('Filters'); + $subpage = __('Filters'); break; case 'fields': $buttons['fields']['active'] = true; - $subpage = ' - '.__('Custom fields'); + $subpage = __('Custom columns'); break; case 'responses': $buttons['responses']['active'] = true; - $subpage = ' - '.__('Responses'); - $help_header = ''; + $subpage = __('Responses'); break; case 'view': @@ -107,18 +106,28 @@ switch ($section) { default: $buttons['filter']['active'] = true; - $subpage = ' - '.__('Filters'); + $subpage = __('Filters'); break; } -if (! defined('METACONSOLE')) { - ui_print_page_header( - __('Manage events').$subpage, +if (is_metaconsole() === false) { + ui_print_standard_header( + $subpage, 'images/gm_events.png', false, - $help_header, + '', true, - $buttons + (array) $buttons, + [ + [ + 'link' => '', + 'label' => __('Configuration'), + ], + [ + 'link' => '', + 'label' => __('Events'), + ], + ] ); } else { ui_meta_print_header(__('Manage events').$subpage, '', $buttons); diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php index aeecc25273..3f05db9a83 100644 --- a/pandora_console/godmode/menu.php +++ b/pandora_console/godmode/menu.php @@ -1,16 +1,32 @@ 0) { - if (array_key_exists('subfatherId', $extmenu)) { + if (array_key_exists('subfatherId', $extmenu) === true) { if (strlen($extmenu['subfatherId']) > 0) { $menu_godmode[$extmenu['fatherId']]['sub'][$extmenu['subfatherId']]['sub2'][$extmenu['sec2']]['text'] = __($extmenu['name']); $menu_godmode[$extmenu['fatherId']]['sub'][$extmenu['subfatherId']]['sub2'][$extmenu['sec2']]['id'] = $extmenu['name']; @@ -462,12 +467,7 @@ if (is_array($config['extensions'])) { $menu_godmode[$extmenu['fatherId']]['sub'][$extmenu['sec2']]['id'] = $extmenu['name']; $menu_godmode[$extmenu['fatherId']]['sub'][$extmenu['sec2']]['refr'] = 0; $menu_godmode[$extmenu['fatherId']]['sub'][$extmenu['sec2']]['icon'] = $extmenu['icon']; - if ($extmenu['name'] == 'Cron jobs') { - $menu_godmode[$extmenu['fatherId']]['sub'][$extmenu['sec2']]['sec'] = $extmenu['fatherId']; - } else { - $menu_godmode[$extmenu['fatherId']]['sub'][$extmenu['sec2']]['sec'] = $extmenu['fatherId']; - } - + $menu_godmode[$extmenu['fatherId']]['sub'][$extmenu['sec2']]['sec'] = $extmenu['fatherId']; $menu_godmode[$extmenu['fatherId']]['sub'][$extmenu['sec2']]['extension'] = true; $menu_godmode[$extmenu['fatherId']]['sub'][$extmenu['sec2']]['enterprise'] = $extension['enterprise']; $menu_godmode[$extmenu['fatherId']]['hasExtensions'] = true; @@ -487,7 +487,7 @@ if (is_array($config['extensions'])) { } } - // Complete the submenu + // Complete the submenu. $extension_view = []; $extension_view['godmode/extensions']['id'] = 'Extension manager view'; $extension_view['godmode/extensions']['text'] = __('Extension manager view'); @@ -499,7 +499,7 @@ if (is_array($config['extensions'])) { $sub['godmode/extensions']['type'] = 'direct'; $sub['godmode/extensions']['subtype'] = 'nolink'; - if (is_array($menu_godmode['gextensions']['sub'])) { + if (is_array($menu_godmode['gextensions']['sub']) === true) { $submenu = array_merge($menu_godmode['gextensions']['sub'], $sub); if ($menu_godmode['gextensions']['sub'] != null) { $menu_godmode['gextensions']['sub'] = $submenu; @@ -514,7 +514,7 @@ $menu_godmode['links']['id'] = 'god-links'; $sub = []; $rows = db_get_all_rows_in_table('tlink', 'name'); foreach ($rows as $row) { - // Audit //meter en extensiones + // Audit //meter en extensiones. $sub[$row['link']]['text'] = $row['name']; $sub[$row['link']]['id'] = $row['name']; $sub[$row['link']]['type'] = 'direct'; @@ -523,8 +523,8 @@ foreach ($rows as $row) { $menu_godmode['links']['sub'] = $sub; -// Update Manager -if (check_acl($config['id_user'], 0, 'PM') && $config['enable_update_manager']) { +// Update Manager. +if ((bool) check_acl($config['id_user'], 0, 'PM') === true && (bool) $config['enable_update_manager'] === true) { $menu_godmode['messages']['text'] = __('Update manager'); $menu_godmode['messages']['id'] = 'god-um_messages'; $menu_godmode['messages']['sec2'] = ''; @@ -546,7 +546,7 @@ if (check_acl($config['id_user'], 0, 'PM') && $config['enable_update_manager']) } // Module library. -if (check_acl($config['id_user'], 0, 'AR')) { +if ((bool) check_acl($config['id_user'], 0, 'AR') === true) { $menu_godmode['gmodule_library']['text'] = __('Module library'); $menu_godmode['gmodule_library']['id'] = 'god-module_library'; @@ -560,6 +560,6 @@ if (check_acl($config['id_user'], 0, 'AR')) { $menu_godmode['gmodule_library']['sub'] = $sub; } -if (!$config['pure']) { +if ((bool) $config['pure'] === false) { menu_print_menu($menu_godmode); } diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php index 15d7f1976c..d9c86aa66a 100644 --- a/pandora_console/include/functions_menu.php +++ b/pandora_console/include/functions_menu.php @@ -232,27 +232,22 @@ function menu_print_menu(&$menu) $menu_selected = true; $selected = true; $visible = true; - } else if (($sec2 == $subsec2 || $allsec2 == $subsec2 || $selected_submenu2) && !isset($sub[$subsec2]['options'])) { + } else if (($sec2 === $subsec2 || $allsec2 === $subsec2 || $selected_submenu2 === true) && isset($sub[$subsec2]['options']) === false) { $class .= 'submenu_selected selected'; $selected = true; $menu_selected = true; - $hasExtensions = (array_key_exists('hasExtensions', $main)) ? $main['hasExtensions'] : false; - if (($extensionInMenuParameter != '') && ($hasExtensions)) { + $hasExtensions = (array_key_exists('hasExtensions', $main) === true) ? $main['hasExtensions'] : false; + if ((empty($extensionInMenuParameter) === false) && ((bool) $hasExtensions === true)) { $visible = true; } else { $visible = false; } - } else if (isset($sub['pages']) && (array_search($sec2, $sub['pages']) !== false)) { - $class .= 'submenu_selected selected'; - $menu_selected = true; - $selected = true; - $visible = true; } else { // Else it's not selected. $class .= 'submenu_not_selected'; } - if (! isset($sub['refr'])) { + if (isset($sub['refr']) === false) { $sub['refr'] = 0; } diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index b72217fa2c..180d887efe 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -942,15 +942,19 @@ if ($pure) { if (is_metaconsole() === false) { unset($onheader['history']); - ui_print_page_header( - __('Events'), + ui_print_standard_header( + __('Events list'), 'images/lightning_go.png', false, 'eventview', false, - $onheader, - true, - 'eventsmodal' + (array) $onheader, + [ + [ + 'link' => '', + 'label' => __('Events'), + ], + ] ); } else { unset($onheader['rss']);