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 -N -r1.70 -r1.71
--- openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	7 Aug 2017 23:48:11 -0000	1.70
+++ openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	1 Oct 2017 12:09:46 -0000	1.71
@@ -513,7 +513,7 @@
 
     db_1row select_object_info {}
     
-    switch $type {
+    switch -- $type {
 	folder {
 	    set result [publish_folder_to_file_system -folder_id $object_id -path $path -folder_name $name -user_id $user_id]
 	} 
@@ -650,7 +650,7 @@
                        -tolower \
                        $file_name]
 
-    switch $storage_type {
+    switch -- $storage_type {
 	lob {
 
 	    # FIXME: db_blob_get_file is failing when i use bind variables
Index: openacs-4/packages/file-storage/www/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/delete.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/file-storage/www/delete.tcl	7 Aug 2017 23:48:11 -0000	1.9
+++ openacs-4/packages/file-storage/www/delete.tcl	1 Oct 2017 12:09:46 -0000	1.10
@@ -59,7 +59,7 @@
     db_transaction {
         template::multirow foreach delete_list {
             if {$delete_p} {
-                switch $type {
+                switch -- $type {
                     folder {
                         fs::delete_folder \
                             -folder_id $fs_object_id \
Index: openacs-4/packages/forums/lib/message/threads-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/threads-chunk.tcl,v
diff -u -N -r1.20 -r1.21
--- openacs-4/packages/forums/lib/message/threads-chunk.tcl	27 Sep 2017 17:01:42 -0000	1.20
+++ openacs-4/packages/forums/lib/message/threads-chunk.tcl	1 Oct 2017 12:09:46 -0000	1.21
@@ -170,7 +170,7 @@
     }
     set n_messages_pretty [lc_numeric $n_messages]
 
-    switch $state {
+    switch -- $state {
         pending {
             set state_pretty [_ forums.Pending]
         }
Index: openacs-4/packages/news/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/index.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/news/www/admin/index.tcl	7 Aug 2017 23:48:12 -0000	1.9
+++ openacs-4/packages/news/www/admin/index.tcl	1 Oct 2017 12:09:46 -0000	1.10
@@ -39,7 +39,7 @@
 set view_option [ad_dimensional_sql $view_slider]
 
 # define action on selected views, unapproved, archived, approved need restriction
-switch $view {
+switch -- $view {
     "unapproved" { 
         set select_actions "<option value=\"publish\">[_ news.Publish]" 
     }
Index: openacs-4/packages/news/www/admin/process-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/process-2.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/news/www/admin/process-2.tcl	7 Aug 2017 23:48:12 -0000	1.5
+++ openacs-4/packages/news/www/admin/process-2.tcl	1 Oct 2017 12:09:46 -0000	1.6
@@ -22,7 +22,7 @@
 }
 
 
-switch $action {
+switch -- $action {
     
     delete {
 	news_items_delete $n_items
Index: openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl,v
diff -u -N -r1.79 -r1.80
--- openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl	7 Aug 2017 23:48:30 -0000	1.79
+++ openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl	1 Oct 2017 12:10:25 -0000	1.80
@@ -800,7 +800,7 @@
 }
 
 proc ::xo::getObjectProperty {o what args} {
-  switch $what {
+  switch -- $what {
     "mixin" {
       return [$o ::nsf::methods::object::info::mixins]
     }
Index: openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl,v
diff -u -N -r1.104 -r1.105
--- openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl	7 Aug 2017 23:48:30 -0000	1.104
+++ openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl	1 Oct 2017 12:10:25 -0000	1.105
@@ -1957,7 +1957,7 @@
         foreach constr $db_constraints($col) {
           set type  [lindex $constr 0]
           set value [join [lrange $constr 1 end]]
-          switch $type {
+          switch -- $type {
             "unique" {
               ::xo::db::require unique \
                   -table $table_name -col $col
Index: openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl,v
diff -u -N -r1.44 -r1.45
--- openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl	7 Aug 2017 23:48:30 -0000	1.44
+++ openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl	1 Oct 2017 12:10:25 -0000	1.45
@@ -973,7 +973,7 @@
         }
         # log the change
         set timestamp [clock format [clock seconds]]
-        switches.log write "$timestamp -- switch $key from\
+        switches.log write "$timestamp -- switch -- $key from\
          [$class set pa($key)] to $pa $url"
       }
     } elseif {[$class exists pa($pa)]} {
Index: openacs-4/packages/xotcl-request-monitor/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/index.tcl,v
diff -u -N -r1.25 -r1.26
--- openacs-4/packages/xotcl-request-monitor/www/index.tcl	7 Aug 2017 23:48:30 -0000	1.25
+++ openacs-4/packages/xotcl-request-monitor/www/index.tcl	1 Oct 2017 12:10:25 -0000	1.26
@@ -228,7 +228,7 @@
       set c 1
       foreach v [throttle max_values $t] {
 	incr c
-	switch $t {
+	switch -- $t {
 	  minutes {set rps "([format %5.2f [expr {[lindex $v 1]/60.0}]] rps)"}
 	  hours   {set rps "([format %5.2f [expr {[lindex $v 1]/(60*60.0)}]] rps)"}
 	  default {set rps ""}
@@ -276,7 +276,7 @@
       set c 1
       foreach v [throttle max_values $t] {
 	incr c
-	switch $t {
+	switch -- $t {
 	  minutes {set rps "([format %5.2f [expr {[lindex $v 1]/60.0}]] rps)"}
 	  hours   {set rps "([format %5.2f [expr {[lindex $v 1]/(60*60.0)}]] rps)"}
 	  default {set rps ""}
Index: openacs-4/packages/xowiki/tcl/chat-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/chat-procs.tcl,v
diff -u -N -r1.20 -r1.21
--- openacs-4/packages/xowiki/tcl/chat-procs.tcl	7 Aug 2017 23:48:30 -0000	1.20
+++ openacs-4/packages/xowiki/tcl/chat-procs.tcl	1 Oct 2017 12:10:25 -0000	1.21
@@ -99,7 +99,7 @@
     # small javascript library to obtain a portable ajax request object
     ::xo::Page requireJS "/resources/xowiki/get-http-object.js"
 
-    switch $mode {
+    switch -- $mode {
       polling {
         set jspath packages/xowiki/www/ajax/chat.js
         set login_url  ${path}ajax/chat?m=login&$context
@@ -142,7 +142,7 @@
 
     template::add_body_script -script [subst {document.getElementById('chatMsg').focus();}]
 
-    switch $mode {
+    switch -- $mode {
       polling {
         template::add_event_listener \
             -id "messages-form" \
Index: openacs-4/packages/xowiki/tcl/folder-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/folder-procs.tcl,v
diff -u -N -r1.36 -r1.37
--- openacs-4/packages/xowiki/tcl/folder-procs.tcl	31 Aug 2017 17:29:34 -0000	1.36
+++ openacs-4/packages/xowiki/tcl/folder-procs.tcl	1 Oct 2017 12:10:25 -0000	1.37
@@ -662,7 +662,7 @@
       $mb add_menu -name $Menu
       set menuEntries {}
       foreach e $entries {
-        switch $e {
+        switch -- $e {
           ::xowiki::File {
             lappend menuEntries {entry -name New.File -label File -object_type ::xowiki::File}
           }
Index: openacs-4/packages/xowiki/tcl/import-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/import-procs.tcl,v
diff -u -N -r1.31 -r1.32
--- openacs-4/packages/xowiki/tcl/import-procs.tcl	7 Aug 2017 23:48:30 -0000	1.31
+++ openacs-4/packages/xowiki/tcl/import-procs.tcl	1 Oct 2017 12:10:25 -0000	1.32
@@ -24,7 +24,7 @@
   Importer instproc report_line {obj operation} {
     set href [$obj pretty_link]
     set name [[$obj package_id] external_name -parent_id [$obj parent_id] [$obj name]]
-    switch $operation {
+    switch -- $operation {
         "added" { set operation "[_ xowiki.added]" }
         "replaced" { set operation "[_ xowiki.replaced]" }
         "updated" { set operation "[_ xowiki.updated]" }
Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -N -r1.206 -r1.207
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	11 Sep 2017 10:48:17 -0000	1.206
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	1 Oct 2017 12:10:25 -0000	1.207
@@ -3815,7 +3815,7 @@
       # All labels of the following switch statement are used
       # as variable names. Take care when adding new labels not to
       # overwrite existing variables.
-      switch $attr {
+      switch -- $attr {
         orderby {set $attr _[::xowiki::formfield::FormField fc_decode $value]}
         buttons - publish_status - category_id - unless -
         where -   with_categories - with_form_link - csv - view_field -
Index: openacs-4/packages/xowiki/tcl/menu-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/menu-procs.tcl,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/xowiki/tcl/menu-procs.tcl	31 Aug 2017 17:29:34 -0000	1.10
+++ openacs-4/packages/xowiki/tcl/menu-procs.tcl	1 Oct 2017 12:10:25 -0000	1.11
@@ -284,7 +284,7 @@
       if {[string index $kind 0] eq "#"} continue
       set properties [lrange $me 1 end]
 
-      switch $kind {
+      switch -- $kind {
         
         clear_menu {
           my clear_menu -menu [dict get $properties -menu]
Index: openacs-4/packages/xowiki/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v
diff -u -N -r1.295 -r1.296
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	14 Sep 2017 16:13:10 -0000	1.295
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	1 Oct 2017 12:10:25 -0000	1.296
@@ -580,7 +580,7 @@
     if {$value eq ""} {set value [next $attribute $default]}
     if {$type ne ""} {
       # to be extended and generalized
-      switch $type {
+      switch -- $type {
         word {if {[regexp {\W} $value]} {error "value '$value' contains invalid character"}}
         default {error "requested type unknown: $type"}
       }
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -N -r1.493 -r1.494
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	30 Sep 2017 18:12:53 -0000	1.493
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	1 Oct 2017 12:10:25 -0000	1.494
@@ -2273,7 +2273,7 @@
   #   $page references all
   #
   Page instproc references {submethod args} {
-    switch $submethod {
+    switch -- $submethod {
       clear {
         set :__references { unresolved {} resolved {} refused {} }
       }
Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -N -r1.332 -r1.333
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	30 Sep 2017 18:12:53 -0000	1.332
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	1 Oct 2017 12:10:25 -0000	1.333
@@ -175,7 +175,7 @@
           set __value [ad_text_to_html -- $__value]
         }
         lappend default_variables [string range $key 1 end] $__value
-        switch $key {
+        switch -- $key {
           _name {set name $__value}
         }
       }
@@ -1890,7 +1890,7 @@
       # Handling now just INPUT types (only one needed so far)
       #
       set type [expr {[$field hasAttribute type] ? [$field getAttribute type] : "text"}]
-      switch $type {
+      switch -- $type {
         checkbox {
           #my msg "get_form_value not implemented for $type"
         }
@@ -1940,7 +1940,7 @@
       #
       set type [expr {[$field hasAttribute type] ? [$field getAttribute type] : "text"}]
       # the switch should be really different objects ad classes...., but thats HTML, anyhow.
-      switch $type {
+      switch -- $type {
         checkbox {
           #my msg "$att: CHECKBOX value='$value', [$field hasAttribute checked], [$field hasAttribute value]"
           if {[$field hasAttribute value]} {
Index: openacs-4/packages/xowiki/www/xinha/insert-file.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/xinha/insert-file.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/xowiki/www/xinha/insert-file.tcl	7 Aug 2017 23:48:31 -0000	1.6
+++ openacs-4/packages/xowiki/www/xinha/insert-file.tcl	1 Oct 2017 12:10:25 -0000	1.7
@@ -90,7 +90,7 @@
                     -creation_ip [ad_conn peeraddr] \
                     -package_id [ad_conn package_id]
             }
-            file delete $upload_tmpfile
+            file delete -- $upload_tmpfile
             permission::grant \
                 -object_id $item_id \
                 -party_id $user_id \
Index: openacs-4/packages/acs-admin/lib/password-update.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/lib/password-update.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-admin/lib/password-update.tcl	7 Aug 2017 23:47:45 -0000	1.5
+++ openacs-4/packages/acs-admin/lib/password-update.tcl	1 Oct 2017 12:16:05 -0000	1.6
@@ -58,7 +58,7 @@
                           -old_password "" \
                           -new_password $password_1]
 
-    switch $result(password_status) {
+    switch -- $result(password_status) {
         ok {
             # Continue
         }
Index: openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl	7 Aug 2017 23:47:45 -0000	1.15
+++ openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl	1 Oct 2017 12:16:05 -0000	1.16
@@ -43,7 +43,7 @@
 
         array set failed $result(failed)
       
-        switch $result(status) {
+        switch -- $result(status) {
             ok {
                 set title "Confirm"
             }
Index: openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl	7 Aug 2017 23:47:45 -0000	1.10
+++ openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl	1 Oct 2017 12:16:05 -0000	1.11
@@ -51,7 +51,7 @@
 	    if { $counter == 1 } {
 		append body "<ul>\n"
 	    }
-            switch $dep_type {
+            switch -- $dep_type {
                 provides { set dep_d provided }
                 requires { set dep_d required }
                 extends { set dep_d extended }
Index: openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.tcl,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.tcl	7 Aug 2017 23:47:45 -0000	1.15
+++ openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.tcl	1 Oct 2017 12:16:05 -0000	1.16
@@ -18,7 +18,7 @@
 apm_package_install_spec $version_id
 
 db_transaction {
-    switch $dependency_type {
+    switch -- $dependency_type {
 	require {
 	    apm_dependency_add -dependency_id $dependency_id ${dependency_type}s $version_id $package_key $version_name
             apm_build_one_package_relationships $our_package_key
Index: openacs-4/packages/acs-admin/www/apm/version-dependency-remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependency-remove.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/acs-admin/www/apm/version-dependency-remove.tcl	7 Aug 2017 23:47:45 -0000	1.9
+++ openacs-4/packages/acs-admin/www/apm/version-dependency-remove.tcl	1 Oct 2017 12:16:05 -0000	1.10
@@ -11,7 +11,7 @@
 }
 
 db_transaction {
-    switch $dependency_type {
+    switch -- $dependency_type {
 
 	provide - require {
 	    apm_dependency_remove $dependency_id
Index: openacs-4/packages/acs-admin/www/apm/version-tag.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/Attic/version-tag.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-admin/www/apm/version-tag.tcl	7 Aug 2017 23:47:45 -0000	1.7
+++ openacs-4/packages/acs-admin/www/apm/version-tag.tcl	1 Oct 2017 12:16:05 -0000	1.8
@@ -58,7 +58,7 @@
 
     vc_parse_cvs_status [apm_fetch_cached_vc_status "packages/$package_key/$path"]
 
-    switch $vc_file_props(status) {
+    switch -- $vc_file_props(status) {
 	"Up-to-date" {
 	    set full_path [acs_package_root_dir $package_key]/$path
 	    exec $cvs tag -F $version_tag $full_path
Index: openacs-4/packages/acs-admin/www/install/install-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/install-2.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-admin/www/install/install-2.tcl	7 Aug 2017 23:47:45 -0000	1.4
+++ openacs-4/packages/acs-admin/www/install/install-2.tcl	1 Oct 2017 12:16:05 -0000	1.5
@@ -36,7 +36,7 @@
 			  -package_keys $install_pkgs]
     array set failed $result(failed)
 
-    switch $result(status) {
+    switch -- $result(status) {
 	ok {
 	    set continue_url [export_vars -base "install-3" { repository_url }]
 	    set page_title "Confirm"
Index: openacs-4/packages/acs-admin/www/users/member-state-change.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/member-state-change.tcl,v
diff -u -N -r1.19 -r1.20
--- openacs-4/packages/acs-admin/www/users/member-state-change.tcl	11 Sep 2017 14:56:16 -0000	1.19
+++ openacs-4/packages/acs-admin/www/users/member-state-change.tcl	1 Oct 2017 12:16:05 -0000	1.20
@@ -34,7 +34,7 @@
 # This page is used for state changes in the member_state, and as well
 # on email confirm require and approve operations.
 #
-switch $email_verified_p {
+switch -- $email_verified_p {
     "t" {
         set user_name     $name
         set url           [ad_url]
@@ -63,7 +63,7 @@
 if {[catch {
     acs_user::change_state -user_id $user_id -state $member_state
 
-    switch $email_verified_p {
+    switch -- $email_verified_p {
         "t" {
             db_exec_plsql approve_email {}
         }
Index: openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl,v
diff -u -N -r1.27 -r1.28
--- openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl	7 Aug 2017 23:47:47 -0000	1.27
+++ openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl	1 Oct 2017 12:16:04 -0000	1.28
@@ -201,7 +201,7 @@
     @error 
 } {
 
-     switch $storage_type {
+     switch -- $storage_type {
 	file {
 	    if {$tmp_filename eq ""} {
                 set filename [cr_create_content_file_from_string $item_id $revision_id $content]
Index: openacs-4/packages/acs-content-repository/tcl/image-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/image-procs.tcl,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/acs-content-repository/tcl/image-procs.tcl	7 Aug 2017 23:47:47 -0000	1.12
+++ openacs-4/packages/acs-content-repository/tcl/image-procs.tcl	1 Oct 2017 12:16:04 -0000	1.13
@@ -175,7 +175,7 @@
         return -code error $errMsg
     }
     lassign $out width height type
-    switch $type { 
+    switch -- $type { 
         JPG - JPEG {
             set mime_type image/jpeg
         } 
Index: openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl,v
diff -u -N -r1.33 -r1.34
--- openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl	7 Aug 2017 23:47:47 -0000	1.33
+++ openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl	1 Oct 2017 12:16:04 -0000	1.34
@@ -58,7 +58,7 @@
 	set content_length 0
     }
 
-    switch $storage_type {
+    switch -- $storage_type {
         text {
             set text [db_string write_text_content ""]
             if { $string_p } {
@@ -242,7 +242,7 @@
             db_exec_plsql mime_type_register ""
         }
 
-        switch $content_type {
+        switch -- $content_type {
             image {
 
                 if { [db_string image_subclass ""] == "f" } {
@@ -300,7 +300,7 @@
 
         # insert the attatchment into the database
 
-        switch $storage_type {
+        switch -- $storage_type {
             file {
                 set filename [cr_create_content_file $item_id $revision_id $tmp_filename]
                 db_dml set_file_content ""
Index: openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl,v
diff -u -N -r1.95 -r1.96
--- openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl	30 Sep 2017 17:42:31 -0000	1.95
+++ openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl	1 Oct 2017 12:16:05 -0000	1.96
@@ -510,7 +510,7 @@
         # Rollout support
         set delivery_mode [parameter::get -package_id [get_package_id] -parameter EmailDeliveryMode -default default]
 
-        switch $delivery_mode {
+        switch -- $delivery_mode {
             log {
                 set send_mode "log"
                 set notice "logging email instead of sending"
Index: openacs-4/packages/acs-subsite/lib/login.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/login.tcl,v
diff -u -N -r1.37 -r1.38
--- openacs-4/packages/acs-subsite/lib/login.tcl	7 Aug 2017 23:47:57 -0000	1.37
+++ openacs-4/packages/acs-subsite/lib/login.tcl	1 Oct 2017 12:16:05 -0000	1.38
@@ -226,7 +226,7 @@
                              -persistent=[expr {$allow_persistent_login_p && [template::util::is_true $persistent_p]}]]
     
     # Handle authentication problems
-    switch $auth_info(auth_status) {
+    switch -- $auth_info(auth_status) {
         ok {
             # Continue below
         }
@@ -246,7 +246,7 @@
     }
 
     # Handle account status
-    switch $auth_info(account_status) {
+    switch -- $auth_info(account_status) {
         ok {
             # Continue below
         }
Index: openacs-4/packages/acs-subsite/lib/user-info.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/user-info.tcl,v
diff -u -N -r1.23 -r1.24
--- openacs-4/packages/acs-subsite/lib/user-info.tcl	7 Aug 2017 23:47:58 -0000	1.23
+++ openacs-4/packages/acs-subsite/lib/user-info.tcl	1 Oct 2017 12:16:05 -0000	1.24
@@ -185,7 +185,7 @@
 
 
     # Handle authentication problems
-    switch $result(update_status) {
+    switch -- $result(update_status) {
         ok {
             # Updating locale/tz data
             if { [info exists site_wide_locale] } {
Index: openacs-4/packages/acs-subsite/lib/user-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/user-new.tcl,v
diff -u -N -r1.20 -r1.21
--- openacs-4/packages/acs-subsite/lib/user-new.tcl	7 Aug 2017 23:47:58 -0000	1.20
+++ openacs-4/packages/acs-subsite/lib/user-new.tcl	1 Oct 2017 12:16:05 -0000	1.21
@@ -133,7 +133,7 @@
     
     # Handle registration problems
     
-    switch $creation_info(creation_status) {
+    switch -- $creation_info(creation_status) {
         ok {
             # Continue below
         }
@@ -153,7 +153,7 @@
         }
     }
     
-    switch $creation_info(account_status) {
+    switch -- $creation_info(account_status) {
         ok {
             # Continue below
         }
Index: openacs-4/packages/acs-subsite/tcl/attribute-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/attribute-procs.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/acs-subsite/tcl/attribute-procs.tcl	7 Aug 2017 23:47:58 -0000	1.13
+++ openacs-4/packages/acs-subsite/tcl/attribute-procs.tcl	1 Oct 2017 12:16:05 -0000	1.14
@@ -188,7 +188,7 @@
     set type ""
     set constraint ""
     
-    switch $datatype {
+    switch -- $datatype {
         "string" { set type "varchar(1000)" }
         "boolean" { set type "char(1)"
                     set constraint "[plsql_utility::generate_constraint_name $table $column "ck"] check ($column in ('t','f'))" }
Index: openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl	7 Aug 2017 23:47:58 -0000	1.15
+++ openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl	1 Oct 2017 12:16:05 -0000	1.16
@@ -61,7 +61,7 @@
         set priv_level $user_level
     }
     set send_email_url [ns_quotehtml "/shared/send-email?sendto=$user_id&return_url=$return_url"]
-    switch $priv_level {
+    switch -- $priv_level {
         "4" {
             return [subst {<a href="mailto:$email" title="#acs-subsite.Send_email_to_this_user#">$email</a>}]
         }
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 -N -r1.40 -r1.41
--- openacs-4/packages/acs-subsite/tcl/group-procs.tcl	7 Aug 2017 23:47:58 -0000	1.40
+++ openacs-4/packages/acs-subsite/tcl/group-procs.tcl	1 Oct 2017 12:16:05 -0000	1.41
@@ -315,7 +315,7 @@
     @author Timo Hentschel (timo@timohentschel.de)
     @creation-date 2005-07-26
 } {
-    switch $type {
+    switch -- $type {
 	party  { set member_list [db_list group_members_party {}] }
 	default { set member_list [db_list group_members {}] }
     }
@@ -458,7 +458,7 @@
     #
     regsub -all " " $member_state "_" member_state
     
-    switch $component {
+    switch -- $component {
         pretty_name {
             set message #acs-kernel.member_state_$member_state#
         }
Index: openacs-4/packages/acs-subsite/www/admin/configure.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/configure.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/acs-subsite/www/admin/configure.tcl	7 Aug 2017 23:47:58 -0000	1.13
+++ openacs-4/packages/acs-subsite/www/admin/configure.tcl	1 Oct 2017 12:16:05 -0000	1.14
@@ -52,7 +52,7 @@
     set group(description) $description
     group::update -group_id $group_id -array group
 
-    switch $visibility {
+    switch -- $visibility {
         any {
             permission::set_inherit -object_id [ad_conn package_id]
         }
Index: openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl	7 Aug 2017 23:47:58 -0000	1.8
+++ openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl	1 Oct 2017 12:16:05 -0000	1.9
@@ -22,7 +22,7 @@
         }
     }
     node_type_ck -requires node_type:notnull {
-        switch $node_type {
+        switch -- $node_type {
             folder {
                 set directory_p t
                 set pattern_p t
Index: openacs-4/packages/acs-subsite/www/members/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/index.tcl,v
diff -u -N -r1.21 -r1.22
--- openacs-4/packages/acs-subsite/www/members/index.tcl	7 Aug 2017 23:47:59 -0000	1.21
+++ openacs-4/packages/acs-subsite/www/members/index.tcl	1 Oct 2017 12:16:05 -0000	1.22
@@ -237,7 +237,7 @@
         set member_state_pretty [group::get_member_state_pretty -member_state $member_state]
         set user_email [email_image::get_user_email -user_id $user_id]
         if { $admin_p } {
-            switch $member_state {
+            switch -- $member_state {
                 approved {
                     if { $member_admin_p == 0 } {
                         set make_admin_url [export_vars -base make-admin { user_id }]
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.6 -r1.7
--- openacs-4/packages/acs-subsite/www/register/restore-user.tcl	7 Aug 2017 23:47:59 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/register/restore-user.tcl	1 Oct 2017 12:16:05 -0000	1.7
@@ -13,7 +13,7 @@
 
 set member_state [acs_user::get_element -user_id $user_id -element member_state]
 
-switch $member_state {
+switch -- $member_state {
     deleted {
         
         # They presumably deleted themselves  
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.15 -r1.16
--- openacs-4/packages/acs-subsite/www/register/user-join.tcl	7 Aug 2017 23:47:59 -0000	1.15
+++ openacs-4/packages/acs-subsite/www/register/user-join.tcl	1 Oct 2017 12:16:05 -0000	1.16
@@ -120,7 +120,7 @@
             set required_seg [template::multirow get required_segments $rownum]
             
             if { ![group::member_p -group_id $required_segments(group_id)] } {
-                switch $required_segments(join_policy) {
+                switch -- $required_segments(join_policy) {
                     "needs approval" {
                         set member_state "needs approval"
                     }
@@ -176,7 +176,7 @@
         ad_script_abort
     }
     
-    switch $member_state {
+    switch -- $member_state {
         "approved" { set message "[_ acs-subsite.You_joined_group]." }
         "needs approval" { set message "[_ acs-subsite.Request_join_submitted]." }
     }
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.22 -r1.23
--- openacs-4/packages/acs-subsite/www/shared/parameters.tcl	7 Aug 2017 23:47:59 -0000	1.22
+++ openacs-4/packages/acs-subsite/www/shared/parameters.tcl	1 Oct 2017 12:16:05 -0000	1.23
@@ -101,7 +101,7 @@
         set focus_elm $parameter_name
     }
 
-    switch $datatype {
+    switch -- $datatype {
         text {
             set widget textarea
             set html [list cols 100 rows 15]
Index: openacs-4/packages/acs-subsite/www/shared/portrait-bits.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/portrait-bits.tcl,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/acs-subsite/www/shared/portrait-bits.tcl	7 Aug 2017 23:47:59 -0000	1.11
+++ openacs-4/packages/acs-subsite/www/shared/portrait-bits.tcl	1 Oct 2017 12:16:05 -0000	1.12
@@ -46,7 +46,7 @@
         set filename $folder/$itemInfo(revision_id).$size
         
         if {![file exists $filename]} {
-            switch $itemInfo(storage_type) {
+            switch -- $itemInfo(storage_type) {
                 "file" {
                     set input_file [content::revision::get_cr_file_path -revision_id $itemInfo(revision_id)]
                     exec convert $input_file -resize $size $filename
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.4 -r1.5
--- openacs-4/packages/acs-subsite/www/user/password-reset.tcl	7 Aug 2017 23:47:59 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/user/password-reset.tcl	1 Oct 2017 12:16:05 -0000	1.5
@@ -70,7 +70,7 @@
                           -old_password "" \
                           -new_password $password_1]
 
-    switch $result(password_status) {
+    switch -- $result(password_status) {
         ok {
             # Continue
         }
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.24 -r1.25
--- openacs-4/packages/acs-subsite/www/user/password-update.tcl	7 Aug 2017 23:47:59 -0000	1.24
+++ openacs-4/packages/acs-subsite/www/user/password-update.tcl	1 Oct 2017 12:16:05 -0000	1.25
@@ -98,7 +98,7 @@
                           -old_password $password_old \
                           -new_password $password_1]
     
-    switch $result(password_status) {
+    switch -- $result(password_status) {
         ok {
             # Continue
         }
@@ -130,7 +130,7 @@
                 -password $password_1]
         
         # Handle authentication problems
-        switch $auth_info(auth_status) {
+        switch -- $auth_info(auth_status) {
             ok {
                 # Continue below
             }
@@ -147,7 +147,7 @@
         }
 
         # Handle account status
-        switch $auth_info(account_status) {
+        switch -- $auth_info(account_status) {
             ok {
                 # Continue below
             }
Index: openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl,v
diff -u -N -r1.89 -r1.90
--- openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl	7 Aug 2017 23:47:59 -0000	1.89
+++ openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl	1 Oct 2017 12:16:05 -0000	1.90
@@ -384,7 +384,7 @@
     # PostgreSQL has a special implementation here, any other db will
     # probably work with the default:
 
-    switch $driverkey {
+    switch -- $driverkey {
 
         postgresql {
             #             # the following query will return a nextval if the sequnce
@@ -708,7 +708,7 @@
     }
 
     set driverkey [db_driverkey $dbn]
-    switch $driverkey {
+    switch -- $driverkey {
         postgresql {
             set postgres_p 1
         }
@@ -1041,7 +1041,7 @@
             if { [llength $bind] == 1 } {
                 # $bind is an ns_set id:
 
-                switch $driverkey {
+                switch -- $driverkey {
                     oracle {
                         return [ns_ora $type $db -bind $bind $sql {*}$args]
                     }
@@ -1064,7 +1064,7 @@
                 }
             }
 
-            switch $driverkey {
+            switch -- $driverkey {
                 oracle {
                     # TODO: Using $args outside the list is
                     # potentially bad here, depending on what is in
@@ -1090,7 +1090,7 @@
             # Bind variables, if any, are defined solely as individual
             # Tcl variables:
 
-            switch $driverkey {
+            switch -- $driverkey {
                 oracle {
                     return [uplevel $ulevel [list ns_ora $type $db $sql] $args]
                 }
@@ -1422,7 +1422,7 @@
 
             # Handle or propagate the error. Can't use the usual "return -code $errno..." trick
             # due to the db_with_handle wrapped around this loop, so propagate it explicitly.
-            switch $errno {
+            switch -- $errno {
                 0 {
                     # TCL_OK
                 }
@@ -1572,7 +1572,7 @@
                         # Handle or propagate the error. Can't use the usual
                         # "return -code $errno..." trick due to the db_with_handle
                         # wrapped around this loop, so propagate it explicitly.
-                        switch $errno {
+                        switch -- $errno {
                             0 {
                                 # TCL_OK
                             }
@@ -1906,7 +1906,7 @@
     ad_arg_parser { clobs blobs clob_files blob_files bind } $args
     set driverkey [db_driverkey $dbn]
 
-    switch $driverkey {
+    switch -- $driverkey {
         postgresql {
             set postgres_p 1
         }
@@ -2015,7 +2015,7 @@
     upvar "#0" [db_state_array_name_is -dbn $dbn] db_state
     set driverkey [db_driverkey $dbn]
 
-    switch $driverkey {
+    switch -- $driverkey {
         oracle {
             return [ns_ora resultrows $db_state(last_used)]
         }
@@ -2228,7 +2228,7 @@
     incr db_state(transaction_level,$dbh) -1
 
     set err_p 0
-    switch $errno {
+    switch -- $errno {
         0 {
             # TCL_OK
         }
@@ -2290,7 +2290,7 @@
 
             # Determine what do with the error.
             set err_p 0
-            switch $errno {
+            switch -- $errno {
                 0 {
                     # TCL_OK
                 }
@@ -2557,7 +2557,7 @@
     set proc_name {db_source_sql_file}
     set driverkey [db_driverkey $dbn]
 
-    switch $driverkey {
+    switch -- $driverkey {
 
         oracle {
             set user_pass [db_get_sql_user -dbn $dbn]
@@ -2848,7 +2848,7 @@
     set proc_name {db_tables}
     set driverkey [db_driverkey $dbn]
 
-    switch $driverkey {
+    switch -- $driverkey {
         oracle {
             set sql_table_names_with_pattern {
                 select lower(table_name) as table_name
@@ -2909,7 +2909,7 @@
     set proc_name {db_table_exists}
     set driverkey [db_driverkey $dbn]
 
-    switch $driverkey {
+    switch -- $driverkey {
         oracle {
             set n_rows [db_string -dbn $dbn table_count {
                 select count(*) from user_tables
@@ -3043,7 +3043,7 @@
     # difference between Oracle and Postgres code?
     # --atp@piskorski.com, 2003/04/09 10:00 EDT
 
-    switch $driverkey {
+    switch -- $driverkey {
         oracle {
             set full_statement_name [db_qd_get_fullname $statement_name]
             db_with_handle -dbn $dbn db {
@@ -3096,7 +3096,7 @@
 
     set full_statement_name [db_qd_get_fullname $statement_name]
 
-    switch $driverkey {
+    switch -- $driverkey {
         oracle {
             db_with_handle -dbn $dbn db {
                 db_exec_lob blob_get_file $db $full_statement_name $sql $file
@@ -3126,7 +3126,7 @@
     set proc_name {db_blob_get}
     set driverkey [db_driverkey $dbn]
 
-    switch $driverkey {
+    switch -- $driverkey {
 
         postgresql {
             set full_statement_name [db_qd_get_fullname $statement_name]
@@ -3187,7 +3187,7 @@
     # possible of those two relatively complex procs.
     # --atp@piskorski.com, 2003/04/09 11:55 EDT
 
-    switch $driverkey {
+    switch -- $driverkey {
         oracle {
             set which_proc {db_exec_lob_oracle}
         }
@@ -3287,7 +3287,7 @@
                 }
             }
 
-            switch $original_type {
+            switch -- $original_type {
 
                 blob_get_file {
                     if {[file exists $content]} {
@@ -3390,12 +3390,12 @@
         # to a file/connection if it is stored as a lob or if it is
         # stored in the content-repository as a file. (DanW - Openacs)
 
-        switch $type {
+        switch -- $type {
 
             blob_get {
 
                 if {[info exists storage_type]} {
-                    switch $storage_type {
+                    switch -- $storage_type {
                         file {
                             if {[file exists $content]} {
                                 set ifp [open $content r]
@@ -3443,7 +3443,7 @@
             blob_select_file {
 
                 if {[info exists storage_type]} {
-                    switch $storage_type {
+                    switch -- $storage_type {
                         file {
                             if {[file exists $content]} {
                                 file copy -- $content $file
@@ -3482,7 +3482,7 @@
             write_blob {
 
                 if {[info exists storage_type]} {
-                    switch $storage_type {
+                    switch -- $storage_type {
                         file {
                             if {[file exists $content]} {
                                 set ofp [open $content r]
Index: openacs-4/packages/acs-tcl/tcl/admin-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/admin-procs.tcl,v
diff -u -N -r1.24 -r1.25
--- openacs-4/packages/acs-tcl/tcl/admin-procs.tcl	7 Aug 2017 23:47:59 -0000	1.24
+++ openacs-4/packages/acs-tcl/tcl/admin-procs.tcl	1 Oct 2017 12:16:05 -0000	1.25
@@ -66,7 +66,7 @@
     foreach criteria [ad_user_class_parameters] {
 	if { [info exists $criteria] && [set $criteria] ne "" } {
 
-	    switch $criteria {
+	    switch -- $criteria {
 		"category_id" {
 		    set pretty_category [db_string $criteria {
 			select category from categories where category_id = :category_id
@@ -194,7 +194,7 @@
     is set, then a list of lists will be returned (url label).
 } {
     set user_finite_states [list]
-    switch $member_state {
+    switch -- $member_state {
         "approved" {
             lappend user_finite_states \
                 [list [export_vars -base "/acs-admin/users/member-state-change" {
Index: openacs-4/packages/acs-tcl/tcl/aolserver-3-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/aolserver-3-procs.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/acs-tcl/tcl/aolserver-3-procs.tcl	7 Aug 2017 23:47:59 -0000	1.8
+++ openacs-4/packages/acs-tcl/tcl/aolserver-3-procs.tcl	1 Oct 2017 12:16:05 -0000	1.9
@@ -24,7 +24,7 @@
     set value [ns_set get $formdata $column]
 
     if { [string match $value ""] } {
-        switch $type {
+        switch -- $type {
 	    
 	    date      {
 		set value [ns_buildsqldate \
@@ -62,7 +62,7 @@
 
 proc ns_dbformvalueput {htmlform column type value} {
 
-    switch $type {
+    switch -- $type {
 
 	date {
 	    set retval [ns_formvalueput $htmlform $column.NULL f]
Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v
diff -u -N -r1.96 -r1.97
--- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	7 Aug 2017 23:47:59 -0000	1.96
+++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	1 Oct 2017 12:16:05 -0000	1.97
@@ -195,7 +195,7 @@
         if { [info exists ::apm_visited_package_keys($package_key)] } {
             continue
         }
-        switch $dependency_type {
+        switch -- $dependency_type {
             extends -
             "" { lappend ::apm_package_url_resolution $::acs::rootdir/packages/$package_key/www }
             embeds {
@@ -809,7 +809,7 @@
                 set file_path "$::acs::rootdir/$file"
                 set file_ext [file extension $file_path]
                 
-                switch $file_ext {
+                switch -- $file_ext {
                     .tcl { 
                         # Make sure this is not a -init.tcl file as those should only be sourced on server startup
                         if { ![regexp {\-init\.tcl$} $file_path] } {
@@ -1977,7 +1977,7 @@
     # We'll be using apm_get_package_files to get a list of files
     # by file type. 
 
-    switch $file_type {
+    switch -- $file_type {
         data_model_pg -
         data_model_ora {
             set file_types [list data_model_create data_model]
@@ -1993,7 +1993,7 @@
                       -file_types $file_types]
 
     # filelist needs to be weeded for certain file types
-    switch $file_type {
+    switch -- $file_type {
         include_page -
         content_page {
             # weed out non-.adp files
Index: openacs-4/packages/acs-tcl/tcl/document-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/document-procs.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-tcl/tcl/document-procs.tcl	7 Aug 2017 23:47:59 -0000	1.7
+++ openacs-4/packages/acs-tcl/tcl/document-procs.tcl	1 Oct 2017 12:16:05 -0000	1.8
@@ -182,7 +182,7 @@
 	}
     }
 
-    switch $mime_type {
+    switch -- $mime_type {
 	text/html;content-pane - text/x-html-content-pane {
 	    # It's a content pane. Find the appropriate template.
 	    set template_path [doc_find_template [ad_conn file]]
Index: openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl,v
diff -u -N -r1.68 -r1.69
--- openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl	7 Aug 2017 23:47:59 -0000	1.68
+++ openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl	1 Oct 2017 12:16:05 -0000	1.69
@@ -879,11 +879,11 @@
             set command [list template::form section]
             foreach option [lrange $element_name 2 end] {
                 lassign $option switch args
-                switch $switch {
+                switch -- $switch {
                     fieldset -
                     legendtext -
                     legend {
-                        lappend command -$switch $args
+                        lappend command -$switch -- $args
                     }
                     default {return -code error "\"$switch\" is not a legal -section option"}
                 }
@@ -893,7 +893,7 @@
         } else {
             set form_command [list template::element create $form_name $element_name]
             foreach flag $af_flag_list(${form_name}__$element_name) {
-                switch $flag {
+                switch -- $flag {
 
                     key {
                         if { [info exists af_key_name($form_name)] } {
@@ -1289,7 +1289,7 @@
                 # Handle or propagate the error. Can't use the usual
                 # "return -code $errno..." trick due to the db_with_handle
                 # wrapped around this loop, so propagate it explicitly.
-                switch $errno {
+                switch -- $errno {
                     0 {
                         # TCL_OK
                     }
Index: openacs-4/packages/acs-tcl/tcl/html-email-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/html-email-procs.tcl,v
diff -u -N -r1.20 -r1.21
--- openacs-4/packages/acs-tcl/tcl/html-email-procs.tcl	7 Aug 2017 23:47:59 -0000	1.20
+++ openacs-4/packages/acs-tcl/tcl/html-email-procs.tcl	1 Oct 2017 12:16:05 -0000	1.21
@@ -127,7 +127,7 @@
 
     foreach part $expanded_parts {
         catch {mime::getproperty $part content} this_content 
-        switch $this_content {
+        switch -- $this_content {
             "text/plain" {
                 if { ![info exists plain] } {
                     set plain [mime::getbody $part]
Index: openacs-4/packages/acs-tcl/tcl/html-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/html-procs.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-tcl/tcl/html-procs.tcl	7 Aug 2017 23:47:59 -0000	1.2
+++ openacs-4/packages/acs-tcl/tcl/html-procs.tcl	1 Oct 2017 12:16:05 -0000	1.3
@@ -124,7 +124,7 @@
         # no name, no variable
         if {![info exists a(name)] || $a(name) eq ""} continue
         set name $a(name) ; set tag $fld(tag)
-        switch $tag {
+        switch -- $tag {
             "input" {
                 if {[info exists a(value)]} {
                     lappend v($name) $a(value)
Index: openacs-4/packages/acs-tcl/tcl/json-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/json-procs.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-tcl/tcl/json-procs.tcl	7 Aug 2017 23:47:59 -0000	1.7
+++ openacs-4/packages/acs-tcl/tcl/json-procs.tcl	1 Oct 2017 12:16:05 -0000	1.8
@@ -443,7 +443,7 @@
             The Ilias RTE JavaScript returns '' rather than null for JS null variables.
 
 } {
-    switch $value {
+    switch -- $value {
         false { return 0 }
         true { return 1 }
         null -
Index: openacs-4/packages/acs-tcl/tcl/request-processor-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-init.tcl,v
diff -u -N -r1.18 -r1.19
--- openacs-4/packages/acs-tcl/tcl/request-processor-init.tcl	7 Aug 2017 23:47:59 -0000	1.18
+++ openacs-4/packages/acs-tcl/tcl/request-processor-init.tcl	1 Oct 2017 12:16:05 -0000	1.19
@@ -122,6 +122,7 @@
     # that filters are registered in order of priority. AOLServer will
     # then run the filters in the order they were registered.
     set filters [lsort -integer -index 0 $filters]
+    ns_log notice "FILTERS [join $filters \n]"
     nsv_set rp_filters . $filters
 
     set filter_index 0
Index: openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl,v
diff -u -N -r1.120 -r1.121
--- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	26 Sep 2017 19:44:59 -0000	1.120
+++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	1 Oct 2017 12:16:05 -0000	1.121
@@ -249,7 +249,7 @@
 
     rp_debug -debug $debug_p "Invoking $why filter $proc"
 
-    switch $arg_count {
+    switch -- $arg_count {
         0 { set errno [catch { set result [$proc] } error] }
         1 { set errno [catch { set result [$proc $why] } error] }
         2 { set errno [catch { set result [$proc $conn $why] } error] }
@@ -309,7 +309,7 @@
 
     rp_debug -debug $debug_p "Invoking registered procedure $proc"
 
-    switch $arg_count {
+    switch -- $arg_count {
         0 { set errno [catch $proc error] }
         1 { set errno [catch "$proc $arg" error] }
         default { set errno [catch {
@@ -528,6 +528,10 @@
     @author Don Baccus (dhogaza@pacifier.com)
 
 } {
+    if {[info commands ::valgrind] ne ""} {
+        ::valgrind start
+    }
+
     ad_conn -set untrusted_user_id 0
     set path "[acs_package_root_dir [lindex [ns_conn urlv] 1]]/www/resources/[join [lrange [ns_conn urlv] 2 end] /]"
     if { [file isfile $path] } {
@@ -1455,7 +1459,7 @@
             # own caching, so calling it instead of [ns_conn form]
             # is OK.
 
-            switch $var {
+            switch -- $var {
                 form {
                     return [ns_getform]
                 }
@@ -1468,7 +1472,7 @@
                     }
 
                     # Fallback
-                    switch $var {
+                    switch -- $var {
                         locale {
                             set ad_conn(locale) [parameter::get \
                                                      -parameter SiteWideLocale \
Index: openacs-4/packages/acs-tcl/tcl/security-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.tcl,v
diff -u -N -r1.80 -r1.81
--- openacs-4/packages/acs-tcl/tcl/security-procs.tcl	29 Aug 2017 16:53:15 -0000	1.80
+++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl	1 Oct 2017 12:16:05 -0000	1.81
@@ -137,7 +137,7 @@
         set user_id 0
         set account_status closed
         
-        switch $login_level {
+        switch -- $login_level {
             1 {
                 set auth_level ok
                 set user_id $untrusted_user_id
Index: openacs-4/packages/acs-tcl/tcl/table-display-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/table-display-procs.tcl,v
diff -u -N -r1.24 -r1.25
--- openacs-4/packages/acs-tcl/tcl/table-display-procs.tcl	7 Aug 2017 23:48:00 -0000	1.24
+++ openacs-4/packages/acs-tcl/tcl/table-display-procs.tcl	1 Oct 2017 12:16:05 -0000	1.25
@@ -318,7 +318,7 @@
 		# single characters r l c are special for alignment 
 		set Tformat [lindex $Tcol 3]
 		set Tcolumn [lindex $Tcol 0]
-		switch $Tformat {
+		switch -- $Tformat {
 		    "" {set Tdisplay_field " <td>[set $Tcolumn]</td>\n"}
 		    r {set Tdisplay_field " <td align=\"right\">[set $Tcolumn]</td>\n"}
 		    l {set Tdisplay_field " <td align=\"left\">[set $Tcolumn]</td>\n"}
Index: openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl,v
diff -u -N -r1.37 -r1.38
--- openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl	7 Aug 2017 23:48:00 -0000	1.37
+++ openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl	1 Oct 2017 12:16:05 -0000	1.38
@@ -1204,7 +1204,7 @@
                         #
                         return ""
                     }
-                    ad_log error "problem rendering complain page: $errorMsg ($errorCode)"
+                    ad_log error "problem rendering complain page: $errorMsg ($errorCode) $::errorInfo"
                     set html "Invalid input"
                 }
                 ns_return 422 text/html $html
Index: openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl,v
diff -u -N -r1.69 -r1.70
--- openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl	30 Sep 2017 18:12:52 -0000	1.69
+++ openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl	1 Oct 2017 12:16:05 -0000	1.70
@@ -531,7 +531,7 @@
                                 set tagstack($tagptr) $tag
                             }
                         } else {
-                            switch $syn($tag) {
+                            switch -- $syn($tag) {
                                 nobr {
                                     if { ! $nobr } {
                                         set nobr_out_point [string length $out]
@@ -1257,7 +1257,7 @@
                 
                 # 3: check for any attribute that could contain a url
                 # whether this is acceptable
-                switch $att {
+                switch -- $att {
                     "href" - "src" - "content" - "action" {                        
                         set url [string trim [$node getAttribute $att ""]]
                         if {$url eq ""} continue
@@ -2003,9 +2003,9 @@
     }
 
     # Do the conversion
-    switch $from {
+    switch -- $from {
         text/enhanced {
-            switch $to {
+            switch -- $to {
                 text/html {
                     set text [ad_enhanced_text_to_html $text]
                 }
@@ -2015,7 +2015,7 @@
             }
         }
         text/plain {
-            switch $to {
+            switch -- $to {
                 text/html {
                     set text [ad_text_to_html -- $text]
                 }
@@ -2025,7 +2025,7 @@
             }
         }
         text/fixed-width {
-            switch $to {
+            switch -- $to {
                 text/html {
                     set text "<pre>[ad_text_to_html -no_lines -- $text]</pre>"
                 }
@@ -2035,7 +2035,7 @@
             }
         }
         text/html {
-            switch $to {
+            switch -- $to {
                 text/html {
                     # Handled below
                 }
@@ -2045,7 +2045,7 @@
             }
         }
         text/xml {
-            switch $to {
+            switch -- $to {
                 text/html {
                     set text "<pre>[ad_text_to_html -no_lines -- $text]</pre>"
                 }
@@ -2057,7 +2057,7 @@
     }
 
     # Handle closing of HTML tags, truncation
-    switch $to {
+    switch -- $to {
         text/html {
             set text [util_close_html_tags $text $truncate_len $truncate_len $ellipsis $more]
         }
Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v
diff -u -N -r1.143 -r1.144
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	13 Sep 2017 16:50:35 -0000	1.143
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	1 Oct 2017 12:16:05 -0000	1.144
@@ -56,7 +56,7 @@
         error "zip command not found on the system."
     }
     set cmd [list exec]
-    switch $::tcl_platform(platform) {
+    switch -- $::tcl_platform(platform) {
         windows {lappend cmd cmd.exe /c}
         default {lappend cmd bash -c}
     }
@@ -998,7 +998,7 @@
     set secret  [ns_config "ns/server/[ns_info server]/acs" parametersecret ""]
     foreach def [split $params &] {
         lassign [split $def =] key val
-        switch $key {
+        switch -- $key {
             max_age -
             secret {set $key [ad_urldecode_query $val]}
         }
@@ -1188,7 +1188,7 @@
         lassign [split $var_spec ":"] var type
         upvar 1 $var value
         if { [info exists value] } {
-            switch $type {
+            switch -- $type {
                 multiple {
                     foreach item $value {
                         append hidden "<input type=\"hidden\" name=\"[ns_quotehtml $var]\" value=\"[ns_quotehtml $item]\" >\n"
@@ -1327,7 +1327,7 @@
             lassign [split $var_spec ":"] var type
             upvar 1 $var upvar_value
             if { [info exists upvar_value] } {
-                switch $type {
+                switch -- $type {
                     multiple {
                         foreach item $upvar_value {
                             lappend params "[ns_urlencode $var]=[ns_urlencode $item]"
@@ -2955,7 +2955,7 @@
         set varname [ns_set key $set_id $i]
         upvar $level $varname var
         if { [info exists var] } {
-            switch $duplicates {
+            switch -- $duplicates {
                 fail {
                     return -code error "ad_ns_set_to_tcl_vars tried to set the var $varname which is already set"
                 }
@@ -3867,7 +3867,7 @@
     # stuff like break or continue, the result is undefined.
     uplevel $finally
 
-    switch $return_code {
+    switch -- $return_code {
         0 {
             # CODE executed without a non-local exit -- return what it
             # evaluated to.
@@ -4503,19 +4503,19 @@
         set hours [expr {abs($age_seconds / 3600)}]
         set minutes [expr {round(($age_seconds% 3600)/60.0)}]
         if {$hours < 24} {
-            switch $hours {
+            switch -- $hours {
                 0 { set result "" }
                 1 { set result "One hour " }
                 default { set result "$hours hours "}
             }
-            switch $minutes {
+            switch -- $minutes {
                 0 {}
                 1 { append result "$minutes minute " }
                 default { append result "$minutes minutes " }
             }
         } else {
             set days [expr {abs($hours / 24)}]
-            switch $days {
+            switch -- $days {
                 1 { set result "One day " }
                 default { set result "$days days "}
             }
@@ -4779,7 +4779,7 @@
 
     @author Gustaf Neumann
 } {
-    switch $::tcl_platform(platform) {
+    switch -- $::tcl_platform(platform) {
         windows {
             #
             # Notice: Windows has an alternative search environment 
Index: openacs-4/packages/acs-tcl/tcl/xml-0-sgml-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/xml-0-sgml-procs.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-tcl/tcl/xml-0-sgml-procs.tcl	7 Aug 2017 23:48:00 -0000	1.5
+++ openacs-4/packages/acs-tcl/tcl/xml-0-sgml-procs.tcl	1 Oct 2017 12:16:05 -0000	1.6
@@ -263,7 +263,7 @@
 	# regsub has done to reconstitute the data
 
 	set empty {}
-	switch $state(mode) {
+	switch -- $state(mode) {
 	    comment {
 		# This had "[string length $param] && " as a guard -
 		# can't remember why :-(
Index: openacs-4/packages/acs-tcl/tcl/xml-1-dom-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/xml-1-dom-procs.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-tcl/tcl/xml-1-dom-procs.tcl	7 Aug 2017 23:48:00 -0000	1.5
+++ openacs-4/packages/acs-tcl/tcl/xml-1-dom-procs.tcl	1 Oct 2017 12:16:05 -0000	1.6
@@ -782,14 +782,14 @@
 		return -code error "too many arguments"
 	    }
 	    if {[regexp [format {^-(%s)$} $nodeOptionsRO] [lindex $args 0] discard option]} {
-		switch $option {
+		switch -- $option {
 		    childNodes {
 			# How are we going to handle documentElement?
 			set result $node(node:childNodes)
 		    }
 		    firstChild {
 			upvar #0 $node(node:childNodes) children
-			switch $node(node:nodeType) {
+			switch -- $node(node:nodeType) {
 			    documentFragment {
 				set result [lindex $children 0]
 				catch {set result $node(document:documentElement)}
@@ -801,7 +801,7 @@
 		    }
 		    lastChild {
 			upvar #0 $node(node:childNodes) children
-			switch $node(node:nodeType) {
+			switch -- $node(node:nodeType) {
 			    documentFragment {
 				set result [lindex $children end]
 				catch {set result $node(document:documentElement)}
@@ -1027,7 +1027,7 @@
 		}
 	    }
 
-	    switch $node(node:nodeType) {
+	    switch -- $node(node:nodeType) {
 		element {
 		    set result [CreateElement {} $node(node:nodeName) [array get $node(element:attributeList)] -docarray $node(docArray)]
 		    if {$deep} {
@@ -1181,7 +1181,7 @@
 		return -code error "too many arguments"
 	    }
 	    if {[regexp [format {^-(%s)$} $elementOptionsRO] [lindex $args 0] discard option]} {
-		switch $option {
+		switch -- $option {
 		    tagName {
 			set result [lindex $node(node:nodeName) 0]
 		    }
@@ -1347,7 +1347,7 @@
 	GetHandle node $n child
 	set cleanup {}
 
-	switch $child(node:nodeType) {
+	switch -- $child(node:nodeType) {
 	    textNode {
 		if {[llength $textNode]} {
 		    # Coalesce into previous node
@@ -1416,7 +1416,7 @@
 		return -code error "too many arguments"
 	    }
 	    if {[regexp [format {^-(%s)$} $elementOptionsRO] [lindex $args 0] discard option]} {
-		switch $option {
+		switch -- $option {
 		    target {
 			set result [lindex $node(node:nodeName) 0]
 		    }
@@ -1425,7 +1425,7 @@
 		    }
 		}
 	    } elseif {[regexp [format {^-(%s)$} $elementOptionsRW] [lindex $args 0] discard option]} {
-		switch $option {
+		switch -- $option {
 		    data {
 			return $node(node:nodeValue)
 		    }
@@ -1447,7 +1447,7 @@
 		    if {[regexp [format {^-(%s)$} $elementOptionsRO] $option discard opt]} {
 			return -code error "attribute \"$option\" is read-only"
 		    } elseif {[regexp [format {^-(%s)$} $elementOptionsRW] $option discard opt]} {
-			switch $opt {
+			switch -- $opt {
 			    data {
 				set node(node:nodeValue) $value
 			    }
@@ -1925,7 +1925,7 @@
 proc dom::Trim nodeid {
     array set node [set $nodeid]
 
-    switch $node(node:nodeType) {
+    switch -- $node(node:nodeType) {
 
 	textNode {
 	    if {[string trim $node(node:nodeValue)] eq ""} {
Index: openacs-4/packages/acs-templating/tcl/currency-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/currency-procs.tcl,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/acs-templating/tcl/currency-procs.tcl	7 Aug 2017 23:48:01 -0000	1.16
+++ openacs-4/packages/acs-templating/tcl/currency-procs.tcl	1 Oct 2017 12:16:05 -0000	1.17
@@ -203,7 +203,7 @@
 
     set format [lindex $currency_list 5]
 
-    switch $what {
+    switch -- $what {
         sql_number {
 
             if { $value eq ""} {
@@ -253,7 +253,7 @@
     set trailing_money [lindex $currency_list 4]
     set format [lindex $currency_list 5]
 
-    switch $what {
+    switch -- $what {
         leading_symbol {
             return $leading_symbol
         }
Index: openacs-4/packages/acs-templating/tcl/data-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/data-procs.tcl,v
diff -u -N -r1.19 -r1.20
--- openacs-4/packages/acs-templating/tcl/data-procs.tcl	7 Aug 2017 23:48:01 -0000	1.19
+++ openacs-4/packages/acs-templating/tcl/data-procs.tcl	1 Oct 2017 12:16:05 -0000	1.20
@@ -138,7 +138,7 @@
   set result ""
   set value [::string tolower $value]
 
-  switch $value {
+  switch -- $value {
       0 -
       1 -
       f -
Index: openacs-4/packages/acs-templating/tcl/date-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/date-procs.tcl,v
diff -u -N -r1.50 -r1.51
--- openacs-4/packages/acs-templating/tcl/date-procs.tcl	7 Aug 2017 23:48:01 -0000	1.50
+++ openacs-4/packages/acs-templating/tcl/date-procs.tcl	1 Oct 2017 12:16:05 -0000	1.51
@@ -215,7 +215,7 @@
 
   variable month_data
 
-  switch $what {
+  switch -- $what {
     year       { return [lindex $date 0] }
     month      { return [lindex $date 1] }
     day        { return [lindex $date 2] }
@@ -441,13 +441,13 @@
   # Erase leading zeroes from the value, but make sure that 00
   # is not completely erased - but only for single-element properties
 
-  switch $value {
+  switch -- $value {
     year - month - day - hour - minutes - seconds - short_year - short_hours - ampm {
       set value [util::trim_leading_zeros $value]
     }
   }
 
-  switch $what {
+  switch -- $what {
     year       { return [lreplace $date 0 0 $value] }
     month      { return [lreplace $date 1 1 $value] }
     day        { return [lreplace $date 2 2 $value] }
@@ -537,7 +537,7 @@
 ad_proc -public template::util::date::defaultInterval { what } {
     Get the default ranges for all the numeric fields of a Date object
 } {
-  switch $what {
+  switch -- $what {
     year        { return [list 2002 2012 1 ] }
     month       { return [list 1 12 1] }
     day         { return [list 1 31 1] }
@@ -995,7 +995,7 @@
   }
 
   # Choose a pre-selected format, if any
-  switch $element(format) {
+  switch -- $element(format) {
     long     { set element(format) "YYYY/MM/DD HH24:MI:SS" }
     short    { set element(format) "YYYY/MM/DD"}
     time     { set element(format) "HH24:MI:SS"}
Index: openacs-4/packages/acs-templating/tcl/file-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/file-procs.tcl,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/acs-templating/tcl/file-procs.tcl	7 Aug 2017 23:48:01 -0000	1.11
+++ openacs-4/packages/acs-templating/tcl/file-procs.tcl	1 Oct 2017 12:16:05 -0000	1.12
@@ -56,7 +56,7 @@
     @return The requested property from the file datatype structure.
 } {
 
-    switch $what {
+    switch -- $what {
         filename {
             return [lindex $file_list 0]
         }
Index: openacs-4/packages/acs-templating/tcl/head-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/head-procs.tcl,v
diff -u -N -r1.21 -r1.22
--- openacs-4/packages/acs-templating/tcl/head-procs.tcl	7 Aug 2017 23:48:02 -0000	1.21
+++ openacs-4/packages/acs-templating/tcl/head-procs.tcl	1 Oct 2017 12:16:05 -0000	1.22
@@ -489,7 +489,7 @@
     }
 
     if {[info exists headers]} {
-      switch $direction {
+      switch -- $direction {
 	outer {set headers [concat [list $values] $headers]}
 	inner {lappend headers $values}
 	default {error "unknown direction $direction"}
@@ -534,7 +534,7 @@
     }
 
     if {[info exists footers]} {
-      switch $direction {
+      switch -- $direction {
 	outer {lappend footers $values}
 	inner {set footers [concat [list $values] $footers]}
 	default {error "unknown direction $direction"}
Index: openacs-4/packages/acs-templating/tcl/list-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/list-procs.tcl,v
diff -u -N -r1.62 -r1.63
--- openacs-4/packages/acs-templating/tcl/list-procs.tcl	7 Aug 2017 23:48:02 -0000	1.62
+++ openacs-4/packages/acs-templating/tcl/list-procs.tcl	1 Oct 2017 12:16:05 -0000	1.63
@@ -880,7 +880,7 @@
     # Get an upvar'd reference to list_properties
     get_reference -name $name
 
-    switch $list_properties(output) {
+    switch -- $list_properties(output) {
         csv {
             write_csv -name $name
             ad_script_abort
@@ -1308,7 +1308,7 @@
                                    ([string is double [set $__element_properties(name)]] ? [set $__element_properties(name)] : 0)}]
                     }
 
-                    switch $__element_properties(aggregate) {
+                    switch -- $__element_properties(aggregate) {
                         sum {
                             set $__element_properties(aggregate_col) $__agg_sum($__element_properties(name))
                             if { $__have_groupby } {
@@ -1667,7 +1667,7 @@
             if { [string trim $label] eq "" } {
                 set label $filter_properties(null_label)
             }
-            switch $filter_properties(type) {
+            switch -- $filter_properties(type) {
                 singleval {
                     set selected_p [exists_and_equal current_filter_value $value]
                 }
@@ -1719,7 +1719,7 @@
             }
 
             # Generate url and add to filter(urls)
-            switch $filter_properties(type) {
+            switch -- $filter_properties(type) {
                 singleval - multival {
                     lappend filter_properties(urls) [get_url \
                                                          -name $name \
@@ -2174,7 +2174,7 @@
         -list_name $list_name \
         -element_name $element_name
 
-    switch $property {
+    switch -- $property {
         display_eval - link_url_eval {
             # This is a chunk of Tcl code, which should be executed later, not now
             set element_properties($property) $value
@@ -2442,7 +2442,7 @@
         -ulevel [expr {$ulevel + 1}]
 
     # This is to be used by the export_vars function
-    switch $filter_properties(type) {
+    switch -- $filter_properties(type) {
         singleval - multivar {
             set filter_properties(var_spec) $filter_name
         }
@@ -2500,7 +2500,7 @@
         -list_name $list_name \
         -filter_name $filter_name
 
-    switch $property {
+    switch -- $property {
         where_clause_eval - add_url_eval {
             # Eval's shouldn't be subst'ed here, will be later
             set filter_properties($property) $value
@@ -2689,7 +2689,7 @@
     set elementnum 0
 
     foreach { key value } $spec {
-        switch $key {
+        switch -- $key {
             row {
                 # We only care about this for the currently selected format
                 if {$format_name eq $selected_format} {
@@ -2977,7 +2977,7 @@
         -list_name $list_name \
         -orderby_name $orderby_name
 
-    switch $property {
+    switch -- $property {
         orderby {
             set value [uplevel $ulevel [list subst $value]]
             set orderby_properties($property) $value
Index: openacs-4/packages/acs-templating/tcl/parse-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/parse-procs.tcl,v
diff -u -N -r1.56 -r1.57
--- openacs-4/packages/acs-templating/tcl/parse-procs.tcl	7 Aug 2017 23:48:02 -0000	1.56
+++ openacs-4/packages/acs-templating/tcl/parse-procs.tcl	1 Oct 2017 12:16:05 -0000	1.57
@@ -185,7 +185,7 @@
     # Always pop off the parse_level no matter how we exit
     template::util::lpop ::template::parse_level
 
-    switch $return_code {
+    switch -- $return_code {
         0 - 2 {
             # CODE executed without a non-local exit -- return what it
             # evaluated to.
Index: openacs-4/packages/acs-templating/tcl/query-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/query-procs.tcl,v
diff -u -N -r1.35 -r1.36
--- openacs-4/packages/acs-templating/tcl/query-procs.tcl	7 Aug 2017 23:48:02 -0000	1.35
+++ openacs-4/packages/acs-templating/tcl/query-procs.tcl	1 Oct 2017 12:16:05 -0000	1.36
@@ -458,7 +458,7 @@
 
   if { $success } {
 
-    switch $type {
+    switch -- $type {
 
       multirow {
 
@@ -871,7 +871,7 @@
 
         set errno [catch { uplevel 1 $code_block } error]
 
-        switch $errno {
+        switch -- $errno {
           0 {
             # TCL_OK
           }
Index: openacs-4/packages/acs-templating/tcl/richtext-or-file-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/richtext-or-file-procs.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/acs-templating/tcl/richtext-or-file-procs.tcl	7 Aug 2017 23:48:02 -0000	1.8
+++ openacs-4/packages/acs-templating/tcl/richtext-or-file-procs.tcl	1 Oct 2017 12:16:05 -0000	1.9
@@ -116,7 +116,7 @@
     # as a non-value in case of a required element.
 
     set storage_type [ns_queryget $element_id.storage_type]
-    switch $storage_type {
+    switch -- $storage_type {
         text {
             set text [ns_queryget $element_id.text]
             if { $text eq "" } {
@@ -162,7 +162,7 @@
     set tmp_filename [lindex $richtext_or_file_list 4]
     set content_url  [lindex $richtext_or_file_list 5]
 
-    switch $what {
+    switch -- $what {
         storage_type {
             # Replace contents with value
             return [list $value $mime_type $text $filename $tmp_filename $content_url]
@@ -210,7 +210,7 @@
     set tmp_filename [lindex $richtext_or_file_list 4]
     set content_url  [lindex $richtext_or_file_list 5]
 
-    switch $what {
+    switch -- $what {
         storage_type {
             return $storage_type
         }
@@ -233,7 +233,7 @@
             return [list $filename $tmp_filename $mime_type]
         }
         html_value {
-            switch $storage_type {
+            switch -- $storage_type {
                 text {
                     return [ad_html_text_convert -from $mime_type -to "text/html" -- $text]
                 }
Index: openacs-4/packages/acs-templating/tcl/richtext-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/richtext-procs.tcl,v
diff -u -N -r1.53 -r1.54
--- openacs-4/packages/acs-templating/tcl/richtext-procs.tcl	7 Aug 2017 23:48:02 -0000	1.53
+++ openacs-4/packages/acs-templating/tcl/richtext-procs.tcl	1 Oct 2017 12:16:05 -0000	1.54
@@ -136,7 +136,7 @@
     set contents [lindex $richtext_list 0]
     set format   [lindex $richtext_list 1]
 
-    switch $what {
+    switch -- $what {
         contents - content - text {
             # Replace contents with value
             return [list $value $format]
@@ -166,7 +166,7 @@
     set contents  [lindex $richtext_list 0]
     set format    [lindex $richtext_list 1]
 
-    switch $what {
+    switch -- $what {
         content - contents - text {
             return $contents
         }
Index: openacs-4/packages/acs-templating/tcl/tag-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/tag-init.tcl,v
diff -u -N -r1.40 -r1.41
--- openacs-4/packages/acs-templating/tcl/tag-init.tcl	7 Aug 2017 23:48:02 -0000	1.40
+++ openacs-4/packages/acs-templating/tcl/tag-init.tcl	1 Oct 2017 12:16:05 -0000	1.41
@@ -824,7 +824,7 @@
 
     # append the switch statement and eval tags in between
 
-    template::adp_append_code "switch $sw -- $arg {"
+    template::adp_append_code "switch -- $sw -- $arg {"
 
     template::adp_compile_chunk $chunk
 
Index: openacs-4/packages/acs-templating/tcl/tag-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/tag-procs.tcl,v
diff -u -N -r1.23 -r1.24
--- openacs-4/packages/acs-templating/tcl/tag-procs.tcl	15 Sep 2017 07:23:22 -0000	1.23
+++ openacs-4/packages/acs-templating/tcl/tag-procs.tcl	1 Oct 2017 12:16:05 -0000	1.24
@@ -34,7 +34,7 @@
 
             set conjunction [lindex $args 0]      
 
-            switch $conjunction {
+            switch -- $conjunction {
                 
                 and { append condition " && " }
                 or { append condition " || " }
@@ -56,7 +56,7 @@
 
     append condition "\} \{"
 
-    switch $condition_type {
+    switch -- $condition_type {
         if     {template::adp_append_code $condition}
         elseif {template::adp_append_code $condition -nobreak}
     }
@@ -144,7 +144,7 @@
 
     # build the conditional expression
 
-    switch $op {
+    switch -- $op {
 
         gt { 
             append condition "$arg1 > \"[lindex $args $i]\"" 
Index: openacs-4/packages/acs-templating/tcl/util-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/util-procs.tcl,v
diff -u -N -r1.29 -r1.30
--- openacs-4/packages/acs-templating/tcl/util-procs.tcl	7 Aug 2017 23:48:02 -0000	1.29
+++ openacs-4/packages/acs-templating/tcl/util-procs.tcl	1 Oct 2017 12:16:05 -0000	1.30
@@ -587,7 +587,7 @@
 
   set cookie "$name=[ns_urlencode $value]; path=/; domain=$domain"
     
-  switch $expire_state {
+  switch -- $expire_state {
 
     persistent {
       append cookie ";expires=Wed, 01-Jan-2020 01:00:00 GMT"
Index: openacs-4/packages/acs-templating/tcl/widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/widget-procs.tcl,v
diff -u -N -r1.54 -r1.55
--- openacs-4/packages/acs-templating/tcl/widget-procs.tcl	7 Aug 2017 23:48:02 -0000	1.54
+++ openacs-4/packages/acs-templating/tcl/widget-procs.tcl	1 Oct 2017 12:16:05 -0000	1.55
@@ -1016,7 +1016,7 @@
     @return 
     @error 
 } {
-    switch $what {
+    switch -- $what {
         select_value - select {
             return [lindex $select_text_list 0]
         }
@@ -1128,7 +1128,7 @@
     @return 
     @error 
 } {
-    switch $what {
+    switch -- $what {
         radio_value - radio {
             return [lindex $radio_list 0]
         }
@@ -1253,7 +1253,7 @@
     @return 
     @error 
 } {
-    switch $what {
+    switch -- $what {
         checkbox_value - checkbox {
             return [lindex $checkbox_list 0]
         }
Index: openacs-4/packages/acs-templating/www/doc/demo/skin.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/skin.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-templating/www/doc/demo/skin.tcl	7 Aug 2017 23:48:02 -0000	1.3
+++ openacs-4/packages/acs-templating/www/doc/demo/skin.tcl	1 Oct 2017 12:16:05 -0000	1.4
@@ -18,7 +18,7 @@
 
 # Choose a skin
 
-switch $skin {
+switch -- $skin {
   plain { set file skin-plain }
   fancy { set file skin-fancy }
   default { set file /packages/acs-templating/www/doc/demo/skin-plain }
Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/file-selector.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/file-selector.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/file-selector.tcl	15 Sep 2017 07:23:22 -0000	1.8
+++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/file-selector.tcl	1 Oct 2017 12:16:05 -0000	1.9
@@ -283,7 +283,7 @@
 }
 
 set HTML_NothingSelected [_ acs-templating.HTMLArea_SelectImageNothingSelected]
-switch $selector_type {
+switch -- $selector_type {
   "image" {
     set HTML_Title  [_ acs-templating.HTMLArea_SelectImageTitle]
     set HTML_Legend [_ acs-templating.HTMLArea_SelectImage]
Index: openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl,v
diff -u -N -r1.19 -r1.20
--- openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl	7 Aug 2017 23:48:03 -0000	1.19
+++ openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl	1 Oct 2017 12:16:05 -0000	1.20
@@ -170,7 +170,7 @@
 			    -package_id [ad_conn package_id] \
 			    -mime_type $mime_type
 		    }
-		    file delete $upload_tmpfile
+		    file delete -- $upload_tmpfile
 		    permission::grant \
 			-object_id $item_id \
 			-party_id $user_id \
Index: openacs-4/packages/acs-templating/www/scripts/xinha/attach-image.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/scripts/xinha/attach-image.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/acs-templating/www/scripts/xinha/attach-image.tcl	7 Aug 2017 23:48:03 -0000	1.13
+++ openacs-4/packages/acs-templating/www/scripts/xinha/attach-image.tcl	1 Oct 2017 12:16:05 -0000	1.14
@@ -134,7 +134,7 @@
 		# create thumbnail
 		image::resize -item_id $item_id
 		
-		file delete $upload_tmpfile
+		file delete -- $upload_tmpfile
 		
 		permission::grant \
 		    -object_id $item_id \
Index: openacs-4/packages/acs-templating/www/scripts/xinha/file-selector.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/scripts/xinha/file-selector.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-templating/www/scripts/xinha/file-selector.tcl	15 Sep 2017 07:23:22 -0000	1.7
+++ openacs-4/packages/acs-templating/www/scripts/xinha/file-selector.tcl	1 Oct 2017 12:16:05 -0000	1.8
@@ -259,7 +259,7 @@
 }
 
 set HTML_NothingSelected [_ acs-templating.HTMLArea_SelectImageNothingSelected]
-switch $selector_type {
+switch -- $selector_type {
   "image" {
     set HTML_Title  [_ acs-templating.HTMLArea_SelectImageTitle]
     set HTML_Legend [_ acs-templating.HTMLArea_SelectImage]