--- loncom/interface/lonmanagekeys.pm 2003/04/23 20:29:17 1.5 +++ loncom/interface/lonmanagekeys.pm 2005/02/17 08:29:42 1.16 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to manage course access keys # -# $Id: lonmanagekeys.pm,v 1.5 2003/04/23 20:29:17 www Exp $ +# $Id: lonmanagekeys.pm,v 1.16 2005/02/17 08:29:42 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,13 +36,15 @@ use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::Constants qw(:common :http REDIRECT); use Spreadsheet::WriteExcel; +use Apache::lonlocal; ############################################################### ############################################################### sub header { + my $html=&Apache::lonxml::xmlbegin(); my $bodytag=&Apache::loncommon::bodytag('Access Key Management'); return(< +$html LON-CAPA Access Key Management @@ -54,65 +56,66 @@ ENDHEAD # =================================================== Show student list to drop sub show_key_list { - my ($r,$mode,$linkto,$action,$statusmode,$classlist,$keylist)=@_; -# -# Just junk so that this compiles -# - my ($username,$domain,$id,$name,$section,$status,@Sorted_Students); -# -# -# - my $cid=$ENV{'form.cid'}; - # - # Variables for excel output - my ($excel_workbook, $excel_sheet, $excel_filename,$row); - # - - # Print out header - if ($mode eq 'view') { - } elsif ($mode eq 'excel') { - # Create the excel spreadsheet - $excel_filename = '/prtspool/'. - $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'. - time.'_'.rand(1000000000).'.xls'; - $excel_workbook = Spreadsheet::WriteExcel->new('/home/httpd'. - $excel_filename); - $excel_workbook->set_tempdir('/home/httpd/perl/tmp'); - $excel_sheet = $excel_workbook->addworksheet('classlist'); - # - my $description = 'Classlist for '. - $ENV{'course.'.$ENV{'request.course.id'}.'.description'}; - $excel_sheet->write($row++,0,$description); - # - $excel_sheet->write($row++,0,["username","domain","ID", - "student name","section","status"]); - } - foreach my $student (@Sorted_Students) { - if ($mode eq 'view') { - } elsif ($mode eq 'csv') { - # no need to bother with $linkto - my @line = (); - foreach ($username,$domain,$id,$name,$section) { - push @line,&Apache::loncommon::csv_translate($_); + my ($r,$csvlist,$comment,$newonly,$checkonly,%cenv)=@_; + $comment=~s/\W/\./g; + my %accesskeys=&Apache::lonnet::dump + ('accesskeys',$cenv{'domain'},$cenv{'num'}); + unless ($csvlist) { + $r->print(< + function copyallcom(tf) { + for (i=0; iprint("\"@line\"\n"); - $" = $tmp; - } elsif ($mode eq 'excel') { - $excel_sheet->write($row++,0,[$username,$domain,$id, - $name,$section,$status]); } + + } + +

List of Keys/Enter New Comments

+ + + +ENDTABLEHEADER + } + foreach (keys %accesskeys) { + if ($_=~/^error\:/) { + $r->print(''); + } elsif ($accesskeys{$_}=~/$comment/) { + my ($checkout,$com)=split(/\s*\#\s*/,$accesskeys{$_}); + unless ($checkout) { + if ($checkonly) { next; } + } else { + if ($newonly) { next; } + } + unless ($csvlist) { + $r->print("\n'); + } else { + my @line = (); + push @line,&Apache::loncommon::csv_translate($_); + push @line,&Apache::loncommon::csv_translate($checkout); + foreach (split(/\s*\;\s*/,$com)) { + push @line,&Apache::loncommon::csv_translate($_); + } + my $tmp = $"; + $" = '","'; + $r->print("\"@line\"\n"); + $" = $tmp; + } + } } - if ($mode eq 'view') { - } elsif ($mode eq 'excel') { - $excel_workbook->close(); - $r->print('

'. - 'Your Excel spreadsheet is ready for download.

'."\n"); + unless ($csvlist) { + $r->print('
KeyChecked OutComments/Remarks/NotesEnter Additional Comments/Remarks/Notes
+ + +
No keys have been generated yet.
".$_.''.($checkout? + $checkout:'-').''. + join('
',split(/\s*\;\s*/,$com)). + '
'); + $r->print('
'); } + return ''; } @@ -149,12 +152,31 @@ sub genkeys { $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 { my $r=shift; if ($r->header_only) { - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK; } @@ -170,20 +192,34 @@ sub handler { return HTTP_NOT_ACCEPTABLE; } if ($ENV{'form.cid'}) { - my %cenv=&Apache::lonnet::coursedescription($ENV{'form.cid'}); - if (exists($ENV{'form.state'}) && ($ENV{'form.state'} eq 'csv')) { + my %cenv=&Apache::lonnet::coursedescription($ENV{'form.cid'}); + my $keytype=''; + if ($cenv{'url'} eq '/res/') { + ($cenv{'domain'},$cenv{'num'})=split(/\_/,$ENV{'form.cid'}); + $keytype='auth'; + } elsif ($cenv{'keyauth'}) { + ($cenv{'num'},$cenv{'domain'})=split(/\W/,$cenv{'keyauth'}); + $keytype='auth'; + } else { + $keytype='course'; + } + if ($ENV{'form.listkeyscsv'}) { # # CSV Output # $r->content_type('text/csv'); + $r->send_http_header; # # Do CSV # + &show_key_list($r,1,$ENV{'form.listcom'}, + $ENV{'form.newonly'},$ENV{'form.checkonly'},%cenv); + } else { # # Normal web stuff # - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; $r->print(&header()); @@ -201,14 +237,24 @@ sub handler { $r->print($msg.'
'); } if ($ENV{'form.listkeys'}) { - &show_key_list($ENV{'form.listcom'},%cenv); + &show_key_list($r,0,$ENV{'form.listcom'}, + $ENV{'form.newonly'},$ENV{'form.checkonly'},%cenv); + } + if ($ENV{'form.addcom'}) { + &addcom(%cenv); } # --- Menu - $r->print('

Key Access

'); - if ($cenv{'keyaccess'} eq 'yes') { - $r->print('Access to this course is key controlled.
') + if ($keytype eq 'course') { + $r->print('

'.&mt('Key Access').'

'); + if ($cenv{'keyaccess'} eq 'yes') { + $r->print(&mt('Access to this course is key controlled.'). +'
') } else { - $r->print('Access to this course is open, no access keys.
'); + $r->print(&mt('Access to this course is open, no access keys').'
'); + } + } else { + $r->print('

'.&mt('Key Authority'). + ' '.$cenv{'num'}.'@'.$cenv{'domain'}.'

'); } $r->print(<

Generate New Keys

@@ -216,24 +262,27 @@ Number of keys to be generated:

List Keys

-Comments/Remarks/Notes/Batch Number: +Comments/Remarks/Notes/User/Batch Number Filter:
- + Unused keys only
+ Used keys only
+ + ENDKEYMENU $r->print(''); } } else { # Start page no course id - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; $r->print(&header().&Apache::loncommon::coursebrowser_javascript()); $r->print( - 'Course ID: '); - $r->print('Domain: '.&Apache::loncommon::select_dom_form( + &mt('Course ID of Key Authority').': '); + $r->print(&mt('Domain').': '.&Apache::loncommon::select_dom_form( $ENV{'request.role.domain'},'domain')); $r->print(&Apache::loncommon::selectcourse_link( 'keyform','course','domain')); - $r->print('
'); + $r->print('
'); $r->print(''); } return OK;