From: poltawski <poltawski>
Date: Sun, 22 Jul 2007 21:56:04 +0000 (+0000)
Subject: MDL-7835 -  add emailstop to user upload
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=47f6428969ba10ce74ae82aef24c7cc91a511fca;p=moodle.git

MDL-7835 -  add emailstop to user upload
---

diff --git a/admin/uploaduser.php b/admin/uploaduser.php
index 5b67a79348..ce86f5da9d 100755
--- a/admin/uploaduser.php
+++ b/admin/uploaduser.php
@@ -120,7 +120,8 @@ if ( $formdata = $mform->get_data() ) {
             "role4" => 1,
             "role5" => 1,
             "password" => $createpassword,
-            "oldusername" => $allowrenames);
+            "oldusername" => $allowrenames,
+            "emailstop" => 1);
 
             // --- get header (field names) ---
             $header = split($csv_delimiter, fgets($fp,1024));
diff --git a/lang/en_utf8/help/uploadusers.html b/lang/en_utf8/help/uploadusers.html
index 9b7b222df9..7c58cdf372 100644
--- a/lang/en_utf8/help/uploadusers.html
+++ b/lang/en_utf8/help/uploadusers.html
@@ -14,7 +14,7 @@
       <p><strong>Default fieldnames:</strong> these are optional - if they are not included then the values are taken from the primary admin</p>
       <p><code class="example1">institution, department, city, country, lang, auth, timezone</code> </p>
       <p><strong>Optional fieldnames: </strong>all of these are completely optional. The  course names are the &quot;shortnames&quot; of the courses - if present then the user  will be enrolled as students in those courses. Group names must be associated to the corresponding courses, i.e. group1 to course1, etc.</p>
-      <p> <code class="example1">idnumber, icq, phone1, phone2, address, url, description, mailformat, maildisplay, htmleditor, autosubscribe, course1, course2, course3, course4, course5, group1, group2, group3, group4, group5, type1, type2, type3, type4, type5, role1, role2, role3, role4, role5</code></p>
+      <p> <code class="example1">idnumber, icq, phone1, phone2, address, url, description, mailformat, maildisplay, htmleditor, autosubscribe, course1, course2, course3, course4, course5, group1, group2, group3, group4, group5, type1, type2, type3, type4, type5, role1, role2, role3, role4, role5, emailstop</code></p>
     </blockquote>
     </li>
   <li>Commas within the data should be encoded as &amp;#44 - the script will automatically decode these back to commas. </li>