Index: openacs-4/packages/acs-admin/www/apm/version-i18n-process-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n-process-2.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/acs-admin/www/apm/version-i18n-process-2.tcl	7 Apr 2018 19:41:47 -0000	1.21
+++ openacs-4/packages/acs-admin/www/apm/version-i18n-process-2.tcl	30 Apr 2018 12:45:00 -0000	1.22
@@ -3,9 +3,9 @@
 
     @author Peter Marklund (peter@collaboraid.biz)
     @creation-date 8 October 2002
-    @cvs-id $Id$  
+    @cvs-id $Id$
 } {
-    version_id:naturalnum,notnull    
+    version_id:naturalnum,notnull
     {files:multiple,notnull}
     {file_action:multiple}
     {number_of_keys:integer,notnull ""}
@@ -68,8 +68,7 @@
     ns_log Notice "Replacing text in file $text_file with message tags"
     append processing_html_result "<h3>Text replacements for $text_file</h3>"
     set adp_text_result_list [lang::util::replace_adp_text_with_message_tags "$::acs::rootdir/$text_file" write $message_key_list]
-    set text_replacement_list [lindex $adp_text_result_list 0]
-    set text_untouched_list [lindex $adp_text_result_list 1]
+    lassign $adp_text_result_list text_replacement_list text_untouched_list
 
     append processing_html_result "<b>Replaced [llength $text_replacement_list] texts</b>: <br>"
     foreach text_replacement $text_replacement_list {
@@ -108,7 +107,7 @@
 
         append processing_html_result "Did $number_of_replacements replacements, see the log file for details"
     }
-}    
+}
 
 # Remove the processed file from the file list.
 set files [lrange $files $number_of_processed_files end]
Index: openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl,v
diff -u -r1.53 -r1.54
--- openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl	23 Apr 2018 07:17:58 -0000	1.53
+++ openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl	30 Apr 2018 12:45:00 -0000	1.54
@@ -490,8 +490,7 @@
     upvar 2 _aa_exports _aa_exports
     foreach init_class \[list $init_classes\] {
       if {[llength $init_class] == 2} {
-        set init_package_key [lindex $init_class 1]
-        set init_class [lindex $init_class 0]
+        lassign $init_class init_class init_package_key
       } else {
         set init_package_key $package_key
       }
@@ -574,19 +573,15 @@
         lappend testcase_ids $testcase_id
         foreach testcase [nsv_get aa_test cases] {
             if {$testcase_id == [lindex $testcase 0]} {
-                set package_key    [lindex $testcase 3]
-                set init_classes   [lindex $testcase 5]
+                lassign $testcase . . . package_key . init_classes
                 foreach init_class $init_classes {
                     set classes([list $package_key $init_class]) 1
                 }
             }
         }
     } else {
         foreach testcase [nsv_get aa_test cases] {
-            set testcase_id    [lindex $testcase 0]
-            set package_key    [lindex $testcase 3]
-            set categories     [lindex $testcase 4]
-            set init_classes   [lindex $testcase 5]
+            lassign $testcase testcase_id . . package_key categories init_classes
 
             # try to disqualify the test case
 
@@ -624,8 +619,7 @@
     #
     if {[info exists classes]} {
         foreach initpair [array names classes] {
-            set package_key [lindex $initpair 0]
-            set init_class  [lindex $initpair 1]
+            lassign $initpair package_key init_class
             set _aa_export {}
             set aa_init_class_logs([list $package_key $init_class]) {}
             set aa_in_init_class [list $package_key $init_class]
@@ -647,8 +641,7 @@
     #
     if {[info exists classes]} {
         foreach initpair [array names classes] {
-            set package_key [lindex $initpair 0]
-            set init_class  [lindex $initpair 1]
+            lassign $initpair package_key init_class
             set aa_in_init_class [list $package_key $init_class]
             _${package_key}__d_$init_class
         }
@@ -688,14 +681,8 @@
     set testcase_bodys {}
     foreach testcase [nsv_get aa_test cases] {
         if {$testcase_id == [lindex $testcase 0]} {
-            set testcase_file     [lindex $testcase 2]
-            set package_key       [lindex $testcase 3]
+            lassign $testcase . . testcase_file package_key testcase_cats testcase_inits testcase_on_error testcase_bodys aa_error_level
             set aa_package_key    $package_key
-            set testcase_cats     [lindex $testcase 4]
-            set testcase_inits    [lindex $testcase 5]
-            set testcase_on_error [lindex $testcase 6]
-            set testcase_bodys    [lindex $testcase 7]
-            set aa_error_level       [lindex $testcase 8]
         }
     }
     if {[llength $testcase_bodys] == 0} {
@@ -1090,7 +1077,7 @@
         lappend extra_args -headers $requestHeaders
     }
     nsv_set aa_test logindata [list peeraddr $peeraddr user_id $user_id]
-    
+
     #
     # Construct nice log line
     #
@@ -1102,7 +1089,7 @@
         append log_line "\n$body"
     }
     aa_log $log_line
-    
+
     #
     # Run actual request
     #
Index: openacs-4/packages/acs-automated-testing/tcl/http.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/tcl/Attic/http.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-automated-testing/tcl/http.tcl	23 Mar 2018 23:53:01 -0000	1.4
+++ openacs-4/packages/acs-automated-testing/tcl/http.tcl	30 Apr 2018 12:45:00 -0000	1.5
@@ -5,9 +5,9 @@
 # http.tcl --
 #
 #	Client-side HTTP for GET, POST, and HEAD commands.
-#	These routines can be used in untrusted code that uses 
-#	the Safesock security policy.  These procedures use a 
-#	callback interface to avoid using vwait, which is not 
+#	These routines can be used in untrusted code that uses
+#	the Safesock security policy.  These procedures use a
+#	callback interface to avoid using vwait, which is not
 #	defined in the safe base.
 #
 # See the file "license.terms" for information on usage and
@@ -59,7 +59,7 @@
             -proxyport {}
             -proxyfilter http::ProxyRequired
         }
-        
+
         # Use a Mozilla compatible useragent header to avoid problems with
         # some web sites.
         set http(-useragent) \
@@ -225,7 +225,7 @@
     catch {fileevent $s readable {}}
     if {$token != {}} {
         variable $token
-        upvar 0 $token state        
+        upvar 0 $token state
         if {[info exists state(socketinfo)]} {
             if {[info exists socketmap($state(socketinfo))]} {
                 unset socketmap($state(socketinfo))
@@ -401,8 +401,7 @@
 	unset $token
 	return -code error "Unsupported URL type \"$proto\""
     }
-    set defport [lindex $urlTypes($proto) 0]
-    set defcmd [lindex $urlTypes($proto) 1]
+    lassign $urlTypes($proto) defport defcmd
 
     if {$port eq ""} {
 	set port $defport
@@ -415,8 +414,7 @@
     }
     set state(url) $url
     if {![catch {$http(-proxyfilter) $host} proxy]} {
-	set phost [lindex $proxy 0]
-	set pport [lindex $proxy 1]
+    lassign $proxy phost pport
     }
 
     # If a timeout is specified we set up the after event
@@ -464,7 +462,7 @@
             eval $defcmd $async [split $state(socketinfo) :]
         } s]
         if {$conStat} {
-            
+
             # something went wrong while trying to establish the
             # connection Clean up after events and such, but DON'T
             # call the command callback (if available) because we're
@@ -487,7 +485,7 @@
 	if {$state(status) eq "error"} {
 	    # something went wrong while trying to establish the connection
 	    # Clean up after events and such, but DON'T call the command
-	    # callback (if available) because we're going to throw an 
+	    # callback (if available) because we're going to throw an
 	    # exception from here instead.
 	    set err [lindex $state(error) 0]
 	    cleanup $token
@@ -586,10 +584,10 @@
 	# get the response from the server because of the error it will
 	# get trying to write the post data.  Having both fileevents active
 	# changes the timing and the behavior, but no two platforms
-	# (among Solaris, Linux, and NT)  behave the same, and none 
+	# (among Solaris, Linux, and NT)  behave the same, and none
 	# behave all that well in any case.  Servers should always read their
 	# POST data if they expect the client to read their response.
-		
+
 	if {$isQuery || $isQueryChannel} {
 	    puts $s "Content-Type: $state(-type)"
 	    if {!$contDone} {
@@ -614,7 +612,7 @@
 		# Something went wrong, so throw the exception, and the
 		# enclosing catch will do cleanup.
 		return -code error [lindex $state(error) 0]
-	    }		
+	    }
 	}
     } err]} {
 	# The socket probably was never connected,
@@ -623,7 +621,7 @@
 	# Clean up after events and such, but DON'T call the command callback
 	# (if available) because we're going to throw an exception from here
 	# instead.
-	
+
 	# if state(status) is error, it means someone's already called Finish
 	# to do the above-described clean up.
 	if {$state(status) eq "error"} {
@@ -737,16 +735,16 @@
     variable $token
     upvar 0 $token state
     set s $state(sock)
-    
+
     # Output a block.  Tcl will buffer this if the socket blocks
-    
+
     set done 0
     if {[catch {
-	
+
 	# Catch I/O errors on dead sockets
 
 	if {[info exists state(-query)]} {
-	    
+
 	    # Chop up large query strings so queryprogress callback
 	    # can give smooth feedback
 
@@ -760,7 +758,7 @@
 		set done 1
 	    }
 	} else {
-	    
+
 	    # Copy blocks from the query channel
 
 	    set outStr [read $state(-querychannel) $state(-queryblocksize)]
@@ -888,7 +886,7 @@
                     }
                 }
                 lappend state(meta) $key [string trim $value]
-                
+
             } elseif {[string match "HTTP*" $line]} {
                 set state(http) $line
             }
@@ -1092,8 +1090,8 @@
 # http::formatQuery --
 #
 #	See documentation for details.
-#	Call http::formatQuery with an even number of arguments, where 
-#	the first is a name, the second is a value, the third is another 
+#	Call http::formatQuery with an even number of arguments, where
+#	the first is a name, the second is a value, the third is another
 #	name, and so on.
 #
 # Arguments:
@@ -1142,7 +1140,7 @@
 }
 
 # http::ProxyRequired --
-#	Default proxy filter. 
+#	Default proxy filter.
 #
 # Arguments:
 #	host	The destination host
Index: openacs-4/packages/acs-automated-testing/tcl/selenium-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/tcl/selenium-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-automated-testing/tcl/selenium-procs.tcl	7 Aug 2017 23:47:46 -0000	1.2
+++ openacs-4/packages/acs-automated-testing/tcl/selenium-procs.tcl	30 Apr 2018 12:45:00 -0000	1.3
@@ -18,19 +18,19 @@
 # Note: This code requires a new HTTP/1.1 aware version of geturl - the current
 #       http 2.4 package in Tcl doesn't know how to keep a 1.1 connection alive
 #       and will slow down because *each* Selenium request will time out.
-#       
+#
 # Example use:
 #
 #       package require selenium
-#       
+#
 #       Se init localhost 4444 *firefox http://www.google.com/webhp
 #       Se start
-#       
+#
 #       Se open http://www.google.com/webhp
 #       Se type q "hello world"
 #       Se clickAndWait btnG
 #       Se assertTitle "hello world - Google Search"
-#       
+#
 #       Se stop
 #
 # by Jean-Claude Wippler, 2007-02-24
@@ -43,26 +43,23 @@
 proc Se {cmd args} {
     global selenium
     switch -- $cmd {
-        
+
         init {
-            set selenium(host) [lindex $args 0]
-            set selenium(port) [lindex $args 1]
-            set selenium(browserStartCommand) [lindex $args 2]
-            set selenium(browserURL) [lindex $args 3]
+            lassign $args selenium(host) selenium(port) selenium(browserStartCommand) selenium(browserURL)
             set selenium(sessionId) ""
         }
-        
+
         start {
             set selenium(sessionId) [Se getNewBrowserSession \
                                         $selenium(browserStartCommand) \
                                         $selenium(browserURL)]
         }
-        
+
         stop {
             Se testComplete
             set selenium(sessionId) ""
         }
-        
+
         default {
             set query [list http::formatQuery cmd $cmd]
             set i 0
Index: openacs-4/packages/acs-automated-testing/www/admin/component.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/component.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-automated-testing/www/admin/component.tcl	7 Aug 2017 23:47:46 -0000	1.6
+++ openacs-4/packages/acs-automated-testing/www/admin/component.tcl	30 Apr 2018 12:45:00 -0000	1.7
@@ -16,11 +16,9 @@
 
 set component_bodys {}
 foreach component [nsv_get aa_test components] {
-  if {$component_id eq [lindex $component 0] && $package_key eq [lindex $component 1]} {
-    set component_desc [lindex $component 2]
-    set component_file [lindex $component 3]
-    set component_body [lindex $component 4]
-  }
+    if {$component_id eq [lindex $component 0] && $package_key eq [lindex $component 1]} {
+        lassign $component . . component_desc component_file component_body
+    }
 }
 
 ad_return_template
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 -r1.78 -r1.79
--- openacs-4/packages/acs-templating/tcl/list-procs.tcl	25 Apr 2018 19:23:26 -0000	1.78
+++ openacs-4/packages/acs-templating/tcl/list-procs.tcl	30 Apr 2018 12:45:00 -0000	1.79
@@ -513,12 +513,12 @@
 
     prepare_filters \
         -name $name
-    
+
     # Split the current ordering info into name and direction
     # name is the string before the comma, order (asc/desc) is what's after
     if { [info exists list_properties(filter,$list_properties(orderby_name))] } {
         lassign [lrange [split $list_properties(filter,$list_properties(orderby_name)) ","] 0 1] orderby_name orderby_direction
-        
+
         set list_properties(orderby_selected_name) $orderby_name
         if { $orderby_direction eq "" } {
 
@@ -3247,8 +3247,7 @@
     # take out filters we already applied...
     set i 0
     foreach option_list $filter_names_options_tmp {
-        set option_label [lindex $option_list 0]
-        set option_name [lindex $option_list 1]
+        lassign $option_list option_label option_name
         if {"${name}:filter:${option_name}:properties" ni $client_property_filters} {
             lappend filter_names_options [list $option_label $option_name]
         }
Index: openacs-4/packages/acs-templating/tcl/paginator-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/paginator-procs.tcl,v
diff -u -r1.29 -r1.30
--- openacs-4/packages/acs-templating/tcl/paginator-procs.tcl	27 Apr 2018 14:32:11 -0000	1.29
+++ openacs-4/packages/acs-templating/tcl/paginator-procs.tcl	30 Apr 2018 12:45:00 -0000	1.30
@@ -121,14 +121,12 @@
          || ([info exists opts(flush_p)] && $opts(flush_p) == "t")
     } {
         if { [info exists opts(printing_prefs)] && $opts(printing_prefs) ne "" } {
-            set title [lindex $opts(printing_prefs) 0]
-            set stylesheet [lindex $opts(printing_prefs) 1]
+            lassign $opts(printing_prefs) title stylesheet background header_file footer_file return_url
             if { $stylesheet ne "" } {
                 set css_link [subst {<link rel="stylesheet" href="[ns_quotehtml $stylesheet]" type="text/css">}]
             } else {
                 set css_link ""
             }
-            set background [lindex $opts(printing_prefs) 2]
             if { $background ne "" } {
                 set bg "background=\"$background\""
             } else {
@@ -144,23 +142,20 @@
                 </head>
                 <body $bg>
             }]
-            set header_file [lindex $opts(printing_prefs) 3]
             if { $header_file ne "" } {
                 ns_write [ns_adp_parse -file $header_file]
             }
             ns_write [lindex $opts(printing_prefs) 6]
             init $statement_name $name $query 1
             ns_write [lindex $opts(printing_prefs) 7]
-            set footer_file [lindex $opts(printing_prefs) 4]
             if { $footer_file ne "" } {
                 ns_write [ns_adp_parse -file $footer_file]
             }
-            set return_url [lindex $opts(printing_prefs) 5]
             if { $return_url ne "" } {
-            # Not sure, what the intended semantics of this command was...
-            #if { [llength $opts(row_ids)]==0 } {
-            #   nsv_set __template_cache_timeout $cache_key $opts(timeout)
-            #}
+                # Not sure, what the intended semantics of this command was...
+                #if { [llength $opts(row_ids)]==0 } {
+                #   nsv_set __template_cache_timeout $cache_key $opts(timeout)
+                #}
                 ns_write [subst {
                     <script type="text/javascript" nonce="$::__csp_nonce">
                     document.location.href="[ns_quotehtml $return_url]";
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 -r1.10 -r1.11
--- openacs-4/packages/acs-templating/tcl/richtext-or-file-procs.tcl	29 Jan 2018 11:03:25 -0000	1.10
+++ openacs-4/packages/acs-templating/tcl/richtext-or-file-procs.tcl	30 Apr 2018 12:45:00 -0000	1.11
@@ -75,16 +75,11 @@
 
     upvar 2 $message_ref message $value_ref richtext_or_file_list
 
-    set storage_type [lindex $richtext_or_file_list 0]
-    set mime_type    [lindex $richtext_or_file_list 1]
-    set text         [lindex $richtext_or_file_list 2]
-    set filename     [lindex $richtext_or_file_list 3]
-    set tmp_filename [lindex $richtext_or_file_list 4]
-    set content_url  [lindex $richtext_or_file_list 5]
+    lassign $richtext_or_file_list storage_type mime_type text filename tmp_filename content_url
 
     if { $text ne "" && [lsearch -exact [template::util::richtext_or_file::formats] $mime_type] == -1 } {
-	set message "Invalid text format, '$mime_type'."
-	return 0
+        set message "Invalid text format, '$mime_type'."
+        return 0
     }
 
     # enhanced text and HTML needs to be security checked
@@ -97,7 +92,7 @@
     }
 
     return 1
-}    
+}
 
 ad_proc -public template::data::transform::richtext_or_file {
     element_ref
@@ -113,7 +108,7 @@
     upvar $element_ref element
     set element_id $element(id)
 
-    # We need to return the empty list in order for form builder to think of it 
+    # We need to return the empty list in order for form builder to think of it
     # as a non-value in case of a required element.
 
     set storage_type [ns_queryget $element_id.storage_type]
@@ -126,7 +121,7 @@
             set mime_type [ns_queryget $element_id.mime_type]
 
             return [list [list "text" $mime_type $text {} {} {}]]
-        }  
+        }
         file {
             set file [template::util::file_transform $element_id.file]
             if { $file eq "" } {
@@ -145,7 +140,7 @@
 }
 
 ad_proc -public template::util::richtext_or_file::set_property { what richtext_or_file_list value } {
-    Set a property of the richtext_or_file datatype. Valid proerties are: 
+    Set a property of the richtext_or_file datatype. Valid proerties are:
 
     <ul>
       <li>storage_type
@@ -156,12 +151,7 @@
       <li>content_url
     </ul>
 } {
-    set storage_type [lindex $richtext_or_file_list 0]
-    set mime_type    [lindex $richtext_or_file_list 1]
-    set text         [lindex $richtext_or_file_list 2]
-    set filename     [lindex $richtext_or_file_list 3]
-    set tmp_filename [lindex $richtext_or_file_list 4]
-    set content_url  [lindex $richtext_or_file_list 5]
+    lassign richtext_or_file_list storage_type mime_type text filename tmp_filename content_url
 
     switch -- $what {
         storage_type {
@@ -193,7 +183,7 @@
 
 ad_proc -public template::util::richtext_or_file::get_property { what richtext_or_file_list } {
 
-    Get a property of the richtext_or_file datatype. Valid proerties are: 
+    Get a property of the richtext_or_file datatype. Valid proerties are:
 
     <ul>
       <li>storage_type
@@ -204,12 +194,7 @@
       <li>content_url
     </ul>
 } {
-    set storage_type [lindex $richtext_or_file_list 0]
-    set mime_type    [lindex $richtext_or_file_list 1]
-    set text         [lindex $richtext_or_file_list 2]
-    set filename     [lindex $richtext_or_file_list 3]
-    set tmp_filename [lindex $richtext_or_file_list 4]
-    set content_url  [lindex $richtext_or_file_list 5]
+    lassign $richtext_or_file_list storage_type mime_type text filename tmp_filename content_url
 
     switch -- $what {
         storage_type {
@@ -253,15 +238,15 @@
 ad_proc -public template::widget::richtext_or_file {
     element_reference
     tag_attributes
-} { 
+} {
     Render a richtext_or_file widget
 
     @param element_reference Reference variable to the form element
     @param tag_attributes Attributes to include in the generated HTML
 
     @return Form HTML for the widget
 
-} { 
+} {
   upvar $element_reference element
 
   if { [info exists element(html)] } {
@@ -273,10 +258,10 @@
   if { [info exists element(value)] } {
       set storage_type [template::util::richtext_or_file::get_property storage_type $element(value)]
       set mime_type    [template::util::richtext_or_file::get_property mime_type $element(value)]
-      set text         [template::util::richtext_or_file::get_property text $element(value)] 
-      set filename     [template::util::richtext_or_file::get_property filename $element(value)] 
-      set tmp_filename [template::util::richtext_or_file::get_property tmp_filename $element(value)] 
-      set content_url  [template::util::richtext_or_file::get_property content_url $element(value)] 
+      set text         [template::util::richtext_or_file::get_property text $element(value)]
+      set filename     [template::util::richtext_or_file::get_property filename $element(value)]
+      set tmp_filename [template::util::richtext_or_file::get_property tmp_filename $element(value)]
+      set content_url  [template::util::richtext_or_file::get_property content_url $element(value)]
   } else {
       set storage_type {}
       set mime_type    {}
@@ -285,7 +270,7 @@
       set tmp_filename {}
       set content_url  {}
   }
-  
+
   set output {}
 
   if {$element(mode) eq "edit"} {
@@ -338,7 +323,7 @@
       if { $storage_type eq "" } {
           append output [subst {<input type="file" name="$element(id).file" disabled>}]
       }
-      
+
       if { $storage_type eq "" } {
           append output "</blockquote>"
       }
@@ -351,7 +336,7 @@
           append output "<input type=\"hidden\" name=\"$element(id).text\" value=\"[ns_quotehtml $text]\">"
       }
   }
-      
+
   return $output
 }
 
Index: openacs-4/packages/acs-templating/tcl/table-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/table-procs.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-templating/tcl/table-procs.tcl	7 Aug 2017 23:48:02 -0000	1.10
+++ openacs-4/packages/acs-templating/tcl/table-procs.tcl	30 Apr 2018 12:45:00 -0000	1.11
@@ -3,7 +3,7 @@
 
     @author Karl Goldstein    (karlg@arsdigita.com)
     @author Stanislav Freidin (sfreidin@arsdigita.com)
-    
+
     @cvs-id $Id$
 }
 
@@ -24,23 +24,23 @@
 #       presentation is the html code that will be shown in the table cell
 #         (defaults to "@row.value@", see below)
 #     The column definition will be extracted from the query results
-#     if it is omitted. 
+#     if it is omitted.
 #
 # 2). The SQL query that will be executed to get the rows. The orderby
 #      clause will be appended to the query (-query, required).
 #
-# 3). The template to render the table (-style, optional). If omitted, 
+# 3). The template to render the table (-style, optional). If omitted,
 #     the code inside the
 #       <tablewidget> tag will be used
 #
 #  The widget creates two datasources:
 #   "tablewidget:${name}_columns", used to render the column headers,
 #     html     - the HTML to render the label
 #     selected - "t" if the table is being sorted by this column, "f" otherwise
-#   
+#
 #   "tablewidget:${name}_rows", used to render the rows, with the fields
 #     representing the column values for the query. For each column, a field
-#     called "${column_name}_html" is created which contains the presentation 
+#     called "${column_name}_html" is created which contains the presentation
 #     for the field
 #
 #   If the -columns_data or -rows_data switches are specified,
@@ -54,209 +54,208 @@
 
 
 ad_proc -public template::widget::table::create {
-  statement_name
-  name
-  args
+    statement_name
+    name
+    args
 } {
-  Create a table widget
+    Create a table widget
 } {
 
-  upvar "tablewidget:${name}" widget
+    upvar "tablewidget:${name}" widget
 
-  set widget(name) $name
-   
-  template::widget::table::get_params $name 2
-  template::widget::table::prepare $statement_name $name 2
+    set widget(name) $name
+
+    template::widget::table::get_params $name 2
+    template::widget::table::prepare $statement_name $name 2
 }
 
 ad_proc -public template::widget::table::get_params {
-  name
-  {level 1}
+    name
+    {level 1}
 } {
-  Get the order by clause for the widget, other parameters (?)
+    Get the order by clause for the widget, other parameters (?)
 } {
-  
-  upvar $level "tablewidget:${name}" widget
 
-  set widget(orderby) [ns_queryget "tablewidget:${name}_orderby"]
+    upvar $level "tablewidget:${name}" widget
+
+    set widget(orderby) [ns_queryget "tablewidget:${name}_orderby"]
 }
 
 ad_proc -public template::widget::table::default_column_def {
-  name
-  { level 2}
+    name
+    { level 2}
 } {
-  Create the default column definition if none exists
+    Create the default column definition if none exists
 } {
 
-  upvar $level "tablewidget:${name}" widget
+    upvar $level "tablewidget:${name}" widget
 
-  if { ![info exists widget(column_def)] } {
+    if { ![info exists widget(column_def)] } {
     # Get the column definition based on the first row of the datasource
-    upvar $level "tw_${name}_rows:rowcount" rowcount
-    if { $rowcount < 1 } {
-      error "No column definition specified and no rows are available to generate the default column definition for tablewidget $name"
+        upvar $level "tw_${name}_rows:rowcount" rowcount
+        if { $rowcount < 1 } {
+            error "No column definition specified and no rows are available to generate the default column definition for tablewidget $name"
+        }
+        upvar $level "tw_${name}_rows:1" row
+        set column_def [list]
+        foreach name [array names row] {
+            lappend column_def $name [list]
+        }
+        set widget(column_def) $column_def
     }
-    upvar $level "tw_${name}_rows:1" row
-    set column_def [list]
-    foreach name [array names row] {
-      lappend column_def $name [list]
-    }
-    set widget(column_def) $column_def
-  }
 }
 
 ad_proc -public template::widget::table::prepare {
-  statement_name
-  name
-  {level 1}
+    statement_name
+    name
+    {level 1}
 } {
-  Compose the query, if necessary, and define the datasources
+    Compose the query, if necessary, and define the datasources
 } {
-  
-  upvar $level "tablewidget:${name}" widget
- 
-  # Get the rows
-  if { ![info exists widget(rows_data)] } {
-    if { ![info exists widget(query)] } {
-      error "No row datasource available for tablewidget $name"
-    }
 
-    # fixme - need to get a statement name here
-    set sql_query $widget(query)
+    upvar $level "tablewidget:${name}" widget
 
-    # Append the order by clause, if any
-    if { [info exists widget(orderby)] } {
-      if { ![regexp -nocase "order +by" $sql_query match] } {
-        append sql_query "\n order by"
-      }
-      append sql_query " $widget(orderby)"
-    }
+    # Get the rows
+    if { ![info exists widget(rows_data)] } {
+        if { ![info exists widget(query)] } {
+            error "No row datasource available for tablewidget $name"
+        }
 
-    if { [info exists widget(column_def)] } {
-      # Convert the column def list to an array for extra speed 
-      upvar $level "tablewidget:${name}_column_def" column_arr
-      array set column_arr $widget(column_def)
-      set eval_code "set row(row_html) \"\"\n"
+        # fixme - need to get a statement name here
+        set sql_query $widget(query)
 
-      # Process each column and append its presentation to the row html
-      foreach {column_name column} $widget(column_def) {
-        set presentation [lindex $column 2]
-        set row_key "${column_name}_html"
+        # Append the order by clause, if any
+        if { [info exists widget(orderby)] } {
+            if { ![regexp -nocase "order +by" $sql_query match] } {
+                append sql_query "\n order by"
+            }
+            append sql_query " $widget(orderby)"
+        }
 
-        # Make sure there are no empty values that cause tables to
-        # look ugly
-        append eval_code "if \{ \[template::util::is_nil row($column_name) \] \} \{
-            set $column_name \"&nbsp;\"
-	  \} else \{
-            set $column_name \$row($column_name)
-	  \}
-        "
+        if { [info exists widget(column_def)] } {
+        # Convert the column def list to an array for extra speed
+            upvar $level "tablewidget:${name}_column_def" column_arr
+            array set column_arr $widget(column_def)
+            set eval_code "set row(row_html) \"\"\n"
 
-        # Append to the row html  
-        if { $presentation ne "" } {
-          # Debug !
-          regsub -all {"} $presentation {\\"} presentation  
-          append eval_code "set row($row_key) \"$presentation\"\n"
-	} else {
-          append eval_code "set row($row_key) <td>\$$column_name</td>\n"
-	}
-        append eval_code "
-          append row(row_html) \$row($row_key)
-        "
-      }
+            # Process each column and append its presentation to the row html
+            foreach {column_name column} $widget(column_def) {
+                set presentation [lindex $column 2]
+                set row_key "${column_name}_html"
 
+                # Make sure there are no empty values that cause tables to
+                # look ugly
+                append eval_code "if \{ \[template::util::is_nil row($column_name) \] \} \{
+                set $column_name \"&nbsp;\"
+                \} else \{
+                set $column_name \$row($column_name)
+            \}
+            "
+
+            # Append to the row html
+            if { $presentation ne "" } {
+            # Debug !
+                regsub -all {"} $presentation {\\"} presentation
+                append eval_code "set row($row_key) \"$presentation\"\n"
+            } else {
+                append eval_code "set row($row_key) <td>\$$column_name</td>\n"
+            }
+            append eval_code "
+            append row(row_html) \$row($row_key)
+            "
+        }
+
     }
 
     if { [info exists widget(eval)] } {
-      append eval_code $widget(eval)
+        append eval_code $widget(eval)
     }
     uplevel $level "
-      db_multirow tw_${name}_rows $statement_name \{$sql_query\} \\
+    db_multirow tw_${name}_rows $statement_name \{$sql_query\} \\
         \{$eval_code\}
     "
-  
+
     # Get the column definition if it does not exist
     if { ![info exists widget(column_def)] } {
-      template::widget::table::default_column_def widget \
-        [expr {$level + 1}]
+        template::widget::table::default_column_def widget \
+            [expr {$level + 1}]
     }
 
-  } else {
-    uplevel $level "uplevel 0 tw_${name}_rows $widget(rows_data)"
-    template::widget::table::default_column_def widget \
-      [expr {$level + 1}]
-  }
+    } else {
+        uplevel $level "uplevel 0 tw_${name}_rows $widget(rows_data)"
+        template::widget::table::default_column_def widget \
+            [expr {$level + 1}]
+    }
 
-  # Process the rows datasource and get the columns
-  if { ![info exists widget(columns_data)] } {
-    upvar $level "tw_${name}_columns:rowcount" rowcount 
+    # Process the rows datasource and get the columns
+    if { ![info exists widget(columns_data)] } {
+        upvar $level "tw_${name}_columns:rowcount" rowcount
 
-    # Get the base url for the page
-    set url [ns_conn url]
-    set the_form [ns_getform]
-    set the_joiner "?"
-    if { ![template::util::is_nil $the_form] } {
-      foreach key [ns_set keys $the_form] {
-        if { $key ne "tablewidget:${name}_orderby" } {
-          append url "${the_joiner}${key}\=[ns_set get $the_form $key]"
-          set the_joiner "&"
+        # Get the base url for the page
+        set url [ns_conn url]
+        set the_form [ns_getform]
+        set the_joiner "?"
+        if { ![template::util::is_nil $the_form] } {
+            foreach key [ns_set keys $the_form] {
+                if { $key ne "tablewidget:${name}_orderby" } {
+                    append url "${the_joiner}${key}\=[ns_set get $the_form $key]"
+                    set the_joiner "&"
+                }
+            }
         }
-      }
-    }
 
-    # Convert the column def into a multirow datasource
-    set rowcount 0
-    foreach {column_name column} $widget(column_def) {
-      incr rowcount
-      upvar $level "tw_${name}_columns:$rowcount" row
-      set row(rownum) $rowcount
-      set row(colnum) $rowcount
-      set row(name) $column_name
+        # Convert the column def into a multirow datasource
+        set rowcount 0
+        foreach {column_name column} $widget(column_def) {
+            incr rowcount
+            upvar $level "tw_${name}_columns:$rowcount" row
+            set row(rownum) $rowcount
+            set row(colnum) $rowcount
+            set row(name) $column_name
 
-      set label [lindex $column 0]
-      if {$label eq ""} {
-        set label $column_name
-      }
-      set orderby_clause [lindex $column 1]
-      if {$orderby_clause eq ""} {
-        set orderby_clause $column_name
-      }
- 
-      if { [info exists widget(orderby)] && $column_name eq $widget(orderby) } {
-        set row(html) "<b>$label</b>"
-        set row(selected) "t"
-      } else {
-	set row(html)    "<a href=\"[ns_quotehtml ${url}${the_joiner}tablewidget:${name}_orderby\=$row(name)]\">"
-        append row(html) "$label</a>"
-        set row(selected) "f"
-      }
+            lassign $column label orderby_clause
+            if {$label eq ""} {
+                set label $column_name
+            }
+            if {$orderby_clause eq ""} {
+                set orderby_clause $column_name
+            }
+
+            if { [info exists widget(orderby)] && $column_name eq $widget(orderby) } {
+                set row(html) "<b>$label</b>"
+                set row(selected) "t"
+            } else {
+                set row(html)    "<a href=\"[ns_quotehtml ${url}${the_joiner}tablewidget:${name}_orderby\=$row(name)]\">"
+                append row(html) "$label</a>"
+                set row(selected) "f"
+            }
+        }
+    } else {
+        uplevel $level "uplevel 0 tw_${name}_columns $template(columns_data)"
     }
-  } else {
-    uplevel $level "uplevel 0 tw_${name}_columns $template(columns_data)"
-  }
 
 }
 
 # Register the tag that actually renders the widget
 
 template_tag tablewidget { chunk params } {
 
-  set name [ns_set iget $params name]
-  set style [ns_set iget $params style]
+    set name [ns_set iget $params name]
+    set style [ns_set iget $params style]
 
-  # Use the style unless the template is specified in the tag
-  if { $chunk eq "" } {
-    if { $style eq "" } {
-      template::adp_append_code "set __tablewidget_style \"$style\""
+    # Use the style unless the template is specified in the tag
+    if { $chunk eq "" } {
+        if { $style eq "" } {
+            template::adp_append_code "set __tablewidget_style \"$style\""
+        } else {
+            template::adp_append_code "set __tablewidget_style \"\$tablewidget:${name}(style)\""
+        }
+        set command "template::adp_parse"
+        append command " \[template::util::url_to_file \"$__tablewidget_style\" \"\$__adp_stub\"\]"
+        template::adp_append_code $command
     } else {
-      template::adp_append_code "set __tablewidget_style \"\$tablewidget:${name}(style)\""
+        template::adp_compile $chunk
     }
-    set command "template::adp_parse" 
-    append command " \[template::util::url_to_file \"$__tablewidget_style\" \"\$__adp_stub\"\]"
-    template::adp_append_code $command 
-  } else {
-    template::adp_compile $chunk
-  }
 }
 
 # Local variables:
Index: openacs-4/packages/bookshelf/tcl/amazon-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookshelf/tcl/amazon-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/bookshelf/tcl/amazon-procs.tcl	26 Mar 2003 17:59:17 -0000	1.3
+++ openacs-4/packages/bookshelf/tcl/amazon-procs.tcl	30 Apr 2018 12:45:00 -0000	1.4
@@ -26,7 +26,7 @@
         }
         return $url
     }
-    
+
     ad_proc get_image_info {
         -array:required
         isbn
@@ -38,37 +38,36 @@
         upvar $array row
 
         # Download image to temp file
-        
+
         set filename "[ns_mktemp "/tmp/gifXXXXXX"].gif"
         set url [get_image_url $isbn]
         set httpopen_result [ns_httpopen GET $url]
-        
-        set readfd [lindex $httpopen_result 0]
-        set writefd [lindex $httpopen_result 1]
+
+        lassign $httpopen_result readfd writefd
         close $writefd
-        
+
         set tmpfilefd [open $filename w]
-        fconfigure $tmpfilefd -translation binary 
-        
+        fconfigure $tmpfilefd -translation binary
+
         fcopy $readfd $tmpfilefd
-        
+
         close $tmpfilefd
         close $readfd
-        
+
         # Figure out the size
-        
+
         # Hmm. it's actually a JPEG, though it's named GIF
         if { [catch {
             set gifsize [ns_jpegsize $filename]
         }] } {
             # Oops, and then sometimes it *is* a GIF ...
             set gifsize [ns_gifsize $filename]
-        } 
-        
+        }
+
         # Delete tmp file
         file delete $filename
-        
-        
+
+
         set row(image_width) [lindex $gifsize 0]
         set row(image_height) [lindex $gifsize 1]
     }
@@ -84,7 +83,7 @@
         upvar $array row
 
         # Grab book info page from Amazon
-        
+
         set url [get_book_url $isbn]
 
         set amazon_info_page [ns_httpget $url]
@@ -94,13 +93,13 @@
         } else {
             set row(book_title) [string trim $title]
         }
-        
-        
+
+
         if { ![regexp {by <a href="/exec/obidos/search-handle-url/index=books&field-author=[^"]*">([^<]+)</a>} $amazon_info_page match author] } {
             set row(book_author) "-"
         } else {
             set row(book_author) [string trim $author]
         }
-        
+
     }
 }
Index: openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.tcl,v
diff -u -r1.56 -r1.57
--- openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.tcl	25 Apr 2018 19:47:46 -0000	1.56
+++ openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.tcl	30 Apr 2018 12:45:00 -0000	1.57
@@ -442,8 +442,7 @@
         set child_id [lindex $elm 0]
 
         if { $child_id == $keyword_id } {
-            set parent(id) [lindex $elm 2]
-            set parent(heading) [lindex $elm 3]
+            lassign $elm . . parent(id) parent(heading)
             return $parent($element)
         }
     }
Index: openacs-4/packages/calendar-portlet/tcl/test/calendar-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/tcl/test/calendar-portlet-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/calendar-portlet/tcl/test/calendar-portlet-procs.tcl	7 Aug 2017 23:48:05 -0000	1.3
+++ openacs-4/packages/calendar-portlet/tcl/test/calendar-portlet-procs.tcl	30 Apr 2018 12:45:00 -0000	1.4
@@ -13,53 +13,52 @@
 } {
     aa_run_with_teardown -test_code {
 
-	tclwebtest::cookies clear
-	# Login user
-	array set user_info [twt::user::create -admin]
-	twt::user::login $user_info(email) $user_info(password)
+        tclwebtest::cookies clear
+        # Login user
+        array set user_info [twt::user::create -admin]
+        twt::user::login $user_info(email) $user_info(password)
 
-	calendar_portlet::twt::go_to_dotlrn_calendar_page_url
+        calendar_portlet::twt::go_to_dotlrn_calendar_page_url
 
         set date [template::util::date::today]
-	set date [template::util::date::get_property display_date $date]
-	
-	set response [calendar_portlet::twt::display_day $date]
-	aa_display_result -response $response -explanation {Webtest for displaying a current day in the calendar}
-	
-	twt::user::logout
+        set date [template::util::date::get_property display_date $date]
+
+        set response [calendar_portlet::twt::display_day $date]
+        aa_display_result -response $response -explanation {Webtest for displaying a current day in the calendar}
+
+        twt::user::logout
     }
 }
 
 aa_register_case -cats {web smoke} -libraries tclwebtest tclwebtest_calendar_portlet_display_week {
 
     Test Display a Week in Calendar
-    
+
     @author Mounir Lallali
 } {
     aa_run_with_teardown -test_code {
-	
-	tclwebtest::cookies clear
-	# Login user
-	array set user_info [twt::user::create -admin]
-	twt::user::login $user_info(email) $user_info(password)
-	
-	calendar_portlet::twt::go_to_dotlrn_calendar_page_url
-	
-	# Get Start and End date Week
+
+        tclwebtest::cookies clear
+        # Login user
+        array set user_info [twt::user::create -admin]
+        twt::user::login $user_info(email) $user_info(password)
+
+        calendar_portlet::twt::go_to_dotlrn_calendar_page_url
+
+        # Get Start and End date Week
         set date [template::util::date::today]
-	set year [template::util::date::get_property year $date]
-	set number_week [expr [clock format [clock scan now] -format %W]-1]	
-	
-	set start_end_date_week [calendar_portlet::twt::get_start_end_week_date $number_week $year] 
+        set year [template::util::date::get_property year $date]
+        set number_week [expr [clock format [clock scan now] -format %W]-1]
 
-        set start_date_week [lindex $start_end_date_week 0]
-	set end_date_week [lindex $start_end_date_week 1]
+        set start_end_date_week [calendar_portlet::twt::get_start_end_week_date $number_week $year]
 
-	# Display week
-	set response [calendar_portlet::twt::display_week $start_date_week $end_date_week ]
-	aa_display_result -response $response -explanation {Webtest for displaying a current week in the calendar}
-	
-	twt::user::logout
+        lassign $start_end_date_week start_date_week end_date_week
+
+        # Display week
+        set response [calendar_portlet::twt::display_week $start_date_week $end_date_week ]
+        aa_display_result -response $response -explanation {Webtest for displaying a current week in the calendar}
+
+        twt::user::logout
     }
 }
 
@@ -91,62 +90,62 @@
 aa_register_case -cats {web smoke} -libraries tclwebtest tclwebtest_calendar_portlet_item_add {
 
     Test Add an Item in Calendar
-    
+
     @author Mounir Lallali
 } {
-        
+
     aa_run_with_teardown -test_code {
 
-	tclwebtest::cookies clear
-	# Login user
-	array set user_info [twt::user::create -admin]
-	twt::user::login $user_info(email) $user_info(password)
-	
-	calendar_portlet::twt::go_to_dotlrn_calendar_page_url
+        tclwebtest::cookies clear
+        # Login user
+        array set user_info [twt::user::create -admin]
+        twt::user::login $user_info(email) $user_info(password)
 
-	set item_title [ad_generate_random_string]
-	set item_description [ad_generate_random_string]
-	
-	set date [template::util::date::today]
-	set item_date [template::util::date::get_property linear_date_no_time $date]
+        calendar_portlet::twt::go_to_dotlrn_calendar_page_url
 
-	set response [calendar_portlet::twt::item_add $item_title $item_description $item_date]
-	aa_display_result -response $response -explanation {Webtest for addting an item in the calendar}
-	
-	twt::user::logout
+        set item_title [ad_generate_random_string]
+        set item_description [ad_generate_random_string]
+
+        set date [template::util::date::today]
+        set item_date [template::util::date::get_property linear_date_no_time $date]
+
+        set response [calendar_portlet::twt::item_add $item_title $item_description $item_date]
+        aa_display_result -response $response -explanation {Webtest for addting an item in the calendar}
+
+        twt::user::logout
     }
 }
 
 aa_register_case -cats {web smoke} -libraries tclwebtest tclwebtest_calendar_portlet_item_edit {
 
     Test Edit an Item in Calendar
-    
+
     @author Mounir Lallali
 } {
-    
+
     aa_run_with_teardown -test_code {
-	
+
         tclwebtest::cookies clear
         # Login user
         array set user_info [twt::user::create -admin]
         twt::user::login $user_info(email) $user_info(password)
-	
-	calendar_portlet::twt::go_to_dotlrn_calendar_page_url
 
+        calendar_portlet::twt::go_to_dotlrn_calendar_page_url
+
         set item_title [ad_generate_random_string]
         set item_description [ad_generate_random_string]
-	
+
         set date [template::util::date::today]
         set item_date [template::util::date::get_property linear_date_no_time $date]
 
-	calendar_portlet::twt::item_add $item_title $item_description $item_date
-	
-	set item_new_title [ad_generate_random_string]
+        calendar_portlet::twt::item_add $item_title $item_description $item_date
+
+        set item_new_title [ad_generate_random_string]
         set item_new_description [ad_generate_random_string]
-	
+
         set response [calendar_portlet::twt::item_edit $item_title $item_new_title $item_new_description $item_date]
         aa_display_result -response $response -explanation {Webtest for editing an item in the calendar}
-	
+
         twt::user::logout
     }
 }
@@ -165,7 +164,7 @@
         array set user_info [twt::user::create -admin]
         twt::user::login $user_info(email) $user_info(password)
 
-	calendar_portlet::twt::go_to_dotlrn_calendar_page_url
+        calendar_portlet::twt::go_to_dotlrn_calendar_page_url
 
         set item_title [ad_generate_random_string]
         set item_description [ad_generate_random_string]
@@ -199,11 +198,11 @@
         array set user_info [twt::user::create -admin]
         twt::user::login $user_info(email) $user_info(password)
 
-	calendar_portlet::twt::go_to_dotlrn_calendar_page_url
+        calendar_portlet::twt::go_to_dotlrn_calendar_page_url
 
         set item_title_1 [ad_generate_random_string]
         set item_description_1 [ad_generate_random_string]
-	
+
         set item_title_2 [ad_generate_random_string]
         set item_description_2 [ad_generate_random_string]
 
@@ -214,13 +213,13 @@
         set item_date [template::util::date::get_property linear_date_no_time $date]
 
         calendar_portlet::twt::item_add $item_title_1 $item_description_1 $item_date
-	calendar_portlet::twt::follow_calendar_link        
+        calendar_portlet::twt::follow_calendar_link
 
-	calendar_portlet::twt::item_add $item_title_2 $item_description_2 $item_date
-	calendar_portlet::twt::follow_calendar_link
-	
-	calendar_portlet::twt::item_add $item_title_3 $item_description_3 $item_date
+        calendar_portlet::twt::item_add $item_title_2 $item_description_2 $item_date
+        calendar_portlet::twt::follow_calendar_link
 
+        calendar_portlet::twt::item_add $item_title_3 $item_description_3 $item_date
+
         set response [calendar_portlet::twt::item_display_list $item_title_1 $item_title_2 $item_title_3]
         aa_display_result -response $response -explanation {Webtest for displaying an item list in the calendar}
 
@@ -232,28 +231,28 @@
 aa_register_case -cats {web smoke} -libraries tclwebtest tclwebtest_request_notification {
 
     Test Request a Notification for Calendar
-    
+
     @author Mounir Lallali
 } {
-    
+
     aa_run_with_teardown -test_code {
-	
+
         tclwebtest::cookies clear
         # Login user
         array set user_info [twt::user::create -admin]
         twt::user::login $user_info(email) $user_info(password)
-	
+
         calendar_portlet::twt::go_to_dotlrn_calendar_page_url
 
-	set item_title [ad_generate_random_string]
+        set item_title [ad_generate_random_string]
         set item_description [ad_generate_random_string]
 
         set date [template::util::date::today]
         set item_date [template::util::date::get_property linear_date_no_time $date]
 
         calendar_portlet::twt::item_add $item_title $item_description $item_date
 
-	set response [calendar_portlet::twt::request_notification]
+        set response [calendar_portlet::twt::request_notification]
         aa_display_result -response $response -explanation {Webtest for requesting a notification for calendar}
     }
 }
@@ -283,7 +282,7 @@
         calendar_portlet::twt::item_add $item_title $item_description $item_date
 
         calendar_portlet::twt::request_notification
-	set response [calendar_portlet::twt::unsubscribe]
+        set response [calendar_portlet::twt::unsubscribe]
         aa_display_result -response $response -explanation {Webtest for unsubscribing a notification for calendar}
     }
 }
@@ -303,9 +302,9 @@
         twt::user::login $user_info(email) $user_info(password)
 
         calendar_portlet::twt::go_to_dotlrn_calendar_page_url
-	set date [template::util::date::today]
-     
-	set response [calendar_portlet::twt::display_date $date]
+        set date [template::util::date::today]
+
+        set response [calendar_portlet::twt::display_date $date]
         aa_display_result -response $response -explanation {Webtest for unsubscribing a notification for calendar}
 
     }
Index: openacs-4/packages/categories/tcl/category-relation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/category-relation-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/categories/tcl/category-relation-procs.tcl	31 Jan 2018 08:24:28 -0000	1.5
+++ openacs-4/packages/categories/tcl/category-relation-procs.tcl	30 Apr 2018 12:45:00 -0000	1.6
@@ -14,7 +14,7 @@
     -category_id_two:required
     {-user_id ""}
 } {
-    Creates a new meta category by creating a relation between category_id_one 
+    Creates a new meta category by creating a relation between category_id_one
     and category_id_two. This relation is also related to the user_id.
 
     @option user_id user that will be related to the meta category.
@@ -24,22 +24,22 @@
     @author Viaro Networks www.viaro.net
 } {
     if { $user_id eq "" } {
-	set user_id [ad_conn user_id]
+        set user_id [ad_conn user_id]
     }
- 
+
     # First we check if the relation exist, if it does, we don't create a new one
     set meta_category_id [db_string get_meta_relation_id {} -default ""]
-    if { $meta_category_id eq "" } { 
-	set meta_category_id [db_exec_plsql add_meta_relation {}]
+    if { $meta_category_id eq "" } {
+        set meta_category_id [db_exec_plsql add_meta_relation {}]
     }
-    
+
     # Now we check if the user already has the meta category associated,
     # if it does, we don't create a new one
     set user_meta_category_id [db_string get_user_meta_relation_id {} -default ""]
-    if { $user_meta_category_id eq "" } { 
-	return [db_exec_plsql add_user_meta_relation {}]
+    if { $user_meta_category_id eq "" } {
+        return [db_exec_plsql add_user_meta_relation {}]
     } else {
-	return $user_meta_category_id
+        return $user_meta_category_id
     }
 }
 
@@ -49,9 +49,9 @@
 } {
     Returns two select menus of the categories on each tree to be used in ad_form. The name of the elements
     are meta_category_one and meta_category_two.
-    
 
-    @option tree_id_one 
+
+    @option tree_id_one
     @option tree_id_two
     @author Miguel Marin (miguelmarin@viaro.net)
     @author Viaro Networks www.viaro.net
@@ -60,16 +60,14 @@
     set label_two [category_tree::get_name $tree_id_two]
     set element_one  "\{meta_category_one:integer(select) \{label $label_one\} \{options \{ "
     set element_two  "\{meta_category_two:integer(select) \{label $label_two\} \{options \{ "
-   
+
     foreach category_one [category_tree::get_tree $tree_id_one] {
-	set value_one [lindex $category_one 0]
-	set label_one [lindex $category_one 1]
-	append element_one "\{$label_one $value_one\} "
+        lassign $category_one value_one label_one
+        append element_one "\{$label_one $value_one\} "
     }
     foreach category_two [category_tree::get_tree $tree_id_two] {
-	set value_two [lindex $category_two 0]
-	set label_two [lindex $category_two 1]
-	append element_two "\{$label_two $value_two\} "
+        lassign $category_two value_two label_two
+        append element_two "\{$label_two $value_two\} "
     }
     append element_one "\} \} \}"
     append element_two "\} \} \}"
Index: openacs-4/packages/chat/tcl/chat-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/tcl/chat-procs.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/chat/tcl/chat-procs.tcl	25 Apr 2018 19:47:46 -0000	1.16
+++ openacs-4/packages/chat/tcl/chat-procs.tcl	30 Apr 2018 12:45:00 -0000	1.17
@@ -38,8 +38,7 @@
     }
 
     # Free up resources.
-    set r [lindex $fds 0]
-    set w [lindex $fds 1]
+    lassign $fds r w
 
     close $r
     close $w
@@ -60,8 +59,7 @@
     # Chat server must already started otherwise error will occur.
     set fds [ns_sockopen -nonblock $host $port]
 
-    set r [lindex $fds 0]
-    set w [lindex $fds 1]
+    lassign $fds r w
 
     ns_log Notice "chat_broadcast_to_applets: Ready to broadcast message to applets."
     ns_log Notice $host
@@ -72,10 +70,10 @@
     flush $w
 
     while { 1 } {
-        # Wait until there is new message in queue.
+    # Wait until there is new message in queue.
         ns_mutex lock [nsv_get chat new_message]
         if {[nsv_exists chat html_message]} {
-            # Get message from queue.
+        # Get message from queue.
             puts $w [nsv_get chat html_message]
             flush $w
         }
@@ -91,19 +89,18 @@
 
     set fds [ns_sockopen -nonblock $host $port]
 
-    set r [lindex $fds 0]
-    set w [lindex $fds 1]
+    lassign $fds r w
     set r_fd [list $r]
 
     ns_log Notice "chat_receive_from_server: Listening for messages from applets."
 
     puts $w "
-      <login>
-        <user_id>-1</user_id>
-        <user_name>AOL_READER</user_name>
-        <pw>T</pw>
-        <room_id>-1</room_id>
-      </login>"
+    <login>
+    <user_id>-1</user_id>
+    <user_name>AOL_READER</user_name>
+    <pw>T</pw>
+    <room_id>-1</room_id>
+    </login>"
     flush $w
 
     set running 1
@@ -133,19 +130,19 @@
                         c1 logout
                     }
                     default {
-			c1 add_msg -uid $user_id $msg
+                        c1 add_msg -uid $user_id $msg
                     }
                 }
 
-		chat_room_get -room_id $room_id -array room_info
-		if { $room_info(archive_p) == "t" } {
-		    if {[catch {
-			chat_post_message_to_db \
-			    -creation_user $user_id $room_id $msg
-		    } errmsg]} {
-			ad_log error "chat_post_message_to_db: error: $errmsg"
-		    }
-		}
+                chat_room_get -room_id $room_id -array room_info
+                if { $room_info(archive_p) == "t" } {
+                    if {[catch {
+                        chat_post_message_to_db \
+                            -creation_user $user_id $room_id $msg
+                    } errmsg]} {
+                        ad_log error "chat_post_message_to_db: error: $errmsg"
+                    }
+                }
 
                 nsv_lappend chat_room $room_id $line
 
@@ -169,7 +166,7 @@
 
 # create a cache for the chat package
 if {"chat_room_cache" ni [ns_cache_names]} {
-    # these should be around 1000 entries
+# these should be around 1000 entries
     ns_cache_create chat_room_cache 350000
 }
 
@@ -181,7 +178,7 @@
 } {
     upvar $array row
     array set row [ns_cache_eval -- chat_room_cache $room_id {
-	chat_room_get_not_cached $room_id
+        chat_room_get_not_cached $room_id
     }]
 }
 
@@ -226,30 +223,30 @@
     Create new chat room. Return room_id if successful else raise error.
 } {
     if {[ad_conn isconnected] && $creation_user eq ""} {
-	set creation_user [ad_conn user_id]
+        set creation_user [ad_conn user_id]
     }
 
     db_transaction {
-	set room_id [::xo::db::sql::acs_object new \
-			 -object_type   "chat_room" \
-			 -creation_user $creation_user \
-			 -creation_ip   $creation_ip \
-			 -context_id    $context_id]
+        set room_id [::xo::db::sql::acs_object new \
+            -object_type   "chat_room" \
+            -creation_user $creation_user \
+            -creation_ip   $creation_ip \
+            -context_id    $context_id]
 
-	db_dml insert_room {}
+        db_dml insert_room {}
 
-	if {$creation_user ne ""} {
-	    foreach privilege {edit view delete} {
-		permission::grant \
-		    -party_id  $creation_user \
-		    -object_id $room_id \
-		    -privilege chat_room_${privilege}
-	    }
-	    permission::grant \
-		-party_id  $creation_user \
-		-object_id $room_id \
-		-privilege chat_transcript_create
-	}
+        if {$creation_user ne ""} {
+            foreach privilege {edit view delete} {
+                permission::grant \
+                    -party_id  $creation_user \
+                    -object_id $room_id \
+                    -privilege chat_room_${privilege}
+            }
+            permission::grant \
+                -party_id  $creation_user \
+                -object_id $room_id \
+                -privilege chat_transcript_create
+        }
     }
 
     return $room_id
@@ -263,21 +260,21 @@
     @return a boolean
 } {
     if {[ns_cache_keys -exact -- chat_room_cache $room_id] ne ""} {
-        # chat room is in cache: it exists "for sure"
+    # chat room is in cache: it exists "for sure"
         return 1
     } elseif {[info exists ::chat_room_deleted_p($room_id)]} {
-        # chat room deletion has been recorded in threaded cache: as
-        # object id comes from a sequence, unless somebody puts an id
-        # by hand, the same will never be used again system wide, so
-        # it is safe to cache this
+    # chat room deletion has been recorded in threaded cache: as
+    # object id comes from a sequence, unless somebody puts an id
+    # by hand, the same will never be used again system wide, so
+    # it is safe to cache this
         return 0
     } elseif {[db_0or1row room_exists {
         select 1 from chat_rooms
-        where room_id = :room_id}]} {
-        # chat room existence has been confirmed by query
+    where room_id = :room_id}]} {
+    # chat room existence has been confirmed by query
         return 1
     } else {
-        # chat room is not there: take note of this in threaded cache
+    # chat room is not there: take note of this in threaded cache
         set ::chat_room_deleted_p($room_id) 1
         return 0
     }
@@ -356,9 +353,9 @@
     Grant party a chat moderate privilege to this chat room.
 } {
     permission::grant \
-	-party_id  $party_id \
-	-object_id $room_id \
-	-privilege "chat_room_moderate"
+        -party_id  $party_id \
+        -object_id $room_id \
+        -privilege "chat_room_moderate"
 }
 
 ad_proc -public chat_moderator_revoke {
@@ -368,9 +365,9 @@
     Revoke party a chat moderate privilege to this chat room.
 } {
     permission::revoke \
-	-party_id  $party_id \
-	-object_id $room_id \
-	-privilege "chat_room_moderate"
+        -party_id  $party_id \
+        -object_id $room_id \
+        -privilege "chat_room_moderate"
 }
 
 ad_proc -public chat_user_grant {
@@ -380,12 +377,12 @@
     Grant party a chat privilege to this chat room.
 } {
     db_transaction {
-	foreach privilege {read write} {
-	    permission::grant \
-		-party_id  $party_id \
-		-object_id $room_id \
-		-privilege chat_${privilege}
-	}
+        foreach privilege {read write} {
+            permission::grant \
+                -party_id  $party_id \
+                -object_id $room_id \
+                -privilege chat_${privilege}
+        }
     }
 }
 
@@ -396,12 +393,12 @@
     Revoke party a chat privilege to this chat room.
 } {
     db_transaction {
-	foreach privilege {read write} {
-	    permission::revoke \
-		-party_id  $party_id \
-		-object_id $room_id \
-		-privilege chat_${privilege}
-	}
+        foreach privilege {read write} {
+            permission::revoke \
+                -party_id  $party_id \
+                -object_id $room_id \
+                -privilege chat_${privilege}
+        }
     }
 }
 
@@ -412,9 +409,9 @@
     Explicit ban user from this chat room.
 } {
     permission::grant \
-	-party_id  $party_id \
-	-object_id $room_id \
-	-privilege "chat_ban"
+        -party_id  $party_id \
+        -object_id $room_id \
+        -privilege "chat_ban"
 }
 
 ad_proc -public chat_user_unban {
@@ -424,9 +421,9 @@
     unban user from this chat room.
 } {
     permission::revoke \
-	-party_id  $party_id \
-	-object_id $room_id \
-	-privilege "chat_ban"
+        -party_id  $party_id \
+        -object_id $room_id \
+        -privilege "chat_ban"
 }
 
 ad_proc -public chat_revoke_moderators {
@@ -436,10 +433,10 @@
     Revoke a list of parties of a moderate privilege from this room.
 } {
     foreach party_id $revoke_list {
-	permission::revoke \
-	    -party_id  $party_id \
-	    -object_id $room_id \
-	    -privilege "chat_moderate_room"
+        permission::revoke \
+            -party_id  $party_id \
+            -object_id $room_id \
+            -privilege "chat_moderate_room"
     }
 }
 
@@ -484,7 +481,7 @@
 
     # write message to the database
     if {[catch {chat_post_message_to_db -creation_user $user_id $room_id $message} errmsg]} {
-	ns_log error "chat_post_message_to_db: error: $errmsg"
+        ns_log error "chat_post_message_to_db: error: $errmsg"
     }
 }
 
@@ -496,13 +493,13 @@
     Post moderate message to the chat room and broadcast to all applet clients. Only use by HTML client.
 } {
     set chat_msg "
-      <message>
-        <from>[chat_user_name $user_id]</from>
-        <from_user_id>$user_id</from_user_id>
-        <room_id>$room_id</room_id>
-        <body>$message</body>
-        <status>pending</status>
-      </message>"
+    <message>
+    <from>[chat_user_name $user_id]</from>
+    <from_user_id>$user_id</from_user_id>
+    <room_id>$room_id</room_id>
+    <body>$message</body>
+    <status>pending</status>
+    </message>"
 
     # Add message to queue. Notify thread responsible for broadcast message to applets.
     nsv_set chat html_message $chat_msg
@@ -523,7 +520,7 @@
     # is not initialize correctly.  Therefore I just hard code the
     # variable.
     if {![nsv_exists chat_room $room_id]} {
-	nsv_set chat_room $room_id {}
+        nsv_set chat_room $room_id {}
     }
 
     set user_name [chat_user_name $user_id]
@@ -573,24 +570,24 @@
     Create chat transcript.
 } {
     if {[ad_conn isconnected] && $creation_user eq ""} {
-	set creation_user [ad_conn user_id]
+        set creation_user [ad_conn user_id]
     }
 
     db_transaction {
-	set transcript_id [::xo::db::sql::acs_object new \
-			 -object_type   "chat_transcript" \
-			 -creation_user $creation_user \
-			 -creation_ip   $creation_ip \
-			 -context_id    $context_id]
+        set transcript_id [::xo::db::sql::acs_object new \
+            -object_type   "chat_transcript" \
+            -creation_user $creation_user \
+            -creation_ip   $creation_ip \
+            -context_id    $context_id]
 
-	db_dml insert_transcript {}
+        db_dml insert_transcript {}
 
-	foreach privilege {edit view delete} {
-	    permission::grant \
-		-party_id  $creation_user \
-		-object_id $transcript_id \
-		-privilege chat_transcript_${privilege}
-	}
+        foreach privilege {edit view delete} {
+            permission::grant \
+                -party_id  $creation_user \
+                -object_id $transcript_id \
+                -privilege chat_transcript_${privilege}
+        }
     }
 
     return $transcript_id
@@ -633,19 +630,19 @@
         chat_room_get -room_id $room_id -array room_info
         # do we have to create a transcript for the room
         if { $room_info(auto_transcript_p) == "t" } {
-            # build a list of all messages
-	    set contents {}
+        # build a list of all messages
+        set contents {}
             foreach message [db_list_of_lists get_archives_messages {}] {
-		lassign $message msg creation_user creation_date
+                lassign $message msg creation_user creation_date
                 set user_name [expr {$creation_user > 0 ? [chat_user_name $creation_user] : "system"}]
                 lappend contents "\[$creation_date\] <b>${user_name}</b>: $msg"
             }
             if { $contents ne "" } {
-		set today [clock format [clock seconds] -format "%d.%m.%Y"]
+                set today [clock format [clock seconds] -format "%d.%m.%Y"]
                 chat_transcript_new \
                     -description "#chat.automatically_created_transcript#" \
                     "#chat.transcript_of_date# $today" \
-		    [join $contents "<br>\n"] $room_id
+                    [join $contents "<br>\n"] $room_id
             }
         }
         # clear all the messages in the room
Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v
diff -u -r1.200 -r1.201
--- openacs-4/packages/new-portal/tcl/portal-procs.tcl	30 Apr 2018 09:14:23 -0000	1.200
+++ openacs-4/packages/new-portal/tcl/portal-procs.tcl	30 Apr 2018 12:45:00 -0000	1.201
@@ -69,7 +69,7 @@
     Dispatch an operation to every datasource
 } {
     foreach datasource [list_datasources $portal_id] {
-        # Callback on datasource
+    # Callback on datasource
         datasource_call $datasource $op $list_args
     }
 }
@@ -97,7 +97,7 @@
     Returns the path of the www dir of the portal package. We
     need this for stupid template tricks.
 } {
-    return "/packages/[package_key]/www"
+   return "/packages/[package_key]/www"
 }
 
 ad_proc -private portal::mount_point_no_cache {} {
@@ -143,20 +143,20 @@
     @param user_id
     @param layout_name optional
 } {
-    # if we have a cvs list in the form "page_name1, layout1;
-    # page_name2, layout2...", we get the required first page_name
-    # and first page layout from it, overriding any other params
+# if we have a cvs list in the form "page_name1, layout1;
+# page_name2, layout2...", we get the required first page_name
+# and first page layout from it, overriding any other params
 
     set page_name_list [list $default_page_name]
     set page_accesskey_list [list $default_accesskey]
     if {$layout_name eq ""} {
         set layout_name_list [list [parameter::get_from_package_key \
-                                       -package_key new-portal \
-                                       -parameter default_layout]]
+            -package_key new-portal \
+            -parameter default_layout]]
     } else {
         set layout_name_list [list $layout_name]
     }
-    
+
     if {$csv_list ne ""} {
         set page_name_and_layout_list [split [string trimright $csv_list ";"] ";"]
         set page_name_list {}
@@ -165,7 +165,7 @@
 
         # separate name and layout
         foreach item $page_name_and_layout_list {
-	    lassign [split $item ","] page_name layout_name page_accesskey
+            lassign [split $item ","] page_name layout_name page_accesskey
             lappend page_name_list $page_name
             lappend layout_name_list $layout_name
             lappend page_accesskey_list $page_accesskey
@@ -200,7 +200,7 @@
 
         # ignore the csv list if we have a template
         if {$csv_list ne "" && $template_id eq ""} {
-            # if there are more pages in the csv_list, create them
+        # if there are more pages in the csv_list, create them
             for {set i 1} {$i < [llength $page_name_list]} {incr i} {
                 portal::page_create -portal_id $portal_id \
                     -pretty_name [lindex $page_name_list $i] \
@@ -277,7 +277,7 @@
     }
 
     db_foreach element_select {} -column_array entry {
-        # put the element IDs into buckets by region...
+    # put the element IDs into buckets by region...
         lappend element_ids($entry(region)) $entry(element_id)
     } if_no_rows {
         set element_ids {}
@@ -288,7 +288,7 @@
     # set up the template, it includes the layout template,
     # which in turn includes the theme, then elements
     set template "<master src=\"@master_template@\">
-        <property name=\"title\">@portal.name@</property>"
+    <property name=\"title\">@portal.name@</property>"
     if { $element_list ne "" } {
         set element_src "[www_path]/render_styles/${render_style}/render-element"
         append template [subst {
@@ -302,7 +302,7 @@
             page_id="@page_id@"
             layout_id="@portal.layout_id@"
             resource_dir="@portal.layout_resource_dir@">
-	}]
+        }]
     }
 
     # Necessary hack to work around the acs-templating system
@@ -382,8 +382,8 @@
     #
 
     set edit_p [permission::permission_p \
-                    -object_id $portal_id \
-                    -privilege portal_edit_portal]
+        -object_id $portal_id \
+        -privilege portal_edit_portal]
 
     if {!$edit_p} {
         permission::require_permission -object_id $portal_id -privilege portal_admin_portal
@@ -405,8 +405,8 @@
 
     if {$referer eq ""} {
         set return_text [subst {
-	    <a href="@return_url@" title="[_ new-portal.Go_back]">[_ new-portal.Go_back]</a>
-	}]
+            <a href="@return_url@" title="[_ new-portal.Go_back]">[_ new-portal.Go_back]</a>
+        }]
     } else {
         set return_text ""
         set return_url $referer
@@ -417,18 +417,18 @@
     #
 
     set template "
-        <master src=\"@master_template@\">
-        <p>$return_text</p>"
+    <master src=\"@master_template@\">
+    <p>$return_text</p>"
 
     #
     # Theme selection chunk
     #
 
     set theme_chunk [subst {
-	<form method='post' action="@action_string@">
-	<div><input type="hidden" name="portal_id" value="@portal_id@"></div>
-	<div><input type="hidden" name="return_url" value="@return_url@"></div>
-	<p><strong>[_ new-portal.Change_Theme]</strong></p>
+        <form method='post' action="@action_string@">
+        <div><input type="hidden" name="portal_id" value="@portal_id@"></div>
+        <div><input type="hidden" name="return_url" value="@return_url@"></div>
+        <p><strong>[_ new-portal.Change_Theme]</strong></p>
     }]
 
     set current_theme_id [portal::get_theme_id -portal_id $portal_id]
@@ -450,8 +450,8 @@
     }
 
     append theme_chunk [subst {
-	<div><input type="submit" name="op_change_theme" value="[_ new-portal.Change_Theme_1]"></div>
-	</form>
+        <div><input type="submit" name="op_change_theme" value="[_ new-portal.Change_Theme_1]"></div>
+        </form>
     }]
     if {$allow_theme_change_p} {
         append template "$theme_chunk"
@@ -469,61 +469,61 @@
 
         set first_page_p [portal::first_page_p -portal_id $portal_id -page_id $page_id]
         # We allow portal page names to have embedded message keys that we localize on the fly
-        db_1row get_page_info {} 
+        db_1row get_page_info {}
         set page_name [lang::util::localize $pretty_name_unlocalized]
         set page_layout_id [portal::get_layout_id -page_id $page_id]
         if {$hidden_p == "t"} {
             set tab_toggle_label [lang::util::localize "\#new-portal.Show_in_main_navigation\#"]
         } else {
             set tab_toggle_label [lang::util::localize "\#new-portal.Hide_in_main_navigation\#"]
         }
-        
+
         append template "<table style=\"background-color:#eeeeee\" border=0 width=\"100%\">"
 
         #
         # Page rename chunk
         #
         set page_name_chunk [subst {
-	    <table border="0" width="100%" class="portal-page-config" cellpadding="0" cellspacing="0">
-	    <tr>
-	    <td align="center">
-	    <a name="$page_id"></a>
-	    <h2 class="portal-page-name">$page_name</h2>
-	    </td>
-	    <td align="right">
-	    <a name="$page_id"></a>
-	    <form name="op_rename_page" method="post" action="@action_string@" class="inline-form">
+            <table border="0" width="100%" class="portal-page-config" cellpadding="0" cellspacing="0">
+            <tr>
+            <td align="center">
+            <a name="$page_id"></a>
+            <h2 class="portal-page-name">$page_name</h2>
+            </td>
+            <td align="right">
+            <a name="$page_id"></a>
+            <form name="op_rename_page" method="post" action="@action_string@" class="inline-form">
             <div><input type="hidden" name="portal_id" value="@portal_id@"></div>
             <div><input type="hidden" name="page_id" value=$page_id></div>
             <div><input type="hidden" name="return_url" value="@return_url@#$page_id"></div>
             <div><input type="hidden" name="anchor" value="$page_id"></div>
             <div><input type="submit" name="op_rename_page" value="[_ new-portal.Rename_Page]"></div>
             <div><input type="text" name="pretty_name" value="[ns_quotehtml $page_name]"></div>
-	    </form>
-	    <form name="op_toggle_tab_visibility" method="post" action="@action_string@">
+            </form>
+            <form name="op_toggle_tab_visibility" method="post" action="@action_string@">
             <div><input type="hidden" name="portal_id" value="@portal_id@"></div>
             <div><input type="hidden" name="page_id" value="$page_id"></div>
             <div><input type="hidden" name="return_url" value="@return_url@#$page_id"></div>
             <div><input type="hidden" name="anchor" value="$page_id"></div>
             <div><input type="submit" name="op_toggle_tab_visibility" value="$tab_toggle_label"></div>
-           </form>
-	    </td>
-	    </tr>
-	    <tr>
-	    <td colspan="2" class="bottom-border">
-	    <img src="/resources/acs-subsite/spacer.gif" height="1" alt="">
-	    </td>
-	    </tr>
-	    </table>
-	}]
+            </form>
+            </td>
+            </tr>
+            <tr>
+            <td colspan="2" class="bottom-border">
+            <img src="/resources/acs-subsite/spacer.gif" height="1" alt="">
+            </td>
+            </tr>
+            </table>
+        }]
 
         append template "<tr><td>$page_name_chunk</td></tr>"
 
         if {[portal::non_hidden_elements_p -page_id $page_id] || $first_page_p} {
 
-            #
-            # Page with non-hidden elements OR the first page of the portal
-            #
+        #
+        # Page with non-hidden elements OR the first page of the portal
+        #
 
             db_1row portal_and_page_info_select {} -column_array portal
 
@@ -543,68 +543,68 @@
             db_1row layout_id_select {}
 
             append template [subst {
-            <tr>
-             <td>
-              <table class="portal-page-config" style="background-color:#eeeeee" border="0" width="100%">
-               <tr valign="middle">
+                <tr>
+                <td>
+                <table class="portal-page-config" style="background-color:#eeeeee" border="0" width="100%">
+                <tr valign="middle">
                 <td valign="middle">
-                 <include src="$layout"
-                  element_list="$element_list"
-                  action_string="@action_string@" portal_id="@portal_id@"
-                  return_url="@return_url@" element_src="@element_src@"
-                  hide_links_p="f"
-                  page_id="$page_id"
-                  layout_id="$layout_id"
-                  edit_p="@edit_p@">
+                <include src="$layout"
+                element_list="$element_list"
+                action_string="@action_string@" portal_id="@portal_id@"
+                return_url="@return_url@" element_src="@element_src@"
+                hide_links_p="f"
+                page_id="$page_id"
+                layout_id="$layout_id"
+                edit_p="@edit_p@">
                 </td>
-               </tr>
-              </table>
-             </td>
-		</tr>}]
-		
+                </tr>
+                </table>
+                </td>
+                </tr>}]
 
-            # clear out the region array
+
+                # clear out the region array
             array unset fake_element_ids
         }
 
         if {![portal::non_hidden_elements_p -page_id $page_id]} {
 
-            #
-            # Non first page with all hidden elements
-            #
+        #
+        # Non first page with all hidden elements
+        #
 
-            #
-            # Remove page chunk - don't allow removal of the first page
-            #
+        #
+        # Remove page chunk - don't allow removal of the first page
+        #
 
-            
+
             if {! $first_page_p } {
-                
+
                 append template [subst {
-                <tr>
-                 <td>
-                  <include src="show-here" portal_id="$portal_id"
-                   action_string="@action_string@"
-                   region="1"
-                   page_id="$page_id"
-                   anchor="$page_id"
-                   return_url="@return_url@">
-                 </td>
-		 </tr>
-		}]
-                
+                    <tr>
+                    <td>
+                    <include src="show-here" portal_id="$portal_id"
+                    action_string="@action_string@"
+                    region="1"
+                    page_id="$page_id"
+                    anchor="$page_id"
+                    return_url="@return_url@">
+                    </td>
+                    </tr>
+                }]
+
                 append template [subst {
-                <tr valign="middle">
-                 <td valign="middle">
-                  <div style="text-align:center">
-                   [_ new-portal.lt_No_Elements_on_this_p]
-                   <form method="post" action="@action_string@">
+                    <tr valign="middle">
+                    <td valign="middle">
+                    <div style="text-align:center">
+                    [_ new-portal.lt_No_Elements_on_this_p]
+                    <form method="post" action="@action_string@">
                     [export_vars -form { portal_id page_id return_url { anchor $page_id } }]
                     <div><input type="submit" name="op_remove_empty_page" value="[_ new-portal.Remove_Empty_Page]"></div>
-                   </form>
-                  </div>
-                 </td>
-  	       </tr>}]
+                    </form>
+                    </div>
+                    </td>
+                    </tr>}]
             }
 
             #
@@ -631,20 +631,20 @@
 
 
             append template [subst {
-            <tr>
-             <td>
-              <br>
-              <form method="post" action="@action_string@">
+                <tr>
+                <td>
+                <br>
+                <form method="post" action="@action_string@">
                 <p><b>[_ new-portal.Change_page_layout]</b></p>
                 <div><input type="hidden" name="portal_id" value="$portal_id"></div>
                 <div><input type="hidden" name="page_id" value="$page_id"></div>
                 <div><input type="hidden" name="return_url" value="@return_url@"></div>
                 <div><input type="hidden" name="anchor" value="$page_id"></div>
                 $layout_chunk
                 <div><input type="submit" name="op_change_page_layout" value="[_ new-portal.Change_Page_Layout]"></div>
-              </form>
-             </td>
-		</tr>}]
+                </form>
+                </td>
+                </tr>}]
 
         }
 
@@ -661,69 +661,69 @@
     set new_page_num [expr {[page_count -portal_id $portal_id] + 1}]
 
     append template [subst {<br>
-    <table class="portal-page-config" border="0" cellspacing="0" cellpadding="0">
-     <tr>
-      <td>
-       <h2 class="portal-page-name">[_ new-portal.Create_a_new_page]</h2>
-      </td>
-     </tr>
-     <tr>
-     <td>
-      <a name="add_a_new_page"></a>
-       <form name="op_add_page" method="post" action="@action_string@">
-        <div><input type="hidden" name="portal_id" value="@portal_id@"></div>
-        <div><input type="hidden" name="return_url" value="@return_url@#$page_id"></div>
-        <div><input type="hidden" name="anchor" value="add_a_new_page"></div>
-        <div style="text-align:center">
-         <input type="text" name="pretty_name" value="[_ new-portal.Page] $new_page_num">
-         <input type="submit" name="op_add_page" value="[_ new-portal.Add_Page]">
-        </div>
-       </form>
-      </td>
-     </tr>
-	</table>}]
+                            <table class="portal-page-config" border="0" cellspacing="0" cellpadding="0">
+                            <tr>
+                            <td>
+                            <h2 class="portal-page-name">[_ new-portal.Create_a_new_page]</h2>
+                            </td>
+                            </tr>
+                            <tr>
+                            <td>
+                            <a name="add_a_new_page"></a>
+                            <form name="op_add_page" method="post" action="@action_string@">
+                            <div><input type="hidden" name="portal_id" value="@portal_id@"></div>
+                            <div><input type="hidden" name="return_url" value="@return_url@#$page_id"></div>
+                            <div><input type="hidden" name="anchor" value="add_a_new_page"></div>
+                            <div style="text-align:center">
+                            <input type="text" name="pretty_name" value="[_ new-portal.Page] $new_page_num">
+                            <input type="submit" name="op_add_page" value="[_ new-portal.Add_Page]">
+                            </div>
+                            </form>
+                            </td>
+                            </tr>
+                            </table>}]
 
-    #
-    # Revert page chunk
-    #
+                            #
+                            # Revert page chunk
+                            #
 
     if {[get_portal_template_id $portal_id] ne ""} {
         append template [subst {<br>
-        <table class="portal-page-config" width="100%" cellpadding="0" border="0" cellspacing="0">
-         <tr>
-          <td>
-           <form name="op_revert" method="post" action="@action_string@">
-            <div><input type="hidden" name="portal_id" value="@portal_id@"></div>
-            <div><input type="hidden" name="return_url" value="@return_url@"></div>
-            <h2 class="portal-page-name">[_ new-portal.lt_Revert_the_entire_por]</h2>
-            <div style="text-align:center">
-             <input type="submit" name="op_revert" value="[_ new-portal.Revert]">
-            </div>
-           </form>
-          </td>
-         </tr>
-	    </table>}]
+                                <table class="portal-page-config" width="100%" cellpadding="0" border="0" cellspacing="0">
+                                <tr>
+                                <td>
+                                <form name="op_revert" method="post" action="@action_string@">
+                                <div><input type="hidden" name="portal_id" value="@portal_id@"></div>
+                                <div><input type="hidden" name="return_url" value="@return_url@"></div>
+                                <h2 class="portal-page-name">[_ new-portal.lt_Revert_the_entire_por]</h2>
+                                <div style="text-align:center">
+                                <input type="submit" name="op_revert" value="[_ new-portal.Revert]">
+                                </div>
+                                </form>
+                                </td>
+                                </tr>
+                                </table>}]
     }
 
     if { [db_string sub_portals {}] } {
-        # Portal has other portals using it as a template
+    # Portal has other portals using it as a template
         append template [subst {<br>
-        <table class="portal-page-config" width="100%" cellpadding="0" border="0" cellspacing="0">
-         <tr>
-          <td>
-           <form name="op_revert_all" method="post" action="@action_string@">
-            <div><input type="hidden" name="portal_id" value="@portal_id@"></div>
-            <div><input type="hidden" name="return_url" value="@return_url@"></div>
-            <h2 class="portal-page-name">[_ new-portal.lt_Revert_all_portals_us]</h2>
-            <div style="text-align:center">
-             <input type="submit" name="op_revert_all" value="[_ new-portal.Revert_All]">
-             <br>
-             <i>[_ new-portal.lt_Note_Please_be_patien]</i>
-            </div>
-           </form>
-          </td>
-         </tr>
-	    </table>}]
+                                <table class="portal-page-config" width="100%" cellpadding="0" border="0" cellspacing="0">
+                                <tr>
+                                <td>
+                                <form name="op_revert_all" method="post" action="@action_string@">
+                                <div><input type="hidden" name="portal_id" value="@portal_id@"></div>
+                                <div><input type="hidden" name="return_url" value="@return_url@"></div>
+                                <h2 class="portal-page-name">[_ new-portal.lt_Revert_all_portals_us]</h2>
+                                <div style="text-align:center">
+                                <input type="submit" name="op_revert_all" value="[_ new-portal.Revert_All]">
+                                <br>
+                                <i>[_ new-portal.lt_Note_Please_be_patien]</i>
+                                </div>
+                                </form>
+                                </td>
+                                </tr>
+                                </table>}]
     }
 
     #
@@ -752,16 +752,16 @@
 } {
     set edit_p \
         [permission::permission_p \
-             -object_id $portal_id \
-             -privilege portal_edit_portal
-        ]
+        -object_id $portal_id \
+        -privilege portal_edit_portal
+    ]
 
     if {!$edit_p} {
         permission::require_permission -object_id $portal_id -privilege portal_admin_portal
         set edit_p 1
     }
 
-    
+
     if { [ns_set get $form "op_revert_all"] ne "" } {
         set template_id [ns_set get $form "portal_id"]
         ns_log notice "REVERTING ALL template_id='${template_id}'"
@@ -783,32 +783,32 @@
         # revert theme
         set theme_id [get_theme_id -portal_id $template_id]
         db_dml revert_theme_update {}
-        
+
         # revert pages
 
         # Roel - 03-10-2005, fix for revert problems
         # This fix tries to match the target portal with the
         # template before the revert via the pages' sort keys
-        
+
         # First, create source pages that aren't in the target portal
         db_foreach revert_source_pages {} {
             if { ! [db_0or1row revert_get_target_page_id {}] } {
                 set pretty_name "portal revert dummy page $sort_key"
                 set page_id [page_create \
-                                 -pretty_name $pretty_name \
-                                 -portal_id $portal_id]
-                
-                # Now set the page's sort_key
-                db_dml revert_set_target_page_sort_key {}
+                                    -pretty_name $pretty_name \
+                                    -portal_id $portal_id]
+
+            # Now set the page's sort_key
+            db_dml revert_set_target_page_sort_key {}
             }
         }
-        
+
         # Second, delete target pages that aren't in the source
         # portal
         db_foreach revert_target_pages {} {
             if { ! [db_0or1row revert_get_source_page_id {}] } {
                 set move_to_page_id [db_string revert_min_page_id_select {}]
-                
+
                 db_foreach revert_move_elements_for_del {} {
                     portal::move_element_to_page \
                         -page_id $move_to_page_id \
@@ -819,43 +819,42 @@
                 page_delete -page_id $page_id
             }
         }
-        
+
         # now that they have the same number of pages, get to it
-        foreach source_page_id \
-            [list_pages_tcl_list -portal_id $template_id] {
-                
-                db_1row revert_get_source_page_info {}
+        foreach source_page_id [list_pages_tcl_list -portal_id $template_id] {
 
-                set target_page_id [db_string revert_get_target_page_id {}]
-                
-                db_dml revert_page_update {}
-                
-                # First, hide all elements.  
-                # If there are new content portlets that are not
-                # in the default template, this will ensure they don't come
-                # up.
+            db_1row revert_get_source_page_info {}
 
-                db_dml hide_all_elements {
-                    update portal_element_map
-                    set  state = 'hidden'
-                    where page_id = :target_page_id
-                }
+            set target_page_id [db_string revert_get_target_page_id {}]
 
-                # revert elements in two steps like "swap"
-                db_foreach revert_get_source_elements {} {
-                    # the element might not be on the target page...
-                    set target_element_id \
-                        [db_string revert_get_target_element {} -default {}]
-                    
+            db_dml revert_page_update {}
+
+            # First, hide all elements.
+            # If there are new content portlets that are not
+            # in the default template, this will ensure they don't come
+            # up.
+
+            db_dml hide_all_elements {
+                update portal_element_map
+                set  state = 'hidden'
+                where page_id = :target_page_id
+            }
+
+            # revert elements in two steps like "swap"
+            db_foreach revert_get_source_elements {} {
+                # the element might not be on the target page...
+                set target_element_id \
+                    [db_string revert_get_target_element {} -default {}]
+
                     # now, lets check if this is one new applet
                     # added, that was not originally mapped
                     # usually with custom portlets
-                    
-                    if {$target_element_id ne ""} {
-                        db_dml revert_element_update {}
-                    }
+
+                if {$target_element_id ne ""} {
+                    db_dml revert_element_update {}
                 }
             }
+        }
     } elseif { [ns_set get $form "op_rename"] ne "" } {
         portal::update_name $portal_id [ns_set get $form new_name]
 
@@ -1020,25 +1019,25 @@
     @param sort_key - optional, defaults to page 0
 } {
     if { $page_name ne "" } {
-        # Get page by page_name
+    # Get page by page_name
 
         set page_id [db_string get_page_id_from_name {} -default ""]
 
         if { $page_id eq "" } {
             if { $create_p } {
-                # there is no page by that name in the portal, create it
+            # there is no page by that name in the portal, create it
                 return [portal::page_create \
-                            -portal_id $portal_id \
-                            -pretty_name $page_name]
+                    -portal_id $portal_id \
+                    -pretty_name $page_name]
             } else {
-                # Call ourselves with portal_id and sort_key 0 to get the first page
+            # Call ourselves with portal_id and sort_key 0 to get the first page
                 return [get_page_id -portal_id $portal_id -sort_key 0]
             }
         } else {
             return $page_id
         }
     } else {
-        # Get page by sort key
+    # Get page by sort key
         return [db_string get_page_id_select {}]
     }
 }
@@ -1103,7 +1102,7 @@
     @return the id of the page
     @param portal_id
 } {
-    # get the layout_id
+# get the layout_id
     if {$layout_name ne ""} {
         set layout_id [get_layout_id -layout_name $layout_name]
     } else {
@@ -1156,16 +1155,16 @@
     set ad_dim_struct "{ page_num [list [_ new-portal.Page_1]] 0 [list $ad_dim_struct] }"
 
     return [dimensional -no_header \
-                -no_bars \
-                -link_all $link_all \
-                -td_align $td_align \
-                -pre_html $pre_html \
-                -post_html $post_html \
-                -extra_td_html $extra_td_html \
-                -extra_td_selected_p $extra_td_selected_p \
-                -table_html_args $table_html_args \
-                $ad_dim_struct \
-                $link]
+        -no_bars \
+        -link_all $link_all \
+        -td_align $td_align \
+        -pre_html $pre_html \
+        -post_html $post_html \
+        -extra_td_html $extra_td_html \
+        -extra_td_selected_p $extra_td_selected_p \
+        -table_html_args $table_html_args \
+        $ad_dim_struct \
+        $link]
 }
 
 #
@@ -1226,7 +1225,7 @@
             set min_region 1
         }
     } else {
-        # verify that the region given is in this layout
+    # verify that the region given is in this layout
         set min_region 0
 
         foreach region $region_list {
@@ -1237,22 +1236,22 @@
         }
 
         if {$min_region == 0} {
-            # the region asked for was not in the list
+        # the region asked for was not in the list
             ns_log error "portal::add_element region $force_region not in layout $layout_id"
             ad_return_complaint 1 "portal::add_element region $force_region not in layout $layout_id"
             ad_script_abort
         }
     }
 
     return [add_element_to_region \
-                -page_name $page_name \
-                -layout_id $layout_id \
-                -pretty_name $pretty_name \
-                -sort_key $sort_key \
-                $portal_id \
-                $portlet_name \
-                $min_region \
-               ]
+        -page_name $page_name \
+        -layout_id $layout_id \
+        -pretty_name $pretty_name \
+        -sort_key $sort_key \
+        $portal_id \
+        $portlet_name \
+        $min_region \
+        ]
 }
 
 ad_proc -public portal::remove_element {
@@ -1273,9 +1272,9 @@
         }
 
         set element_ids [portal::get_element_ids_by_ds \
-                             $portal_id \
-                             $portlet_name
-                        ]
+            $portal_id \
+            $portlet_name
+        ]
 
         db_transaction {
             foreach element_id $element_ids {
@@ -1302,8 +1301,8 @@
     @param ds_name
 } {
 
-    # XXX AKS: The whole issue of datasource/portlet naming must
-    # be cleaned up! FIXME
+# XXX AKS: The whole issue of datasource/portlet naming must
+# be cleaned up! FIXME
 
     if {$pretty_name eq ""} {
         set pretty_name $ds_name
@@ -1319,18 +1318,18 @@
 
         set new_element_id [db_nextval acs_object_id_seq]
         set target_page_id [get_page_id \
-                                -portal_id $portal_id \
-                                -page_name $page_name \
-                                -sort_key $template_page_sort_key
-                           ]
+            -portal_id $portal_id \
+            -page_name $page_name \
+            -sort_key $template_page_sort_key
+        ]
 
         db_dml template_insert {}
         db_dml template_params_insert {}
 
     } else {
-        # no template, or the template doesn't have this D
+    # no template, or the template doesn't have this D
 
-        # sort_key will be used only on insert
+    # sort_key will be used only on insert
         if { $sort_key eq "" } {
             set sort_key [db_string get_sort_key {} -default "1"]
             set sort_key [ad_decode $sort_key "" "1" $sort_key]
@@ -1396,7 +1395,7 @@
 
         # Set the element to be moved's sort_key to the right value
         db_dml swap_sort_keys_3 {}
-    } on_error {
+        } on_error {
         ad_return_complaint 1 "portal::swap_element: [_ new-portal.transaction_failed]"
         ad_script_abort
     }
@@ -1456,11 +1455,11 @@
     }
 
     set target_reg_num [get_layout_region_count_not_cached \
-                            -layout_id [get_layout_id -page_id $page_id]
-                       ]
+        -layout_id [get_layout_id -page_id $page_id]
+    ]
 
     if {$curr_reg > $target_reg_num} {
-        # the new page dosent have this region, set to max region
+    # the new page dosent have this region, set to max region
         set region $target_reg_num
     } else {
         set region $curr_reg
@@ -1522,8 +1521,8 @@
     @param key
     @param value
 } {
-    #ns_log notice "aks80 set_element_param $element_id / $key / $value / [db_list_of_lists foo {
-    # select * from portal_element_parameters where element_id = :element_id}] "
+#ns_log notice "aks80 set_element_param $element_id / $key / $value / [db_list_of_lists foo {
+# select * from portal_element_parameters where element_id = :element_id}] "
 
     db_dml update {}
 
@@ -1629,14 +1628,14 @@
     If you know that on a given portal there is a _unique_ element
     identified by a parameter value and you want to find said element,
     this is your proc. Will error out if the param is not found (poor-man's
-                                                                 ASSERT)
+    ASSERT)
 } {
     return [db_string select {
         select portal_element_map.element_id
         from portal_element_map, portal_element_parameters
         where portal_element_map.page_id in (select page_id
-                                             from portal_pages
-                                             where portal_id = :portal_id)
+        from portal_pages
+        where portal_id = :portal_id)
         and portal_element_parameters.element_id = portal_element_map.element_id
         and portal_element_parameters.key = :key
         and portal_element_parameters.value = :value
@@ -1660,11 +1659,11 @@
     set element_params [util_memoize "portal::element_params_not_cached $element_id" 86400]
     if {[llength $element_params]} {
         foreach param $element_params {
-	    lassign $param key value
+            lassign $param key value
             lappend config($key) $value
         }
     } else {
-        # this element has no config, set up some defaults
+    # this element has no config, set up some defaults
         set config(shaded_p) "f"
         set config(shadeable_p) "f"
         set config(hideable_p) "f"
@@ -1699,7 +1698,7 @@
         append element(content) "You have found a bug in our code. " \
             "<p>Please notify the webmaster and include the following text. Thank You." \
             "<p><pre><small>*** portal::evaluate_element callback Error! ***\n\n [ns_quotehtml $errorMsg]</small></pre>\n\n"
-        
+
     } on ok {content} {
         set element(content) $content
     }
@@ -1713,10 +1712,10 @@
 
         set element(name) \
             [datasource_call \
-                 -datasource_name $element(ds_name) \
-                 $element(datasource_id) \
-                 "GetPrettyName" \
-                 [list]]
+            -datasource_name $element(ds_name) \
+            $element(datasource_id) \
+            "GetPrettyName" \
+            [list]]
     } else {
         set element(name) $element(pretty_name)
     }
@@ -1731,12 +1730,12 @@
     # value this returns is ignored
     set element(link) \
         [datasource_call \
-             -datasource_name $element(ds_name) \
-             $element(datasource_id) \
-             "Link" \
-             [list]]
+        -datasource_name $element(ds_name) \
+        $element(datasource_id) \
+        "Link" \
+        [list]]
 
-    # done with callbacks, now set config params
+        # done with callbacks, now set config params
     set element(shadeable_p) $config(shadeable_p)
     set element(shaded_p) $config(shaded_p)
     set element(hideable_p) $config(hideable_p)
@@ -1746,12 +1745,12 @@
     # apply the path hack to the filename and the resourcedir
     # Only do this if the element filename does not start with "/packages"
     if {[string first "/packages" $element(filename)] < 0} {
-	set element(filename) "[www_path]/$element(filename)"
+        set element(filename) "[www_path]/$element(filename)"
     }
 
     # DRB: don't ruin URLs that start with "/", i.e. the form "/resources/package-key/..."
     if { [string index $element(resource_dir) 0] ne "/" } {
-        # notice no "/" after mount point
+    # notice no "/" after mount point
         set element(resource_dir) "[mount_point]$element(resource_dir)"
     }
 
@@ -1772,7 +1771,7 @@
     db_foreach params_select {} {
         lappend config($key) $value
     } if_no_rows {
-        # this element has no config, set up some defaults
+    # this element has no config, set up some defaults
         set config(shaded_p) "f"
         set config(shadeable_p) "f"
         set config(hideable_p) "f"
@@ -1793,10 +1792,10 @@
 
     set element(name) \
         [datasource_call \
-             $element(datasource_id) "GetPrettyName" [list]]
+        $element(datasource_id) "GetPrettyName" [list]]
 
-    # Peter: we allow the element name to contain embedded message catalog keys
-    # that we localize on the fly
+        # Peter: we allow the element name to contain embedded message catalog keys
+        # that we localize on the fly
     set element(name) [lang::util::localize $element(name)]
 
     # no "Link" for raw elements
@@ -1849,11 +1848,11 @@
             # Get the edit html by callback
             # Notice that the "edit" proc takes only the element_id
             set html_string [datasource_call $datasource_id "Edit" \
-                                 [list $element_id]]
+                [list $element_id]]
 
             if { $html_string eq "" } {
                 ns_log Error "portal::configure_element op = edit, but
-                    portlet's edit proc returned null string"
+                portlet's edit proc returned null string"
 
                 ad_returnredirect $return_url
                 ad_script_abort
@@ -1874,7 +1873,7 @@
                 @html_string@
                 <P>
                 </form>
-	    }]
+            }]
             set __adp_stub "[get_server_root][www_path]/."
             set {master_template} \"master\"
 
@@ -1906,7 +1905,7 @@
     }
 }
 
-ad_proc -private portal::set_pretty_name { 
+ad_proc -private portal::set_pretty_name {
     {-element_id:required}
     {-pretty_name:required}
 } {
@@ -1986,7 +1985,7 @@
     @param portal_id
     @param ds_id
 } {
-    # permission::require_permission -object_id $portal_id -privilege portal_admin_portal
+# permission::require_permission -object_id $portal_id -privilege portal_admin_portal
     db_dml delete {}
 }
 
@@ -2099,8 +2098,8 @@
 } {
     if { $layout_name eq "" } {
         set layout_name [parameter::get_from_package_key \
-                            -package_key new-portal \
-                            -parameter default_layout]
+            -package_key new-portal \
+            -parameter default_layout]
     }
     if { $page_num ne "" } {
         db_1row get_layout_id_num_select {}
@@ -2169,15 +2168,15 @@
 
     if {[llength $element_id_list] == 0} {
         db_transaction {
-            # Tell portal to add this element to the page
+        # Tell portal to add this element to the page
             set element_id [add_element \
-                                -portal_id $portal_id \
-                                -portlet_name $portlet_name \
-                                -pretty_name $pretty_name \
-                                -page_name $page_name \
-                                -force_region $force_region \
-                                -sort_key $sort_key
-                           ]
+                -portal_id $portal_id \
+                -portlet_name $portlet_name \
+                -pretty_name $pretty_name \
+                -page_name $page_name \
+                -force_region $force_region \
+                -sort_key $sort_key
+            ]
 
             # There is already a value for the param which is overwritten
             set_element_param $element_id $key $value
@@ -2275,8 +2274,8 @@
     db_transaction {
         foreach element_id $element_ids {
             if {[llength [get_element_param_list \
-                              -element_id $element_id \
-                              -key $key]] == 0} {
+                    -element_id $element_id \
+                -key $key]] == 0} {
                 remove_element -element_id $element_id
             }
         }
@@ -2389,32 +2388,32 @@
     if {$option_list eq ""} {
         return
     }
-    
+
     if {$options_set eq ""} {
         set options_set [ns_getform]
     }
-    
+
     if {$url eq ""} {
         set url [ad_conn url]
     }
-    
+
     set html "\n<table $table_html_args>\n"
-    
+
     if {!$no_header_p} {
         foreach option $option_list {
             append html "<tr>    <th bgcolor=\"$th_bgcolor\">[lindex $option 1]</th>\n"
         }
     }
-    
+
     append html "  <tr>\n"
-    
+
     foreach option $option_list {
-        
+
         if {!$no_bars_p} {
             append html "\["
         }
-        
-        
+
+
         if { $names_in_cells_p } {
             set pre_td_html "<td class=\"navbar\">"
             set pre_selected_td_html "<td class=\"navbar-selected\">"
@@ -2439,15 +2438,14 @@
 
         # find out what the current option value is.
         # check if a default is set otherwise the first value is used
-        set option_key [lindex $option 0]
-        set option_val [lindex $option 2]
+        lassign $option option_key . option_val
         if {$options_set ne ""} {
             set options_set_val [ns_set get $options_set $option_key]
             if { $options_set_val ne "" } {
                 set option_val $options_set_val
             }
         }
-        
+
         set first_p 1
         foreach option_value [lindex $option 3] {
             set thisoption_name [lindex $option_value 0]
@@ -2464,14 +2462,14 @@
             } else {
                 append html $break_html
             }
-            
+
             if {($option_val eq $thisoption_name && !$link_all) || !$thisoption_link_p} {
                 append html "${pre_selected_td_html}${pre_html}${thisoption_value}${post_selected_html}\n"
             } else {
-		set href "$url?[export_ns_set_vars url $option_key $options_set]&[ns_urlencode $option_key]=[ns_urlencode $thisoption_name]"
+                set href "$url?[export_ns_set_vars url $option_key $options_set]&[ns_urlencode $option_key]=[ns_urlencode $thisoption_name]"
                 append html [subst {
-		    ${pre_td_html}<a href="[ns_quotehtml $href]">${pre_html}${thisoption_value}${post_html}
-		}]
+                    ${pre_td_html}<a href="[ns_quotehtml $href]">${pre_html}${thisoption_value}${post_html}
+                }]
             }
         }
 
Index: openacs-4/packages/news-aggregator/tcl/source-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/tcl/source-procs.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/news-aggregator/tcl/source-procs.tcl	24 Apr 2018 14:28:56 -0000	1.12
+++ openacs-4/packages/news-aggregator/tcl/source-procs.tcl	30 Apr 2018 12:45:00 -0000	1.13
@@ -215,8 +215,7 @@
             ns_log Debug "source::update: guid $guid marked as new"
         } else {
             set new_p 0
-            set db_title [lindex $existing_items($guid) 0]
-            set db_description [lindex $existing_items($guid) 1]
+            lassign $existing_items($guid) db_title db_description
 
             ns_log Debug "source::update: guid $guid marked as existing\ttitle = $db_title\tdescription = $db_description"
         }
Index: openacs-4/packages/notifications/tcl/notification-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-callback-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/notifications/tcl/notification-callback-procs.tcl	7 Aug 2017 23:48:13 -0000	1.6
+++ openacs-4/packages/notifications/tcl/notification-callback-procs.tcl	30 Apr 2018 12:45:00 -0000	1.7
@@ -27,12 +27,12 @@
     set msg "Merging notifications"
     set result [list $msg]
     ns_log Notice $msg
-    
+
     db_transaction {
-	db_dml upd_notifications {}
-	db_dml upd_map {}
-	lappend result "Notifications merge is done"
-    } 
+        db_dml upd_notifications {}
+        db_dml upd_map {}
+        lappend result "Notifications merge is done"
+    }
     return $result
 }
 
@@ -61,73 +61,72 @@
     upvar $array email
 
     set is_auto_reply_p 0
-    
+
     #TODO: we need to check if it Auto-Submitted header exists or "Out of Office AutoReply" in Subject
-    
+
     if { $is_auto_reply_p } {
-	ns_log Notice "acs_mail_lite::incoming_email -impl notifications: message $email(message-id) is from an auto-responder, skipping"
+        ns_log Notice "acs_mail_lite::incoming_email -impl notifications: message $email(message-id) is from an auto-responder, skipping"
     }
 
     set from [notification::email::parse_email_address $email(from)]
     set to [notification::email::parse_email_address $email(to)]
-    
+
     set to_stuff [notification::email::parse_reply_address -reply_address $to]
     # We don't accept a bad incoming email address
     if {$to_stuff eq ""} {
-	# This is not an e-mail notification can work with. Maybe bounce ?
-	return
+    # This is not an e-mail notification can work with. Maybe bounce ?
+        return
     }
 
     # Find the user_id of the sender
     ns_log Notice "acs_mail_lite::incoming_email -impl notifications: from $from"
     set user_id [party::get_by_email -email $from]
-    
+
     # We don't accept empty users for now
     if {$user_id eq ""} {
-	ns_log Notice "acs_mail_lite::incoming_email -impl notifications: Unknown sender with email $from. Bouncing message."
-	# bounce message with an informative error.
-	notification::email::bounce_mail_message \
-	    -to_addr $from \
-	    -from_addr $to \
-	    -body $email(bodies)  \
-	    -message_headers $email(headers) \
-	    -reason "Invalid sender.  You must be a member of the site and\nyour From address must match your registered address."
-	return
+        ns_log Notice "acs_mail_lite::incoming_email -impl notifications: Unknown sender with email $from. Bouncing message."
+        # bounce message with an informative error.
+        notification::email::bounce_mail_message \
+            -to_addr $from \
+            -from_addr $to \
+            -body $email(bodies)  \
+            -message_headers $email(headers) \
+            -reason "Invalid sender.  You must be a member of the site and\nyour From address must match your registered address."
+        return
     }
-    
-    set object_id [lindex $to_stuff 0]
-    set type_id [lindex $to_stuff 1]
+
+    lassign $to_stuff object_id type_id
     set to_addr $to
     set headers $email(headers)
     set bodies $email(bodies)
 
     db_transaction {
-	ns_log Notice "acs_mail_lite::incoming_email -impl notifications: Creating a reply for user: $user_id, object: object_id: $object_id, type_id: $type_id."
-	set reply_id [notification::reply::new \
-			  -object_id $object_id \
-			  -type_id $type_id \
-			  -from_user $user_id \
-			  -subject $email(subject) \
-			  -content $email(bodies)]
-	db_dml holdinsert {}
-	
-	#extending email array for notification callback implementors
-	set email(object_id) $object_id
-	set email(type_id) $type_id
-	set email(reply_id) $reply_id
-	set email(user_id) $user_id
-	
-	if {[db_0or1row select_impl {}]} {
-	ns_log Notice "acs_mail_lite::incoming_email -impl notifications: calling notifications::incoming_email implementation for package $package_key"
-	    if { [catch {callback -impl $package_key notifications::incoming_email -array email} error] } {
-		ns_log Notice "acs_mail_lite::incoming_email -impl notifications: $error"
-	    }
-	} else {
-	    ns_log Notice "acs_mail_lite::incoming_email -impl notifications: No corresponding package registered for type_id $type_id"
-	}
-	
+        ns_log Notice "acs_mail_lite::incoming_email -impl notifications: Creating a reply for user: $user_id, object: object_id: $object_id, type_id: $type_id."
+        set reply_id [notification::reply::new \
+            -object_id $object_id \
+            -type_id $type_id \
+            -from_user $user_id \
+            -subject $email(subject) \
+            -content $email(bodies)]
+        db_dml holdinsert {}
+
+        #extending email array for notification callback implementors
+        set email(object_id) $object_id
+        set email(type_id) $type_id
+        set email(reply_id) $reply_id
+        set email(user_id) $user_id
+
+        if {[db_0or1row select_impl {}]} {
+            ns_log Notice "acs_mail_lite::incoming_email -impl notifications: calling notifications::incoming_email implementation for package $package_key"
+            if { [catch {callback -impl $package_key notifications::incoming_email -array email} error] } {
+                ns_log Notice "acs_mail_lite::incoming_email -impl notifications: $error"
+            }
+        } else {
+            ns_log Notice "acs_mail_lite::incoming_email -impl notifications: No corresponding package registered for type_id $type_id"
+        }
+
     } on_error {
-	ns_log Error "acs_mail_lite::incoming_email -impl notifications: error inserting incoming email into the queue: $errmsg"
+        ns_log Error "acs_mail_lite::incoming_email -impl notifications: error inserting incoming email into the queue: $errmsg"
     }
 }
 
Index: openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl	25 Apr 2018 19:47:47 -0000	1.16
+++ openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl	30 Apr 2018 12:45:00 -0000	1.17
@@ -1,6 +1,6 @@
 #
 # tDAV.tcl
-# 
+#
 # Copyright 2003 Musea Technologies
 #
 # http://www.museatech.net
@@ -11,11 +11,11 @@
 # toddg@tdav.museatech.net
 #
 # Authors: Todd Gillespie
-#          Dave Bauer 
+#          Dave Bauer
 #
 # Based upon sources from:
 #
-# webdav.tcl    
+# webdav.tcl
 #
 # A WebDAV implementation for AOLserver 3.x.
 #
@@ -65,7 +65,7 @@
 #     returns an HTTP response containing WebDAV options supported
 #
 # TODO Make this smart to return options based on URI
-# We still need to pretend that the site root supports DAV 
+# We still need to pretend that the site root supports DAV
 # methods or some clients get confused.
 
 proc tdav::filter_webdav_options {args} {
@@ -74,12 +74,12 @@
 
     # The allowed webdav options for the share that the requested
     # URL belongs to.
-    
+
     foreach {uri options} [nsv_array get tdav_options] {
-	if {[regexp $uri [ns_conn url]]} {
-	    ns_set put [ns_conn outputheaders] Allow [join $options {, }]
-	    break
-	}
+        if {[regexp $uri [ns_conn url]]} {
+            ns_set put [ns_conn outputheaders] Allow [join $options {, }]
+            break
+        }
     }
 
     # This tells MSFT products to skip looking for FrontPage extensions.
@@ -96,9 +96,9 @@
 # get body
 
 proc tdav::xml_valid_p {xml_doc} {
-    # TODO use tnc with tDOM to vaildate the xml request
+# TODO use tnc with tDOM to vaildate the xml request
     return 1
-    
+
 }
 
 # tdav::read_xml
@@ -115,11 +115,11 @@
 proc tdav::read_xml {} {
     set fp ""
     while {$fp eq ""} {
-	set tmpfile [ad_tmpnam]
-	set fp [ns_openexcl $tmpfile]
+        set tmpfile [ad_tmpnam]
+        set fp [ns_openexcl $tmpfile]
     }
     #fconfigure $fp -translation binary -encoding binary
-#    fconfigure $fp -encoding utf-8
+    #    fconfigure $fp -encoding utf-8
     ns_conncptofp $fp
     seek $fp 0
     set xml [read $fp]
@@ -137,18 +137,18 @@
 # Arguments:
 #     uri URI of the request being handled
 #     list properties formatted in a Tcl list as
-#     propertyname value 
+#     propertyname value
 #
 # Results:
 #     file written including contents of list
 
 proc tdav::dbm_write_list {uri list} {
     set file [tdav::get_prop_file $uri]
     if {[catch {set f [open $file w]} err]} {
-	# probably no parent dir, create it:
-	file mkdir [file dirname $file]
-	# open again:
-	set f [open $file w] 
+    # probably no parent dir, create it:
+        file mkdir [file dirname $file]
+        # open again:
+        set f [open $file w]
     }
     fconfigure $f -encoding utf-8
     puts $f $list
@@ -163,26 +163,26 @@
 #     uri URI to get properties filename for
 #
 # Results:
-#     Returns the filename containing user properties. 
+#     Returns the filename containing user properties.
 
 proc tdav::get_prop_file {uri} {
-    # just in case.  I hate that 'file join' fails on this
-    regsub {^/} $uri {} uri
+# just in case.  I hate that 'file join' fails on this
+regsub {^/} $uri {} uri
 
-    # log this for failed config section
+# log this for failed config section
     set name [ns_config "ns/server/[ns_info server]/tdav" propdir]
 
     if {$name eq ""} {
-	set name [file join $::acs::pageroot "../propdir/${uri}"]
+        set name [file join $::acs::pageroot "../propdir/${uri}"]
     } else {
-	set name [file join $name $uri]
+        set name [file join $name $uri]
     }
 
     # catch uncreated parent dirs here:
     if {![file exists [file dirname $name]]} {
-	# no parent dir, create it:
-	file mkdir [file dirname $name]
-	# safe for public consumption?
+    # no parent dir, create it:
+        file mkdir [file dirname $name]
+        # safe for public consumption?
     }
     return "${name}.prop"
 }
@@ -198,21 +198,21 @@
 #     Returns the filename containing the lock information for URI
 
 proc tdav::get_lock_file {uri} {
-    # just in case.  I hate that 'file join' fails on this
-    regsub {^/} $uri {} uri
+# just in case.  I hate that 'file join' fails on this
+regsub {^/} $uri {} uri
 
-    # log this for failed config section
+# log this for failed config section
     set name [ns_config "ns/server/[ns_info server]/tdav" lockdir]
 
     if {$name eq ""} {
-	set name [file join $::acs::pageroot "../lockdir/${uri}"]
+        set name [file join $::acs::pageroot "../lockdir/${uri}"]
     } else {
-	set name [file join $name $uri]
+        set name [file join $name $uri]
     }
     if {![file exists [file dirname $name]]} {
-	# no parent dir, create it:
-	file mkdir [file dirname $name]
-	# safe for public consumption?
+    # no parent dir, create it:
+        file mkdir [file dirname $name]
+        # safe for public consumption?
     }
 
     return "${name}.lock"
@@ -327,7 +327,7 @@
 # UNUSED
 
 proc tdav::dbm_write_array {uri arr} {
-    # extract list from array
+# extract list from array
     tdav::dbm_write_list($uri,[array get arr])
     # throw errors
 }
@@ -346,7 +346,7 @@
     set lockexpiretime [clock scan "$timeout seconds" -base $locktime]
     set timeout_left [expr {$lockexpiretime - [clock seconds]}]
     if {$timeout_left < 0} {
-	set timeout_left 0
+        set timeout_left 0
     }
     return $timeout_left
 }
@@ -373,35 +373,35 @@
     regsub {^/} $uri {} uri
     # if lock exists, work.  if not, just return.
     if {[file exists [tdav::get_lock_file $uri]]} {
-	  set lockinfo [tdav::read_lock $uri]
+        set lockinfo [tdav::read_lock $uri]
 
-	# check if lock is expired
-	if {[tdav::lock_timeout_left [lindex $lockinfo 4] [lindex $lockinfo 6]] == 0 } {
-	    tdav::remove_lock $uri
-	    return "unlocked"
-	}
-	set hdr [ns_set iget [ns_conn headers] If]
-	
-	# the If header exists, work, otherwise 423
-	
-	if {[info exists hdr] && [string length $hdr]} {
-	    set token ""
-	    # add ? in the token re in case there is a conditional () 
-	    # in the header
-	    regexp {(<https?://[^/]+([^>]+)>\s+)?\(<([^>]+)>\)} $hdr nil maybe hdr_uri token
-	    
-	    set ftk [lindex $lockinfo 3]
-	    if {![info exists token] || $token ne $ftk } {
+        # check if lock is expired
+        if {[tdav::lock_timeout_left [lindex $lockinfo 4] [lindex $lockinfo 6]] == 0 } {
+            tdav::remove_lock $uri
+            return "unlocked"
+        }
+        set hdr [ns_set iget [ns_conn headers] If]
+
+        # the If header exists, work, otherwise 423
+
+        if {[info exists hdr] && [string length $hdr]} {
+            set token ""
+            # add ? in the token re in case there is a conditional ()
+            # in the header
+            regexp {(<https?://[^/]+([^>]+)>\s+)?\(<([^>]+)>\)} $hdr nil maybe hdr_uri token
+
+            set ftk [lindex $lockinfo 3]
+            if {![info exists token] || $token ne $ftk } {
                 ns_log Debug "tdav::check_lock: token mismatch $ftk expected hdr: $hdr token: $token"
-		ns_return 423 {text/plain} {}
-		return filter_return
-	    }
-	} else {
+                ns_return 423 {text/plain} {}
+                return filter_return
+            }
+        } else {
             ns_log Debug "tdav::check_lock: no \"If\" header found for request of $uri"
-	    ns_return 423 {text/plain} {}
-	    return filter_return
-	}
-	# also check for uri == hdr_uri
+            ns_return 423 {text/plain} {}
+            return filter_return
+        }
+        # also check for uri == hdr_uri
     }
     return unlocked
 }
@@ -422,20 +422,20 @@
     regsub {^/} $uri {} uri
     # if lock exists, work.  if not, just return.
     if {[file exists [tdav::get_lock_file $uri]]} {
-	set hdr [ns_set iget [ns_conn headers] {Lock-Token}]
-	# the If header exists, work, otherwise 423
-	if {[info exists hdr] && [string length $hdr]} {
-	    regexp {<([^>]+)>} $hdr nil token
-	    set ftk [lindex [tdav::read_lock $uri] 3]
-	    if {[info exists token] && $token eq $ftk} {
-		# it's good, the tokens match.  carry on.
-	    } else {
-		return filter_return
-	    }
-	} else {
-	    return filter_return
-	}
-	# also check for uri == hdr_uri
+        set hdr [ns_set iget [ns_conn headers] {Lock-Token}]
+        # the If header exists, work, otherwise 423
+        if {[info exists hdr] && [string length $hdr]} {
+            regexp {<([^>]+)>} $hdr nil token
+            set ftk [lindex [tdav::read_lock $uri] 3]
+            if {[info exists token] && $token eq $ftk} {
+            # it's good, the tokens match.  carry on.
+            } else {
+                return filter_return
+            }
+        } else {
+            return filter_return
+        }
+        # also check for uri == hdr_uri
     }
     return unlocked
 }
@@ -458,17 +458,17 @@
 proc tdav::get_fs_props {} {
 #    global fs_props
     set fs_props {}
-    
-#    lappend fs_props [list ns0 supportlock] {subst {"<none/>"}}
+
+    #    lappend fs_props [list ns0 supportlock] {subst {"<none/>"}}
     lappend fs_props [list ns0 getcontenttype] {subst {[ns_guesstype $filename]}}
     lappend fs_props [list D getcontentlength] {subst {[file size $entry]}}
     lappend fs_props [list D creationdate]     {subst {[clock format $file_stat(mtime) -format "%Y-%m-%dT%H:%M:%SZ" -gmt 1]}}
     lappend fs_props [list D getlastmodified]  {subst {[clock format $file_stat(mtime) -format "%a, %d %b %Y %H:%M:%S %Z" -gmt 1]}}
     lappend fs_props [list D getetag]          {subst {"1f9a-400-3948d0f5"}}
     lappend fs_props [list D resourcetype] {if {[file isdirectory $entry]} {
-	subst {D:collection}
+        subst {D:collection}
     } else {
-	subst {[ns_guesstype $filename]}
+        subst {[ns_guesstype $filename]}
     }}
 
     return $fs_props
@@ -482,11 +482,11 @@
     # ht
     # ACTION
     foreach c $proplist {
-	# extraneous, then name
-	set p [[$c childNodes] childNodes]
-	set name [$p nodeName]
-	# DATA:
-	set ht($name) [[$p childNodes] nodeValue]
+    # extraneous, then name
+        set p [[$c childNodes] childNodes]
+        set name [$p nodeName]
+        # DATA:
+        set ht($name) [[$p childNodes] nodeValue]
     }
     return $ht
 }
@@ -499,11 +499,11 @@
     # ht
     # ACTION
     foreach c $proplist {
-	# extraneous, then name
-	set p [[$c childNodes] childNodes]
-	set name [$p nodeName]
-	# DATA:
-	set ht($name) [[$p childNodes] nodeValue]
+    # extraneous, then name
+        set p [[$c childNodes] childNodes]
+        set name [$p nodeName]
+        # DATA:
+        set ht($name) [[$p childNodes] nodeValue]
     }
     return $ht
 }
@@ -525,46 +525,46 @@
     set depth [tdav::conn -set depth [ns_set iget [ns_conn headers] Depth]]
 
     set xml [tdav::read_xml]
-    
+
     if {[catch {dom parse $xml} xd]} {
-	# xml body is not well formed
-	ns_returnbadrequest
-	return filter_return
+    # xml body is not well formed
+        ns_returnbadrequest
+        return filter_return
     }
-    
+
     set setl [$xd getElementsByTagName "*set"]
     set rml [$xd getElementsByTagName "*remove"]
     set prop_req {}
     foreach node $rml {
-	set p [[$node childNodes] childNodes]
-	# we use localname because we always resolve the URI namespace
-	# for the tag name
-	set ns [$p namespaceURI]
-	if {$ns eq ""} {
-	    set name [$p nodeName]
-	} else {
-	    set name [$p localName]
-	}
-	if {[catch {set value [[$p childNodes] nodeValue]}]} {
-	    set value ""
-	}
-	lappend prop_req remove [list [list $ns $name] $value]
+        set p [[$node childNodes] childNodes]
+        # we use localname because we always resolve the URI namespace
+        # for the tag name
+        set ns [$p namespaceURI]
+        if {$ns eq ""} {
+            set name [$p nodeName]
+        } else {
+            set name [$p localName]
+        }
+        if {[catch {set value [[$p childNodes] nodeValue]}]} {
+            set value ""
+        }
+        lappend prop_req remove [list [list $ns $name] $value]
     }
 
     foreach node $setl {
-	set p [[$node childNodes] childNodes]
-	# we use localname because we always resolve the URI namespace
-	# for the tag name
-	set ns [$p namespaceURI]
-	if {$ns eq ""} {
-	    set name [$p nodeName]
-	} else {
-	    set name [$p localName]
-	}
-	if {[catch {set value [[$p childNodes] nodeValue]}]} {
-	    set value ""
-	}
-	lappend prop_req set [list [list $ns $name] $value]
+        set p [[$node childNodes] childNodes]
+        # we use localname because we always resolve the URI namespace
+        # for the tag name
+        set ns [$p namespaceURI]
+        if {$ns eq ""} {
+            set name [$p nodeName]
+        } else {
+            set name [$p localName]
+        }
+        if {[catch {set value [[$p childNodes] nodeValue]}]} {
+            set value ""
+        }
+        lappend prop_req set [list [list $ns $name] $value]
     }
 
     tdav::conn -set prop_req $prop_req
@@ -590,21 +590,21 @@
 
 proc tdav::webdav_proppatch {} {
     set uri [ns_conn url]
-    regsub {^/} $uri {} uri    
+    regsub {^/} $uri {} uri
     set filename [file join $::acs::pageroot $uri]
     set body ""
     set ret_code 200
     if {![file exists $filename]} {
-	set ret_code 404
+        set ret_code 404
     } else {
-	if {"unlocked" ne [tdav::check_lock $uri] } {
-	    set ret_code 423
-	    set response "The resource is locked"
-	} else {
-	    set prop_req [tdav::conn prop_req]
-	    set response [tdav::update_user_props $uri $prop_req]
-	}
-	set ret_code 207
+        if {"unlocked" ne [tdav::check_lock $uri] } {
+            set ret_code 423
+            set response "The resource is locked"
+        } else {
+            set prop_req [tdav::conn prop_req]
+            set response [tdav::update_user_props $uri $prop_req]
+        }
+        set ret_code 207
     }
 
     tdav::respond [list $ret_code $response]
@@ -636,33 +636,33 @@
 
     # decide on file or directory
     # why doesn't Tcl handle this?
-    # otoh, it lets us handle the notfound error here    
+    # otoh, it lets us handle the notfound error here
     # wait, no, this is right as long as the DAV request is correct
     # so fuck it
     if {$depth > 0} {
-	set entries [glob -nocomplain [file join $::acs::pageroot $uri *]]
+        set entries [glob -nocomplain [file join $::acs::pageroot $uri *]]
     } else {
-	set entries [glob -nocomplain [file join $::acs::pageroot $uri]]
+        set entries [glob -nocomplain [file join $::acs::pageroot $uri]]
     }
-    
+
     foreach entry $entries {
-	set entry_props [list]
-	set filename [lindex [file split $entry] end]
-	# Tcl befuddles me:
-	set href [string replace $entry 1 [string length $::acs::pageroot] ""]
-	file stat $entry file_stat
-	set collection_p [string equal "directory" $file_stat(type)]
+        set entry_props [list]
+        set filename [lindex [file split $entry] end]
+        # Tcl befuddles me:
+        set href [string replace $entry 1 [string length $::acs::pageroot] ""]
+        file stat $entry file_stat
+        set collection_p [string equal "directory" $file_stat(type)]
 
-	foreach {i j} [tdav::get_fs_props] {
-	    lappend entry_props [list [lindex $i 0] [lindex $i 1]] [eval $j]
-	}
-	foreach {i j} [tdav::get_user_props $uri $depth $prop_req] {
-	    lappend entry_props [list [lindex $i 0] [lindex $i 1]] $j
-	}
-	
-	lappend props [list $href $collection_p $entry_props]
+        foreach {i j} [tdav::get_fs_props] {
+            lappend entry_props [list [lindex $i 0] [lindex $i 1]] [eval $j]
+        }
+        foreach {i j} [tdav::get_user_props $uri $depth $prop_req] {
+            lappend entry_props [list [lindex $i 0] [lindex $i 1]] $j
+        }
+
+        lappend props [list $href $collection_p $entry_props]
     }
-    
+
     tdav::respond [list 207 $props]
 }
 
@@ -682,45 +682,44 @@
 #           are always returned
 #
 # Results:
-#     returns a list of name/value pairs 
+#     returns a list of name/value pairs
 
 proc tdav::get_user_props { uri depth prop_req } {
     regsub {^/} $uri {} luri
-    return [tdav::dbm_read_list $luri] 
+    return [tdav::dbm_read_list $luri]
 }
 
 proc tdav::update_user_props {uri prop_req} {
     array set props [tdav::dbm_read_list $uri]
     set status {}
     foreach {action i} $prop_req {
-	set k [lindex $i 0]
-	set value [lindex $i 1]
-	switch -- $action {
-	    set {
-		if {[catch {set props($k) $value} err]} {
-		    lappend status [list "HTTP/1.1 409 Conflict" $k]
-		} else {
-		    lappend status [list "HTTP/1.1 200 OK" $k]
-		}
+        lassign $i k value
+        switch -- $action {
+            set {
+                if {[catch {set props($k) $value} err]} {
+                    lappend status [list "HTTP/1.1 409 Conflict" $k]
+                } else {
+                    lappend status [list "HTTP/1.1 200 OK" $k]
+                }
 
-	    }
-	    remove {
-		#according to WebDAV spec removing a nonexistent
-		# property is not an error, if it's there
-		# remove it, otherwise, continue.
-		if {[info exists props($k)]} {
-		    unset props($k)
-		}
-		lappend status [list "HTTP/1.1 200 OK" $k]
-	    }
-	}
+            }
+            remove {
+            #according to WebDAV spec removing a nonexistent
+            # property is not an error, if it's there
+            # remove it, otherwise, continue.
+                if {[info exists props($k)]} {
+                    unset props($k)
+                }
+                lappend status [list "HTTP/1.1 200 OK" $k]
+            }
+        }
 
-    #filter out filesystem sets
-    # DAVEB where is this filtering occurring?
+        #filter out filesystem sets
+        # DAVEB where is this filtering occurring?
 
-    #write the props back out to disc:
-    tdav::dbm_write_list $uri [array get props]
-   }
+        #write the props back out to disc:
+        tdav::dbm_write_list $uri [array get props]
+    }
     return $status
 }
 
@@ -752,27 +751,27 @@
     set entry [file join $::acs::pageroot $uri]
     # parse the xml body to check if its valid
     if {"" ne $xml && [catch {dom parse $xml} xd]} {
-	ns_return 400 text/plain "XML request not well-formed."
-	return filter_return
+        ns_return 400 text/plain "XML request not well-formed."
+        return filter_return
     }
-    
+
     set xml_prop_list {}
 
     if {[info exists xd] && "" ne $xd } {
-	set prop [$xd getElementsByTagNameNS "DAV:" "prop"]
-	# if <prop> element doesn't exist we return all properties
-	if {$prop ne ""} {
-	    set xml_prop_list [$prop childNodes]
-	}
-	foreach node $xml_prop_list {
-	    set ns [$node namespaceURI]
-	    if {$ns eq ""} {
-		set name [$node nodeName]
-	    } else {
-		set name [$node localName]
-	    }
-	    lappend prop_req [list $ns $name]
-	}
+        set prop [$xd getElementsByTagNameNS "DAV:" "prop"]
+        # if <prop> element doesn't exist we return all properties
+        if {$prop ne ""} {
+            set xml_prop_list [$prop childNodes]
+        }
+        foreach node $xml_prop_list {
+            set ns [$node namespaceURI]
+            if {$ns eq ""} {
+                set name [$node nodeName]
+            } else {
+                set name [$node localName]
+            }
+            lappend prop_req [list $ns $name]
+        }
     }
     tdav::conn -set prop_req $prop_req
     # this should be the end of the filter.
@@ -823,20 +822,20 @@
     set ret_code 500
     set body ""
     if {[file exists $entry]} {
-	if {"unlocked" ne [tdav::check_lock $uri] } {
-	    set ret_code 423
-	    set body "Resource is locked."
-	} else {
-	    file rename -force -- $tmpfile $entry
-	    set ret_code 204
-	}
+        if {"unlocked" ne [tdav::check_lock $uri] } {
+            set ret_code 423
+            set body "Resource is locked."
+        } else {
+            file rename -force -- $tmpfile $entry
+            set ret_code 204
+        }
     } else {
         file rename -- $tmpfile $entry
-	set ret_code 201
+        set ret_code 201
     }
 
     tdav::respond [list $ret_code ""]
-    
+
 }
 
 # tdav::filter_webdav_delete
@@ -851,7 +850,7 @@
 #     right now
 
 proc tdav::filter_webdav_delete {args} {
-    # not sure there is anything we need to set here
+# not sure there is anything we need to set here
     return filter_ok
 }
 
@@ -876,27 +875,27 @@
 
     set ret_code 500
     set body ""
-    
+
     if {[file exists $entry]} {
-	# 423's and returns:
-	if {"unlocked" eq [tdav::check_lock $uri]} {
-	    file delete -force -- $entry
-	    tdav::delete_props $uri
-	    tdav::remove_lock $uri
-	    set ret_code 204
-	} else {
-	    set ret_code 423
-	    set body "Resource is locked."
-	}
+    # 423's and returns:
+        if {"unlocked" eq [tdav::check_lock $uri]} {
+            file delete -force -- $entry
+            tdav::delete_props $uri
+            tdav::remove_lock $uri
+            set ret_code 204
+        } else {
+            set ret_code 423
+            set body "Resource is locked."
+        }
     } else {
-	# file exists will fail on urls created by urlencode.  do a decode here & test
-	# ?
+    # file exists will fail on urls created by urlencode.  do a decode here & test
+    # ?
 
-	set ret_code 404
+    set ret_code 404
     }
-    
+
     tdav::respond [list $ret_code $body]
-    
+
 }
 
 # tdav::filter_webdav_mkcol
@@ -913,10 +912,10 @@
 
 proc tdav::filter_webdav_mkcol {args} {
     if {[ns_conn contentlength]} {
-	set ret_code 415
-	set html_response ""
-	tdav::respond [list 415]
-	return filter_return
+        set ret_code 415
+        set html_response ""
+        tdav::respond [list 415]
+        return filter_return
     }
     return filter_ok
 }
@@ -936,19 +935,19 @@
 proc tdav::webdav_mkcol {} {
     set uri [ns_conn url]
     regsub {^/} $uri {} uri
-    
+
     set entry [file join $::acs::pageroot $uri]
     set filename [lindex [file split $entry] end]
     regsub {/[^/]*/*$} $entry {} parent_dir
 
     if {![file exists $parent_dir]} {
-	set ret_code 409
+        set ret_code 409
     } elseif {![file exists $entry]} {
-	file mkdir $entry
-	file mkdir [file join $::acs::pageroot "../props/" $uri]
-	set ret_code 201
+        file mkdir $entry
+        file mkdir [file join $::acs::pageroot "../props/" $uri]
+        set ret_code 201
     } else {
-	set ret_code 405
+        set ret_code 405
 
     }
 
@@ -963,50 +962,50 @@
     regsub {https?://[^/]+/} $destination {/} dest
     tdav::conn -set destination $dest
     return filter_ok
-    
+
 }
 
 proc tdav::webdav_copy {} {
     set overwrite [tdav::conn overwrite]
 
     set dest [tdav::conn destination]
-   
+
     set local_dest $::acs::pageroot
     append local_dest $dest
     set newuri [string replace $local_dest 1 [string length $::acs::pageroot] ""]
     regsub {^/} $newuri {} newuri
 
     set uri [ns_conn url]
     regsub {^/} $uri {} uri
-    
+
     set entry [file join $::acs::pageroot $uri]
     set filename [lindex [file split $entry] end]
 
     regsub {^/} [ns_conn url] {} uri
     set entry [file join $::acs::pageroot $uri]
-    
+
     if {![file exists $entry]} {
-	set ret_code 404
+        set ret_code 404
     } else {
-	if {[file exists $local_dest]} {
-	    if {"unlocked" ne [tdav::check_lock $dest] } {
-		#           ns_return 423 {text/plain} {Resource is locked.}
-		set ret_code 423
-		set body "Resource is locked."
-	    } else {
-		if {[string equal -nocase $overwrite "F"]} {
-		    set ret_code 412
-		} else {
-		    set ret_code 204
-		    file copy -force -- $entry $local_dest
-		    tdav::copy_props $uri $newuri
-		}
-	    }
-	} else {
-	    set ret_code 201
-	    file copy -- $entry $local_dest
-	    tdav::copy_props $uri $newuri
-	}
+        if {[file exists $local_dest]} {
+            if {"unlocked" ne [tdav::check_lock $dest] } {
+            #           ns_return 423 {text/plain} {Resource is locked.}
+                set ret_code 423
+                set body "Resource is locked."
+            } else {
+                if {[string equal -nocase $overwrite "F"]} {
+                    set ret_code 412
+                } else {
+                    set ret_code 204
+                    file copy -force -- $entry $local_dest
+                    tdav::copy_props $uri $newuri
+                }
+            }
+        } else {
+            set ret_code 201
+            file copy -- $entry $local_dest
+            tdav::copy_props $uri $newuri
+        }
     }
     ns_return $ret_code {text/html} {}
     tdav::respond [list $ret_code]
@@ -1022,7 +1021,7 @@
 
     tdav::conn -set destination $dest
 
-return filter_ok
+    return filter_ok
 }
 
 proc tdav::webdav_move { args } {
@@ -1036,38 +1035,38 @@
 
     set uri [ns_conn url]
     regsub {^/} $uri {} uri
-    
+
     set entry [file join $::acs::pageroot $uri]
     set filename [lindex [file split $entry] end]
-    
+
     set ret_code 500
     set body {}
 
     if {![file exists $entry]} {
-	set ret_code 404
+        set ret_code 404
     } else {
-	if {"unlocked" ne [tdav::check_lock $uri] } {
-#         ns_return 423 {text/plain} {Resource is locked.}
-	    set ret_code 423
-	    set body "Resource is locked."
-	} elseif {[file exists $local_dest]} {
-	    if {[string equal -nocase $overwrite "F"]} {
-		set ret_code 412
-	    } else {
-		set ret_code 204
-		file delete -force -- $local_dest
-		file copy -force -- $entry $local_dest
-		file delete -force -- $entry
-		tdav::copy_props $uri $newuri
-		tdav::delete_props $uri
-	    }
-	} else {
-	    set ret_code 201
-	    file copy -- $entry $local_dest
-	    tdav::copy_props $uri $newuri
-	    file delete -force -- $entry
-	    tdav::delete_props $uri
-	}
+        if {"unlocked" ne [tdav::check_lock $uri] } {
+        #         ns_return 423 {text/plain} {Resource is locked.}
+            set ret_code 423
+            set body "Resource is locked."
+        } elseif {[file exists $local_dest]} {
+            if {[string equal -nocase $overwrite "F"]} {
+                set ret_code 412
+            } else {
+                set ret_code 204
+                file delete -force -- $local_dest
+                file copy -force -- $entry $local_dest
+                file delete -force -- $entry
+                tdav::copy_props $uri $newuri
+                tdav::delete_props $uri
+            }
+        } else {
+            set ret_code 201
+            file copy -- $entry $local_dest
+            tdav::copy_props $uri $newuri
+            file delete -force -- $entry
+            tdav::delete_props $uri
+        }
     }
 
     ns_return $ret_code {text/html} $body
@@ -1084,14 +1083,14 @@
     set scope [[[lindex $l 0] childNodes] nodeName]
     set type [[[lindex $l 1] childNodes] nodeName]
     if {[catch {set owner [[[lindex $l 2] childNodes] nodeValue]} err]} {
-	set owner ""
+        set owner ""
     }
     set depth [ns_set iget [ns_conn headers] Depth]
     set timeout [ns_set iget [ns_conn headers] Timeout]
     regsub {^Second-} $timeout {} timeout
     tdav::conn -set lock_timeout $timeout
-     if {$depth eq ""} {
-	set depth 0
+    if {$depth eq ""} {
+        set depth 0
     }
     tdav::conn -set depth $depth
 
@@ -1105,10 +1104,10 @@
 
 proc tdav::set_lock {uri depth type scope owner {timeout ""} {locktime ""} } {
     if {$timeout eq ""} {
-	set timeout [ns_config "ns/server/[ns_info server]/tdav" "defaultlocktimeout" "300"]
+        set timeout [ns_config "ns/server/[ns_info server]/tdav" "defaultlocktimeout" "300"]
     }
     if {$locktime eq ""} {
-	set locktime [clock format [clock seconds] -format "%T %D"]
+        set locktime [clock format [clock seconds] -format "%T %D"]
     }
     set token "opaquelocktoken:[ns_rand 2147483647]"
     set lock [list $type $scope $owner $token $timeout $depth $locktime]
@@ -1126,30 +1125,30 @@
     set entry [file join $::acs::pageroot $uri]
     set filename [lindex [file split $entry] end]
     set existing_lock_token [tdav::conn lock_token]
-#    if {![file exists $entry]} {
-#	set ret_code 404
-#    } else
+    #    if {![file exists $entry]} {
+    #	set ret_code 404
+    #    } else
     if {"unlocked" ne [tdav::check_lock $uri] } {
-	set ret_code 423
-	tdav::respond [list $ret_code]
+        set ret_code 423
+        tdav::respond [list $ret_code]
     } else {
-	set depth [tdav::conn depth]
-	set timeout [tdav::conn lock_timeout]
-	if {$timeout eq ""} {
-	    #probably make this a paramter?
-	    set timeout 180
-	}
-	if {"" ne $existing_lock_token && [file exists [tdav::get_lock_file $uri]} {
-	    
-	    set old_lock [tdav::read_lock $uri]
-	    set new_lock [list [lindex $old_lock 0] [lindex $old_lock 1] [lindex $old_lock 2] [lindex $old_lock 3] $timeout [clock format [clock seconds]]]
-	    tdav::write_lock $uri $new_lock
-	} else {
-	    set token [tdav::set_lock $uri $depth $type $scope $owner $timeout [clock format [clock seconds]]]
-	}
-	set ret_code 200
+        set depth [tdav::conn depth]
+        set timeout [tdav::conn lock_timeout]
+        if {$timeout eq ""} {
+        #probably make this a paramter?
+            set timeout 180
+        }
+        if {"" ne $existing_lock_token && [file exists [tdav::get_lock_file $uri]} {
 
-	tdav::respond [list $ret_code [list depth $depth token $token timeout $timeout owner $owner scope $scope type $type]]
+            set old_lock [tdav::read_lock $uri]
+            set new_lock [list [lindex $old_lock 0] [lindex $old_lock 1] [lindex $old_lock 2] [lindex $old_lock 3] $timeout [clock format [clock seconds]]]
+            tdav::write_lock $uri $new_lock
+        } else {
+            set token [tdav::set_lock $uri $depth $type $scope $owner $timeout [clock format [clock seconds]]]
+        }
+        set ret_code 200
+
+        tdav::respond [list $ret_code [list depth $depth token $token timeout $timeout owner $owner scope $scope type $type]]
     }
 }
 
@@ -1169,21 +1168,21 @@
     set filename [lindex [file split $entry] end]
 
     if {![file exists $entry]} {
-	set ret_code 404
-	set body {}
+        set ret_code 404
+        set body {}
     } elseif {"unlocked" ne [tdav::check_lock_for_unlock $uri] } {
-	set ret_code 423
-	set body "Resource is locked."
+        set ret_code 423
+        set body "Resource is locked."
     } else {
-	tdav::remove_lock $uri
-	set ret_code 204
-	set body ""
+        tdav::remove_lock $uri
+        set ret_code 204
+        set body ""
     }
     tdav::respond [list $ret_code $body]
 }
 
 proc tdav::filter_stuff_nsperm {args} {
-    # should be something like "Basic 29234k3j49a"
+# should be something like "Basic 29234k3j49a"
     set a [ns_set get [ns_conn headers] Authorization]
     # get the second bit, the base64 encoded bit
     set up [lindex [split $a " "] 1]
@@ -1205,18 +1204,17 @@
 proc tdav::respond { response } {
     set response_code [lindex $response 0]
     if {"423" eq $response_code} {
-	set response_body "The resource is locked"
-	set mime_type "text/plain"
+        set response_body "The resource is locked"
+        set mime_type "text/plain"
     } else {
-	set response_list [tdav::respond::[string tolower [ns_conn method]] $response]
-	set response_body [lindex $response_list 0]
-	set mime_type [lindex $response_list 1]
-	if {$mime_type eq ""} {
-	    set mime_type "text/plain"
-	}
-	if {[string match "text/xml*" $mime_type]} {
-	    set response_body [encoding convertto utf-8 $response_body]
-	}
+        set response_list [tdav::respond::[string tolower [ns_conn method]] $response]
+        lassign $response_list response_body mime_type
+        if {$mime_type eq ""} {
+            set mime_type "text/plain"
+        }
+        if {[string match "text/xml*" $mime_type]} {
+            set response_body [encoding convertto utf-8 $response_body]
+        }
     }
     ns_log debug "\n ----- tdav litmus headers ----- \n [ns_set iget [ns_conn headers] X-Litmus] \n -----\n"
     ns_log debug "\n  ----- tdav::response response_body ----- \n $response_body \n ----- end ----- \n"
@@ -1236,20 +1234,20 @@
     array set lock [lindex $response 1]
 
     set body [subst {<?xml version="1.0" encoding="utf-8"?>
-	<prop xmlns="DAV:">
-	<lockdiscovery>
-	<activelock>
-	<locktype><${lock(type)}/></locktype>
-	<lockscope><${lock(scope)}/></lockscope>
-	<depth>${lock(depth)}</depth>
-	<owner>${lock(owner)}</owner><timeout>Second-${lock(timeout)}</timeout>
-	<locktoken>
-	<href>${lock(token)}</href>
-	</locktoken>
-	</activelock>
-	</lockdiscovery>
-	</prop>}]
-    
+                     <prop xmlns="DAV:">
+                     <lockdiscovery>
+                     <activelock>
+                     <locktype><${lock(type)}/></locktype>
+                     <lockscope><${lock(scope)}/></lockscope>
+                     <depth>${lock(depth)}</depth>
+                     <owner>${lock(owner)}</owner><timeout>Second-${lock(timeout)}</timeout>
+                     <locktoken>
+                     <href>${lock(token)}</href>
+                     </locktoken>
+                     </activelock>
+                     </lockdiscovery>
+                     </prop>}]
+
     ns_set put [ns_conn outputheaders] "Lock-Token" "<${lock(token)}>"
 
     set ret_code 200
@@ -1259,7 +1257,7 @@
 }
 
 proc tdav::respond::unlock { response } {
-    # probably should be doing something here
+# probably should be doing something here
 
     set body ""
 
@@ -1274,23 +1272,23 @@
     set resp_code [lindex $response 0]
     set href ""
     set body [subst {<?xml version="1.0" encoding="utf-8" ?>
-	<D:multistatus xmlns:D="DAV:">
-	<D:response xmlns:ns0="DAV:">
-	<D:href>[ns_conn location]${href}</D:href>
+                     <D:multistatus xmlns:D="DAV:">
+                     <D:response xmlns:ns0="DAV:">
+                     <D:href>[ns_conn location]${href}</D:href>
     }]
 
     foreach res [lindex $response 1] {
-	set status [lindex $res 0]
-	set ns [lindex $res 1 0]
-	set name [lindex $res 1 1]
-	append body [subst {<D:propstat>
-	    <D:prop><$name xmlns='$ns'/></D:prop>
-	    <D:status>$status</D:status>
-	    </D:propstat>
+        set status [lindex $res 0]
+        set ns [lindex $res 1 0]
+        set name [lindex $res 1 1]
+        append body [subst {<D:propstat>
+                            <D:prop><$name xmlns='$ns'/></D:prop>
+                            <D:status>$status</D:status>
+                            </D:propstat>
         }]
     }
     append body {</D:response>
-	</D:multistatus>}
+                 </D:multistatus>}
     return [list $body {text/xml charset="utf-8"}]
 }
 
@@ -1305,173 +1303,171 @@
 proc tdav::respond::mkcol { response } {
     set body ""
     switch -- [lindex $response 0] {
-	415 {
-#	    set body "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">"
-	}
-	490 {
-#	    set body "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">"
-	}
-	201 {
-# 	    set body "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">
-# <html><head>
-# <title>201 Created</title>
-# </head><body>
-# <h1>Created</h1>
-# <p>Collection [ns_conn url] has been created.</p>
-# <hr>
-# <address></address>
-# 	</body></html>"
+        415 {
+        #	    set body "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">"
+        }
+        490 {
+            #	    set body "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">"
+        }
+        201 {
+        # 	    set body "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">
+        # <html><head>
+        # <title>201 Created</title>
+        # </head><body>
+        # <h1>Created</h1>
+        # <p>Collection [ns_conn url] has been created.</p>
+        # <hr>
+        # <address></address>
+        # 	</body></html>"
 
-	}
-	405 {
-	    	set body "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">
-<html><head>
-<title>405 Method Not Allowed</title>
-</head><body>
-<h1>Method not allowed</h1>
-</body></html>"
-	}
+        }
+        405 {
+            set body "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">
+            <html><head>
+            <title>405 Method Not Allowed</title>
+            </head><body>
+            <h1>Method not allowed</h1>
+            </body></html>"
+        }
     }
     return [list $body text/html]
 }
 
 proc tdav::respond::propfind { response } {
-    # this proc requires that all properties to be returned are in the
-    # response lindex 1
-    # we don't have to check the tdav fs props or lock properties
-    # they should already be there
+# this proc requires that all properties to be returned are in the
+# response lindex 1
+# we don't have to check the tdav fs props or lock properties
+# they should already be there
 
     set d [dom createDocumentNS "DAV:" "D:multistatus"]
     set n [$d documentElement]
     $n setAttribute "xmlns:b" "urn:uuid:c2f41010-65b3-11d1-a29f-00aa00c14882/"
     set mst_body ""
     foreach res [lindex $response 1] {
-	set href [lindex $res 0]
-	set props [lindex $res 2]
-	set r [$d createElementNS DAV: ns0:response]
-	$n appendChild $r
-	set h [$d createElement D:href]
+        lassign $res href . props
+        set r [$d createElementNS DAV: ns0:response]
+        $n appendChild $r
+        set h [$d createElement D:href]
         $h appendChild [$d createTextNode ${href}]
-	set propstat [$d createElement D:propstat]
-	set prop [$d createElement D:prop]
-	$r appendChild $h
-	$r appendChild $propstat
+        set propstat [$d createElement D:propstat]
+        set prop [$d createElement D:prop]
+        $r appendChild $h
+        $r appendChild $propstat
 
-	foreach {i j} $props {
-	    # interestingly enough, adding the namespace here to the prop is fine
-	    set name [lindex $i 1]
-	    set ns [lindex $i 0]
-	    if {"D" ne $ns && "ns0" ne $ns } {
-		# for user properties set the namespace explicitly in
-		# the tag
-		if {$ns ne ""} {
-		    set pnode [$d createElementNS $ns $name]
-		} else {
-		    set pnode [$d createElement $name]
-		}
-	    } else {
-		set pnode [$d createElement ${ns}:${name}]
-	    }
+        foreach {i j} $props {
+        # interestingly enough, adding the namespace here to the prop is fine
+            lassign $i ns name
+            if {"D" ne $ns && "ns0" ne $ns } {
+            # for user properties set the namespace explicitly in
+            # the tag
+                if {$ns ne ""} {
+                    set pnode [$d createElementNS $ns $name]
+                } else {
+                    set pnode [$d createElement $name]
+                }
+            } else {
+                set pnode [$d createElement ${ns}:${name}]
+            }
 
-	    if {"creationdate" eq $name} {
+            if {"creationdate" eq $name} {
 
-		$pnode setAttribute "b:dt" "dateTime.tz"
+                $pnode setAttribute "b:dt" "dateTime.tz"
 
             }
 
-	    if {"getlastmodified" eq $name} {
+            if {"getlastmodified" eq $name} {
 
-		$pnode setAttribute "b:dt" "dateTime.rfc1123"
+                $pnode setAttribute "b:dt" "dateTime.rfc1123"
 
-	    }
+            }
 
             if {"D:collection" eq $j} {
-		
-		$pnode appendChild [$d createElement $j]
 
-	    } else {
-		
-		$pnode appendChild [$d createTextNode $j]
+                $pnode appendChild [$d createElement $j]
 
-	    }
+            } else {
 
-	    $prop appendChild $pnode
+                $pnode appendChild [$d createTextNode $j]
 
-	}
+            }
 
-	set supportedlock [$d createElement D:supportedlock]	
-	
-	set lockentry [$d createElement D:lockentry]
-	set lockscope [$d createElement D:lockscope]
-	set exclusive [$d createElement D:exclusive]
-	set locktype [$d createElement D:locktype]
-	set write_type [$d createElement D:write]
-	
-	$supportedlock appendChild $lockentry
-	
+            $prop appendChild $pnode
+
+        }
+
+        set supportedlock [$d createElement D:supportedlock]
+
+        set lockentry [$d createElement D:lockentry]
+        set lockscope [$d createElement D:lockscope]
+        set exclusive [$d createElement D:exclusive]
+        set locktype [$d createElement D:locktype]
+        set write_type [$d createElement D:write]
+
+        $supportedlock appendChild $lockentry
+
         $locktype appendChild $write_type
-	$lockscope appendChild $exclusive
+        $lockscope appendChild $exclusive
 
-	$lockentry appendChild $lockscope
-	$lockentry appendChild $locktype
+        $lockentry appendChild $lockscope
+        $lockentry appendChild $locktype
 
-	$prop appendChild $supportedlock
+        $prop appendChild $supportedlock
 
-	set lockdiscovery [$d createElement D:lockdiscovery]
-	regsub {https?://[^/]+/} $href {/} local_uri
-	if {[file exists [tdav::get_lock_file $local_uri]]} {
-	    # check for timeout
-	    set lockinfo [tdav::read_lock $local_uri]
-	    set lock_timeout_left [tdav::lock_timeout_left [lindex $lockinfo 4] [lindex $lockinfo 6]]
-	    if {$lock_timeout_left > 0} {
+        set lockdiscovery [$d createElement D:lockdiscovery]
+        regsub {https?://[^/]+/} $href {/} local_uri
+        if {[file exists [tdav::get_lock_file $local_uri]]} {
+        # check for timeout
+            set lockinfo [tdav::read_lock $local_uri]
+            set lock_timeout_left [tdav::lock_timeout_left [lindex $lockinfo 4] [lindex $lockinfo 6]]
+            if {$lock_timeout_left > 0} {
 
-		set activelock [$d createElement D:activelock]
-		set locktype [$d createElement D:locktype]
-		set lockscope [$d createElement D:lockscope]
-		set depth [$d createElement D:depth]
-		set owner [$d createElement D:owner]
-		set timeout [$d createElement D:timeout]
-		set locktoken [$d createElement D:locktoken]
-		set locktokenhref [$d createElement D:href]
-		
-		$locktype appendChild [$d createElement D:[lindex $lockinfo 0]]
-		$lockscope appendChild [$d createElement D:[lindex $lockinfo 1]]
-		$depth appendChild [$d createTextNode [lindex $lockinfo 5]]
+                set activelock [$d createElement D:activelock]
+                set locktype [$d createElement D:locktype]
+                set lockscope [$d createElement D:lockscope]
+                set depth [$d createElement D:depth]
+                set owner [$d createElement D:owner]
+                set timeout [$d createElement D:timeout]
+                set locktoken [$d createElement D:locktoken]
+                set locktokenhref [$d createElement D:href]
 
-		$timeout appendChild [$d createTextNode Second-$lock_timeout_left]
-		$owner appendChild [$d createTextNode [lindex $lockinfo 2]]
-		$locktokenhref appendChild [$d createTextNode [lindex $lockinfo 3]]
-		$locktoken appendChild $locktokenhref
+                $locktype appendChild [$d createElement D:[lindex $lockinfo 0]]
+                $lockscope appendChild [$d createElement D:[lindex $lockinfo 1]]
+                $depth appendChild [$d createTextNode [lindex $lockinfo 5]]
 
-		$activelock appendChild $locktype
-		$activelock appendChild $lockscope
-		$activelock appendChild $depth
-		$activelock appendChild $timeout
-		$activelock appendChild $owner
-		$activelock appendChild $locktoken
+                $timeout appendChild [$d createTextNode Second-$lock_timeout_left]
+                $owner appendChild [$d createTextNode [lindex $lockinfo 2]]
+                $locktokenhref appendChild [$d createTextNode [lindex $lockinfo 3]]
+                $locktoken appendChild $locktokenhref
 
-		$lockdiscovery appendChild $activelock
-	    }
-	}
+                $activelock appendChild $locktype
+                $activelock appendChild $lockscope
+                $activelock appendChild $depth
+                $activelock appendChild $timeout
+                $activelock appendChild $owner
+                $activelock appendChild $locktoken
 
-	$prop appendChild $lockdiscovery
-	$propstat appendChild $prop	
+                $lockdiscovery appendChild $activelock
+            }
+        }
 
-	set status [$d createElement D:status]
-	set status_text [$d createTextNode "HTTP/1.1 200 OK"]
+        $prop appendChild $lockdiscovery
+        $propstat appendChild $prop
 
-	$status appendChild $status_text
-	$propstat appendChild $status
+        set status [$d createElement D:status]
+        set status_text [$d createTextNode "HTTP/1.1 200 OK"]
 
+        $status appendChild $status_text
+        $propstat appendChild $status
 
-	}
-    
 
+    }
+
+
     set body [$d asXML -escapeNonASCII]
     set body "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n${body}"
     set response [list $body {text/xml charset="utf-8"}]
     return $response
-    
+
 }
 
 proc tdav::conn {args} {
@@ -1484,44 +1480,44 @@
         set var [lindex $args 1]
     }
     switch -- $flag {
-	-set {
-	    set value [lindex $args 2]
-	    set tdav_conn($var) $value
-	    return $value
-	}
+        -set {
+            set value [lindex $args 2]
+            set tdav_conn($var) $value
+            return $value
+        }
         -get {
             if { [info exists tdav_conn($var)] } {
                 return $tdav_conn($var)
-	    } else {
-		return [ns_conn $var]
-	    }               
-	}
+            } else {
+                return [ns_conn $var]
+            }
+        }
     }
 }
 
 
 proc tdav::apply_filters {{uri "/*"} {options "OPTIONS GET HEAD POST DELETE TRACE PROPFIND PROPPATCH COPY MOVE MKCOL LOCK UNLOCK"} {enable_filesystem "f"}} {
 
-    # Verify that the options are valid options. Webdav requires
-    # support for a minimum set of options. And offers support for a
-    # limited set of options. (See RFC 2518)
+# Verify that the options are valid options. Webdav requires
+# support for a minimum set of options. And offers support for a
+# limited set of options. (See RFC 2518)
 
     set required_options [list OPTIONS PROPFIND PROPPATCH MKCOL GET HEAD POST]
     foreach required_option $required_options {
-	if {$required_option ni [string toupper $options]} {
-	    ns_log error "Required option $required_option missing from tDAV options for URI '$uri'.
-Required web dav options are: '$required_options'."
-	    return
-	}
+        if {$required_option ni [string toupper $options]} {
+            ns_log error "Required option $required_option missing from tDAV options for URI '$uri'.
+            Required web dav options are: '$required_options'."
+            return
+        }
     }
     set allowed_options [list OPTIONS COPY DELETE GET HEAD MKCOL MOVE LOCK POST PROPFIND PROPPATCH PUT TRACE UNLOCK]
     foreach option $options {
-	if {[lsearch -exact $allowed_options [string toupper $option]] < 0} {
-	    ns_log error "Option $option is not an allowed tDAV option for URI '$uri'.
-Allowed web dav options are: '$allowed_options'."
-	    return
-	}
-    }    
+        if {[lsearch -exact $allowed_options [string toupper $option]] < 0} {
+            ns_log error "Option $option is not an allowed tDAV option for URI '$uri'.
+            Allowed web dav options are: '$allowed_options'."
+            return
+        }
+    }
 
     # Register filters for selected tDAV options. Do not register a
     # filter for GET, POST or HEAD.
@@ -1530,27 +1526,27 @@
     # url matching for registered filters
     set filter_uri "[string trimright $uri /*]*"
     foreach option $options {
-	if {$option ni [list GET POST HEAD]} {
-	    ns_log debug "tDAV registering filter for $filter_uri on $option"
-	    ns_register_filter postauth [string toupper $option] "${filter_uri}" tdav::filter_webdav_[string tolower $option]
+        if {$option ni [list GET POST HEAD]} {
+            ns_log debug "tDAV registering filter for $filter_uri on $option"
+            ns_register_filter postauth [string toupper $option] "${filter_uri}" tdav::filter_webdav_[string tolower $option]
         }
     }
     ns_log notice "tDAV: Registered filters on $filter_uri"
-    
+
     # Register procedures for selected tDAV options. Do not register a
     # proc for OPTIONS, GET, POST or HEAD.
 
-    if {"true" eq $enable_filesystem} {    
-	
-	foreach option $options {
-	    if {$option ni [list OPTIONS GET POST HEAD]} {
-		ns_log debug "tDAV registering proc for $uri on $option"
-		ns_register_proc [string toupper $option] "${uri}" tdav::webdav_[string tolower $option]
-	    }
-	}
-	ns_log notice "tDAV: Registered procedures on $uri"
+    if {"true" eq $enable_filesystem} {
+
+        foreach option $options {
+            if {$option ni [list OPTIONS GET POST HEAD]} {
+                ns_log debug "tDAV registering proc for $uri on $option"
+                ns_register_proc [string toupper $option] "${uri}" tdav::webdav_[string tolower $option]
+            }
+        }
+        ns_log notice "tDAV: Registered procedures on $uri"
     } else {
-	ns_log notice "tDAV: Filesystem access by WebDAV disabled"
+        ns_log notice "tDAV: Filesystem access by WebDAV disabled"
     }
     # Store the tDAV properties in an nsv set so that the registerd
     # filters and procedures don't have to read the config file
@@ -1569,52 +1565,52 @@
 
 proc tdav::remove_user {user} {
     # no corresponding ns_perm function.
-    # ns_perm setpass 
+    # ns_perm setpass
     # ns_perm denyuser /*
     # might work
 }
 
 proc tdav::allow_user {uri user} {
     foreach {share_uri options} [nsv_array get tdav_options] {
-	if {[regexp $share_uri $uri]} {
-	    foreach option $options {
-		ns_perm allowuser [string toupper $option] ${uri} $user
-	    }
-	    break
-	}
+        if {[regexp $share_uri $uri]} {
+            foreach option $options {
+                ns_perm allowuser [string toupper $option] ${uri} $user
+            }
+            break
+        }
     }
 }
 
 proc tdav::deny_user {uri user} {
     foreach {share_uri options} [nsv_array get tdav_options] {
-	if {[regexp $share_uri $uri]} {
-	    foreach option $options {
-		ns_perm denyuser [string toupper $option] ${uri} $user
-	    }
-	    break
-	}
+        if {[regexp $share_uri $uri]} {
+            foreach option $options {
+                ns_perm denyuser [string toupper $option] ${uri} $user
+            }
+            break
+        }
     }
 }
 
 proc tdav::allow_group {uri group} {
     foreach {share_uri options} [nsv_array get tdav_options] {
-	if {[regexp $share_uri $uri]} {
-	    foreach option $options {
-		ns_perm allowgroup [string toupper $option] ${uri} $group
-	    }
-	    break
-	}
+        if {[regexp $share_uri $uri]} {
+            foreach option $options {
+                ns_perm allowgroup [string toupper $option] ${uri} $group
+            }
+            break
+        }
     }
 }
 
 proc tdav::deny_group {uri group} {
     foreach {share_uri options} [nsv_array get tdav_options] {
-	if {[regexp $share_uri $uri]} {
-	    foreach option $options {
-		ns_perm denygroup [string toupper $option] ${uri} $group
-	    }
-	    break
-	}
+        if {[regexp $share_uri $uri]} {
+            foreach option $options {
+                ns_perm denygroup [string toupper $option] ${uri} $group
+            }
+            break
+        }
     }
 }
 
@@ -1633,15 +1629,15 @@
     # The alternative is to define preauth filters on the WebDAV
     # methods and write your own code to handle authentication. This
     # is how the OpenACS implementation that uses tDAV works.
-    
-#     ns_perm adduser tdav [ns_crypt tdav salt] userfield
-#     ns_perm adduser tdav1 [ns_crypt tdav1 salt] userfield    
-#     ns_perm addgroup tdav tdav tdav1
 
+    #     ns_perm adduser tdav [ns_crypt tdav salt] userfield
+    #     ns_perm adduser tdav1 [ns_crypt tdav1 salt] userfield
+    #     ns_perm addgroup tdav tdav tdav1
+
     set tdav_shares [ns_configsection "ns/server/[ns_info server]/tdav/shares"]
     if { "" ne $tdav_shares } {
         for {set i 0} {$i < [ns_set size $tdav_shares]} {incr i} {
-            set tdav_share [ns_configsection "ns/server/[ns_info server]/tdav/share/[ns_set key $tdav_shares $i]"] 
+            set tdav_share [ns_configsection "ns/server/[ns_info server]/tdav/share/[ns_set key $tdav_shares $i]"]
             tdav::apply_filters [ns_set get $tdav_share uri] [ns_set get $tdav_share options] [ns_set get $tdav_share enablefilesystem]
             # uncomment the next line if you are using ns_perm authentication
             # tdav::allow_group [ns_set get $tdav_share uri] tdav