--- capa/capa51/Discuss/Ver1.3/Attic/capadiscuss	2000/01/05 21:11:15	1.6
+++ capa/capa51/Discuss/Ver1.3/Attic/capadiscuss	2000/03/22 21:08:02	1.8
@@ -51,11 +51,17 @@ $validadmin = "unchecked";
   $psetid   = $form{'PSETID'};
 if ($snum eq "A12345678") {$debug=1;}
 if ($snum eq "a12345678") {$debug=1;}
+$debug=0;
   if($psetid eq "") { $psetid = $setid; }
 if ($debug) {print "GetTeacherInfo<BR>";$BenchmarkTa = new Benchmark;}
   &GetTeacherInfo;
 if($debug) {$BenchmarkTb = new Benchmark;print "<BR>",timestr(timediff($BenchmarkTb,$BenchmarkTa)),"\n";}
 
+  # check if student is banned from forum
+if ($debug) {print "BanUser<BR>";$BenchmarkTa = new Benchmark;}
+if (&BanUser) {exit;}
+if($debug) {$BenchmarkTb = new Benchmark;print "<BR>",timestr(timediff($BenchmarkTb,$BenchmarkTa)),"\n";}
+
   # check for valid studentnumber/capaid, an exit will occur here if the set wasn't open
 if ($debug) {print "ValidateUser<BR>";$BenchmarkTa = new Benchmark;}
   &ValidateUser;
@@ -172,6 +178,7 @@ if($debug) {$BenchmarkTb = new Benchmark
 }
 
 sub ViewSet {
+  local($hidden);
   if ($debug) {print "InsideViewSet<BR>";$BenchmarkTa = new Benchmark;}
   &Log("ViewSet");
   &CheckAdmin;
@@ -215,6 +222,7 @@ if($debug) {$BenchmarkTb = new Benchmark
 
   $col = 1;
   for($probnum=1; $probnum<=$maxprobs; $probnum++) {
+    $hidden=0;
     if($col eq "1" && $probnum > $col1size && $bigtable eq "yes") {
       $col = 2;
       &ViewSetEndColHTML;
@@ -226,13 +234,19 @@ if($debug) {$BenchmarkTb = new Benchmark
       closedir(MSG);
       foreach $msg(@msgs) {
         if(&RemZero(substr($msg,0,6)) eq $probnum) {
-          push(@good,$msg);
+          &OpenMsg("$capadir/$class/discussion/$setid/$msg");
+          if(!($status eq "hidden" && $validadmin ne "yes")) { 
+            push(@good,$msg); 
+          } else { $hidden++; }
         }
       }
-
-      &OpenMsg("$capadir/$class/discussion/$setid/$good[$#good]");
-      $lastpost = "$date at $time";
-      $posts = $found[$probnum];
+      $posts = $found[$probnum]-$hidden;
+      if ($posts >0) {
+         &OpenMsg("$capadir/$class/discussion/$setid/$good[$#good]");
+         $lastpost = "$date at $time";
+      } else {
+         $lastpost = "--";
+      }
     }
     else {
       $lastpost = "--";
@@ -585,7 +599,7 @@ sub WriteMsg {
   # add sr to grab e-mail address of user
 
   
-  # <B> <I> <P> <A> <LI> <OL> <UL> <EM> <BR> <TT> <STRONG> <BLOCKQUOTE> <DIV .*> <DIV> <P .
+  # <B> <I> <P> <A> <LI> <OL> <UL> <EM> <BR> <TT> <STRONG> <BLOCKQUOTE> <DIV .*> <DIV> <IMG>
   %html=(B=>1, I=>1, P=>1, A=>1, LI=>1, OL=>1, UL=>1, EM=>1, BR=>1, TT=>1, STRONG=>1,
 	 BLOCKQUOTE=>1, DIV=>1, IMG=>1);
 
@@ -660,6 +674,7 @@ sub CheckAdmin {
 	last;
       }
     }
+	if ($debug) { print "Admin Sections: ".$adminsection;}
     @adminsections = split(/\,/,$adminsection);
     for ($asection=0; $asection <= $#adminsections; $asection++) {
       $adminsections[$asection]=&RemZero($adminsections[$asection])
@@ -671,10 +686,12 @@ sub CheckAdmin {
     
     $snum =~ tr/a-z/A-Z/;
     LINE: foreach $line(@classl) {
-      ($course,$coursenum,$section,$stunum,$a) = split(/\ +/,$line);
+      $section= substr $line, 10, 3;
+      $stunum= substr $line, 14, 9;
       $stunum =~ tr/a-z/A-Z/;
       if ( $stunum ne $snum ) { next LINE;}
       $section = &RemZero($section);
+	if ($debug) {print "<BR>".$stunum."Is in section:".$section."<BR>";}
       foreach $asection(@adminsections) {
 	if($section eq $asection ) {
 	  $validadmin = "yes";
@@ -686,6 +703,30 @@ sub CheckAdmin {
   if($validadmin eq "no" && $mode eq "kill") { &NotAdminHTML; }
 }
 
+sub BanUser {
+  local (@capaconfig,$line,$command,$value,$ban,@banned,$result);
+  $result = 0;
+  open(CAPACONFIG,"$capadir/$class/capa.config");
+  @capaconfig = <CAPACONFIG>;
+  close(CAPACONFIG);
+  foreach $line(@capaconfig) {
+    chop $line;
+    ($command,$value) = split(/\ =\ /,$line);
+    if($command eq "banned_users") { $ban = $value; last; }
+  }
+  
+  if ($debug) { print "Banned Users: ".$ban }
+  @banned = split(/\,/,$ban);
+  $snum =~ tr/a-x/A-Z/;
+  foreach $ban (@banned) {
+    if ($debug) {print $ban . "is Banned <br>";}
+    $ban =~ tr/a-z/A-Z/;
+    $ban =~ tr/\ //d;
+    if ( $ban eq $snum) { &BannedMessageHTML; $result=1 }
+  }
+  return $result
+}
+
 sub ValidateUser {
   local(@allcapaid,@classl,$line);
 
@@ -827,6 +868,8 @@ sub GetDateTime  {
   ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) = localtime (time);
   $mon++;
 
+  $year=$year+1900;
+
   if ($hour < 12) {
   $AMPM = "AM";
   }