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

Merge branch 'MDL-62920-master' of https://github.com/aanabit/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2018-10-18 23:47:37 +02:00
commit d6d5ea5d04
6 changed files with 76 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

32
admin/user/user_bulk_cohortadd.php
View file

@ -66,8 +66,8 @@ if (count($cohorts) < 2) {
$countries = get_string_manager()->get_list_of_countries(true);
$namefields = get_all_user_name_fields(true);
foreach ($users as $key => $id) {
$user = $DB->get_record('user', array('id'=>$id, 'deleted'=>0), 'id, ' . $namefields . ', username,
email, country, lastaccess, city');
$user = $DB->get_record('user', array('id' => $id), 'id, ' . $namefields . ', username,
email, country, lastaccess, city, deleted');
$user->fullname = fullname($user, true);
$user->country = @$countries[$user->country];
unset($user->firstname);
@ -84,7 +84,7 @@ if (empty($users) or $mform->is_cancelled()) {
} else if ($data = $mform->get_data()) {
// process request
foreach ($users as $user) {
if (!$DB->record_exists('cohort_members', array('cohortid'=>$data->cohort, 'userid'=>$user->id))) {
if (!$user->deleted && !$DB->record_exists('cohort_members', array('cohortid' => $data->cohort, 'userid' => $user->id))) {
cohort_add_member($data->cohort, $user->id);
}
}
@ -125,13 +125,25 @@ foreach ($columns as $column) {
}
foreach ($users as $user) {
$table->data[] = array (
'<a href="'.$CFG->wwwroot.'/user/view.php?id='.$user->id.'&amp;course='.SITEID.'">'.$user->fullname.'</a>',
$user->email,
$user->city,
$user->country,
$user->lastaccess ? format_time(time() - $user->lastaccess) : $strnever
);
if ($user->deleted) {
$table->data[] = array (
$user->fullname,
'',
'',
'',
get_string('deleteduser', 'bulkusers')
);
} else {
$table->data[] = array(
'<a href="' . $CFG->wwwroot . '/user/view.php?id=' . $user->id . '&amp;course=' . SITEID . '">' .
$user->fullname .
'</a>',
$user->email,
$user->city,
$user->country,
$user->lastaccess ? format_time(time() - $user->lastaccess) : $strnever
);
}
}
echo $OUTPUT->header();

2
admin/user/user_bulk_delete.php
View file

@ -24,7 +24,7 @@ echo $OUTPUT->header();
if ($confirm and confirm_sesskey()) {
$notifications = '';
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', "deleted = 0 and id $in", $params);
foreach ($rs as $user) {
if (!is_siteadmin($user) and $USER->id != $user->id and delete_user($user)) {
unset($SESSION->bulk_users[$user->id]);