Index: openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl,v diff -u -r1.24 -r1.25 --- openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl 1 Nov 2013 21:08:34 -0000 1.24 +++ openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl 27 Oct 2014 16:41:17 -0000 1.25 @@ -22,6 +22,8 @@ @version $Id$ } +set context [list [list users [_ dotlrn.Users]] [_ dotlrn.Bulk_Upload]] + # Pages in this directory are only runnable by dotlrn-wide admins. dotlrn::require_admin @@ -38,7 +40,7 @@ where party_id = :admin_user_id }] -doc_body_append "[_ dotlrn.Bulk_Uploading]
" +append body "[_ dotlrn.Bulk_Uploading]
"
set list_of_user_ids [list]
set list_of_addresses_and_passwords [list]
@@ -53,7 +55,7 @@
# First make sure the required data is there
if { ![info exists row(email)] || ![info exists row(first_names)] || ![info exists row(last_name)] } {
- doc_body_append [_ dotlrn.datafile_must]
+ append body [_ dotlrn.datafile_must]
db_abort_transaction
return
}
@@ -72,7 +74,7 @@
# Check if this user already exists
set user_id [cc_lookup_email_user $row(email)]
if { $user_id ne "" } {
- doc_body_append [_ dotlrn.user_email_already_exists [list user_email $row(email)]]
+ append body [_ dotlrn.user_email_already_exists [list user_email $row(email)]]
lappend list_of_user_ids $user_id
} else {
@@ -126,7 +128,7 @@
# Set the privacy
dotlrn_privacy::set_user_guest_p -user_id $user_id -value $row(guest)
- doc_body_append [_ dotlrn.user_email_created [list user_email $row(email)]]
+ append body [_ dotlrn.user_email_created [list user_email $row(email)]]
set msg_subst_list [list system_name [ad_system_name] \
system_url [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemURL] \
user_email $row(email) \
@@ -138,33 +140,33 @@
if { $row(notify) == "t" } {
# Send note to new user
if {[catch {acs_mail_lite::send -send_immediately -to_addr $row(email) -from_addr $admin_email -subject $subject -body $message} errmsg]} {
- doc_body_append "[_ dotlrn.lt_emailing_this_user_fa]"
+ append body [_ dotlrn.lt_emailing_this_user_fa]
set fail_p 1
} else {
lappend list_of_addresses_and_passwords $row(email) $password
}
} else {
- doc_body_append "[_ dotlrn.No_notification_requested]"
+ append body [_ dotlrn.No_notification_requested]
}
}
- doc_body_append "
"
+ append body "
\n"
unset row
}
} on_error {
ns_log Error "The database choked while trying to create the last user in the list above! The transaction has been aborted, no users have been entered, and no e-mail notifications have been sent.\n
$errmsg"
- doc_body_append [_ dotlrn.database_choked]
+ append body [_ dotlrn.database_choked]
ad_script_abort
}
if {$fail_p} {
- doc_body_append "
[_ dotlrn.lt_Some_of_the_emails_fa]
" + append body "
[_ dotlrn.lt_Some_of_the_emails_fa]
" } -doc_body_append "
" -doc_body_append "[_ dotlrn.or_return_to] [_ dotlrn.User_Management]." +append body "[_ dotlrn.or_return_to] [_ dotlrn.User_Management]."