tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2718-Creacion-de-usuarios-desde-metaconsola' into 'develop' 

fixed bug: admin users not able to log in to node when they are created in…

See merge request artica/pandorafms!1812
This commit is contained in:
vgilc 2018-10-25 12:10:58 +02:00
parent c14a7d270a 93f4b74c9c
commit b50f52ae9d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/godmode/users/configure_user.php
View File

@ -154,6 +154,8 @@ if ($create_user) {
} }
if (html_print_csrf_error()) return; if (html_print_csrf_error()) return;
$user_is_admin = (int) get_parameter ('is_admin', 0);
$values = array (); $values = array ();
$values['id_user'] = (string) get_parameter ('id_user'); $values['id_user'] = (string) get_parameter ('id_user');
$values['fullname'] = (string) get_parameter ('fullname'); $values['fullname'] = (string) get_parameter ('fullname');
@ -164,7 +166,7 @@ if ($create_user) {
$values['email'] = (string) get_parameter ('email'); $values['email'] = (string) get_parameter ('email');
$values['phone'] = (string) get_parameter ('phone'); $values['phone'] = (string) get_parameter ('phone');
$values['comments'] = (string) get_parameter ('comments'); $values['comments'] = (string) get_parameter ('comments');
$values['is_admin'] = (int) get_parameter ('is_admin', 0); $values['is_admin'] = $user_is_admin;
$values['language'] = get_parameter ('language', 'default'); $values['language'] = get_parameter ('language', 'default');
$values['timezone'] = (string) get_parameter('timezone'); $values['timezone'] = (string) get_parameter('timezone');
$values['default_event_filter'] = (int) get_parameter('default_event_filter'); $values['default_event_filter'] = (int) get_parameter('default_event_filter');
@ -193,9 +195,9 @@ if ($create_user) {
$values['last_pass_change'] = date ("Y/m/d H:i:s", get_system_time()); $values['last_pass_change'] = date ("Y/m/d H:i:s", get_system_time());
if(defined('METACONSOLE')) { if(defined('METACONSOLE')) {
$values['metaconsole_access'] = get_parameter ('metaconsole_access', 'basic'); $values['metaconsole_access'] = get_parameter ('metaconsole_access', 'basic');
$values['metaconsole_agents_manager'] = get_parameter ('metaconsole_agents_manager', '0'); $values['metaconsole_agents_manager'] = ($user_is_admin == 1 ? 1 : get_parameter ('metaconsole_agents_manager', '0'));
$values['metaconsole_assigned_server'] = get_parameter ('metaconsole_assigned_server', ''); $values['metaconsole_assigned_server'] = get_parameter ('metaconsole_assigned_server', '');
$values['metaconsole_access_node'] = get_parameter ('metaconsole_access_node', '0'); $values['metaconsole_access_node'] = ($user_is_admin == 1 ? 1 : get_parameter ('metaconsole_access_node', '0'));
} }
} }
$values["not_login"] = (bool)get_parameter ('not_login', false); $values["not_login"] = (bool)get_parameter ('not_login', false);
@ -738,12 +740,11 @@ $(document).ready (function () {
$('input:radio[name="is_admin"]').change(function() { $('input:radio[name="is_admin"]').change(function() {
if($('#radiobtn0002').prop('checked')) { if($('#radiobtn0002').prop('checked')) {
$('#user_configuration_table-metaconsole_agents_manager').show(); $('#user_configuration_table-metaconsole_agents_manager').show();
$('#user_configuration_table-metaconsole_assigned_server').show();
$('#user_configuration_table-metaconsole_access_node').show(); $('#user_configuration_table-metaconsole_access_node').show();
} }
else { else {
$('#user_configuration_table-metaconsole_agents_manager').hide(); $('#user_configuration_table-metaconsole_agents_manager').hide();
$('#user_configuration_table-metaconsole_assigned_server').hide(); $('#user_configuration_table-metaconsole_assigned_server').show();
$('#user_configuration_table-metaconsole_access_node').hide(); $('#user_configuration_table-metaconsole_access_node').hide();
} }
}); });