Index: openacs-4/packages/bulk-mail/www/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bulk-mail/www/one.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/bulk-mail/www/one.adp	15 May 2002 22:07:52 -0000	1.1
+++ openacs-4/packages/bulk-mail/www/one.adp	16 May 2002 00:49:16 -0000	1.2
@@ -7,31 +7,31 @@
   <table bgcolor="#ececec" border="1" width="95%" cellpadding="3" cellspacing="3">
     <tr>
       <td>Send Date</td>
-      <td>@send_date@</td>
+      <td><if @send_date@ not nil>@send_date@</if><else>&nbsp;</else></td>
     </tr>
     <tr>
       <td>From</td>
-      <td>@from_addr@</td>
+      <td><if @from_addr@ not nil>@from_addr@</if><else>&nbsp;</else></td>
     </tr>
     <tr>
       <td>Subject</td>
-      <td>@subject@</td>
+      <td><if @subject@ not nil>@subject@</if><else>&nbsp;</else></td>
     </tr>
     <tr>
       <td>Reply To</td>
-      <td>@reply_to@</td>
+      <td><if @reply_to@ not nil>@reply_to@</if><else>&nbsp;</else></td>
     </tr>
     <tr>
       <td>Extra Headers</td>
-      <td>@extra_headers@</td>
+      <td><if @extra_headers@ not nil>@extra_headers@</if><else>&nbsp;</else></td>
     </tr>
     <tr>
       <td>Message</td>
-      <td><pre>@message@</pre></td>
+      <td><if @message@ not nil><pre>@message@</pre></if><else>&nbsp;</else></td>
     </tr>
     <tr>
       <td>Query</td>
-      <td><pre>@query@</pre></td>
+      <td><if @query@ not nil><pre>@query@</pre></if><else>&nbsp;</else></td>
     </tr>
     <tr>
       <td>Sent?</td>
Index: openacs-4/packages/dotlrn/www/members-chunk-table.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk-table.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/members-chunk-table.tcl	8 May 2002 14:35:07 -0000	1.5
+++ openacs-4/packages/dotlrn/www/members-chunk-table.tcl	16 May 2002 00:55:47 -0000	1.6
@@ -35,8 +35,8 @@
 set referer [ns_conn url]
 
 set site_wide_admin_p [ad_permission_p \
-	-user_id $my_user_id \
-	[acs_magic_object "security_context_root"] "admin"
+    -user_id $my_user_id \
+    [acs_magic_object "security_context_root"] "admin"
 ]
 
 if {!$site_wide_admin_p} {
@@ -60,38 +60,38 @@
 
 set table_def [list]
 lappend table_def [list \
-	first_names \
-	"First Names" \
-	{upper(first_names) $order} \
-	{<td>[acs_community_member_link -user_id $user_id -label $first_names</td>]}
+    first_names \
+    "First Names" \
+    {upper(first_names) $order} \
+    {<td>[acs_community_member_link -user_id $user_id -label $first_names</td>]}
 ]
 lappend table_def [list \
-	last_name \
-	"Last Name" \
-	{upper(last_name) $order} \
-	{<td>[acs_community_member_link -user_id $user_id -label $last_name</td>]}
+    last_name \
+    "Last Name" \
+    {upper(last_name) $order} \
+    {<td>[acs_community_member_link -user_id $user_id -label $last_name</td>]}
 ]
 
 if {$read_private_data_p || [string equal $my_user_id $user_id]} {
     lappend table_def [list \
-	    email \
-	    "Email" \
-	    {upper(email) $order, upper(role)} \
-	    {<td><a href="mailto:$email">$email</a></td>}
-]
+        email \
+        "Email" \
+        {upper(email) $order, upper(role)} \
+        {<td><a href="mailto:$email">$email</a></td>}
+    ]
 } else {
     lappend table_def [list \
-	    email \
-	    "Email" \
-	    {upper(email) $order, upper(role)} \
-	    {<td>&nbsp;</td>}
-]
+        email \
+        "Email" \
+        {upper(email) $order, upper(role)} \
+        {<td>&nbsp;</td>}
+    ]
 }
 
 lappend table_def [list \
-	role \
-	"Role" \
-	{decode(role, 'Professor', 1, 
+    role \
+    "Role" \
+    {decode(role, 'Professor', 1, 
                       'Administrator', 2, 
                       'Teaching Assistant', 3, 
                       'Course Assistant', 4, 
@@ -103,53 +103,57 @@
 
 if {$site_wide_admin_p} {
     lappend table_def [list \
-	    manage \
-	    "Action" \
-	    {} \
-	    {<td>\[<a href="deregister?user_id=$user_id&referer=$referer">Drop&nbsp;Membership</a>&nbsp;| <a href=[dotlrn::get_url]/admin/user?user_id=$user_id>Manage</a>\]</td>}]
+        manage \
+        "Action" \
+        {} \
+        {<td>\[<a href="deregister?user_id=$user_id&referer=$referer">Drop&nbsp;Membership</a>&nbsp;| <a href=[dotlrn::get_url]/admin/user?user_id=$user_id>Manage</a>\]</td>} \
+    ]
 } elseif {$admin_p} {
     lappend table_def [list \
-	    manage \
-	    "Action" \
-	    {} \
-	    {<td>\[<a href="deregister?user_id=$user_id&referer=$referer">Drop&nbsp;Membership</a>\]}
-]
+        manage \
+        "Action" \
+        {} \
+        {<td>\[<a href="deregister?user_id=$user_id&referer=$referer">Drop&nbsp;Membership</a>\]} \
+    ]
 } else {
     lappend table_def [list \
-	    manage \
-	    "Action" \
-	    {} \
-	    {[eval {if {$my_user_id == $user_id} {
-	                return "<td>\[<a href=\"deregister?user_id=$user_id&referer=$referer\">Drop&nbsp;Membership</a>\]</td>"
-                    } else {
-	                return "<td>&nbsp;</td>"
-                    }
-                   }
-	     ]
-            }
-]
+        manage \
+        "Action" \
+        {} \
+        {
+            [eval {
+                if {$my_user_id == $user_id} {
+                    return "<td>\[<a href=\"deregister?user_id=$user_id&referer=$referer\">Drop&nbsp;Membership</a>\]</td>"
+                } else {
+                    return "<td>&nbsp;</td>"
+                }
+            }]
+        }
+    ]
 }
 
 set sql "
-select dotlrn_member_rels_approved.rel_id,
-       dotlrn_member_rels_approved.rel_type,
-       dotlrn_member_rels_approved.role,
-       dotlrn_member_rels_approved.user_id,
-       registered_users.first_names,
-       registered_users.last_name,
-       registered_users.email
-from registered_users,
-     dotlrn_member_rels_approved
-where dotlrn_member_rels_approved.community_id = :community_id
-and dotlrn_member_rels_approved.user_id = registered_users.user_id
-[ad_order_by_from_sort_spec $orderby $table_def]"
+    select dotlrn_member_rels_approved.rel_id,
+           dotlrn_member_rels_approved.rel_type,
+           dotlrn_member_rels_approved.role,
+           dotlrn_member_rels_approved.user_id,
+           registered_users.first_names,
+           registered_users.last_name,
+           registered_users.email
+    from registered_users,
+         dotlrn_member_rels_approved
+    where dotlrn_member_rels_approved.community_id = :community_id
+    and dotlrn_member_rels_approved.user_id = registered_users.user_id
+    [ad_order_by_from_sort_spec $orderby $table_def]
+"
 
 set table [ad_table \
-	-Textra_vars {referer my_user_id} \
-	-Torderby $orderby \
-	make_table \
-	$sql \
-	$table_def
+    -Tmissing_text {<blockquote><i>No members</i></blockquote>} \
+    -Textra_vars {referer my_user_id} \
+    -Torderby $orderby \
+    select_current_members \
+    $sql \
+    $table_def
 ]
 
 set user_list [list]