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

2011-02-15 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* godmode/users/user_list.php: Only display administrator users if
	current user is administrator too. 
	* godmode/users/configure_user.php: Only administrator can create
	administrator users. Only administrator users can assign group "All" to
	a profile.  

	Fixes: #3180761



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3860 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2011-02-15 17:49:13 +00:00
parent 37df52a4ff
commit 0c0ab29ec8
3 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,3 +1,13 @@
2011-02-15 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/users/user_list.php: Only display administrator users if
current user is administrator too.
* godmode/users/configure_user.php: Only administrator can create
administrator users. Only administrator users can assign group "All" to
a profile.
Fixes: #3180761
2011-02-15 Miguel de Dios <miguel.dedios@artica.es> 2011-02-15 Miguel de Dios <miguel.dedios@artica.es>
* pandoradb.postgreSQL.sql, pandoradb.data.postgreSQL.sql: added column * pandoradb.postgreSQL.sql, pandoradb.data.postgreSQL.sql: added column

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

@ -258,13 +258,16 @@ if ($config['user_can_update_password']) {
'', 15, 255, $view_mode, '', '', true, true); '', 15, 255, $view_mode, '', '', true, true);
} }
$own_info = get_user_info ($config['id_user']);
if ($config['admin_can_make_admin']) { if ($config['admin_can_make_admin']) {
$table->data[6][0] = __('Global Profile'); $table->data[6][0] = __('Global Profile');
$table->data[6][1] = print_radio_button ('is_admin', 1, '', $user_info['is_admin'], true); $table->data[6][1] = '';
$table->data[6][1] .= __('Administrator'); if ($own_info['is_admin'] || $user_info['is_admin']){
$table->data[6][1] .= print_help_tip (__("This user has permissions to manage all. This is admin user and overwrites all permissions given in profiles/groups"), true); $table->data[6][1] = print_radio_button ('is_admin', 1, '', $user_info['is_admin'], true);
$table->data[6][1] .= '<br />'; $table->data[6][1] .= __('Administrator');
$table->data[6][1] .= print_help_tip (__("This user has permissions to manage all. This is admin user and overwrites all permissions given in profiles/groups"), true);
$table->data[6][1] .= '<br />';
}
$table->data[6][1] .= print_radio_button ('is_admin', 0, '', $user_info['is_admin'], true); $table->data[6][1] .= print_radio_button ('is_admin', 0, '', $user_info['is_admin'], true);
$table->data[6][1] .= __('Standard User'); $table->data[6][1] .= __('Standard User');
$table->data[6][1] .= print_help_tip (__("This user has separated permissions to view data in his group agents, create incidents belong to his groups, add notes in another incidents, create personal assignments or reviews and other tasks, on different profiles"), true); $table->data[6][1] .= print_help_tip (__("This user has separated permissions to view data in his group agents, create incidents belong to his groups, add notes in another incidents, create personal assignments or reviews and other tasks, on different profiles"), true);
@ -363,7 +366,7 @@ $data = array ();
$data[0] = '<form method="post">'; $data[0] = '<form method="post">';
$data[0] .= print_select (get_profiles (), 'assign_profile', 0, '', __('None'), $data[0] .= print_select (get_profiles (), 'assign_profile', 0, '', __('None'),
0, true, false, false); 0, true, false, false);
$data[1] = print_select_groups($config['id_user'], "UM", true, $data[1] = print_select_groups($config['id_user'], "UM", $own_info['is_admin'],
'assign_group', -1, '', __('None'), -1, true, false, false); 'assign_group', -1, '', __('None'), -1, true, false, false);
$data[2] = print_input_image ('add', 'images/add.png', 1, '', true); $data[2] = print_input_image ('add', 'images/add.png', 1, '', true);
$data[2] .= print_input_hidden ('id', $id, true); $data[2] .= print_input_hidden ('id', $id, true);

15
pandora_console/godmode/users/user_list.php
View File

@ -140,11 +140,22 @@ $table->align[3] = "center";
$table->align[5] = "center"; $table->align[5] = "center";
$table->size[5] = 40; $table->size[5] = 40;
$info = array (); $info1 = array ();
$info = get_users ($order, array ('offset' => (int) get_parameter ('offset'), $info1 = get_users ($order, array ('offset' => (int) get_parameter ('offset'),
'limit' => (int) $config['block_size'])); 'limit' => (int) $config['block_size']));
$info = array();
$own_info = get_user_info ($config['id_user']);
if ($own_info['is_admin'])
$info = $info1;
// If user is not admin then don't display admin users.
else
foreach ($info1 as $key => $usr)
if (!$usr['is_admin'])
$info[$key] = $usr;
// Prepare pagination // Prepare pagination
pagination (count(get_users ())); pagination (count(get_users ()));