Index: openacs-4/packages/ecommerce/tcl/ecommerce-ssl-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-ssl-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/tcl/ecommerce-ssl-procs.tcl	18 Jul 2001 23:46:14 -0000	1.2
+++ openacs-4/packages/ecommerce/tcl/ecommerce-ssl-procs.tcl	23 Oct 2001 05:07:14 -0000	1.3
@@ -83,8 +83,18 @@
             set sdriver $drivers(sdriver)
         }
             
-        set secure_port [ns_config -int "ns/server/[ns_info server]/module/$sdriver" Port 443]
+        set secure_port [ns_config -int "ns/server/[ns_info server]/module/$sdriver" Port]
+	### nsopenssl 2.0 has different names for the secure port
+	if [empty_string_p $secure_port] {
+	    set secure_port [ns_config -int "ns/server/[ns_info server]/module/$sdriver" ServerPort 443]
+	}
+
         set secure_location "https://[ns_config ns/server/[ns_info server]/module/$sdriver Hostname]"
+	### nsopenssl 2.0 uses ServerHostname instead of Hostname
+        if [string match $secure_location "https://"] {
+	    set secure_location "https://[ns_config ns/server/[ns_info server]/module/$sdriver ServerHostname]"
+	}
+
         if {![empty_string_p $secure_port] && ($secure_port != 443)}  {
             append secure_location ":$secure_port"
         }
Index: openacs-4/packages/ecommerce/tcl/ecommerce-utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-utilities-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/tcl/ecommerce-utilities-procs.tcl	22 Oct 2001 08:02:10 -0000	1.4
+++ openacs-4/packages/ecommerce/tcl/ecommerce-utilities-procs.tcl	23 Oct 2001 05:07:14 -0000	1.5
@@ -396,12 +396,12 @@
 } {
     if [catch {
 	db_1row country_name {
-	    select default_name from country_names where iso=:country_code
+	    select default_name from countries where iso=:country_code
 	}
     } errmsg] {
 	return "Country not found"
     }
-    return $name
+    return $default_name
 }
 
 ad_proc ec_pretty_mailing_address_from_args { line1 line2 city usps_abbrev zip_code country_code full_state_name attn phone phone_time } { get Pretty Mailing Address } {
Index: openacs-4/packages/ecommerce/tcl/ecommerce-utilities-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-utilities-procs.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/tcl/ecommerce-utilities-procs.xql	22 Oct 2001 08:02:10 -0000	1.2
+++ openacs-4/packages/ecommerce/tcl/ecommerce-utilities-procs.xql	23 Oct 2001 05:07:14 -0000	1.3
@@ -52,7 +52,7 @@
 
 <fullquery name="ec_country_name_from_country_code.country_name">
       <querytext> 
-      select default_name from country_names where iso=:country_code
+      select default_name from countries where iso=:country_code
       </querytext>
 </fullquery>
 
Index: openacs-4/packages/ecommerce/tcl/ecommerce-widgets-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-widgets-procs.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/ecommerce/tcl/ecommerce-widgets-procs.tcl	22 Oct 2001 08:02:10 -0000	1.9
+++ openacs-4/packages/ecommerce/tcl/ecommerce-widgets-procs.tcl	23 Oct 2001 05:07:14 -0000	1.10
@@ -172,13 +172,9 @@
     return $to_return
 }
 
-ad_proc ec_multiple_state_widget { {default_list ""} {select_name "usps_abbrev"} {multiple_size "5"} } "Returns a state multiple selection box of size n" {
+ad_proc ec_multiple_state_widget { {default_list ""} {select_name "usps_abbrev"} } "Returns a state multiple selection box" {
 
-    if { $multiple_size > 1 } {
-	set widget_value "<select multiple name=\"$select_name\" size=$multiple_size>\n"
-    } else {
-	set widget_value "<select name=\"$select_name\">\n"
-    }
+    set widget_value "<select multiple name=\"$select_name\" size=5>\n"
     set sql "select * from us_states order by state_name"
     db_foreach get_all_states $sql {
         
Index: openacs-4/packages/ecommerce/www/shipping-address.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/Attic/shipping-address.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/shipping-address.tcl	22 Oct 2001 07:38:06 -0000	1.2
+++ openacs-4/packages/ecommerce/www/shipping-address.tcl	23 Oct 2001 05:07:14 -0000	1.3
@@ -33,7 +33,7 @@
 
 set user_name_with_quotes_escaped [ad_quotehtml [db_string get_full_name "select first_names || ' ' || last_name as name from cc_users where user_id=:user_id"]]
 db_release_unused_handles
-set state_widget [ec_multiple_state_widget "" "usps_abbrev" 1]
+set state_widget [state_widget]
 
 ec_return_template
 
Index: openacs-4/packages/ecommerce/www/admin/orders/address-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/address-add.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/admin/orders/address-add.tcl	22 Oct 2001 07:43:06 -0000	1.2
+++ openacs-4/packages/ecommerce/www/admin/orders/address-add.tcl	23 Oct 2001 05:07:14 -0000	1.3
@@ -47,7 +47,7 @@
 </tr>
 <tr>
  <td>City</font></td>
- <td><input type=text name=city size=20> &nbsp;State [ec_multiple_state_widget "" "usps_abbrev" 1]</td>
+ <td><input type=text name=city size=20> &nbsp;State [state_widget]</td>
 </tr>
 <tr>
  <td>Zip</td>
Index: openacs-4/packages/ecommerce/www/admin/retailers/add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/retailers/add.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/admin/retailers/add.tcl	22 Oct 2001 07:43:06 -0000	1.2
+++ openacs-4/packages/ecommerce/www/admin/retailers/add.tcl	23 Oct 2001 05:07:14 -0000	1.3
@@ -72,7 +72,7 @@
 
 
 
-append page_html "State [ec_multiple_state_widget "" "usps_abbrev" 1]
+append page_html "State [state_widget] 
 Zip <input type=text name=zip_code size=5>
 </td>
 </tr>
Index: openacs-4/packages/ecommerce/www/admin/retailers/edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/retailers/edit.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/admin/retailers/edit.tcl	22 Oct 2001 07:43:06 -0000	1.2
+++ openacs-4/packages/ecommerce/www/admin/retailers/edit.tcl	23 Oct 2001 05:07:14 -0000	1.3
@@ -102,7 +102,7 @@
 <tr>
 <td valign=top>City</td>
 <td valign=top><input type=text name=city size=15 value=\"[ad_quotehtml $city]\">
-State [ec_multiple_state_widget $usps_abbrev "" "usps_abbrev" 1]
+State [state_widget]
 Zip <input type=text name=zip_code size=5 value=\"[ad_quotehtml $zip_code]\">
 </td>
 </tr>