Index: openacs-4/packages/lars-blogger/lib/blog-titles.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/lib/blog-titles.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/lars-blogger/lib/blog-titles.tcl 30 Oct 2013 17:37:08 -0000 1.3
+++ openacs-4/packages/lars-blogger/lib/blog-titles.tcl 28 Jun 2015 12:46:36 -0000 1.4
@@ -57,7 +57,7 @@
}
incr output_rows_count
- set permalink_url "${package_url}one-entry?[export_vars { entry_id }]"
+ set permalink_url [export_vars -base ${package_url}one-entry { entry_id }]
}
set arrow_url "${package_url}graphics/arrow-box.gif"
Index: openacs-4/packages/lars-blogger/lib/last-n-comments.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/lib/last-n-comments.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/lars-blogger/lib/last-n-comments.tcl 30 Oct 2013 17:37:08 -0000 1.2
+++ openacs-4/packages/lars-blogger/lib/last-n-comments.tcl 28 Jun 2015 12:46:36 -0000 1.3
@@ -6,6 +6,7 @@
-parameter NumberOfCommentsInIncludelet]
}
+set entry_base [ad_url][lars_blog_public_package_url]/one-entry
db_multirow -extend {entry_url} comments select_n_comments "" {
- set entry_url "[ad_url][lars_blog_public_package_url]/one-entry?[export_vars entry_id]"
-}
\ No newline at end of file
+ set entry_url [export_vars -base $entry_base entry_id]
+}
Index: openacs-4/packages/lars-blogger/tcl/entry-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/entry-procs.tcl,v
diff -u -r1.26 -r1.27
--- openacs-4/packages/lars-blogger/tcl/entry-procs.tcl 30 Oct 2013 17:37:08 -0000 1.26
+++ openacs-4/packages/lars-blogger/tcl/entry-procs.tcl 28 Jun 2015 12:46:36 -0000 1.27
@@ -217,7 +217,7 @@
get -entry_id $entry_id -array blog
set blog_url "[ad_url][lars_blog_public_package_url -package_id $blog(package_id)]"
- set entry_url "[ad_url][lars_blog_public_package_url -package_id $blog(package_id)]one-entry?[export_vars { entry_id }]"
+ set entry_url [export_vars -base "[ad_url][lars_blog_public_package_url -package_id $blog(package_id)]one-entry" { entry_id }]
set blog_name [lars_blog_name -package_id $blog(package_id)]
set new_content ""
Index: openacs-4/packages/lars-blogger/tcl/technorati-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/technorati-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/lars-blogger/tcl/technorati-procs.tcl 30 Oct 2013 17:37:09 -0000 1.3
+++ openacs-4/packages/lars-blogger/tcl/technorati-procs.tcl 28 Jun 2015 12:46:36 -0000 1.4
@@ -170,7 +170,7 @@
set url "[ad_url][lars_blog_public_package_url]"
}
- set api_url "http://api.technorati.com/cosmos?[export_vars -url [list key url type version]]"
+ set api_url [export_vars -base http://api.technorati.com/cosmos [list key url type version]]
array set f [ad_httpget -url $api_url -timeout 60]
if {$f(status) == 200} {
Index: openacs-4/packages/lars-blogger/www/blog.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/blog.tcl,v
diff -u -r1.28 -r1.29
--- openacs-4/packages/lars-blogger/www/blog.tcl 30 Oct 2013 17:37:09 -0000 1.28
+++ openacs-4/packages/lars-blogger/www/blog.tcl 28 Jun 2015 12:46:36 -0000 1.29
@@ -217,7 +217,7 @@
append sw_category_url "swcat/$sw_category_id"
}
- set permalink_url "${package_url}one-entry?[export_vars { entry_id }]"
+ set permalink_url [export_vars -base ${package_url}one-entry { entry_id }]
# Inner multirow. Here's its magic name:
set sw_category_multirow "__branimir__multirow__blog/$entry_id"
Index: openacs-4/packages/lars-blogger/www/entry-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-chunk.tcl,v
diff -u -r1.24 -r1.25
--- openacs-4/packages/lars-blogger/www/entry-chunk.tcl 30 Oct 2013 17:37:09 -0000 1.24
+++ openacs-4/packages/lars-blogger/www/entry-chunk.tcl 28 Jun 2015 12:46:36 -0000 1.25
@@ -71,14 +71,16 @@
-creation_user $blog(user_id) \
-party_id [ad_conn untrusted_user_id]]
-set display_categories [lars_blog_categories_p \
- -package_id [ad_conn package_id]]
+set display_categories [lars_blog_categories_p -package_id [ad_conn package_id]]
+set comment_return_url [export_vars -base ${package_url}flush-cache { return_url }]
-set comment_return_url "${package_url}flush-cache?[export_vars { return_url }]"
-
if { [template::util::is_true $show_comments_p] } {
lars_blogger::entry::get_comments -entry_id $entry_id
- set blog(comment_add_url) [export_vars -base "${general_comments_package_url}comment-add" { { object_id $entry_id } { object_name $blog(title) } { return_url "$comment_return_url"} }]
+ set blog(comment_add_url) [export_vars -base "${general_comments_package_url}comment-add" {
+ { object_id $entry_id }
+ { object_name $blog(title) }
+ { return_url "$comment_return_url"}
+ }]
}
set blog(posted_time_pretty) [util::age_pretty \
Index: openacs-4/packages/lars-blogger/www/entry-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-edit.tcl,v
diff -u -r1.31 -r1.32
--- openacs-4/packages/lars-blogger/www/entry-edit.tcl 6 Aug 2014 16:39:15 -0000 1.31
+++ openacs-4/packages/lars-blogger/www/entry-edit.tcl 28 Jun 2015 12:46:36 -0000 1.32
@@ -200,7 +200,7 @@
} \
-after_submit {
if {"$draft_p" == "t"} {
- ad_returnredirect one-entry?[export_vars -url {entry_id}]
+ ad_returnredirect [export_vars -base one-entry {entry_id}]
} else {
ad_returnredirect $return_url
}
Index: openacs-4/packages/lars-blogger/www/entry-headline.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-headline.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/lars-blogger/www/entry-headline.tcl 30 Oct 2013 17:37:09 -0000 1.4
+++ openacs-4/packages/lars-blogger/www/entry-headline.tcl 28 Jun 2015 12:46:36 -0000 1.5
@@ -52,9 +52,9 @@
set entry_id $blog(entry_id)
if { $screen_name eq "" } {
- set blog(permalink_url) "${package_url}one-entry?[export_vars { entry_id }]"
+ set blog(permalink_url) [export_vars -base ${package_url}one-entry { entry_id }]
} else {
- set blog(permalink_url) "${package_url}user/$screen_name/one-entry?[export_vars { entry_id }]"
+ set blog(permalink_url) [export_vars -base ${package_url}user/$screen_name/one-entry { entry_id }]
}
lars_blogger::entry::htmlify \
@@ -79,7 +79,11 @@
if { [template::util::is_true $show_comments_p] } {
lars_blogger::entry::get_comments -entry_id $entry_id
- set blog(comment_add_url) [export_vars -base "${general_comments_package_url}comment-add" { { object_id $entry_id } { object_name $blog(title) } { return_url "${package_url}flush-cache?[export_vars { return_url }]"} }]
+ set blog(comment_add_url) [export_vars -base "${general_comments_package_url}comment-add" {
+ { object_id $entry_id }
+ { object_name $blog(title) }
+ { return_url "[export_vars -base ${package_url}flush-cache { return_url }]"}
+ }]
}
set blog(posted_time_pretty) [util::age_pretty \
Index: openacs-4/packages/lars-blogger/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/index.tcl,v
diff -u -r1.34 -r1.35
--- openacs-4/packages/lars-blogger/www/index.tcl 6 Aug 2014 16:39:15 -0000 1.34
+++ openacs-4/packages/lars-blogger/www/index.tcl 28 Jun 2015 12:46:37 -0000 1.35
@@ -50,7 +50,7 @@
# Set up the <link> elements for the HTML <head>
# 3 items - RSS, RSD and stylesheet.
set rss_file_url [parameter::get -parameter rss_file_url -default ""]
-if { $rss_file_url eq "" && ![empty_string_p [parameter::get -parameter "rss_file_name"]] } {
+if { $rss_file_url eq "" && [parameter::get -parameter "rss_file_name"] ne "" } {
if {([info exists screen_name] && $screen_name ne "")} {
set rss_file_url "${package_url}user/$screen_name/rss/[parameter::get -parameter "rss_file_name"]"
} else {
Index: openacs-4/packages/lars-blogger/www/one-entry.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/one-entry.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/lars-blogger/www/one-entry.tcl 6 Aug 2014 16:39:15 -0000 1.21
+++ openacs-4/packages/lars-blogger/www/one-entry.tcl 28 Jun 2015 12:46:37 -0000 1.22
@@ -60,9 +60,9 @@
if {![info exists screen_name] || $screen_name eq ""} {
set screen_name ""
set context [list $page_title]
- set blog(permalink_url) "${package_url}one-entry?[export_vars { entry_id }]"
+ set blog(permalink_url) [export_vars -base ${package_url}one-entry { entry_id }]
} else {
- set blog(permalink_url) "${package_url}user/$screen_name/one-entry?[export_vars { entry_id }]"
+ set blog(permalink_url) [export_vars -base ${package_url}user/$screen_name/one-entry { entry_id }]
set context [list $screen_name]
}
Index: openacs-4/packages/lars-blogger/www/admin/blogroll.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/blogroll.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/lars-blogger/www/admin/blogroll.tcl 8 Aug 2006 21:26:58 -0000 1.3
+++ openacs-4/packages/lars-blogger/www/admin/blogroll.tcl 28 Jun 2015 12:46:37 -0000 1.4
@@ -57,9 +57,9 @@
delete_link
edit_link
} links links_select "" {
- set move_up_link "blogroll-move?[export_vars -url [list link_id [list direction up]]]"
- set move_down_link "blogroll-move?[export_vars -url [list link_id [list direction down]]]"
- set delete_link "blogroll-delete?[export_vars -url link_id]"
- set edit_link "blogroll-ae?[export_vars -url link_id]"
+ set move_up_link [export_vars -base blogroll-move {link_id {direction up}}]
+ set move_down_link [export_vars -base blogroll-move {link_id {direction down}}]
+ set delete_link [export_vars -base blogroll-delete link_id]
+ set edit_link [export_vars -base blogroll-ae link_id]
}
Index: openacs-4/packages/lars-blogger/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/index.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/lars-blogger/www/admin/index.tcl 11 Sep 2013 07:23:43 -0000 1.13
+++ openacs-4/packages/lars-blogger/www/admin/index.tcl 28 Jun 2015 12:46:37 -0000 1.14
@@ -30,6 +30,6 @@
set rss_manage_url "[apm_package_url_from_key "rss-support"]my-subscrs"
-if { ![empty_string_p [parameter::get -parameter "rss_file_name"]] } {
+if { [parameter::get -parameter "rss_file_name"] ne "" } {
set rss_file_url "[ad_conn package_url]rss/[parameter::get -parameter "rss_file_name"]"
}
Index: openacs-4/packages/new-portal/www/themes/kelp-theme/site-master-kelp.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/themes/kelp-theme/site-master-kelp.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/new-portal/www/themes/kelp-theme/site-master-kelp.tcl 1 Nov 2013 21:45:34 -0000 1.4
+++ openacs-4/packages/new-portal/www/themes/kelp-theme/site-master-kelp.tcl 28 Jun 2015 12:49:11 -0000 1.5
@@ -72,8 +72,7 @@
# change locale
set num_of_locales [llength [lang::system::get_locales]]
if { $num_of_locales > 1 } {
- set change_locale_url \
- "/acs-lang/?[export_vars { { package_id "[ad_conn package_id]" } }]"
+ set change_locale_url [export_vars -base /acs-lang { { package_id "[ad_conn package_id]" } }]
}
# Curriculum bar
Index: openacs-4/packages/new-portal/www/themes/kelp-theme/dotlrn/dotlrn-master-kelp.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/themes/kelp-theme/dotlrn/dotlrn-master-kelp.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/new-portal/www/themes/kelp-theme/dotlrn/dotlrn-master-kelp.tcl 1 Nov 2013 21:45:34 -0000 1.5
+++ openacs-4/packages/new-portal/www/themes/kelp-theme/dotlrn/dotlrn-master-kelp.tcl 28 Jun 2015 12:49:11 -0000 1.6
@@ -322,7 +322,7 @@
set ds_link {}
}
-set change_locale_url "/acs-lang/?[export_vars { { package_id "[ad_conn package_id]" } }]"
+set change_locale_url [export_vars -base /acs-lang { { package_id "[ad_conn package_id]" } }]
# Hack for title and context bar outside of dotlrn
Index: openacs-4/packages/photo-album/tcl/photo-album-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/tcl/photo-album-procs.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/photo-album/tcl/photo-album-procs.tcl 23 Jun 2015 16:34:08 -0000 1.21
+++ openacs-4/packages/photo-album/tcl/photo-album-procs.tcl 28 Jun 2015 12:56:09 -0000 1.22
@@ -840,7 +840,7 @@
continue
}
- foreach {base_bytes base_width base_height base_type base_mime base_colors base_quantum base_sha256} $base_info { break }
+ lassign $base_info base_bytes base_width base_height base_type base_mime base_colors base_quantum base_sha256
# If we don't have a mime type we like we try to make a jpg or png
#
@@ -871,7 +871,7 @@
}
# get info again
- foreach {base_bytes base_width base_height base_type base_mime base_colors base_quantum base_sha256} [pa_file_info $image_file] { break }
+ lassign [pa_file_info $image_file] base_bytes base_width base_height base_type base_mime base_colors base_quantum base_sha256
}
if {$base_mime eq "image/jpeg"} {
Index: openacs-4/packages/photo-album/www/album-export.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/album-export.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/photo-album/www/album-export.tcl 7 Aug 2014 07:59:50 -0000 1.6
+++ openacs-4/packages/photo-album/www/album-export.tcl 28 Jun 2015 12:56:09 -0000 1.7
@@ -34,7 +34,7 @@
and ci.item_id = :album_id
}
- # set path [ns_tmpnam]
+ # set path [ad_tmpnam]
regsub -all -- {[^a-zA-Z0-9\.-]} $album_name {_} album_name
set original_path [file join [acs_root_dir] album-exports $album_name]
set path $original_path
Index: openacs-4/packages/photo-album/www/album.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/album.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/photo-album/www/album.tcl 7 Aug 2014 07:59:50 -0000 1.7
+++ openacs-4/packages/photo-album/www/album.tcl 28 Jun 2015 12:56:09 -0000 1.8
@@ -116,7 +116,7 @@
for {set i 1} {$i <= $total_pages} {incr i} {
lappend pages $i
}
- set page_nav [pa_pagination_bar $page $pages "album?[export_vars -url {album_id}]&page=" page]
+ set page_nav [pa_pagination_bar $page $pages "[export_vars -base album {album_id}]&page="]
} else {
# don't bother querying for children if we know they don't exist
Index: openacs-4/packages/photo-album/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/index.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/photo-album/www/index.tcl 7 Aug 2014 07:59:50 -0000 1.9
+++ openacs-4/packages/photo-album/www/index.tcl 28 Jun 2015 12:56:09 -0000 1.10
@@ -41,7 +41,7 @@
set package_id [ad_conn package_id]
set return_url [ad_conn url]
-set parameter_url_vars [export_vars -url {package_id return_url}]
+set parameter_url_vars [export_vars {package_id return_url}]
# to move an album need write on album and write on parent folder
set root_folder_id [pa_get_root_folder]
Index: openacs-4/packages/photo-album/www/photo-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo-add-2.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/photo-album/www/photo-add-2.tcl 7 Aug 2014 07:59:50 -0000 1.10
+++ openacs-4/packages/photo-album/www/photo-add-2.tcl 28 Jun 2015 12:56:09 -0000 1.11
@@ -30,7 +30,7 @@
ad_complain "error"
}
- foreach {base_bytes base_width base_height base_type base_mime base_colors base_quantum base_sha256} $photo_info { break }
+ lassign $photo_info base_bytes base_width base_height base_type base_mime base_colors base_quantum base_sha256
if {$base_mime eq ""} {
set base_mime invalid
Index: openacs-4/packages/photo-album/www/photos-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photos-edit.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/photo-album/www/photos-edit.tcl 7 Aug 2014 07:59:51 -0000 1.8
+++ openacs-4/packages/photo-album/www/photos-edit.tcl 28 Jun 2015 12:56:09 -0000 1.9
@@ -170,7 +170,7 @@
for {set i 1} {$i <= $total_pages} {incr i} {
lappend pages $i
}
- set page_nav [pa_pagination_bar $page $pages "photos-edit?[export_vars -url {album_id}]&page="]
+ set page_nav [pa_pagination_bar $page $pages "[export_vars -base photos-edit {album_id}]&page="]
} else {