Index: openacs-4/packages/download/download.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/download.info,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/download/download.info 12 Sep 2013 10:26:11 -0000 1.12
+++ openacs-4/packages/download/download.info 18 Sep 2013 15:23:40 -0000 1.13
@@ -7,7 +7,7 @@
f
f
-
+
oracle
postgresql
@@ -19,10 +19,9 @@
OpenACS
Intended to support downloads of versioned software and packages. UI needs work.
-
+
-
Index: openacs-4/packages/download/www/admin/approve-or-reject-2-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/approve-or-reject-2-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/download/www/admin/approve-or-reject-2-oracle.xql 24 Aug 2001 14:44:08 -0000 1.2
+++ openacs-4/packages/download/www/admin/approve-or-reject-2-oracle.xql 18 Sep 2013 15:23:40 -0000 1.3
@@ -16,21 +16,4 @@
-
-
-
-
- begin
- :1 := acs_mail_nt.post_request(
- party_from => :user_id,
- party_to => :creation_user,
- expand_group => 'f',
- subject => :subject,
- message => :body);
- end;
-
-
-
-
-
Index: openacs-4/packages/download/www/admin/approve-or-reject-2-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/approve-or-reject-2-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/download/www/admin/approve-or-reject-2-postgresql.xql 24 Aug 2001 14:44:08 -0000 1.3
+++ openacs-4/packages/download/www/admin/approve-or-reject-2-postgresql.xql 18 Sep 2013 15:23:40 -0000 1.4
@@ -16,27 +16,4 @@
-
-
-
-
- declare
- v_id integer;
- begin
- v_id := acs_mail_nt__post_request(
- :user_id, -- p_party_from
- :creation_user, -- p_party_to
- 'f', -- p_expand_group
- :subject, -- p_subject
- :message, -- p_message
- 0 -- p_max_retries
- );
-
- return v_id;
- end;
-
-
-
-
-
Index: openacs-4/packages/download/www/admin/approve-or-reject-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/approve-or-reject-2.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/download/www/admin/approve-or-reject-2.tcl 12 Sep 2013 10:26:12 -0000 1.6
+++ openacs-4/packages/download/www/admin/approve-or-reject-2.tcl 18 Sep 2013 15:23:40 -0000 1.7
@@ -59,21 +59,10 @@
# them know it's approved (or rejected).
# This is the email address of the user who submitted the version.
- db_1row creation_email_select {
- select da.archive_name,
- dar.creation_user,
- dar.version_name
- from download_arch_revisions_obj dar, download_archives_obj da
- where da.archive_id = dar.archive_id and dar.revision_id = :revision_id
- }
+ db_1row creation_email_select { *SQL* }
# This is the email address and name of the user who approved (or rejected) the version
- db_1row approving_user_select {
- select email as approving_email,
- first_names || ' ' || last_name as approving_name
- from cc_users
- where user_id = :user_id
- }
+ db_1row approving_user_select { *SQL* }
set body "
Your posting to [ad_system_name] $repository_info(title): $archive_name $version_name
@@ -84,14 +73,7 @@
set subject "$repository_info(title): $archive_name $version_name $approval_status: "
- db_exec_plsql sendmail {
- begin
- :1 := acs_mail_nt.post_request(
- party_from => :user_id,
- party_to => :creation_user,
- expand_group => 'f',
- subject => :subject,
- message => :body);
- end;
- }
+ acs_mail_lite::send -to_addr $creation_email -from_addr $approving_email \
+ -subject $subject -body $body
+
}
Index: openacs-4/packages/download/www/admin/approve-or-reject-2.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/approve-or-reject-2.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/admin/approve-or-reject-2.xql 10 May 2001 20:51:30 -0000 1.1
+++ openacs-4/packages/download/www/admin/approve-or-reject-2.xql 18 Sep 2013 15:23:40 -0000 1.2
@@ -6,9 +6,11 @@
select da.archive_name,
dar.creation_user,
- dar.version_name
- from download_arch_revisions_obj dar, download_archives_obj da
+ dar.version_name,
+ u.email as creation_email
+ from download_arch_revisions_obj dar, download_archives_obj da, cc_users u
where da.archive_id = dar.archive_id and dar.revision_id = :revision_id
+ and u.user_id = dar.creation_user
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/download/www/admin/spam-users-2-oracle.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/packages/download/www/admin/spam-users-2-postgresql.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/download/www/admin/spam-users-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/spam-users-2.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/download/www/admin/spam-users-2.tcl 12 Sep 2013 10:26:13 -0000 1.7
+++ openacs-4/packages/download/www/admin/spam-users-2.tcl 18 Sep 2013 15:23:40 -0000 1.8
@@ -35,14 +35,10 @@
# send out email
set count 0
foreach to_user_id $user_id_list {
- db_exec_plsql sendmail {
- select acs_mail_nt__post_request (
- :user_id, -- p_party_from
- :to_user_id, -- p_party_to
- :subject, -- p_subject
- :msgbody -- p_message
- );
- }
+ set from_addr [acs_user::get_element -user_id $user_id -element email]
+ set to_addr [acs_user::get_element -user_id $to_user_id -element email]
+ acs_mail_lite::send -to_addr $to_addr -from_addr $from_addr \
+ -subject $subject -body $msgbody
incr count
}