optionalDefaults are now set using settings from Admin account

diff --git a/admin/uploaduser.php b/admin/uploaduser.php
index bd9aa32a1250573c7eb378608f813d4415b50b09..dad874044bea276723767036c6e4b0f20e0ca829 100755 (executable)
--- a/admin/uploaduser.php
+++ b/admin/uploaduser.php
@@ -36,6 +36,8 @@
     $usernotaddederror = get_string("usernotaddederror");
     $enroledincourse = get_string("enroledincourse");
     $notenroledincourse = get_string("notenroledincourse");
+    
+    $adminuser = get_record("user","id",1);
 
 /// Print the header
 
@@ -109,6 +111,10 @@
         }
         $linenum = 2; // since header is line 1
 
+        foreach ($optionalDefaults as $key => $value) {
+          $user->$key = $adminuser->$key;
+        }
+ 
         while (!feof ($fp)) {
             //Note: commas within a field should be encoded as &#44
             $line = split("\,", fgets($fp,1024));