--- loncom/interface/lonmanagekeys.pm	2003/04/23 01:55:52	1.3
+++ loncom/interface/lonmanagekeys.pm	2003/05/01 20:26:28	1.7
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to manage course access keys 
 #
-# $Id: lonmanagekeys.pm,v 1.3 2003/04/23 01:55:52 www Exp $
+# $Id: lonmanagekeys.pm,v 1.7 2003/05/01 20:26:28 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -54,7 +54,32 @@ ENDHEAD
 
 # =================================================== Show student list to drop
 sub show_key_list {
-    my ($r,$mode,$linkto,$action,$statusmode,$classlist,$keylist)=@_;
+    my ($r,$comment,$newonly,$checkonly,%cenv)=@_;
+    $comment=~s/\W/\./g;
+    my %accesskeys=&Apache::lonnet::dump
+	('accesskeys',$cenv{'domain'},$cenv{'num'});
+    $r->print('<table border="2"><tr><th>Key</th><th>Checked Out</th><th>Comments/Remarks/Notes</th></tr>');
+    foreach (keys %accesskeys) {
+        if ($_=~/^error\:/) {
+	    $r->print('<tr><td>No keys have been generated yet.</td></tr>');
+        } elsif ($accesskeys{$_}=~/$comment/) {
+	    my ($checkout,$com)=split(/\s*\#\s*/,$accesskeys{$_});
+            unless ($checkout) {
+		if ($checkonly) { next; }
+            } else {
+		if ($newonly) { next; }
+            }
+	   $r->print("\n<tr><td><tt>".$_.'</tt></td><td>'.($checkout?
+                     $checkout:'-').'</td><td>'.
+                     join('<br />',split(/\s*\;\s*/,$com)).'</td></tr>');
+       }
+    }
+    $r->print('</table>');
+    return '';
+#
+# Junk below
+#
+    my ($mode,$linkto,$action,$statusmode,$classlist,$keylist);
 #
 # Just junk so that this compiles
 #
@@ -136,12 +161,17 @@ sub togglekeyaccess {
 
 sub genkeys {
     my ($num,$comments,%cenv)=@_;
+    unless ($comments) { $comments=''; }
+    $comments=~s/\#/ /g;
+    $comments=~s/\;/ /g;
     unless ($num) { return 'No number of keys given.'; }
     unless (($num=~/^\d+$/) && ($num>0)) { 
 	return 'Invalid number of keys given.'; 
     }
+    my $batchnumber='BATCH_'.time().'_'.$$;
     return 'Generated '.&Apache::lonnet::generate_access_keys
-    ($num,$cenv{'domain'},$cenv{'number'},$comments).' access keys.';
+    ($num,$cenv{'domain'},$cenv{'num'},$batchnumber.'; '.$comments).' of '.
+    $num.' access keys (Batch Number: '.$batchnumber.')',$batchnumber;
 }
 
 ###################################################################
@@ -189,23 +219,35 @@ sub handler {
 		$r->print(&togglekeyaccess(%cenv).'<br />');
 		%cenv=&Apache::lonnet::coursedescription($ENV{'form.cid'});
 	    }
+            my $batchnumber='';
 	    if ($ENV{'form.genkeys'}) {
-		$r->print(
-	      &genkeys($ENV{'form.num'},$ENV{'form.comments'},%cenv).'<br />');
+		(my $msg,$batchnumber)=
+		    &genkeys($ENV{'form.num'},$ENV{'form.comments'},%cenv);
+                $r->print($msg.'<br />');
 	    }
+            if ($ENV{'form.listkeys'}) {
+		&show_key_list($r,$ENV{'form.listcom'},
+                          $ENV{'form.newonly'},$ENV{'form.checkonly'},%cenv);
+            }
 # --- Menu
 	    $r->print('<h3>Key Access</h3>');
 	    if ($cenv{'keyaccess'} eq 'yes') {
-		$r->print('Access to this course is key controlled. <input type="submit" name="toggle" value="Open Access" />')
+		$r->print('Access to this course is key controlled.<br /><input type="submit" name="toggle" value="Open Access" />')
 		} else {
-		    $r->print('Access to this course is open, no access keys. <input type="submit" name="toggle" value="Control Access" />');
+		    $r->print('Access to this course is open, no access keys.<br /><input type="submit" name="toggle" value="Control Access" />');
 	    }
-	    $r->print(<<ENDKEYGEN);
+	    $r->print(<<ENDKEYMENU);
 <hr /><h3>Generate New Keys</h3>
 Number of keys to be generated: <input type="text" name="num" size="6" /><br />
 Comments/Remarks/Notes: <input type="text" name="comments" size="30" /><br />
 <input type="submit" name="genkeys" value="Generate Keys" />
-ENDKEYGEN
+<hr /><h3>List Keys</h3>
+Comments/Remarks/Notes/User/Batch Number:
+<input type="text" name="listcom" size="30" value="$batchnumber" /><br />
+<input type="checkbox" name="newonly" /> Unused keys only<br />
+<input type="checkbox" name="checkonly" />Used keys only<br />
+<input type="submit" name="listkeys" value="List Keys" />
+ENDKEYMENU
 	    $r->print('</form></body></html>');
 	}
     } else {