Index: openacs-4/packages/download/www/admin/spam-users.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/spam-users.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/download/www/admin/spam-users.adp	6 Sep 2002 21:50:32 -0000	1.3
+++ openacs-4/packages/download/www/admin/spam-users.adp	16 Jan 2003 13:46:20 -0000	1.4
@@ -2,8 +2,22 @@
     <property name="title">Spam Downloaders</property>
     <property name="context">"Spam downloaders"</property>
 
+    <if @users:rowcount@ eq 0>
+      After weeding out users who don't want to be spammed, there was no one
+      left on your list. Sorry!
+    </if>
+    <else>
+
+    <p>
+        Users who have requested not to be spammed will
+        <strong>NOT</strong> receive your email.
+        <br />
+        (@no_spam_count@ user<if @no_spam_count@ ne 1>s</if> removed 
+        from the list for this reason)
+    </p>
+
     <form action="spam-users-2" method="post">
-      @userid_list_export@
+      @user_id_list_export@
       <table>
         <tr>
           <td>Email Subject:</td>
@@ -23,6 +37,14 @@
     <p>
       The following users will receive your spam:
       <ul>
-        @userlist_str@
+        <if @users:rowcount@ lt 25>
+          <multiple name="users">
+            <li>@users.user_name@ (<a href="mailto:@users.email@">@users.email@</a>)</li>
+          </multiple>
+        </if>
+        <else>
+          <li>@users:rowcount@ users will receive your message.</li>
+        </else>
       </ul>
-    </p>
\ No newline at end of file
+    </p>
+    </else>
\ No newline at end of file