Index: openacs-4/packages/acs-bootstrap-installer/installer.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer.tcl,v
diff -u -r1.24.2.6 -r1.24.2.7
--- openacs-4/packages/acs-bootstrap-installer/installer.tcl	9 Aug 2014 08:48:10 -0000	1.24.2.6
+++ openacs-4/packages/acs-bootstrap-installer/installer.tcl	9 Aug 2014 08:51:02 -0000	1.24.2.7
@@ -53,7 +53,7 @@
     for OpenACS installation.
 
     @return An array list with variable names as values
-            and pretty names as keys.
+    and pretty names as keys.
 } {
     return {
         email "Email"
@@ -72,7 +72,7 @@
     for OpenACS installation.
 
     @return An array list with variable names as values
-            and default values as keys.
+    and default values as keys.
 } {
     return  {
         username ""
@@ -90,9 +90,9 @@
     more primitive proc instead.
 
     @param mandatory_params An array list where keys are param names and values
-                            are pretty names.
+    are pretty names.
     @param optional_params An array list with param names as keys and default
-                           values as keys.
+    values as keys.
 
     @author Peter Marklund
 } {
@@ -136,7 +136,7 @@
     # If there are missing mandatory params - return a complaint
     # page and exit
     if { [llength $missing_params] > 0 } {
-        ns_write "[install_header 200 "Missing parameters"]
+        ns_write "[install_header 200 {Missing parameters}]
 
 The following mandatory parameters are missing:
 <ul>
@@ -198,9 +198,9 @@
 # Does the ACS kernel data model seem installed?
 proc install_good_data_model_p {} {
     foreach table_name { acs_objects sec_session_properties } {
-	if { ![db_table_exists $table_name] } {
-	    return 0
-	}
+        if { ![db_table_exists $table_name] } {
+            return 0
+        }
     }
     return 1
 }
@@ -213,75 +213,75 @@
 
 proc install_file_serve { path } {
     if {[file isdirectory $path] && [string index [ad_conn url] end] != "/" } {
-  	ad_returnredirect "[ad_conn url]/"
+        ad_returnredirect "[ad_conn url]/"
     } else {
-	ns_log Debug "Installer serving $path"
-	ad_try {
-	    rp_serve_abstract_file $path
-	} notfound val {
-	    install_return 404 "Not found" "
-	    The file you've requested, doesn't exist. Please check
-	    your URL and try again."
-	} redirect url {
-	    ad_returnredirect $url
-	} directory dir_index {
-	    set new_file [file join $path "index.html"]
-	    if {[file exists $new_file]} {
-		rp_serve_abstract_file $new_file
-	    } 
-	    set new_file [file join $path "index.adp"]
-	    if {[file exists $new_file]} {
-		rp_serve_abstract_file $new_file
-	    } 
-	}
+        ns_log Debug "Installer serving $path"
+        ad_try {
+            rp_serve_abstract_file $path
+        } notfound val {
+            install_return 404 "Not found" "
+        The file you've requested, doesn't exist. Please check
+        your URL and try again."
+        } redirect url {
+            ad_returnredirect $url
+        } directory dir_index {
+            set new_file [file join $path "index.html"]
+            if {[file exists $new_file]} {
+                rp_serve_abstract_file $new_file
+            } 
+            set new_file [file join $path "index.adp"]
+            if {[file exists $new_file]} {
+                rp_serve_abstract_file $new_file
+            } 
+        }
     }
 }
 
 # The preauth filter which serves installation scripts.
 proc install_handler { conn arg why } {
     # Redirect requests to /doc appropriately.  Thus, the installer can reference the install guide.
     if { [regexp {/doc(.*)} [ad_conn url] "" doc_url] } {
-	set doc_urlv [split [string trimleft $doc_url] /]
-	set package_key [lindex $doc_urlv 1]
-	ns_log Debug "Scanning $doc_url with package_key $package_key..."
-	if {[file isfile "$::acs::rootdir/packages/acs-core-docs/www[join $doc_urlv /]"]} {
-	    install_file_serve "$::acs::rootdir/packages/acs-core-docs/www[join $doc_urlv /]"
-	} elseif {[file isdirectory \
-		"$::acs::rootdir/packages/acs-core-docs/www[join $doc_urlv /]"]} {
-	    install_file_serve "$::acs::rootdir/packages/acs-core-docs/www[join $doc_urlv /]"
-	} elseif {[file isdirectory "$::acs::rootdir/packages/$package_key/www/doc"]} {
-	    install_file_serve "$::acs::rootdir/packages/$package_key/www/doc[join [lrange $doc_urlv 2 end] /]"
-	} else {
-	    install_file_serve "$::acs::rootdir/packages/$package_key/doc[join $doc_url /]"
-	}
-	return "filter_return"
+        set doc_urlv [split [string trimleft $doc_url] /]
+        set package_key [lindex $doc_urlv 1]
+        ns_log Debug "Scanning $doc_url with package_key $package_key..."
+        if {[file isfile "$::acs::rootdir/packages/acs-core-docs/www[join $doc_urlv /]"]} {
+            install_file_serve "$::acs::rootdir/packages/acs-core-docs/www[join $doc_urlv /]"
+        } elseif {[file isdirectory \
+                       "$::acs::rootdir/packages/acs-core-docs/www[join $doc_urlv /]"]} {
+            install_file_serve "$::acs::rootdir/packages/acs-core-docs/www[join $doc_urlv /]"
+        } elseif {[file isdirectory "$::acs::rootdir/packages/$package_key/www/doc"]} {
+            install_file_serve "$::acs::rootdir/packages/$package_key/www/doc[join [lrange $doc_urlv 2 end] /]"
+        } else {
+            install_file_serve "$::acs::rootdir/packages/$package_key/doc[join $doc_url /]"
+        }
+        return "filter_return"
     }
 
     # Make sure any requests to /SYSTEM still get through.  This is useful if your server
     # is setting behind a load balancer that uses SYSTEM pages to verify that the server
     # is still working.
     if { [regexp {/SYSTEM/(.*)} [ad_conn url] "" system_file] } {
-	if {[string compare [string range $system_file \
-		[expr {[string length $system_file ] - 4}] end] ".tcl"
-	]} {
-	    set system_file "$system_file.tcl"
-	}
-	apm_source $::acs::rootdir/www/SYSTEM/$system_file
-	return "filter_return"
+        if {[string compare [string range $system_file \
+                                 [expr {[string length $system_file ] - 4}] end] ".tcl"
+            ]} {
+            set system_file "$system_file.tcl"
+        }
+        apm_source $::acs::rootdir/www/SYSTEM/$system_file
+        return "filter_return"
     }
 
     if { ![regexp {/([a-zA-Z0-9\-_]*)$} [ad_conn url] "" script] } {
-	ns_returnredirect "/"
-	return "filter_return"
+        ns_returnredirect "/"
+        return "filter_return"
     }
 
     if { $script eq "" } {
-	set script "index"
+        set script "index"
     }
 
     set path "[nsv_get acs_properties root_directory]/packages/acs-bootstrap-installer/installer/$script.tcl"
     if { ![info exists path] } {
-	install_return 404 "Not found" "
+        install_return 404 "Not found" "
 The installation script you've requested, <code>$script</code>, doesn't exist. Please check
 your URL and try again.
 "
@@ -292,30 +292,30 @@
     # Engage a mutex for double-click protection.
     ns_mutex lock [nsv_get acs_installer mutex]
     if { [catch {
-	# Source the page and then unlock the mutex.
-	apm_source $path errors
-	ns_mutex unlock [nsv_get acs_installer mutex]
+        # Source the page and then unlock the mutex.
+        apm_source $path errors
+        ns_mutex unlock [nsv_get acs_installer mutex]
     } error] } {
-	# In case of an error, don't forget to unlock the mutex.
-	ns_mutex unlock [nsv_get acs_installer mutex]
-	global errorInfo
-	install_return 500 "Error" "The following error occurred in an installation script:\n\
+        # In case of an error, don't forget to unlock the mutex.
+        ns_mutex unlock [nsv_get acs_installer mutex]
+        global errorInfo
+        install_return 500 "Error" "The following error occurred in an installation script:\n\
         <blockquote><pre>[ns_quotehtml $errorInfo]</pre></blockquote>\n"
     }
     if {[array size errors] > 0} {
-	install_return 500 "Error" [install_load_errors_formatted errors]
+        install_return 500 "Error" [install_load_errors_formatted errors]
     }
     return "filter_return"
 }
 
 proc install_admin_widget {} {
 
     return "
-	<form action=create-administrator>
-	<input type=hidden name=done_p value=1>
-	<center>
-	<input type=submit value=\"Create Administrator ->\">
-	</center>
+    <form action=create-administrator>
+    <input type=hidden name=done_p value=1>
+    <center>
+    <input type=submit value=\"Create Administrator ->\">
+    </center>
 "
 
 }
@@ -343,9 +343,9 @@
 } {
     set thisplatform [ns_info platform]
     if {$thisplatform eq "win32"} {
-       return 1
+        return 1
     } else {
-       return 0
+        return 0
     }
 }
 
@@ -358,14 +358,14 @@
 
     set result ""
     if {[array size errors] > 0} {
-	append result "<blockquote><pre>\n"
-	foreach {package errorInfos} [array get errors] {
-	    append result "<h4>Error in Package $package:</h4>\n"
-	    foreach {fileName backTrace} $errorInfos {
-		append result "<strong>Error in File $fileName</strong>\n\n[ad_quotehtml $backTrace]\n\n\n"
-	    }
-	}
-	append result "</pre></blockquote>\n"
+        append result "<blockquote><pre>\n"
+        foreach {package errorInfos} [array get errors] {
+            append result "<h4>Error in Package $package:</h4>\n"
+            foreach {fileName backTrace} $errorInfos {
+                append result "<strong>Error in File $fileName</strong>\n\n[ad_quotehtml $backTrace]\n\n\n"
+            }
+        }
+        append result "</pre></blockquote>\n"
     }
     return $result
 }
@@ -397,9 +397,9 @@
             set db_pretty_name [lindex $known_db_type 2]
             db_dml insert_apm_db_type {
                 insert into apm_package_db_types
-                    (db_type_key, pretty_db_name)
+                (db_type_key, pretty_db_name)
                 values
-                    (:db_type, :db_pretty_name)
+                (:db_type, :db_pretty_name)
             }
         }
     }
@@ -417,13 +417,13 @@
     apm_source [acs_package_root_dir acs-tcl]/tcl/database-init.tcl errors
 
     if {[array size errors] > 0} {
-	ns_write "<h3>Errors during initial load:</h3>"
-	ns_write [install_load_errors_formatted errors]
+        ns_write "<h3>Errors during initial load:</h3>"
+        ns_write [install_load_errors_formatted errors]
     }
 
     apm_version_enable -callback apm_ns_write_callback \
-	[apm_package_install -callback apm_ns_write_callback \
-	     [file join $::acs::rootdir packages acs-kernel acs-kernel.info]]
+        [apm_package_install -callback apm_ns_write_callback \
+             [file join $::acs::rootdir packages acs-kernel acs-kernel.info]]
 
     ns_write "<p>Loading package .info files.<p>"
 
@@ -467,9 +467,9 @@
     install_redefine_ad_conn
 
     if {[array size errors] > 0} {
-	ns_write "<h2>Errors during load of acs-tcl init or package acs-subsite</h2>\n"
-	ns_write [install_load_errors_formatted errors]
-	 return
+        ns_write "<h2>Errors during load of acs-tcl init or package acs-subsite</h2>\n"
+        ns_write [install_load_errors_formatted errors]
+        return
     }
 
     # Attempt to install all packages.
@@ -478,16 +478,16 @@
     set pkg_list [lindex $dependency_results 1]
 
     if { !$dependencies_satisfied_p } {
-	 ns_write "<p><b><i>At least one core package has an unsatisifed dependency.\
+        ns_write "<p><b><i>At least one core package has an unsatisifed dependency.\
               No packages have been installed missing: [lindex $dependency_results 2]. \
               Here's what the APM has computed:</i></b>"
 
-	 ns_write "\n<ul>"
-         foreach dep $pkg_list {
-	     lassign $dep _name _path _a _b _pkg _deps _flag _msg
-	     ns_write "<li>[lindex $_pkg 0]: $_msg</li>"
-	 }
-	 return
+        ns_write "\n<ul>"
+        foreach dep $pkg_list {
+            lassign $dep _name _path _a _b _pkg _deps _flag _msg
+            ns_write "<li>[lindex $_pkg 0]: $_msg</li>"
+        }
+        return
     }
 
     apm_packages_full_install -callback apm_ns_write_callback $pkg_list
@@ -512,10 +512,8 @@
         apm_mount_core_packages
 
         ns_write "</pre></blockquote>"
-
     }
 
-
     ns_write "All Packages Installed."
 }
 
@@ -529,3 +527,9 @@
     proc install_handler {why} { install_handler_conn _ _ $why }
 }
 
+#
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End: