Index: openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl,v
diff -u -r1.84 -r1.85
--- openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl	26 Jul 2018 14:53:25 -0000	1.84
+++ openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl	26 Jul 2018 15:12:22 -0000	1.85
@@ -33,38 +33,38 @@
 
     ad_proc -public class_group_type_key {
     } {
-	Returns the group type key used for class groups
+        Returns the group type key used for class groups
     } {
-	return [dotlrn::parameter -name class_group_type_key]
+        return [dotlrn::parameter -name class_group_type_key]
     }
 
     ad_proc -public group_type_key {
     } {
-	Returns the group_type key that is being used for class management
+        Returns the group_type key that is being used for class management
     } {
-	return [dotlrn::parameter -name group_type_key]
+        return [dotlrn::parameter -name group_type_key]
     }
 
     ad_proc -public package_key {} {
-	returns the package key
+        returns the package key
     } {
-	return dotlrn
+        return dotlrn
     }
 
     ad_proc -public get_url {} {
-	returns the root URL for dotLRN
+        returns the root URL for dotLRN
     } {
-	return "/[package_key]"
+        return "/[package_key]"
     }
 
     ad_proc -public get_admin_url {} {
-	returns the root URL for dotLRN
+        returns the root URL for dotLRN
     } {
-	return "[get_url]/admin"
+        return "[get_url]/admin"
     }
 
     ad_proc -public is_instantiated {} {
-	returns 1 if dotlrn is instantiated, 0 otherwise
+        returns 1 if dotlrn is instantiated, 0 otherwise
     } {
         return [ad_decode [apm_num_instances [package_key]] 0 0 1]
     }
@@ -89,11 +89,11 @@
             dotlrn_community::set_type_package_id \
                 -community_type [community_type] \
                 -package_id [get_package_id]
-            
+
             dotlrn::new_type_portal \
                 -type user \
                 -pretty_name [dotlrn::parameter -name user_portal_pretty_name]
-            
+
             # do the same for subgroups (the dotlrn_community type)
             dotlrn::new_type_portal \
                 -type dotlrn_community \
@@ -107,7 +107,7 @@
         returns 1 if package is mounted under dotlrn, 0 otherwise
     } {
         set list [site_node::get_children -package_key $package_key \
-                      -node_id [get_node_id]]
+            -node_id [get_node_id]]
         return [expr {[llength $list] > 0 ? 1 : 0}]
     }
 
@@ -134,7 +134,7 @@
                 -package_key $package_key \
                 -package_name $pretty_name \
                 -context_id $parent_package_id \
-            ]
+                ]
         }
 
         return $package_id
@@ -144,81 +144,81 @@
         {-package_id:required}
     } {
         unmount a package previously mounted with dotlrn::mount_package.
-        just a nice wrapper for the dotrn-*-procs so they don't have to 
+        just a nice wrapper for the dotrn-*-procs so they don't have to
         deal with site_nodes and apm directly.
     } {
         set node_id [site_node::get_node_id_from_object_id -object_id $package_id]
         db_transaction {
             site_node::unmount -node_id $node_id
             apm_package_instance_delete $package_id
         } on_error {
-             site_node::update_cache -node_id $node_id
+            site_node::update_cache -node_id $node_id
         }
     }
 
     ad_proc -public get_node_id {} {
-	return the root node id for dotLRN
+        return the root node id for dotLRN
     } {
-	return [site_node::get_node_id -url [get_url]]
+        return [site_node::get_node_id -url [get_url]]
     }
 
     ad_proc -public get_package_id {} {
-	return the package ID for dotLRN
+        return the package ID for dotLRN
     } {
         return [site_node::get_object_id -node_id [get_node_id]]
     }
 
     ad_proc -public get_users_rel_segment_id {} {
-	returns the rel_segment_id of the dotLRN users segment
+        returns the rel_segment_id of the dotLRN users segment
     } {
-	return [db_string select_user_rel_segment {}]
+        return [db_string select_user_rel_segment {}]
     }
 
     ad_proc -public get_user_theme {
-	user_id
+        user_id
     } {
-	Return the user default theme
+        Return the user default theme
     } {
-	return [util_memoize "dotlrn::get_user_theme_not_cached $user_id"]
+        return [util_memoize "dotlrn::get_user_theme_not_cached $user_id"]
     }
 
     ad_proc -private get_user_theme_not_cached {
-	user_id
+        user_id
     } {
-	helper
+        helper
     } {
-	return [db_string select_user_theme {} -default ""]
+        return [db_string select_user_theme {} -default ""]
     }
 
     ad_proc -public set_user_theme {
-	user_id
-	theme_id
+        user_id
+        theme_id
     } {
-	Set the user theme
+        Set the user theme
     } {
-	db_dml update_user_theme {}
+        db_dml update_user_theme {}
     }
 
     ad_proc -public get_portal_id {
-	{-user_id:required}
+        {-user_id:required}
     } {
-	Get the portal_id for a particular user
+        Get the portal_id for a particular user
     } {
         return [util_memoize "dotlrn::get_portal_id_not_cached -user_id $user_id"]
     }
 
     ad_proc -private get_portal_id_not_cached {
-	{-user_id:required}
+        {-user_id:required}
     } {
-	Get the portal_id for a particular user
+        Get the portal_id for a particular user
     } {
-	return [db_string select_user_portal_id {} -default ""]
+        return [db_string select_user_portal_id {} -default ""]
     }
 
     ad_proc -public -deprecated get_user_name {
-	user_id
+        user_id
     } {
-	Get the names the user.
+        Get the names the user.
 
         Deprecated. Use person::name instead.
 
@@ -232,49 +232,49 @@
     }
 
     ad_proc -public instantiate_and_mount {
-	{-mount_point ""}
-	community_id
-	package_key
+        {-mount_point ""}
+        community_id
+        package_key
     } {
-	Mount an application under a particular community
+        Mount an application under a particular community
     } {
-	if {$mount_point eq ""} {
-	    set mount_point $package_key
-	}
+        if {$mount_point eq ""} {
+            set mount_point $package_key
+        }
 
-	# Get the parent node_id correctly
-	set package_id [dotlrn_community::get_package_id $community_id]
+        # Get the parent node_id correctly
+        set package_id [dotlrn_community::get_package_id $community_id]
 
-	# We only take the first node right now
-	# FIXME: in case of multi-mounting, which is doubtful, but possible
-	# we have a problem here.
-	set parent_node_id [site_node::get_node_id -url [lindex [site_node::get_url_from_object_id -object_id $package_id] 0]]
+        # We only take the first node right now
+        # FIXME: in case of multi-mounting, which is doubtful, but possible
+        # we have a problem here.
+        set parent_node_id [site_node::get_node_id -url [lindex [site_node::get_url_from_object_id -object_id $package_id] 0]]
 
         set new_package_id [site_node::instantiate_and_mount \
             -node_name $mount_point \
             -parent_node_id $parent_node_id \
             -package_key $package_key \
             -context_id $package_id \
-        ]
+            ]
 
-	# Return the newly created package_id
-	return $new_package_id
+            # Return the newly created package_id
+        return $new_package_id
     }
-	
+
     ad_proc -public render_page {
-	{-workspace_p ""}
-	{-hide_links_p  f}
+        {-workspace_p ""}
+        {-hide_links_p  f}
         {-render_style individual}
         {-page_num ""}
-	portal_id
+        portal_id
     } {
-	render a page in a user's favorite style
+        render a page in a user's favorite style
     } {
-	return [portal::render \
-                -page_num $page_num \
-                -hide_links_p $hide_links_p \
-                -render_style $render_style \
-                $portal_id
+        return [portal::render \
+            -page_num $page_num \
+            -hide_links_p $hide_links_p \
+            -render_style $render_style \
+            $portal_id
         ]
     }
 
@@ -299,7 +299,7 @@
         {-name:required}
         {-default ""}
     } {
-        wrap 
+        wrap
     } {
         return [parameter::get -localize=$localize_p -package_id [get_package_id] -parameter $name -default $default]
     }
@@ -324,17 +324,17 @@
     ad_proc -public get_portal_id_from_type {
         {-type:required}
     } {
-        What's this type's portal_id? If the type is not matched, 
+        What's this type's portal_id? If the type is not matched,
         return the id of dotlrn_class_instance by default
     } {
         set id [db_string select {} -default ""]
 
         if {$id eq ""} {
             set type dotlrn_class_instance
-	    # aks: this next line is necessary 
-	    # for dotlrn_class_instances, don't remove it!
-	    set id [db_string select {} -default ""]
-        } 
+            # aks: this next line is necessary
+            # for dotlrn_class_instances, don't remove it!
+            set id [db_string select {} -default ""]
+        }
 
         return $id
     }
@@ -346,8 +346,8 @@
         Create a portal for the given type. This is how "portal templates"
         (actually just regular portals) are created for things like the
         "user" portal, "communities", or "class instances". We can't just
-        associate a portal_id with a dotlrn community_type since there's 
-        no community type for a "user" portal. So we use the 
+        associate a portal_id with a dotlrn community_type since there's
+        no community type for a "user" portal. So we use the
         dotlrn_portal_types_map table instead.
 
         @param type
@@ -370,30 +370,30 @@
             set csv_list [dotlrn::parameter -name class_instance_pages_csv]
             set default_applets [dotlrn::parameter -name default_class_instance_applets]
         }
-        
-        # FIXME - if there's a proc to get the admin user_id w/o 
+
+        # FIXME - if there's a proc to get the admin user_id w/o
         # a connection put it here. This needs to be a valid
         # grantee for the perms
-        set user_id -1        
-        
+        set user_id -1
+
         set portal_id [portal::create \
             -name "$pretty_name Portal" \
             -csv_list $csv_list \
             $user_id
         ]
-        
+
         # Associate this type with portal_id, must be before applet
         # callbacks, since they use this info
         set_type_portal_id \
             -type $type \
             -portal_id $portal_id
 
-        # Add the default applets 
+            # Add the default applets
         set default_applets_list [string trim [split $default_applets {,}]]
-        
+
         foreach applet_key $default_applets_list {
             if {[dotlrn_applet::applet_exists_p -applet_key $applet_key]} {
-                if {[catch {dotlrn_community::applet_call $applet_key AddPortlet [list $portal_id]} errMsg]} { 
+                if {[catch {dotlrn_community::applet_call $applet_key AddPortlet [list $portal_id]} errMsg]} {
                     ns_log warning "FAILED: dotlrn_community::applet_call $applet_key AddPortlet [list $portal_id]\n$errMsg"
                 }
             }
@@ -405,13 +405,13 @@
         {-site_template_id:required}
     } {
         Sets a given Site Template for a User
-	
-	@author Victor Guerra ( guerra@galileo.edu )
-	@creation-date 2006-03-11
-	
-	@param user_id The id of the User that will change his Site Template 
-	@param site_template_id The id of the Site Template that will be used by the User
-  
+
+        @author Victor Guerra ( guerra@galileo.edu )
+        @creation-date 2006-03-11
+
+        @param user_id The id of the User that will change his Site Template
+        @param site_template_id The id of the Site Template that will be used by the User
+
     } {
         set portal_id [dotlrn::get_portal_id -user_id $user_id]
         set new_theme_id [db_string select_portal_theme {}]
@@ -425,99 +425,98 @@
         {-user_id:required}
     } {
         Returns the master configured for a given User
-	
-	@author Victor Guerra ( guerra@galileo.edu )
-	@creation-date 2006-03-11
-	
-	@param user_id The id of the User in order to obtain the master template configured for him
-	
-	@return The path of the master template that will be used.
 
+        @author Victor Guerra ( guerra@galileo.edu )
+        @creation-date 2006-03-11
+
+        @param user_id The id of the User in order to obtain the master template configured for him
+
+        @return The path of the master template that will be used.
+
     } {
-	set site_template_id [get_site_template_id -user_id $user_id]
+        set site_template_id [get_site_template_id -user_id $user_id]
         return [get_master_from_site_template_id -site_template_id $site_template_id]
     }
 
     ad_proc -public get_site_template_id {
-	{-user_id:required}
+        {-user_id:required}
     } {
-	Gets the id of a User's site template
-	
-	@author Victor Guerra ( guerra@galileo.edu )
-	@creation-date 2006-03-11
-	
-	@param user_id The id of the User of whom we want to abtain the Site Template
-	
-	@return The id of the Site Template assigned to the User
+        Gets the id of a User's site template
 
+        @author Victor Guerra ( guerra@galileo.edu )
+        @creation-date 2006-03-11
+
+        @param user_id The id of the User of whom we want to abtain the Site Template
+
+        @return The id of the Site Template assigned to the User
+
     } {
         return [util_memoize [list dotlrn::get_site_template_id_not_cached -user_id $user_id] ]
     }
 
     ad_proc -private get_site_template_id_not_cached {
         {-user_id:required}
     } {
-	Gets the id of the user's site template - not cached
+        Gets the id of the user's site template - not cached
     } {
-	set dotlrn_package_id [dotlrn::get_package_id]
-	set user_site_template_id [db_string select_site_template_id {} -default "0"]
-	if {[parameter::get -package_id $dotlrn_package_id -parameter UserChangeSiteTemplate_p]} {
-	    set site_template_id $user_site_template_id
-	} else {
-	    set site_template_id [parameter::get -package_id $dotlrn_package_id -parameter UserDefaultSiteTemplate_p]
-	    if {$site_template_id != $user_site_template_id} {
-		set_site_template_id -user_id $user_id -site_template_id $site_template_id
-	    }
-	}
-	return $site_template_id
+        set dotlrn_package_id [dotlrn::get_package_id]
+        set user_site_template_id [db_string select_site_template_id {} -default "0"]
+        if {[parameter::get -package_id $dotlrn_package_id -parameter UserChangeSiteTemplate_p]} {
+            set site_template_id $user_site_template_id
+        } else {
+            set site_template_id [parameter::get -package_id $dotlrn_package_id -parameter UserDefaultSiteTemplate_p]
+            if {$site_template_id != $user_site_template_id} {
+                set_site_template_id -user_id $user_id -site_template_id $site_template_id
+            }
+        }
+        return $site_template_id
     }
-    
-    
+
+
     ad_proc -public get_master_from_site_template_id {
-	{-site_template_id:required}
+        {-site_template_id:required}
     } {
-	Returns the master template associated to a given Site Template
-	
-	@author Victor Guerra ( guerra@galileo.edu )
-	@creation-date 2006-03-11
-	
-	@param site_template_id The id of The Site Template to obtain the master template
-	
-	@return The path of the master template associated to the Site Template
-	
+        Returns the master template associated to a given Site Template
+
+        @author Victor Guerra ( guerra@galileo.edu )
+        @creation-date 2006-03-11
+
+        @param site_template_id The id of The Site Template to obtain the master template
+
+        @return The path of the master template associated to the Site Template
+
     } {
-	return [util_memoize [list dotlrn::get_master_from_site_template_id_not_cached -site_template_id $site_template_id]]
+        return [util_memoize [list dotlrn::get_master_from_site_template_id_not_cached -site_template_id $site_template_id]]
     }
-    
+
     ad_proc -private get_master_from_site_template_id_not_cached {
-	{-site_template_id:required}
+        {-site_template_id:required}
     } {
-	Returns the master template for a given site template
+        Returns the master template for a given site template
     } {
-	return [db_string select_site_template_master {} \
-		    -default [parameter::get -package_id [dotlrn::get_package_id] -parameter DefaultMaster_p]]
+        return [db_string select_site_template_master {} \
+            -default [parameter::get -package_id [dotlrn::get_package_id] -parameter DefaultMaster_p]]
     }
-    
+
     ad_proc -public assign_default_sitetemplate {
-	{-site_template_id:required}
+        {-site_template_id:required}
     } {
-	Assigns a portal theme associated to a Site Template
-	to all users
-	
-	@author Victor Guerra ( guerra@galileo.edu )
-	@creation-date 2006-03-11
-	
-	@param site_template_id The id of The Site Template to obtain the portal theme to be assigned
+        Assigns a portal theme associated to a Site Template
+        to all users
 
+        @author Victor Guerra ( guerra@galileo.edu )
+        @creation-date 2006-03-11
+
+        @param site_template_id The id of The Site Template to obtain the portal theme to be assigned
+
     } {
-	
-	# We need to update the portal theme before the first hit!
-	set new_theme_id [db_string select_portal_theme {}]
+
+        # We need to update the portal theme before the first hit!
+        set new_theme_id [db_string select_portal_theme {}]
         db_dml update_portal_themes {update }
 
-	util_memoize_flush_regexp "dotlrn::get_site_template_id_not_cached *" 
+        util_memoize_flush_regexp "dotlrn::get_site_template_id_not_cached *"
     }
-
 }
 
 # Local variables: