Major improvement of Batch Import of users. Adds 4 new functions to separate the process from global user registration. 2 of these are split out from BitUser::verifyEmail() to handle validation of email syntax and MX host so they can be reused, which is done by the batch import.

Admin can now set if email should be sent to imported users, validate users by email as well as validate email address (MX host check). Import a ready made password hash e.g. from phpBB2 and passwords are auto generated if not specified in the CSV file.

Admin can also truely overwrite user records on import, which proper check of existing user_id, login and email (in that order) with mixing the result. I will write up some docs for this to publish on site as well.

3 files changed, 48 insertions, 3 deletions

diff --git a/templates/admin_validation_mail.tpl b/templates/admin_validation_mail.tpl
new file mode 100644
index 0000000..38f297c
--- /dev/null
+++ b/templates/admin_validation_mail.tpl
@@ -0,0 +1,11 @@
+{tr}Hi {$mail_user},
+
+The Administrator at {$mail_site} registered this email address for an account at his website, but wants you to confirm the registration.
+
+If you want to be a registered user in this site you will have to use the following link to login for the first time:
+
+{$mail_machine}?v={$mailUserId}:{$mailProvPass}
+
+Note: This login can only be used once, so you need to create your own unique password after login.
+
+Enjoy the site!{/tr}
diff --git a/templates/admin_welcome_mail.tpl b/templates/admin_welcome_mail.tpl
new file mode 100644
index 0000000..1c8bc0e
--- /dev/null
+++ b/templates/admin_welcome_mail.tpl
@@ -0,0 +1,10 @@
+{tr}Hi {$mail_user},
+
+Welcome to {$siteName}!
+
+To login, visit http://{$mail_site}{$smarty.const.USERS_PKG_URL}login.php
+
+Your login email is: {$mailEmail}
+Your password is: {$mailPassword}
+
+Enjoy the site!{/tr}
diff --git a/templates/users_admin.tpl b/templates/users_admin.tpl
index 7a8953f..2ca2c73 100644
--- a/templates/users_admin.tpl
+++ b/templates/users_admin.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_users/templates/users_admin.tpl,v 1.7 2006/11/16 15:11:08 squareing Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_users/templates/users_admin.tpl,v 1.8 2007/11/13 19:01:45 joasch Exp $ *}
 {strip}
 <div class="floaticon">{bithelp}</div>
 
@@ -106,7 +106,7 @@
 						{formlabel label="Batch upload (CSV file)" for="csvlist"}
 						{forminput}
 							<input type="file" name="csvlist" id="csvlist" />
-							{formhelp note="You can batch import users by uploading a CSV (comma-separated values) file. The CSV file needs to have the column names in the first record. The column titles must match with fields in 'users_users' table. Login, password and email are required fields. If an unexistant field is specified, it's ignored."}
+							{formhelp note="You can batch import users by uploading a CSV (comma-separated values) file. The file needs to have the column names in the first line. The column titles need to match with fields in 'users_users' table. Login, password and email are required fields, however if you leave the password field empty a new password will be auto generated. You can also import a MD5 hash as password, like from phpBB2, it need to be put in the 'hash' column. In such case it override other options and it's assumed the user or at least admin knows the password. Currently you can't import custom fields and if a non-existent field is specified, it's ignored."}
 						{/forminput}
 					</div>
 
@@ -121,11 +121,35 @@
 					<div class="row">
 						{formlabel label="Overwrite existing users" for="overwrite"}
 						{forminput}
-							<input type="checkbox" name="overwrite" id="overwrite" checked="checked" />
+							<input type="checkbox" name="overwrite" id="overwrite" />
 							{formhelp note=""}
 						{/forminput}
 					</div>
 
+					<div class="row">
+						{formlabel label="Validate users by email" for="admin_verify_user"}
+						{forminput}
+							<input type="checkbox" name="admin_verify_user" id="admin_verify_user" />
+							{formhelp note="This will email the user a validation url with a temporary one time password. On validation the user is forced to choose a new password."}
+						{/forminput}
+					</div>
+
+					<div class="row">
+						{formlabel label="Validate email address" for="admin_verify_email"}
+						{forminput}
+							<input type="checkbox" name="admin_verify_email" id="admin_verify_email" />
+							{formhelp note="This feature should be used only when you need the maximum security and should be used with discretion. If a visitor's email server is not responding, they will not be able to register. You also must have a valid sender email to use this feature."}
+						{/forminput}
+					</div>
+
+					<div class="row">
+						{formlabel label="Don't email imported users" for="admin_noemail_user"}
+						{forminput}
+							<input type="checkbox" name="admin_noemail_user" id="admin_noemail_user" />
+							{formhelp note="If you for some reason don't want to email imported users the login and password, or validation url."}
+						{/forminput}
+					</div>
+
 					<div class="row submit">
 						<input type="submit" name="batchimport" value="{tr}Import{/tr}" />
 					</div>