diff --git a/pandora_console/general/last_message.php b/pandora_console/general/last_message.php
new file mode 100644
index 0000000000..2a4188a116
--- /dev/null
+++ b/pandora_console/general/last_message.php
@@ -0,0 +1,60 @@
+';
+
+ echo '
';
+ echo $last_message["data"];
+ echo '
';
+echo '';
+
+?>
+
+
diff --git a/pandora_console/general/login_identification_wizard.php b/pandora_console/general/login_identification_wizard.php
index 69e8e5a888..e6a2d3790a 100644
--- a/pandora_console/general/login_identification_wizard.php
+++ b/pandora_console/general/login_identification_wizard.php
@@ -124,7 +124,7 @@ $display_register = display_register ($wizard_data);
$display_forced = ($wizard_data['force_newsletter'] != -1) || ($wizard_data['force_register'] != -1);
// Return if it is fully completed
-if ((!$display_register) && (!$display_newsletter)) return;
+if ((!$display_register) && (!$display_newsletter)) return false;
$return_button = get_parameter ('return_button', 0) == 1;
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 9aacdadb65..53101d68d5 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -1515,18 +1515,19 @@ function config_check () {
if (license_free() && users_is_admin($config['id_user'])) {
+ $login = get_parameter ('login', false);
//Registration advice
- if (!isset ($config['instance_registered']) || ($config['instance_registered'] != 1)) {
+ if ((!isset ($config['instance_registered']) || ($config['instance_registered'] != 1)) && ($login === false)) {
set_pandora_error_for_header(
- __('Click here to init the registration process'),
- __("This PandoraFMS instance is not registered"));
+ __('Click here to start the registration process'),
+ __("This instance is not registered in the Update manager"));
}
//Newsletter advice
$newsletter = db_get_value ('middlename', 'tusuario', 'id_user', $config['id_user']);
- if ($newsletter != 1) {
+ if ($newsletter != 1 && $login === false) {
set_pandora_error_for_header(
- __('Click here to init the newsletter subscription process'),
+ __('Click here to start the newsletter subscription process'),
__("Missing user in newsletter"));
}
}
diff --git a/pandora_console/index.php b/pandora_console/index.php
index a26186ed57..89027e647d 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -536,7 +536,7 @@ $config['logged'] = false;
extensions_load_extensions ($process_login);
// Check for update manager messages
-if ($config['last_um_check'] > (time() + 2 * SECONDS_1HOUR)) {
+if (license_free() && is_user_admin ($config['id_user']) && $config['last_um_check'] > (time() + 2 * SECONDS_1HOUR)) {
require_once("include/functions_update_manager.php");
update_manager_download_messages ();
@@ -611,7 +611,12 @@ if ($old_global_counter_chat != $now_global_counter_chat) {
$_SESSION['new_chat'] = true;
}
-if ($config['initial_wizard'] != 1) {
+// Pop-ups display order:
+// 1) login_required (timezone and email)
+// 2) identification (newsletter and register)
+// 3) last_message (update manager message popup
+// 4) login_help (online help, enterpirse version, forums, documentation)
+if (!isset($config['initial_wizard']) || $config['initial_wizard'] != 1) {
include_once ("general/login_required.php");
}
if (get_parameter ('login', 0) !== 0) {
@@ -620,9 +625,12 @@ if (get_parameter ('login', 0) !== 0) {
// Display login help info dialog
// If it's configured to not skip this
-
- if ($config['initial_wizard'] == 1) {
- include_once("general/login_identification_wizard.php");
+ $display_previous_popup = false;
+ if (license_free() && is_user_admin ($config['id_user']) && $config['initial_wizard'] == 1) {
+ $display_previous_popup = include_once("general/login_identification_wizard.php");
+ if ($display_previous_popup === false) {
+ $display_previous_popup = include_once("general/last_message.php");
+ }
}
if (!isset($config['skip_login_help_dialog']) ||
$config['skip_login_help_dialog'] == 0) {
@@ -890,7 +898,7 @@ require('include/php_to_js_values.php');
$("#login_accept_register").dialog('open');
}
else {
- console.log ("ajax open wizard");
+
$(".ui-dialog-titlebar-close").show();
$("#container").append('');
jQuery.get ("ajax.php",