--- loncom/interface/lonfeedback.pm	2006/07/27 15:48:56	1.213
+++ loncom/interface/lonfeedback.pm	2006/08/16 19:32:54	1.216
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.213 2006/07/27 15:48:56 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.216 2006/08/16 19:32:54 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
@@ -2058,9 +2058,10 @@ $start_page
   <td>&nbsp;</td>
   <td align="center" valign="top">
    <select name="statusfilter">
-    <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="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>
@@ -2545,9 +2546,9 @@ sub clear_out_html {
 	     H1=>1, H2=>1, H3=>1, H4=>1, H5=>1);
   }
 # Do the substitution of everything that is not explicitly allowed
-  $message =~ s/\<(\/?\s*(\w*)[^\>\<]*)/
+  $message =~ s/\<(\/?\s*(\w+)[^\>\<]*)/
 	  {($html{uc($2)}&&(length($1)<1000))?"\<$1":"\&lt;$1"}/ge;
-  $message =~ s/(\<?\s*(\w*)[^\<\>]*)\>/
+  $message =~ s/(\<?\s*(\w+)[^\<\>]*)\>/
 	  {($html{uc($2)}&&(length($1)<1000))?"$1\>":"$1\&gt;"}/ge;
   return $message;
 }
@@ -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',
                    );
 }