2012-11-03 Miguel de Dios <miguel.dedios@artica.es>

* godmode/users/configure_user.php: cleaned source code style.
	
	* include/styles/pandora.css, godmode/users/user_list.php: improved
	the row aspect of disabled users in the list.
	
	Pending task: #3540077




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7121 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2012-11-03 16:41:26 +00:00
parent 41ca6b430c
commit 027920182e
4 changed files with 36 additions and 16 deletions

View File

@ -1,3 +1,12 @@
2012-11-03 Miguel de Dios <miguel.dedios@artica.es>
* godmode/users/configure_user.php: cleaned source code style.
* include/styles/pandora.css, godmode/users/user_list.php: improved
the row aspect of disabled users in the list.
Pending task: #3540077
2012-11-02 Miguel de Dios <miguel.dedios@artica.es> 2012-11-02 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_reporting.php, extensions/update_manager.php: * include/functions_reporting.php, extensions/update_manager.php:

View File

@ -45,11 +45,14 @@ if (! check_acl ($config['id_user'], 0, "UM")) {
return; return;
} }
/*
* Disabled at the moment.
if (!check_referer()) { if (!check_referer()) {
require ("general/noaccess.php"); require ("general/noaccess.php");
return; return;
} }
*/
$tab = get_parameter('tab', 'user'); $tab = get_parameter('tab', 'user');
@ -329,7 +332,7 @@ if ($delete_profile) {
$perfilUser = db_get_row('tusuario_perfil', 'id_up', $id_up); $perfilUser = db_get_row('tusuario_perfil', 'id_up', $id_up);
$id_perfil = $perfilUser['id_perfil']; $id_perfil = $perfilUser['id_perfil'];
$perfil = db_get_row('tperfil', 'id_perfil', $id_perfil); $perfil = db_get_row('tperfil', 'id_perfil', $id_perfil);
db_pandora_audit("User management", db_pandora_audit("User management",
"Deleted profile for user ".io_safe_input($id2), false, false, 'The profile with id ' . $id_perfil . ' in the group ' . $perfilUser['id_grupo']); "Deleted profile for user ".io_safe_input($id2), false, false, 'The profile with id ' . $id_perfil . ' in the group ' . $perfilUser['id_grupo']);

View File

@ -140,14 +140,14 @@ elseif (isset ($_GET["profile_del"])) { //delete profile
elseif ($disable_user !== false) { //disable_user elseif ($disable_user !== false) { //disable_user
$id_user = get_parameter ("id", 0); $id_user = get_parameter ("id", 0);
if($id_user !== 0) { if ($id_user !== 0) {
$result = users_disable ($id_user, $disable_user); $result = users_disable ($id_user, $disable_user);
} }
else { else {
$result = false; $result = false;
} }
if($disable_user == 1) { if ($disable_user == 1) {
ui_print_result_message ($result, ui_print_result_message ($result,
__('Successfully disabled'), __('Successfully disabled'),
__('There was a problem disabling user')); __('There was a problem disabling user'));
@ -192,14 +192,14 @@ $info1 = get_users ($order, array ('offset' => (int) get_parameter ('offset'),
'limit' => (int) $config['block_size'])); 'limit' => (int) $config['block_size']));
$info = array(); $info = array();
$own_info = get_user_info ($config['id_user']); $own_info = get_user_info ($config['id_user']);
$own_groups = users_get_groups ($config['id_user'], 'AR', $own_info['is_admin']); $own_groups = users_get_groups ($config['id_user'], 'AR', $own_info['is_admin']);
if ($own_info['is_admin']) if ($own_info['is_admin'])
$info = $info1; $info = $info1;
// If user is not admin then don't display admin users and user of others groups. // If user is not admin then don't display admin users and user of others groups.
else else
foreach ($info1 as $key => $usr){ foreach ($info1 as $key => $usr) {
$u = get_user_info ($key); $u = get_user_info ($key);
$g = users_get_groups ($key, 'AR', $u['is_admin']); $g = users_get_groups ($key, 'AR', $u['is_admin']);
$result = array_intersect($g, $own_groups); $result = array_intersect($g, $own_groups);
@ -220,26 +220,29 @@ foreach ($info as $user_id => $user_info) {
else else
$table->rowclass[$iterator] = 'rowOdd'; $table->rowclass[$iterator] = 'rowOdd';
$rowPair = !$rowPair; $rowPair = !$rowPair;
if ($user_info['disabled']) {
$table->rowclass[$iterator] .= ' disabled_row_user';
}
$iterator++; $iterator++;
$data[0] = '<a href="index.php?sec=gusuarios&amp;sec2=godmode/users/configure_user&amp;id='.$user_id.'">'.$user_id.'</a>'; $data[0] = '<a href="index.php?sec=gusuarios&amp;sec2=godmode/users/configure_user&amp;id='.$user_id.'">'.$user_id.'</a>';
$data[1] = $user_info["fullname"].'<a href="#" class="tip"><span>'; $data[1] = $user_info["fullname"] . '<a href="#" class="tip"><span>';
$data[1] .= __('First name').': '.$user_info["firstname"].'<br />'; $data[1] .= __('First name') . ': ' . $user_info["firstname"].'<br />';
$data[1] .= __('Last name').': '.$user_info["lastname"].'<br />'; $data[1] .= __('Last name') . ': ' . $user_info["lastname"].'<br />';
$data[1] .= __('Phone').': '.$user_info["phone"].'<br />'; $data[1] .= __('Phone') . ': ' . $user_info["phone"].'<br />';
$data[1] .= __('E-mail').': '.$user_info["email"].'<br />'; $data[1] .= __('E-mail') . ': ' . $user_info["email"].'<br />';
$data[1] .= '</span></a>'; $data[1] .= '</span></a>';
$data[2] = ui_print_timestamp ($user_info["last_connect"], true); $data[2] = ui_print_timestamp ($user_info["last_connect"], true);
if ($user_info["is_admin"]) { if ($user_info["is_admin"]) {
$data[3] = html_print_image ("images/user_suit.png", true, $data[3] = html_print_image ("images/user_suit.png", true,
array ("alt" => __('Admin'), array ("alt" => __('Admin'),
"title" => __('Administrator'))).'&nbsp;'; "title" => __('Administrator'))) . '&nbsp;';
} }
else { else {
$data[3] = html_print_image ("images/user_green.png", true, $data[3] = html_print_image ("images/user_green.png", true,
array ("alt" => __('User'), array ("alt" => __('User'),
"title" => __('Standard User'))).'&nbsp;'; "title" => __('Standard User'))) . '&nbsp;';
} }
$data[3] .= '<a href="#" class="tip"><span>'; $data[3] .= '<a href="#" class="tip"><span>';
@ -259,7 +262,7 @@ foreach ($info as $user_id => $user_info) {
$data[4] = ui_print_string_substr ($user_info["comments"], 24, true); $data[4] = ui_print_string_substr ($user_info["comments"], 24, true);
if($user_info['disabled'] == 0) { if ($user_info['disabled'] == 0) {
$data[5] = '<a href="index.php?sec=gusuarios&amp;sec2=godmode/users/user_list&amp;disable_user=1&amp;id='.$user_info['id_user'].'">'.html_print_image('images/lightbulb.png', true, array('title' => __('Disable'))).'</a>'; $data[5] = '<a href="index.php?sec=gusuarios&amp;sec2=godmode/users/user_list&amp;disable_user=1&amp;id='.$user_info['id_user'].'">'.html_print_image('images/lightbulb.png', true, array('title' => __('Disable'))).'</a>';
} }
else { else {
@ -289,6 +292,4 @@ else {
echo '<i>'.__('The current authentication scheme doesn\'t support creating users from Pandora FMS').'</i>'; echo '<i>'.__('The current authentication scheme doesn\'t support creating users from Pandora FMS').'</i>';
} }
echo '</div>'; echo '</div>';
?>
?>

View File

@ -556,12 +556,19 @@ tr.rowOdd {
tr.rowPair:hover { tr.rowPair:hover {
background-color: #E0E0E0; background-color: #E0E0E0;
} }
tr.rowOdd:hover { tr.rowOdd:hover {
background-color: #E0E0E0 background-color: #E0E0E0
} }
tr.disabled_row_user * {
color: grey;
}
.bg { /* op menu */ .bg { /* op menu */
background-color: #567953; background-color: #567953;
} }
.bg2 { /* main page */ .bg2 { /* main page */
background-color: #0A160C; background-color: #0A160C;
} }