Index: openacs-4/packages/acs-subsite/acs-subsite.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/acs-subsite.info,v
diff -u -r1.78 -r1.79
--- openacs-4/packages/acs-subsite/acs-subsite.info 10 Jun 2005 17:52:08 -0000 1.78
+++ openacs-4/packages/acs-subsite/acs-subsite.info 15 Jun 2005 18:02:26 -0000 1.79
@@ -7,7 +7,8 @@
t
f
-
+
+
OpenACS
Subsite
2005-06-10
@@ -16,13 +17,13 @@
GPL
3
-
-
-
-
-
-
+
+
+
+
+
+
@@ -33,6 +34,7 @@
+
@@ -52,6 +54,7 @@
3 - Show user email as an image (require ImageMagick). If ImageMagick not present then the @ symbol is replaced with an image.
2 - Hide email, show a link that allows users to send a message.
1 - Shows nothing." section_name="user-info"/>
+
Index: openacs-4/packages/acs-subsite/lib/user-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/user-new.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-subsite/lib/user-new.tcl 14 Jun 2005 15:40:27 -0000 1.12
+++ openacs-4/packages/acs-subsite/lib/user-new.tcl 15 Jun 2005 18:02:26 -0000 1.13
@@ -41,10 +41,14 @@
# Redirect to the registration assessment if there is one, if not, continue with the regular
# registration form.
-set url [callback -catch -impl asm_url user::registration]
+set implName [parameter::get -parameter "RegImplName" -package_id [subsite::main_site_id]]
+
+set url [callback -catch -impl "$implName" user::registration]
+
if { ![empty_string_p $url] } {
ad_returnredirect "$url"
+
}
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 -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/tcl/apm-callback-procs.tcl 10 Jun 2005 17:41:11 -0000 1.6
+++ openacs-4/packages/acs-subsite/tcl/apm-callback-procs.tcl 15 Jun 2005 18:02:26 -0000 1.7
@@ -26,7 +26,7 @@
-from_version_name $from_version_name \
-to_version_name $to_version_name \
-spec {
- 5.2.0d2 5.2.0d3 {
+ 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"]
@@ -36,5 +36,13 @@
}
+ 5.2.0a1 5.2.0a2 {
+ set value [parameter::get -parameter "AsmForRegisterId" -package_id [subsite::main_site_id]]
+ if {[empty_string_p $value]} {
+ 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"
+
+ }
}
}