tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added unmerged changes from identification wizard feature

Browse Source
This commit is contained in:
fermin831 2016-06-16 13:27:19 +02:00
parent e8ce7e7a13
commit e2fb16cf63
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_console/godmode/update_manager/update_manager.setup.php
View File

@ -24,6 +24,7 @@ if (! check_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_us
return;
}
$identification_reminder = get_parameter('identification_reminder', 1);
$action_update_url_update_manager = (bool)get_parameter(
'action_update_url_update_manager', 0);
@ -50,6 +51,8 @@ if(!$action_update_url_update_manager){
if ($result)
$result = config_update_value('update_manager_proxy_password',
$update_manager_proxy_password);
if ($result && license_free())
$result = config_update_value('identification_reminder',$identification_reminder);
ui_print_result_message($result,
__('Succesful Update the url config vars.'),
@ -78,7 +81,8 @@ if(!$action_update_url_update_manager){
if ($result)
$result = config_update_value('update_manager_proxy_password',
$update_manager_proxy_password);
if ($result && license_free())
$result = config_update_value('identification_reminder',$identification_reminder);
ui_print_result_message($result,
__('Succesful Update the url config vars.'),
__('Unsuccesful Update the url config vars.'));
@ -113,6 +117,14 @@ $table->data[4][0] = __('Proxy password:');
$table->data[4][1] = html_print_input_password('update_manager_proxy_password',
$update_manager_proxy_password, __('Proxy password'), 40, 60, true);
if (license_free()) {
$config["identification_reminder"] = isset($config["identification_reminder"]) ? $config["identification_reminder"] : 1;
$table->data[6][0] = __('Pandora FMS community reminder') .
ui_print_help_tip(__('Every 8 days, a message is displayed to admin users to remember to register this Pandora instance'), true);
$table->data[6][1] = __('Yes').'   '.html_print_radio_button ('identification_reminder', 1, '', $config["identification_reminder"], true).'  ';
$table->data[6][1] .= __('No').'   '.html_print_radio_button ('identification_reminder', 0, '', $config["identification_reminder"], true);
}
html_print_input_hidden('action_update_url_update_manager', 1);
html_print_table($table);

7
pandora_console/index.php
View File

@ -635,9 +635,10 @@ if (get_parameter ('login', 0) !== 0) {
$display_previous_popup = include_once("general/last_message.php");
}
}
if (!isset($config['skip_login_help_dialog']) ||
$config['skip_login_help_dialog'] == 0) {
if ((!isset($config['skip_login_help_dialog']) || $config['skip_login_help_dialog'] == 0) &&
$display_previous_popup === false &&
$config['initial_wizard'] == 1) {
include_once("general/login_help_dialog.php");
}