Index: openacs-4/packages/acs-subsite/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/apm-callback-procs.tcl,v
diff -u -N -r1.13 -r1.13.2.1
--- openacs-4/packages/acs-subsite/tcl/apm-callback-procs.tcl	7 Aug 2017 23:47:58 -0000	1.13
+++ openacs-4/packages/acs-subsite/tcl/apm-callback-procs.tcl	16 May 2019 09:27:52 -0000	1.13.2.1
@@ -7,12 +7,14 @@
 namespace eval subsite {}
 
 ad_proc -private subsite::package_install {} {} {
-    set type_id [content::type::new -content_type "email_image" -pretty_name "Email_Image" \
-		 -pretty_plural "Email_Images" -table_name "users_email_image" -id_column "email_image_id"]
+    set type_id [content::type::new \
+                     -content_type "email_image" -pretty_name "Email_Image" \
+                     -pretty_plural "Email_Images" -table_name "users_email_image" \
+                     -id_column "email_image_id"]
 
     set folder_id [content::folder::new -name "Email_Images" -label "Email_Images"]
 
-    content::folder::register_content_type -folder_id $folder_id -content_type "email_image" 
+    content::folder::register_content_type -folder_id $folder_id -content_type "email_image"
 
 }
 
@@ -27,71 +29,73 @@
         -to_version_name $to_version_name \
         -spec {
             5.2.0d1 5.2.0d2 {
-		set type_id [content::type::new -content_type "email_image" -pretty_name "Email_Image" \
-				 -pretty_plural "Email_Images" -table_name "users_email_image" -id_column "email_image_id"]
-		
-		set folder_id [content::folder::new -name "Email_Images" -label "Email_Images"]
-		
-		content::folder::register_content_type -folder_id $folder_id -content_type "email_image" 
-		
-		
-	    }
-	    5.2.0a1 5.2.0a2 {
-		set value [parameter::get -parameter "AsmForRegisterId" -package_id [subsite::main_site_id]]
-		if {$value eq ""} {
-		    apm_parameter_register "AsmForRegisterId" "Assessment used on the registration process." "acs-subsite" "0" "number" "user-login"
-		}
-		apm_parameter_register "RegImplName" "Name of the implementation used in the registration process" "acs-subsite" "asm_url" "string" "user-login"
-		
-	    }
-	    5.2.0a1 5.2.0a2 {
-		set value [parameter::get -parameter "RegistrationId" -package_id [subsite::main_site_id]]
-		if {$value eq ""} {
-		    apm_parameter_register "RegistrationId" "Assessment used on the registration process." "acs-subsite" "0" "number" "user-login"
-		}
-		set value [parameter::get -parameter "RegistrationId" -package_id [subsite::main_site_id]]
-		if {$value eq ""} {
-		    apm_parameter_register "RegistrationImplName" "Name of the implementation used in the registration process" "acs-subsite" "asm_url" "string" "user-login"
+                set type_id [content::type::new \
+                                 -content_type "email_image" -pretty_name "Email_Image" \
+                                 -pretty_plural "Email_Images" -table_name "users_email_image" \
+                                 -id_column "email_image_id"]
+
+                set folder_id [content::folder::new -name "Email_Images" -label "Email_Images"]
+
+                content::folder::register_content_type \
+                    -folder_id $folder_id -content_type "email_image"
+
+            }
+            5.2.0a1 5.2.0a2 {
+                set value [parameter::get -parameter "AsmForRegisterId" -package_id [subsite::main_site_id]]
+                if {$value eq ""} {
+                    apm_parameter_register "AsmForRegisterId" "Assessment used on the registration process." "acs-subsite" "0" "number" "user-login"
                 }
-	    }
-	    5.2.0a2 5.2.0a3 {
-		db_transaction {
-		    db_foreach select_group_name {select group_id, group_name from groups} {
-			if { [info commands "::lang::util::convert_to_i18n"] ne "" } {
-			    set pretty_name [lang::util::convert_to_i18n -message_key "group_title_${group_id}" -text "$group_name"]
-			} else {
-			    set pretty_name "$group_name"
-			}
-			
-			db_dml title_update "update acs_objects set title=:pretty_name where object_id = :group_id"
-		    }
-		}
-	    }
-	    5.2.0a1 5.2.0a2 {
-		set value [parameter::get -parameter "RegistrationId" -package_id [subsite::main_site_id]]
-		if {$value eq ""} {
-		    apm_parameter_register "RegistrationId" "Assessment used on the registration process." "acs-subsite" "0" "number" "user-login"
-		}
-		set value [parameter::get -parameter "RegistrationId" -package_id [subsite::main_site_id]]
-		if {$value eq ""} {
-		    apm_parameter_register "RegistrationImplName" "Name of the implementation used in the registration process" "acs-subsite" "asm_url" "string" "user-login"
+                apm_parameter_register "RegImplName" "Name of the implementation used in the registration process" "acs-subsite" "asm_url" "string" "user-login"
+
+            }
+            5.2.0a1 5.2.0a2 {
+                set value [parameter::get -parameter "RegistrationId" -package_id [subsite::main_site_id]]
+                if {$value eq ""} {
+                    apm_parameter_register "RegistrationId" "Assessment used on the registration process." "acs-subsite" "0" "number" "user-login"
                 }
-	    }
-	    5.2.0a2 5.2.0a3 {
-		db_transaction {
-		    db_foreach select_group_name {select group_id, group_name from groups} {
-			if { [info commands "::lang::util::convert_to_i18n"] ne "" } {
-			    set pretty_name [lang::util::convert_to_i18n -message_key "group_title_${group_id}" -text "$group_name"]
-			} else {
-			    set pretty_name "$group_name"
-			}
-			
-			db_dml title_update "update acs_objects set title=:pretty_name where object_id = :group_id"
-		    }
-		}
-	    }
-	    5.5.0d7 5.5.0d8 {
+                set value [parameter::get -parameter "RegistrationId" -package_id [subsite::main_site_id]]
+                if {$value eq ""} {
+                    apm_parameter_register "RegistrationImplName" "Name of the implementation used in the registration process" "acs-subsite" "asm_url" "string" "user-login"
+                }
+            }
+            5.2.0a2 5.2.0a3 {
                 db_transaction {
+                    db_foreach select_group_name {select group_id, group_name from groups} {
+                        if { [info commands "::lang::util::convert_to_i18n"] ne "" } {
+                            set pretty_name [lang::util::convert_to_i18n -message_key "group_title_${group_id}" -text "$group_name"]
+                        } else {
+                            set pretty_name "$group_name"
+                        }
+
+                        db_dml title_update "update acs_objects set title=:pretty_name where object_id = :group_id"
+                    }
+                }
+            }
+            5.2.0a1 5.2.0a2 {
+                set value [parameter::get -parameter "RegistrationId" -package_id [subsite::main_site_id]]
+                if {$value eq ""} {
+                    apm_parameter_register "RegistrationId" "Assessment used on the registration process." "acs-subsite" "0" "number" "user-login"
+                }
+                set value [parameter::get -parameter "RegistrationId" -package_id [subsite::main_site_id]]
+                if {$value eq ""} {
+                    apm_parameter_register "RegistrationImplName" "Name of the implementation used in the registration process" "acs-subsite" "asm_url" "string" "user-login"
+                }
+            }
+            5.2.0a2 5.2.0a3 {
+                db_transaction {
+                    db_foreach select_group_name {select group_id, group_name from groups} {
+                        if { [info commands "::lang::util::convert_to_i18n"] ne "" } {
+                            set pretty_name [lang::util::convert_to_i18n -message_key "group_title_${group_id}" -text "$group_name"]
+                        } else {
+                            set pretty_name "$group_name"
+                        }
+
+                        db_dml title_update "update acs_objects set title=:pretty_name where object_id = :group_id"
+                    }
+                }
+            }
+            5.5.0d7 5.5.0d8 {
+                db_transaction {
                     set package_keys ([join '[subsite::package_keys]' ,])
                     foreach subsite_id [db_list get_subsite_ids {}] {
                         set new_css [list]
@@ -112,7 +116,7 @@
                     }
                 }
             }
-	}
+        }
 }
 
 # Local variables: