--- loncom/interface/lonmanagekeys.pm 2003/09/23 00:26:10 1.13 +++ loncom/interface/lonmanagekeys.pm 2006/04/26 14:52:22 1.19 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to manage course access keys # -# $Id: lonmanagekeys.pm,v 1.13 2003/09/23 00:26:10 www Exp $ +# $Id: lonmanagekeys.pm,v 1.19 2006/04/26 14:52:22 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,7 +31,7 @@ package Apache::lonmanagekeys; use strict; -use Apache::lonnet(); +use Apache::lonnet; use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::Constants qw(:common :http REDIRECT); @@ -41,13 +41,9 @@ use Apache::lonlocal; ############################################################### ############################################################### sub header { - my $bodytag=&Apache::loncommon::bodytag('Access Key Management'); + my $start_page=&Apache::loncommon::start_page('Access Key Management'); return(< - -LON-CAPA Access Key Management - -$bodytag +$start_page
ENDHEAD @@ -157,10 +153,10 @@ sub addcom { my %cenv=@_; my %newcomment=(); undef %newcomment; - foreach (keys %ENV) { + foreach (keys %env) { if ($_=~/^form\.com\_(.+)$/) { my $key=$1; - my $comment=$ENV{$_}; + my $comment=$env{$_}; $comment=~s/^\s+//gs; if ($comment) { &Apache::lonnet::comment_access_key @@ -181,18 +177,28 @@ sub handler { } &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'}; + 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'}= + 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; } - if ($ENV{'form.cid'}) { - my %cenv=&Apache::lonnet::coursedescription($ENV{'form.cid'}); - if ($ENV{'form.listkeyscsv'}) { + if ($env{'form.cid'}) { + 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 # @@ -201,8 +207,8 @@ sub handler { # # Do CSV # - &show_key_list($r,1,$ENV{'form.listcom'}, - $ENV{'form.newonly'},$ENV{'form.checkonly'},%cenv); + &show_key_list($r,1,$env{'form.listcom'}, + $env{'form.newonly'},$env{'form.checkonly'},%cenv); } else { # @@ -213,32 +219,38 @@ sub handler { $r->print(&header()); $r->print( - ''); + ''); # --- Actions - if ($ENV{'form.toggle'}) { + if ($env{'form.toggle'}) { $r->print(&togglekeyaccess(%cenv).'
'); - %cenv=&Apache::lonnet::coursedescription($ENV{'form.cid'}); + %cenv=&Apache::lonnet::coursedescription($env{'form.cid'}, + {'freshen_cache'=> 1}); } my $batchnumber=''; - if ($ENV{'form.genkeys'}) { + if ($env{'form.genkeys'}) { (my $msg,$batchnumber)= - &genkeys($ENV{'form.num'},$ENV{'form.comments'},%cenv); + &genkeys($env{'form.num'},$env{'form.comments'},%cenv); $r->print($msg.'
'); } - if ($ENV{'form.listkeys'}) { - &show_key_list($r,0,$ENV{'form.listcom'}, - $ENV{'form.newonly'},$ENV{'form.checkonly'},%cenv); + if ($env{'form.listkeys'}) { + &show_key_list($r,0,$env{'form.listcom'}, + $env{'form.newonly'},$env{'form.checkonly'},%cenv); } - if ($ENV{'form.addcom'}) { + if ($env{'form.addcom'}) { &addcom(%cenv); } # --- Menu - $r->print('

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

'); - if ($cenv{'keyaccess'} eq 'yes') { - $r->print(&mt('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(&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

@@ -253,7 +265,7 @@ Comments/Remarks/Notes/User/Batch Number ENDKEYMENU - $r->print(''); + $r->print(''.&Apache::loncommon::end_page()); } } else { # Start page no course id @@ -261,13 +273,13 @@ ENDKEYMENU $r->send_http_header; $r->print(&header().&Apache::loncommon::coursebrowser_javascript()); $r->print( - &mt('Course ID').': '); + &mt('Course ID of Key Authority').': '); $r->print(&mt('Domain').': '.&Apache::loncommon::select_dom_form( - $ENV{'request.role.domain'},'domain')); + $env{'request.role.domain'},'domain')); $r->print(&Apache::loncommon::selectcourse_link( 'keyform','course','domain')); $r->print('
'); - $r->print(''); + $r->print(''.&Apache::loncommon::end_page()); } return OK; }