Index: openacs-4/packages/acs-subsite/www/admin/attributes/add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/add-2.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/attributes/add-2.tcl 13 Jun 2015 23:59:10 -0000 1.5
+++ openacs-4/packages/acs-subsite/www/admin/attributes/add-2.tcl 27 Jun 2015 16:03:11 -0000 1.6
@@ -57,9 +57,9 @@
# If we're an enumeration, redirect to start adding possible values.
if {$datatype eq "enumeration"} {
- ad_returnredirect enum-add?[export_vars {attribute_id return_url}]
+ ad_returnredirect [export_vars -base enum-add {attribute_id return_url}]
} elseif { $return_url eq "" } {
- ad_returnredirect add?[export_vars {object_type}]
+ ad_returnredirect [export_vars -base add {object_type}]
} else {
ad_returnredirect $return_url
}
Index: openacs-4/packages/acs-subsite/www/admin/attributes/delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/delete-2.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/attributes/delete-2.tcl 27 Oct 2014 16:39:48 -0000 1.3
+++ openacs-4/packages/acs-subsite/www/admin/attributes/delete-2.tcl 27 Jun 2015 16:03:12 -0000 1.4
@@ -29,7 +29,7 @@
}
}
} elseif { $return_url eq "" } {
- set return_url one?[export_vars attribute_id]
+ set return_url [export_vars -base one attribute_id]
}
ad_returnredirect $return_url
Index: openacs-4/packages/acs-subsite/www/admin/attributes/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/delete.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/attributes/delete.tcl 27 Oct 2014 16:39:48 -0000 1.3
+++ openacs-4/packages/acs-subsite/www/admin/attributes/delete.tcl 27 Jun 2015 16:03:12 -0000 1.4
@@ -19,7 +19,7 @@
export_form_vars:onevalue
}
-set context [list [list one?[export_vars attribute_id] "One attribute"] "Delete attribute"]
+set context [list [list [export_vars -base one attribute_id] "One attribute"] "Delete attribute"]
db_1row select_object_type {
select a.object_type, a.pretty_name as attribute_pretty_name
Index: openacs-4/packages/acs-subsite/www/admin/attributes/enum-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/enum-add-2.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/attributes/enum-add-2.tcl 27 Oct 2014 16:39:48 -0000 1.3
+++ openacs-4/packages/acs-subsite/www/admin/attributes/enum-add-2.tcl 27 Jun 2015 16:03:12 -0000 1.4
@@ -61,9 +61,9 @@
if {$operation eq "Add more values"} {
# redirect to add more values
- set return_url enum-add?[export_vars {attribute_id return_url}]
+ set return_url [export_vars -base enum-add {attribute_id return_url}]
} elseif { $return_url eq "" } {
- set return_url one?[export_vars attribute_id]
+ set return_url [export_vars -base one attribute_id]
}
ad_returnredirect $return_url
Index: openacs-4/packages/acs-subsite/www/admin/attributes/enum-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/enum-add.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/attributes/enum-add.tcl 27 Oct 2014 16:39:49 -0000 1.4
+++ openacs-4/packages/acs-subsite/www/admin/attributes/enum-add.tcl 27 Jun 2015 16:03:12 -0000 1.5
@@ -49,7 +49,7 @@
where a.attribute_id = :attribute_id
}
-set context [list [list one?[export_vars -url {attribute_id}] "One attribute"] "Add values"]
+set context [list [list [export_vars -base one {attribute_id}] "One attribute"] "Add values"]
set export_vars [export_vars -form {attribute_id return_url}]
Index: openacs-4/packages/acs-subsite/www/admin/attributes/value-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/value-delete-2.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/attributes/value-delete-2.tcl 27 Oct 2014 16:39:49 -0000 1.3
+++ openacs-4/packages/acs-subsite/www/admin/attributes/value-delete-2.tcl 27 Jun 2015 16:03:12 -0000 1.4
@@ -12,7 +12,7 @@
attribute_id:naturalnum,notnull
enum_value:trim,notnull
{ operation:trim "No, I want to cancel my request" }
- { return_url "one?[export_vars attribute_id]" }
+ { return_url [export_vars -base one attribute_id] }
}
if {$operation eq "Yes, I really want to delete this attribute value"} {
Index: openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.tcl 27 Oct 2014 16:39:49 -0000 1.4
+++ openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.tcl 27 Jun 2015 16:03:12 -0000 1.5
@@ -11,7 +11,7 @@
} {
attribute_id:naturalnum,notnull
enum_value:trim,notnull
- { return_url "one?[export_vars attribute_id]" }
+ { return_url [export_vars -base one attribute_id] }
} -properties {
context:onevalue
export_vars:onevalue
@@ -29,7 +29,7 @@
ad_script_abort
}
-set context [list [list one?[export_vars attribute_id] "One attribute"] "Delete value"]
+set context [list [list [export_vars -base one attribute_id] "One attribute"] "Delete value"]
set export_vars [export_vars -form {attribute_id enum_value return_url}]
ad_return_template
Index: openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy-2.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy-2.tcl 27 Oct 2014 16:39:49 -0000 1.3
+++ openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy-2.tcl 27 Jun 2015 16:03:12 -0000 1.4
@@ -45,7 +45,7 @@
}
if {$return_url eq ""} {
- set return_url one?[export_vars group_type]
+ set return_url [export_vars -base one group_type]
}
-ad_returnredirect $return_url
\ No newline at end of file
+ad_returnredirect $return_url
Index: openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.tcl 27 Oct 2014 16:39:49 -0000 1.5
+++ openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.tcl 27 Jun 2015 16:03:12 -0000 1.6
@@ -23,7 +23,7 @@
set context [list \
[list "[ad_conn package_url]admin/group-types/" "Group types"] \
- [list "one?[export_vars group_type]" "One type"] \
+ [list [export_vars -base one group_type] "One type"] \
"Edit default join policy"]
if { ![db_0or1row select_pretty_name {
Index: openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.tcl 27 Oct 2014 16:39:49 -0000 1.6
+++ openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.tcl 27 Jun 2015 16:03:12 -0000 1.7
@@ -24,7 +24,7 @@
if { $operation ne "Yes, I really want to delete this group type" } {
if { $return_url eq "" } {
- ad_returnredirect "one?[export_vars {group_type}]"
+ ad_returnredirect [export_vars -base one {group_type}]
} else {
ad_returnredirect $return_url
}
Index: openacs-4/packages/acs-subsite/www/admin/group-types/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/delete.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/group-types/delete.tcl 27 Oct 2014 16:39:49 -0000 1.4
+++ openacs-4/packages/acs-subsite/www/admin/group-types/delete.tcl 27 Jun 2015 16:03:12 -0000 1.5
@@ -30,7 +30,7 @@
set context [list \
[list "[ad_conn package_url]admin/group-types/" "Group types"] \
- [list one?[export_vars -url {group_type}] "One group type"] \
+ [list [export_vars -base one {group_type}] "One group type"] \
"Delete group type"]
if { ![db_0or1row select_pretty_name {
Index: openacs-4/packages/acs-subsite/www/admin/group-types/groups-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/groups-display.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/group-types/groups-display.tcl 27 Oct 2014 16:39:50 -0000 1.4
+++ openacs-4/packages/acs-subsite/www/admin/group-types/groups-display.tcl 27 Jun 2015 16:03:12 -0000 1.5
@@ -18,7 +18,7 @@
}
set user_id [ad_conn user_id]
-set context [list [list "[ad_conn package_url]admin/group-types/" "Group types"] [list one?[export_vars group_type] "One type"] "Groups"]
+set context [list [list "[ad_conn package_url]admin/group-types/" "Group types"] [list [export_vars -base one group_type] "One type"] "Groups"]
set group_type_enc [ad_urlencode $group_type]
if { ![db_0or1row select_type_info {
Index: openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add-2.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add-2.tcl 27 Oct 2014 16:39:50 -0000 1.4
+++ openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add-2.tcl 27 Jun 2015 16:03:12 -0000 1.5
@@ -50,7 +50,7 @@
db_release_unused_handles
if { $return_url eq "" } {
- set return_url "one?[export_vars {group_type}]"
+ set return_url [export_vars -base one {group_type}]
}
ad_returnredirect $return_url
Index: openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.tcl 27 Oct 2014 16:39:50 -0000 1.5
+++ openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.tcl 27 Jun 2015 16:03:12 -0000 1.6
@@ -21,7 +21,7 @@
set return_url_enc [ad_urlencode "[ad_conn url]?[ad_conn query]"]
set doc(title) [_ acs-subsite.Add_a_permissible_relationship_type]
-set context [list [list "[ad_conn package_url]admin/group-types/" [_ acs-subsite.Group_Types]] [list one?[export_vars {group_type}] $group_type] $doc(title)]
+set context [list [list "[ad_conn package_url]admin/group-types/" [_ acs-subsite.Group_Types]] [list [export_vars -base one {group_type}] $group_type] $doc(title)]
# Select out all the relationship types that are not currently
Index: openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove-2.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove-2.tcl 27 Oct 2014 16:39:50 -0000 1.3
+++ openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove-2.tcl 27 Jun 2015 16:03:12 -0000 1.4
@@ -21,7 +21,7 @@
from group_type_rels g
where g.group_rel_type_id = :group_rel_type_id
}
- set return_url one?[export_vars {group_type}]
+ set return_url [export_vars -base one {group_type}]
}
if {$operation eq "Yes, I really want to remove this relationship type"} {
Index: openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.tcl 27 Oct 2014 16:39:50 -0000 1.4
+++ openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.tcl 27 Jun 2015 16:03:12 -0000 1.5
@@ -31,6 +31,6 @@
}
set export_vars [export_vars -form {group_rel_type_id return_url}]
-set context [list [list "[ad_conn package_url]admin/group-types/" "Group types"] [list one?[export_vars {group_type}] "One type"] "Remove relation type"]
+set context [list [list "[ad_conn package_url]admin/group-types/" "Group types"] [list [export_vars -base one {group_type}] "One type"] "Remove relation type"]
ad_return_template
Index: openacs-4/packages/acs-subsite/www/admin/groups/constraints-create-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/constraints-create-2.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/groups/constraints-create-2.tcl 27 Oct 2014 16:39:50 -0000 1.3
+++ openacs-4/packages/acs-subsite/www/admin/groups/constraints-create-2.tcl 27 Jun 2015 16:03:12 -0000 1.4
@@ -22,12 +22,12 @@
if { $return_url eq "" } {
# Setup return_url to send up back to the group admin page
# when we're all done
- set return_url "[ad_conn package_url]/admin/groups/one?[export_vars group_id]"
+ set return_url [export_vars -base [ad_conn package_url]/admin/groups/one group_id]
}
- ad_returnredirect "../rel-segments/new?[export_vars {group_id rel_type return_url}]"
+ ad_returnredirect [export_vars -base ../rel-segments/new {group_id rel_type return_url}]
} else {
if { $return_url eq "" } {
- set return_url "one?[export_vars group_id]"
+ set return_url [export_vars -base one group_id]
}
ad_returnredirect $return_url
}
Index: openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.tcl 27 Oct 2014 16:39:50 -0000 1.4
+++ openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.tcl 27 Jun 2015 16:03:12 -0000 1.5
@@ -20,7 +20,7 @@
group_name:onevalue
}
-set context [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list one?[export_vars group_id] "One Group"] "Add constraint"]
+set context [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list [export_vars -base one group_id] "One Group"] "Add constraint"]
set export_vars [export_vars -form {group_id rel_type return_url}]
db_1row select_props {
Index: openacs-4/packages/acs-subsite/www/admin/groups/delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/delete-2.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/groups/delete-2.tcl 27 Oct 2014 16:39:50 -0000 1.3
+++ openacs-4/packages/acs-subsite/www/admin/groups/delete-2.tcl 27 Jun 2015 16:03:12 -0000 1.4
@@ -25,11 +25,11 @@
set group_type [group::delete $group_id]
}
if { $return_url eq "" && $group_type ne "" } {
- set return_url "../group-types/one?[export_vars group_type]"
+ set return_url [export_vars -base ../group-types/one group_type]
}
} else {
if { $return_url eq "" } {
- set return_url "one?[export_vars group_id]"
+ set return_url [export_vars -base one group_id]
}
}
Index: openacs-4/packages/acs-subsite/www/admin/groups/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/delete.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/groups/delete.tcl 15 Jun 2015 11:14:17 -0000 1.4
+++ openacs-4/packages/acs-subsite/www/admin/groups/delete.tcl 27 Jun 2015 16:03:12 -0000 1.5
@@ -23,7 +23,7 @@
}
}
-set context [list [list "" "Groups"] [list one?[export_vars {group_id}] "One Group"] "Nuke group"]
+set context [list [list "" "Groups"] [list [export_vars -base one {group_id}] "One Group"] "Nuke group"]
set group_name [db_string object_name {select acs_object.name(:group_id) from dual}]
set export_form_vars [export_vars -form {group_id}]
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl 15 Jun 2015 11:14:18 -0000 1.4
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl 27 Jun 2015 16:03:12 -0000 1.5
@@ -72,7 +72,7 @@
# Build the member state dimensional slider
-set base_url [ad_conn package_url]admin/groups/elements-display?[export_vars {group_id rel_type}]
+set base_url [export_vars -base [ad_conn package_url]admin/groups/elements-display {group_id rel_type}]
template::multirow create possible_member_states \
val label url
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl 27 Oct 2014 16:39:51 -0000 1.5
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl 27 Jun 2015 16:03:12 -0000 1.6
@@ -54,6 +54,6 @@
set role_pretty_name [lang::util::localize $role_pretty_name]
set role_pretty_plural [lang::util::localize $role_pretty_plural]
-set context [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list one?[export_vars group_id] "One Group"] "All $role_pretty_plural"]
+set context [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list [export_vars -base one group_id] "One Group"] "All $role_pretty_plural"]
ad_return_template
Index: openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add-2.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add-2.tcl 27 Oct 2014 16:39:51 -0000 1.5
+++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add-2.tcl 27 Jun 2015 16:03:12 -0000 1.6
@@ -67,10 +67,10 @@
from dual
}] } {
if { $return_url eq "" } {
- set return_url one?[export_vars group_id]
+ set return_url [export_vars -base one group_id]
}
ad_returnredirect $return_url
} else {
- ad_returnredirect constraints-create?[export_vars {group_id rel_type return_url}]
+ ad_returnredirect [export_vars -base constraints-create {group_id rel_type return_url}]
}
Index: openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.tcl 27 Oct 2014 16:39:51 -0000 1.4
+++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.tcl 27 Jun 2015 16:03:12 -0000 1.5
@@ -18,7 +18,7 @@
primary_rels:multirow
}
-set context [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list "one?[export_vars group_id]" "One Group"] "Add relation type"]
+set context [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list [export_vars -base one group_id] "One Group"] "Add relation type"]
set return_url_enc [ad_urlencode "[ad_conn url]?[ad_conn query]"]
# Select out all the relationship types that are not currently
Index: openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove-2.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove-2.tcl 27 Oct 2014 16:39:51 -0000 1.3
+++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove-2.tcl 27 Jun 2015 16:03:12 -0000 1.4
@@ -65,7 +65,7 @@
if { $return_url eq "" } {
- set return_url one?[export_vars {group_id}]
+ set return_url [export_vars -base one {group_id}]
}
ad_returnredirect $return_url
Index: openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.tcl 27 Oct 2014 16:39:51 -0000 1.4
+++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.tcl 27 Jun 2015 16:03:13 -0000 1.5
@@ -33,6 +33,6 @@
permission::require_permission -object_id $group_id -privilege admin
set export_vars [export_vars -form {group_rel_id return_url}]
-set context [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list one?[export_vars {group_id}] "One group"] "Remove relation type"]
+set context [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list [export_vars -base one {group_id}] "One group"] "Remove relation type"]
ad_return_template
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints-redirect.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints-redirect.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints-redirect.tcl 27 Oct 2014 16:39:52 -0000 1.3
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints-redirect.tcl 27 Jun 2015 16:03:13 -0000 1.4
@@ -20,7 +20,7 @@
ad_returnredirect "constraints/new?rel_segment=$segment_id&[export_vars return_url]"
} else {
if { $return_url eq "" } {
- set return_url "one?[export_vars segment_id]"
+ set return_url [export_vars -base one segment_id]
}
ad_returnredirect $return_url
}
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/delete-2.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/delete-2.tcl 27 Oct 2014 16:39:52 -0000 1.3
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/delete-2.tcl 27 Jun 2015 16:03:13 -0000 1.4
@@ -27,7 +27,7 @@
select s.group_id from rel_segments s where s.segment_id = :segment_id
} -default ""]
if { $group_id ne "" } {
- set return_url "../groups/one?[export_vars group_id]"
+ set return_url [export_vars -base ../groups/one group_id]
}
}
@@ -38,7 +38,7 @@
}
if { $return_url eq "" } {
- set return_url "one?[export_vars {segment_id}]"
+ set return_url [export_vars -base one {segment_id}]
}
ad_returnredirect $return_url
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.tcl 27 Oct 2014 16:39:52 -0000 1.4
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.tcl 27 Jun 2015 16:03:13 -0000 1.5
@@ -31,7 +31,7 @@
set export_vars [export_vars -form {segment_id}]
set context [list \
[list "[ad_conn package_url]admin/rel-segments/" "Relational segments"] \
- [list one?[export_vars segment_id] "One segment"] \
+ [list [export_vars -base one segment_id] "One segment"] \
"Remove segment"]
ad_return_template
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.tcl 27 Oct 2014 16:39:52 -0000 1.6
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.tcl 27 Jun 2015 16:03:13 -0000 1.7
@@ -36,7 +36,7 @@
# to be localized before they are displayed
set role_pretty_plural [lang::util::localize $role_pretty_plural]
-set context [list [list "[ad_conn package_url]admin/rel-segments/" "Relational segments"] [list one?[export_vars {segment_id}] "One segment"] "Elements"]
+set context [list [list "[ad_conn package_url]admin/rel-segments/" "Relational segments"] [list [export_vars -base one {segment_id}] "One segment"] "Elements"]
# Expects segment_id, segment_name, group_id, role to be passed in
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl 15 Jun 2015 11:14:18 -0000 1.6
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl 27 Jun 2015 16:03:13 -0000 1.7
@@ -66,7 +66,7 @@
}
-set context [list [list "[ad_conn package_url]admin/rel-segments/" "Relational segments"] [list one?[export_vars segment_id] "One segment"] "Create constraints"]
+set context [list [list "[ad_conn package_url]admin/rel-segments/" "Relational segments"] [list [export_vars -base one segment_id] "One segment"] "Create constraints"]
set export_vars [export_vars -form {segment_id return_url}]
ad_return_template
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/new.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/new.tcl 15 Jun 2015 11:14:18 -0000 1.5
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new.tcl 27 Jun 2015 16:03:13 -0000 1.6
@@ -31,7 +31,7 @@
# If the user has specified a rel_type, redirect to new-2
if { $rel_type ne "" } {
- ad_returnredirect new-2?[export_vars {group_id rel_type return_url}]
+ ad_returnredirect [export_vars -base new-2 {group_id rel_type return_url}]
ad_script_abort
}
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete-2.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete-2.tcl 27 Oct 2014 16:39:53 -0000 1.5
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete-2.tcl 27 Jun 2015 16:03:13 -0000 1.6
@@ -25,7 +25,7 @@
if { [db_0or1row select_segment_id {
select c.rel_segment as segment_id from rel_constraints c where c.constraint_id = :constraint_id
}] } {
- set return_url "../one?[export_vars {segment_id}]"
+ set return_url [export_vars -base ../one {segment_id}]
}
}
@@ -51,7 +51,7 @@
} elseif { $return_url eq "" } {
# if we're not deleting, redirect to the constraint page
- set return_url one?[export_vars constraint_id]
+ set return_url [export_vars -base one constraint_id]
}
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.tcl 27 Oct 2014 16:39:53 -0000 1.4
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.tcl 27 Jun 2015 16:03:13 -0000 1.5
@@ -18,7 +18,7 @@
export_vars:onevalue
}
-set context [list [list one?[export_vars constraint_id] "One constraint"] "Delete constraint"]
+set context [list [list [export_vars -base one constraint_id] "One constraint"] "Delete constraint"]
set package_id [ad_conn package_id]
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.tcl 27 Oct 2014 16:39:53 -0000 1.5
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.tcl 27 Jun 2015 16:03:13 -0000 1.6
@@ -33,9 +33,9 @@
}
-set return_url_enc [ad_urlencode "[ad_conn url]?[export_vars {rel_segment constraint_name rel_side required_rel_segment return_url}]"]
+set return_url_enc [ad_urlencode [export_vars -base [ad_conn url] {rel_segment constraint_name rel_side required_rel_segment return_url}]]
-set context [list [list "../" "Relational segments"] [list "../one?segment_id=$rel_segment" "One Segment"] "Add constraint"]
+set context [list [list "../" "Relational segments"] [list [export_vars -base ../one {{segment_id $rel_segment}}] "One Segment"] "Add constraint"]
set package_id [ad_conn package_id]
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/delete-2.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/rel-types/delete-2.tcl 27 Oct 2014 16:39:54 -0000 1.4
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/delete-2.tcl 27 Jun 2015 16:03:13 -0000 1.5
@@ -17,7 +17,7 @@
if { $operation ne "Yes, I really want to delete this relationship type" } {
# set the return_url to something useful if we are not deleting
if { $return_url eq "" } {
- set return_url "one?[export_vars rel_type]"
+ set return_url [export_vars -base one rel_type]
}
} else {
db_1row select_type_info {
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/delete.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/rel-types/delete.tcl 27 Oct 2014 16:39:54 -0000 1.3
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/delete.tcl 27 Jun 2015 16:03:13 -0000 1.4
@@ -18,7 +18,7 @@
counts:onerow
}
-set context [list [list "" "Relationship types"] [list one?[export_vars rel_type] "One type"] "Delete type"]
+set context [list [list "" "Relationship types"] [[export_vars -base one rel_type] "One type"] "Delete type"]
set rel_type_pretty_name [db_string select_pretty_name {
select t.pretty_name
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove.tcl 27 Oct 2014 16:39:54 -0000 1.3
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove.tcl 27 Jun 2015 16:03:13 -0000 1.4
@@ -32,6 +32,6 @@
}
set export_vars [export_vars -form {group_rel_type_id return_url}]
-set context [list [list "" "Group types"] [list one?[export_vars {group_type}] "One type"] "Remove relation type"]
+set context [list [list "" "Group types"] [[export_vars -base one {group_type}] "One type"] "Remove relation type"]
ad_return_template
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list.tcl 27 Oct 2014 16:39:54 -0000 1.3
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list.tcl 27 Jun 2015 16:03:13 -0000 1.4
@@ -19,7 +19,7 @@
set user_id [ad_conn user_id]
set package_id [ad_conn package_id]
-set context [list [list "" "Relationship types"] [list one?[export_vars rel_type] "One type"] "Relations"]
+set context [list [list "" "Relationship types"] [[export_vars -base one rel_type] "One type"] "Relations"]
if { ![db_0or1row select_pretty_name {
select t.pretty_name as rel_type_pretty_name
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete.tcl 27 Oct 2014 16:39:54 -0000 1.3
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete.tcl 27 Jun 2015 16:03:13 -0000 1.4
@@ -17,7 +17,7 @@
export_vars:onevalue
}
-set context [list [list "../" "Relationship types"] [list "" "Roles"] [list one?[export_vars role] "One role"] "Delete role"]
+set context [list [list "../" "Relationship types"] [list "" "Roles"] [[export_vars -base one role] "One role"] "Delete role"]
set export_vars [export_vars -form {role return_url}]
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/edit.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/edit.tcl 27 Oct 2014 16:39:54 -0000 1.5
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/edit.tcl 27 Jun 2015 16:03:13 -0000 1.6
@@ -22,7 +22,7 @@
where r.role = :role
}
-set context [list [list "../" "Relationship types"] [list "one?[export_vars role]" "One role"] "Edit"]
+set context [list [list "../" "Relationship types"] [list [export_vars -base one role] "One role"] "Edit"]
template::form create role_form
@@ -57,7 +57,7 @@
where r.role = :role
} -bind [ns_getform]
if { $return_url eq "" } {
- set return_url "one?[export_vars role]"
+ set return_url [export_vars -base one role]
}
ad_returnredirect $return_url
ad_script_abort
Index: openacs-4/packages/acs-subsite/www/admin/relations/add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/add.tcl,v
diff -u -N -r1.14 -r1.15
--- openacs-4/packages/acs-subsite/www/admin/relations/add.tcl 15 Jun 2015 11:14:18 -0000 1.14
+++ openacs-4/packages/acs-subsite/www/admin/relations/add.tcl 27 Jun 2015 16:03:13 -0000 1.15
@@ -126,7 +126,7 @@
set party_type_exact_p f
set add_to_group_id $group_id
set add_with_rel_type $rel_type
-set add_party_url "[ad_conn package_url]admin/parties/new?[export_vars {add_to_group_id add_with_rel_type party_type party_type_exact_p return_url}]"
+set add_party_url [export_vars -base [ad_conn package_url]admin/parties/new {add_to_group_id add_with_rel_type party_type party_type_exact_p return_url}]
# Build a url used to select an existing party from the system (as opposed
# to limiting the selection to parties on the current subsite).
@@ -163,7 +163,7 @@
ad_script_abort
}
if { $return_url eq "" } {
- set return_url one?[export_vars rel_id]
+ set return_url [export_vars -base one rel_id]
}
ad_returnredirect $return_url
ad_script_abort
Index: openacs-4/packages/acs-subsite/www/admin/relations/remove-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/remove-2.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/relations/remove-2.tcl 27 Oct 2014 16:39:55 -0000 1.3
+++ openacs-4/packages/acs-subsite/www/admin/relations/remove-2.tcl 27 Jun 2015 16:03:13 -0000 1.4
@@ -28,7 +28,7 @@
} else {
if { $return_url eq "" } {
# redirect to the relation by default, if we haven't deleted it
- set return_url "one?[export_vars rel_id]"
+ set return_url [export_vars -base one rel_id]
}
}
Index: openacs-4/packages/acs-subsite/www/admin/site-map/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/delete.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/site-map/delete.tcl 27 Oct 2014 16:39:56 -0000 1.5
+++ openacs-4/packages/acs-subsite/www/admin/site-map/delete.tcl 27 Jun 2015 16:03:13 -0000 1.6
@@ -18,4 +18,4 @@
site_node::delete -node_id $node_id
-ad_returnredirect ".?[export_vars -url {expand:multiple root_id}]"
+ad_returnredirect [export_vars -base . {expand:multiple root_id}]
Index: openacs-4/packages/acs-subsite/www/admin/site-map/mount-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/mount-2.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/site-map/mount-2.tcl 27 Oct 2014 16:39:56 -0000 1.3
+++ openacs-4/packages/acs-subsite/www/admin/site-map/mount-2.tcl 27 Jun 2015 16:03:13 -0000 1.4
@@ -16,4 +16,4 @@
site_node::mount -node_id $node_id -object_id $package_id
-ad_returnredirect ".?[export_vars -url {expand:multiple root_id}]"
+ad_returnredirect [export_vars -base . {expand:multiple root_id}]
Index: openacs-4/packages/acs-subsite/www/admin/site-map/mount.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/mount.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/site-map/mount.tcl 27 Oct 2014 16:39:56 -0000 1.4
+++ openacs-4/packages/acs-subsite/www/admin/site-map/mount.tcl 27 Jun 2015 16:03:13 -0000 1.5
@@ -20,15 +20,15 @@
set site_node_url [site_node::get_url -node_id $node_id]
db_multirow -extend { url } unmounted packages_unmounted_select {} {
- set url "mount-2?[export_vars { expand:multiple root_id node_id package_id }]"
+ set url [export_vars -base mount-2 { expand:multiple root_id node_id package_id }]
}
db_multirow -extend { url } mounted packages_mounted_select {} {
- set url "mount-2?[export_vars { expand:multiple root_id node_id package_id}]"
+ set url [export_vars -base mount-2 { expand:multiple root_id node_id package_id}]
}
db_multirow -extend { url } singleton packages_singleton_select {} {
- set url "mount-2?[export_vars { expand:multiple root_id node_id package_id}]"
+ set url [export_vars -base mount-2 { expand:multiple root_id node_id package_id}]
}
Index: openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl 27 Oct 2014 16:39:56 -0000 1.6
+++ openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl 27 Jun 2015 16:03:13 -0000 1.7
@@ -65,4 +65,4 @@
lappend expand $parent_id
}
-ad_returnredirect ".?[export_vars -url {expand:multiple root_id}]"
+ad_returnredirect [export_vars -base . {expand:multiple root_id}]
Index: openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl,v
diff -u -N -r1.14 -r1.15
--- openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl 13 Jun 2015 23:59:10 -0000 1.14
+++ openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl 27 Jun 2015 16:03:13 -0000 1.15
@@ -67,4 +67,4 @@
}
}
-ad_returnredirect ".?[export_vars -url {expand:multiple root_id}]"
+ad_returnredirect [export_vars -base . {expand:multiple root_id}]
Index: openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl 9 Jun 2015 07:26:38 -0000 1.8
+++ openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl 27 Jun 2015 16:03:13 -0000 1.9
@@ -44,7 +44,7 @@
set javascript "onload=\"javascript:document.check_checkbox()\""
-set parent_link ".?[export_vars -url {expand:multiple {root_id $parent_id}}]"
+set parent_link [export_vars -base . {expand:multiple {root_id $parent_id}}]
set page_title "Build Your Site Map "
set context [list [list "." "Site Map"] $page_title]
@@ -53,7 +53,8 @@
db_foreach path_select {} {
if {$node_id != $root_id && $admin_p == "t"} {
- append head ""
+ set href [export_vars -base . {expand:multiple {root_id $node_id}}]
+ append head [subst {}]
}
if {$name eq ""} {
append head "$obj_name:"
@@ -185,31 +186,31 @@
if {$directory_p == "t"} {
set add_folder_url "?[export_vars -url {expand:multiple root_id node_id {new_parent $node_id} {new_type folder}}]"
if {$object_id eq ""} {
- set mount_url "mount?[export_vars -url {expand:multiple root_id node_id}]"
+ set mount_url [export_vars -base mount {expand:multiple root_id node_id}]
set new_app_url "?[export_vars -url {expand:multiple root_id {new_application $node_id}}]"
} else {
# This makes sure you can't unmount the thing that is serving the page you're looking at.
if {[ad_conn node_id] != $node_id} {
- set unmount_url "unmount?[export_vars -url {expand:multiple root_id node_id}]"
+ set unmount_url [export_vars -base unmount {expand:multiple root_id node_id}]
}
# Add a link to control permissioning
if {$object_admin_p} {
- set permissions_url "../../permissions/one?[export_vars -url {object_id}]"
+ set permissions_url [export_vars -base ../../permissions/one {object_id}]
set rename_url "?[export_vars -url {expand:multiple root_id {rename_application $node_id}}]"
set delete_url "instance-delete?package_id=$object_id&root_id=$root_id"
}
# Is the object a package?
if {$package_id ne ""} {
if {$object_admin_p && ($parameter_count > 0)} {
- set parameters_url "[export_vars -base "/shared/parameters" { package_id {return_url {[ad_return_url]} } }]"
+ set parameters_url [export_vars -base "/shared/parameters" { package_id {return_url {[ad_return_url]} } }]
}
}
}
}
if {[ad_conn node_id] != $node_id && $n_children == 0 && $object_id eq ""} {
- set delete_url "delete?[export_vars -url {expand:multiple root_id node_id}]"
+ set delete_url [export_vars -base delete {expand:multiple root_id node_id}]
}
# use the indent variable to hold current indent level we'll use it later to indent stuff at the end by the amount of the last node
@@ -247,7 +248,7 @@
set expand_url ""
}
- set name_url [export_vars -url {expand:multiple {root_id $node_id}}]
+ set name_url [export_vars {expand:multiple {root_id $node_id}}]
set action_type 0
set action_form_part ""
@@ -265,15 +266,15 @@
}
} elseif {$rename_application == $node_id} {
set action_type "rename_app"
- set action_form_part "[export_vars -form {expand:multiple root_id node_id rename_package_id}]"
+ set action_form_part [export_vars -form {expand:multiple root_id node_id rename_package_id}]
} else {}
if {$node_id == $new_parent} {
set parent_id $new_parent
set node_type $new_type
set action_type "new_folder"
- set action_form_part "[export_vars -form {expand:multiple parent_id node_type root_id}]"
+ set action_form_part [export_vars -form {expand:multiple parent_id node_type root_id}]
}
multirow append nodes $node_id $expand_mode $expand_url $indent $name $name_url $object_name $url $package_pretty_name $action_type $action_form_part $add_folder_url $new_app_url $unmount_url $mount_url $rename_url $delete_url $parameters_url $permissions_url "" $view_p
@@ -290,7 +291,8 @@
db_foreach services_select {} {
if {$parameter_count > 0} {
- append services "$instance_name"
+ set href [export_vars -base "/shared/parameters" { package_id { return_url {[ad_return_url]} } }]
+ append services [subst {$instance_name}]
}
} if_no_rows {
append services " (none)\n"
Index: openacs-4/packages/acs-subsite/www/admin/site-map/unmount.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/unmount.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/site-map/unmount.tcl 27 Oct 2014 16:39:57 -0000 1.4
+++ openacs-4/packages/acs-subsite/www/admin/site-map/unmount.tcl 27 Jun 2015 16:03:13 -0000 1.5
@@ -14,4 +14,4 @@
site_node::unmount -node_id $node_id
-ad_returnredirect ".?[export_vars -url {expand:multiple root_id}]"
+ad_returnredirect [export_vars -base . {expand:multiple root_id}]
Index: openacs-4/packages/acs-subsite/www/admin/users/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/users/new.tcl,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/acs-subsite/www/admin/users/new.tcl 13 Jun 2015 23:59:10 -0000 1.15
+++ openacs-4/packages/acs-subsite/www/admin/users/new.tcl 27 Jun 2015 16:03:13 -0000 1.16
@@ -248,11 +248,13 @@
set row_id [db_string user_new_2_rowid_for_email "select rowid from users where user_id = :user_id"]
# the user has to come back and activate their account
+ set href [export_vars \
+ -base [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemURL]/register/email-confirm {row_id}]
acs_mail_lite::send \
-to_addr [template::element::get_value add_user email] \
-from_addr $notification_address \
-subject "Welcome to [ad_system_name]" \
- -body "To confirm your registration, please go to [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemURL]/register/email-confirm?[export_vars -url {row_id}]
+ -body "To confirm your registration, please go to $href
After confirming your email, here's how you can log in at [ad_url]:
Index: openacs-4/packages/acs-subsite/www/permissions/grant.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/grant.tcl,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/acs-subsite/www/permissions/grant.tcl 27 Oct 2014 16:39:59 -0000 1.15
+++ openacs-4/packages/acs-subsite/www/permissions/grant.tcl 27 Jun 2015 16:03:14 -0000 1.16
@@ -19,7 +19,7 @@
set title [_ acs-subsite.lt_Grant_Permission_on_n]
-set context [list [list one?[export_vars -url {object_id}] "[_ acs-subsite.Permissions_for_name]"] [_ acs-subsite.Grant]]
+set context [list [list [export_vars -base one {object_id}] "[_ acs-subsite.Permissions_for_name]"] [_ acs-subsite.Grant]]
# Compute a hierarchical tree representation of the contents of
@@ -161,9 +161,9 @@
}
if {([info exists return_url] && $return_url ne "")} {
- ad_returnredirect "$return_url"
+ ad_returnredirect $return_url
} else {
- ad_returnredirect "one?[export_vars [list object_id application_url]]"
+ ad_returnredirect [export_vars -base one {object_id application_url}]
}
ad_script_abort
Index: openacs-4/packages/acs-subsite/www/permissions/perm-include.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/perm-include.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/acs-subsite/www/permissions/perm-include.tcl 27 Oct 2014 16:39:59 -0000 1.13
+++ openacs-4/packages/acs-subsite/www/permissions/perm-include.tcl 27 Jun 2015 16:03:14 -0000 1.14
@@ -71,7 +71,7 @@
set user_add_url [export_vars -base $user_add_url { object_id expanded {return_url "[ad_return_url]"}}]
set actions [list \
- [_ acs-subsite.Grant_Permission] "${perm_url}grant?[export_vars {return_url application_url object_id}]" [_ acs-subsite.Grant_Permission] \
+ [_ acs-subsite.Grant_Permission] [export_vars -base "${perm_url}grant" {return_url application_url object_id}] [_ acs-subsite.Grant_Permission] \
[_ acs-subsite.Search_For_Exist_User] $user_add_url [_ acs-subsite.Search_For_Exist_User]]
if { $context_id ne "" } {
Index: openacs-4/packages/acs-subsite/www/permissions/revoke-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/revoke-2.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/permissions/revoke-2.tcl 27 Oct 2014 16:39:59 -0000 1.6
+++ openacs-4/packages/acs-subsite/www/permissions/revoke-2.tcl 27 Jun 2015 16:03:14 -0000 1.7
@@ -24,4 +24,4 @@
}
}
-ad_returnredirect "one?[export_vars {object_id application_url}]"
+ad_returnredirect [export_vars -base one {object_id application_url}]
Index: openacs-4/packages/acs-subsite/www/permissions/revoke.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/revoke.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/permissions/revoke.tcl 27 Oct 2014 16:39:59 -0000 1.5
+++ openacs-4/packages/acs-subsite/www/permissions/revoke.tcl 27 Jun 2015 16:03:14 -0000 1.6
@@ -14,7 +14,7 @@
permission::require_permission -object_id $object_id -privilege admin
if {[llength $revoke_list] == 0} {
- ad_returnredirect "./?[export_vars -url {object_id}]"
+ ad_returnredirect [export_vars -base ./ {object_id}]
ad_script_abort
}
Index: openacs-4/packages/acs-subsite/www/user/portrait/erase.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/erase.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/user/portrait/erase.tcl 27 Oct 2014 16:40:03 -0000 1.8
+++ openacs-4/packages/acs-subsite/www/user/portrait/erase.tcl 27 Jun 2015 16:03:14 -0000 1.9
@@ -26,7 +26,7 @@
if {$admin_p} {
set context [list \
[list [ad_pvt_home] [ad_pvt_home_name]] \
- [list "./?[export_vars user_id]" [_ acs-subsite.User_Portrait]] \
+ [list [export_vars -base ./ user_id] [_ acs-subsite.User_Portrait]] \
$doc(title)]
} else {
set context [list \
Index: openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl 27 Oct 2014 16:40:03 -0000 1.16
+++ openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl 27 Jun 2015 16:03:14 -0000 1.17
@@ -47,12 +47,12 @@
if {$admin_p} {
set context [list \
- [list "./?[export_vars user_id]" [_ acs-subsite.User_Portrait]] \
+ [list [export_vars -base ./ user_id] [_ acs-subsite.User_Portrait]] \
$doc(title)]
} else {
set context [list \
[list [ad_pvt_home] [ad_pvt_home_name]] \
- [list "./?[export_vars return_url]" [_ acs-subsite.Your_Portrait]] \
+ [list [export_vars -base ./ return_url] [_ acs-subsite.Your_Portrait]] \
$doc(title)]
}