Index: openacs-4/packages/acs-admin/www/users/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/search.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-admin/www/users/search.tcl	4 Jun 2006 00:45:20 -0000	1.5
+++ openacs-4/packages/acs-admin/www/users/search.tcl	10 Jan 2007 21:22:00 -0000	1.6
@@ -45,27 +45,27 @@
 
 set context [list [list "./" "Users"] "Search"]
 
-if [info exists keyword] {
+if {[info exists keyword]} {
     # this is an administrator 
-    if { [empty_string_p $keyword] } {
+    if { $keyword eq "" } {
 	incr exception_count
 	append exception_text "<li>You forgot to type a search string!\n"
     }
 } else {
     # from one of the user pages
-    if { (![info exists email] || [empty_string_p $email]) && \
-	    (![info exists last_name] || [empty_string_p $last_name]) } {
+    if { (![info exists email] || $email eq "") && \
+	    (![info exists last_name] || $last_name eq "") } {
 	incr exception_count
 	append exception_text "<li>You must specify either an email address or last name to search for.\n"
     }
 
     if { [info exists email] && [info exists last_name] && \
-	    ![empty_string_p $email] && ![empty_string_p $last_name] } {
+	    $email ne "" && $last_name ne "" } {
 	incr exception_count
 	append exception_text "<li>You can only specify either email or last name, not both.\n"
     }
 
-    if { ![info exists target] || [empty_string_p $target] } {
+    if { ![info exists target] || $target eq "" } {
 	incr exception_count
 	append exception_text "<li>Target was not specified. This shouldn't have happened,
 please contact the <a href=\"mailto:[ad_host_administrator]\">administrator</a>
@@ -86,7 +86,7 @@
     set search_type "keyword"
     set sql_keyword "%[string tolower $keyword]%"
     lappend where_clause "(email like :sql_keyword or lower(first_names || ' ' || last_name) like :sql_keyword)"
-} elseif { [info exists email] && ![empty_string_p $email] } {
+} elseif { [info exists email] && $email ne "" } {
     set search_type "email"    
     set sql_email "%[string tolower $email]%"
     lappend where_clause "email like :sql_email"
@@ -141,7 +141,7 @@
     set last_name_from_search $last_name
     set email_from_search $email
     
-    if { [empty_string_p $from_user_id] } {
+    if { $from_user_id eq "" } {
 	set user_search:[set rowcount](user_id) $user_id
     } else {
 	set user_search:[set rowcount](user_id) $from_user_id
@@ -153,7 +153,7 @@
     set user_search:[set rowcount](export_vars) [export_url_vars user_id_from_search first_names_from_search last_name_from_search email_from_search]
     set user_search:[set rowcount](member_state) $member_state
     
-    if { $member_state != "approved" } {
+    if { $member_state ne "approved" } {
 	set user_search:[set rowcount](user_finite_state_links) [join [ad_registration_finite_state_machine_admin_links $member_state $email_verified_p $user_id_from_search "search?[export_url_vars email last_name keyword target passthrough limit_users_in_group_id only_authorized_p]"] " | "]
     } else {
 	set user_search:[set rowcount](user_finite_state_links) ""