--- loncom/auth/lonroles.pm 2003/09/11 20:03:28 1.67 +++ loncom/auth/lonroles.pm 2003/12/30 22:45:59 1.81 @@ -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.81 2003/12/30 22:45:59 www 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(); @@ -76,6 +77,17 @@ ENDREDIR return; } +sub authorbombs { + my ($uname,$udom)=@_; + my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom); + foreach (keys %bombs) { + if ($_=~/^$udom\/$uname\//) { + return ''; + } + } + return ''; +} + sub handler { my $r = shift; @@ -130,7 +142,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 +176,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 +184,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 +195,9 @@ ENDENTERKEY "request.course.id" => $cdom.'_'.$cnum); $furl='/adm/roles?tryagain=1'; $msg= - '

Could not initialize course at this time.

Please try again.

'.$ferr; + '

'. + &mt('Could not initialize course at this time.'). + '

'.&mt('Please try again.').'

'.$ferr; } # Check to see if the user is a CC entering a course @@ -199,7 +213,7 @@ ENDENTERKEY } # # Send the user to the course they selected - &redirect_user($r,'Entering Course', + &redirect_user($r,&mt('Entering Course'), $furl,$msg); return OK; } @@ -215,7 +229,7 @@ ENDENTERKEY $redirect_url .= $1; } $redirect_url .= '/'; - &redirect_user($r,'Entering Construction Space', + &redirect_user($r,&mt('Entering Construction Space'), $redirect_url); return OK; } @@ -227,7 +241,7 @@ ENDENTERKEY # =============================================================== No Roles Init - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); &Apache::loncommon::no_cache($r); $r->send_http_header; return OK if $r->header_only; @@ -235,7 +249,7 @@ ENDENTERKEY my $swinfo=&Apache::lonmenu::rawconfig(); my $bodytag=&Apache::loncommon::bodytag('User Roles'); my $helptag=&Apache::loncommon::help_open_topic - ("General_Intro","Click here for help"); + ("General_Intro",&mt("Click here for help")); $r->print(< @@ -274,34 +288,35 @@ ENDHEADER } else { if ($ENV{'user.error.msg'}) { $r->print( - '

You need to choose another user role or '. - 'enter a specific course for this function

'); + '

'. + &mt('You need to choose another user role or enter a specific course for this function').'

'); } } # -------------------------------------------------------- Choice or no choice? if ($nochoose) { if ($advanced) { - $r->print("

Assigned User Roles

\n"); + $r->print("

".&mt('Assigned User Roles')."

\n"); } else { - $r->print("

Sorry ...

\nThis resource might be part of"); + $r->print("

".&mt('Sorry ...')."

\n". + &mt('This resource might be part of')); if ($ENV{'request.course.id'}) { - $r->print(' another'); + $r->print(&mt(' another')); } else { - $r->print(' a certain'); + $r->print(&mt(' a certain')); } - $r->print(' course.'); + $r->print(&mt(' course.').''); return OK; } } else { if ($advanced) { - $r->print("Your home server is ". + $r->print(&mt("Your home server is "). $Apache::lonnet::hostname{&Apache::lonnet::homeserver ($ENV{'user.name'},$ENV{'user.domain'})}. "
\n"); - $r->print("Author and Co-Author roles may not be available on ". - "servers other than your home server."); + $r->print(&mt( + "Author and Co-Author roles may not be available on servers other than your home server.")); } else { - $r->print("

Select a Course to Enter

\n"); + $r->print("

".&mt('Select a Course to Enter')."

\n"); } if (($ENV{'REDIRECT_QUERY_STRING'}) && ($fn)) { $fn.='?'.$ENV{'REDIRECT_QUERY_STRING'}; @@ -312,19 +327,23 @@ ENDHEADER } if ($ENV{'user.adv'}) { $r->print( - '
Show all roles: '.&mt('Show all roles').': print(' checked'); } - $r->print('>'); + $r->print('>'); } # ----------------------------------------------------------------------- Table $r->print('
'); unless ($nochoose) { $r->print(''); } - $r->print(''. - ''."\n"); + $r->print(''."\n"); + my (%roletext,%sortrole,%roleclass); foreach $envkey (sort keys %ENV) { my $button = 1; my $switchserver=''; + my $roletext; + my $sortkey; if ($envkey=~/^user\.role\./) { my (undef,undef,$role,@pwhere)=split(/\./,$envkey); next if (!defined($role) || $role eq ''); @@ -341,7 +360,7 @@ ENDHEADER $tstatus='future'; if ($tstart<$now) { $tstatus='will'; } } - $tpstart=localtime($tstart); + $tpstart=&Apache::lonlocal::locallocaltime($tstart); } if ($tend) { if ($tend<$then) { @@ -349,7 +368,7 @@ ENDHEADER } elsif ($tend<$now) { $tstatus='will_not'; } - $tpend=localtime($tend); + $tpend=&Apache::lonlocal::locallocaltime($tend); } if ($ENV{'request.role'} eq $trolecode) { $tstatus='selected'; @@ -365,23 +384,24 @@ ENDHEADER $button=0; } elsif ($tstatus eq 'will') { $tbg='#FFAA77'; - $tremark.='Active at next login. '; + $tremark.=&mt('Active at next login. '); } elsif ($tstatus eq 'expired') { $tbg='#FF7777'; $tfont='#330000'; $button=0; } elsif ($tstatus eq 'will_not') { $tbg='#AAFF77'; - $tremark.='Expired after logout. '; + $tremark.=&mt('Expired after logout. '); } elsif ($tstatus eq 'selected') { $tbg='#11CC55'; $tfont='#002200'; - $tremark.='Currently selected. '; + $tremark.=&mt('Currently selected. '); } my $trole; if ($role =~ /^cr\//) { my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role); - $tremark.='
Defined by '.$rauthor.' at '.$rdomain.'.'; + $tremark.='
'.&mt('Defined by ').$rauthor. + &mt(' at ').$rdomain.'.'; $trole=$rrole; } else { $trole=Apache::lonnet::plaintext($role); @@ -404,9 +424,12 @@ ENDHEADER #next if ($home eq 'no_host'); $home = $Apache::lonnet::hostname{$home}; $ttype='Construction Space'; - $twhere='User: '.$trest.'
Domain: '.$tdom.'
'. - ' Server: '.$home; + $twhere=&mt('User').': '.$trest.'
'.&mt('Domain'). + ': '.$tdom.'
'. + ' '.&mt('Server').': '.$home; $ENV{'course.'.$tdom.'_'.$trest.'.description'}='ca'; + $tremark.=&authorbombs($trest,$tdom); + $sortkey=$role."$trest:$tdom"; } elsif ($role eq 'au') { # Authors my $home = &Apache::lonnet::homeserver @@ -422,97 +445,137 @@ ENDHEADER #next if ($home eq 'no_host'); $home = $Apache::lonnet::hostname{$home}; $ttype='Construction Space'; - $twhere='Domain: '.$tdom.'
Server: '.$home; + $twhere=&mt('Domain').': '.$tdom.'
'.&mt('Server'). + ': '.$home; $ENV{'course.'.$tdom.'_'.$trest.'.description'}='ca'; + $tremark.=&authorbombs($ENV{'user.name'},$tdom); + $sortkey=$role; } elsif ($trest) { $ttype='Course'; if ($tsection) { - $ttype.='
Section/Group: '.$tsection; + $ttype.='
'.&mt('Section/Group').': '.$tsection; } my $tcourseid=$tdom.'_'.$trest; if ($ENV{'course.'.$tcourseid.'.description'}) { $twhere=$ENV{'course.'.$tcourseid.'.description'}; - unless ($twhere eq 'Currently not available') { + $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey; + unless ($twhere eq &mt('Currently not available')) { $twhere.=' '. - &Apache::loncommon::syllabuswrapper('Syllabus',$trest,$tdom,$tfont). + &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom,$tfont). ''; } } else { my %newhash=Apache::lonnet::coursedescription ($tcourseid); if (%newhash) { + $sortkey=$role."\0".$tdom."\0".$newhash{'description'}. + "\0".$envkey; $twhere=$newhash{'description'}. ' '. - &Apache::loncommon::syllabuswrapper('Syllabus',$trest,$tdom,$tfont). + &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom,$tfont). ''; } else { - $twhere='Currently not available'; + $twhere=&mt('Currently not available'); $ENV{'course.'.$tcourseid.'.description'}=$twhere; + $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey; } } - if ($role ne 'st') { $twhere.="
Domain:".$tdom; } + if ($role ne 'st') { $twhere.="
".&mt('Domain').":".$tdom; } } elsif ($tdom) { $ttype='Domain'; $twhere=$tdom; + $sortkey=$role.$twhere; } else { $ttype='System'; - $twhere='system wide'; + $twhere=&mt('system wide'); + $sortkey=$role.$twhere; } - $r->print(''); + $roletext.=''; unless ($nochoose) { if (!$button) { if ($switchserver) { - $r->print(''); + $roletext.=''; } else { - $r->print(''); + $roletext.=(''); } } elsif ($tstatus eq 'is') { - $r->print(''); } elsif ($tryagain) { - $r->print - (''); + $roletext.= + ''; } elsif ($advanced) { - $r->print - (''); + $roletext.= + ''; } else { - $r->print(''); + $roletext.=''; } } $tremark.=&Apache::lonannounce::showday(time,1, &Apache::lonannounce::readcalendar($tdom.'_'.$trest)); - $r->print(''."\n"); + ' '."\n"; + $roletext{$envkey}=$roletext; + if (!$sortkey) {$sortkey=$twhere."\0".$envkey;} + $sortrole{$sortkey}=$envkey; + $roleclass{$envkey}=$ttype; } } } + my $doheaders=-1; + foreach my $type ('Construction Space','Course','Domain','System') { + my $haverole=0; + foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) { + if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { + $haverole=1; + } + } + if ($haverole) { $doheaders++; } + } + foreach my $type ('Construction Space','Course','Domain','System') { + my $output; + foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) { + if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { + $output.=&mt($roletext{$sortrole{$which}}); + } + } + if ($output) { + if ($doheaders > 0) { + $r->print("". + ""); + } + $r->print($output); + } + } my $tremark=''; my $tfont='#003300'; if ($ENV{'request.role'} eq 'cm') { $r->print(''); - $tremark='Currently selected.'; + $tremark=&mt('Currently selected. '); $tfont='#002200'; } else { $r->print(''); } unless ($nochoose) { if ($ENV{'request.role'} ne 'cm') { - $r->print(''); + $r->print(''); } else { $r->print(''); } } - $r->print(''."\n");
 User RoleExtentStartEndRemark
'.&mt('User Role').''.&mt('Extent'). + ''.&mt('Start').''.&mt('End').''. + &mt('Remark').'
Switch Server'.&mt('Switch Server').'    '.$trole. + $roletext.=''.$trole. ''.$ttype. ''.$twhere. ''.$tpstart. ''.$tpend. ''.$tremark. - ' 
".&mt($type)."
 No role specified'. + $r->print(''.&mt('No role specified'). ''.$tremark. '