Index: openacs-4/packages/acs-authentication/tcl/authority-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/authority-procs.tcl,v diff -u -r1.28 -r1.29 --- openacs-4/packages/acs-authentication/tcl/authority-procs.tcl 6 Apr 2009 20:13:15 -0000 1.28 +++ openacs-4/packages/acs-authentication/tcl/authority-procs.tcl 27 Oct 2014 16:39:01 -0000 1.29 @@ -84,7 +84,7 @@ # Check that the columns provided in the array are all valid # Set array entries as local variables foreach name $names { - if { [lsearch -exact $all_columns $name] == -1 } { + if {$name ni $all_columns} { error "Attribute '$name' isn't valid for auth_authorities." } set $name $row($name) @@ -104,15 +104,15 @@ } } - if { ![exists_and_not_null context_id] } { + if { ![info exists context_id] || $context_id eq "" } { set context_id [ad_conn package_id] } - if { ![exists_and_not_null creation_user] } { + if { ![info exists creation_user] || $creation_user eq "" } { set creation_user [ad_conn user_id] } - if { ![exists_and_not_null creation_ip] } { + if { ![info exists creation_ip] || $creation_ip eq "" } { set creation_ip [ad_conn peeraddr] } @@ -151,7 +151,7 @@ } # Flush the cache, so that if we've tried to request this short_name while it didn't exist, we will now find it - if { [exists_and_not_null row(short_name)] } { + if { [info exists row(short_name)] && $row(short_name) ne "" } { get_id_flush -short_name $row(short_name) } @@ -248,7 +248,7 @@ # Check that the columns provided in the array are all valid # Set array entries as local variables foreach name $names { - if { [lsearch -exact $columns $name] == -1 } { + if {$name ni $columns} { error "Attribute '$name' isn't valid for auth_authorities." } if {$name eq "authority_id"} { @@ -361,7 +361,7 @@ if { $ack_file_name ne "" } { # Interpolate set pairs [list \ - acs_root_dir [acs_root_dir] \ + acs_root_dir $::acs::rootdir \ ansi_date [clock format [clock seconds] -format %Y-%m-%d] \ authority $authority(short_name)] foreach { var value } $pairs {