diff --git a/admin/cli/fix_deleted_users.php b/admin/cli/fix_deleted_users.php new file mode 100644 index 00000000000..d2a895057a2 --- /dev/null +++ b/admin/cli/fix_deleted_users.php @@ -0,0 +1,91 @@ +. + +/** + * This script fixed incorrectly deleted users. + * + * @package core + * @subpackage cli + * @copyright 2013 Petr Skoda (http://skodak.org) + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +define('CLI_SCRIPT', true); + +require(__DIR__.'/../../config.php'); +require_once($CFG->libdir.'/clilib.php'); + + +// Now get cli options. +list($options, $unrecognized) = cli_get_params(array('help'=>false), + array('h'=>'help')); + +if ($unrecognized) { + $unrecognized = implode("\n ", $unrecognized); + cli_error(get_string('cliunknowoption', 'admin', $unrecognized)); +} + +if ($options['help']) { + $help = + "Fix incorrectly deleted users. + + This scripts detects users that are marked as deleted instead + of calling delete_user(). + + Deleted users do not have original username, idnumber or email, + we must also delete all roles, enrolments, group memberships, etc. + + Please note this script does not delete any public information + such as forum posts. + + Options: + -h, --help Print out this help + + Example: + \$sudo -u www-data /usr/bin/php admin/cli/fix_deleted_users.php + "; + + echo $help; + die; +} + +cli_heading('Looking for sloppy user deletes'); + +// Look for sloppy deleted users where somebody only flipped the deleted flag. +$sql = "SELECT * + FROM {user} + WHERE deleted = 1 AND email LIKE '%@%' AND username NOT LIKE '%@%'"; +$rs = $DB->get_recordset_sql($sql); +foreach ($rs as $user) { + echo "Redeleting user $user->id: $user->username ($user->email)\n"; + delete_user($user); +} + +cli_heading('Deleting all leftovers'); + +$DB->set_field('user', 'idnumber', '', array('deleted'=>1)); + +$DB->delete_records_select('role_assignments', "userid IN (SELECT id FROM {user} WHERE deleted = 1)"); +$DB->delete_records_select('cohort_members', "userid IN (SELECT id FROM {user} WHERE deleted = 1)"); +$DB->delete_records_select('groups_members', "userid IN (SELECT id FROM {user} WHERE deleted = 1)"); +$DB->delete_records_select('user_enrolments', "userid IN (SELECT id FROM {user} WHERE deleted = 1)"); +$DB->delete_records_select('user_preferences', "userid IN (SELECT id FROM {user} WHERE deleted = 1)"); +$DB->delete_records_select('user_info_data', "userid IN (SELECT id FROM {user} WHERE deleted = 1)"); +$DB->delete_records_select('user_lastaccess', "userid IN (SELECT id FROM {user} WHERE deleted = 1)"); +$DB->delete_records_select('external_tokens', "userid IN (SELECT id FROM {user} WHERE deleted = 1)"); +$DB->delete_records_select('external_services_users', "userid IN (SELECT id FROM {user} WHERE deleted = 1)"); + +exit(0); diff --git a/enrol/category/locallib.php b/enrol/category/locallib.php index 69ec05e8a9b..4ca66c84ce5 100644 --- a/enrol/category/locallib.php +++ b/enrol/category/locallib.php @@ -213,6 +213,7 @@ function enrol_category_sync_course($course) { $sql = "SELECT ra.userid, ra.estart FROM (SELECT xra.userid, MIN(xra.timemodified) AS estart FROM {role_assignments} xra + JOIN {user} xu ON (xu.id = xra.userid AND xu.deleted = 0) WHERE xra.roleid $roleids AND xra.contextid $contextids GROUP BY xra.userid ) ra diff --git a/enrol/cohort/locallib.php b/enrol/cohort/locallib.php index 4027af34e00..606b8290e17 100644 --- a/enrol/cohort/locallib.php +++ b/enrol/cohort/locallib.php @@ -184,6 +184,7 @@ function enrol_cohort_sync(progress_trace $trace, $courseid = NULL) { $sql = "SELECT cm.userid, e.id AS enrolid, ue.status FROM {cohort_members} cm JOIN {enrol} e ON (e.customint1 = cm.cohortid AND e.enrol = 'cohort' $onecourse) + JOIN {user} u ON (u.id = cm.userid AND u.deleted = 0) LEFT JOIN {user_enrolments} ue ON (ue.enrolid = e.id AND ue.userid = cm.userid) WHERE ue.id IS NULL OR ue.status = :suspended"; $params = array(); @@ -244,6 +245,7 @@ function enrol_cohort_sync(progress_trace $trace, $courseid = NULL) { JOIN {enrol} e ON (e.id = ue.enrolid AND e.enrol = 'cohort' AND e.status = :statusenabled $onecourse) JOIN {role} r ON (r.id = e.roleid) JOIN {context} c ON (c.instanceid = e.courseid AND c.contextlevel = :coursecontext) + JOIN {user} u ON (u.id = ue.userid AND u.deleted = 0) LEFT JOIN {role_assignments} ra ON (ra.contextid = c.id AND ra.userid = ue.userid AND ra.itemid = e.id AND ra.component = 'enrol_cohort' AND e.roleid = ra.roleid) WHERE ue.status = :useractive AND ra.id IS NULL"; $params = array(); @@ -307,6 +309,7 @@ function enrol_cohort_sync(progress_trace $trace, $courseid = NULL) { FROM {user_enrolments} ue JOIN {enrol} e ON (e.id = ue.enrolid AND e.enrol = 'cohort' $onecourse) JOIN {groups} g ON (g.courseid = e.courseid AND g.id = e.customint2) + JOIN {user} u ON (u.id = ue.userid AND u.deleted = 0) LEFT JOIN {groups_members} gm ON (gm.groupid = g.id AND gm.userid = ue.userid) WHERE gm.id IS NULL"; $params = array(); diff --git a/enrol/imsenterprise/lib.php b/enrol/imsenterprise/lib.php index 258f2cefee3..f9ac4cad75d 100644 --- a/enrol/imsenterprise/lib.php +++ b/enrol/imsenterprise/lib.php @@ -511,13 +511,19 @@ function process_person_tag($tagcontents){ // Now if the recstatus is 3, we should delete the user if-and-only-if the setting for delete users is turned on - // In the "users" table we can do this by setting deleted=1 if($recstatus==3){ if($imsdeleteusers){ // If we're allowed to delete user records - // Make sure their "deleted" field is set to one - $DB->set_field('user', 'deleted', 1, array('username'=>$person->username)); - $this->log_line("Marked user record for user '$person->username' (ID number $person->idnumber) as deleted."); + // Do not dare to hack the user.deleted field directly in database!!! + if ($user = $DB->get_record('user', array('username'=>$person->username, 'mnethostid'=>$CFG->mnet_localhost_id, 'deleted'=>0))) { + if (delete_user($user)) { + $this->log_line("Deleted user '$person->username' (ID number $person->idnumber)."); + } else { + $this->log_line("Error deleting '$person->username' (ID number $person->idnumber)."); + } + } else { + $this->log_line("Can not delete user '$person->username' (ID number $person->idnumber) - user does not exist."); + } }else{ $this->log_line("Ignoring deletion request for user '$person->username' (ID number $person->idnumber)."); } @@ -536,8 +542,10 @@ function process_person_tag($tagcontents){ } else { // If they don't exist and they have a defined username, and $createnewusers == true, we create them. - $person->lang = 'manual'; //TODO: this needs more work due tu multiauth changes - $person->auth = $CFG->auth; + $person->lang = $CFG->lang; + $auth = explode(',', $CFG->auth); //TODO: this needs more work due tu multiauth changes, use first auth for now + $auth = reset($auth); + $person->auth = $auth; $person->confirmed = 1; $person->timemodified = time(); $person->mnethostid = $CFG->mnet_localhost_id; @@ -565,8 +573,8 @@ function process_person_tag($tagcontents){ } elseif ($createnewusers) { $this->log_line("User record already exists for user '$person->username' (ID number $person->idnumber)."); - // Make sure their "deleted" field is set to zero. - $DB->set_field('user', 'deleted', 0, array('idnumber'=>$person->idnumber)); + // It is totally wrong to mess with deleted users flag directly in database!!! + // There is no official way to undelete user, sorry.. }else{ $this->log_line("No user record found for '$person->username' (ID number $person->idnumber)."); } diff --git a/enrol/meta/locallib.php b/enrol/meta/locallib.php index 5bfa2002d21..a23f9b5dc5b 100644 --- a/enrol/meta/locallib.php +++ b/enrol/meta/locallib.php @@ -435,6 +435,7 @@ function enrol_meta_sync($courseid = NULL, $verbose = false) { FROM {user_enrolments} pue JOIN {enrol} pe ON (pe.id = pue.enrolid AND pe.enrol <> 'meta' AND pe.enrol $enabled) JOIN {enrol} e ON (e.customint1 = pe.courseid AND e.enrol = 'meta' $onecourse) + JOIN {user} u ON (u.id = pue.userid AND u.deleted = 0) LEFT JOIN {user_enrolments} ue ON (ue.enrolid = e.id AND ue.userid = pue.userid) WHERE ue.id IS NULL";