Index: openacs-4/packages/acs-admin/www/users/complex-search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/complex-search.tcl,v
diff -u -r1.11.10.3 -r1.11.10.4
--- openacs-4/packages/acs-admin/www/users/complex-search.tcl	1 Oct 2013 08:09:25 -0000	1.11.10.3
+++ openacs-4/packages/acs-admin/www/users/complex-search.tcl	1 Oct 2013 08:16:47 -0000	1.11.10.4
@@ -101,21 +101,22 @@
 set where_clause [list]
 set rowcount 0
 
-if {([info exists limit_to_users_in_group_id] && $limit_to_users_in_group_id ne "") && ![regexp {[^-0-9]} $limit_to_users_in_group_id] } {
+if {$limit_to_users_in_group_id ne "" 
+    && ![regexp {[^-0-9]} $limit_to_users_in_group_id] } {
     set group_name [db_string user_group_name_from_id \
-"select group_name from groups where group_id = :limit_to_users_in_group_id"]
+			"select group_name from groups where group_id = :limit_to_users_in_group_id"]
     incr rowcount
     set criteria:[set rowcount](data) \
         "Is a member of '$group_name'"
 }
 
-if { ([info exists authority_id] && $authority_id ne "") } {
+if { $authority_id ne "" } {
     lappend where_clause "authority_id = :authority_id"
     incr rowcount
     set criteria:[set rowcount](data) "Authority is '[auth::authority::get_element -authority_id $authority_id -element pretty_name]'"
 }
 
-if { ([info exists email] && $email ne "") } {
+if { $email ne "" } {
     set sql_email "%[string tolower $email]%"
     lappend where_clause "email like :sql_email"
     incr rowcount
@@ -128,14 +129,14 @@
     set criteria:[set rowcount](data) "Creation IP is $ip"
 }
 
-if { ([info exists last_name_starts_with] && $last_name_starts_with ne "") } {
+if { $last_name_starts_with ne "" } {
     set sql_last_name_starts_with "[string tolower $last_name_starts_with]%"
     lappend where_clause "lower(last_name) like :sql_last_name_starts_with"
     incr rowcount
     set criteria:[set rowcount](data) "Last name starts with '$last_name_starts_with'"
 }
 
-if { ([info exists first_names] && $first_names ne "") } {
+if { $first_names ne "" } {
     set sql_first_names "%[string tolower $first_names]%"
     lappend where_clause "lower(first_names) like :sql_first_names"
     incr rowcount
@@ -192,18 +193,18 @@
 set criteria:rowcount $rowcount
 
 
-if { ([info exists limit_to_users_in_group_id] && $limit_to_users_in_group_id ne "") } {
-set query "select distinct first_names, last_name, email, member_state, email_verified_p, cu.user_id
-from cc_users cu, group_member_map gm
-where (cu.user_id = gm.member_id
-       and gm.group_id = :limit_to_users_in_group_id)"
+if { $limit_to_users_in_group_id ne "" } {
+    set query "select distinct first_names, last_name, email, member_state, email_verified_p, cu.user_id
+	from cc_users cu, group_member_map gm
+	where (cu.user_id = gm.member_id
+        and gm.group_id = :limit_to_users_in_group_id)"
     if {[llength $where_clause] > 0} {
         append query \
             "\n$where_conjunction [join $where_clause "\n$where_conjunction "]"
     }
 } else {
-set query "select user_id, email_verified_p, first_names, last_name, email, member_state
-from cc_users"
+    set query "select user_id, email_verified_p, first_names, last_name, email, member_state
+	from cc_users"
     if {[llength $where_clause] > 0} {
         append query "\nwhere [join $where_clause "\n$where_conjunction "]"
     }