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.12.2.2 -r1.12.2.3 --- openacs-4/packages/acs-bootstrap-installer/installer.tcl 26 Nov 2003 21:46:32 -0000 1.12.2.2 +++ openacs-4/packages/acs-bootstrap-installer/installer.tcl 9 Feb 2004 15:37:11 -0000 1.12.2.3 @@ -16,13 +16,18 @@ {-type ""} {-size 40} {-extra_attributes ""} + {-value ""} param_name } { Return an HTML input widget for a parameter with an indication of whether the param is mandatory. } { set type_attribute [ad_decode $type "" "" "type=\"$type\""] + if { ![empty_string_p $value] } { + append extra_attributes " value=\"[ad_quotehtml $value]\"" + } + set input_widget "" if { [install_param_mandatory_p $param_name] } { Index: openacs-4/packages/acs-bootstrap-installer/installer/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer/index.tcl,v diff -u -r1.17.2.4 -r1.17.2.5 --- openacs-4/packages/acs-bootstrap-installer/installer/index.tcl 11 Dec 2003 02:12:26 -0000 1.17.2.4 +++ openacs-4/packages/acs-bootstrap-installer/installer/index.tcl 9 Feb 2004 15:37:12 -0000 1.17.2.5 @@ -265,13 +265,13 @@ # Get the default for system_url. First try to get it from the nssock # hostname setting - if that is not available then try ns_info - # hostname, use yourdomain.com if that fails too. if { [catch { set system_url "http://[ns_config "ns/server/[ns_info server]/module/nssock" hostname [ns_info hostname]]" + set system_port [ns_config "ns/server/[ns_info server]/module/nssock" port [ns_conn port]] # append port number if non-standard port - if { !([ns_conn port] == 0 || [ns_conn port] == 80) } { - append system_url ":[ns_conn port]" + if { !($system_port == 0 || $system_port == 80) } { + append system_url ":$system_port" } }] } { @@ -339,7 +339,7 @@