--- loncom/auth/lonroles.pm 2003/09/11 20:03:28 1.67 +++ loncom/auth/lonroles.pm 2003/11/08 12:06:38 1.75 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # User Roles Screen # -# $Id: lonroles.pm,v 1.67 2003/09/11 20:03:28 albertel Exp $ +# $Id: lonroles.pm,v 1.75 2003/11/08 12:06:38 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -51,11 +51,12 @@ use Apache::File(); use Apache::lonmenu; use Apache::loncommon; use Apache::lonannounce; +use Apache::lonlocal; sub redirect_user { my ($r,$title,$url,$msg) = @_; $msg = $title if (! defined($msg)); - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); &Apache::loncommon::no_cache($r); $r->send_http_header; my $swinfo=&Apache::lonmenu::rawconfig(); @@ -130,7 +131,7 @@ sub handler { # student attempts to register a new key } else { # print form to enter a new key - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); &Apache::loncommon::no_cache($r); $r->send_http_header; my $swinfo=&Apache::lonmenu::rawconfig(); @@ -164,7 +165,7 @@ ENDENTERKEY 'request.role.adv' => $tadv, 'request.role.domain' => $cdom, 'request.course.sec' => $csec); - my $msg='Entering course ...'; + my $msg=&mt('Entering course ...'); if (($cnum) && ($role ne 'ca')) { my ($furl,$ferr)= @@ -172,7 +173,7 @@ ENDENTERKEY if (($ENV{'form.orgurl'}) && ($ENV{'form.orgurl'}!~/^\/adm\/flip/)) { my $dest=$ENV{'form.orgurl'}; - if ( Apache::exists_config_define("MODPERL2") ) { + if ( &Apache::lonnet::mod_perl_version() == 2 ) { &Apache::lonnet::cleanenv(); } $r->internal_redirect($dest); @@ -183,7 +184,9 @@ ENDENTERKEY "request.course.id" => $cdom.'_'.$cnum); $furl='/adm/roles?tryagain=1'; $msg= - '