--- loncom/interface/lonmanagekeys.pm	2003/04/12 15:57:30	1.1
+++ loncom/interface/lonmanagekeys.pm	2003/05/02 15:26:36	1.9
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to manage course access keys 
 #
-# $Id: lonmanagekeys.pm,v 1.1 2003/04/12 15:57:30 www Exp $
+# $Id: lonmanagekeys.pm,v 1.9 2003/05/02 15:26:36 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -48,13 +48,41 @@ sub header {
 </head>
 $bodytag
 <form method="post" enctype="multipart/form-data"  
-      action="/adm/keymanage" name="keyform">
+      action="/adm/managekeys" name="keyform">
 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('<h3>List of Keys/Enter New Comments</h3><table border="2"><tr><th>Key</th><th>Checked Out</th><th>Comments/Remarks/Notes</th><th>Enter Additional 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><td><input type="text" size="40" name="com_'.$_.
+		     '" /></td></tr>');
+       }
+    }
+    $r->print('</table>');
+    $r->print('<input type="submit" name="addcom" value="Add Above Comments to Keys" /><hr />');
+    return '';
+#
+# Junk below
+#
+    my ($mode,$linkto,$action,$statusmode,$classlist,$keylist);
 #
 # Just junk so that this compiles
 #
@@ -62,7 +90,7 @@ sub show_key_list {
 #
 # 
 # 
-    my $cid=$ENV{'request.course.id'};
+    my $cid=$ENV{'form.cid'};
     #
     # Variables for excel output
     my ($excel_workbook, $excel_sheet, $excel_filename,$row);
@@ -111,10 +139,63 @@ sub show_key_list {
     } elsif ($mode eq 'excel') {
         $excel_workbook->close();
         $r->print('<p><a href="'.$excel_filename.'">'.
-                  'Your Excel spreadsheet</a> is ready for download.</p>'."\n");
+               'Your Excel spreadsheet</a> is ready for download.</p>'."\n");
+    }
+}
+
+
+# ----------------------------------------------------------- Toggle Key Access
+
+sub togglekeyaccess {
+    my %cenv=@_;
+    unless ($cenv{'domain'}) { return; }
+    if ($cenv{'keyaccess'} eq 'yes') {
+       return 'Removing key access: '.
+       &Apache::lonnet::del('environment',['keyaccess'],
+			    $cenv{'domain'},$cenv{'num'});
+   } else {
+      return 'Establishing key access: '.
+       &Apache::lonnet::put('environment',{'keyaccess' => 'yes'},
+			    $cenv{'domain'},$cenv{'num'});
     }
 }
 
+# --------------------------------------------------------------- Generate Keys
+
+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{'num'},$batchnumber.'; '.$comments).' of '.
+    $num.' access keys (Batch Number: '.$batchnumber.')',$batchnumber;
+}
+
+# ---------------------------------------------------------------- Add comments
+
+sub addcom {
+    my %cenv=@_;
+    my %newcomment=();
+    undef %newcomment;
+    foreach (keys %ENV) {
+	if ($_=~/^form\.com\_(.+)$/) {
+            my $key=$1;
+	    my $comment=$ENV{$_};
+            $comment=~s/^\s+//gs;
+            if ($comment) {
+               &Apache::lonnet::comment_access_key
+		   ($key,$cenv{'domain'},$cenv{'num'},$comment); 
+	   }
+	}
+    }
+    return '';
+}
 ###################################################################
 ###################################################################
 sub handler {
@@ -124,32 +205,89 @@ sub handler {
         $r->send_http_header;
         return OK;
     }
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['state']);
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+					    ['state','cid']);
+    if (($ENV{'form.domain'}) && ($ENV{'form.course'})) {
+	$ENV{'form.cid'}=$ENV{'form.domain'}.'_'.$ENV{'form.course'};
+    }
 
     unless (&Apache::lonnet::allowed('mky',$ENV{'request.role.domain'})) {
         $ENV{'user.error.msg'}=
             "/adm/managekeys:mky:0:0:Cannot manage access keys";
         return HTTP_NOT_ACCEPTABLE; 
     }
-    #
-    # Only output the header information if they did not request csv format
-    #
-    if (exists($ENV{'form.state'}) && ($ENV{'form.state'} eq 'csv')) {
-        $r->content_type('text/csv');
-    } else {
-        # Start page
-        $r->content_type('text/html');
-        $r->send_http_header;
-        $r->print(&header());
-    }
-#
-# do stuff here.
-#
-
-    if (exists($ENV{'form.state'}) && ($ENV{'form.state'} eq 'csv')) {
-        $r->print("\n");
+    if ($ENV{'form.cid'}) {
+        my %cenv=&Apache::lonnet::coursedescription($ENV{'form.cid'});
+	if (exists($ENV{'form.state'}) && ($ENV{'form.state'} eq 'csv')) {
+#
+# CSV Output
+#
+	    $r->content_type('text/csv');
+#
+# Do CSV
+#
+	} else {
+#
+# Normal web stuff
+#
+	    $r->content_type('text/html');
+	    $r->send_http_header;
+	    $r->print(&header());
+	
+	    $r->print(
+	    '<input type="hidden" name="cid" value="'.$ENV{'form.cid'}.'" />');
+# --- Actions
+	    if ($ENV{'form.toggle'}) {
+		$r->print(&togglekeyaccess(%cenv).'<br />');
+		%cenv=&Apache::lonnet::coursedescription($ENV{'form.cid'});
+	    }
+            my $batchnumber='';
+	    if ($ENV{'form.genkeys'}) {
+		(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);
+            }
+            if ($ENV{'form.addcom'}) {
+		&addcom(%cenv);
+            }
+# --- Menu
+	    $r->print('<h3>Key Access</h3>');
+	    if ($cenv{'keyaccess'} eq 'yes') {
+		$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.<br /><input type="submit" name="toggle" value="Control Access" />');
+	    }
+	    $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" />
+<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 {
-        $r->print('</form></body></html>');
+	# Start page no course id
+	$r->content_type('text/html');
+	$r->send_http_header;
+	$r->print(&header().&Apache::loncommon::coursebrowser_javascript());
+        $r->print(
+   'Course ID: <input input type="text" size="25" name="course" value="" />');
+        $r->print('Domain: '.&Apache::loncommon::select_dom_form(
+               $ENV{'request.role.domain'},'domain'));
+        $r->print(&Apache::loncommon::selectcourse_link(
+					        'keyform','course','domain'));
+        $r->print('<br /><input type="submit" value="Manage Access Keys" />');
+	$r->print('</form></body></html>');
     }
     return OK;
 }