From b9c2db98253a5315ef084346d7a1fc534e757e7a Mon Sep 17 00:00:00 2001 From: Daniel Barbero Martin <daniel.barbero@artica.es> Date: Fri, 27 Nov 2020 13:21:14 +0100 Subject: [PATCH] fix check install meta --- pandora_console/general/login_page.php | 48 +++++++++++++++++++++--- pandora_console/include/functions_ui.php | 15 ++++---- 2 files changed, 51 insertions(+), 12 deletions(-) diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php index 59257907ad..ed253bb1ca 100755 --- a/pandora_console/general/login_page.php +++ b/pandora_console/general/login_page.php @@ -165,11 +165,31 @@ echo '<div class="container_login">'; echo '<div class="login_page">'; echo '<form method="post" action="'.ui_get_full_url('index.php'.$url).'" ><div class="login_logo_icon">'; echo '<a href="'.$logo_link.'">'; -if (defined('METACONSOLE')) { +if (is_metaconsole() === true) { if (!isset($config['custom_logo_login'])) { - html_print_image(ui_get_full_url('images/custom_logo_login/login_logo.png'), false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true); + html_print_image( + 'enterprise/images/custom_logo_login/login_logo.png', + false, + [ + 'class' => 'login_logo', + 'alt' => 'logo', + 'border' => 0, + 'title' => $logo_title, + ], + false + ); } else { - html_print_image(ui_get_full_url('images/custom_logo_login/'.$config['custom_logo_login']), false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true); + html_print_image( + 'enterprise/images/custom_logo_login/'.$config['custom_logo_login'], + false, + [ + 'class' => 'login_logo', + 'alt' => 'logo', + 'border' => 0, + 'title' => $logo_title, + ], + false + ); } } else if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) { if (!isset($config['custom_logo_login'])) { @@ -350,9 +370,27 @@ if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) { echo '<div class ="img_banner_login">'; if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) { if (isset($config['custom_splash_login'])) { - html_print_image('enterprise/images/custom_splash_login/'.$config['custom_splash_login'], false, [ 'alt' => 'splash', 'border' => 0], false, true); + html_print_image( + 'enterprise/images/custom_splash_login/'.$config['custom_splash_login'], + false, + [ + 'alt' => 'splash', + 'border' => 0, + ], + false, + false + ); } else { - html_print_image('enterprise/images/custom_splash_login/splash_image_default.png', false, ['alt' => 'logo', 'border' => 0], false, true); + html_print_image( + 'enterprise/images/custom_splash_login/splash_image_default.png', + false, + [ + 'alt' => 'logo', + 'border' => 0, + ], + false, + false + ); } } else { html_print_image('images/splash_image_default.png', false, ['alt' => 'logo', 'border' => 0], false, true); diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 2506b3e051..fc9c85b2b9 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -1473,15 +1473,16 @@ function ui_require_css_file($name, $path='include/styles/', $echo_tag=false) && ! file_exists($config['homedir'].'/'.$filename) && ! file_exists($config['homedir'].'/'.ENTERPRISE_DIR.'/'.$filename) ) { - return false; - } - - if (is_metaconsole()) { - $config['css'][$name] = '/../../'.$filename; - } else { - $config['css'][$name] = $filename; + if (is_metaconsole() === true + && file_exists('/../../'.$filename) === true + ) { + $filename = '/../../'.$filename; + } else { + return false; + } } + $config['css'][$name] = $filename; return true; }