Allow authentication method to be specified in bulk upload

admin/uploaduser.php

@@ -81,7 +81,8 @@
                                   "department" => 1, 
                                   "city" => 1, 
                                   "country" => 1,
-                                  "lang" => 1, 
+                                  "lang" => 1,
+                                  "auth" => 1,
                                   "timezone" => 1);
         $optional = array("idnumber" => 1, 
                           "icq" => 1, 
@@ -163,7 +164,6 @@
                         $user->{$name} = addslashes($value);
                     }
                 }
-                $user->auth = 'manual';
                 $user->confirmed = 1;
                 $user->timemodified = time();
                 $linenum++;

lang/en/help/uploadusers.html

@@ -13,7 +13,7 @@
       <font color="#990000" face="Courier New, Courier, mono">username, password, firstname, lastname, email</font></p>
 </p>
       <p><strong>Default fieldnames:</strong> these are optional - if they are not included then the values are taken from the primary admin</p>
-      <p><font color="#990000" face="Courier New, Courier, mono">institution, department, city, country, lang, timezone</font> </p>
+      <p><font color="#990000" face="Courier New, Courier, mono">institution, department, city, country, lang, auth, timezone</font> </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> <font color="#990000" face="Courier New, Courier, mono">idnumber, icq, phone1, phone2, address, url, description, mailformat, maildisplay, htmleditor, autosubscribe, course1, course2, course3, course4, course5, group1, group2, group3, group4, group5</font></p>
     </blockquote>