Index: openacs-4/packages/dotlrn/tcl/class-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/class-procs.xql,v
diff -u -N -r1.17 -r1.18
--- openacs-4/packages/dotlrn/tcl/class-procs.xql 22 Nov 2017 13:22:52 -0000 1.17
+++ openacs-4/packages/dotlrn/tcl/class-procs.xql 27 Jan 2018 17:58:19 -0000 1.18
@@ -26,16 +26,6 @@
-
-
- select node_id
- from site_nodes
- where object_id = (select package_id
- from dotlrn_classes_full
- where class_key = :class_key)
-
-
-
select term_id
Index: openacs-4/packages/dotlrn/tcl/community-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs-oracle.xql,v
diff -u -N -r1.26 -r1.27
--- openacs-4/packages/dotlrn/tcl/community-procs-oracle.xql 8 Aug 2006 21:26:23 -0000 1.26
+++ openacs-4/packages/dotlrn/tcl/community-procs-oracle.xql 27 Jan 2018 17:58:19 -0000 1.27
@@ -37,21 +37,6 @@
-
-
- declare
- begin
- :1 := dotlrn_community.new(
- community_type => :community_type,
- community_key => :name
- pretty_name => :pretty_name,
- pretty_plural => :pretty_name,
- description => :description
- );
- end;
-
-
-
declare
Index: openacs-4/packages/dotlrn/tcl/community-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs-postgresql.xql,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/dotlrn/tcl/community-procs-postgresql.xql 8 Aug 2006 21:26:23 -0000 1.5
+++ openacs-4/packages/dotlrn/tcl/community-procs-postgresql.xql 27 Jan 2018 17:58:19 -0000 1.6
@@ -31,18 +31,6 @@
-
-
- select dotlrn_community__new(
- :community_type,
- :name
- :pretty_name,
- :pretty_name,
- :description
- );
-
-
-
select dotlrn_community__set_active_dates(
Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v
diff -u -N -r1.218 -r1.219
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl 8 Jan 2018 09:43:12 -0000 1.218
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl 27 Jan 2018 17:58:19 -0000 1.219
@@ -2293,7 +2293,7 @@
set var_list [lindex [callback dotlrn::member_email_var_list -community_id $community_id -to_user $to_user -type $type] 0]
array set vars $var_list
- if {![db_0or1row member_email {*SQL*}] } {
+ if {![db_0or1row member_email {}] } {
# Only use the default mail if this is set in a parameter (off by default).
Index: openacs-4/packages/dotlrn/tcl/community-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.xql,v
diff -u -N -r1.98 -r1.99
--- openacs-4/packages/dotlrn/tcl/community-procs.xql 15 Nov 2017 14:35:30 -0000 1.98
+++ openacs-4/packages/dotlrn/tcl/community-procs.xql 27 Jan 2018 17:58:19 -0000 1.99
@@ -440,27 +440,6 @@
-
-
- delete
- from dotlrn_community_applets
- where community_id = :community_id
- and applet_id = :applet_id
-
-
-
-
-
- select impl_name
- from acs_sc_impls,
- acs_sc_bindings,
- acs_sc_contracts
- where acs_sc_impls.impl_id = acs_sc_bindings.impl_id
- and acs_sc_contracts.contract_id = acs_sc_bindings.contract_id
- and acs_sc_contracts.contract_name = 'dotlrn_applet'
-
-
-
select dotlrn_applets.applet_key
@@ -471,14 +450,6 @@
-
-
- select applet_key
- from dotlrn_applets
- where active_p = 't'
-
-
-
select dotlrn_applets.applet_key
@@ -624,13 +595,4 @@
-
-
- select dst.site_master
- from dotlrn_site_templates dst, dotlrn_communities_all dca
- where dca.community_id = :community_id
- and dca.site_template_id = dst.site_template_id
-
-
-
Index: openacs-4/packages/dotlrn/tcl/dotlrn-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-callback-procs.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/dotlrn/tcl/dotlrn-callback-procs.tcl 29 Sep 2017 13:54:16 -0000 1.6
+++ openacs-4/packages/dotlrn/tcl/dotlrn-callback-procs.tcl 27 Jan 2018 17:58:19 -0000 1.7
@@ -36,7 +36,7 @@
ns_log Notice $msg
set result [list $msg]
- set from_rel_ids [db_list_of_lists get_from_rel_ids { *SQL* } ]
+ set from_rel_ids [db_list_of_lists get_from_rel_ids {} ]
foreach rel $from_rel_ids {
set l_rel_id [lindex $rel 0]
@@ -76,7 +76,7 @@
# select the communities where from_user_id belongs to and
# to_user_id does not belong.
- set from_rel_ids [db_list_of_lists get_from_rel_ids { *SQL* } ]
+ set from_rel_ids [db_list_of_lists get_from_rel_ids {} ]
foreach rel $from_rel_ids {
set l_rel_id [lindex $rel 0]
@@ -175,7 +175,7 @@
} {
- db_1row get_community_id { }
+ db_1row get_community_id {}
dotlrn_privacy::set_user_guest_p -user_id $party_id -value "t"
Index: openacs-4/packages/dotlrn/tcl/dotlrn-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/Attic/dotlrn-procs-oracle.xql,v
diff -u -N
--- openacs-4/packages/dotlrn/tcl/dotlrn-procs-oracle.xql 8 Aug 2006 21:26:23 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-
-
-
- oracle8.1.6
-
-
-
- begin acs_rel_type.create_role(
- role => :role,
- pretty_name => :pretty_name,
- pretty_plural => :pretty_plural
- ); end;
-
-
-
-
-
- begin acs_rel_type.create_role(
- role => :role,
- pretty_name => :pretty_name,
- pretty_plural => :pretty_plural
- ); end;
-
-
-
-
Index: openacs-4/packages/dotlrn/tcl/dotlrn-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/Attic/dotlrn-procs-postgresql.xql,v
diff -u -N
--- openacs-4/packages/dotlrn/tcl/dotlrn-procs-postgresql.xql 8 Aug 2006 21:26:23 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-
-
-
- postgresql7.1
-
-
-
- select acs_rel_type__create_role(
- :role_key,
- :pretty_name,
- :pretty_plural
- )
-
-
-
-
-
- select acs_rel_type__create_role(
- :role_key,
- :pretty_name,
- :pretty_plural
- )
-
-
-
-
Index: openacs-4/packages/dotlrn/www/communities-chunk-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/communities-chunk-postgresql.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/communities-chunk-postgresql.xql 8 Aug 2002 13:34:30 -0000 1.2
+++ openacs-4/packages/dotlrn/www/communities-chunk-postgresql.xql 27 Jan 2018 17:58:19 -0000 1.3
@@ -10,35 +10,6 @@
-
-
- select dotlrn_communities.community_id,
- dotlrn_communities.community_type,
- dotlrn_communities.pretty_name,
- dotlrn_communities.description,
- dotlrn_communities.package_id,
- dotlrn_community__url(dotlrn_communities.community_id) as url,
- 1 as member_p,
- CASE
- WHEN acs_permission__permission_p(:user_id,
- dotlrn_communities.community_id,
- 'admin') = 'f'
- THEN 0
- ELSE 1
- END as admin_p,
- (select dotlrn_community_types.community_type
- from dotlrn_community_types
- where dotlrn_community_types.tree_sortkey = tree_ancestor_key(dotlrn_communities.tree_sortkey, 1)) as root_community_type
- from dotlrn_active_communities dotlrn_communities,
- dotlrn_member_rels_approved
- where dotlrn_member_rels_approved.user_id = :user_id
- and dotlrn_member_rels_approved.community_id = dotlrn_communities.community_id
- order by root_community_type,
- dotlrn_communities.community_type,
- dotlrn_communities.pretty_name
-
-
-
select dotlrn_communities.community_id,
Index: openacs-4/packages/dotlrn/www/community-edit-2.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-edit-2.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/community-edit-2.xql 13 Jan 2005 13:57:21 -0000 1.2
+++ openacs-4/packages/dotlrn/www/community-edit-2.xql 27 Jan 2018 17:58:19 -0000 1.3
@@ -2,15 +2,6 @@
-
-
- select item_id
- from cr_items
- where parent_id = :parent_id
- and name = :logo_name
-
-
-
select c_root_folder_id
Index: openacs-4/packages/dotlrn/www/community-edit.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/community-edit.xql,v
diff -u -N
--- openacs-4/packages/dotlrn/www/community-edit.xql 29 Jul 2004 05:27:36 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- select
- community_type,
- community_type
- from
- dotlrn_community_types
- order by
- community_type
-
-
-
-
Index: openacs-4/packages/dotlrn/www/community-member-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/community-member-oracle.xql,v
diff -u -N
--- openacs-4/packages/dotlrn/www/community-member-oracle.xql 15 Jul 2002 20:12:46 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-
-
-
- oracle8.1.6
-
-
-
- select acs_object_types.pretty_name,
- acs_object_types.pretty_plural,
- acs_objects.creation_date,
- acs_object.name(acs_objects.object_id) object_name
- from acs_objects,
- acs_object_types
- where acs_objects.creation_user = :user_id
- and acs_objects.object_type in ('acs_message')
- and acs_objects.object_type = acs_object_types.object_type
- order by object_name,
- creation_date
-
-
-
-
Index: openacs-4/packages/dotlrn/www/community-member-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/community-member-postgresql.xql,v
diff -u -N
--- openacs-4/packages/dotlrn/www/community-member-postgresql.xql 15 Jul 2002 20:12:46 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-
-
-
- postgresql7.1
-
-
-
- select acs_object_types.pretty_name,
- acs_object_types.pretty_plural,
- acs_objects.creation_date,
- acs_object__name(acs_objects.object_id) as object_name
- from acs_objects,
- acs_object_types
- where acs_objects.creation_user = :user_id
- and acs_objects.object_type in ('acs_message')
- and acs_objects.object_type = acs_object_types.object_type
- order by object_name,
- creation_date
-
-
-
-
Index: openacs-4/packages/dotlrn/www/community-member.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-member.tcl,v
diff -u -N -r1.22 -r1.23
--- openacs-4/packages/dotlrn/www/community-member.tcl 19 Jan 2018 14:38:45 -0000 1.22
+++ openacs-4/packages/dotlrn/www/community-member.tcl 27 Jan 2018 17:58:19 -0000 1.23
@@ -42,7 +42,6 @@
bio:onevalue
verified_user_id:onevalue
folder_id:onevalue
- user_contributions:multirow
}
if {[dotlrn_community::get_community_id] != $community_id} {
@@ -83,8 +82,9 @@
and cr.revision_id = c.live_revision}]
if { $portrait_p } {
- set img_src [export_vars -base "[subsite::get_element -element url]shared/portrait-bits.tcl" { user_id item_id {size thumbnail}}]
- set portrait_url [export_vars -base "[subsite::get_element -element url]shared/portrait" { user_id return_url }]
+ set url [subsite::get_element -element url]
+ set img_src [export_vars -base "${url}shared/portrait-bits.tcl" { user_id item_id {size thumbnail} }]
+ set portrait_url [export_vars -base "${url}shared/portrait" { user_id return_url }]
}
ad_return_template
Index: openacs-4/packages/dotlrn/www/member-email-toggle.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-email-toggle.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/member-email-toggle.tcl 19 Jan 2018 14:38:45 -0000 1.4
+++ openacs-4/packages/dotlrn/www/member-email-toggle.tcl 27 Jan 2018 17:58:19 -0000 1.5
@@ -17,7 +17,7 @@
set community_id [dotlrn_community::get_community_id]
-db_dml toggle_member_email { }
+db_dml toggle_member_email {}
ad_returnredirect "one-community-admin"
ad_script_abort
Index: openacs-4/packages/dotlrn/www/member-email.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-email.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/member-email.tcl 7 Aug 2017 23:48:09 -0000 1.4
+++ openacs-4/packages/dotlrn/www/member-email.tcl 27 Jan 2018 17:58:19 -0000 1.5
@@ -18,7 +18,7 @@
set community_id [dotlrn_community::get_community_id]
dotlrn::require_user_admin_community -community_id $community_id
-db_0or1row member_email { }
+db_0or1row member_email {}
ad_form -name "member_email" -form {
{email_id:key}
@@ -36,17 +36,17 @@
} -new_data {
- db_dml new_email { }
+ db_dml new_email {}
} -edit_request {
- db_1row member_email_values { }
+ db_1row member_email_values {}
set email [list $email ""]
} -edit_data {
- db_dml update_email { }
+ db_dml update_email {}
} -after_submit {
Index: openacs-4/packages/dotlrn/www/spam.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam.xql,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/spam.xql 24 Jul 2004 08:34:10 -0000 1.8
+++ openacs-4/packages/dotlrn/www/spam.xql 27 Jan 2018 17:58:19 -0000 1.9
@@ -14,13 +14,4 @@
-
-
- select rel_segments.segment_id
- from rel_segments
- where rel_segments.group_id = :community_id
- and rel_segments.rel_type in (:rel_types_str)
-
-
-
Index: openacs-4/packages/dotlrn/www/admin/add-edit-site-template.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/add-edit-site-template.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/admin/add-edit-site-template.tcl 7 Aug 2017 23:48:09 -0000 1.4
+++ openacs-4/packages/dotlrn/www/admin/add-edit-site-template.tcl 27 Jan 2018 17:58:19 -0000 1.5
@@ -30,7 +30,7 @@
set context_bar [list [list site-templates "[_ dotlrn.Site_Templates]"] "$title"]
-set options [db_list_of_lists select_portal_themes { *SQL* }]
+set options [db_list_of_lists select_portal_themes {}]
ad_form -cancel_url $referer -export {referer} -name site_template -form {
site_template_id:key
{pretty_name:text(text)
@@ -50,9 +50,9 @@
}
} -select_query_name select_site_template_info -new_data {
set site_template_id [db_nextval acs_object_id_seq]
- db_dml insert_site_template { *SQL* }
+ db_dml insert_site_template {}
} -edit_data {
- db_dml update_site_template { *SQL* }
+ db_dml update_site_template {}
util_memoize_flush [list dotlrn::get_master_from_site_template_id_not_cached -site_template_id $site_template_id]
} -new_request {
set pretty_name ""
Index: openacs-4/packages/dotlrn/www/admin/club-new.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/club-new.xql,v
diff -u -N
--- openacs-4/packages/dotlrn/www/admin/club-new.xql 15 Apr 2005 16:50:10 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- select
- community_type,
- community_type
- from
- dotlrn_community_types
- order by
- dotlrn_community_types.community_type
-
-
-
-
Index: openacs-4/packages/dotlrn/www/admin/community-type.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/community-type.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/admin/community-type.tcl 7 Aug 2017 23:48:09 -0000 1.3
+++ openacs-4/packages/dotlrn/www/admin/community-type.tcl 27 Jan 2018 17:58:19 -0000 1.4
@@ -51,7 +51,7 @@
}
} -on_request {
if { $edit_p } {
- db_1row get_community_type { *SQL* }
+ db_1row get_community_type {}
}
} -on_submit {
if { ![info exists original_community_type] } {
@@ -61,7 +61,7 @@
-pretty_name $pretty_name
} else {
# Update type
- db_dml set_community_type { *SQL* }
+ db_dml set_community_type {}
}
} -after_submit {
ad_returnredirect "community-types"
Index: openacs-4/packages/dotlrn/www/admin/user-edit.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/user-edit.xql,v
diff -u -N
--- openacs-4/packages/dotlrn/www/admin/user-edit.xql 25 Apr 2002 21:10:46 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-
-
-
-
-
-
- update dotlrn_user_profile_rels
- set id = :id
- where rel_id = (select rel_id
- from dotlrn_users
- where user_id = :user_id)
-
-
-
-
Index: openacs-4/packages/dotlrn/www/admin/user-nuke-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/user-nuke-oracle.xql,v
diff -u -N
--- openacs-4/packages/dotlrn/www/admin/user-nuke-oracle.xql 6 Oct 2003 13:21:53 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-
-
-
- oracle8.1.6
-
-
-
- begin
- acs.remove_user(:user_id);
- end;
-
-
-
-
Index: openacs-4/packages/dotlrn/www/admin/user-nuke-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/user-nuke-postgresql.xql,v
diff -u -N
--- openacs-4/packages/dotlrn/www/admin/user-nuke-postgresql.xql 6 Oct 2003 13:21:53 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-
-
-
- postgresql7.1
-
-
-
- select acs__remove_user(:user_id);
-
-
-
-