--- capa/capa51/Discuss/Ver1.3/Attic/capadiscuss	1999/10/14 18:47:01	1.3
+++ capa/capa51/Discuss/Ver1.3/Attic/capadiscuss	2000/01/05 21:11:15	1.6
@@ -1,13 +1,15 @@
 #!/usr/ucb/perl
 #
 # CAPA Discussion Forum
-# version 1.3
+# version 1.3.0
 #
 # Michigan State University
 # Department of Physics and Astronomy
 #
 # Ryan J. Shaltry
 # tech4@msue.msu.edu
+# Guy Albertelli
+# albertel@msu.edu
 
 print "Content-type: text/html\n\n";
 
@@ -327,8 +329,8 @@ sub ViewProblem {
           $hidebutton = &UnHideButtonHTML;
           $messagenote = "Hidden by $hiddenuser on $hiddendate at $hiddentime from $hiddenaddr";
         }
-	$message =~ s/</&lt;/g;
-	$message =~ s/>/&gt;/g;
+#	$message =~ s/</&lt;/g;
+#	$message =~ s/>/&gt;/g;
         &ViewProblemGutsHTML;
       }
     }
@@ -349,6 +351,7 @@ sub ViewProblem {
 }
 
 sub ViewInfoFile {
+  &Log("InfoFile");
   open(INFOFILE,"$capadir/$class/discussion/$file");
     @file = <INFOFILE>;
   closedir(INFOFILE);
@@ -581,10 +584,24 @@ sub WriteMsg {
   $filename = shift(@_);
   # add sr to grab e-mail address of user
 
+  
+  # <B> <I> <P> <A> <LI> <OL> <UL> <EM> <BR> <TT> <STRONG> <BLOCKQUOTE> <DIV .*> <DIV> <P .
+  %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);
+
   $message = $form{'message'};
-  $message =~ s/\n\r\n/<p>/g;
+
+  $message =~ s/((\n\r)|(\n))\n/<p>/g;
   $message =~ s/\n/<br>/g;
 
+  $message =~ s/\<(\/?\s*(\w+)[^\>\<]*)/
+    {($html{uc($2)}&(length($1)<1000))?"\<$1":"\&lt;$1"}/ge;
+  $message =~ s/(\<?\s*(\w+)[^\<\>]*)\>/
+    {($html{uc($2)}&(length($1)<1000))?"$1\>":"$1\&gt;"}/ge;
+
+#  $message =~ s/</&lt;/g;
+#  $message =~ s/>/&gt;/g;
+
   # check if posted anonymously
   if($form{'ANONYMOUS'} eq "yes") {
     $username = "Anonymous|$username";
@@ -685,7 +702,7 @@ sub ValidateUser {
   if($valid eq "no") { &InvalidVarsHTML; }
 
   # check w/ allcapaid program
-  @allcapaid = `allcapaid51 -s $setid -e $setid -stu $snum -c $capadir/$class -i -checkopen`;
+  @allcapaid = `allcapaid -s $setid -e $setid -stu $snum -c $capadir/$class -i -checkopen`;
 
   chop $allcapaid[2];
   chop $allcapaid[2];
@@ -790,7 +807,7 @@ sub form_info {
 
   foreach $pair (@pairs) {
      ($name, $value) = split(/=/, $pair);
-
+     if ($name eq "message") {$allow_html=1;} else {$allow_html=0;}
      # Un-Webify plus signs and %-encoding
      $value =~ tr/+/ /;
      $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
@@ -847,7 +864,7 @@ sub Log {
 
   &Lock("lock.file");
   open(LOG,">>$capadir/$class/discussion/logs/access.log");
-    print LOG "$snum|$capaid|$username|$email|$logmsg|$setid|$probnum|$HyphenDate|$Time\n";
+    print LOG "$snum|$capaid|$username|$email|$logmsg|$setid|$probnum|$HyphenDate|$Time|$file\n";
   close(LOG);
   &Unlock("lock.file");
 }