--- capa/capa51/Discuss/Ver1.3/Attic/capadiscuss	1999/09/28 21:27:46	1.1
+++ capa/capa51/Discuss/Ver1.3/Attic/capadiscuss	1999/10/18 20:58:33	1.4
@@ -54,7 +54,7 @@ if ($debug) {print "GetTeacherInfo<BR>";
   &GetTeacherInfo;
 if($debug) {$BenchmarkTb = new Benchmark;print "<BR>",timestr(timediff($BenchmarkTb,$BenchmarkTa)),"\n";}
 
-  # check for valid studentnumber/capaid
+  # 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;
 if($debug) {$BenchmarkTb = new Benchmark;print "<BR>",timestr(timediff($BenchmarkTb,$BenchmarkTa)),"\n";}
@@ -100,12 +100,57 @@ exit;
 #######################
 ## Begin Subroutines ##
 #######################
+sub GetSetList {
+  opendir(DDIR,"$capadir/$class/discussion");
+  @sets = grep(/^[0-9]+$/,sort(readdir(DDIR)));
+  closedir(DDIR);
+  if ($debug) {print "<br> Sets:". @sets ."<BR>\n";}
+}
+
+sub SetListHeader {
+  $pdset = "<select name=\"SETID\">\n";
+  foreach $setnum(@sets) {
+    $selected = "";
+    if($setnum eq $setid) { $selected = "selected"; }
+    $pdset .= "<option value=\"$setnum\" $selected>$setnum\n";
+  }
+  $pdset .= "</select>\n";
+}
+
+sub GetInfoList {
+  local(@temp,@alldir,@setdir);
+#  if ($debug) {print "<br> GetInfoList <br>";}
+  opendir(DDIR,"$capadir/$class/discussion");
+  @alldir = sort(grep(/.info$/,readdir(DDIR)));
+  closedir(DDIR);
+
+  opendir(FORUM,"$capadir/$class/discussion/$setid");
+  @setdir = sort(grep(/.info$/,readdir(FORUM)));
+  closedir(FORUM);
+
+  foreach $file(@setdir) { @setdir2 = (@setdir2,"$setid/$file"); }
+  @infofiles = (@alldir,@setdir2);
+  $infostring = "";
+#  if ($debug) {print "<br> GetInfoList" . @infofiles."<br>";}
+  foreach $infofile(@infofiles) {
+#    if ($debug) {print "<br> GetInfoList" . $infofile."<br>";}
+    @temp = reverse split /\//, $infofile;
+    $infodesc = $temp[0];
+    $infodesc =~ s/.info//g;
+    $infodesc =~ s/_/ /g;
+    $infostring .= &InfoButtonHTML;
+  }
+  if ($infostring ne "") {
+ #   $infostring = "</tr><tr>" . $infostring;
+  }
+#  if ($debug) {print "<br> GetInfoList" . $infostring."<br>";}
+}
 
 sub NewSet {
   &Log("NewSet");
 
   if($setid <= $psetid) {   #grab capaid
-    if ($debug) {print "ViewSet<BR>";$BenchmarkTa = new Benchmark;}
+    if ($debug) {print "NewSet<BR>";$BenchmarkTa = new Benchmark;}
     @allcapaid = `allcapaid -s $setid -e $setid -stu $snum -c $capadir/$class -i`;
 
     $capaid = $allcapaid[2];
@@ -116,18 +161,10 @@ if($debug) {$BenchmarkTb = new Benchmark
     return;
   }
 
-  opendir(DDIR,"$capadir/$class/discussion");
-    @sets = grep(/[0-9]/,sort(readdir(DDIR)));
-  closedir(DDIR);
-
-  $pdset = "<select name=\"SETID\">\n";
-  foreach $setnum(@sets) {
-    $selected = "";
-    if($setnum eq $setid) { $selected = "selected"; }
-    $pdset .= "<option value=\"$setnum\" $selected>$setnum\n";
-  }
-  $pdset .= "</select>\n";
-
+  if ($debug) { print "<br> GetSetList\n"; }
+  &GetSetList;
+  if ($debug) { print "<br> EndGetSetList\n"; }
+  &SetListHeader;
   &NewSetHTML;
   #exit;
 }
@@ -143,20 +180,13 @@ sub ViewSet {
 
   $capasbin = "$capasbin/$teachdir/capasbin";
   &SetJumpBox;
+  $backfunction="viewset";
+  &GetInfoList;
+
   opendir(FORUM,"$capadir/$class/discussion/$setid");
     @dir = sort(readdir(FORUM));
   closedir(FORUM);
 
-  @infofiles = grep(/.info/,@dir);
-  $infostring = "";
-  $backfunction = "viewset";
-  foreach $infofile(@infofiles) {
-    $infodesc = $infofile;
-    $infodesc =~ s/.info//g;
-    $infodesc =~ s/_/ /g;
-    $infostring .= &InfoButtonHTML;
-  }
-
   foreach $i(@dir) {
     $probnum = &RemZero(substr($i,0,6));
     $found[$probnum]++;
@@ -263,6 +293,7 @@ sub ViewProblem {
       }
 
       if($msgcount eq "1") {
+	&GetInfoList;
         $postbutton = &ReplyButtonHTML;
         &ProblemJumpBox;
         &ViewProblemTopHTML;
@@ -304,6 +335,7 @@ sub ViewProblem {
   }
 
   if($msgfind eq "no") {
+    &GetInfoList;
     $postbutton = &PostNewButtonHTML;
     &ProblemJumpBox;
     &ViewProblemTopHTML;
@@ -317,7 +349,8 @@ sub ViewProblem {
 }
 
 sub ViewInfoFile {
-  open(INFOFILE,"$capadir/$class/discussion/$setid/$file");
+  &Log("InfoFile");
+  open(INFOFILE,"$capadir/$class/discussion/$file");
     @file = <INFOFILE>;
   closedir(INFOFILE);
 
@@ -653,16 +686,29 @@ sub ValidateUser {
   if($valid eq "no") { &InvalidVarsHTML; }
 
   # check w/ allcapaid program
-  @allcapaid = `allcapaid -s $setid -e $setid -stu $snum -c $capadir/$class -i`;
+  @allcapaid = `allcapaid51 -s $setid -e $setid -stu $snum -c $capadir/$class -i -checkopen`;
 
   chop $allcapaid[2];
   chop $allcapaid[2];
+  if ($debug) {print "capaid:" . $allcapaid[2] . "<BR>\n";}
   if($allcapaid[2] ne $capaid) {
-    if($action ne "newset") { &BadPassHTML; }
+    if ($allcapaid[2] =~ /Open/) { &NotOpen; exit; }
+    if($action ne "newset") { &BadPassHTML; exit; }
     #&NewSet;
   }
 }
 
+sub NotOpen {
+  &GetSetList;
+  &SetListHeader;
+  &ViewSetTitleHTML;
+print <<NotOpen2;
+This set is not yet open. Please choose a different set.
+</body>
+</html>
+NotOpen2
+}
+
 sub UserInfo {
   local($line,@classl,$last,$first,$middle);
 
@@ -703,17 +749,8 @@ sub ProblemJumpBox {
 }
 
 sub SetJumpBox {
-  opendir(DDIR,"$capadir/$class/discussion");
-    @sets = grep(/[0-9]/,sort(readdir(DDIR)));
-  closedir(DDIR);
-
-  $pdset = "<select name=\"SETID\">\n";
-  foreach $set(@sets) {
-    $selected = "";
-    if($set eq $setid) { $selected = " selected"; }
-    $pdset .= "  <option value=\"$set\"$selected>$set\n";
-  }
-  $pdset .= "</select>";
+  &GetSetList;
+  &SetListHeader;
 }
 
 sub AddZero {
@@ -811,7 +848,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");
 }