Index: openacs-4/packages/acs-subsite/www/admin/users/new-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/users/new-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/www/admin/users/new-oracle.xql 15 May 2001 16:59:01 -0000 1.1 +++ openacs-4/packages/acs-subsite/www/admin/users/new-oracle.xql 28 May 2018 18:23:19 -0000 1.2 @@ -17,20 +17,7 @@ - - - - - select case when exists - (select 1 from users where user_id = :user_id) - then 1 else 0 end - from dual - - - - - select rowid from users where user_id = :user_id Index: openacs-4/packages/acs-subsite/www/admin/users/new-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/users/new-postgresql.xql,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/acs-subsite/www/admin/users/new-postgresql.xql 10 Sep 2002 11:00:36 -0000 1.5 +++ openacs-4/packages/acs-subsite/www/admin/users/new-postgresql.xql 28 May 2018 18:23:19 -0000 1.6 @@ -18,20 +18,7 @@ - - - - - select case when exists - (select 1 from users where user_id = :user_id) - then 1 else 0 end - - - - - - select oid as rowid from users where user_id = :user_id Index: openacs-4/packages/acs-subsite/www/admin/users/new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/users/new.tcl,v diff -u -N -r1.20 -r1.21 --- openacs-4/packages/acs-subsite/www/admin/users/new.tcl 21 Jan 2018 00:35:29 -0000 1.20 +++ openacs-4/packages/acs-subsite/www/admin/users/new.tcl 28 May 2018 18:23:19 -0000 1.21 @@ -51,15 +51,12 @@ set rel_member_state "" } -# Select out the user name and the user's object type. Note we can -# use 1row because the validate filter above will catch missing parties +# Select out the user name and the user's object type. The validate +# filter above will catch missing parties -db_1row select_type_info { - select t.pretty_name as user_type_pretty_name, - t.table_name - from acs_object_types t - where t.object_type = :user_type -} +acs_object_type::get -object_type $user_type -array object_type +set user_type_pretty_name $object_type(pretty_name) +set table_name $object_type(table_name) ## ISSUE / TO DO: (see also admin/groups/new.tcl) ## @@ -226,11 +223,8 @@ if {[parameter::get -parameter NotifyAdminOfNewRegistrationsP -default 0]} { set creation_user [ad_conn user_id] - set creation_name [db_string creation_name_query { - select p.first_names || ' ' || p.last_name || ' (' || pa.email || ')' - from persons p, parties pa - where p.person_id = pa.party_id and p.person_id = :creation_user - }] + set user [acs_user::get -user_id $creation_user] + set creation_name "[dict get $user name] ([dict get $user email])" # we're supposed to notify the administrator when someone new registers Index: openacs-4/packages/acs-subsite/www/admin/users/new.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/users/Attic/new.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/www/admin/users/new.xql 15 May 2001 16:59:01 -0000 1.1 +++ openacs-4/packages/acs-subsite/www/admin/users/new.xql 28 May 2018 18:23:19 -0000 1.2 @@ -1,40 +1,10 @@ - - - - select group_name as add_to_group_name, - join_policy as add_to_group_join_policy - from groups - where group_id = :add_to_group_id - - - - + + + select count(*) from users where user_id = :user_id + + - - - - select t.pretty_name as user_type_pretty_name, - t.table_name - from acs_object_types t - where t.object_type = :user_type - - - - - - - - - select p.first_names || ' ' || p.last_name - || ' (' || pa.email || ')' - from persons p, parties pa - where p.person_id = pa.party_id and p.person_id = :creation_user - - - - -