From 43b13e92b8d3385116685a83907ddfc4a4d2abce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= Date: Fri, 24 May 2013 21:01:08 +0200 Subject: [PATCH 1/2] MDL-39802 add cli script for fixing of all deleted users Use this script if something just set the user.deleted flag instead of calling the delete_user() method. --- admin/cli/fix_deleted_users.php | 91 +++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 admin/cli/fix_deleted_users.php 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); From 7934b786a9974705ce22687c5940033ec0a1e34e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= Date: Fri, 24 May 2013 21:14:53 +0200 Subject: [PATCH 2/2] MDL-39802 fix sloppy user deleting and creating in imsenterprise plugin --- enrol/imsenterprise/lib.php | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/enrol/imsenterprise/lib.php b/enrol/imsenterprise/lib.php index 9d11e00be2b..5ce5d9bb196 100644 --- a/enrol/imsenterprise/lib.php +++ b/enrol/imsenterprise/lib.php @@ -509,13 +509,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)."); } @@ -534,8 +540,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; @@ -563,8 +571,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)."); }