';
@@ -86,16 +87,11 @@ if (! $id || ! file_exists ($help_file)) {
/* Show help */
echo '
';
- if (empty($config['enterprise_installed'])) {
- echo html_print_image('images/pandora_tinylogo_open.png', true, array("border" => '0'));
+ if (!empty($config['enterprise_installed']) && is_metaconsole()) {
+ echo '

';
}
else {
- if (is_metaconsole()) {
- echo '

';
- }
- else{
- echo html_print_image('images/pandora_tinylogo.png', true, array("border" => '0'));
- }
+ echo html_print_image($logo, true, array("border" => '0'));
}
echo '
';
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index bfcd3ed44f..35765882b9 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -3956,4 +3956,21 @@ function ui_get_support_logo () {
return 'enterprise/images/custom_general_logos/' . $config['custom_support_logo'];
}
+/**
+ * Get the custom header logo
+ *
+ * @return string with the path to logo. If it is not set, return the default value
+ *
+ */
+function ui_get_custom_header_logo () {
+ global $config;
+
+ if (empty($config['enterprise_installed'])) {
+ return 'images/pandora_tinylogo_open.png';
+ }
+
+ if (empty($config['custom_logo'])) return 'images/pandora_tinylogo.png';
+ return 'enterprise/images/custom_logo/' . $config['custom_logo'];
+}
+
?>
diff --git a/pandora_console/index.php b/pandora_console/index.php
index db2ce4b2ca..d7d7baba3e 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -702,7 +702,7 @@ if (! isset ($config['id_user'])) {
$cod_hash = $user_reset_pass . "::::" . md5(rand(10, 1000000) . rand(10, 1000000) . rand(10, 1000000));
- $subject = '[Pandora] '.__('Reset password');
+ $subject = '[' . get_product_name() . '] '.__('Reset password');
$body = __('This is an automatically sent message for user ');
$body .= ' "
' . $user_reset_pass . '"';
$body .= '
';
@@ -710,7 +710,7 @@ if (! isset ($config['id_user'])) {
$body .= '
';
$body .= '
' . __('Reset your password') . '';
$body .= '
';
- $body .= 'Pandora FMS';
+ $body .= get_product_name();
$body .= '
';
$body .= '
'.__('Please do not reply to this email.').'';