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.6 -r1.7 --- openacs-4/packages/acs-admin/www/users/complex-search.tcl 6 Sep 2002 21:49:53 -0000 1.6 +++ openacs-4/packages/acs-admin/www/users/complex-search.tcl 16 Jan 2003 13:28:06 -0000 1.7 @@ -29,6 +29,7 @@ @author Mark Thomas (mthomas@arsdigita.com) } { {email ""} + {ip ""} {last_name_starts_with ""} {first_names ""} keyword:optional @@ -114,6 +115,12 @@ set criteria:[set rowcount](data) "Email contains '$email'" } +if { [exists_and_not_null ip] } { + lappend where_clause "creation_ip = :ip" + incr rowcount + set criteria:[set rowcount](data) "Creation IP is $ip" +} + if { [exists_and_not_null last_name_starts_with] } { set sql_last_name_starts_with "[string tolower $last_name_starts_with]%" lappend where_clause "lower(last_name) like :sql_last_name_starts_with" @@ -217,7 +224,7 @@ set user_search:[set rowcount](member_state) $member_state if { $member_state != "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]"] " | "] + 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 "complex-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) "" }