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.7 -r1.8
--- openacs-4/packages/ecommerce/tcl/ecommerce-ssl-procs.tcl	8 Mar 2004 19:46:11 -0000	1.7
+++ openacs-4/packages/ecommerce/tcl/ecommerce-ssl-procs.tcl	13 Jan 2005 13:57:56 -0000	1.8
@@ -84,15 +84,26 @@
             
         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] {
+	if { [empty_string_p $secure_port] } {
 	    set secure_port [ns_config -int "ns/server/[ns_info server]/module/$sdriver" ServerPort 443]
 	}
+        ### nsopenssl 3 has variable locations for the secure port
+	# This next check might best be handled by creating another
+	# parameter value for users/inboundssl (custom driver name)
+        if { [empty_string_p $secure_port] || [string match $secure_port 443] } {
+	    set secure_port [ns_config -int "ns/server/[ns_info server]/module/$sdriver/ssldriver/users" port 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://"] {
+        if { [string match $secure_location "https://"] } {
 	    set secure_location "https://[ns_config ns/server/[ns_info server]/module/$sdriver ServerHostname]"
 	}
+        ### nsopenssl 3 uses Hostname and custom driver name
+        # made need to make users/inboundssl (custom driver name) another parameter value
+        if { [string match $secure_location "https://"] } {
+	    set secure_location "https://[ns_config ns/server/[ns_info server]/module/$sdriver/ssldriver/users hostname]"
+	}
 
         if {![empty_string_p $secure_port] && ($secure_port != 443)}  {
             append secure_location ":$secure_port"
@@ -182,6 +193,7 @@
 		# based out of the ecommerce instance site-node
 		# so that links from both /ecommerce-instance/ and 
 		# and /ecommerce-instance/admin work
+
 		set register_url "[ec_secure_location][ad_conn package_url]register/index?return_url=[ns_urlencode $secure_url]&http_id=$user_id&user_session_id=$user_session_id"
 		ad_returnredirect $register_url
 		template::adp_abort
@@ -329,6 +341,7 @@
            regexp {^(.*)/} $current_url match new_url_dir
            append new_url "$new_url_dir/$new_page"
         }
+        set new_url "[ad_url]$new_url"
         return $new_url
     }
 }