MDL-13226 - allow user digest settings to be set with bulk user actions

merged from MOODLE_19_STABLE

diff --git a/admin/uploaduser.php b/admin/uploaduser.php
index 595493c77109aba4dcae51935b3866402be3fd8f..d47fc282bbc127eb0c73834b37b5a64e19e4cb40 100755 (executable)
--- a/admin/uploaduser.php
+++ b/admin/uploaduser.php
@@ -66,7 +66,7 @@ $returnurl = $CFG->wwwroot.'/'.$CFG->admin.'/uploaduser.php';
 $bulknurl  = $CFG->wwwroot.'/'.$CFG->admin.'/user/user_bulk.php';
 
 // array of all valid fields for validation
-$STD_FIELDS = array('firstname', 'lastname', 'username', 'email', 'city', 'country', 'lang', 'auth', 'timezone', 'mailformat', 'maildisplay', 'htmleditor',
+$STD_FIELDS = array('firstname', 'lastname', 'username', 'email', 'city', 'country', 'lang', 'auth', 'timezone', 'mailformat', 'maildisplay', 'maildigest', 'htmleditor',
                     'ajax', 'autosubscribe', 'mnethostid', 'institution', 'department', 'idnumber', 'icq', 'phone1', 'phone2', 'address', 'url', 'description',
                     'oldusername', 'emailstop', 'deleted',  'password');
 

diff --git a/admin/uploaduser_form.php b/admin/uploaduser_form.php
index c18c59857e6d29e63f9a434e6065e3b2c94c8a3e..b3c05db373b839f4db4474d6f00c6f7efafe9612 100644 (file)
--- a/admin/uploaduser_form.php
+++ b/admin/uploaduser_form.php
@@ -165,6 +165,11 @@ class admin_uploaduser_form2 extends moodleform {
         $mform->setDefault('mailformat', 1);
         $mform->setAdvanced('mailformat');
 
+        $choices = array(0 => get_string('emaildigestoff'), 1 => get_string('emaildigestcomplete'), 2 => get_string('emaildigestsubjects'));
+        $mform->addElement('select', 'maildigest', get_string('emaildigest'), $choices);
+        $mform->setDefault('maildigest', 0);
+        $mform->setAdvanced('maildigest');
+
         $choices = array(0 => get_string('autosubscribeyes'), 1 => get_string('autosubscribeno'));
         $mform->addElement('select', 'autosubscribe', get_string('autosubscribe'), $choices);
         $mform->setDefault('autosubscribe', 1);