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

2013-04-25 Ramon Novoa <rnovoa@artica.es> 

* images/cross_double.png,
	  godmode/users/user_list.php: Added support to delete users from all
	  consoles to the metaconsole. Fixes bug #3607619.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8058 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2013-04-25 11:34:29 +00:00
parent 74776d7188
commit 4889cbe92c
3 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2013-04-25 Ramon Novoa <rnovoa@artica.es>
* images/cross_double.png,
godmode/users/user_list.php: Added support to delete users from all
consoles to the metaconsole. Fixes bug #3607619.
2013-04-25 Miguel de Dios <miguel.dedios@artica.es>
* godmode/events/custom_events.php,

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

@ -21,6 +21,7 @@ check_login ();
include_once($config['homedir'] . "/include/functions_profile.php");
include_once ($config['homedir'].'/include/functions_users.php');
require_once ($config['homedir'] . '/include/functions_groups.php');
enterprise_include_once ('include/functions_metaconsole.php');
enterprise_include_once ('meta/include/functions_users_meta.php');
if (! check_acl ($config['id_user'], 0, "UM")) {
@ -135,17 +136,48 @@ if (isset ($_GET["user_del"])) { //delete user
if ($result) {
users_save_logout($user_row, true);
}
db_pandora_audit("User management",
"Deleted user ".io_safe_input($id_user));
__("Deleted user %s", io_safe_input($id_user)));
}
ui_print_result_message ($result,
__('Successfully deleted'),
__('There was a problem deleting the user'));
// Delete the user in all the consoles
if (defined ('METACONSOLE') && isset ($_GET["delete_all"])) {
$servers = metaconsole_get_servers();
foreach ($servers as $server) {
// Connect to the remote console
metaconsole_connect($server);
// Delete the user
$result = delete_user ($id_user);
if ($result) {
db_pandora_audit("User management",
__("Deleted user %s from metaconsole", io_safe_input($id_user)));
}
else
// Restore the db connection
metaconsole_restore_db();
// Log to the metaconsole too
if ($result) {
db_pandora_audit("User management",
__("Deleted user %s from %s", io_safe_input($id_user), io_safe_input($server['server_name'])));
}
ui_print_result_message ($result,
__('Successfully deleted from %s', io_safe_input($server['server_name'])),
__('There was a problem deleting the user from %s', io_safe_input($server['server_name'])));
}
}
}
else {
ui_print_error_message (__('There was a problem deleting the user'));
}
}
elseif (isset ($_GET["profile_del"])) { //delete profile
$id_profile = (int) get_parameter_post ("delete_profile");
@ -307,6 +339,9 @@ foreach ($info as $user_id => $user_info) {
$data[5] .= '<a href="index.php?sec='.$sec.'&amp;sec2=godmode/users/configure_user&pure='.$pure.'&amp;id='.$user_id.'">'.html_print_image('images/config.png', true, array('title' => __('Edit'))).'</a>';
if ($config["admin_can_delete_user"] && $user_info['id_user'] != $config['id_user']) {
$data[5] .= "<a href='index.php?sec=".$sec."&sec2=godmode/users/user_list&user_del=1&pure=".$pure."&delete_user=".$user_info['id_user']."'>".html_print_image('images/cross.png', true, array ('title' => __('Delete'), 'onclick' => "if (! confirm ('" .__('Deleting User'). " ". $user_info['id_user'] . ". " . __('Are you sure?') ."')) return false"))."</a>";
if (defined('METACONSOLE')) {
$data[5] .= "<a href='index.php?sec=".$sec."&sec2=godmode/users/user_list&user_del=1&pure=".$pure."&delete_user=".$user_info['id_user']."&delete_all=1'>".html_print_image('images/cross_double.png', true, array ('title' => __('Delete from all consoles'), 'onclick' => "if (! confirm ('" .__('Deleting User %s from all consoles', $user_info['id_user']) . ". " . __('Are you sure?') ."')) return false"))."</a>";
}
}
else {
$data[5] .= ''; //Delete button not in this mode

BIN
pandora_console/images/cross_double.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 730 B