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

Merge branch 'w12_MDL-26803_20_userupload' of git://github.com/skodak/moodle

Browse source
This commit is contained in:
Sam Hemelryk 2011-03-21 12:28:45 +08:00
commit 37fff87398
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/uploaduser_form.php
View file

@ -231,7 +231,7 @@ class admin_uploaduser_form2 extends moodleform {
$mform->setDefault('maildigest', 0); $mform->setDefault('maildigest', 0);
$mform->setAdvanced('maildigest'); $mform->setAdvanced('maildigest');
$choices = array(0 => get_string('autosubscribeyes'), 1 => get_string('autosubscribeno')); $choices = array(1 => get_string('autosubscribeyes'), 0 => get_string('autosubscribeno'));
$mform->addElement('select', 'autosubscribe', get_string('autosubscribe'), $choices); $mform->addElement('select', 'autosubscribe', get_string('autosubscribe'), $choices);
$mform->setDefault('autosubscribe', 1); $mform->setDefault('autosubscribe', 1);

9
lib/cronlib.php
View file

@ -287,22 +287,23 @@ function cron_run() {
mtrace('checking for create_password'); mtrace('checking for create_password');
if ($DB->count_records('user_preferences', array('name'=>'create_password', 'value'=>'1'))) { if ($DB->count_records('user_preferences', array('name'=>'create_password', 'value'=>'1'))) {
mtrace('creating passwords for new users'); mtrace('creating passwords for new users');
$newusers = $DB->get_records_sql("SELECT u.id as id, u.email, u.firstname, $newusers = $DB->get_recordset_sql("SELECT u.id as id, u.email, u.firstname,
u.lastname, u.username, u.lastname, u.username,
p.id as prefid p.id as prefid
FROM {user} u FROM {user} u
JOIN {user_preferences} p ON u.id=p.userid JOIN {user_preferences} p ON u.id=p.userid
WHERE p.name='create_password' AND p.value='1' AND u.email !='' "); WHERE p.name='create_password' AND p.value='1' AND u.email !='' ");
foreach ($newusers as $newuserid => $newuser) { foreach ($newusers as $newuser) {
// email user // email user
if (setnew_password_and_mail($newuser)) { if (setnew_password_and_mail($newuser)) {
// remove user pref unset_user_preference('create_password', $newuser);
$DB->delete_records('user_preferences', array('id'=>$newuser->prefid)); set_user_preference('auth_forcepasswordchange', 1, $newuser);
} else { } else {
trigger_error("Could not create and mail new user password!"); trigger_error("Could not create and mail new user password!");
} }
} }
$newusers->close();
} }
if (!empty($CFG->usetags)) { if (!empty($CFG->usetags)) {