Index: openacs-4/packages/acs-authentication/acs-authentication.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/acs-authentication.info,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-authentication/acs-authentication.info	1 Oct 2003 08:52:03 -0000	1.4
+++ openacs-4/packages/acs-authentication/acs-authentication.info	23 Oct 2003 10:27:36 -0000	1.5
@@ -14,8 +14,8 @@
         <description format="text/html">Implements authentication-related security functions for OpenACS, including authentication, password maangement, account management, session management, etc.</description>
 
         <provides url="acs-authentication" version="5.0d3"/>
-        <requires url="acs-service-contract" version="4.7d2"/>
         <requires url="acs-kernel" version="5.0d10"/>
+        <requires url="acs-service-contract" version="4.7d2"/>
 
         <callbacks>
             <callback type="after-install"  proc="auth::package_install"/>
@@ -24,6 +24,7 @@
         <parameters>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="KeepBatchLogDays"  default="0" description="The number of days to keep the log for a batch user synchronization job around. Say 0 if you want to keep the log forever."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RegisterAuthority"  default="local" description="The short name of the authority in which users are registered. Is best set in the Authentication admin UI."/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="SyncEmailConfirmationP"  default="0" description="Send out email confirmation when batch sync is complete. 1 = Yes, 0 = No."/>
         </parameters>
 
     </version>
Index: openacs-4/packages/acs-authentication/tcl/sync-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/sync-procs.tcl,v
diff -u -N -r1.22 -r1.23
--- openacs-4/packages/acs-authentication/tcl/sync-procs.tcl	22 Oct 2003 12:39:55 -0000	1.22
+++ openacs-4/packages/acs-authentication/tcl/sync-procs.tcl	23 Oct 2003 10:27:36 -0000	1.23
@@ -169,8 +169,13 @@
     
     # interactive_p, run_time_seconds, num_actions, num_problems
     get -job_id $job_id -array job
-        
-    if { ![template::util::is_true $job(interactive_p)] } {
+
+    set email_p [parameter::get_from_package_key \
+                     -parameter SyncEmailConfirmationP \
+                     -package_key "acs-authentication" \
+                     -default 0] 
+
+    if { ![template::util::is_true $job(interactive_p)] && $email_p } {
         # Only send out email if not an interactive job
 
         with_catch errmsg {
@@ -440,7 +445,10 @@
     Purge jobs that are older than KeepBatchLogDays days.
 } {
     if { ![exists_and_not_null num_days] } {
-        set num_days [parameter::get_from_package_key -parameter KeepBatchLogDays -package_key "acs-authentication" -default 0]
+        set num_days [parameter::get_from_package_key \
+                          -parameter KeepBatchLogDays \
+                          -package_key "acs-authentication" \
+                          -default 0]
     }
     
     validate_integer num_days $num_days
Index: openacs-4/packages/acs-authentication/tcl/test/sync-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/test/sync-test-procs.tcl,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/acs-authentication/tcl/test/sync-test-procs.tcl	17 Sep 2003 11:26:53 -0000	1.12
+++ openacs-4/packages/acs-authentication/tcl/test/sync-test-procs.tcl	23 Oct 2003 10:27:36 -0000	1.13
@@ -678,7 +678,6 @@
             }
 
             aa_log "job.message = '$job(message)'"
-            aa_log "job.document = '$job(document)'"
 
         }
 }
@@ -704,10 +703,10 @@
     <sourcedid>
       <id>$ims_doc(username)</id>
     </sourcedid>
-    <name>
+    <n>
       <given>$ims_doc(first_names)</given>
       <family>$ims_doc(last_name)</family>
-    </name>
+    </n>
     <email>$ims_doc(email)</email>
     <url>$ims_doc(url)</url>
   </person>
@@ -776,7 +775,6 @@
             aa_equals "Number of actions" $job(num_actions) 1
             aa_equals "Number of problems" $job(num_problems) 0
             aa_log "job.message = '$job(message)'"
-            aa_log "job.document = '$job(document)'"
 
             set entry_id [auth::sync::job::get_entries -job_id $job_id]
             aa_equals "One entry" [llength $entry_id] 1
@@ -820,7 +818,6 @@
             aa_equals "Number of actions" $job(num_actions) 1
             aa_equals "Number of problems" $job(num_problems) 0
             aa_log "job.message = '$job(message)'"
-            aa_log "job.document = '$job(document)'"
 
             set entry_id [auth::sync::job::get_entries -job_id $job_id]
             aa_equals "One entry" [llength $entry_id] 1
@@ -860,7 +857,6 @@
             aa_equals "Number of actions" $job(num_actions) 1
             aa_equals "Number of problems" $job(num_problems) 0
             aa_log "job.message = '$job(message)'"
-            aa_log "job.document = '$job(document)'"
 
             set entry_id [auth::sync::job::get_entries -job_id $job_id]
             aa_equals "One entry" [llength $entry_id] 1
@@ -900,7 +896,6 @@
             aa_equals "Number of actions" $job(num_actions) 1
             aa_equals "Number of problems" $job(num_problems) 0
             aa_log "job.message = '$job(message)'"
-            aa_log "job.document = '$job(document)'"
 
             set entry_id [auth::sync::job::get_entries -job_id $job_id]
             aa_equals "One entry" [llength $entry_id] 1