Fisheye: Tag 1.1.2.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-kernel/sql/oracle/upgrade/updgrade-5.0.0b2-5.0.0b3.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.0.0b2-5.0.0b3.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql,v diff -u -r1.16 -r1.16.2.1 --- openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql 18 Sep 2003 17:11:37 -0000 1.16 +++ openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql 21 Nov 2003 22:09:22 -0000 1.16.2.1 @@ -255,6 +255,8 @@ url varchar(200) ); +create index parties_email_lower_idx on parties(lower(email)); + comment on table parties is ' Party is the supertype of person and organization. It exists because many other types of object can have relationships to parties. @@ -524,6 +526,9 @@ unique (authority_id, username) ); +create index users_username_lower_idx on users(lower(username)); +create index users_screenname_lower_idx on users(lower(screen_name)); + create table user_preferences ( user_id integer constraint user_prefs_user_id_fk references users (user_id) Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.0.0b2-5.0.0b3.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-tcl/tcl/admin-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/admin-procs.tcl,v diff -u -r1.13 -r1.13.2.1 --- openacs-4/packages/acs-tcl/tcl/admin-procs.tcl 3 Oct 2003 09:21:39 -0000 1.13 +++ openacs-4/packages/acs-tcl/tcl/admin-procs.tcl 21 Nov 2003 22:09:22 -0000 1.13.2.1 @@ -268,12 +268,12 @@ } "last_name_starts_with" { - lappend where_clauses "upper(users.last_name) like upper([ns_dbquotevalue "${last_name_starts_with}%"])" + lappend where_clauses "lower(users.last_name) like lower([ns_dbquotevalue "${last_name_starts_with}%"])" # note the added percent sign here } "email_starts_with" { - lappend where_clauses "upper(users.email) like upper([ns_dbquotevalue "${email_starts_with}%"])" + lappend where_clauses "lower(users.email) like lower([ns_dbquotevalue "${email_starts_with}%"])" # note the added percent sign here } Index: openacs-4/packages/acs-tcl/tcl/community-core-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/community-core-procs-oracle.xql,v diff -u -r1.15 -r1.15.2.1 --- openacs-4/packages/acs-tcl/tcl/community-core-procs-oracle.xql 1 Nov 2003 10:46:32 -0000 1.15 +++ openacs-4/packages/acs-tcl/tcl/community-core-procs-oracle.xql 21 Nov 2003 22:09:22 -0000 1.15.2.1 @@ -50,10 +50,10 @@ select distinct u.first_names || ' ' || u.last_name || ' (' || u.email || ')' as name, u.user_id from cc_users u - where upper(nvl(u.first_names || ' ', '') || + where lower(nvl(u.first_names || ' ', '') || nvl(u.last_name || ' ', '') || u.email || ' ' || - nvl(u.screen_name, '')) like upper('%'||:value||'%') + nvl(u.screen_name, '')) like lower('%'||:value||'%') order by name @@ -126,7 +126,7 @@ creation_ip from cc_users where authority_id = :authority_id - and upper(username) = upper(:username) + and lower(username) = lower(:username) Index: openacs-4/packages/acs-tcl/tcl/community-core-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/community-core-procs-postgresql.xql,v diff -u -r1.17 -r1.17.2.1 --- openacs-4/packages/acs-tcl/tcl/community-core-procs-postgresql.xql 1 Nov 2003 10:46:32 -0000 1.17 +++ openacs-4/packages/acs-tcl/tcl/community-core-procs-postgresql.xql 21 Nov 2003 22:09:22 -0000 1.17.2.1 @@ -46,10 +46,10 @@ select distinct u.first_names || ' ' || u.last_name || ' (' || u.email || ')' as name, u.user_id from cc_users u - where upper(coalesce(u.first_names || ' ', '') || + where lower(coalesce(u.first_names || ' ', '') || coalesce(u.last_name || ' ', '') || u.email || ' ' || - coalesce(u.screen_name, '')) like upper('%'||:value||'%') + coalesce(u.screen_name, '')) like lower('%'||:value||'%') order by name @@ -122,7 +122,7 @@ creation_ip from cc_users where authority_id = :authority_id - and upper(username) = upper(:username) + and lower(username) = lower(:username) Index: openacs-4/packages/acs-tcl/tcl/community-core-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/community-core-procs.tcl,v diff -u -r1.39 -r1.39.2.1 --- openacs-4/packages/acs-tcl/tcl/community-core-procs.tcl 1 Nov 2003 10:46:32 -0000 1.39 +++ openacs-4/packages/acs-tcl/tcl/community-core-procs.tcl 21 Nov 2003 22:09:22 -0000 1.39.2.1 @@ -13,9 +13,7 @@ namespace eval acs_user {} ad_proc -private cc_lookup_screen_name_user { screen_name } { - return [db_string user_select { - select user_id from cc_users where upper(screen_name) = upper(:screen_name) - } -default ""] + return [db_string user_select {*SQL*} -default {}] } ad_proc cc_screen_name_user { screen_name } { @@ -30,17 +28,13 @@ ad_proc -private cc_lookup_email_user { email } { Return the user_id of a user given the email. Returns the empty string if no such user exists. } { - return [db_string user_select { - select user_id from cc_users where email = lower(:email) - } -default ""] + return [db_string user_select {*SQL*} -default {}] } ad_proc -public cc_email_from_party { party_id } { @return The email address of the indicated party. } { - return [db_string email_from_party { - select email from parties where party_id = :party_id - } -default ""] + return [db_string email_from_party {*SQL*} -default {}] } ad_proc cc_email_user { email } { @@ -53,9 +47,7 @@ } ad_proc -private cc_lookup_name_group { name } { - return [db_string group_select { - select group_id from groups where group_name = :name - } -default ""] + return [db_string group_select {*SQL*} -default {}] } ad_proc cc_name_to_group { name } { @@ -123,12 +115,7 @@ set user_id [db_exec_plsql user_insert {}] # set password_question, password_answer - db_dml update_question_answer { - update users - set password_question = :password_question, - password_answer = :password_answer - where user_id = :user_id - } + db_dml update_question_answer {*SQL*} if {[catch { # Call the extension @@ -318,11 +305,7 @@ } { Change the membership state of a user. } { - set rel_id [db_string select_rel_id { - select rel_id - from cc_users - where user_id = :user_id - } -default ""] + set rel_id [db_string select_rel_id {*SQL*} -default {}] if {[empty_string_p $rel_id]} { return @@ -479,7 +462,7 @@ @author Peter Marklund } { - db_1row select_user_info {} -column_array row + db_1row select_user_info {*SQL*} -column_array row return [array get row] } @@ -490,7 +473,7 @@ @author Peter Marklund } { - db_1row select_user_info {} -column_array row + db_1row select_user_info {*SQL*} -column_array row return [array get row] } @@ -584,9 +567,7 @@ Returns the user_id from a screen_name, or empty string if no user found. Searches all users, including banned, deleted, unapproved, etc. } { - return [db_string select_user_id_by_screen_name { - select user_id from users where screen_name = :screen_name - } -default {}] + return [db_string select_user_id_by_screen_name {*SQL*} -default {}] } @@ -606,8 +587,8 @@ } return [permission::permission_p -party_id $user_id \ - -object_id [acs_lookup_magic_object security_context_root] \ - -privilege "admin"] + -object_id [acs_lookup_magic_object security_context_root] \ + -privilege "admin"] } @@ -657,6 +638,6 @@ @return party_id } { - return [db_string select_party_id {} -default {}] + return [db_string select_party_id {*SQL*} -default {}] } Index: openacs-4/packages/acs-tcl/tcl/community-core-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/community-core-procs.xql,v diff -u -r1.11 -r1.11.2.1 --- openacs-4/packages/acs-tcl/tcl/community-core-procs.xql 3 Oct 2003 13:12:43 -0000 1.11 +++ openacs-4/packages/acs-tcl/tcl/community-core-procs.xql 21 Nov 2003 22:09:22 -0000 1.11.2.1 @@ -4,17 +4,25 @@ - select user_id from cc_users where upper(screen_name) = upper(:screen_name) + select user_id from cc_users where lower(screen_name) = lower(:screen_name) + + + + select user_id from cc_users where lower(email) = lower(:email) + + + + - + select email from parties where party_id = :party_id - + @@ -112,7 +120,7 @@ select user_id from users - where upper(username) = upper(:username) + where lower(username) = lower(:username) and authority_id =:authority_id @@ -138,4 +146,44 @@ + + + + + select party_id + from parties + where lower(email) = lower(:email) + + + + + + + + select user_id from users where lower(screen_name) = lower(:screen_name) + + + + + + + + select rel_id + from cc_users + where user_id = :user_id + + + + + + + + update users + set password_question = :password_question, + password_answer = :password_answer + where user_id = :user_id + + + +