Permalink
Browse files

Merge branch 'w22_MDL-39802_m24_deletedusers' of git://github.com/sko…

…dak/moodle into MOODLE_24_STABLE
  • Loading branch information...
2 parents c8b05c3 + 7934b78 commit 4fffc06f654b193d675edf79f02a33b9bbb863da @damyon damyon committed May 28, 2013
Showing with 107 additions and 8 deletions.
  1. +91 −0 admin/cli/fix_deleted_users.php
  2. +16 −8 enrol/imsenterprise/lib.php
@@ -0,0 +1,91 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * 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);
@@ -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).");
}

0 comments on commit 4fffc06

Please sign in to comment.