From 521f7ad0ce6cf8061f33cf1357585c5d1d506daf Mon Sep 17 00:00:00 2001 From: Jonathan Date: Mon, 20 Feb 2023 08:57:04 +0100 Subject: [PATCH 1/4] Menu go to images correction --- pandora_console/include/class/OrderInterpreter.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/class/OrderInterpreter.class.php b/pandora_console/include/class/OrderInterpreter.class.php index dab6c7d4fb..534eb6e45e 100644 --- a/pandora_console/include/class/OrderInterpreter.class.php +++ b/pandora_console/include/class/OrderInterpreter.class.php @@ -294,7 +294,7 @@ class OrderInterpreter extends Wizard [ 'name' => __('Task List'), 'icon' => ui_get_full_url( - 'images/menu/discovery.menu.png' + 'images/menu/discovery.svg' ), 'url' => ui_get_full_url( 'index.php?sec=discovery&sec2=godmode/servers/discovery&wiz=tasklist' @@ -338,7 +338,7 @@ class OrderInterpreter extends Wizard [ 'name' => __('Warp Update'), 'icon' => ui_get_full_url( - 'images/menu/um_messages.svg' + 'images/menu/warp_update.svg' ), 'url' => ui_get_full_url( 'index.php?sec=messages&sec2=godmode/update_manager/update_manager&tab=setup' From 4ee6cf7e2819bf37675cc6d104235593d840ce9d Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Mon, 20 Feb 2023 09:54:48 +0100 Subject: [PATCH 2/4] 9662-Fix login meta --- pandora_console/general/login_page.php | 53 +++--- pandora_console/general/mysqlerr.php | 218 +++++++---------------- pandora_console/images/icono_support.png | Bin 750 -> 254 bytes pandora_console/include/styles/login.css | 33 +++- 4 files changed, 121 insertions(+), 183 deletions(-) diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php index eb924227d0..bbdd8ba76c 100755 --- a/pandora_console/general/login_page.php +++ b/pandora_console/general/login_page.php @@ -171,11 +171,11 @@ if (isset($config['custom_support_url'])) { echo '
  • '.__('Support').'
  • '; } else { echo '
  • support
  • '; - echo '
  • '.__('Support').'
  • '; + echo '
  • '.__('Support').'
  • '; } } else if (!$custom_conf_enabled) { echo '
  • support
  • '; - echo '
  • '.__('Docs').'
  • '; + echo '
  • '.__('Support').'
  • '; } echo ''; @@ -370,17 +370,18 @@ if ($config['enterprise_installed']) { echo ''.__('Forgot your password?'); echo ''; - echo ''; echo ''; echo ''; } else if (isset($process_error_message) && !empty($process_error_message)) { - echo '
    '; + echo '
    '; echo '
    '; echo '
    '; - echo html_print_image('images/icono_stop.png', true, ['alt' => __('Password reset'), 'border' => 0]); + echo html_print_image('images/icono_stop.png', true, ['alt' => __('Forbidden'), 'border' => 0]); echo '
    '; echo '
    '; echo '
    '; echo '

    '.__('ERROR').'

    '; echo '

    '.$process_error_message.'

    '; + echo '
    '; echo '
    '; + echo '
    '; echo '
    '; - html_print_submit_button('Ok', 'reset_correct_button', false); + html_print_submit_button('Ok', 'reset_correct_button', false, ['class' => 'mini float-right']); echo '
    '; echo '
    '; echo '
    '; @@ -529,8 +533,9 @@ if (isset($correct_reset_pass_process)) { echo '

    '.__('SUCCESS').'

    '; echo '

    '.$correct_reset_pass_process.'

    '; echo '
    '; + echo '
    '; echo '
    '; - html_print_submit_button('Ok', 'final_process_correct_button', false); + html_print_submit_button('Ok', 'final_process_correct_button', false, ['class' => 'mini float-right']); echo '
    '; echo '
    '; echo ''; @@ -557,8 +562,9 @@ if (isset($login_failed)) { echo ''; } + echo '
    '; echo '
    '; - html_print_submit_button('Ok', 'hide-login-error', false, ['class' => ' mini']); + html_print_submit_button('Ok', 'hide-login-error', false, ['class' => ' mini float-right']); echo '
    '; echo ''; echo ''; @@ -581,8 +587,9 @@ if ($login_screen == 'logout') { } echo ''; + echo '
    '; echo '
    '; - html_print_submit_button('Ok', 'hide-login-logout', false, ['class' => ' mini']); + html_print_submit_button('Ok', 'hide-login-logout', false, ['class' => ' mini float-right']); echo '
    '; echo ''; echo ''; @@ -600,8 +607,9 @@ if ($login_screen === 'disabled_access_node') { echo '

    '.__('Centralized user in metaconsole').'

    '; echo '

    '.__('This user does not have access on node, please enable node access on this user from metaconsole.').'

    '; echo ''; + echo '
    '; echo '
    '; - html_print_submit_button('Ok', 'hide-login-logout', false); + html_print_submit_button('Ok', 'hide-login-logout', false, ['class' => 'mini float-right']); echo '
    '; echo ''; echo ''; @@ -708,8 +716,9 @@ if ($login_screen == 'error_authconfig' || $login_screen == 'error_emptyconfig' echo '

    '.$title.'

    '; echo '

    '.$message.''; echo ''; + echo '
    '; echo '

    '; - html_print_submit_button('Ok', 'hide-login-error', false); + html_print_submit_button('Ok', 'hide-login-error', false, ['class' => 'mini float-right']); echo '
    '; echo ''; echo ''; @@ -779,19 +788,23 @@ html_print_div(['id' => 'forced_title_layer', 'class' => 'forced_title_layer', ' resizable: true, draggable: true, modal: true, - height: 220, width: 528, clickOutside: true, overlay: { opacity: 0.5, background: "black" + }, + open: function (event, ui) { + $(".ui-widget-overlay").click(function () { + $('#login_logout').dialog('close'); + }); } }); }); $("#button-hide-login-logout").click (function () { - document.location = ""; - }); + $( "#login_logout" ).dialog( "close" ); + }); }); break; @@ -802,7 +815,6 @@ html_print_div(['id' => 'forced_title_layer', 'class' => 'forced_title_layer', ' resizable: true, draggable: true, modal: true, - height: 220, width: 528, clickOutside: true, overlay: { @@ -826,7 +838,6 @@ html_print_div(['id' => 'forced_title_layer', 'class' => 'forced_title_layer', ' resizable: true, draggable: true, modal: true, - height: 400, width: 700, overlay: { opacity: 0.5, @@ -844,7 +855,6 @@ html_print_div(['id' => 'forced_title_layer', 'class' => 'forced_title_layer', ' resizable: true, draggable: true, modal: true, - height: 220, width: 528, overlay: { opacity: 0.5, @@ -869,7 +879,6 @@ html_print_div(['id' => 'forced_title_layer', 'class' => 'forced_title_layer', ' resizable: true, draggable: true, modal: true, - height: 220, width: 528, clickOutside: true, overlay: { @@ -890,7 +899,6 @@ html_print_div(['id' => 'forced_title_layer', 'class' => 'forced_title_layer', ' resizable: true, draggable: true, modal: true, - height: 220, width: 528, clickOutside: true, overlay: { @@ -910,7 +918,6 @@ html_print_div(['id' => 'forced_title_layer', 'class' => 'forced_title_layer', ' resizable: true, draggable: true, modal: true, - height: 220, width: 528, overlay: { opacity: 0.5, diff --git a/pandora_console/general/mysqlerr.php b/pandora_console/general/mysqlerr.php index fe24117d3a..6368122da3 100644 --- a/pandora_console/general/mysqlerr.php +++ b/pandora_console/general/mysqlerr.php @@ -1,167 +1,77 @@ - - - - - - -
    - -
    - - - - /images/icono_cerrar.png'> -
    - -
    - /images/mysqlerr.png'> -
    - -
    -
    - $value) { - if (preg_match('/._alt/i', $key)) { - $custom_conf_enabled = true; - break; - } +$custom_conf_enabled = false; +foreach ($config as $key => $value) { + if (preg_match('/._alt/i', $key)) { + $custom_conf_enabled = true; + break; } +} - if (!$custom_conf_enabled || isset($config['custom_docs_url_alt'])) { - if (isset($config['custom_docs_url_alt'])) { - $docs_url = $config['custom_docs_url_alt']; - } else { - $docs_url = 'https://pandorafms.com/manual/en/documentation/02_installation/04_configuration'; - } - - echo ' - -
    - '.__('Documentation').' - -
    -
    - '; +if (empty($custom_conf_enabled) === true || isset($config['custom_docs_url_alt']) === true) { + if (isset($config['custom_docs_url_alt']) === true) { + $docs_url = $config['custom_docs_url_alt']; + } else { + $docs_url = 'https://pandorafms.com/manual/en/documentation/02_installation/04_configuration'; } +} + +echo '
    '; + echo '
    '; + echo '
    '; + echo html_print_image('images/mysqlerr.png', true, ['alt' => __('Mysql error'), 'border' => 0]); + echo '
    '; + echo '
    '; + echo '
    '; + echo '

    '.__('Database error').'

    '; + echo '

    '.$message.'

    '; + echo '
    '; + echo '
    '; + echo '
    '; + html_print_submit_button( + __('Documentation'), + 'mysqlerr_button', + false, + ['class' => 'mini float-right'] + ); + echo '
    '; + echo '
    '; + echo '
    '; + echo '
    '; + ?> - ?> - - - -
    - -
    - - - diff --git a/pandora_console/images/icono_support.png b/pandora_console/images/icono_support.png index 6db6d32b528d041ddbad081f2a80fc471eb68b8f..302e245ebcd20025a43c8aa45e132fc093504b6e 100644 GIT binary patch literal 254 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAd3?%E9GuQzs#^NA%Cx&(BWL^R}x&b~Ru0XnR z;@ZXuYnvvnZ=SfmX(EuZ4vHqMYXYK4>zaXrlYp}8?yq}44XA;?B*-tAq2Yg7{nCoX z2lhAC)z(z2pDE`BN~L(ZIEHY{Oio~6R8&o6<46bz5^6A-J4Ixnj+p9F293#_XHuGt zLK~tM`lzzIsY(Rz`qmRr3G< literal 750 zcmVw9Lma1BmaV3%&;kAY_gK5dX*Lll}i8Ac28c08)(XLPi3L8-SEO zKmak21PHnbD5-!mI?xoZhna{=!F=SXB4jNLfP%n)kizr$;~E-YpyWeLki3Uk2@pWE zMbJ8#W5x1WbLj;i0&3WYF zhp3#3X3%-OMG~%J3RadO8;UE7AOj{e{zhnh^&gl#1fgOZi1rdbXOrrs|7hiSKP;K! zGl&sKeH;(v9)!~UAn$<;MDiw4u0k#n9H6cgAg3fufEofTPXA-AvWYYZgzrO3#rw$V zh}1Nc01e~>Xx1ynkK}RPu%!G`+id0pU{@12v~*C5yeaS4blLw5GMtr@gWN=>aB~{-{!?8PoNs zfyo0`7{*N2`8|q~YGgp&Y`%A;pk&70Y3&@ZHh!%8THtR+Hrstm7Gy zVe&AuoeM?|{y-17Lq~Mp$g)7}AojspmJ2(vw914<-Z#GdJ^Q=XtWTzksEWU`aj z+(9LqQIuusshU8=#hjVIsWWAi@}$Bvl{xehEAiYwi>%UMl_wo}Etf{cvll3N Date: Mon, 20 Feb 2023 11:16:07 +0100 Subject: [PATCH 3/4] 9662-Fix double authentication login --- pandora_console/general/login_page.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php index bbdd8ba76c..9f2f0aabf2 100755 --- a/pandora_console/general/login_page.php +++ b/pandora_console/general/login_page.php @@ -334,7 +334,7 @@ switch ($login_screen) { echo ''; From e95e6acd0c087645e38ec1377c52ecad7e823f6d Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Mon, 20 Feb 2023 11:27:20 +0100 Subject: [PATCH 4/4] 9662-Fix double authentication login --- pandora_console/general/login_page.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php index 9f2f0aabf2..397c67755f 100755 --- a/pandora_console/general/login_page.php +++ b/pandora_console/general/login_page.php @@ -334,7 +334,7 @@ switch ($login_screen) { echo '';