Diff for /capa/capa51/Discuss/Ver1.3/Attic/capadiscuss between versions 1.1.1.1 and 1.2

version 1.1.1.1, 1999/09/28 21:27:46 version 1.2, 1999/10/13 18:45:28
Line 54  if ($debug) {print "GetTeacherInfo<BR>"; Line 54  if ($debug) {print "GetTeacherInfo<BR>";
   &GetTeacherInfo;    &GetTeacherInfo;
 if($debug) {$BenchmarkTb = new Benchmark;print "<BR>",timestr(timediff($BenchmarkTb,$BenchmarkTa)),"\n";}  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;}  if ($debug) {print "ValidateUser<BR>";$BenchmarkTa = new Benchmark;}
   &ValidateUser;    &ValidateUser;
 if($debug) {$BenchmarkTb = new Benchmark;print "<BR>",timestr(timediff($BenchmarkTb,$BenchmarkTa)),"\n";}  if($debug) {$BenchmarkTb = new Benchmark;print "<BR>",timestr(timediff($BenchmarkTb,$BenchmarkTa)),"\n";}
Line 100  exit; Line 100  exit;
 #######################  #######################
 ## Begin Subroutines ##  ## Begin Subroutines ##
 #######################  #######################
   sub GetSetList {
     opendir(DDIR,"$capadir/$class/discussion");
     @sets = grep(/[0-9]/,sort(readdir(DDIR)));
     closedir(DDIR);
   }
   
   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 NewSet {  sub NewSet {
   &Log("NewSet");    &Log("NewSet");
Line 116  if($debug) {$BenchmarkTb = new Benchmark Line 131  if($debug) {$BenchmarkTb = new Benchmark
     return;      return;
   }    }
   
   opendir(DDIR,"$capadir/$class/discussion");    &GetSetList;
     @sets = grep(/[0-9]/,sort(readdir(DDIR)));    &SetListHeader;
   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";  
   
   &NewSetHTML;    &NewSetHTML;
   #exit;    #exit;
 }  }
Line 653  sub ValidateUser { Line 658  sub ValidateUser {
   if($valid eq "no") { &InvalidVarsHTML; }    if($valid eq "no") { &InvalidVarsHTML; }
   
   # check w/ allcapaid program    # 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];
   chop $allcapaid[2];    chop $allcapaid[2];
     if ($debug) {print "capaid:" . $allcapaid[2] . "<BR>\n";}
   if($allcapaid[2] ne $capaid) {    if($allcapaid[2] ne $capaid) {
     if($action ne "newset") { &BadPassHTML; }      if ($allcapaid[2] =~ /Open/) { &NotOpen; exit; }
       if($action ne "newset") { &BadPassHTML; exit; }
     #&NewSet;      #&NewSet;
   }    }
 }  }
   
   sub NotOpen {
     &GetSetList;
     &SetListHeader;
     &ViewSetTitleHTML;
   print <<NotOpen2;
   This set is not yet open. Please choose a different set.
   </body>
   </html>
   NotOpen2
   }
   
 sub UserInfo {  sub UserInfo {
   local($line,@classl,$last,$first,$middle);    local($line,@classl,$last,$first,$middle);
   

Removed from v.1.1.1.1  
changed lines
  Added in v.1.2


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>