moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 09:56:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'wip-mdl-39863' of git://github.com/rajeshtaneja/moodle

Browse source
This commit is contained in:
Sam Hemelryk 2013-06-18 11:19:35 +12:00
commit 21467b4461
2 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
admin/user/user_bulk_confirm.php
View file

@ -23,6 +23,7 @@ echo $OUTPUT->header();
//TODO: add support for large number of users //TODO: add support for large number of users
if ($confirm and confirm_sesskey()) { if ($confirm and confirm_sesskey()) {
$notifications = '';
list($in, $params) = $DB->get_in_or_equal($SESSION->bulk_users); list($in, $params) = $DB->get_in_or_equal($SESSION->bulk_users);
$rs = $DB->get_recordset_select('user', "id $in", $params, '', 'id, username, secret, confirmed, auth, firstname, lastname'); $rs = $DB->get_recordset_select('user', "id $in", $params, '', 'id, username, secret, confirmed, auth, firstname, lastname');
foreach ($rs as $user) { foreach ($rs as $user) {
@ -32,12 +33,19 @@ if ($confirm and confirm_sesskey()) {
$auth = get_auth_plugin($user->auth); $auth = get_auth_plugin($user->auth);
$result = $auth->user_confirm($user->username, $user->secret); $result = $auth->user_confirm($user->username, $user->secret);
if ($result != AUTH_CONFIRM_OK && $result != AUTH_CONFIRM_ALREADY) { if ($result != AUTH_CONFIRM_OK && $result != AUTH_CONFIRM_ALREADY) {
echo $OUTPUT->notification(get_string('usernotconfirmed', '', fullname($user, true))); $notifications .= $OUTPUT->notification(get_string('usernotconfirmed', '', fullname($user, true)));
} }
} }
$rs->close(); $rs->close();
redirect($return, get_string('changessaved')); echo $OUTPUT->box_start('generalbox', 'notice');
if (!empty($notifications)) {
echo $notifications;
} else {
echo $OUTPUT->notification(get_string('changessaved'), 'notifysuccess');
}
$continue = new single_button(new moodle_url($return), get_string('continue'), 'post');
echo $OUTPUT->render($continue);
echo $OUTPUT->box_end();
} else { } else {
list($in, $params) = $DB->get_in_or_equal($SESSION->bulk_users); list($in, $params) = $DB->get_in_or_equal($SESSION->bulk_users);
$userlist = $DB->get_records_select_menu('user', "id $in", $params, 'fullname', 'id,'.$DB->sql_fullname().' AS fullname'); $userlist = $DB->get_records_select_menu('user', "id $in", $params, 'fullname', 'id,'.$DB->sql_fullname().' AS fullname');

15
admin/user/user_bulk_delete.php
View file

@ -23,20 +23,27 @@ echo $OUTPUT->header();
//TODO: add support for large number of users //TODO: add support for large number of users
if ($confirm and confirm_sesskey()) { if ($confirm and confirm_sesskey()) {
$notifications = '';
list($in, $params) = $DB->get_in_or_equal($SESSION->bulk_users); list($in, $params) = $DB->get_in_or_equal($SESSION->bulk_users);
$rs = $DB->get_recordset_select('user', "id $in", $params); $rs = $DB->get_recordset_select('user', "id $in", $params);
foreach ($rs as $user) { foreach ($rs as $user) {
if (!is_siteadmin($user) and $USER->id != $user->id and delete_user($user)) { if (!is_siteadmin($user) and $USER->id != $user->id and delete_user($user)) {
unset($SESSION->bulk_users[$user->id]); unset($SESSION->bulk_users[$user->id]);
} else { } else {
echo $OUTPUT->notification(get_string('deletednot', '', fullname($user, true))); $notifications .= $OUTPUT->notification(get_string('deletednot', '', fullname($user, true)));
} }
} }
$rs->close(); $rs->close();
session_gc(); // remove stale sessions session_gc(); // remove stale sessions
redirect($return, get_string('changessaved')); echo $OUTPUT->box_start('generalbox', 'notice');
if (!empty($notifications)) {
echo $notifications;
} else {
echo $OUTPUT->notification(get_string('changessaved'), 'notifysuccess');
}
$continue = new single_button(new moodle_url($return), get_string('continue'), 'post');
echo $OUTPUT->render($continue);
echo $OUTPUT->box_end();
} else { } else {
list($in, $params) = $DB->get_in_or_equal($SESSION->bulk_users); list($in, $params) = $DB->get_in_or_equal($SESSION->bulk_users);
$userlist = $DB->get_records_select_menu('user', "id $in", $params, 'fullname', 'id,'.$DB->sql_fullname().' AS fullname'); $userlist = $DB->get_records_select_menu('user', "id $in", $params, 'fullname', 'id,'.$DB->sql_fullname().' AS fullname');