Index: openacs-4/packages/dotlrn-assessment/tcl/dotlrn-assessment-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-assessment/tcl/dotlrn-assessment-procs.tcl,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/packages/dotlrn-assessment/tcl/dotlrn-assessment-procs.tcl	27 Mar 2018 14:22:30 -0000	1.8
+++ openacs-4/packages/dotlrn-assessment/tcl/dotlrn-assessment-procs.tcl	24 Aug 2020 15:29:47 -0000	1.8.2.1
@@ -1,7 +1,7 @@
 ad_library {
-    
+
     Procs to set up the dotLRN assessment applet
-    
+
     @author jopez@galileo.edu
     @cvs-id $Id$
 }
@@ -39,11 +39,11 @@
 }
 
 ad_proc -public dotlrn_assessment::remove_applet {} {
-    One time destroy. 
+    One time destroy.
 } {
     set applet_id [dotlrn_applet::get_applet_id_from_key [my_package_key]]
-    db_exec_plsql delete_applet_from_communities { *SQL* } 
-    db_exec_plsql delete_applet { *SQL* } 
+    db_exec_plsql delete_applet_from_communities { *SQL* }
+    db_exec_plsql delete_applet { *SQL* }
 }
 
 ad_proc -public dotlrn_assessment::add_applet_to_community {
@@ -53,7 +53,7 @@
 } {
     set portal_id [dotlrn_community::get_portal_id -community_id $community_id]
 
-    # create the assessment package instance 
+    # create the assessment package instance
     set package_id [dotlrn::instantiate_and_mount $community_id [package_key]]
 
     # set up the admin portal
@@ -64,7 +64,7 @@
     assessment_admin_portlet::add_self_to_page \
         -portal_id $admin_portal_id \
         -package_id $package_id
-    
+
     set args [ns_set create]
     ns_set put $args package_id $package_id
     add_portlet_helper $portal_id $args
@@ -80,15 +80,15 @@
     ad_return_complaint 1 "[applet_key] remove_applet_from_community not implemented!"
 }
 
-ad_proc -public dotlrn_assessment::add_user {
+ad_proc -private dotlrn_assessment::add_user {
     user_id
 } {
     one time user-specifuc init
 } {
     # noop
 }
 
-ad_proc -public dotlrn_assessment::remove_user {
+ad_proc -private dotlrn_assessment::remove_user {
     user_id
 } {
 } {
@@ -103,7 +103,7 @@
 } {
     set package_id [dotlrn_community::get_applet_package_id -community_id $community_id -applet_key [applet_key]]
     set portal_id [dotlrn::get_portal_id -user_id $user_id]
-    
+
     # use "append" here since we want to aggregate
     set args [ns_set create]
     ns_set put $args package_id $package_id
@@ -129,8 +129,8 @@
 ad_proc -public dotlrn_assessment::add_portlet {
     portal_id
 } {
-    A helper proc to add the underlying portlet to the given portal. 
-    
+    A helper proc to add the underlying portlet to the given portal.
+
     @param portal_id
 } {
     # simple, no type specific stuff, just set some dummy values
@@ -160,11 +160,11 @@
     portal_id
     args
 } {
-    A helper proc to remove the underlying portlet from the given portal. 
-    
+    A helper proc to remove the underlying portlet from the given portal.
+
     @param portal_id
     @param args A list of key-value pairs (possibly user_id, community_id, and more)
-} { 
+} {
     assessment_portlet::remove_self_from_page \
         -portal_id $portal_id \
         -package_id [ns_set get $args package_id]
@@ -184,24 +184,24 @@
                        ]
 
     set folder_id [as::assessment::folder_id -package_id $new_package_id]
-    
+
     set assessments [db_list_of_lists get_assessments {}]
-    
+
     foreach assessment $assessments {
-	dotlrn_assessment::assessment_copy -assessment_id [lindex $assessment 0] -name [lindex $assessment 1] -folder_id $folder_id
+        dotlrn_assessment::assessment_copy -assessment_id [lindex $assessment 0] -name [lindex $assessment 1] -folder_id $folder_id
     }
     return $new_package_id
 }
 
-ad_proc -public dotlrn_assessment::change_event_handler {
+ad_proc -private dotlrn_assessment::change_event_handler {
     community_id
     event
     old_value
     new_value
-} { 
-    listens for the following events: 
-} { 
-}   
+} {
+    listens for the following events:
+} {
+}
 
 ad_proc -public dotlrn_assessment::assessment_copy {
     {-assessment_id:required}
@@ -216,45 +216,45 @@
     as::assessment::data -assessment_id $assessment_id
     array set a [array get assessment_data]
     append a(title) "[_ assessment.copy_appendix]"
-    
-    
+
+
     set new_assessment_id [db_nextval acs_object_id_seq]
     if {$name eq ""} {
-	set name "ASS_$new_assessment_id"
+        set name "ASS_$new_assessment_id"
     }
     set new_assessment_id [content::item::new -item_id $new_assessment_id -parent_id $folder_id -content_type {as_assessments} -name $name]
-    
+
     set new_rev_id [content::revision::new \
-			-item_id $new_assessment_id \
-			-content_type {as_assessments} \
-			-title $a(title) \
-			-description $a(description) \
-			-attributes [list [list creator_id $a(creator_id)] \
-					 [list instructions $a(instructions)] \
-					 [list run_mode $a(run_mode)] \
-					 [list anonymous_p $a(anonymous_p)] \
-					 [list secure_access_p $a(secure_access_p)] \
-					 [list reuse_responses_p $a(reuse_responses_p)] \
-					 [list show_item_name_p $a(show_item_name_p)] \
-					 [list random_p $a(random_p)] \
-					 [list entry_page $a(entry_page)] \
-					 [list exit_page $a(exit_page)] \
-					 [list consent_page $a(consent_page)] \
-					 [list return_url $a(return_url)] \
-					 [list start_time $a(start_time)] \
-					 [list end_time $a(end_time)] \
-					 [list number_tries $a(number_tries)] \
-					 [list wait_between_tries $a(wait_between_tries)] \
-					 [list time_for_response $a(time_for_response)] \
-					 [list ip_mask $a(ip_mask)] \
-					 [list password $a(password)] \
-					 [list show_feedback $a(show_feedback)] \
-					 [list section_navigation $a(section_navigation)] ] ]
-    
+            -item_id $new_assessment_id \
+            -content_type {as_assessments} \
+            -title $a(title) \
+            -description $a(description) \
+            -attributes [list [list creator_id $a(creator_id)] \
+                     [list instructions $a(instructions)] \
+                     [list run_mode $a(run_mode)] \
+                     [list anonymous_p $a(anonymous_p)] \
+                     [list secure_access_p $a(secure_access_p)] \
+                     [list reuse_responses_p $a(reuse_responses_p)] \
+                     [list show_item_name_p $a(show_item_name_p)] \
+                     [list random_p $a(random_p)] \
+                     [list entry_page $a(entry_page)] \
+                     [list exit_page $a(exit_page)] \
+                     [list consent_page $a(consent_page)] \
+                     [list return_url $a(return_url)] \
+                     [list start_time $a(start_time)] \
+                     [list end_time $a(end_time)] \
+                     [list number_tries $a(number_tries)] \
+                     [list wait_between_tries $a(wait_between_tries)] \
+                     [list time_for_response $a(time_for_response)] \
+                     [list ip_mask $a(ip_mask)] \
+                     [list password $a(password)] \
+                     [list show_feedback $a(show_feedback)] \
+                     [list section_navigation $a(section_navigation)] ] ]
+
     as::assessment::copy_sections -assessment_id $a(assessment_rev_id) -new_assessment_id $new_rev_id
     as::assessment::copy_categories -from_id $a(assessment_rev_id) -to_id $new_rev_id
-    
-    
+
+
     return $new_assessment_id
 }
 
Index: openacs-4/packages/dotlrn-faq/tcl/dotlrn-faq-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-faq/tcl/dotlrn-faq-procs.tcl,v
diff -u -r1.46.2.1 -r1.46.2.2
--- openacs-4/packages/dotlrn-faq/tcl/dotlrn-faq-procs.tcl	24 Aug 2020 15:25:54 -0000	1.46.2.1
+++ openacs-4/packages/dotlrn-faq/tcl/dotlrn-faq-procs.tcl	24 Aug 2020 15:26:36 -0000	1.46.2.2
@@ -242,10 +242,10 @@
         event
         old_value
         new_value
-    } { 
+    } {
         Listens for the events. This is currently empty.
     } {
-    }   
+    }
 
 }
 
Index: openacs-4/packages/dotlrn-forums/tcl/dotlrn-forums-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-forums/tcl/dotlrn-forums-procs.tcl,v
diff -u -r1.16.2.1 -r1.16.2.2
--- openacs-4/packages/dotlrn-forums/tcl/dotlrn-forums-procs.tcl	24 Aug 2020 15:25:04 -0000	1.16.2.1
+++ openacs-4/packages/dotlrn-forums/tcl/dotlrn-forums-procs.tcl	24 Aug 2020 15:25:19 -0000	1.16.2.2
@@ -97,7 +97,7 @@
         ]
 
         # mount attachments under forums, if available
-        # attachments requires that dotlrn-fs is already mounted 
+        # attachments requires that dotlrn-fs is already mounted
         if {[apm_package_registered_p attachments]
             && [dotlrn_community::applet_active_p \
                     -community_id $community_id \
@@ -118,16 +118,16 @@
                  -community_id $community_id \
                  -applet_key [dotlrn_fs::applet_key]
             ]
-                                     
+
             # map the fs root folder to the package_id of the new forums pkg
             attachments::map_root_folder \
                 -package_id $package_id \
-                -folder_id [fs::get_root_folder -package_id $fs_package_id] 
-            
+                -folder_id [fs::get_root_folder -package_id $fs_package_id]
+
         } else {
             ns_log Warning "DOTLRN-FORUMS: Warning attachments or dotlrn-fs not found!"
         }
-        
+
         set auto_create_forum_p [parameter::get_from_package_key \
             -package_key [my_package_key] \
             -parameter auto_create_forum_p \
@@ -334,15 +334,15 @@
         event
         old_value
         new_value
-    } { 
+    } {
         listens for the following events: rename
-    } { 
+    } {
         switch $event {
             rename {
                 handle_rename -community_id $community_id -old_value $old_value -new_value $new_value
             }
         }
-    }   
+    }
 
     ad_proc -private handle_rename {
         {-community_id:required}
Index: openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-applet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-applet-procs.tcl,v
diff -u -r1.7.2.1 -r1.7.2.2
--- openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-applet-procs.tcl	24 Aug 2020 15:18:09 -0000	1.7.2.1
+++ openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-applet-procs.tcl	24 Aug 2020 15:21:46 -0000	1.7.2.2
@@ -51,7 +51,7 @@
 
     ad_proc -public add_applet {
     } {
-	Used for one-time init - must be repeatable!
+        Used for one-time init - must be repeatable!
     } {
         dotlrn_applet::add_applet_to_dotlrn -applet_key [applet_key] -package_key [package_key]
     }
@@ -125,7 +125,7 @@
         ]
 
         # Class members can read from and write to the folder.  We'll manipulate direct
-        # perms on files in order to implement the special restrictions placed on members 
+        # perms on files in order to implement the special restrictions placed on members
         # actions
 
         permission::grant -party_id $members -object_id $folder_id -privilege read
@@ -150,20 +150,20 @@
         set package_id [dotlrn::instantiate_and_mount $community_id [package_key]]
 
         set folder_id [create_homework_folder -community_id $community_id -package_id $package_id]
-        
+
         # add the portlet
 
         dotlrn_homework_portlet::add_self_to_page -portal_id $portal_id -package_id $package_id \
             -folder_id $folder_id -param_action overwrite
 
         # add the admin portlet
-	set admin_portal_id [dotlrn_community::get_admin_portal_id -community_id $community_id]
-	dotlrn_homework_admin_portlet::add_self_to_page -portal_id $admin_portal_id -package_id $package_id \
+        set admin_portal_id [dotlrn_community::get_admin_portal_id -community_id $community_id]
+        dotlrn_homework_admin_portlet::add_self_to_page -portal_id $admin_portal_id -package_id $package_id \
             -folder_id $folder_id -param_action overwrite
 
         return $package_id
     }
-    
+
     ad_proc -public remove_applet_from_community {
         community_id
     } {
@@ -223,26 +223,26 @@
 
         # this code is copied from add_applet_to_community above
         # they should be refactored together
-        
+
         # get the old comm's root folder id
         set old_package_id [dotlrn_community::get_applet_package_id -community_id $old_community_id -applet_key [applet_key]]
         set old_root_folder [fs::get_root_folder -package_id $old_package_id]
-        
+
         # do homework folder stuff
 
         set portal_id [dotlrn_community::get_portal_id -community_id $new_community_id]
         set package_id [dotlrn::instantiate_and_mount $new_community_id [package_key]]
 
         set folder_id [create_homework_folder -community_id $new_community_id -package_id $package_id]
-        
+
         # add the portlet
 
         dotlrn_homework_portlet::add_self_to_page -portal_id $portal_id -package_id $package_id \
             -folder_id $folder_id -param_action overwrite
 
         # add the admin portlet
-	set admin_portal_id [dotlrn_community::get_admin_portal_id -community_id $new_community_id]
-	dotlrn_homework_admin_portlet::add_self_to_page -portal_id $admin_portal_id -package_id $package_id \
+        set admin_portal_id [dotlrn_community::get_admin_portal_id -community_id $new_community_id]
+        dotlrn_homework_admin_portlet::add_self_to_page -portal_id $admin_portal_id -package_id $package_id \
             -folder_id $folder_id -param_action overwrite
 
         return $package_id
Index: openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-portlet-procs.tcl,v
diff -u -r1.10 -r1.10.2.1
--- openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-portlet-procs.tcl	11 Jul 2018 08:25:52 -0000	1.10
+++ openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-portlet-procs.tcl	24 Aug 2020 15:21:46 -0000	1.10.2.1
@@ -58,10 +58,10 @@
         ns_set put $args folder_id 0
         ns_set put $args param_action "overwrite"
 
-        add_portlet_helper $portal_id $args        
+        add_portlet_helper $portal_id $args
     }
 
-    
+
     ad_proc -public remove_portlet {
         {-portal_id:required}
     } {
@@ -70,7 +70,7 @@
     } {
         ad_return_complaint 1  "[applet_key] remove_portlet not implemented!"
     }
-    
+
     ad_proc -public add_portlet_helper {
         portal_id
         args
@@ -91,7 +91,7 @@
         {-folder_id:required}
         {-param_action:required}
     } {
-        Adds a homework PE to the given page. 
+        Adds a homework PE to the given page.
 
         @param portal_id The page to add self to
         @param folder_id The homework folder to associate with this portlet
@@ -171,7 +171,7 @@
         {-folder_id:required}
         {-param_action:required}
     } {
-        Adds a homework PE to the given page. 
+        Adds a homework PE to the given page.
 
         @param portal_id The page to add self to
         @param folder_id The homework folder to associate with this portlet
Index: openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-procs.tcl,v
diff -u -r1.7.2.1 -r1.7.2.2
--- openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-procs.tcl	8 Jan 2020 18:24:01 -0000	1.7.2.1
+++ openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-procs.tcl	24 Aug 2020 15:21:46 -0000	1.7.2.2
@@ -10,7 +10,7 @@
     package_id
 } {
 
-    Post package instantiation procedure to insert a package_id, 
+    Post package instantiation procedure to insert a package_id,
     folder_id pair in fs_root_folders.   The homework package wants its own root folder
     because we don't want it to be visible to any mounted instance of file storage.
 
@@ -67,7 +67,7 @@
         -description:required
         -upload_file:required
         -homework_file_id
-	{-package_id ""}
+        {-package_id ""}
     } {
 
         Build a new content revision in the given folder.  If new_file_p is set true then
@@ -95,7 +95,7 @@
         set tmp_filename [template::util::file::get_property tmp_filename $upload_file]
 
         # The content repository is kinda stupid about mime types,
-        # so we have to check if we know about this one and possibly 
+        # so we have to check if we know about this one and possibly
         # add it.
         set mime_type [cr_filename_to_mime_type $filename]
 
@@ -114,21 +114,21 @@
 
             if { [db_0or1row check_duplicate {}]} {
 
-		# AG: Make a reasonable attempt at avoiding collisions by
-		# converting a duplicate filename foo.txt to foo-2.txt,
-		# foo-3.txt and so on.
-		set success_p 0
-		set saved_filename $encoded_filename
-		for {set i 2} {$i < 11} {incr i} {
-		    set encoded_filename "[file rootname $saved_filename]-${i}[file extension $saved_filename]"
-		    if { ![db_0or1row check_duplicate {}]} {
-			set success_p 1
-			break
-		    }
-		}
-		if { !$success_p } {
-		    return -code error "[_ dotlrn-homework.lt_file_named]"
-		}
+                # AG: Make a reasonable attempt at avoiding collisions by
+                # converting a duplicate filename foo.txt to foo-2.txt,
+                # foo-3.txt and so on.
+                set success_p 0
+                set saved_filename $encoded_filename
+                for {set i 2} {$i < 11} {incr i} {
+                    set encoded_filename "[file rootname $saved_filename]-${i}[file extension $saved_filename]"
+                    if { ![db_0or1row check_duplicate {}]} {
+                    set success_p 1
+                    break
+                    }
+                }
+                if { !$success_p } {
+                    return -code error "[_ dotlrn-homework.lt_file_named]"
+                }
             }
 
             db_exec_plsql new_lob_file {}
@@ -153,7 +153,7 @@
 
             # admins of this community can admin the file
             permission::grant -party_id $admins -object_id $file_id -privilege admin
-            
+
             if { $homework_file_id == 0 } {
 
                 # The student uploading a homework file can read and edit it
@@ -175,12 +175,12 @@
 
         } else {
 
-	    # When updating we simply query for the title of the live
-	    # revision.  The title is used by the new_version query
-	    # below.
-	    set title [db_string live_version_title {}]
+            # When updating we simply query for the title of the live
+            # revision.  The title is used by the new_version query
+            # below.
+            set title [db_string live_version_title {}]
 
-	}
+        }
 
         # Grab key for new revision
         set revision_id [db_exec_plsql new_version {}]
@@ -194,7 +194,7 @@
 
             db_dml lob_content {} -blob_files [list $tmp_filename]
 
-            # Unfortunately, we can only calculate the file size after the lob is uploaded 
+            # Unfortunately, we can only calculate the file size after the lob is uploaded
             db_dml lob_size {}
 
         } else {
@@ -254,7 +254,7 @@
 
         db_1row get_alert_info {}
 
-	set decoded_name [decode_name $name]
+        set decoded_name [decode_name $name]
 
         set message "
 
@@ -282,7 +282,7 @@
 
         db_1row get_alert_info {}
 
-	set decoded_name [decode_name $name]
+        set decoded_name [decode_name $name]
 
         set message "