Index: openacs-4/packages/acs-tcl/tcl/http-auth-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/http-auth-procs.tcl,v
diff -u -N -r1.4 -r1.4.2.1
--- openacs-4/packages/acs-tcl/tcl/http-auth-procs.tcl	7 Aug 2017 23:47:59 -0000	1.4
+++ openacs-4/packages/acs-tcl/tcl/http-auth-procs.tcl	10 Apr 2019 20:49:53 -0000	1.4.2.1
@@ -18,34 +18,34 @@
         # get the second bit, the base64 encoded bit
         set up [lindex [split $a " "] 1]
         # after decoding, it should be user:password; get the username
-	lassign [split [ns_uudecode $up] ":"] user password
+        lassign [split [ns_uudecode $up] ":"] user password
         ns_log debug "\nACS VERSION [ad_acs_version]"
         ns_log debug "\nHTTP authentication"
-	# check all authorities 
-	foreach authority [auth::authority::get_authority_options] {
-	    set authority_id [lindex $authority 1]
-        array set auth [auth::authenticate \
-                            -username $user \
-                            -password $password \
-			    -authority_id $authority_id \
-			    -no_cookie]
-	    if {$auth(auth_status) ne "ok" } {
-		array set auth [auth::authenticate \
-				    -email $user \
-				    -password $password \
-				    -authority_id $authority_id \
-				    -no_cookie]
-	    }
-	    if {$auth(auth_status) eq "ok"} {
-		# we can stop checking
-		break
-	    }
-	}
-	if {$auth(auth_status) ne "ok" } {
-	    ns_log debug "\nTDAV 5.0 auth status $auth(auth_status)"
-	    ns_returnunauthorized
-	    return 0
-	}
+        # check all authorities
+        foreach authority [auth::authority::get_authority_options] {
+            set authority_id [lindex $authority 1]
+            array set auth [auth::authenticate \
+                                -username $user \
+                                -password $password \
+                                -authority_id $authority_id \
+                                -no_cookie]
+            if {$auth(auth_status) ne "ok" } {
+                array set auth [auth::authenticate \
+                                    -email $user \
+                                    -password $password \
+                                    -authority_id $authority_id \
+                                    -no_cookie]
+            }
+            if {$auth(auth_status) eq "ok"} {
+                # we can stop checking
+                break
+            }
+        }
+        if {$auth(auth_status) ne "ok" } {
+            ns_log debug "\nTDAV 5.0 auth status $auth(auth_status)"
+            ns_returnunauthorized
+            return 0
+        }
         ns_log debug "\nTDAV: auth_check OpenACS 5.0 user_id= $auth(user_id)"
         ad_conn -set user_id $auth(user_id)
 
@@ -63,16 +63,19 @@
     Setup HTTP authentication for a URL pattern
 
     @param url_pattern Follows ns_register_filter rules for defining the
-    pattern to match.
-    @param proc Name of Tcl procedure to call to check permissions. Use this to figure out what object the URL pattern matches to. This proc should accept two named parameters user_id and url. Should return a valid Tcl true or false value. If empty the site_node matching the URL will be checked.
-    
-    @return Tcl true or false 
+                       pattern to match.
+    @param proc Name of Tcl procedure to call to check permissions. Use this to
+                figure out what object the URL pattern matches to. This proc should accept
+                two named parameters user_id and url. Should return a valid Tcl
+                true or false value. If empty the site_node matching the URL will be checked.
 
+    @return Tcl true or false
+
     @author Dave Bauer (dave@solutiongrove.com)
     @creation-date 2007-03-08
 
 } {
-    
+
     ad_register_filter preauth GET $url_pattern http_auth::authorize $proc
     ad_register_filter preauth POST $url_pattern http_auth::authorize $proc
     ad_register_filter preauth HEAD $url_pattern http_auth::authorize $proc
@@ -91,7 +94,7 @@
     set user_id [http_auth::set_user_id]
     set proc [lindex $args 0]
     if {$proc eq {}} {
-	set proc http_auth::site_node_authorize
+        set proc http_auth::site_node_authorize
     }
     return [$proc -user_id $user_id -url [ns_conn url]]
 }
@@ -105,10 +108,10 @@
 } {
     set node_id [site_node::get_element -element node_id -url $url]
     if {[permission::permission_p \
-		-party_id $user_id \
-		-privilege read \
-	     -object_id $node_id]} {
-	return filter_ok
+                -party_id $user_id \
+                -privilege read \
+             -object_id $node_id]} {
+        return filter_ok
     }
     ns_returnunauthorized
     return filter_return