Index: openacs-4/packages/download/www/admin/report-by-ip.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-by-ip.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/download/www/admin/report-by-ip.tcl	10 Sep 2002 22:22:35 -0000	1.6
+++ openacs-4/packages/download/www/admin/report-by-ip.tcl	16 Jan 2003 13:46:20 -0000	1.7
@@ -1,59 +1,47 @@
-# /packages/download/www/admin/all-user-downloads.tcl
+# /packages/download/www/admin/report-by-ip.tcl
 ad_page_contract {
+    List of IP addresses that have downloaded a specific archive
      
      @author jbank@arsdigita.com [jbank@arsdigita.com]
      @creation-date Wed Dec 13 13:39:29 2000
      @cvs-id $Id$
 } {
     {downloaded "1m"}
+} -properties {
+    context:onevalue
+    user_id_list_export:onevalue
+    dimensional_html:onevalue
+    table:onevalue
 }
 
 set repository_id [download_repository_id]
-##TODO: Add support for other
 
-# vinodk: put in the full query name so that when I
-#         pass this var to spam-users, it can find
-#         the right query
 set dimensional {
     {downloaded "Download Period" 1m {
-        {1d "last 24hrs" {where "[db_map dbqd.download.www.admin.report-by-ip.date_clause_1]"}}
-        {1w "last week"  {where "[db_map dbqd.download.www.admin.report-by-ip.date_clause_7]"}}
-        {1m "last month" {where "[db_map dbqd.download.www.admin.report-by-ip.date_clause_30]"}}
+        {1d "last 24hrs" {where "[db_map date_clause_1]"}}
+        {1w "last week"  {where "[db_map date_clause_7]"}}
+        {1m "last month" {where "[db_map date_clause_30]"}}
         {all "all" {}}}}
 }
 
 set table_def {
     {download_ip "From IP"
                {no_sort}
-               {<td><a href=report-one-ip?[export_url_vars download_ip downloaded]>$download_ip</a></td>}}
+               {<td><a href="report-one-ip?[export_url_vars download_ip downloaded]">$download_ip</a></td>}}
     {download_hostname "Hostname" {} {}}
     {num_downloads "# Downloads" {no_sort} {}}
 }
 
-set sql_query "
-    select min(u.last_name || ', ' || u.first_names) as user_name,
-           min(u.email) as email,
-           min(d.user_id) as user_id,
-           d.download_ip,
-           nvl(min(d.download_hostname),'unavailable') as download_hostname,
-           count(*) as num_downloads,
-           min('$downloaded') as downloaded
-     from download_downloads_repository d, cc_users u
-     where d.repository_id = $repository_id and
-           d.user_id = u.user_id
-           [ad_dimensional_sql $dimensional where]
-     group by d.download_ip
-     order by 2 desc
-"
-
-set export_sql_query [export_vars -url -sign {downloaded repository_id dimensional}]
-
 set dimensional_html [ad_dimensional $dimensional]
 set table [ad_table \
-        -Ttable_extra_html { width= 90% align=center} \
+        -Ttable_extra_html { width="90%" align="center" } \
         -bind [ad_tcl_vars_to_ns_set repository_id downloaded] \
-        download_table $sql_query $table_def ]
+               download_table { *SQL* } $table_def ]
 
+# query users to spam
+set user_id_list [db_list users_to_spam { *SQL* }]
+set user_id_list_export [export_vars -form -sign user_id_list]
+
 set context [list "Downloads by IP"]
 
 ad_return_template
\ No newline at end of file