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 -N -r1.117.2.16 -r1.117.2.17 --- openacs-4/packages/acs-subsite/acs-subsite.info 20 May 2016 18:13:41 -0000 1.117.2.16 +++ openacs-4/packages/acs-subsite/acs-subsite.info 20 May 2016 20:02:44 -0000 1.117.2.17 @@ -22,7 +22,7 @@ - + Index: openacs-4/packages/acs-subsite/www/group-join.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/group-join.tcl,v diff -u -N -r1.2.18.2 -r1.2.18.3 --- openacs-4/packages/acs-subsite/www/group-join.tcl 20 May 2016 18:13:41 -0000 1.2.18.2 +++ openacs-4/packages/acs-subsite/www/group-join.tcl 20 May 2016 20:02:44 -0000 1.2.18.3 @@ -5,7 +5,7 @@ @creation-date 2003-08-07 @cvs-id $Id$ } { - {return_url:return_url "."} + {return_url:localurl "."} } auth::require_login Index: openacs-4/packages/acs-subsite/www/group-leave.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/group-leave.tcl,v diff -u -N -r1.3.2.2 -r1.3.2.3 --- openacs-4/packages/acs-subsite/www/group-leave.tcl 20 May 2016 17:55:46 -0000 1.3.2.2 +++ openacs-4/packages/acs-subsite/www/group-leave.tcl 20 May 2016 20:02:44 -0000 1.3.2.3 @@ -6,7 +6,7 @@ @cvs-id $Id$ } { {group_id:naturalnum,notnull {[application_group::group_id_from_package_id]}} - return_url:return_url,optional + return_url:localurl,optional } set user_id [auth::require_login] Index: openacs-4/packages/acs-subsite/www/admin/applications/application-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/applications/application-add.tcl,v diff -u -N -r1.12.2.3 -r1.12.2.4 --- openacs-4/packages/acs-subsite/www/admin/applications/application-add.tcl 20 May 2016 18:13:41 -0000 1.12.2.3 +++ openacs-4/packages/acs-subsite/www/admin/applications/application-add.tcl 20 May 2016 20:02:44 -0000 1.12.2.4 @@ -6,7 +6,7 @@ @cvs-id $Id$ } { node_id:naturalnum,optional - {return_url:return_url "."} + {return_url:localurl "."} } set page_title "[_ acs-subsite.New_Application]" Index: openacs-4/packages/acs-subsite/www/admin/applications/application-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/applications/application-delete.tcl,v diff -u -N -r1.6.2.1 -r1.6.2.2 --- openacs-4/packages/acs-subsite/www/admin/applications/application-delete.tcl 20 May 2016 18:13:41 -0000 1.6.2.1 +++ openacs-4/packages/acs-subsite/www/admin/applications/application-delete.tcl 20 May 2016 20:02:44 -0000 1.6.2.2 @@ -9,7 +9,7 @@ } { {node_id:naturalnum,multiple ""} {package_id:naturalnum,multiple ""} - {return_url:return_url .} + {return_url:localurl .} {confirm_p:boolean 0} } Index: openacs-4/packages/acs-subsite/www/admin/applications/multiple-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/applications/multiple-add.tcl,v diff -u -N -r1.2.6.3 -r1.2.6.4 --- openacs-4/packages/acs-subsite/www/admin/applications/multiple-add.tcl 20 May 2016 18:13:41 -0000 1.2.6.3 +++ openacs-4/packages/acs-subsite/www/admin/applications/multiple-add.tcl 20 May 2016 20:02:44 -0000 1.2.6.4 @@ -5,7 +5,7 @@ @creation-date 2003-05-28 @cvs-id $Id$ } { - {return_url:return_url "."} + {return_url:localurl "."} } set doc(title) "[_ acs-subsite.Add_multiple_applications]" 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.6.2.2 -r1.6.2.3 --- openacs-4/packages/acs-subsite/www/admin/attributes/add-2.tcl 20 May 2016 18:13:42 -0000 1.6.2.2 +++ openacs-4/packages/acs-subsite/www/admin/attributes/add-2.tcl 20 May 2016 20:02:44 -0000 1.6.2.3 @@ -15,7 +15,7 @@ default_value:trim datatype:notnull,trim required_p:boolean,notnull - { return_url:return_url "" } + { return_url:localurl "" } } -properties { context:onevalue export_vars:onevalue Index: openacs-4/packages/acs-subsite/www/admin/attributes/add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/add.tcl,v diff -u -N -r1.3.2.2 -r1.3.2.3 --- openacs-4/packages/acs-subsite/www/admin/attributes/add.tcl 20 May 2016 18:13:42 -0000 1.3.2.2 +++ openacs-4/packages/acs-subsite/www/admin/attributes/add.tcl 20 May 2016 20:02:44 -0000 1.3.2.3 @@ -10,7 +10,7 @@ } { object_type:notnull,trim - { return_url:return_url "" } + { return_url:localurl "" } } -properties { context:onevalue export_vars:onevalue 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.4.2.2 -r1.4.2.3 --- openacs-4/packages/acs-subsite/www/admin/attributes/delete-2.tcl 20 May 2016 18:13:42 -0000 1.4.2.2 +++ openacs-4/packages/acs-subsite/www/admin/attributes/delete-2.tcl 20 May 2016 20:02:44 -0000 1.4.2.3 @@ -10,7 +10,7 @@ } { attribute_id:notnull,naturalnum,attribute_dynamic_p - { return_url:return_url "" } + { return_url:localurl "" } { operation "" } } 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.4.2.2 -r1.4.2.3 --- openacs-4/packages/acs-subsite/www/admin/attributes/delete.tcl 20 May 2016 18:13:42 -0000 1.4.2.2 +++ openacs-4/packages/acs-subsite/www/admin/attributes/delete.tcl 20 May 2016 20:02:44 -0000 1.4.2.3 @@ -10,7 +10,7 @@ } { attribute_id:notnull,naturalnum,attribute_dynamic_p - { return_url:return_url "" } + { return_url:localurl "" } } -properties { context:onevalue attribute_id:onevalue Index: openacs-4/packages/acs-subsite/www/admin/attributes/edit-one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/edit-one.tcl,v diff -u -N -r1.5.2.3 -r1.5.2.4 --- openacs-4/packages/acs-subsite/www/admin/attributes/edit-one.tcl 20 May 2016 18:13:42 -0000 1.5.2.3 +++ openacs-4/packages/acs-subsite/www/admin/attributes/edit-one.tcl 20 May 2016 20:02:44 -0000 1.5.2.4 @@ -12,7 +12,7 @@ attribute_id:naturalnum id_column:trim,integer { attribute_value "" } - { return_url:return_url "" } + { return_url:localurl "" } } -properties { context:onevalue focus:onevalue 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.4.2.4 -r1.4.2.5 --- openacs-4/packages/acs-subsite/www/admin/attributes/enum-add-2.tcl 20 May 2016 18:13:42 -0000 1.4.2.4 +++ openacs-4/packages/acs-subsite/www/admin/attributes/enum-add-2.tcl 20 May 2016 20:02:44 -0000 1.4.2.5 @@ -12,7 +12,7 @@ attribute_id:naturalnum,notnull attribute_enum_values:array,trim,optional { operation:trim "Finish adding values" } - { return_url:return_url "" } + { return_url:localurl "" } } set max_sort_order [db_string select_max_sort_order {}] 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.5.2.2 -r1.5.2.3 --- openacs-4/packages/acs-subsite/www/admin/attributes/enum-add.tcl 20 May 2016 18:13:42 -0000 1.5.2.2 +++ openacs-4/packages/acs-subsite/www/admin/attributes/enum-add.tcl 20 May 2016 20:02:44 -0000 1.5.2.3 @@ -10,7 +10,7 @@ } { attribute_id:naturalnum,notnull - { return_url:return_url "" } + { return_url:localurl "" } } -properties { context:onevalue export_vars:onevalue Index: openacs-4/packages/acs-subsite/www/admin/attributes/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/one.tcl,v diff -u -N -r1.4.2.2 -r1.4.2.3 --- openacs-4/packages/acs-subsite/www/admin/attributes/one.tcl 20 May 2016 18:13:42 -0000 1.4.2.2 +++ openacs-4/packages/acs-subsite/www/admin/attributes/one.tcl 20 May 2016 20:02:44 -0000 1.4.2.3 @@ -10,7 +10,7 @@ } { attribute_id:naturalnum,notnull - { return_url:return_url "" } + { return_url:localurl "" } } -properties { context:onevalue attribute:onerow 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.4.2.2 -r1.4.2.3 --- openacs-4/packages/acs-subsite/www/admin/attributes/value-delete-2.tcl 20 May 2016 17:55:46 -0000 1.4.2.2 +++ openacs-4/packages/acs-subsite/www/admin/attributes/value-delete-2.tcl 20 May 2016 20:02:44 -0000 1.4.2.3 @@ -12,7 +12,7 @@ attribute_id:naturalnum,notnull enum_value:trim,notnull { operation:trim "No, I want to cancel my request" } - { return_url:return_url "[export_vars -base one attribute_id]" } + { return_url:localurl "[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.5.2.2 -r1.5.2.3 --- openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.tcl 20 May 2016 17:55:46 -0000 1.5.2.2 +++ openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.tcl 20 May 2016 20:02:44 -0000 1.5.2.3 @@ -11,7 +11,7 @@ } { attribute_id:naturalnum,notnull enum_value:trim,notnull - { return_url:return_url "[export_vars -base one attribute_id]" } + { return_url:localurl "[export_vars -base one attribute_id]" } } -properties { context:onevalue export_vars:onevalue 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.4.2.2 -r1.4.2.3 --- openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy-2.tcl 20 May 2016 18:13:42 -0000 1.4.2.2 +++ openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy-2.tcl 20 May 2016 20:02:44 -0000 1.4.2.3 @@ -10,7 +10,7 @@ } { group_type:notnull default_join_policy:notnull - {return_url:return_url ""} + {return_url:localurl ""} } if { ![db_0or1row select_pretty_name { 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.6.2.4 -r1.6.2.5 --- openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.tcl 20 May 2016 18:13:42 -0000 1.6.2.4 +++ openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.tcl 20 May 2016 20:02:44 -0000 1.6.2.5 @@ -9,7 +9,7 @@ @cvs-id $Id$ } { group_type:notnull - {return_url:return_url ""} + {return_url:localurl ""} } -properties { context:onevalue group_type:onevalue 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.7.2.3 -r1.7.2.4 --- openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.tcl 20 May 2016 18:13:42 -0000 1.7.2.3 +++ openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.tcl 20 May 2016 20:02:44 -0000 1.7.2.4 @@ -10,7 +10,7 @@ } { group_type - { return_url:return_url "" } + { return_url:localurl "" } { operation "" } } -properties { context:onevalue 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.5.2.3 -r1.5.2.4 --- openacs-4/packages/acs-subsite/www/admin/group-types/delete.tcl 20 May 2016 18:13:42 -0000 1.5.2.3 +++ openacs-4/packages/acs-subsite/www/admin/group-types/delete.tcl 20 May 2016 20:02:44 -0000 1.5.2.4 @@ -10,7 +10,7 @@ } { group_type:notnull - { return_url:return_url "" } + { return_url:localurl "" } } -properties { subtypes:multirow context:onevalue 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.5.2.3 -r1.5.2.4 --- openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add-2.tcl 20 May 2016 18:13:42 -0000 1.5.2.3 +++ openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add-2.tcl 20 May 2016 20:02:44 -0000 1.5.2.4 @@ -12,7 +12,7 @@ } { group_type:trim,notnull rel_type:trim,notnull - { return_url:return_url "" } + { return_url:localurl "" } } -validate { rel_type_acceptable_p -requires {group_type:notnull rel_type:notnull} { # This test makes sure this group_type can accept the 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.6.2.3 -r1.6.2.4 --- openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.tcl 20 May 2016 18:13:42 -0000 1.6.2.3 +++ openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.tcl 20 May 2016 20:02:44 -0000 1.6.2.4 @@ -10,7 +10,7 @@ } { group_type:trim,notnull - { return_url:return_url "" } + { return_url:localurl "" } } -properties { context:onevalue return_url_enc:onevalue 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.4.2.2 -r1.4.2.3 --- openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove-2.tcl 20 May 2016 18:13:42 -0000 1.4.2.2 +++ openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove-2.tcl 20 May 2016 20:02:44 -0000 1.4.2.3 @@ -10,7 +10,7 @@ } { group_rel_type_id:naturalnum,notnull - { return_url:return_url "" } + { return_url:localurl "" } { operation:trim "No, I want to cancel my request" } } 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.5.2.2 -r1.5.2.3 --- openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.tcl 20 May 2016 18:13:42 -0000 1.5.2.2 +++ openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.tcl 20 May 2016 20:02:44 -0000 1.5.2.3 @@ -10,7 +10,7 @@ } { group_rel_type_id:naturalnum,notnull - { return_url:return_url "" } + { return_url:localurl "" } } -properties { context:onevalue rel_pretty_name:onevalue Index: openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy-2.tcl,v diff -u -N -r1.3.2.2 -r1.3.2.3 --- openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy-2.tcl 20 May 2016 18:13:42 -0000 1.3.2.2 +++ openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy-2.tcl 20 May 2016 20:02:44 -0000 1.3.2.3 @@ -10,7 +10,7 @@ } { group_id:naturalnum,notnull join_policy:notnull - {return_url:return_url ""} + {return_url:localurl ""} } -validate { groups_exists_p -requires {group_id:notnull} { if { ![group::permission_p -privilege admin $group_id] } { Index: openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy.tcl,v diff -u -N -r1.4.2.3 -r1.4.2.4 --- openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy.tcl 20 May 2016 18:13:42 -0000 1.4.2.3 +++ openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy.tcl 20 May 2016 20:02:44 -0000 1.4.2.4 @@ -9,7 +9,7 @@ @cvs-id $Id$ } { group_id:naturalnum,notnull - {return_url:return_url ""} + {return_url:localurl ""} } -properties { context:onevalue group_id:onevalue 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.4.2.2 -r1.4.2.3 --- openacs-4/packages/acs-subsite/www/admin/groups/constraints-create-2.tcl 20 May 2016 18:13:42 -0000 1.4.2.2 +++ openacs-4/packages/acs-subsite/www/admin/groups/constraints-create-2.tcl 20 May 2016 20:02:44 -0000 1.4.2.3 @@ -13,7 +13,7 @@ group_id:notnull,naturalnum rel_type:notnull { operation "" } - { return_url:return_url "" } + { return_url:localurl "" } } set operation [string trim [string tolower $operation]] 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.5.2.3 -r1.5.2.4 --- openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.tcl 20 May 2016 18:13:42 -0000 1.5.2.3 +++ openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.tcl 20 May 2016 20:02:44 -0000 1.5.2.4 @@ -12,7 +12,7 @@ } { group_id:notnull,naturalnum rel_type:notnull - { return_url:return_url "" } + { return_url:localurl "" } } -properties { context:onevalue export_vars:onevalue 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.4.2.2 -r1.4.2.3 --- openacs-4/packages/acs-subsite/www/admin/groups/delete-2.tcl 20 May 2016 18:13:42 -0000 1.4.2.2 +++ openacs-4/packages/acs-subsite/www/admin/groups/delete-2.tcl 20 May 2016 20:02:44 -0000 1.4.2.3 @@ -11,7 +11,7 @@ } { group_id:naturalnum,notnull { operation "" } - { return_url:return_url "" } + { return_url:localurl "" } } -validate { groups_exists_p -requires {group_id:notnull} { if { ![group::permission_p $group_id] } { Index: openacs-4/packages/acs-subsite/www/admin/groups/new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/new.tcl,v diff -u -N -r1.10.2.3 -r1.10.2.4 --- openacs-4/packages/acs-subsite/www/admin/groups/new.tcl 20 May 2016 18:13:42 -0000 1.10.2.3 +++ openacs-4/packages/acs-subsite/www/admin/groups/new.tcl 20 May 2016 20:02:44 -0000 1.10.2.4 @@ -15,7 +15,7 @@ { group_id:naturalnum "" } {add_to_group_id:integer ""} {add_with_rel_type "composition_rel"} - { return_url:return_url "" } + { return_url:localurl "" } {group_rel_type_list ""} } -properties { context:onevalue 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.6.2.3 -r1.6.2.4 --- openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add-2.tcl 20 May 2016 18:13:42 -0000 1.6.2.3 +++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add-2.tcl 20 May 2016 20:02:44 -0000 1.6.2.4 @@ -12,7 +12,7 @@ } { group_id:naturalnum,notnull rel_type:notnull - { return_url:return_url "" } + { return_url:localurl "" } } -validate { rel_type_acceptable_p -requires {group_id:notnull rel_type:notnull} { # This test makes sure this group can accept the specified rel 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.5.2.3 -r1.5.2.4 --- openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.tcl 20 May 2016 18:13:42 -0000 1.5.2.3 +++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.tcl 20 May 2016 20:02:44 -0000 1.5.2.4 @@ -10,7 +10,7 @@ } { group_id:naturalnum,notnull - { return_url:return_url "" } + { return_url:localurl "" } } -properties { context:onevalue export_vars:onevalue 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.4.2.2 -r1.4.2.3 --- openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove-2.tcl 20 May 2016 18:13:42 -0000 1.4.2.2 +++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove-2.tcl 20 May 2016 20:02:44 -0000 1.4.2.3 @@ -10,7 +10,7 @@ } { group_rel_id:naturalnum,notnull - { return_url:return_url "" } + { return_url:localurl "" } { operation:trim "No, I want to cancel my request" } } 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.5.2.3 -r1.5.2.4 --- openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.tcl 20 May 2016 18:13:42 -0000 1.5.2.3 +++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.tcl 20 May 2016 20:02:44 -0000 1.5.2.4 @@ -11,7 +11,7 @@ } { group_rel_id:naturalnum,notnull - { return_url:return_url "" } + { return_url:localurl "" } } -properties { context:onevalue rel_pretty_name:onevalue 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 -N -r1.9.2.3 -r1.9.2.4 --- openacs-4/packages/acs-subsite/www/admin/parties/new.tcl 20 May 2016 18:13:42 -0000 1.9.2.3 +++ openacs-4/packages/acs-subsite/www/admin/parties/new.tcl 20 May 2016 20:02:44 -0000 1.9.2.4 @@ -13,7 +13,7 @@ { party_type_exact_p:boolean t } { party_id:naturalnum "" } { party.email ""} - { return_url:return_url "" } + { return_url:localurl "" } {add_to_group_id:naturalnum ""} {add_with_rel_type "membership_rel"} {group_rel_type_list ""} 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.4.2.2 -r1.4.2.3 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints-redirect.tcl 20 May 2016 18:13:42 -0000 1.4.2.2 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints-redirect.tcl 20 May 2016 20:02:44 -0000 1.4.2.3 @@ -11,7 +11,7 @@ } { segment_id:naturalnum,notnull { operation "" } - { return_url:return_url "" } + { return_url:localurl "" } } set operation [string trim [string tolower $operation]] 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.4.2.2 -r1.4.2.3 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/delete-2.tcl 20 May 2016 18:13:42 -0000 1.4.2.2 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/delete-2.tcl 20 May 2016 20:02:44 -0000 1.4.2.3 @@ -11,7 +11,7 @@ } { segment_id:naturalnum,notnull { operation "" } - { return_url:return_url "" } + { return_url:localurl "" } } -validate { segment_exists_p -requires {segment_id:notnull} { if { ![rel_segments_permission_p -privilege delete $segment_id] } { 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.5.2.2 -r1.5.2.3 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.tcl 20 May 2016 18:13:42 -0000 1.5.2.2 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.tcl 20 May 2016 20:02:44 -0000 1.5.2.3 @@ -10,7 +10,7 @@ } { segment_id:naturalnum,notnull - { return_url:return_url "" } + { return_url:localurl "" } } -properties { export_vars:onevalue segment_name:onevalue Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.tcl,v diff -u -N -r1.6.2.3 -r1.6.2.4 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.tcl 20 May 2016 18:13:42 -0000 1.6.2.3 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.tcl 20 May 2016 20:02:44 -0000 1.6.2.4 @@ -12,7 +12,7 @@ } { group_id:integer,notnull rel_type:notnull - { return_url:return_url "" } + { return_url:localurl "" } } -properties { context:onevalue export_vars:onevalue 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.7.2.3 -r1.7.2.4 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl 20 May 2016 18:13:42 -0000 1.7.2.3 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl 20 May 2016 20:02:44 -0000 1.7.2.4 @@ -13,7 +13,7 @@ group_id:integer,notnull segment_name:notnull rel_type:notnull - { return_url:return_url "" } + { return_url:localurl "" } } -properties { context:onevalue export_vars:onevalue 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.6.2.3 -r1.6.2.4 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/new.tcl 20 May 2016 18:13:42 -0000 1.6.2.3 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new.tcl 20 May 2016 20:02:44 -0000 1.6.2.4 @@ -11,7 +11,7 @@ } { group_id:integer,notnull { rel_type:trim "" } - { return_url:return_url "" } + { return_url:localurl "" } } -properties { context:onevalue export_vars:onevalue 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.6.2.3 -r1.6.2.4 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete-2.tcl 20 May 2016 18:13:42 -0000 1.6.2.3 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete-2.tcl 20 May 2016 20:02:44 -0000 1.6.2.4 @@ -11,7 +11,7 @@ } { constraint_id:naturalnum,notnull { operation "" } - { return_url:return_url "" } + { return_url:localurl "" } } permission::require_permission -object_id $constraint_id -privilege delete 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.5.2.2 -r1.5.2.3 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.tcl 20 May 2016 18:13:42 -0000 1.5.2.2 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.tcl 20 May 2016 20:02:44 -0000 1.5.2.3 @@ -10,7 +10,7 @@ } { constraint_id:naturalnum,notnull - { return_url:return_url "" } + { return_url:localurl "" } } -properties { context:onevalue constraint_name:onevalue 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.6.2.3 -r1.6.2.4 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.tcl 20 May 2016 18:13:42 -0000 1.6.2.3 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.tcl 20 May 2016 20:02:44 -0000 1.6.2.4 @@ -13,7 +13,7 @@ constraint_name:optional rel_side:optional required_rel_segment:optional - { return_url:return_url "" } + { return_url:localurl "" } } -properties { context:onevalue segment_name:onevalue Index: openacs-4/packages/acs-subsite/www/admin/rel-types/add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/add-2.tcl,v diff -u -N -r1.2.2.2 -r1.2.2.3 --- openacs-4/packages/acs-subsite/www/admin/rel-types/add-2.tcl 20 May 2016 18:13:42 -0000 1.2.2.2 +++ openacs-4/packages/acs-subsite/www/admin/rel-types/add-2.tcl 20 May 2016 20:02:44 -0000 1.2.2.3 @@ -12,7 +12,7 @@ constraint_id:naturalnum,notnull rel_type:notnull object_type:notnull - { return_url:return_url "" } + { return_url:localurl "" } } db_dml update_rel_type_mapping { Index: openacs-4/packages/acs-subsite/www/admin/rel-types/add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/add.tcl,v diff -u -N -r1.5.2.2 -r1.5.2.3 --- openacs-4/packages/acs-subsite/www/admin/rel-types/add.tcl 20 May 2016 18:13:42 -0000 1.5.2.2 +++ openacs-4/packages/acs-subsite/www/admin/rel-types/add.tcl 20 May 2016 20:02:44 -0000 1.5.2.3 @@ -10,7 +10,7 @@ } { object_type:notnull - { return_url:return_url "" } + { return_url:localurl "" } } -properties { context:onevalue export_form_vars:onevalue 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.5.2.3 -r1.5.2.4 --- openacs-4/packages/acs-subsite/www/admin/rel-types/delete-2.tcl 20 May 2016 18:13:42 -0000 1.5.2.3 +++ openacs-4/packages/acs-subsite/www/admin/rel-types/delete-2.tcl 20 May 2016 20:02:44 -0000 1.5.2.4 @@ -11,7 +11,7 @@ } { rel_type:notnull,rel_type_dynamic_p { operation "" } - { return_url:return_url "" } + { return_url:localurl "" } } if { $operation ne "Yes, I really want to delete this relationship type" } { 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.4.2.3 -r1.4.2.4 --- openacs-4/packages/acs-subsite/www/admin/rel-types/delete.tcl 20 May 2016 18:13:42 -0000 1.4.2.3 +++ openacs-4/packages/acs-subsite/www/admin/rel-types/delete.tcl 20 May 2016 20:02:44 -0000 1.4.2.4 @@ -10,7 +10,7 @@ } { rel_type:notnull,rel_type_dynamic_p - { return_url:return_url "" } + { return_url:localurl "" } } -properties { context:onevalue rel_type_pretty_name:onevalue Index: openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove-2.tcl,v diff -u -N -r1.5.2.2 -r1.5.2.3 --- openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove-2.tcl 20 May 2016 18:13:42 -0000 1.5.2.2 +++ openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove-2.tcl 20 May 2016 20:02:44 -0000 1.5.2.3 @@ -12,7 +12,7 @@ } { { group_rel_id:naturalnum "" } { group_type_rel_id:naturalnum "" } - { return_url:return_url "" } + { return_url:localurl "" } } -properties { context:onevalue } 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.4.2.2 -r1.4.2.3 --- openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove.tcl 20 May 2016 18:13:42 -0000 1.4.2.2 +++ openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove.tcl 20 May 2016 20:02:44 -0000 1.4.2.3 @@ -11,7 +11,7 @@ } { { group_rel_type_id:naturalnum "" } { group_rel_id:naturalnum "" } - { return_url:return_url "" } + { return_url:localurl "" } } -properties { context:onevalue rel_pretty_name:onevalue Index: openacs-4/packages/acs-subsite/www/admin/rel-types/new-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/new-2.tcl,v diff -u -N -r1.8.2.3 -r1.8.2.4 --- openacs-4/packages/acs-subsite/www/admin/rel-types/new-2.tcl 20 May 2016 18:13:42 -0000 1.8.2.3 +++ openacs-4/packages/acs-subsite/www/admin/rel-types/new-2.tcl 20 May 2016 20:02:44 -0000 1.8.2.4 @@ -21,7 +21,7 @@ role_two:optional min_n_rels_two:optional max_n_rels_two:optional - { return_url:return_url "" } + { return_url:localurl "" } } -properties { context:onevalue supertype_pretty_name:onevalue Index: openacs-4/packages/acs-subsite/www/admin/rel-types/new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/new.tcl,v diff -u -N -r1.5.2.3 -r1.5.2.4 --- openacs-4/packages/acs-subsite/www/admin/rel-types/new.tcl 20 May 2016 18:13:42 -0000 1.5.2.3 +++ openacs-4/packages/acs-subsite/www/admin/rel-types/new.tcl 20 May 2016 20:02:44 -0000 1.5.2.4 @@ -9,7 +9,7 @@ @cvs-id $Id$ } { - { return_url:return_url "" } + { return_url:localurl "" } } -properties { context:onevalue } Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete-2.tcl,v diff -u -N -r1.2.12.3 -r1.2.12.4 --- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete-2.tcl 20 May 2016 18:13:42 -0000 1.2.12.3 +++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete-2.tcl 20 May 2016 20:02:44 -0000 1.2.12.4 @@ -11,7 +11,7 @@ } { role:notnull { operation "" } - { return_url:return_url "" } + { return_url:localurl "" } } 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.4.2.2 -r1.4.2.3 --- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete.tcl 20 May 2016 18:13:42 -0000 1.4.2.2 +++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete.tcl 20 May 2016 20:02:44 -0000 1.4.2.3 @@ -10,7 +10,7 @@ } { role:notnull - { return_url:return_url "" } + { return_url:localurl "" } } -properties { context:onevalue pretty_name:onevalue 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.6.2.2 -r1.6.2.3 --- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/edit.tcl 20 May 2016 18:13:42 -0000 1.6.2.2 +++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/edit.tcl 20 May 2016 20:02:44 -0000 1.6.2.3 @@ -10,7 +10,7 @@ } { role:notnull - { return_url:return_url "" } + { return_url:localurl "" } } -properties { context:onevalue Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/new.tcl,v diff -u -N -r1.5.14.2 -r1.5.14.3 --- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/new.tcl 20 May 2016 18:13:42 -0000 1.5.14.2 +++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/new.tcl 20 May 2016 20:02:44 -0000 1.5.14.3 @@ -12,7 +12,7 @@ { role:trim "" } { pretty_name "" } { pretty_plural "" } - { return_url:return_url "" } + { return_url:localurl "" } } -properties { context:onevalue 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.15.2.3 -r1.15.2.4 --- openacs-4/packages/acs-subsite/www/admin/relations/add.tcl 20 May 2016 18:13:42 -0000 1.15.2.3 +++ openacs-4/packages/acs-subsite/www/admin/relations/add.tcl 20 May 2016 20:02:44 -0000 1.15.2.4 @@ -13,7 +13,7 @@ rel_type:notnull { party_id:naturalnum "" } { exact_p:boolean "f" } - { return_url:return_url "" } + { return_url:localurl "" } { allow_out_of_scope_p:boolean "f" } } -properties { context:onevalue Index: openacs-4/packages/acs-subsite/www/admin/relations/change-member-state.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/change-member-state.tcl,v diff -u -N -r1.3.2.2 -r1.3.2.3 --- openacs-4/packages/acs-subsite/www/admin/relations/change-member-state.tcl 20 May 2016 18:13:42 -0000 1.3.2.2 +++ openacs-4/packages/acs-subsite/www/admin/relations/change-member-state.tcl 20 May 2016 20:02:44 -0000 1.3.2.3 @@ -11,7 +11,7 @@ } { rel_id:naturalnum,notnull member_state:notnull - {return_url:return_url ""} + {return_url:localurl ""} } -validate { permission_p -requires {rel_id:notnull} { if { ![relation_permission_p -privilege admin $rel_id] } { 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.4.2.2 -r1.4.2.3 --- openacs-4/packages/acs-subsite/www/admin/relations/remove-2.tcl 20 May 2016 18:13:42 -0000 1.4.2.2 +++ openacs-4/packages/acs-subsite/www/admin/relations/remove-2.tcl 20 May 2016 20:02:44 -0000 1.4.2.3 @@ -9,7 +9,7 @@ } { rel_id:naturalnum,notnull { operation "" } - { return_url:return_url "" } + { return_url:localurl "" } } -validate { permission_p -requires {rel_id:notnull} { if { ![relation_permission_p -privilege delete $rel_id] } { Index: openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl,v diff -u -N -r1.3.2.3 -r1.3.2.4 --- openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl 20 May 2016 18:13:42 -0000 1.3.2.3 +++ openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl 20 May 2016 20:02:44 -0000 1.3.2.4 @@ -8,7 +8,7 @@ @cvs-id $Id$ } { rel_id:naturalnum,notnull - { return_url:return_url "" } + { return_url:localurl "" } } -properties { context:onevalue export_vars:onevalue Index: openacs-4/packages/acs-subsite/www/admin/site-map/allow-for-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/allow-for-view.tcl,v diff -u -N -r1.4.12.3 -r1.4.12.4 --- openacs-4/packages/acs-subsite/www/admin/site-map/allow-for-view.tcl 20 May 2016 18:13:42 -0000 1.4.12.3 +++ openacs-4/packages/acs-subsite/www/admin/site-map/allow-for-view.tcl 20 May 2016 20:02:44 -0000 1.4.12.4 @@ -5,7 +5,7 @@ } { checkbox:integer,multiple,optional - return_url:return_url + return_url:localurl } set user_id [auth::require_login] Index: openacs-4/packages/acs-subsite/www/admin/site-map/auto-mount.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/auto-mount.tcl,v diff -u -N -r1.5.2.2 -r1.5.2.3 --- openacs-4/packages/acs-subsite/www/admin/site-map/auto-mount.tcl 20 May 2016 18:13:42 -0000 1.5.2.2 +++ openacs-4/packages/acs-subsite/www/admin/site-map/auto-mount.tcl 20 May 2016 20:02:44 -0000 1.5.2.3 @@ -11,7 +11,7 @@ } { package_key:notnull node_id:naturalnum,notnull - {return_url:return_url ""} + {return_url:localurl ""} } subsite::auto_mount_application -node_id $node_id $package_key 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.16.2.4 -r1.16.2.5 --- openacs-4/packages/acs-subsite/www/admin/users/new.tcl 20 May 2016 18:13:42 -0000 1.16.2.4 +++ openacs-4/packages/acs-subsite/www/admin/users/new.tcl 20 May 2016 20:02:44 -0000 1.16.2.5 @@ -12,7 +12,7 @@ { user_type:notnull "user" } { user_type_exact_p:boolean t } { user_id:naturalnum "" } - { return_url:return_url "" } + { return_url:localurl "" } {add_to_group_id:naturalnum ""} {add_with_rel_type "user_profile"} {group_rel_type_list ""} 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.16.2.3 -r1.16.2.4 --- openacs-4/packages/acs-subsite/www/permissions/grant.tcl 20 May 2016 18:13:42 -0000 1.16.2.3 +++ openacs-4/packages/acs-subsite/www/permissions/grant.tcl 20 May 2016 20:02:44 -0000 1.16.2.4 @@ -9,7 +9,7 @@ object_id:naturalnum,notnull privileges:multiple,optional {application_url ""} - {return_url:return_url ""} + {return_url:localurl ""} } permission::require_permission -object_id $object_id -privilege admin Index: openacs-4/packages/acs-subsite/www/permissions/perm-modify.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/perm-modify.tcl,v diff -u -N -r1.4.2.3 -r1.4.2.4 --- openacs-4/packages/acs-subsite/www/permissions/perm-modify.tcl 20 May 2016 18:13:42 -0000 1.4.2.3 +++ openacs-4/packages/acs-subsite/www/permissions/perm-modify.tcl 20 May 2016 20:02:44 -0000 1.4.2.4 @@ -2,7 +2,7 @@ object_id:naturalnum,notnull {perm:multiple {[list]}} {privs:optional} - return_url:return_url + return_url:localurl } Index: openacs-4/packages/acs-subsite/www/permissions/perm-user-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/perm-user-add-2.tcl,v diff -u -N -r1.3.2.2 -r1.3.2.3 --- openacs-4/packages/acs-subsite/www/permissions/perm-user-add-2.tcl 20 May 2016 18:13:42 -0000 1.3.2.2 +++ openacs-4/packages/acs-subsite/www/permissions/perm-user-add-2.tcl 20 May 2016 20:02:44 -0000 1.3.2.3 @@ -1,7 +1,7 @@ ad_page_contract {} { object_id:naturalnum,notnull user_id:multiple,naturalnum - return_url:return_url + return_url:localurl } permission::require_permission -object_id $object_id -privilege admin Index: openacs-4/packages/acs-subsite/www/permissions/perm-user-add-include.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/perm-user-add-include.tcl,v diff -u -N -r1.8.2.2 -r1.8.2.3 --- openacs-4/packages/acs-subsite/www/permissions/perm-user-add-include.tcl 20 May 2016 18:13:42 -0000 1.8.2.2 +++ openacs-4/packages/acs-subsite/www/permissions/perm-user-add-include.tcl 20 May 2016 20:02:44 -0000 1.8.2.3 @@ -1,7 +1,7 @@ ad_page_contract { } { object_id:naturalnum,notnull - return_url:return_url + return_url:localurl page:naturalnum,optional } Index: openacs-4/packages/acs-subsite/www/permissions/perm-user-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/perm-user-add.tcl,v diff -u -N -r1.3.14.2 -r1.3.14.3 --- openacs-4/packages/acs-subsite/www/permissions/perm-user-add.tcl 20 May 2016 18:13:42 -0000 1.3.14.2 +++ openacs-4/packages/acs-subsite/www/permissions/perm-user-add.tcl 20 May 2016 20:02:44 -0000 1.3.14.3 @@ -1,7 +1,7 @@ ad_page_contract { Simple page for adding users to permissions list. } { - return_url:return_url + return_url:localurl } set context [list [list $return_url "Permissions"] "[_ acs-subsite.Add_User]"] Index: openacs-4/packages/acs-subsite/www/permissions/toggle-inherit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/toggle-inherit.tcl,v diff -u -N -r1.6.2.2 -r1.6.2.3 --- openacs-4/packages/acs-subsite/www/permissions/toggle-inherit.tcl 20 May 2016 18:13:42 -0000 1.6.2.2 +++ openacs-4/packages/acs-subsite/www/permissions/toggle-inherit.tcl 20 May 2016 20:02:44 -0000 1.6.2.3 @@ -10,7 +10,7 @@ } { object_id:naturalnum,notnull {application_url ""} - {return_url:return_url {[export_vars -base "one" {application_url object_id}]}} + {return_url:localurl {[export_vars -base "one" {application_url object_id}]}} } permission::require_permission -object_id $object_id -privilege admin Index: openacs-4/packages/acs-subsite/www/register/account-message.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/account-message.tcl,v diff -u -N -r1.2.2.2 -r1.2.2.3 --- openacs-4/packages/acs-subsite/www/register/account-message.tcl 20 May 2016 18:13:42 -0000 1.2.2.2 +++ openacs-4/packages/acs-subsite/www/register/account-message.tcl 20 May 2016 20:02:44 -0000 1.2.2.3 @@ -4,7 +4,7 @@ @cvs-id $Id$ } { {message:html ""} - {return_url:return_url ""} + {return_url:localurl ""} } set page_title "Logged in" Index: openacs-4/packages/acs-subsite/www/register/auto-login.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/auto-login.tcl,v diff -u -N -r1.2.12.2 -r1.2.12.3 --- openacs-4/packages/acs-subsite/www/register/auto-login.tcl 20 May 2016 18:13:42 -0000 1.2.12.2 +++ openacs-4/packages/acs-subsite/www/register/auto-login.tcl 20 May 2016 20:02:44 -0000 1.2.12.3 @@ -6,7 +6,7 @@ } { email password - {return_url:return_url "/"} + {return_url:localurl "/"} } array set auth_info [auth::authenticate \ Index: openacs-4/packages/acs-subsite/www/register/email-confirm.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/email-confirm.tcl,v diff -u -N -r1.12.2.2 -r1.12.2.3 --- openacs-4/packages/acs-subsite/www/register/email-confirm.tcl 20 May 2016 18:13:42 -0000 1.12.2.2 +++ openacs-4/packages/acs-subsite/www/register/email-confirm.tcl 20 May 2016 20:02:44 -0000 1.12.2.3 @@ -6,7 +6,7 @@ token:notnull,trim user_id:naturalnum,notnull - {return_url:return_url ""} + {return_url:localurl ""} } set subsite_id [ad_conn subsite_id] Index: openacs-4/packages/acs-subsite/www/register/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/index.tcl,v diff -u -N -r1.14.2.2 -r1.14.2.3 --- openacs-4/packages/acs-subsite/www/register/index.tcl 20 May 2016 18:13:42 -0000 1.14.2.2 +++ openacs-4/packages/acs-subsite/www/register/index.tcl 20 May 2016 20:02:44 -0000 1.14.2.3 @@ -5,7 +5,7 @@ {authority_id:naturalnum ""} {username ""} {email ""} - {return_url:return_url ""} + {return_url:localurl ""} } set subsite_id [ad_conn subsite_id] Index: openacs-4/packages/acs-subsite/www/register/logout.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/logout.tcl,v diff -u -N -r1.4.12.2 -r1.4.12.3 --- openacs-4/packages/acs-subsite/www/register/logout.tcl 20 May 2016 18:13:42 -0000 1.4.12.2 +++ openacs-4/packages/acs-subsite/www/register/logout.tcl 20 May 2016 20:02:44 -0000 1.4.12.3 @@ -6,7 +6,7 @@ @cvs-id $Id$ } { - {return_url:return_url ""} + {return_url:localurl ""} } if { $return_url eq "" } { Index: openacs-4/packages/acs-subsite/www/register/restore-bounce.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/restore-bounce.tcl,v diff -u -N -r1.1.12.2 -r1.1.12.3 --- openacs-4/packages/acs-subsite/www/register/restore-bounce.tcl 20 May 2016 18:13:42 -0000 1.1.12.2 +++ openacs-4/packages/acs-subsite/www/register/restore-bounce.tcl 20 May 2016 20:02:44 -0000 1.1.12.3 @@ -2,7 +2,7 @@ The page restores a user from the deleted state. @cvs-id $Id$ } { - {return_url:return_url {[ad_pvt_home]}} + {return_url:localurl {[ad_pvt_home]}} } set page_title [_ acs-mail-lite.Restore_bounce] Index: openacs-4/packages/acs-subsite/www/register/restore-user.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/restore-user.tcl,v diff -u -N -r1.5.24.2 -r1.5.24.3 --- openacs-4/packages/acs-subsite/www/register/restore-user.tcl 20 May 2016 18:13:42 -0000 1.5.24.2 +++ openacs-4/packages/acs-subsite/www/register/restore-user.tcl 20 May 2016 20:02:44 -0000 1.5.24.3 @@ -2,7 +2,7 @@ The page restores a user from the deleted state. @cvs-id $Id$ } { - {return_url:return_url {[ad_pvt_home]}} + {return_url:localurl {[ad_pvt_home]}} } set page_title [_ acs-subsite.Account_reopened_title] Index: openacs-4/packages/acs-subsite/www/register/user-join.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/user-join.tcl,v diff -u -N -r1.14.2.3 -r1.14.2.4 --- openacs-4/packages/acs-subsite/www/register/user-join.tcl 20 May 2016 18:13:42 -0000 1.14.2.3 +++ openacs-4/packages/acs-subsite/www/register/user-join.tcl 20 May 2016 20:02:44 -0000 1.14.2.4 @@ -11,7 +11,7 @@ } { {group_id:naturalnum,notnull {[application_group::group_id_from_package_id]}} {rel_type:notnull "membership_rel"} - {return_url:return_url {}} + {return_url:localurl {}} } -properties { context:onevalue role_pretty_name:onevalue Index: openacs-4/packages/acs-subsite/www/register/user-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/user-new.tcl,v diff -u -N -r1.22.12.3 -r1.22.12.4 --- openacs-4/packages/acs-subsite/www/register/user-new.tcl 20 May 2016 18:13:42 -0000 1.22.12.3 +++ openacs-4/packages/acs-subsite/www/register/user-new.tcl 20 May 2016 20:02:44 -0000 1.22.12.4 @@ -4,7 +4,7 @@ @cvs-id $Id$ } { {email ""} - {return_url:return_url [ad_pvt_home]} + {return_url:localurl [ad_pvt_home]} } -validate { valid_return_url { if {[string first {$} $return_url] > -1} { Index: openacs-4/packages/acs-subsite/www/shared/make-invisible.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/make-invisible.tcl,v diff -u -N -r1.2.10.2 -r1.2.10.3 --- openacs-4/packages/acs-subsite/www/shared/make-invisible.tcl 20 May 2016 18:13:42 -0000 1.2.10.2 +++ openacs-4/packages/acs-subsite/www/shared/make-invisible.tcl 20 May 2016 20:02:44 -0000 1.2.10.3 @@ -1,7 +1,7 @@ ad_page_contract { Make user invisible. } { - {return_url:return_url ""} + {return_url:localurl ""} } auth::require_login Index: openacs-4/packages/acs-subsite/www/shared/make-visible.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/make-visible.tcl,v diff -u -N -r1.2.10.2 -r1.2.10.3 --- openacs-4/packages/acs-subsite/www/shared/make-visible.tcl 20 May 2016 18:13:42 -0000 1.2.10.2 +++ openacs-4/packages/acs-subsite/www/shared/make-visible.tcl 20 May 2016 20:02:44 -0000 1.2.10.3 @@ -1,7 +1,7 @@ ad_page_contract { Make user visible. } { - {return_url:return_url ""} + {return_url:localurl ""} } auth::require_login Index: openacs-4/packages/acs-subsite/www/shared/parameters.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/parameters.tcl,v diff -u -N -r1.21.2.2 -r1.21.2.3 --- openacs-4/packages/acs-subsite/www/shared/parameters.tcl 20 May 2016 17:55:46 -0000 1.21.2.2 +++ openacs-4/packages/acs-subsite/www/shared/parameters.tcl 20 May 2016 20:02:44 -0000 1.21.2.3 @@ -8,7 +8,7 @@ {package_id:naturalnum "[ad_conn package_id]"} package_key:optional {scope "instance"} - {return_url:return_url,optional "[ad_conn url]?[ad_conn query]"} + {return_url:localurl,optional "[ad_conn url]?[ad_conn query]"} {section ""} } Index: openacs-4/packages/acs-subsite/www/shared/send-email.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/send-email.tcl,v diff -u -N -r1.8.8.4 -r1.8.8.5 --- openacs-4/packages/acs-subsite/www/shared/send-email.tcl 20 May 2016 18:13:42 -0000 1.8.8.4 +++ openacs-4/packages/acs-subsite/www/shared/send-email.tcl 20 May 2016 20:02:44 -0000 1.8.8.5 @@ -4,7 +4,7 @@ @author Miguel Marin (miguelmarin@viaro.net) Viaro Networks (www.viaro.net) } { sendto:notnull - {return_url:return_url ""} + {return_url:localurl ""} } -properties { context:onevalue } Index: openacs-4/packages/acs-subsite/www/shared/session-update.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/session-update.tcl,v diff -u -N -r1.3.12.2 -r1.3.12.3 --- openacs-4/packages/acs-subsite/www/shared/session-update.tcl 20 May 2016 18:13:42 -0000 1.3.12.2 +++ openacs-4/packages/acs-subsite/www/shared/session-update.tcl 20 May 2016 20:02:44 -0000 1.3.12.3 @@ -22,7 +22,7 @@ is signed and verified. } { session_property:array,verify - return_url:return_url + return_url:localurl } -validate { referrer_error { if { $session_property(referrer) ne [get_referrer] } { Index: openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl,v diff -u -N -r1.16.2.3 -r1.16.2.4 --- openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl 20 May 2016 18:13:42 -0000 1.16.2.3 +++ openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl 20 May 2016 20:02:44 -0000 1.16.2.4 @@ -5,7 +5,7 @@ @creation-date Unknown @cvs-id $Id$ } { - {return_url:return_url ""} + {return_url:localurl ""} {user_id:naturalnum ""} {edit_p:boolean 0} {message ""} Index: openacs-4/packages/acs-subsite/www/user/email-privacy-level.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/email-privacy-level.tcl,v diff -u -N -r1.4.2.2 -r1.4.2.3 --- openacs-4/packages/acs-subsite/www/user/email-privacy-level.tcl 20 May 2016 18:13:42 -0000 1.4.2.2 +++ openacs-4/packages/acs-subsite/www/user/email-privacy-level.tcl 20 May 2016 20:02:44 -0000 1.4.2.3 @@ -4,7 +4,7 @@ @author Miguel Marin (miguelmarin@viaro.net) Viaro Networks (www.viaro.net) } { {user_id:naturalnum ""} - {return_url:return_url ""} + {return_url:localurl ""} } if { $return_url eq "" } { Index: openacs-4/packages/acs-subsite/www/user/password-reset.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/password-reset.tcl,v diff -u -N -r1.3.2.2 -r1.3.2.3 --- openacs-4/packages/acs-subsite/www/user/password-reset.tcl 20 May 2016 18:13:42 -0000 1.3.2.2 +++ openacs-4/packages/acs-subsite/www/user/password-reset.tcl 20 May 2016 20:02:44 -0000 1.3.2.3 @@ -4,7 +4,7 @@ @cvs-id $Id$ } { {user_id:naturalnum,notnull {[ad_conn untrusted_user_id]}} - {return_url:return_url ""} + {return_url:localurl ""} {password_hash ""} {message ""} } Index: openacs-4/packages/acs-subsite/www/user/password-update.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/password-update.tcl,v diff -u -N -r1.23.2.2 -r1.23.2.3 --- openacs-4/packages/acs-subsite/www/user/password-update.tcl 20 May 2016 18:13:42 -0000 1.23.2.2 +++ openacs-4/packages/acs-subsite/www/user/password-update.tcl 20 May 2016 20:02:44 -0000 1.23.2.3 @@ -5,7 +5,7 @@ @cvs-id $Id$ } { {user_id:naturalnum,notnull {[ad_conn untrusted_user_id]}} - {return_url:return_url ""} + {return_url:localurl ""} {old_password ""} {message ""} } Index: openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.tcl,v diff -u -N -r1.9.2.2 -r1.9.2.3 --- openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.tcl 20 May 2016 18:13:42 -0000 1.9.2.2 +++ openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.tcl 20 May 2016 20:02:44 -0000 1.9.2.3 @@ -5,7 +5,7 @@ @creation-date 22 Jun 2000 @cvs-id $Id$ } { - {return_url:return_url "" } + {return_url:localurl "" } {user_id:naturalnum ""} } -properties { context:onevalue 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.9.2.2 -r1.9.2.3 --- openacs-4/packages/acs-subsite/www/user/portrait/erase.tcl 20 May 2016 18:13:42 -0000 1.9.2.2 +++ openacs-4/packages/acs-subsite/www/user/portrait/erase.tcl 20 May 2016 20:02:44 -0000 1.9.2.3 @@ -3,7 +3,7 @@ @cvs-id $Id$ } { - {return_url:return_url "" } + {return_url:localurl "" } {user_id:naturalnum ""} } -properties { context:onevalue Index: openacs-4/packages/acs-subsite/www/user/portrait/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/index.tcl,v diff -u -N -r1.12.2.5 -r1.12.2.6 --- openacs-4/packages/acs-subsite/www/user/portrait/index.tcl 20 May 2016 18:13:42 -0000 1.12.2.5 +++ openacs-4/packages/acs-subsite/www/user/portrait/index.tcl 20 May 2016 20:02:44 -0000 1.12.2.6 @@ -6,7 +6,7 @@ @creation-date September 26, 1999 @cvs-id $Id$ } { - {return_url:return_url "" } + {return_url:localurl "" } {user_id:naturalnum ""} } -properties { first_names:onevalue 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.17.2.3 -r1.17.2.4 --- openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl 20 May 2016 18:13:42 -0000 1.17.2.3 +++ openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl 20 May 2016 20:02:44 -0000 1.17.2.4 @@ -4,7 +4,7 @@ @cvs-id $Id$ } { {user_id:naturalnum ""} - {return_url:return_url ""} + {return_url:localurl ""} } -properties { first_names:onevalue last_name:onevalue