Index: openacs-4/packages/acs-subsite/tcl/group-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/group-procs.tcl,v
diff -u -r1.60.2.14 -r1.60.2.15
--- openacs-4/packages/acs-subsite/tcl/group-procs.tcl 17 Oct 2020 16:40:23 -0000 1.60.2.14
+++ openacs-4/packages/acs-subsite/tcl/group-procs.tcl 1 Feb 2021 10:58:35 -0000 1.60.2.15
@@ -506,7 +506,7 @@
#
# We can't use spaces in message keys, so replace it with a "_".
#
- regsub -all " " $member_state "_" member_state
+ regsub -all -- " " $member_state "_" member_state
switch -- $component {
pretty_name {
Index: openacs-4/packages/acs-subsite/tcl/plsql-utility-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/plsql-utility-procs.tcl,v
diff -u -r1.9.2.2 -r1.9.2.3
--- openacs-4/packages/acs-subsite/tcl/plsql-utility-procs.tcl 3 Jul 2020 07:43:20 -0000 1.9.2.2
+++ openacs-4/packages/acs-subsite/tcl/plsql-utility-procs.tcl 1 Feb 2021 10:58:35 -0000 1.9.2.3
@@ -151,12 +151,12 @@
set suffix ""
}
# Leave only letters, numbers, underscores, dashes, and spaces
- regsub -all {[^ _\-a-z0-9]} [string tolower $stem] "" stem
+ regsub -all -- {[^ _\-a-z0-9]} [string tolower $stem] "" stem
# Make sure it starts with a letter
regsub {^[^a-z]} $stem "" stem
# change spaces to underscores
- regsub -all {\s+} $stem "_" stem
+ regsub -all -- {\s+} $stem "_" stem
#Trim to fit in $max_length character limit
set max_length_without_suffix [expr {$max_length - [string length $suffix]}]
if { [string length $stem] >= $max_length_without_suffix } {
Index: openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl,v
diff -u -r1.68.2.19 -r1.68.2.20
--- openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl 19 Jan 2021 13:01:17 -0000 1.68.2.19
+++ openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl 1 Feb 2021 10:58:35 -0000 1.68.2.20
@@ -855,8 +855,8 @@
foreach {var param} $settings {
set default [string trim [set $var]]
set value [string trim [parameter::get -parameter $param -package_id $subsite_id]]
- regsub -all {\r\n} $value "\n" value
- regsub -all {\r\n} $default "\n" default
+ regsub -all -- {\r\n} $value "\n" value
+ regsub -all -- {\r\n} $default "\n" default
set collect_p [expr {$default eq $value}]
if {!$collect_p} {
ns_log notice "theme '$theme' parameter $var differs on subsite '$subsite_id': default '$default' actual value '$value'"
Index: openacs-4/packages/acs-subsite/www/admin/themes/view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/themes/view.tcl,v
diff -u -r1.4.2.1 -r1.4.2.2
--- openacs-4/packages/acs-subsite/www/admin/themes/view.tcl 16 May 2019 09:54:29 -0000 1.4.2.1
+++ openacs-4/packages/acs-subsite/www/admin/themes/view.tcl 1 Feb 2021 10:58:35 -0000 1.4.2.2
@@ -66,9 +66,9 @@
if {$currentThemeKey eq $key} {
set currentValue [string trim [parameter::get -parameter $param -package_id $subsite_id]]
- regsub -all {\r\n} $currentValue "\n" currentValue
+ regsub -all -- {\r\n} $currentValue "\n" currentValue
set value [string trim [set $var]]
- regsub -all {\r\n} $value "\n" value
+ regsub -all -- {\r\n} $value "\n" value
if {$currentValue ne $value} {
lappend currentSpec [list help_text "differs"]
ns_log notice "current value \n<$currentValue>\ndiffers from\n<$value>"
Index: openacs-4/packages/acs-subsite/www/members/user-batch-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/user-batch-add-2.tcl,v
diff -u -r1.8.2.1 -r1.8.2.2
--- openacs-4/packages/acs-subsite/www/members/user-batch-add-2.tcl 16 May 2019 09:54:29 -0000 1.8.2.1
+++ openacs-4/packages/acs-subsite/www/members/user-batch-add-2.tcl 1 Feb 2021 10:58:35 -0000 1.8.2.2
@@ -98,7 +98,7 @@
set sub_message $message
foreach key $key_list value $value_list {
- regsub -all "<$key>" $sub_message $value sub_message
+ regsub -all -- "<$key>" $sub_message $value sub_message
}
if {[catch {acs_mail_lite::send -send_immediately -to_addr $email -from_addr $from -subject $subject -body $sub_message} errmsg]} {
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 -r1.21 -r1.21.2.1
--- openacs-4/packages/acs-subsite/www/permissions/grant.tcl 9 May 2018 15:33:28 -0000 1.21
+++ openacs-4/packages/acs-subsite/www/permissions/grant.tcl 1 Feb 2021 10:58:35 -0000 1.21.2.1
@@ -68,7 +68,7 @@
# define the block
set block_to_move [lrange $hierarchy $start_pos $end_pos]
- # Only cut out the block if it is on the toplevel, which means it
+ # Only cut out the block if it is on the top-level, which means it
# hasn't been moved yet. Otherwise the block will appear in two
# places intentionally.
if { [lindex $hierarchy $start_pos 0] == 0 } {
Index: openacs-4/packages/acs-content-repository/tcl/content-item-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-item-procs.tcl,v
diff -u -r1.38.2.5 -r1.38.2.6
--- openacs-4/packages/acs-content-repository/tcl/content-item-procs.tcl 3 Jul 2020 07:27:29 -0000 1.38.2.5
+++ openacs-4/packages/acs-content-repository/tcl/content-item-procs.tcl 1 Feb 2021 11:00:34 -0000 1.38.2.6
@@ -880,7 +880,7 @@
# extension also matches any char unless it is escaped. Like Malte, I
# see no reason to get rid of the extension in the title anyway ...
- # regsub -all ".${extension}\$" $filename "" title
+ # regsub -all -- ".${extension}\$" $filename "" title
set title $filename
}
Index: openacs-4/packages/acs-content-repository/tcl/doc-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/doc-procs.tcl,v
diff -u -r1.11 -r1.11.2.1
--- openacs-4/packages/acs-content-repository/tcl/doc-procs.tcl 1 May 2018 08:27:19 -0000 1.11
+++ openacs-4/packages/acs-content-repository/tcl/doc-procs.tcl 1 Feb 2021 11:00:34 -0000 1.11.2.1
@@ -133,7 +133,7 @@
if { [info exists tags(see)] } {
if { ![info exists opts(link_url_stub)] } {
# Just remove the links
- regsub -all {\{([^\}]*)\}} $tags(see) {\1} new_see
+ regsub -all -- {\{([^\}]*)\}} $tags(see) {\1} new_see
set tags(see) $new_see
} else {
if { ![info exists opts(link_package_name)] } {
@@ -143,9 +143,9 @@
set opts(link_proc_name) proc_name
}
- regsub -all {\&} $opts(link_url_stub) {\\\&} stub
+ regsub -all -- {\&} $opts(link_url_stub) {\\\&} stub
set subspec "\\1.\\2"
- regsub -all {\{([a-zA-Z0-9_]+)\.([a-zA-Z0-9_]+)\}} $tags(see) $subspec new_see
+ regsub -all -- {\{([a-zA-Z0-9_]+)\.([a-zA-Z0-9_]+)\}} $tags(see) $subspec new_see
set tags(see) $new_see
}
}
Index: openacs-4/packages/forums/lib/search/search-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/search/search-chunk.tcl,v
diff -u -r1.14 -r1.14.2.1
--- openacs-4/packages/forums/lib/search/search-chunk.tcl 26 Jun 2018 10:39:02 -0000 1.14
+++ openacs-4/packages/forums/lib/search/search-chunk.tcl 1 Feb 2021 11:01:48 -0000 1.14.2.1
@@ -19,10 +19,10 @@
# remove any special characters from the search text so we
# don't crash interMedia
- regsub -all {[^[:alnum:]_[:blank:]]} $search_text {} search_text
+ regsub -all -- {[^[:alnum:]_[:blank:]]} $search_text {} search_text
# replace subsequent spaces
- regsub -all {\s+} $search_text " " search_text
+ regsub -all -- {\s+} $search_text " " search_text
set search_text [string trim $search_text]
# don't search for empty search strings
Index: openacs-4/packages/forums/tcl/forums-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/forums-callback-procs.tcl,v
diff -u -r1.12.2.5 -r1.12.2.6
--- openacs-4/packages/forums/tcl/forums-callback-procs.tcl 21 Jul 2020 14:03:49 -0000 1.12.2.5
+++ openacs-4/packages/forums/tcl/forums-callback-procs.tcl 1 Feb 2021 11:01:48 -0000 1.12.2.6
@@ -206,8 +206,8 @@
# ms.
#
if {$message(format) eq "text/enhanced"} {
- regsub -all {} $content "\n\n" content
- regsub -all {(]*>)} $content "" content
+ regsub -all -- {
} $content "\n\n" content
+ regsub -all -- {(]*>)} $content "" content
} else {
set content [ad_html_text_convert -from $format -to text/plain -- $content]
}
Index: openacs-4/packages/forums/tcl/messages-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/messages-procs.tcl,v
diff -u -r1.59.2.24 -r1.59.2.25
--- openacs-4/packages/forums/tcl/messages-procs.tcl 11 Aug 2020 13:35:13 -0000 1.59.2.24
+++ openacs-4/packages/forums/tcl/messages-procs.tcl 1 Feb 2021 11:01:48 -0000 1.59.2.25
@@ -151,7 +151,7 @@
# a zero width space after the "#" signs to make the regular
# expression searching for the message keys fail....
#
- regsub -all "#" $message_html "#\\" message_html
+ regsub -all -- "#" $message_html "#\\" message_html
}
set html_version ""
Index: openacs-4/packages/dotlrn/tcl/navigation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/navigation-procs.tcl,v
diff -u -r1.31.2.1 -r1.31.2.2
--- openacs-4/packages/dotlrn/tcl/navigation-procs.tcl 5 Oct 2019 13:43:47 -0000 1.31.2.1
+++ openacs-4/packages/dotlrn/tcl/navigation-procs.tcl 1 Feb 2021 11:02:58 -0000 1.31.2.2
@@ -268,7 +268,7 @@
#Strip out extra anchors and other crud.
#page_num will be empty_string for special pages like
#My Space and Control Panel
- regsub -all {[^0-9]} $page_num {} page_num
+ regsub -all -- {[^0-9]} $page_num {} page_num
db_foreach list_page_nums_select {} {
if { ("$dotlrn_url/" == [ad_conn url] || "$dotlrn_url/index" == [ad_conn url]) && $sort_key == 0 && $page_num eq ""} {
Index: openacs-4/packages/dotlrn/www/manage-memberships.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/manage-memberships.tcl,v
diff -u -r1.24 -r1.24.2.1
--- openacs-4/packages/dotlrn/www/manage-memberships.tcl 15 Sep 2017 07:28:53 -0000 1.24
+++ openacs-4/packages/dotlrn/www/manage-memberships.tcl 1 Feb 2021 11:03:26 -0000 1.24.2.1
@@ -312,7 +312,7 @@
}
db_multirow non_member_classes $non_member_query {} {
- regsub -all {
} $description {
} description
+ regsub -all -- {
} $description {
} description
}
template::list::create -name non_member_clubs -multirow non_member_clubs -pass_properties { show_drop_button_p referer swa_p} -html {width 100%} -elements {
@@ -349,7 +349,7 @@
}
db_multirow non_member_clubs select_non_member_clubs {} {
- regsub -all {
} $description {
} description
+ regsub -all -- {
} $description {
} description
}
Index: openacs-4/packages/dotlrn/tcl/spam-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/spam-procs.tcl,v
diff -u -r1.13 -r1.13.2.1
--- openacs-4/packages/dotlrn/tcl/spam-procs.tcl 9 May 2018 15:33:30 -0000 1.13
+++ openacs-4/packages/dotlrn/tcl/spam-procs.tcl 1 Feb 2021 11:04:09 -0000 1.13.2.1
@@ -41,7 +41,7 @@
@return the interpolated string
} {
foreach tuple $values {
- regsub -all [lindex $tuple 0] $text [lindex $tuple 1] text
+ regsub -all -- [lindex $tuple 0] $text [lindex $tuple 1] text
}
return $text
Index: openacs-4/packages/file-storage/lib/folder-links.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/lib/folder-links.tcl,v
diff -u -r1.5.2.6 -r1.5.2.7
--- openacs-4/packages/file-storage/lib/folder-links.tcl 3 May 2020 18:13:02 -0000 1.5.2.6
+++ openacs-4/packages/file-storage/lib/folder-links.tcl 1 Feb 2021 11:05:41 -0000 1.5.2.7
@@ -102,7 +102,7 @@
# We need to encode the hashes in any i18n message keys (.LRN plays this trick on some of its folders).
# If we don't, the hashes will cause the path to be chopped off (by ns_conn url) at the leftmost hash.
- regsub -all {\#} $file_url {%23} file_url
+ regsub -all -- {\#} $file_url {%23} file_url
}
ad_return_template
Index: openacs-4/packages/file-storage/tcl/file-storage-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs.tcl,v
diff -u -r1.90.2.9 -r1.90.2.10
--- openacs-4/packages/file-storage/tcl/file-storage-procs.tcl 21 Jul 2020 14:06:40 -0000 1.90.2.9
+++ openacs-4/packages/file-storage/tcl/file-storage-procs.tcl 1 Feb 2021 11:05:41 -0000 1.90.2.10
@@ -371,7 +371,7 @@
@see ad_sanitize_filename
} {
- regsub -all {[<>:\"|/@\#%&+\\]} $string {_} string
+ regsub -all -- {[<>:\"|/@\#%&+\\]} $string {_} string
return [string trim $string]
}
@@ -724,16 +724,16 @@
} {
set cmd [parameter::get -parameter ArchiveCommand -default "tar cf - {in_file} | gzip > {out_file}"]
- regsub -all {(\W)} $in_file {\\\1} in_file
- regsub -all {\\/} $in_file {/} in_file
- regsub -all {\\\.} $in_file {.} in_file
+ regsub -all -- {(\W)} $in_file {\\\1} in_file
+ regsub -all -- {\\/} $in_file {/} in_file
+ regsub -all -- {\\\.} $in_file {.} in_file
- regsub -all {(\W)} $out_file {\\\1} out_file
- regsub -all {\\/} $out_file {/} out_file
- regsub -all {\\\.} $out_file {.} out_file
+ regsub -all -- {(\W)} $out_file {\\\1} out_file
+ regsub -all -- {\\/} $out_file {/} out_file
+ regsub -all -- {\\\.} $out_file {.} out_file
- regsub -all {{in_file}} $cmd $in_file cmd
- regsub -all {{out_file}} $cmd $out_file cmd
+ regsub -all -- {{in_file}} $cmd $in_file cmd
+ regsub -all -- {{out_file}} $cmd $out_file cmd
return $cmd
}
Index: openacs-4/packages/file-storage/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/index.tcl,v
diff -u -r1.35 -r1.35.2.1
--- openacs-4/packages/file-storage/www/index.tcl 16 Jul 2018 07:44:11 -0000 1.35
+++ openacs-4/packages/file-storage/www/index.tcl 1 Feb 2021 11:05:42 -0000 1.35.2.1
@@ -106,7 +106,7 @@
if { $use_webdav_p == 1} {
set webdav_url [fs::webdav_url -item_id $folder_id]
- regsub -all {/\$} $webdav_url {/\\$} webdav_url
+ regsub -all -- {/\$} $webdav_url {/\\$} webdav_url
}
# FIXME make this a parameter!
Index: openacs-4/packages/file-storage/www/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/search.tcl,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/file-storage/www/search.tcl 30 Apr 2018 07:57:40 -0000 1.6
+++ openacs-4/packages/file-storage/www/search.tcl 1 Feb 2021 11:05:42 -0000 1.6.2.1
@@ -22,9 +22,9 @@
# In case they used wildcards, replace * with %
-regsub -all {\*} $query {%} query
+regsub -all -- {\*} $query {%} query
set query "%${query}%"
-regsub -all {%+} $query {%} query
+regsub -all -- {%+} $query {%} query
db_multirow results get_ids_and_titles {}