diff --git a/htdocs/admin/users/bulkimport.php b/htdocs/admin/users/bulkimport.php index 38afe55089fd5cd0b38e42e36d4f60c48968f2aa..f42e2eba2878a22e029251c616781af93d7d88e2 100644 --- a/htdocs/admin/users/bulkimport.php +++ b/htdocs/admin/users/bulkimport.php @@ -49,7 +49,7 @@ $form = array( 'type' => 'text', 'title' => get_string('importfile', 'admin'), 'size' => 40, - 'description' => get_string('bulkleap2aimportfiledescription', 'admin'), + 'description' => get_string('bulkleap2aimportfiledescription1', 'admin'), 'rules' => array( 'required' => true ) @@ -136,7 +136,7 @@ function bulkimport_validate(Pieform $form, $values) { foreach ($csvdata->data as $user) { $username = $user[0]; $filename = $user[1]; - $LEAP2AFILES[$username] = "$importdir/users/$filename"; + $LEAP2AFILES[$username] = $importdir . 'users/' . $filename; } } diff --git a/htdocs/lang/en.utf8/admin.php b/htdocs/lang/en.utf8/admin.php index 59a33e49068db5e158d0ff1b3b74b7192863d14e..1f872f8cc38b5ed026538f6348ef030644b9ca62 100755 --- a/htdocs/lang/en.utf8/admin.php +++ b/htdocs/lang/en.utf8/admin.php @@ -764,20 +764,28 @@ $string['showupdatedetails'] = 'Show update details'; // Bulk Leap2A import $string['bulkleap2aimport'] = 'Import users from Leap2A files'; -$string['bulkleap2aimportdescription'] = '
You can import users in bulk from a collection of Leap2A files on your server. You must specify a ZIP file on the server file system, which contains all the Leap2A ZIP files and a single CSV file called usernames.csv mapping usernames to filenames.
+$string['bulkleap2aimportdescription1'] = 'You can import users in bulk from a collection of Leap2A files on your server. You must specify a ZIP file on the server file system, which contains all the Leap2A ZIP files and a single CSV file called usernames.csv mapping usernames to filenames.
usernames.csv will look something like this:
bob,mahara-export-leap-user8-1265165366.zip
nigel,mahara-export-leap-user1-1266458159.zip
where mahara-export-leap-user8-1265165366.zip and mahara-export-leap-user1-1266458159.zip are files in a subdirectory called users.
+The structure of your ZIP file, eg import.zip file will be:
++import.zip
+ usernames.csv
+ users
+ mahara-export-leap-user8-1265165366.zip
+ mahara-export-leap-user1-1266458159.zip
+
This ZIP file should normally be generated using the bulk export built into Mahara.
If you are importing a lot of users, please be patient. The import process can take a long time.
'; $string['importfile'] = 'Bulk export file'; $string['importfilemissinglisting'] = 'The bulk export file is missing a file named usernames.csv. Did you use the Mahara bulk exporter to export these users?'; $string['importfilenotafile'] = 'Error during form submission: file was not recognised.'; $string['importfilenotreadable'] = 'Error during form submission: file was not readable.'; -$string['bulkleap2aimportfiledescription'] = 'The ZIP file on your server containing all exported users (in Leap2A format) along with a CSV listing of usernames'; +$string['bulkleap2aimportfiledescription1'] = 'Enter the path to the ZIP file on your server containing all exported users (in Leap2A format) along with a CSV listing of usernames