--- loncom/auth/lonroles.pm 2005/04/07 06:56:21 1.118 +++ loncom/auth/lonroles.pm 2005/06/05 07:57:28 1.121 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # User Roles Screen # -# $Id: lonroles.pm,v 1.118 2005/04/07 06:56:21 albertel Exp $ +# $Id: lonroles.pm,v 1.121 2005/06/05 07:57:28 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -39,6 +39,7 @@ use Apache::loncommon; use Apache::lonhtmlcommon; use Apache::lonannounce; use Apache::lonlocal; +use GDBM_File; sub redirect_user { my ($r,$title,$url,$msg,$launch_nav) = @_; @@ -232,9 +233,6 @@ ENDENTERKEY if (($env{'form.orgurl'}) && ($env{'form.orgurl'}!~/^\/adm\/flip/)) { my $dest=$env{'form.orgurl'}; - if ( &Apache::lonnet::mod_perl_version() == 2 ) { - &Apache::lonnet::cleanenv(); - } if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; } &Apache::lonnet::appenv('request.role.adv'=>$tadv); $r->internal_redirect($dest); @@ -341,7 +339,18 @@ ENDHEADER $r->print("
Access : ". Apache::lonnet::plaintext($priv)."\n"); $r->print("Resource: ".&Apache::lonenc::check_encrypt($fn)."\n"); - $r->print("Action : $msg\n
'); } - $r->print(' | '.&mt('User Role').' | '.&mt('Extent'). + $r->print(' | '.&mt('User Role').' | '.&mt('Extent'). ' | '.&mt('Start').' | '.&mt('End').' | '. &mt('Remarks and Calendar Announcements').' | |
---|---|---|---|---|---|---|---|---|
". + $r->print(" | ||||||||
". &mt('Recent Roles')." | "); $r->print($output); $r->print("||||||||
".&mt($type)." | ".&mt($type)." | "); } $r->print($output); } @@ -651,7 +661,7 @@ ENDHEADER $r->print(''); } } - $r->print(' | '.&mt('No role specified'). + $r->print(' | '.&mt('No role specified'). ' | '.$tremark. ' | '."\n"); @@ -780,8 +790,7 @@ sub build_roletext { $roletext.=''.$trole. - ' | '.$ttype. - ' | '.$twhere. + ' | '.$twhere. ' | '.$tpstart. ' | '.$tpend. ' | '.$tremark. @@ -944,11 +953,11 @@ sub allcourses_row { 'onClick="verifyCoursePick(this)">'. ' | '. ''. - $ccrole.' | '.&mt('Course').' | '. + $ccrole.''. ''.&mt('All courses').': '.
$selectlink.''.
' '.&mt('Domain').':'.$dcdom.''. - ' | '. + ' | '. &mt('Course Coordinator access to all courses in domain'). ': '.$dcdom.' | '."\n"; return $output;