--- loncom/auth/lonroles.pm 2006/11/23 01:49:41 1.170 +++ loncom/auth/lonroles.pm 2006/12/14 20:49:23 1.174 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # User Roles Screen # -# $Id: lonroles.pm,v 1.170 2006/11/23 01:49:41 albertel Exp $ +# $Id: lonroles.pm,v 1.174 2006/12/14 20:49:23 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -126,7 +126,7 @@ sub handler { if ($numdc > 0) { foreach my $envkey (keys %env) { if (my ($domain,$coursenum) = - ($envkey =~ m-^form\.cc\./($match_domain)/($match_username)$-)) { + ($envkey =~ m-^form\.cc\./($match_domain)/($match_courseid)$-)) { if ($dcroles{$domain}) { &check_privs($domain,$coursenum,$then,$now); } @@ -165,7 +165,7 @@ sub handler { my $authnum=$cnum; if ($env{'course.'.$cdom.'_'.$cnum.'.keyauth'}) { ($authnum,$authdom)= - split(/\W/,$env{'course.'.$cdom.'_'.$cnum.'.keyauth'}); + split(/:/,$env{'course.'.$cdom.'_'.$cnum.'.keyauth'}); } # check with key authority unless (&Apache::lonnet::validate_access_key( @@ -407,10 +407,17 @@ ENDHEADER # --------------------------------------------------------------- Error Header? if ($error) { $r->print("
Access : ". - Apache::lonnet::plaintext($priv)."\n"); - $r->print("Resource: ".&Apache::lonenc::check_encrypt($fn)."\n"); - $r->print("Action : $msg\n
"); + if ($priv ne '') { + $r->print("Access : ".&Apache::lonnet::plaintext($priv)."\n"); + } + if ($fn ne '') { + $r->print("Resource: ".&Apache::lonenc::check_encrypt($fn)."\n"); + } + if ($msg ne '') { + $r->print("Action : $msg\n"); + } + $r->print("
'); } $r->print(' | '.&mt('User Role').' | '.&mt('Extent'). ' | '.&mt('Start').' | '.&mt('End').' |
---|---|---|---|---|
';
- foreach my $type ('Course','Group') {
- my $selectlink = &courselink($dcdom,$rowtype,$type);
- my $ccrole = &Apache::lonnet::plaintext('cc',$type);
- $output.= ''.$ccrole.''.
+ my $selectlink = &courselink($dcdom,$rowtype);
+ my $ccrole = &Apache::lonnet::plaintext('cc');
+ $output.= ''.$ccrole.''.
' '.$selectlink.''.
' from '.&mt('Domain').' '.$dcdom.' '; - } $output .= ' | ||||