Index: openacs-4/packages/acs-subsite/www/admin/parties/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/parties/new.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/parties/new.tcl	10 Jan 2007 21:22:07 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/parties/new.tcl	27 Oct 2014 16:39:52 -0000	1.7
@@ -14,7 +14,7 @@
     { party_id:naturalnum "" }
     { party.email ""}
     { return_url "" }
-    {add_to_group_id ""}
+    {add_to_group_id:naturalnum ""}
     {add_with_rel_type "membership_rel"}
     {group_rel_type_list ""}
 } -properties {
@@ -116,7 +116,7 @@
 	
 	lappend export_var_list group_rel_type_list
 	
-	set export_url_vars [ad_export_vars -exclude {add_to_group_id add_with_rel_type} $export_var_list]
+	set export_url_vars [export_vars -exclude {add_to_group_id add_with_rel_type} $export_var_list]
 	
 	ad_return_template new-list-required-segments
 	return
@@ -132,9 +132,9 @@
 set object_type_path_list [subsite::util::object_type_path_list $party_type party]
 
 set redirects_for_type [list \
-	group "groups/new?group_id=$party_id&group_type_exact_p=$party_type_exact_p&group_type=$party_type&[ad_export_vars -exclude {party_id party_type_exact_p party_type} $export_var_list]" \
+	group "groups/new?group_id=$party_id&group_type_exact_p=$party_type_exact_p&group_type=$party_type&[export_vars -exclude {party_id party_type_exact_p party_type} $export_var_list]" \
 	rel_segment "rel-segments/new?segment_id=$party_id&group_id=$add_to_group_id" \
-	user "users/new?user_id=$party_id&[ad_export_vars -exclude {party_id party_type_exact_p party_type} $export_var_list]"]
+	user "users/new?user_id=$party_id&[export_vars -exclude {party_id party_type_exact_p party_type} $export_var_list]"]
 
 foreach {type url} $redirects_for_type {
     if {[lsearch $object_type_path_list $type] != -1} {
@@ -143,12 +143,12 @@
 }
 
 
-if { $party_type_exact_p eq "f" && \
-	[subsite::util::sub_type_exists_p $party_type] } {
+if { $party_type_exact_p == "f" 
+     && [subsite::util::sub_type_exists_p $party_type] } {
 
     # Sub party-types exist... select one
     set party_type_exact_p "t"
-    set export_url_vars [ad_export_vars -exclude party_type $export_var_list ]
+    set export_url_vars [export_vars -exclude party_type $export_var_list ]
 
     party::types_valid_for_rel_type_multirow -datasource_name object_types -start_with $party_type -rel_type $add_with_rel_type
 
@@ -194,8 +194,7 @@
     # there may be more segments to put this new party in before the
     # user's original request is complete.   So build a return_url stack
     foreach group_rel_type $group_rel_type_list {
-	set next_group_id [lindex $group_rel_type 0]
-	set next_rel_type [lindex $group_rel_type 1]
+	lassign $group_rel_type next_group_id next_rel_type
 	lappend return_url_list \
 		"../relations/add?group_id=$next_group_id&rel_type=[ad_urlencode $next_rel_type]&party_id=$party_id&allow_out_of_scope_p=t"
     }