--- loncom/interface/lonfeedback.pm	2006/07/18 17:42:15	1.211
+++ loncom/interface/lonfeedback.pm	2006/08/14 21:44:14	1.215
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.211 2006/07/18 17:42:15 albertel Exp $
+# $Id: lonfeedback.pm,v 1.215 2006/08/14 21:44:14 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -186,8 +186,8 @@ sub list_discussion {
             push @{$roleinfo{$student}}, 'st:'.$section.':'.$status;
         }
 	($classgroups,$studentgroups) = 
-         &Apache::loncoursedata::get_group_memberships($classlist,$keylist,
-                                                       $cdom,$cnum);
+	    &Apache::loncoursedata::get_group_memberships($classlist,$keylist,
+							  $cdom,$cnum);
     }
 
 # Get discussion display default settings for user
@@ -713,8 +713,8 @@ END
     if ($discussiononly) {
         my $now = time;
         my $attachnum = 0;
-        my $currnewattach;
-        my $currdelold;
+        my $currnewattach = [];
+        my $currdelold = [];
         my $comment = '';
         my $subject = '';
         if ($env{'form.origpage'}) {
@@ -1683,7 +1683,7 @@ END
                 }
             }
             if ($attachmsg) {
-                $r->print("<b>Retained attachments</b>:$attachmsg<br />\n");
+                $r->print("<br /><b>Retained attachments</b>:$attachmsg<br />\n");
             }
             if ($newattachmsg) {
                 $r->print("$newattachmsg<br />");
@@ -1930,8 +1930,8 @@ sub print_sortfilter_options {
         unshift(@sections,'all'); # Put 'all' at the front of the list
 
     }
-    foreach (@sections) {
-        $section_sel .= "  <option value=\"$_\" />$_\n";
+    foreach my $sec (@sections) {
+        $section_sel .= "  <option value=\"$sec\">$sec</option>\n";
     }
 
     if (&check_group_priv() eq 'ok') {
@@ -1956,8 +1956,8 @@ sub print_sortfilter_options {
             $numgroupvis = 1;
         }
     }
-    foreach (@groups) {
-        $group_sel .= "  <option value=\"$_\" />$_\n";
+    foreach my $group (@groups) {
+        $group_sel .= "  <option value=\"$group\">$group</option>\n";
     }
 
     my $function = &Apache::loncommon::get_users_function();
@@ -2047,32 +2047,33 @@ $start_page
  <tr>
   <td align="center" valign="top">
    <select name="sortposts">
-    <option value="ascdate" selected="selected" />$sort_types{'ascdate'}
-    <option value="descdate" />$sort_types{'descdate'}
-    <option value="thread" />$sort_types{'thread'}
-    <option value="subject" />$sort_types{'subject'}
-    <option value="username" />$sort_types{'username'}
-    <option value="lastfirst" />$sort_types{'lastfirst'}
+    <option value="ascdate" selected="selected">$sort_types{'ascdate'}</option>
+    <option value="descdate">$sort_types{'descdate'}</option>
+    <option value="thread">$sort_types{'thread'}</option>
+    <option value="subject">$sort_types{'subject'}</option>
+    <option value="username">$sort_types{'username'}</option>
+    <option value="lastfirst">$sort_types{'lastfirst'}</option>
    </select>
   </td>
   <td>&nbsp;</td>
   <td align="center" valign="top">
    <select name="statusfilter">
-    <option value="all" selected="selected" />$status_types{'all'}
-    <option value="Active" />$status_types{'Active'}
-    <option value="Expired" />$status_types{'Expired'}
+    <option value="all" selected="selected">$status_types{'all'}</option>
+    <option value="Active">$status_types{'Active'}</option>
+    <option value="Expired">$status_types{'Expired'}</option>
+    <option value="Future">$status_types{'Future'}</option>
    </select>
   </td>
   <td>&nbsp;</td>
   <td align="center" valign="top">
    <select name="rolefilter" multiple="true" size="5">
-    <option value="all" />$role_types{'all'}
-    <option value="st" />$role_types{'st'}
-    <option value="cc" />$role_types{'cc'}
-    <option value="in" />$role_types{'in'}
-    <option value="ta" />$role_types{'ta'}
-    <option value="ep" />$role_types{'ep'}
-    <option value="cr" />$role_types{'cr'}
+    <option value="all">$role_types{'all'}</option>
+    <option value="st">$role_types{'st'}</option>
+    <option value="cc">$role_types{'cc'}</option>
+    <option value="in">$role_types{'in'}</option>
+    <option value="ta">$role_types{'ta'}</option>
+    <option value="ep">$role_types{'ep'}</option>
+    <option value="cr">$role_types{'cr'}</option>
    </select>
   </td>
   <td>&nbsp;</td>
@@ -2920,7 +2921,7 @@ END
             }
         }
     }
-    if (@{$currnewattach} > 0) {
+    if ((ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)) {
         $r->print("The following attachments have been uploaded for inclusion with this posting.<br />Check the checkboxes for any you wish to remove<br />\n");
         foreach (@{$currnewattach}) {
             $_ =~ m#/([^/]+)$#;
@@ -3168,8 +3169,9 @@ sub sort_filter_names {
                    );
     %{$status_types} = (
                      all     => 'Roles of any status',
-                     Active => 'Only active roles',
-                     Expired => 'Only inactive roles'
+                     Active  => 'Only active roles',
+                     Expired => 'Only past roles',
+                     Future  => 'Only future roles',
                    );
 }