--- loncom/auth/lonroles.pm 2010/08/17 20:06:30 1.257 +++ loncom/auth/lonroles.pm 2014/03/25 09:41:16 1.301 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # User Roles Screen # -# $Id: lonroles.pm,v 1.257 2010/08/17 20:06:30 raeburn Exp $ +# $Id: lonroles.pm,v 1.301 2014/03/25 09:41:16 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -138,10 +138,12 @@ use Apache::lonlocal; use Apache::lonpageflip(); use Apache::lonnavdisplay(); use Apache::loncoursequeueadmin; +use Apache::longroup; +use Apache::lonrss; use GDBM_File; use LONCAPA qw(:DEFAULT :match); use HTML::Entities; - + sub redirect_user { my ($r,$title,$url,$msg) = @_; @@ -203,13 +205,48 @@ sub handler { my $now=time; my $then=$env{'user.login.time'}; my $refresh=$env{'user.refresh.time'}; + my $update=$env{'user.update.time'}; if (!$refresh) { $refresh = $then; } + if (!$update) { + $update = $then; + } + + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}); + +# -------------------------------------------------- Check if setting hot list + my $hotlist; + if ($env{'form.action'} eq 'verify_and_change_rolespref') { + $hotlist = &Apache::lonpreferences::verify_and_change_rolespref($r); + } + +# -------------------------------------------------------- Check for new roles + my $updateresult; + if ($env{'form.state'} eq 'doupdate') { + my $show_course=&Apache::loncommon::show_course(); + my $checkingtxt; + if ($show_course) { + $checkingtxt = &mt('Checking for new courses ...'); + } else { + $checkingtxt = &mt('Checking for new roles ...'); + } + $updateresult = $checkingtxt; + $updateresult .= &update_session_roles(); + &Apache::lonnet::appenv({'user.update.time' => $now}); + $update = $now; + &Apache::loncoursequeueadmin::reqauthor_check(); + } + +# -------------------------------------------------- Check for author requests + my $reqauthor; + if ($env{'form.state'} eq 'requestauthor') { + $reqauthor = &Apache::loncoursequeueadmin::process_reqauthor(\$update); + } + my $envkey; my %dcroles = (); - my $numdc = &check_fordc(\%dcroles,$then); - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}); + my $numdc = &check_fordc(\%dcroles,$update,$then); my $loncaparev = $Apache::lonnet::perlvar{'lonVersion'}; # ================================================================== Roles Init @@ -228,13 +265,13 @@ sub handler { if (defined($env{'user.role.'.$env{'form.switchrole'}})) { my ($start,$end) = split(/\./,$env{'user.role.'.$env{'form.switchrole'}}); if (!$end || $end > $now) { - if (!$start || $start < $refresh) { + if (!$start || $start < $update) { $switch_is_active = 1; } } } unless ($switch_is_active) { - &adhoc_course_role($refresh,$then); + &adhoc_course_role($refresh,$update,$then); } } my %temp=('logout_'.$env{'request.course.id'} => time); @@ -245,18 +282,21 @@ sub handler { "request.course.fn" => '', "request.course.uri" => '', "request.course.sec" => '', + "request.course.tied" => '', "request.role" => 'cm', "request.role.adv" => $env{'user.adv'}, "request.role.domain" => $env{'user.domain'}}); # Check if user is a DC trying to enter a course or author space and needs privs to be created if ($numdc > 0) { - foreach my $envkey (keys %env) { + foreach my $envkey (keys(%env)) { # Is this an ad-hoc Coordinator role? if (my ($ccrole,$domain,$coursenum) = ($envkey =~ m-^form\.(cc|co)\./($match_domain)/($match_courseid)$-)) { if ($dcroles{$domain}) { - &Apache::lonnet::check_adhoc_privs($domain,$coursenum, - $then,$refresh,$now,$ccrole); + if (&Apache::lonnet::check_adhoc_privs($domain,$coursenum, + $update,$refresh,$now,$ccrole)) { + &Apache::lonnet::appenv({"environment.internal.$domain.$coursenum.$ccrole.adhoc" => time}); + } } last; } @@ -271,6 +311,7 @@ sub handler { my $trolecode = 'au./'.$domain.'/'; my $switchserver = '/adm/switchserver?otherserver='.$home.'&role='.$trolecode; $r->internal_redirect($switchserver); + return OK; } last; } @@ -282,6 +323,7 @@ sub handler { my $trolecode = 'ca./'.$domain.'/'.$user; my $switchserver = '/adm/switchserver?otherserver='.$home.'&role='.$trolecode; $r->internal_redirect($switchserver); + return OK; } last; } @@ -296,13 +338,14 @@ sub handler { if ($dcroles{$domain}) { my ($server_status,$home) = &check_author_homeserver($user,$domain); if (($server_status eq 'ok') || ($server_status eq 'switchserver')) { - &Apache::lonnet::check_adhoc_privs($domain,$user,$then, + &Apache::lonnet::check_adhoc_privs($domain,$user,$update, $refresh,$now,'ca'); if ($server_status eq 'switchserver') { my $trolecode = 'ca./'.$domain.'/'.$user; my $switchserver = '/adm/switchserver?' .'otherserver='.$home.'&role='.$trolecode; $r->internal_redirect($switchserver); + return OK; } } else { delete($env{$envkey}); @@ -315,10 +358,10 @@ sub handler { } } - foreach $envkey (keys %env) { + foreach $envkey (keys(%env)) { next if ($envkey!~/^user\.role\./); my ($where,$trolecode,$role,$tstatus,$tend,$tstart); - &Apache::lonnet::role_status($envkey,$then,$refresh,$now,\$role,\$where, + &Apache::lonnet::role_status($envkey,$update,$refresh,$now,\$role,\$where, \$trolecode,\$tstatus,\$tstart,\$tend); if ($env{'form.'.$trolecode}) { if ($tstatus eq 'is') { @@ -479,14 +522,37 @@ ENDENTERKEY my $msg; my ($furl,$ferr)= &Apache::lonuserstate::readmap($cdom.'/'.$cnum); + unless ($ferr) { + unless (($env{'form.switchrole'}) || + ($env{"environment.internal.$cdom.$cnum.$role.adhoc"})) { + &Apache::lonnet::put('nohist_crslastlogin', + {$env{'user.name'}.':'.$env{'user.domain'}. + ':'.$csec.':'.$role => $now},$cdom,$cnum); + } + my ($feeds,$syllabus_time); + &Apache::lonrss::advertisefeeds($cnum,$cdom,undef,\$feeds); + &Apache::lonnet::appenv({'request.course.feeds' => $feeds}); + &Apache::lonnet::get_numsuppfiles($cnum,$cdom,1); + unless ($env{'course.'.$cdom.'_'.$cnum.'.updatedsyllabus'}) { + unless (($env{'course.'.$cdom.'_'.$cnum.'.externalsyllabus'}) || + ($env{'course.'.$cdom.'_'.$cnum.'.uploadedsyllabus'})) { + my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum); + $syllabus_time = $syllabus{'uploaded.lastmodified'}; + if ($syllabus_time) { + &Apache::lonnet::appenv({'request.course.syllabustime' => $syllabus_time}); + } + } + } + } if (($env{'form.orgurl'}) && - ($env{'form.orgurl'}!~/^\/adm\/flip/)) { + ($env{'form.orgurl'}!~/^\/adm\/flip/) && + ($env{'form.orgurl'} ne '/adm/roles')) { my $dest=$env{'form.orgurl'}; if ($env{'form.symb'}) { if ($dest =~ /\?/) { $dest .= '&'; } else { - $dest .= '?' + $dest .= '?'; } $dest .= 'symb='.$env{'form.symb'}; } @@ -498,7 +564,8 @@ ENDENTERKEY if ($dest =~ m{^/adm/coursedocs\?folderpath}) { if ($env{'request.course.id'} eq $cdom.'_'.$cnum) { my $chome = &Apache::lonnet::homeserver($cnum,$cdom); - &update_content_constraints($cdom,$cnum,$chome,$cdom.'_'.$cnum); + &Apache::loncommon::update_content_constraints($cdom,$cnum,$chome, + $cdom.'_'.$cnum); } } $r->internal_redirect($dest); @@ -524,24 +591,60 @@ ENDENTERKEY } else { # Check to see if the user is a CC entering a course # for the first time - my (undef, undef, $role, $courseid) = split(/\./, $envkey); - if (substr($courseid, 0, 1) eq '/') { - $courseid = substr($courseid, 1); - } - $courseid =~ s/\//_/; if ((($role eq 'cc') || ($role eq 'co')) - && ($env{'course.' . $courseid .'.course.helper.not.run'})) { + && ($env{'course.'.$cdom.'_'.$cnum.'.course.helper.not.run'})) { $furl = "/adm/helper/course.initialization.helper"; # Send the user to the course they selected } elsif ($env{'request.course.id'}) { - if ($env{'form.destinationurl'}) { - my $dest = $env{'form.destinationurl'}; - if ($env{'form.destsymb'} ne '') { - my $esc_symb = &HTML::Entities::encode($env{'form.destsymb'},'"<>&'); - $dest .= '?symb='.$esc_symb; + my ($dest,$destsymb,$checkenc); + $dest = $env{'form.destinationurl'}; + $destsymb = $env{'form.destsymb'}; + if ($dest ne '') { + if ($env{'form.switchrole'}) { + if ($destsymb ne '') { + if ($destsymb !~ m{^/enc/}) { + unless ($env{'request.role.adv'}) { + $checkenc = 1; + } + } + } + if ($dest =~ m{^/enc/}) { + if ($env{'request.role.adv'}) { + $dest = &Apache::lonenc::unencrypted($dest); + if ($destsymb eq '') { + ($destsymb) = ($dest =~ /(?:\?|\&)symb=([^\&]*)/); + $destsymb = &unescape($destsymb); + } + } + } else { + if ($destsymb eq '') { + ($destsymb) = ($dest =~ /(?:\?|\&)symb=([^\&]+)/); + $destsymb = &unescape($destsymb); + } + unless ($env{'request.role.adv'}) { + $checkenc = 1; + } + } + if (($checkenc) && ($destsymb ne '')) { + my ($encstate,$unencsymb,$res); + $unencsymb = &Apache::lonnet::symbclean($destsymb); + (undef,undef,$res) = &Apache::lonnet::decode_symb($unencsymb); + &Apache::lonnet::symbverify($unencsymb,$res,\$encstate); + if ($encstate) { + if (($dest ne '') && ($dest !~ m{^/enc/})) { + $dest=&Apache::lonenc::encrypted($dest); + } + } + } + } + unless (($dest =~ m{^/enc/}) || ($dest =~ /(\?|\&)symb=.+___\d+___.+/)) { + if (($destsymb ne '') && ($destsymb !~ m{^/enc/})) { + my $esc_symb = &escape($destsymb); + $dest .= '?symb='.$esc_symb; + } } &redirect_user($r, &mt('Entering [_1]', - $env{'course.'.$courseid.'.description'}), + $env{'course.'.$cdom.'_'.$cnum.'.description'}), $dest, $msg); return OK; } @@ -551,25 +654,36 @@ ENDENTERKEY $env{'request.course.id'}.'/' .$env{'request.course.sec'}) ) { - my $startpage = &courseloadpage($courseid); + my $startpage = &courseloadpage($env{'request.course.id'}); unless ($startpage eq 'firstres') { $msg = &mt('Entering [_1] ...', - $env{'course.'.$courseid.'.description'}); + $env{'course.'.$env{'request.course.id'}.'.description'}); &redirect_user($r, &mt('New in course'), '/adm/whatsnew?refpage=start', $msg); return OK; } } } -# Are we allowed to look at the first resource? - if ($furl !~ m|^/adm/|) { -# Guess not ... - $furl=&Apache::lonpageflip::first_accessible_resource(); - } + # Are we allowed to look at the first resource? + if ($furl =~ m{^(/adm/wrapper|)/ext/}) { + # If it's an external resource, + # strip off the symb argument and possible query + my ($exturl,$symb) = ($furl =~ m{^(.+)(?:\?|\&)symb=(.+)$}); + # Unencode $symb + $symb = &unescape($symb); + # Then check for permission + if (!&Apache::lonnet::allowed('bre',$exturl,$symb)) { + $furl = &Apache::lonpageflip::first_accessible_resource(); + } + # For other resources just check for permission + } elsif (!&Apache::lonnet::allowed('bre',$furl)) { + $furl = &Apache::lonpageflip::first_accessible_resource(); + } + $msg = &mt('Entering [_1] ...', - $env{'course.'.$courseid.'.description'}); + $env{'course.'.$cdom.'_'.$cnum.'.description'}); &redirect_user($r, &mt('Entering [_1]', - $env{'course.'.$courseid.'.description'}), + $env{'course.'.$cdom.'_'.$cnum.'.description'}), $furl, $msg); } return OK; @@ -580,13 +694,12 @@ ENDENTERKEY if ($role =~ /^(au|ca|aa)$/) { my $redirect_url = '/priv/'; if ($role eq 'au') { - $redirect_url.=$env{'user.name'}; + $redirect_url.=$env{'user.domain'}.'/'.$env{'user.name'}; } else { - $where =~ /\/(.*)$/; - $redirect_url .= $1; + $redirect_url .= $where; } $redirect_url .= '/'; - &redirect_user($r,&mt('Entering Construction Space'), + &redirect_user($r,&mt('Entering Authoring Space'), $redirect_url); return OK; } @@ -618,22 +731,28 @@ ENDENTERKEY my $crumbtext = 'User Roles'; my $pagetitle = 'My Roles'; my $recent = &mt('Recent Roles'); + my $standby = &mt('Role selected. Please stand by.'); my $show_course=&Apache::loncommon::show_course(); if ($show_course) { $crumbtext = 'Courses'; $pagetitle = 'My Courses'; $recent = &mt('Recent Courses'); + $standby = &mt('Course selected. Please stand by.'); } my $brcrum =[{href=>"/adm/roles",text=>$crumbtext}]; + + my %roles_in_env; + my $showcount = &roles_from_env(\%roles_in_env,$update); + my $swinfo=&Apache::lonmenu::rawconfig(); my $start_page=&Apache::loncommon::start_page($pagetitle,undef,{bread_crumbs=>$brcrum}); - my $standby=&mt('Role selected. Please stand by.'); + my $funcs = &get_roles_functions($showcount); $standby=~s/\n/\\n/g; - my $noscript=''.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.').'
'.&mt('As this is not the case, most functionality in the system will be unavailable.').'
'; + my $noscript='
'.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.').'
'.&mt('As this is not the case, most functionality in the system will be unavailable.').'
'; $r->print(< +$funcs @@ -653,8 +772,22 @@ function enterrole (thisform,rolecode,bu thisform.submit(); } else { alert('$standby'); - } + } +} + +function rolesView (caller) { + if ((caller == 'showall') || (caller == 'noshowall')) { + document.rolechoice.display.value = caller; + } else { + if ((caller == 'doupdate') || (caller == 'requestauthor') || + (caller == 'queued')) { + document.rolechoice.state.value = caller; + } + } + document.rolechoice.selectrole.value=''; + document.rolechoice.submit(); } + // ]]> ENDHEADER @@ -715,47 +848,60 @@ ENDHEADER } } } -# -------------------------------------------------------- Choice or no choice? if ($nochoose) { $r->print("

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

\n". &mt('This action is currently not authorized.').''. &Apache::loncommon::end_page()); return OK; } else { + if ($updateresult || $reqauthor || $hotlist) { + my $showresult = '
'; + if ($updateresult) { + $showresult .= &Apache::lonhtmlcommon::confirm_success($updateresult); + } + if ($reqauthor) { + $showresult .= &Apache::lonhtmlcommon::confirm_success($reqauthor); + } + if ($hotlist) { + $showresult .= $hotlist; + } + $showresult .= '
'; + $r->print($showresult); + } elsif ($env{'form.state'} eq 'queued') { + $r->print(&get_queued()); + } if (($ENV{'REDIRECT_QUERY_STRING'}) && ($fn)) { $fn.='?'.$ENV{'REDIRECT_QUERY_STRING'}; } + my $display = ($env{'form.display'} =~ /^(showall)$/); $r->print('
'); $r->print(''); $r->print(''); $r->print(''); + $r->print(''); + $r->print(''); } + $r->rflush(); my (%roletext,%sortrole,%roleclass,%futureroles,%timezones); my ($countactive,$countfuture,$inrole,$possiblerole) = - &gather_roles($then,$refresh,$now,$reinit,$nochoose,\%roletext,\%sortrole,\%roleclass, - \%futureroles,\%timezones,$loncaparev); - + &gather_roles($update,$refresh,$now,$reinit,$nochoose,\%roles_in_env,\%roletext, + \%sortrole,\%roleclass,\%futureroles,\%timezones,$loncaparev); $refresh = $now; &Apache::lonnet::appenv({'user.refresh.time' => $refresh}); - if ($env{'user.adv'}) { - $r->print('

' - .' ' - .'

'); - } else { + unless ($env{'user.adv'}) { if ($countactive > 0) { - $r->print(&Apache::loncoursequeueadmin::queued_selfenrollment()); my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description'); my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); $r->print( '

' - .&mt('[_1]Visit the [_2]Course/Community Catalog[_3]' - .' to view all [_4] LON-CAPA courses and communities.' + .&mt('[_1]Visit the [_2]Course/Community Catalog[_3][_4]' + .' to view all [_5] LON-CAPA courses and communities.' ,'' ,'' - ,'',$domdesc) + ,'' + ,'' + ,'"'.$domdesc.'"') .'
' .&mt('If a course or community is [_1]not[_2] in your list of current courses and communities below,' .' you may be able to enroll if self-enrollment is permitted.' @@ -845,12 +991,16 @@ ENDHEADER } elsif ($numdc > 0) { unless ($role =~/^error\:/) { my ($roletext,$role_text_end) = &display_cc_role('user.role.'.$role); - $output.= &Apache::loncommon::start_data_table_row(). - $roletext. - &Apache::loncommon::end_data_table_row(). - &Apache::loncommon::continue_data_table_row(). - $role_text_end. - &Apache::loncommon::end_data_table_row(); + if ($roletext) { + $output.= &Apache::loncommon::start_data_table_row(). + $roletext. + &Apache::loncommon::end_data_table_row(); + if ($role_text_end) { + $output .= &Apache::loncommon::continue_data_table_row(). + $role_text_end. + &Apache::loncommon::end_data_table_row(); + } + } } } } @@ -900,7 +1050,12 @@ ENDHEADER $r->print('

'.&mt('Current Privileges').'

'); $r->print(&privileges_info()); } - $r->print(&Apache::lonnet::getannounce()); + my $announcements = &Apache::lonnet::getannounce(); + $r->print( + '
'. + '

'.&mt('Announcements').'

'. + $announcements + ) unless (!$announcements); if ($advanced) { my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); $r->print('

' @@ -915,32 +1070,44 @@ ENDHEADER return OK; } +sub roles_from_env { + my ($roleshash,$update) = @_; + my $count = 0; + if (ref($roleshash) eq 'HASH') { + foreach my $envkey (keys(%env)) { + if ($envkey =~ m{^user\.role\.(\w+)[./]}) { + next if ($1 eq 'gr'); + $roleshash->{$envkey} = $env{$envkey}; + my ($start,$end) = split(/\./,$env{$envkey}); + unless ($end && $end<$update) { + $count ++; + } + } + } + } + return $count; +} + sub gather_roles { - my ($then,$refresh,$now,$reinit,$nochoose,$roletext,$sortrole,$roleclass,$futureroles,$timezones,$loncaparev) = @_; + my ($update,$refresh,$now,$reinit,$nochoose,$roles_in_env,$roletext,$sortrole,$roleclass,$futureroles, + $timezones,$loncaparev) = @_; my ($countactive,$countfuture,$inrole,$possiblerole) = (0,0,0,''); my $advanced = $env{'user.adv'}; my $tryagain = $env{'form.tryagain'}; my @ids = &Apache::lonnet::current_machine_ids(); - foreach my $envkey (sort(keys(%env))) { - my $button = 1; - my $switchserver=''; - my $switchwarning; - my ($role_text,$role_text_end,$sortkey); - if ($envkey=~/^user\.role\./) { - my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus,$tpstart,$tpend); - &Apache::lonnet::role_status($envkey,$then,$refresh,$now,\$role,\$where, + if (ref($roles_in_env) eq 'HASH') { + foreach my $envkey (sort(keys(%{$roles_in_env}))) { + my $button = 1; + my $switchserver=''; + my $switchwarning; + my ($role_text,$role_text_end,$sortkey,$role,$where,$trolecode,$tstart, + $tend,$tremark,$tstatus,$tpstart,$tpend); + &Apache::lonnet::role_status($envkey,$update,$refresh,$now,\$role,\$where, \$trolecode,\$tstatus,\$tstart,\$tend); next if (!defined($role) || $role eq '' || $role =~ /^gr/); - my $timezone = &role_timezone($where,$timezones); $tremark=''; $tpstart=' '; $tpend=' '; - if ($tstart) { - $tpstart=&Apache::lonlocal::locallocaltime($tstart,$timezone); - } - if ($tend) { - $tpend=&Apache::lonlocal::locallocaltime($tend,$timezone); - } if ($env{'request.role'} eq $trolecode) { $tstatus='selected'; } @@ -948,7 +1115,14 @@ sub gather_roles { if (($tstatus eq 'is') || ($tstatus eq 'selected') || ($tstatus eq 'future') - || ($env{'form.showall'})) { + || ($env{'form.display'} eq 'showall')) { + my $timezone = &role_timezone($where,$timezones); + if ($tstart) { + $tpstart=&Apache::lonlocal::locallocaltime($tstart,$timezone); + } + if ($tend) { + $tpend=&Apache::lonlocal::locallocaltime($tend,$timezone); + } if ($tstatus eq 'is') { $tbg='LC_roles_is'; $possiblerole=$trolecode; @@ -974,7 +1148,7 @@ sub gather_roles { if ($role =~ /^cr\//) { my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role); if ($tremark) { $tremark.='
'; } - $tremark.=&mt('Customrole defined by [_1].',$rauthor.':'.$rdomain); + $tremark.=&mt('Custom role defined by [_1].',$rauthor.':'.$rdomain); } $trole=Apache::lonnet::plaintext($role); my $ttype; @@ -992,7 +1166,7 @@ sub gather_roles { } #next if ($home eq 'no_host'); $home = &Apache::lonnet::hostname($home); - $ttype='Construction Space'; + $ttype='Authoring Space'; $twhere=&mt('User').': '.$trest.'
'.&mt('Domain'). ': '.$tdom.'
'. ' '.&mt('Server').': '.$home; @@ -1011,7 +1185,7 @@ sub gather_roles { } #next if ($home eq 'no_host'); $home = &Apache::lonnet::hostname($home); - $ttype='Construction Space'; + $ttype='Authoring Space'; $twhere=&mt('Domain').': '.$tdom.'
'.&mt('Server'). ': '.$home; $env{'course.'.$tdom.'_'.$trest.'.description'}='ca'; @@ -1032,10 +1206,12 @@ sub gather_roles { ''; unless ($home && grep(/^\Q$home\E$/,@ids) && $loncaparev eq '') { my $required = $env{'course.'.$tcourseid.'.internal.releaserequired'}; - ($switchserver,$switchwarning) = - &check_release_required($loncaparev,$tcourseid,$trolecode,$required); - if ($switchserver || $switchwarning) { - $button = 0; + if ($required ne '') { + ($switchserver,$switchwarning) = + &check_release_required($loncaparev,$tcourseid,$trolecode,$required); + if ($switchserver || $switchwarning) { + $button = 0; + } } } } @@ -1053,10 +1229,12 @@ sub gather_roles { my $home = $newhash{'home'}; unless ($home && grep(/^\Q$home\E$/,@ids) && $loncaparev eq '') { my $required = $newhash{'internal.releaserequired'}; - ($switchserver,$switchwarning) = - &check_release_required($loncaparev,$tcourseid,$trolecode,$required); - if ($switchserver || $switchwarning) { - $button = 0; + if ($required ne '') { + ($switchserver,$switchwarning) = + &check_release_required($loncaparev,$tcourseid,$trolecode,$required); + if ($switchserver || $switchwarning) { + $button = 0; + } } } } else { @@ -1102,9 +1280,15 @@ sub role_timezone { my $cnum = $2; if ($cdom && $cnum) { if (!exists($timezones->{$cdom.'_'.$cnum})) { - my %timehash = - &Apache::lonnet::get('environment',['timezone'],$cdom,$cnum); - if ($timehash{'timezone'} eq '') { + my $tz; + if ($env{'course.'.$cdom.'_'.$cnum.'.description'}) { + $tz = $env{'course.'.$cdom.'_'.$cnum.'.timezone'}; + } else { + my %timehash = + &Apache::lonnet::get('environment',['timezone'],$cdom,$cnum); + $tz = $timehash{'timezone'}; + } + if ($tz eq '') { if (!exists($timezones->{$cdom})) { my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom); @@ -1117,7 +1301,7 @@ sub role_timezone { $timezones->{$cdom.'_'.$cnum} = $timezones->{$cdom}; } else { $timezones->{$cdom.'_'.$cnum} = - &Apache::lonlocal::gettimezone($timehash{'timezone'}); + &Apache::lonlocal::gettimezone($tz); } } $timezone = $timezones->{$cdom.'_'.$cnum}; @@ -1174,7 +1358,7 @@ sub roletable_headers { } sub roletypes { - my @types = ('Domain','Construction Space','Course','Community','Unavailable','System'); + my @types = ('Domain','Authoring Space','Course','Community','Unavailable','System'); return @types; } @@ -1313,7 +1497,7 @@ sub privileges_info { my (undef,$tdom,$trest,$tsec)=split(m{/},$where); if ($trest) { if ($env{'course.'.$tdom.'_'.$trest.'.description'} eq 'ca') { - $ttype='Construction Space'; + $ttype='Authoring Space'; $twhere='User: '.$trest.', Domain: '.$tdom; } else { $ttype= &Apache::loncommon::course_type($tdom.'_'.$trest); @@ -1426,24 +1610,6 @@ sub build_roletext { return ($roletext,$roletext_end); } -sub check_needs_switchserver { - my ($possiblerole) = @_; - my $needs_switchserver; - my ($role,$where) = split(/\./,$possiblerole,2); - my (undef,$tdom,$twho) = split(/\//,$where); - my ($server_status,$home); - if (($role eq 'ca') || ($role eq 'aa')) { - ($server_status,$home) = &check_author_homeserver($twho,$tdom); - } else { - ($server_status,$home) = &check_author_homeserver($env{'user.name'}, - $env{'user.domain'}); - } - if ($server_status eq 'switchserver') { - $needs_switchserver = 1; - } - return $needs_switchserver; -} - sub check_author_homeserver { my ($uname,$udom)=@_; if (($uname eq '') || ($udom eq '')) { @@ -1462,7 +1628,7 @@ sub check_author_homeserver { } sub check_fordc { - my ($dcroles,$then) = @_; + my ($dcroles,$update,$then) = @_; my $numdc = 0; if ($env{'user.adv'}) { foreach my $envkey (sort keys %env) { @@ -1470,8 +1636,12 @@ sub check_fordc { my $dcdom = $1; my $livedc = 1; my ($tstart,$tend)=split(/\./,$env{$envkey}); - if ($tstart && $tstart>$then) { $livedc = 0; } - if ($tend && $tend <$then) { $livedc = 0; } + my $limit = $update; + if ($env{'request.role'} eq 'dc./'.$dcdom.'/') { + $limit = $then; + } + if ($tstart && $tstart>$limit) { $livedc = 0; } + if ($tend && $tend <$limit) { $livedc = 0; } if ($livedc) { $$dcroles{$dcdom} = $envkey; $numdc++; @@ -1483,24 +1653,29 @@ sub check_fordc { } sub adhoc_course_role { - my ($refresh,$then) = @_; + my ($refresh,$update,$then) = @_; my ($cdom,$cnum,$crstype); $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; $crstype = &Apache::loncommon::course_type(); - if (&check_forcc($cdom,$cnum,$refresh,$then,$crstype)) { + if (&check_forcc($cdom,$cnum,$refresh,$update,$then,$crstype)) { my $setprivs; if (!defined($env{'user.role.'.$env{'form.switchrole'}})) { $setprivs = 1; } else { my ($start,$end) = split(/\./,$env{'user.role.'.$env{'form.switchrole'}}); if (($start && ($start>$refresh || $start == -1)) || - ($end && $end<$then)) { + ($end && $end<$update)) { + $setprivs = 1; + } + } + unless ($setprivs) { + if (!exists($env{'user.priv.'.$env{'form.switchrole'}.'./'})) { $setprivs = 1; } } if ($setprivs) { - if ($env{'form.switchrole'} =~ m-^(in|ta|ep|ad|st|cr)([\w/]*)\./\Q$cdom\E/\Q$cnum\E/?(\w*)$-) { + if ($env{'form.switchrole'} =~ m-^(in|ta|ep|ad|st|cr)(.*?)\./\Q$cdom\E/\Q$cnum\E/?(\w*)$-) { my $role = $1; my $custom_role = $2; my $usec = $3; @@ -1526,7 +1701,11 @@ sub adhoc_course_role { $spec .= '/'.$usec; $area .= '/'.$usec; } - &Apache::lonnet::standard_roleprivs(\%newrole,$role,$cdom,$spec,$cnum,$area); + if ($role =~ /^cr/) { + &Apache::lonnet::custom_roleprivs(\%newrole,$role,$cdom,$cnum,$spec,$area); + } else { + &Apache::lonnet::standard_roleprivs(\%newrole,$role,$cdom,$spec,$cnum,$area); + } &Apache::lonnet::set_userprivs(\%userroles,\%newrole,\%newgroups); my $adhocstart = $refresh-1; $userroles{'user.role.'.$spec} = $adhocstart.'.'; @@ -1538,22 +1717,24 @@ sub adhoc_course_role { } sub check_forcc { - my ($cdom,$cnum,$refresh,$then,$crstype) = @_; + my ($cdom,$cnum,$refresh,$update,$then,$crstype) = @_; my ($is_cc,$ccrole); if ($crstype eq 'Community') { $ccrole = 'co'; } else { $ccrole = 'cc'; } - if ($cdom ne '' && $cnum ne '') { - if (&Apache::lonnet::is_course($cdom,$cnum)) { - my $envkey = 'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum; - if (defined($env{$envkey})) { - $is_cc = 1; - my ($tstart,$tend)=split(/\./,$env{$envkey}); - if ($tstart && $tstart>$refresh) { $is_cc = 0; } - if ($tend && $tend <$then) { $is_cc = 0; } + if (&Apache::lonnet::is_course($cdom,$cnum)) { + my $envkey = 'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum; + if (defined($env{$envkey})) { + $is_cc = 1; + my ($tstart,$tend)=split(/\./,$env{$envkey}); + my $limit = $update; + if ($env{'request.role'} eq $ccrole.'./'.$cdom.'/'.$cnum) { + $limit = $then; } + if ($tstart && $tstart>$refresh) { $is_cc = 0; } + if ($tend && $tend <$limit) { $is_cc = 0; } } } return $is_cc; @@ -1569,7 +1750,7 @@ sub check_release_required { my $otherserver; if (($major eq '' && $minor eq '') || (($reqdmajor > $major) || (($reqdmajor == $major) && ($reqdminor > $minor)))) { - my ($userdomserver) = &Apache::lonnet::choose_server($env{'user.domain'}); + my ($userdomserver) = &Apache::lonnet::choose_server($env{'user.domain'},undef,$required); my $switchlcrev = &Apache::lonnet::get_server_loncaparev($env{'user.domain'}, $userdomserver); @@ -1611,43 +1792,6 @@ sub check_release_required { return ($switchserver,$warning); } -sub update_content_constraints { - my ($cdom,$cnum,$chome,$cid) = @_; - my %curr_reqd_hash = &Apache::lonnet::userenvironment($cdom,$cnum,'internal.releaserequired'); - my ($reqdmajor,$reqdminor) = split(/\./,$curr_reqd_hash{'internal.releaserequired'}); - my %checkresponsetypes; - foreach my $key (keys(%Apache::lonnet::needsrelease)) { - my ($item,$name,$value) = split(/:/,$key); - if ($item eq 'resourcetag') { - if ($name eq 'responsetype') { - $checkresponsetypes{$value} = $Apache::lonnet::needsrelease{$key} - } - } - } - my $navmap = Apache::lonnavmaps::navmap->new(); - if (defined($navmap)) { - my %allresponses; - foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_problem() },1,0)) { - my %responses = $res->responseTypes(); - foreach my $key (keys(%responses)) { - next unless(exists($checkresponsetypes{$key})); - $allresponses{$key} += $responses{$key}; - } - } - foreach my $key (keys(%allresponses)) { - my ($major,$minor) = split(/\./,$checkresponsetypes{$key}); - if (($major > $reqdmajor) || ($major == $reqdmajor && $minor > $reqdminor)) { - ($reqdmajor,$reqdminor) = ($major,$minor); - } - } - undef($navmap); - } - unless (($reqdmajor eq '') && ($reqdminor eq '')) { - &Apache::lonnet::update_released_required($reqdmajor.'.'.$reqdminor,$cdom,$cnum,$chome,$cid); - } - return; -} - sub courselink { my ($dcdom,$rowtype) = @_; my $courseform=&Apache::loncommon::selectcourse_link @@ -1728,7 +1872,7 @@ sub display_cc_role { my %newhash=&Apache::lonnet::coursedescription($tcourseid); if (%newhash) { $twhere=$newhash{'description'}. - ' '. + ' '. &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom). ''; $ttype = $newhash{'type'}; @@ -1737,7 +1881,7 @@ sub display_cc_role { $env{'course.'.$tcourseid.'.description'}=$twhere; } my $trole = &Apache::lonnet::plaintext($ccrole,$ttype,$tcourseid); - $twhere.="
".&mt('Domain').":".$1; + $twhere.="
".&mt('Domain').":".$tdom; ($roletext,$roletext_end) = &build_roletext($trolecode,$tdom,$trest,'is',$tryagain,$advanced,'',$tbg,$trole,$twhere,'','','',1,''); } } @@ -1783,6 +1927,909 @@ sub courseloadpage { return $startpage; } +sub update_session_roles { + my $then=$env{'user.login.time'}; + my $refresh=$env{'user.refresh.time'}; + if (!$refresh) { + $refresh = $then; + } + my $update = $env{'user.update.time'}; + if (!$update) { + $update = $then; + } + my $now = time; + my %roleshash = + &Apache::lonnet::get_my_roles('','','userroles', + ['active','future','previous'], + undef,undef,1); + my ($msg,@newsec,$oldsec,$currrole_expired,@changed_roles, + %changed_groups,%dbroles,%deletedroles,%allroles,%allgroups, + %userroles,%checkedgroup,%crprivs,$hasgroups,%rolechange, + %groupchange,%newrole,%newgroup,%customprivchg,%groups_roles, + @rolecodes); + my @possroles = ('cr','st','ta','ad','ep','in','co','cc'); + my %courseroles; + foreach my $item (keys(%roleshash)) { + my ($uname,$udom,$role,$remainder) = split(/:/,$item,4); + my ($tstart,$tend) = split(/:/,$roleshash{$item}); + my ($section,$group,@group_privs); + if ($role =~ m{^gr/(\w*)$}) { + $role = 'gr'; + my $priv = $1; + next if ($tstart eq '-1'); + if (&curr_role_status($tstart,$tend,$refresh,$now) eq 'active') { + if ($priv ne '') { + push(@group_privs,$priv); + } + } + if ($remainder =~ /:/) { + (my $additional_privs,$group) = + ($remainder =~ /^([\w:]+):([^:]+)$/); + if ($additional_privs ne '') { + if (&curr_role_status($tstart,$tend,$refresh,$now) eq 'active') { + push(@group_privs,split(/:/,$additional_privs)); + @group_privs = sort(@group_privs); + } + } + } else { + $group = $remainder; + } + } else { + $section = $remainder; + } + my $where = "/$udom/$uname"; + if ($section ne '') { + $where .= "/$section"; + } elsif ($group ne '') { + $where .= "/$group"; + } + my $rolekey = "$role.$where"; + my $envkey = "user.role.$rolekey"; + $dbroles{$envkey} = 1; + if (($env{'request.role'} eq $rolekey) && ($role ne 'st')) { + if (&curr_role_status($tstart,$tend,$refresh,$now) ne 'active') { + $currrole_expired = 1; + } + } + if ($env{$envkey} eq '') { + my $status_in_db = + &curr_role_status($tstart,$tend,$now,$now); + &gather_roleprivs(\%allroles,\%allgroups,\%userroles,$where,$role,$tstart,$tend,$status_in_db); + if (($role eq 'st') && ($env{'request.role'} =~ m{^\Q$role\E\.\Q/$udom/$uname\E})) { + if ($status_in_db eq 'active') { + if ($section eq '') { + push(@newsec,'none'); + } else { + push(@newsec,$section); + } + } + } else { + unless (grep(/^\Q$role\E$/,@changed_roles)) { + push(@changed_roles,$role); + } + if ($status_in_db ne 'previous') { + if ($role eq 'gr') { + $newgroup{$rolekey} = $status_in_db; + if ($status_in_db eq 'active') { + unless (ref($courseroles{$udom}) eq 'HASH') { + %{$courseroles{$udom}} = + &Apache::lonnet::get_my_roles('','','userroles', + ['active'],\@possroles, + [$udom],1); + } + &Apache::lonnet::get_groups_roles($udom,$uname, + $courseroles{$udom}, + \@rolecodes,\%groups_roles); + } + } else { + $newrole{$rolekey} = $status_in_db; + } + } + } + } else { + my ($currstart,$currend) = split(/\./,$env{$envkey}); + if ($role eq 'gr') { + if (&curr_role_status($currstart,$currend,$refresh,$update) ne 'previous') { + $hasgroups = 1; + } + } + if (($currstart ne $tstart) || ($currend ne $tend)) { + my $status_in_env = + &curr_role_status($currstart,$currend,$refresh,$update); + my $status_in_db = + &curr_role_status($tstart,$tend,$now,$now); + if ($status_in_env ne $status_in_db) { + if ($status_in_env eq 'active') { + if ($role eq 'st') { + if ($env{'request.role'} eq $rolekey) { + my $switchsection; + unless (ref($courseroles{$udom}) eq 'HASH') { + %{$courseroles{$udom}} = + &Apache::lonnet::get_my_roles('','','userroles', + ['active'], + \@possroles,[$udom],1); + } + foreach my $crsrole (keys(%{$courseroles{$udom}})) { + if ($crsrole =~ /^\Q$uname\E:\Q$udom\E:st/) { + $switchsection = 1; + last; + } + } + if ($switchsection) { + if ($section eq '') { + $oldsec = 'none'; + } else { + $oldsec = $section; + } + &gather_roleprivs(\%allroles,\%allgroups,\%userroles,$where,$role,$tstart,$tend,$status_in_db); + } else { + $currrole_expired = 1; + next; + } + } + } + unless ($rolekey eq $env{'request.role'}) { + if ($role eq 'gr') { + &Apache::lonnet::delete_env_groupprivs($where,\%courseroles,\@possroles); + } else { + &Apache::lonnet::delenv("user.priv.$rolekey",undef,[$role]); + &Apache::lonnet::delenv("user.priv.cm.$where",undef,['cm']); + } + &gather_roleprivs(\%allroles,\%allgroups,\%userroles,$where,$role,$tstart,$tend,$status_in_db); + } + } elsif ($status_in_db eq 'active') { + if (($role eq 'st') && + ($env{'request.role'} =~ m{^\Q$role\E\.\Q/$udom/$uname\E})) { + if ($section eq '') { + push(@newsec,'none'); + } else { + push(@newsec,$section); + } + } elsif ($role eq 'gr') { + unless (ref($courseroles{$udom}) eq 'HASH') { + %{$courseroles{$udom}} = + &Apache::lonnet::get_my_roles('','','userroles', + ['active'], + \@possroles,[$udom],1); + } + &Apache::lonnet::get_groups_roles($udom,$uname, + $courseroles{$udom}, + \@rolecodes,\%groups_roles); + } + &gather_roleprivs(\%allroles,\%allgroups,\%userroles,$where,$role,$tstart,$tend,$status_in_db); + } + unless (grep(/^\Q$role\E$/,@changed_roles)) { + push(@changed_roles,$role); + } + if ($role eq 'gr') { + $groupchange{"/$udom/$uname"}{$group} = $status_in_db; + } else { + $rolechange{$rolekey} = $status_in_db; + } + } + } else { + if ($role eq 'gr') { + unless ($checkedgroup{$where}) { + my $status_in_db = + &curr_role_status($tstart,$tend,$refresh,$now); + if ($tstart eq '-1') { + $status_in_db = 'deleted'; + } + unless (ref($courseroles{$udom}) eq 'HASH') { + %{$courseroles{$udom}} = + &Apache::lonnet::get_my_roles('','','userroles', + ['active'], + \@possroles,[$udom],1); + } + if (ref($courseroles{$udom}) eq 'HASH') { + foreach my $item (keys(%{$courseroles{$udom}})) { + next unless ($item =~ /^\Q$uname\E/); + my ($cnum,$cdom,$crsrole,$crssec) = split(/:/,$item); + my $area = '/'.$cdom.'/'.$cnum; + if ($crssec ne '') { + $area .= '/'.$crssec; + } + my $crsrolekey = $crsrole.'.'.$area; + my $currprivs = $env{'user.priv.'.$crsrole.'.'.$area.'.'.$where}; + $currprivs =~ s/^://; + $currprivs =~ s/\&F$//; + my @curr_grp_privs = split(/\&F:/,$currprivs); + @curr_grp_privs = sort(@curr_grp_privs); + my @diffs; + if (@group_privs > 0 || @curr_grp_privs > 0) { + @diffs = &Apache::loncommon::compare_arrays(\@group_privs,\@curr_grp_privs); + } + if (@diffs == 0) { + last; + } else { + unless(grep(/^\Qgr\E$/,@rolecodes)) { + push(@rolecodes,'gr'); + } + &gather_roleprivs(\%allroles,\%allgroups, + \%userroles,$where,$role, + $tstart,$tend,$status_in_db); + if ($status_in_db eq 'active') { + &Apache::lonnet::get_groups_roles($udom,$uname, + $courseroles{$udom}, + \@rolecodes,\%groups_roles); + } + $changed_groups{$udom.'_'.$uname}{$group} = $status_in_db; + last; + } + } + } + $checkedgroup{$where} = 1; + } + } elsif ($role =~ /^cr/) { + my $status_in_db = + &curr_role_status($tstart,$tend,$refresh,$now); + my ($rdummy,$rest) = split(/\//,$role,2); + my %currpriv; + unless (exists($crprivs{$rest})) { + my ($rdomain,$rauthor,$rrole)=split(/\//,$rest); + my $homsvr=&Apache::lonnet::homeserver($rauthor,$rdomain); + if (&Apache::lonnet::hostname($homsvr) ne '') { + my ($rdummy,$roledef)= + &Apache::lonnet::get('roles',["rolesdef_$rrole"], + $rdomain,$rauthor); + if (($rdummy ne 'con_lost') && ($roledef ne '')) { + my $i = 0; + my @scopes = ('sys','dom','crs'); + my @privs = split(/\_/,$roledef); + foreach my $priv (@privs) { + my ($blank,@prv) = split(/:/,$priv); + @prv = map { $_ .= (/\&\w+$/ ? '':'&F') } @prv; + if (@prv) { + $priv = ':'.join(':',sort(@prv)); + } + $crprivs{$rest}{$scopes[$i]} = $priv; + $i++; + } + } + } + } + my $status_in_env = + &curr_role_status($currstart,$currend,$refresh,$update); + if ($status_in_env eq 'active') { + $currpriv{sys} = $env{"user.priv.$rolekey./"}; + $currpriv{dom} = $env{"user.priv.$rolekey./$udom/"}; + $currpriv{crs} = $env{"user.priv.$rolekey.$where"}; + if (keys(%crprivs)) { + if (($crprivs{$rest}{sys} ne $currpriv{sys}) || + ($crprivs{$rest}{dom} ne $currpriv{dom}) + || + ($crprivs{$rest}{crs} ne $currpriv{crs})) { + &gather_roleprivs(\%allroles,\%allgroups, + \%userroles,$where,$role, + $tstart,$tend,$status_in_db); + unless (grep(/^\Q$role\E$/,@changed_roles)) { + push(@changed_roles,$role); + } + $customprivchg{$rolekey} = $status_in_env; + } + } + } + } + } + } + } + foreach my $envkey (keys(%env)) { + next unless ($envkey =~ /^user\.role\./); + next if ($dbroles{$envkey}); + next if ($envkey eq 'user.role.'.$env{'request.role'}); + my ($currstart,$currend) = split(/\./,$env{$envkey}); + my $status_in_env = + &curr_role_status($currstart,$currend,$refresh,$update); + my ($rolekey) = ($envkey =~ /^user\.role\.(.+)$/); + my ($role,$rest)=split(m{\./},$rolekey,2); + $rest = '/'.$rest; + if (&Apache::lonnet::delenv($envkey,undef,[$role])) { + if ($status_in_env eq 'active') { + if ($role eq 'gr') { + &Apache::lonnet::delete_env_groupprivs($rest,\%courseroles, + \@possroles); + } else { + &Apache::lonnet::delenv("user.priv.$rolekey",undef,[$role]); + &Apache::lonnet::delenv("user.priv.cm.$rest",undef,['cm']); + } + unless (grep(/^\Q$role\E$/,@changed_roles)) { + push(@changed_roles,$role); + } + $deletedroles{$rolekey} = 1; + } + } + } + if (($oldsec) && (@newsec > 0)) { + if (@newsec > 1) { + $msg = '

'.&mt('The section has changed for your current role. Log-out and log-in again to select a role for the new section.').'

'; + } else { + my $newrole = $env{'request.role'}; + if ($newsec[0] eq 'none') { + $newrole =~ s{(/[^/])$}{}; + } elsif ($oldsec eq 'none') { + $newrole .= '/'.$newsec[0]; + } else { + $newrole =~ s{([^/]+)$}{$newsec[0]}; + } + my $coursedesc = $env{'course.'.$env{'request.course.id'}.'.description'}; + my ($curr_role) = ($env{'request.role'} =~ m{^(\w+)\./$match_domain/$match_courseid}); + my %temp=('logout_'.$env{'request.course.id'} => time); + &Apache::lonnet::put('email_status',\%temp); + &Apache::lonnet::delenv('user.state.'.$env{'request.course.id'}); + &Apache::lonnet::appenv({"request.course.id" => '', + "request.course.fn" => '', + "request.course.uri" => '', + "request.course.sec" => '', + "request.role" => 'cm', + "request.role.adv" => $env{'user.adv'}, + "request.role.domain" => $env{'user.domain'}}); + my $rolename = &Apache::loncommon::plainname($curr_role); + $msg = '

'. + ''. + ''. + ''. + &mt('Your section has changed for your current [_1] role in [_2].',$rolename,$coursedesc).'
'; + my $button = ''; + if ($newsec[0] eq 'none') { + $msg .= &mt('[_1] to continue with your new section-less role.',$button); + } else { + $msg .= &mt('[_1] to continue with your new role in section ([_2]).',$button,$newsec[0]); + } + $msg .= '

'; + } + } elsif ($currrole_expired) { + $msg .= '

'; + if (&Apache::loncommon::show_course()) { + $msg .= &mt('Your role in the current course has expired.'); + } else { + $msg .= &mt('Your current role has expired.'); + } + $msg .= '
'.&mt('However you can continue to use this role until you logout, click the "Re-Select" button, or your session has been idle for more than 24 hours.').'

'; + } + &Apache::lonnet::set_userprivs(\%userroles,\%allroles,\%allgroups,\%groups_roles); + my ($curr_is_adv,$curr_role_adv,$curr_author,$curr_role_author); + $curr_author = $env{'user.author'}; + if (($env{'request.role'} =~/^au/) || ($env{'request.role'} =~/^ca/) || + ($env{'request.role'} =~/^aa/)) { + $curr_role_author=1; + } + $curr_is_adv = $env{'user.adv'}; + $curr_role_adv = $env{'request.role.adv'}; + if (keys(%userroles) > 0) { + foreach my $role (@changed_roles) { + unless(grep(/^\Q$role\E$/,@rolecodes)) { + push(@rolecodes,$role); + } + } + unless(grep(/^\Qcm\E$/,@rolecodes)) { + push(@rolecodes,'cm'); + } + &Apache::lonnet::appenv(\%userroles,\@rolecodes); + } + my %newenv; + if (&Apache::lonnet::is_advanced_user($env{'user.domain'},$env{'user.name'})) { + unless ($curr_is_adv) { + $newenv{'user.adv'} = 1; + } + } elsif ($curr_is_adv && !$curr_role_adv) { + &Apache::lonnet::delenv('user.adv'); + } + my %authorroleshash = + &Apache::lonnet::get_my_roles('','','userroles',['active'],['au','ca','aa']); + if (keys(%authorroleshash)) { + unless ($curr_author) { + $newenv{'user.author'} = 1; + } + } elsif ($curr_author && !$curr_role_author) { + &Apache::lonnet::delenv('user.author'); + } + if ($env{'request.course.id'}) { + my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; + my (@activecrsgroups,$crsgroupschanged); + if ($env{'request.course.groups'}) { + @activecrsgroups = split(/:/,$env{'request.course.groups'}); + foreach my $item (keys(%deletedroles)) { + if ($item =~ m{^gr\./\Q$cdom\E/\Q$cnum\E/(\w+)$}) { + if (grep(/^\Q$1\E$/,@activecrsgroups)) { + $crsgroupschanged = 1; + last; + } + } + } + } + unless ($crsgroupschanged) { + foreach my $item (keys(%newgroup)) { + if ($item =~ m{^gr\./\Q$cdom\E/\Q$cnum\E/(\w+)$}) { + if ($newgroup{$item} eq 'active') { + $crsgroupschanged = 1; + last; + } + } + } + } + if ((ref($changed_groups{$env{'request.course.id'}}) eq 'HASH') || + (ref($groupchange{"/$cdom/$cnum"}) eq 'HASH') || + ($crsgroupschanged)) { + my %grouproles = &Apache::lonnet::get_my_roles('','','userroles', + ['active'],['gr'],[$cdom],1); + my @activegroups; + foreach my $item (keys(%grouproles)) { + next unless($item =~ /^\Q$cnum\E:\Q$cdom\E/); + my $group; + my ($crsn,$crsd,$role,$remainder) = split(/:/,$item,4); + if ($remainder =~ /:/) { + (my $other,$group) = ($remainder =~ /^([\w:]+):([^:]+)$/); + } else { + $group = $remainder; + } + if ($group ne '') { + push(@activegroups,$group); + } + } + $newenv{'request.course.groups'} = join(':',@activegroups); + } + } + if (keys(%newenv)) { + &Apache::lonnet::appenv(\%newenv); + } + if (!@changed_roles || !(keys(%changed_groups))) { + my ($rolesmsg,$groupsmsg); + if (!@changed_roles) { + if (&Apache::loncommon::show_course()) { + $rolesmsg = &mt('No new courses or communities'); + } else { + $rolesmsg = &mt('No role changes'); + } + } + if ($hasgroups && !(keys(%changed_groups)) && !(grep(/gr/,@changed_roles))) { + $groupsmsg = &mt('No changes in course/community groups'); + } + if (!@changed_roles && !(keys(%changed_groups))) { + if (($msg ne '') || ($groupsmsg ne '')) { + $msg .= '
    '; + if ($rolesmsg) { + $msg .= '
  • '.$rolesmsg.'
    • '; + } + if ($groupsmsg) { + $msg .= '
  • '.$groupsmsg.'
    • '; + } + $msg .= '
'; + } else { + $msg = ' '.$rolesmsg.'
'; + } + return $msg; + } + } + my $changemsg; + if (@changed_roles > 0) { + if (keys(%newgroup) > 0) { + my $groupmsg; + my (%curr_groups,%groupdescs,$currcrs); + foreach my $item (sort(keys(%newgroup))) { + if (&is_active_course($item,$refresh,$update,\%roleshash)) { + if ($item =~ m{^gr\./($match_domain/$match_courseid)/(\w+)$}) { + my ($cdom,$cnum) = split(/\//,$1); + my $group = $2; + if ($currcrs ne $cdom.'_'.$cnum) { + if ($currcrs) { + $groupmsg .= '
  • '; + } + $groupmsg .= '
  • '. + $env{'course.'.$cdom.'_'.$cnum.'.description'}.'
      '; + $currcrs = $cdom.'_'.$cnum; + } + my $groupdesc; + unless (ref($curr_groups{$cdom.'_'.$cnum}) eq 'HASH') { + %{$curr_groups{$cdom.'_'.$cnum}} = + &Apache::longroup::coursegroups($cdom,$cnum); + } + unless ((ref($groupdescs{$cdom.'_'.$cnum}) eq 'HASH') && + ($groupdescs{$cdom.'_'.$cnum}{$group})) { + + my %groupinfo = + &Apache::longroup::get_group_settings($curr_groups{$cdom.'_'.$cnum}{$group}); + $groupdescs{$cdom.'_'.$cnum}{$group} = + &unescape($groupinfo{'description'}); + } + $groupdesc = $groupdescs{$cdom.'_'.$cnum}{$group}; + if ($groupdesc) { + $groupmsg .= '
    • '. + &mt('[_1] with status: [_2].', + ''.$groupdesc.'',$newgroup{$item}).'
      • '; + } + } + } + if ($groupmsg) { + $groupmsg .= '
    • '; + } + } + if ($groupmsg) { + $changemsg .= '
  • '. + &mt('Courses with new groups').'
    • '. + '
      '.$groupmsg.'
    '; + } + } + if (keys(%newrole) > 0) { + my $newmsg; + foreach my $item (sort(keys(%newrole))) { + my $desc = &role_desc($item,$update,$refresh,$now); + if ($desc) { + $newmsg .= '
  • '. + &mt('[_1] with status: [_2].', + $desc,&mt($newrole{$item})).'
    • '; + } + } + if ($newmsg) { + $changemsg .= '
  • '.&mt('New roles'). + '
      '.$newmsg.'
    '. + '
    • '; + } + } + if (keys(%customprivchg) > 0) { + my $privmsg; + foreach my $item (sort(keys(%customprivchg))) { + my $desc = &role_desc($item,$update,$refresh,$now); + if ($desc) { + $privmsg .= '
  • '.$desc.'
    • '; + } + } + if ($privmsg) { + $changemsg .= '
  • '. + &mt('Custom roles with privilege changes'). + '
      '.$privmsg.'
    '. + '
    • '; + } + } + if (keys(%rolechange) > 0) { + my $rolemsg; + foreach my $item (sort(keys(%rolechange))) { + my $desc = &role_desc($item,$update,$refresh,$now); + if ($desc) { + $rolemsg .= '
  • '. + &mt('[_1] status now: [_2].',$desc, + $rolechange{$item}).'
    • '; + } + } + if ($rolemsg) { + $changemsg .= '
  • '. + &mt('Existing roles with status changes').'
    • '. + '
      '.$rolemsg.'
    '. + ''; + } + } + if (keys(%deletedroles) > 0) { + my $delmsg; + foreach my $item (sort(keys(%deletedroles))) { + my $desc = &role_desc($item,$update,$refresh,$now); + if ($desc) { + $delmsg .= '
  • '.$desc.'
    • '; + } + } + if ($delmsg) { + $changemsg .= '
  • '. + &mt('Existing roles now expired').'
    • '. + '
      '.$delmsg.'
    '. + ''; + } + } + } + if ((keys(%changed_groups) > 0) || (keys(%groupchange) > 0)) { + my $groupchgmsg; + foreach my $key (sort(keys(%changed_groups))) { + my $crs = 'gr/'.$key; + $crs =~ s/_/\//; + if (&is_active_course($crs,$refresh,$update,\%roleshash)) { + if (ref($changed_groups{$key}) eq 'HASH') { + my @showgroups; + foreach my $group (sort(keys(%{$changed_groups{$key}}))) { + if ($changed_groups{$key}{$group} eq 'active') { + push(@showgroups,$group); + } + } + if (@showgroups > 0) { + $groupchgmsg .= '
  • '. + &mt('Course: [_1], groups: [_2].',$key, + join(', ',@showgroups)). + '
    • '; + } + } + } + } + if (keys(%groupchange) > 0) { + $groupchgmsg .= '
  • '. + &mt('Existing course/community groups with status changes').'
    • '. + '
      '; + foreach my $crs (sort(keys(%groupchange))) { + my $cid = $crs; + $cid=~s{^/}{}; + $cid=~s{/}{_}; + my $crsdesc = $env{'course.'.$cid.'.description'}; + my $cdom = $env{'course.'.$cid.'.domain'}; + my $cnum = $env{'course.'.$cid.'.num'}; + my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum); + my %groupdesc; + if (ref($groupchange{$crs}) eq 'HASH') { + $groupchgmsg .= '
    • '.&mt('Course/Community: [_1]',''.$crsdesc.'
        '); + foreach my $group (sort(keys(%{$groupchange{$crs}}))) { + unless ($groupdesc{$group}) { + my %groupinfo = &Apache::longroup::get_group_settings($curr_groups{$group}); + $groupdesc{$group} = &unescape($groupinfo{'description'}); + } + $groupchgmsg .= '
      • '.&mt('Group: [_1] status now: [_2].',''.$groupdesc{$group}.'',$groupchange{$crs}{$group}).'
        • '; + } + $groupchgmsg .= '
      • '; + } + } + $groupchgmsg .= '
    '; + } + if ($groupchgmsg) { + $changemsg .= '
  • '. + &mt('Courses with changes in groups').'
    • '. + '
      '.$groupchgmsg.'
    '; + } + } + if ($changemsg) { + $msg .= '
      '.$changemsg.'
    '; + } else { + if (&Apache::loncommon::show_course()) { + $msg = &mt('No new courses or communities'); + } else { + $msg = &mt('No role changes'); + } + } + return $msg; +} + +sub role_desc { + my ($item,$update,$refresh,$now) = @_; + my ($where,$trolecode,$role,$tstatus,$tend,$tstart,$twhere, + $trole,$tremark); + &Apache::lonnet::role_status('user.role.'.$item,$update,$refresh, + $now,\$role,\$where,\$trolecode, + \$tstatus,\$tstart,\$tend); + return unless ($role); + if ($role =~ /^cr\//) { + my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role); + $tremark = &mt('Custom role defined by [_1].',$rauthor.':'.$rdomain); + } + $trole=Apache::lonnet::plaintext($role); + my ($tdom,$trest,$tsection)= + split(/\//,Apache::lonnet::declutter($where)); + if (($role eq 'ca') || ($role eq 'aa')) { + my $home = &Apache::lonnet::homeserver($trest,$tdom); + $home = &Apache::lonnet::hostname($home); + $twhere=&mt('User').': '.$trest.'  '.&mt('Domain'). + ': '.$tdom.'  '.&mt('Server').': '.$home; + } elsif ($role eq 'au') { + my $home = &Apache::lonnet::homeserver + ($env{'user.name'},$env{'user.domain'}); + $home = &Apache::lonnet::hostname($home); + $twhere=&mt('Domain').': '.$tdom.'  '.&mt('Server'). + ': '.$home; + } elsif ($trest) { + my $tcourseid=$tdom.'_'.$trest; + my $crstype = &Apache::loncommon::course_type($tcourseid); + $trole = &Apache::lonnet::plaintext($role,$crstype,$tcourseid); + if ($env{'course.'.$tcourseid.'.description'}) { + $twhere=$env{'course.'.$tcourseid.'.description'}; + } else { + my %newhash=&Apache::lonnet::coursedescription($tcourseid); + if (%newhash) { + $twhere=$newhash{'description'}; + } else { + $twhere=&mt('Currently not available'); + } + } + if ($tsection) { + $twhere.= '  '.&mt('Section').': '.$tsection; + } + if ($role ne 'st') { + $twhere.= '  '.&mt('Domain').': '.$tdom; + } + } elsif ($tdom) { + $twhere = &mt('Domain').': '.$tdom; + } + my $output; + if ($trole) { + $output = $trole; + if ($twhere) { + $output .= " -- $twhere"; + } + if ($tremark) { + $output .= '
    '.$tremark; + } + } + return $output; +} + +sub curr_role_status { + my ($start,$end,$refresh,$update) = @_; + if (($start) && ($start<0)) { return 'deleted' }; + my $status = 'active'; + if (($end) && ($end<=$update)) { + $status = 'previous'; + } + if (($start) && ($refresh<$start)) { + $status = 'future'; + } + return $status; +} + +sub gather_roleprivs { + my ($allroles,$allgroups,$userroles,$area,$role,$tstart,$tend,$status) = @_; + return unless ((ref($allroles) eq 'HASH') && (ref($allgroups) eq 'HASH') && (ref($userroles) eq 'HASH')); + if (($area ne '') && ($role ne '')) { + &Apache::lonnet::userrolelog($role,$env{'user.name'},$env{'user.domain'}, + $area,$tstart,$tend); + my $spec=$role.'.'.$area; + $userroles->{'user.role.'.$spec} = $tstart.'.'.$tend; + my ($tdummy,$tdomain,$trest)=split(/\//,$area); + if ($status eq 'active') { + if ($role =~ /^cr\//) { + &Apache::lonnet::custom_roleprivs($allroles,$role,$tdomain,$trest,$spec,$area); + } elsif ($role eq 'gr') { + my %rolehash = &Apache::lonnet::get('roles',[$area.'_'.$role], + $env{'user.domain'}, + $env{'user.name'}); + my ($trole) = split(/_/,$rolehash{$area.'_'.$role},2); + (undef,my $group_privs) = split(/\//,$trole); + $group_privs = &unescape($group_privs); + &Apache::lonnet::group_roleprivs($allgroups,$area,$group_privs,$tend,$tstart); + } else { + &Apache::lonnet::standard_roleprivs($allroles,$role,$tdomain,$spec,$trest,$area); + } + } + } + return; +} + +sub is_active_course { + my ($rolekey,$refresh,$update,$roleshashref) = @_; + return unless(ref($roleshashref) eq 'HASH'); + my ($role,$cdom,$cnum) = split(/\//,$rolekey); + my $is_active; + foreach my $key (keys(%{$roleshashref})) { + if ($key =~ /^\Q$cnum\E:\Q$cdom\E:/) { + my ($tstart,$tend) = split(/:/,$roleshashref->{$key}); + my $status = &curr_role_status($tstart,$tend,$refresh,$update); + if ($status eq 'active') { + $is_active = 1; + last; + } + } + } + return $is_active; +} + +sub get_roles_functions { + my ($rolescount) = @_; + my @links; + push(@links,["javascript:rolesView('doupdate');",'start-here-22x22',&mt('Check for changes')]); + if ($env{'environment.canrequest.author'}) { + unless (&Apache::loncoursequeueadmin::is_active_author()) { + push(@links,["javascript:rolesView('requestauthor');",'list-add-22x22',&mt('Request author role')]); + } + } + if (($rolescount > 3) || ($env{'environment.recentroles'})) { + push(@links,['/adm/preferences?action=changerolespref&returnurl=/adm/roles','role_hotlist-22x22',&mt('Hotlist')]); + } + if (&Apache::lonmenu::check_for_rcrs()) { + push(@links,['/adm/requestcourse','rcrs-22x22',&mt('Request course')]); + } + if ($env{'form.state'} eq 'queued') { + push(@links,["javascript:rolesView('noqueued');",'selfenrl-queue-22x22',&mt('Hide queued')]); + } else { + push(@links,["javascript:rolesView('queued');",'selfenrl-queue-22x22',&mt('Show queued')]); + } + if ($env{'user.adv'}) { + if ($env{'form.display'} eq 'showall') { + push(@links,["javascript:rolesView('noshowall');",'edit-redo-22x22',&mt('Exclude expired')]); + } else { + push(@links,["javascript:rolesView('showall');",'edit-undo-22x22',&mt('Include expired')]); + } + } + if (&Apache::loncommon::designparm('login.coursecatalog',$env{'user.domain'})) { + push(@links,['/adm/coursecatalog','ccat-22x22',&mt('Course catalog')]); + } + my $funcs = &Apache::lonhtmlcommon::start_funclist(); + foreach my $link (@links) { + $funcs .= &Apache::lonhtmlcommon::add_item_funclist( + ''. + ''.$link->[2].''. + $link->[2].''); + } + $funcs .= &Apache::lonhtmlcommon::end_funclist(); + return &Apache::loncommon::head_subbox($funcs); +} + +sub get_queued { + my ($output,%reqcrs); + my ($types,$typenames) = &Apache::loncommon::course_types(); + my %statusinfo = &Apache::lonnet::dump('courserequests',$env{'user.domain'}, + $env{'user.name'},'^status:'); + foreach my $key (keys(%statusinfo)) { + next unless (($statusinfo{$key} eq 'approval') || ($statusinfo{$key} eq 'pending')); + (undef,my($cdom,$cnum)) = split(/:/,$key); + my $requestkey = $cdom.'_'.$cnum; + if ($requestkey =~ /^($match_domain)_($match_courseid)$/) { + my %history = &Apache::lonnet::restore($requestkey,'courserequests', + $env{'user.domain'},$env{'user.name'}); + next if ((exists($history{'status'})) && ($history{'status'} eq 'created')); + my $reqtime = $history{'reqtime'}; + my $lastupdate = $history{'timestamp'}; + my $showtype = $history{'crstype'}; + if (defined($typenames->{$history{'crstype'}})) { + $showtype = $typenames->{$history{'crstype'}}; + } + my $description; + if (ref($history{'details'}) eq 'HASH') { + $description = $history{details}{'cdescr'}; + } + @{$reqcrs{$reqtime}} = ($description,$showtype); + } + } + my @sortedtimes = sort {$a <=> $b} (keys(%reqcrs)); + if (@sortedtimes > 0) { + $output .= '

    '.&mt('Course/Community requests').'
    '. + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). + ''.&mt('Date requested').''. + ''.&mt('Course title').''. + ''.&mt('Course type').''; + &Apache::loncommon::end_data_table_header_row(); + foreach my $reqtime (@sortedtimes) { + next unless (ref($reqcrs{$reqtime}) eq 'ARRAY'); + $output .= &Apache::loncommon::start_data_table_row(). + ''.&Apache::lonlocal::locallocaltime($reqtime).''. + ''.join('',@{$reqcrs{$reqtime}}).''. + &Apache::loncommon::end_data_table_row(); + } + $output .= &Apache::loncommon::end_data_table(). + '

    '; + } + my $queuedselfenroll = &Apache::loncoursequeueadmin::queued_selfenrollment(1); + if ($queuedselfenroll) { + $output .= '

    '.&mt('Enrollment requests').'
    '. + $queuedselfenroll.'

    '; + } + if ($env{'environment.canrequest.author'}) { + unless (&Apache::loncoursequeueadmin::is_active_author()) { + my $requestauthor; + my ($status,$timestamp) = split(/:/,$env{'environment.requestauthorqueued'}); + if (($status eq 'approval') || ($status eq 'approved')) { + $output .= '

    '.&mt('Author role request').'
    '; + if ($status eq 'approval') { + $output .= &mt('A request for Authoring Space submitted on [_1] is awaiting approval', + &Apache::lonlocal::locallocaltime($timestamp)); + } elsif ($status eq 'approved') { + my %roleshash = + &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},'userroles', + ['active'],['au'],[$env{'user.domain'}]); + if (keys(%roleshash)) { + $output .= ''. + &mt('Your request for an author role has been approved.').'
    '. + &mt('Use the "Check for changes" link to update your list of roles.'). + '    '; + } + } + $output .= '

    '; + } + } + } + unless ($output) { + if ($env{'environment.canrequest.author'} || $env{'environment.canrequest.official'} || + $env{'environment.canrequest.unofficial'} || $env{'environment.canrequest.community'}) { + $output = &mt('No requests for courses, communities or authoring currently queued'); + } else { + $output = &mt('No enrollment requests currently queued awaiting approval'); + } + } + return '
    '.&mt('Queued requests').''. + $output.'

    '; +} + 1; __END__