Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v diff -u -N -r1.210 -r1.211 --- openacs-4/packages/dotlrn/tcl/community-procs.tcl 18 Jun 2015 20:04:43 -0000 1.210 +++ openacs-4/packages/dotlrn/tcl/community-procs.tcl 28 Jun 2015 11:58:50 -0000 1.211 @@ -1243,14 +1243,19 @@ set url [get_community_url $sc_id] set subgroup_name [get_community_name $sc_id] - if {[has_subcommunity_p -community_id $sc_id] \ - && [member_p $sc_id $user_id]} { + if {[has_subcommunity_p -community_id $sc_id] + && [member_p $sc_id $user_id]} { # Shows the subcomms of this subcomm ONLY IF I'm a # member of the current comm - append chunk "$pretext $subgroup_name\n" + append chunk [subst {$pretext + $subgroup_name + }] if {$show_drop_link_p} { - append chunk "([_ dotlrn.Drop])\n" + set href [export_vars -base ${url}${drop_target} {{referer {[ad_conn url]}}}] + append chunk [subst { + ([_ dotlrn.Drop]) + }] } append chunk "\n" @@ -1274,25 +1279,36 @@ # illicit registrations if the group is closed. set parent_url [get_community_url $community_id] - append chunk "$pretext $subgroup_name\n" + append chunk [subst {$pretext + $subgroup_name + }] if {![member_p $sc_id $user_id] && [not_closed_p -community_id $sc_id]} { append chunk "" if {[member_pending_p -community_id $sc_id -user_id $user_id]} { append chunk "[_ dotlrn.Pending_Approval]" } elseif {[needs_approval_p -community_id $sc_id]} { - append chunk "[_ dotlrn.Request_Membership]\n" + set href [export_vars -base ${parent_url}${join_target} {{community_id $sc_id} {referer {[ad_conn url]}}}] + append chunk [subst { + [_ dotlrn.Request_Membership] + }] } else { - append chunk "([_ dotlrn.Join])\n" + set href [export_vars -base ${parent_url}${join_target} {{community_id $sc_id} {referer {[ad_conn url]}}}] + append chunk [subst { + ([_ dotlrn.Join]) + } } append chunk "\n" } elseif {[member_p $sc_id $user_id]} { # User is a member. if {$show_drop_link_p} { - append chunk "([_ dotlrn.Drop])\n" + set href [export_vars -base ${url}${drop_target} {{referer {[ad_conn url]}}}] + append chunk [subst { + ([_ dotlrn.Drop]) + }] } } } @@ -1410,7 +1426,7 @@ if {[subcommunity_p -community_id $community_id]} { set parent_name [get_parent_name -community_id $community_id] set parent_url [get_community_url [get_parent_id -community_id $community_id]] - return [subst {$parent_name: [get_community_name $community_id]}] + return [subst {$parent_name: [get_community_name $community_id]}] } else { return [get_community_name $community_id] } Index: openacs-4/packages/dotlrn/www/dotlrn-master-kelp.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master-kelp.tcl,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/dotlrn/www/dotlrn-master-kelp.tcl 1 Nov 2013 21:54:13 -0000 1.8 +++ openacs-4/packages/dotlrn/www/dotlrn-master-kelp.tcl 28 Jun 2015 11:58:50 -0000 1.9 @@ -291,12 +291,12 @@ } else { set link_control_panel 0 } - set extra_spaces "" + set extra_spaces [subst {] set navbar [dotlrn::portal_navbar \ -user_id $user_id \ -link_control_panel $link_control_panel \ -control_panel_text $control_panel_text \ - -pre_html "$extra_spaces" \ + -pre_html $extra_spaces \ -post_html $extra_spaces \ -link_all $link_all ] @@ -324,11 +324,11 @@ set ds_link {} } -set change_locale_url "/acs-lang/?[export_vars { { package_id "[ad_conn package_id]" } }]" +set change_locale_url [export_vars -base /acs-lang { { package_id "[ad_conn package_id]" } }] # Hack for title and context bar outside of dotlrn -set in_dotlrn_p [expr [string match "[dotlrn::get_url]/*" [ad_conn url]]] +set in_dotlrn_p [string match "[dotlrn::get_url]/*" [ad_conn url]] if { [info exists context] } { set context_bar [eval ad_context_bar -- $context] Index: openacs-4/packages/dotlrn/www/dotlrn-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master.tcl,v diff -u -N -r1.43 -r1.44 --- openacs-4/packages/dotlrn/www/dotlrn-master.tcl 1 Nov 2013 21:54:13 -0000 1.43 +++ openacs-4/packages/dotlrn/www/dotlrn-master.tcl 28 Jun 2015 11:58:50 -0000 1.44 @@ -336,11 +336,11 @@ set ds_link {} } -set change_locale_url "/acs-lang/?[export_vars { { package_id "[ad_conn package_id]" } }]" +set change_locale_url [export_vars -base /acs-lang { { package_id "[ad_conn package_id]" } }] # Hack for title and context bar outside of dotlrn -set in_dotlrn_p [expr {[string match "[dotlrn::get_url]/*" [ad_conn url]]}] +set in_dotlrn_p [string match "[dotlrn::get_url]/*" [ad_conn url]] if { [info exists context] } { set context_bar [eval ad_context_bar -- $context] Index: openacs-4/packages/dotlrn/www/manage-memberships.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/manage-memberships.tcl,v diff -u -N -r1.21 -r1.22 --- openacs-4/packages/dotlrn/www/manage-memberships.tcl 1 Nov 2013 21:08:31 -0000 1.21 +++ openacs-4/packages/dotlrn/www/manage-memberships.tcl 28 Jun 2015 11:58:50 -0000 1.22 @@ -351,7 +351,9 @@ where dotlrn_member_rels_full.user_id = :user_id) }] -set referer [ns_urlencode "[ns_conn url]?[export_vars {member_department_key member_term_id non_member_department_key non_member_term_id}]"] +set referer [ns_urlencode [export_vars -base [ns_conn url] { + member_department_key member_term_id non_member_department_key non_member_term_id +}]] # en_US messages make use of these configurable pretty names set clubs_pretty_plural [parameter::get -localize -parameter clubs_pretty_plural] Index: openacs-4/packages/dotlrn/www/members.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.tcl,v diff -u -N -r1.32 -r1.33 --- openacs-4/packages/dotlrn/www/members.tcl 1 Nov 2013 21:08:32 -0000 1.32 +++ openacs-4/packages/dotlrn/www/members.tcl 28 Jun 2015 11:58:50 -0000 1.33 @@ -21,7 +21,7 @@ @version $Id$ } { - {orderby:optional "last_name,asc"} + {orderby:token,optional "last_name,asc"} {csv:optional} {reset:optional} {reltype:optional} Index: openacs-4/packages/dotlrn/www/user-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add-2.tcl,v diff -u -N -r1.15 -r1.16 --- openacs-4/packages/dotlrn/www/user-add-2.tcl 1 Nov 2013 21:08:32 -0000 1.15 +++ openacs-4/packages/dotlrn/www/user-add-2.tcl 28 Jun 2015 11:58:50 -0000 1.16 @@ -68,7 +68,7 @@ } } -set redirect "user-add-2?[export_vars {user_id password referer type can_browse_p read_private_data_p dotlrn_interactive_p add_membership_p}]" +set redirect [export_vars -base user-add-2 {user_id password referer type can_browse_p read_private_data_p dotlrn_interactive_p add_membership_p}] if { $add_membership_p == "t" && $referer eq "/acs-admin/users" } { set redirect "one-community-admin" } else { @@ -78,10 +78,10 @@ # Don't redirect back to the user-new-2 page if we've already been there if {${dotlrn_interactive_p} && !$dotlrn_user_p} { # set redirect "../${redirect}" - ad_returnredirect "admin/user-new-2?[export_vars {user_id {referer $redirect}}]" + ad_returnredirect [export_vars -base admin/user-new-2 {user_id {referer $redirect}}] ad_script_abort } elseif {$add_membership_p == "t"} { - ad_returnredirect "member-add-2?[export_vars {user_id {referer $redirect}}]" + ad_returnredirect [export_vars -base member-add-2 {user_id {referer $redirect}}] ad_script_abort } Index: openacs-4/packages/dotlrn/www/admin/class-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-delete.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/dotlrn/www/admin/class-delete.tcl 8 Aug 2006 21:26:28 -0000 1.2 +++ openacs-4/packages/dotlrn/www/admin/class-delete.tcl 28 Jun 2015 11:58:50 -0000 1.3 @@ -36,10 +36,10 @@ #here's where we actually do the delete. dotlrn_class::delete -class_key $class_key } -after_submit { - ad_returnredirect classes?[export_vars {department_key}] + ad_returnredirect [export_vars -base classes {department_key}] ad_script_abort -} -cancel_url classes?[export_vars {department_key}] +} -cancel_url [export_vars -base classes {department_key}] set title "[_ dotlrn.Delete_Empty_Class]" -set context_bar [list [list classes?[export_vars {department_key}] [parameter::get -localize -parameter classes_pretty_plural]] Delete] +set context_bar [list [[export_vars -base classes {department_key}] [parameter::get -localize -parameter classes_pretty_plural]] Delete] Index: openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl,v diff -u -N -r1.33 -r1.34 --- openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl 1 Nov 2013 21:08:33 -0000 1.33 +++ openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl 28 Jun 2015 11:58:50 -0000 1.34 @@ -114,12 +114,12 @@ db_dml update_community_info {} if {$referer eq ""} { - set referer "[dotlrn::get_admin_url]/class?[export_vars -url {class_key}]" + set referer [export_vars -base [dotlrn::get_admin_url]/class {class_key}] } if {${add_instructor}} { set community_id $class_instance_id - ad_returnredirect "add-instructor?[export_vars -url {community_id referer}]" + ad_returnredirect [export_vars -base add-instructor {community_id referer}] ad_script_abort } Index: openacs-4/packages/dotlrn/www/admin/community-types.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/community-types.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/dotlrn/www/admin/community-types.tcl 15 May 2007 20:14:25 -0000 1.2 +++ openacs-4/packages/dotlrn/www/admin/community-types.tcl 28 Jun 2015 11:58:50 -0000 1.3 @@ -39,6 +39,6 @@ db_multirow -extend { edit_url } community_types select_community_types { *SQL* } { - set edit_url "community-type?[export_vars -url {community_type}]" + set edit_url [export_vars -base community-type {community_type}] } Index: openacs-4/packages/dotlrn/www/admin/term-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term-edit.tcl,v diff -u -N -r1.13 -r1.14 --- openacs-4/packages/dotlrn/www/admin/term-edit.tcl 27 Oct 2014 16:41:17 -0000 1.13 +++ openacs-4/packages/dotlrn/www/admin/term-edit.tcl 28 Jun 2015 11:58:50 -0000 1.14 @@ -38,7 +38,7 @@ ad_script_abort } -set referer "term?[export_vars {term_id}]" +set referer [export_vars -base term {term_id}] set context_bar [list [list terms [_ dotlrn.Terms]] [list $referer "$term_name $term_year"] [_ dotlrn.Edit]] ad_form -name edit_term -export term_pretty_name -select_query_name select_term_info -form { Index: openacs-4/packages/dotlrn/www/admin/term.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term.tcl,v diff -u -N -r1.18 -r1.19 --- openacs-4/packages/dotlrn/www/admin/term.tcl 27 Oct 2014 16:41:17 -0000 1.18 +++ openacs-4/packages/dotlrn/www/admin/term.tcl 28 Jun 2015 11:58:50 -0000 1.19 @@ -91,7 +91,7 @@ form get_values term_form term_id department_key if {$term_id != -1} { - ad_returnredirect "term?[export_vars {term_id department_key}]" + ad_returnredirect [export_vars -base term {term_id department_key}] } } Index: openacs-4/packages/dotlrn/www/admin/users-search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-search.tcl,v diff -u -N -r1.29 -r1.30 --- openacs-4/packages/dotlrn/www/admin/users-search.tcl 1 Nov 2013 21:08:35 -0000 1.29 +++ openacs-4/packages/dotlrn/www/admin/users-search.tcl 28 Jun 2015 11:58:50 -0000 1.30 @@ -67,16 +67,16 @@ switch -exact $search_action { "spam" { - ad_returnredirect "users-spam?[export_vars {{users $selected_users}}]" + ad_returnredirect [export_vars -base users-spam {{users $selected_users}}] } "add_to_community" { - ad_returnredirect "users-add-to-community?[export_vars {{users $selected_users}}]" + ad_returnredirect [export_vars -base users-add-to-community {{users $selected_users}}] } "deactivate" { - ad_returnredirect "users-deactivate?[export_vars {{users $selected_users}}]" + ad_returnredirect [export_vars -base users-deactivate {{users $selected_users}}] } "delete" { - ad_returnredirect "users-delete?[export_vars {{users $selected_users}}]" + ad_returnredirect [export_vars -base users-delete {{users $selected_users}}] } } } @@ -258,7 +258,8 @@ set selected_users_options [list] set selected_users_values [list] db_foreach select_users $sql { - lappend selected_users_options [list "$last_name, $first_names ($email)" $user_id] + set href [export_vars -base user user_id] + lappend selected_users_options [list [subst {$last_name, $first_names ($email)}] $user_id] lappend selected_users_values $user_id }