Index: openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl,v diff -u -r1.87.4.3 -r1.87.4.4 --- openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl 30 Sep 2013 18:26:48 -0000 1.87.4.3 +++ openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl 2 Oct 2013 08:01:34 -0000 1.87.4.4 @@ -767,10 +767,10 @@ array set element_info [auth::get_registration_elements] - if { [lsearch $element_info(required) password] != -1 } { + if {"password" in $element_info(required)} { lappend element_info(required) password_confirm } - if { [lsearch $element_info(optional) password] != -1 } { + if {"password" in $element_info(optional)} { lappend element_info(optional) password_confirm } 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.8.1 -r1.28.8.2 --- openacs-4/packages/acs-authentication/tcl/authority-procs.tcl 30 Sep 2013 18:26:48 -0000 1.28.8.1 +++ openacs-4/packages/acs-authentication/tcl/authority-procs.tcl 2 Oct 2013 08:01:35 -0000 1.28.8.2 @@ -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) @@ -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"} { Index: openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl,v diff -u -r1.41.2.5 -r1.41.2.6 --- openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl 1 Oct 2013 07:40:20 -0000 1.41.2.5 +++ openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl 2 Oct 2013 08:03:14 -0000 1.41.2.6 @@ -347,7 +347,7 @@ set arg [string range $arg 1 end] lappend switches $arg - if { [lsearch $arg_flags "boolean"] >= 0 } { + if {"boolean" in $arg_flags} { set default_values(${arg}_p) 0 append switch_code " -$arg - -$arg=1 - -$arg=t - -$arg=true { ::uplevel ::set ${arg}_p 1 @@ -365,7 +365,7 @@ append switch_code " }\n" } - if { [lsearch $arg_flags "required"] >= 0 } { + if {"required" in $arg_flags} { append check_code " ::if { !\[::uplevel ::info exists $arg\] } { ::return -code error \"Required switch -$arg not provided\" } @@ -948,7 +948,7 @@ } { upvar $arg_name arg_value - if { [lsearch -exact $allowed_values_list $arg_value] == -1 } { + if {$arg_value ni $allowed_values_list} { error "argument $arg_name has value $arg_value but must be in ([join $allowed_values_list ", "])" }