--- loncom/auth/lonroles.pm 2010/09/03 19:20:51 1.240.2.16 +++ loncom/auth/lonroles.pm 2012/08/19 03:11:43 1.275 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # User Roles Screen # -# $Id: lonroles.pm,v 1.240.2.16 2010/09/03 19:20:51 raeburn Exp $ +# $Id: lonroles.pm,v 1.275 2012/08/19 03:11:43 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -57,8 +57,7 @@ course they should act on, etc. Both in handler determines via C's C<&allowed> function that a certain action is not allowed, C is used as error handler. This allows the user to select another role which may have permission to do -what they were trying to do. C can also be accessed via the -B button in the Remote Control. +what they were trying to do. =begin latex @@ -138,7 +137,6 @@ use Apache::lonannounce; use Apache::lonlocal; use Apache::lonpageflip(); use Apache::lonnavdisplay(); -use Apache::lonmainmenu(); use Apache::loncoursequeueadmin; use GDBM_File; use LONCAPA qw(:DEFAULT :match); @@ -146,19 +144,11 @@ use HTML::Entities; sub redirect_user { - my ($r,$title,$url,$msg,$launch_nav) = @_; + my ($r,$title,$url,$msg) = @_; $msg = $title if (! defined($msg)); &Apache::loncommon::content_type($r,'text/html'); &Apache::loncommon::no_cache($r); $r->send_http_header; - my $swinfo=&Apache::lonmenu::rawconfig(); - my $navwindow; - if ($launch_nav eq 'on') { - $navwindow.=&Apache::lonnavdisplay::launch_win('now',undef,undef, - ($url =~ m-^/adm/whatsnew-)); - } else { - $navwindow.=&Apache::lonnavmaps::close(); - } # Breadcrumbs my $brcrum = [{'href' => $url, @@ -166,7 +156,6 @@ sub redirect_user { my $start_page = &Apache::loncommon::start_page('Switching Role',undef, {'redirect' => [1,$url], 'bread_crumbs' => $brcrum,}); - &Apache::lonhtmlcommon::clear_breadcrumbs(); my $end_page = &Apache::loncommon::end_page(); # Note to style police: @@ -174,12 +163,6 @@ sub redirect_user { $url=~s/ /\%20/g; $r->print(< -// - -$navwindow

$msg

$end_page ENDREDIR @@ -220,14 +203,49 @@ 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 $custommenu = &Apache::loncommon::needs_gci_custom(); + my $numdc = &check_fordc(\%dcroles,$update,$then); + my $loncaparev = $Apache::lonnet::perlvar{'lonVersion'}; # ================================================================== Roles Init if ($env{'form.selectrole'}) { @@ -241,8 +259,17 @@ sub handler { if ($env{'request.course.id'}) { # Check if user is CC trying to select a course role if ($env{'form.switchrole'}) { - if (!defined($env{'user.role.'.$env{'form.switchrole'}})) { - &adhoc_course_role($refresh,$then); + my $switch_is_active; + 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 < $update) { + $switch_is_active = 1; + } + } + } + unless ($switch_is_active) { + &adhoc_course_role($refresh,$update,$then); } } my %temp=('logout_'.$env{'request.course.id'} => time); @@ -253,6 +280,7 @@ 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'}}); @@ -263,8 +291,10 @@ sub handler { 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; } @@ -277,7 +307,7 @@ sub handler { my ($server_status,$home) = &check_author_homeserver($user,$domain); if ($server_status eq 'switchserver') { my $trolecode = 'au./'.$domain.'/'; - my $switchserver = '/adm/switchserver?otherserver='.$home.'&role='.$trolecode; + my $switchserver = '/adm/switchserver?otherserver='.$home.'&role='.$trolecode; $r->internal_redirect($switchserver); } last; @@ -288,7 +318,7 @@ sub handler { my ($server_status,$home) = &check_author_homeserver($user,$domain); if ($server_status eq 'switchserver') { my $trolecode = 'ca./'.$domain.'/'.$user; - my $switchserver = '/adm/switchserver?otherserver='.$home.'&role='.$trolecode; + my $switchserver = '/adm/switchserver?otherserver='.$home.'&role='.$trolecode; $r->internal_redirect($switchserver); } last; @@ -304,12 +334,12 @@ 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; + .'otherserver='.$home.'&role='.$trolecode; $r->internal_redirect($switchserver); } } else { @@ -322,18 +352,52 @@ sub handler { } } } - if (($env{'form.cm'}) && ($env{'form.orgurl'})) { - $r->internal_redirect($env{'form.orgurl'}); - } + 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') { $where=~s/^\///; my ($cdom,$cnum,$csec)=split(/\//,$where); + if (($cnum) && ($role ne 'ca') && ($role ne 'aa')) { + my $home = $env{'course.'.$cdom.'_'.$cnum.'.home'}; + my @ids = &Apache::lonnet::current_machine_ids(); + unless ($loncaparev eq '' && $home && grep(/^\Q$home\E$/,@ids)) { + my %curr_reqd_hash = &Apache::lonnet::userenvironment($cdom,$cnum,'internal.releaserequired'); + if ($curr_reqd_hash{'internal.releaserequired'} ne '') { + my ($switchserver,$switchwarning) = + &check_release_required($loncaparev,$cdom.'_'.$cnum,$trolecode,$curr_reqd_hash{'internal.releaserequired'}); + if ($switchwarning ne '' || $switchserver ne '') { + &Apache::loncommon::content_type($r,'text/html'); + &Apache::loncommon::no_cache($r); + $r->send_http_header; + my $end_page=&Apache::loncommon::end_page(); + $r->print(&Apache::loncommon::start_page('Selected course unavailable on this server'). + '

'); + if ($switchwarning) { + $r->print($switchwarning.'
'); + if (&Apache::loncommon::show_course()) { + $r->print(&mt('Display courses')); + } else { + $r->print(&mt('Display roles')); + } + $r->print(''); + } elsif ($switchserver) { + $r->print(&mt('This course requires a newer version of LON-CAPA than is installed on this server.'). + '
'. + ''. + &mt('Switch Server'). + ''); + } + $r->print('

'.&Apache::loncommon::end_page()); + return OK; + } + } + } + } # check for course groups my %coursegroups = &Apache::lonnet::get_active_groups( $env{'user.domain'},$env{'user.name'},$cdom, $cnum); @@ -451,15 +515,13 @@ ENDENTERKEY if (($cnum) && ($role ne 'ca') && ($role ne 'aa')) { my $msg; - if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; } - &Apache::lonnet::appenv({'request.role.adv'=>$tadv}); my ($furl,$ferr)= &Apache::lonuserstate::readmap($cdom.'/'.$cnum); - if ($custommenu) { - unless (($ferr) || ($env{'form.switchrole'})) { - &Apache::lonnet::put('nohist_crslastlogin',{$env{'user.name'}.':'.$env{'user.domain'}.':'.$csec.':'.$role => $now}, - $cdom,$cnum); - } + unless (($ferr) || ($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); } if (($env{'form.orgurl'}) && ($env{'form.orgurl'}!~/^\/adm\/flip/)) { @@ -472,9 +534,18 @@ ENDENTERKEY } $dest .= 'symb='.$env{'form.symb'}; } + if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; } + &Apache::lonnet::appenv({'request.role.adv'=>$tadv}); if (($ferr) && ($tadv)) { &error_page($r,$ferr,$dest); } else { + if ($dest =~ m{^/adm/coursedocs\?folderpath}) { + if ($env{'request.course.id'} eq $cdom.'_'.$cnum) { + my $chome = &Apache::lonnet::homeserver($cnum,$cdom); + &Apache::loncommon::update_content_constraints($cdom,$cnum,$chome, + $cdom.'_'.$cnum); + } + } $r->internal_redirect($dest); } return OK; @@ -490,6 +561,8 @@ ENDENTERKEY .'

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

' .'

'.$ferr.'

'; } + if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; } + &Apache::lonnet::appenv({'request.role.adv'=>$tadv}); if (($ferr) && ($tadv)) { &error_page($r,$ferr,$furl); @@ -501,7 +574,7 @@ ENDENTERKEY $courseid = substr($courseid, 1); } $courseid =~ s/\//_/; - if (($cdom ne 'gcitest') && (($role eq 'cc') || ($role eq 'co')) + if ((($role eq 'cc') || ($role eq 'co')) && ($env{'course.' . $courseid .'.course.helper.not.run'})) { $furl = "/adm/helper/course.initialization.helper"; # Send the user to the course they selected @@ -512,10 +585,9 @@ ENDENTERKEY my $esc_symb = &HTML::Entities::encode($env{'form.destsymb'},'"<>&'); $dest .= '?symb='.$esc_symb; } - &redirect_user($r,&mt('Entering [_1]', - $env{'course.'.$courseid.'.description'}), - $dest,$msg, - $env{'environment.remotenavmap'}); + &redirect_user($r, &mt('Entering [_1]', + $env{'course.'.$courseid.'.description'}), + $dest, $msg); return OK; } if (&Apache::lonnet::allowed('whn', @@ -525,12 +597,11 @@ ENDENTERKEY .$env{'request.course.sec'}) ) { my $startpage = &courseloadpage($courseid); - unless (($startpage eq 'firstres') || ($cdom eq 'gcitest')) { + unless ($startpage eq 'firstres') { $msg = &mt('Entering [_1] ...', $env{'course.'.$courseid.'.description'}); - &redirect_user($r,&mt('New in course'), - '/adm/whatsnew?refpage=start',$msg, - $env{'environment.remotenavmap'}); + &redirect_user($r, &mt('New in course'), + '/adm/whatsnew?refpage=start', $msg); return OK; } } @@ -540,15 +611,11 @@ ENDENTERKEY # Guess not ... $furl=&Apache::lonpageflip::first_accessible_resource(); } - if (($cdom eq 'gcitest') && ($custommenu)) { - $furl = '/adm/navmaps'; - } $msg = &mt('Entering [_1] ...', $env{'course.'.$courseid.'.description'}); - &redirect_user($r,&mt('Entering [_1]', - $env{'course.'.$courseid.'.description'}), - $furl,$msg, - $env{'environment.remotenavmap'}); + &redirect_user($r, &mt('Entering [_1]', + $env{'course.'.$courseid.'.description'}), + $furl, $msg); } return OK; } @@ -558,10 +625,9 @@ 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'), @@ -585,6 +651,7 @@ ENDENTERKEY } } + # =============================================================== No Roles Init &Apache::loncommon::content_type($r,'text/html'); @@ -592,36 +659,30 @@ ENDENTERKEY $r->send_http_header; return OK if $r->header_only; - my ($crumbtext,$pagetitle,$recent,$show_course); - 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.').'
'; - if ($custommenu) { - my $start_page = &Apache::loncommon::start_page('Main Menu',undef, - {'bread_crumbs' => 1}); - $r->print(<<"ENDCUSTOM"); -$start_page -
- -ENDCUSTOM - } else { - $crumbtext = 'User Roles'; - $pagetitle = 'My Roles'; - $recent = &mt('Recent Roles'); - $show_course=&Apache::loncommon::show_course(); - if ($show_course) { - $crumbtext = 'Courses'; - $pagetitle = 'My Courses'; - $recent = &mt('Recent Courses'); - } - my $brcrum =[{href=>"/adm/roles",text=>$crumbtext}]; - 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.'); - $standby=~s/\n/\\n/g; - $r->print(<"/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 $funcs = &get_roles_functions($showcount); + my $standby=&mt('Role selected. Please stand by.'); + $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.').'
'; + + $r->print(< +$funcs @@ -641,12 +702,25 @@ 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 - } # ------------------------------------------ Get Error Message from Environment @@ -704,99 +778,64 @@ 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'}; } - unless ($custommenu) { - $r->print('
'); - $r->print(''); - $r->print(''); - $r->print(''); - } + 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); - + &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 (!$countactive && !$countfuture) { - if (&Apache::loncommon::new_roles_update()) { - ($countactive,$countfuture,$inrole,$possiblerole) = - &gather_roles($then,$refresh,$now,$reinit,$nochoose,\%roletext,\%sortrole, - \%roleclass,\%futureroles,\%timezones); - } - } - if ($custommenu) { - if ($env{'form.destinationurl'} eq '/adm/gci_info') { - $r->print(&gci_info_page()). - &Apache::loncommon::end_page(); - return OK; - } - my %courses = &Apache::loncommon::existing_gcitest_courses('cc'); - $env{'browser.interface'}='faketextual'; - $env{'environment.remote'}='off'; - my $numcourses = keys(%courses); - my $switcher; - if ($numcourses > 0) { - $switcher = &Apache::lonmainmenu::gcitest_switcher('cc',%courses); - my $current; - if ($env{'request.course.id'}) { - $current = 'cc./'.$env{'course.'.$env{'request.course.id'}.'.domain'}. - '/'.$env{'course.'.$env{'request.course.id'}.'.num'}; - } - my $switcher_js = &Apache::lonmainmenu::gcitest_switcher_js($current,$numcourses); - $r->print(<<"ENDSCRIPT"); - -ENDSCRIPT - } - $r->print(&Apache::lonmenu::inlinemenu('gcicustom',$switcher). - &Apache::loncommon::end_page()); - return OK; - } else { - if ($env{'form.destinationurl'} eq '/adm/gci_info') { - delete($env{'form.destinationurl'}); - } - } - 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'},'"<>&'); - unless ($env{'user.domain'} eq 'gcitest') { - $r->print( - '

' - .&mt('[_1]Visit the [_2]Course/Community Catalog[_3]' - .' to view all [_4] LON-CAPA courses and communities.' - ,'' - ,'' - ,'',$domdesc) - .'
' - .&mt('If a course or community is [_1]not[_2] in your list of current courses and communities below,' + $r->print( + '

' + .&mt('[_1]Visit the [_2]Course/Community Catalog[_3]' + .' to view all [_4] LON-CAPA courses and communities.' + ,'' + ,'' + ,'',$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.' ,'','') - .'

' - ); - } + .'

' + ); } } @@ -807,10 +846,8 @@ ENDSCRIPT } else { $r->print('

'.&mt('Currently no active roles, courses or communities').'

'); } - unless ($env{'user.domain'} eq 'gcitest') { - &findcourse_advice($r); - &requestcourse_advice($r); - } + &findcourse_advice($r); + &requestcourse_advice($r); $r->print('
'); if ($countfuture) { $r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture)); @@ -839,29 +876,15 @@ ENDSCRIPT } $r->print(&Apache::loncommon::end_page()); return OK; - } elsif ($countactive==1) { # Is there only one choice? - my $needs_switchserver; - if ($env{'user.author'}) { - $needs_switchserver = &check_needs_switchserver($possiblerole); - } - if ((!$needs_switchserver) && ($env{'request.role'} eq 'cm')) { - $r->print('

'.&mt('Please stand by.').'

'. - ''. - ''); - $r->print("\n"); - $r->rflush(); - $r->print(''); - $r->print(&Apache::loncommon::end_page()); - return OK; - } - if ($needs_switchserver) { - $r->print("

".&mt('Server Switch Required')."

\n". - &mt('Construction Space access is only available from '. - 'the home server of the corresponding Author.').'
'. - &mt("Click the 'Switch Server' link to go there.").'
'); - } } # ----------------------------------------------------------------------- Table + + if ($numdc > 0) { + $r->print(&coursepick_jscript()); + $r->print(&Apache::loncommon::coursebrowser_javascript(). + &Apache::loncommon::authorbrowser_javascript()); + } + unless ((!&Apache::loncommon::show_course()) || ($nochoose) || ($countactive==1)) { $r->print("

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

\n"); } @@ -873,28 +896,41 @@ ENDSCRIPT $env{'form.destsymb'}.'" />'); } } + my $doheaders = &roletable_headers($r,\%roleclass,\%sortrole,$nochoose); if ($env{'environment.recentroles'}) { my %recent_roles = &Apache::lonhtmlcommon::get_recent('roles',$env{'environment.recentrolesn'}); my $output=''; - foreach (sort(keys(%recent_roles))) { - if (ref($roletext{'user.role.'.$_}) eq 'ARRAY') { + foreach my $role (sort(keys(%recent_roles))) { + if (ref($roletext{'user.role.'.$role}) eq 'ARRAY') { $output.= &Apache::loncommon::start_data_table_row(). - $roletext{'user.role.'.$_}->[0]. - &Apache::loncommon::end_data_table_row(). - &Apache::loncommon::continue_data_table_row(). - $roletext{'user.role.'.$_}->[1]. + $roletext{'user.role.'.$role}->[0]. &Apache::loncommon::end_data_table_row(); - if ($_ =~ m-dc\./($match_domain)/- + if ($roletext{'user.role.'.$role}->[1] ne '') { + $output .= &Apache::loncommon::continue_data_table_row(). + $roletext{'user.role.'.$role}->[1]. + &Apache::loncommon::end_data_table_row(); + } + if ($role =~ m{dc\./($match_domain)/} && $dcroles{$1}) { $output .= &adhoc_roles_row($1,'recent'); } } elsif ($numdc > 0) { - unless ($_ =~/^error\:/) { - $output.=&display_cc_role('user.role.'.$_); + unless ($role =~/^error\:/) { + my ($roletext,$role_text_end) = &display_cc_role('user.role.'.$role); + 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(); + } + } } - } + } } if ($output) { $r->print(&Apache::loncommon::start_data_table_empty_row() @@ -907,12 +943,6 @@ ENDSCRIPT $doheaders ++; } } - - if ($numdc > 0) { - $r->print(&coursepick_jscript()); - $r->print(&Apache::loncommon::coursebrowser_javascript(). - &Apache::loncommon::authorbrowser_javascript()); - } &print_rolerows($r,$doheaders,\%roleclass,\%sortrole,\%dcroles,\%roletext); if ($countactive > 1) { my $tremark=''; @@ -948,7 +978,12 @@ ENDSCRIPT $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('

' @@ -963,48 +998,44 @@ ENDSCRIPT return OK; } -sub gci_info_page { - return <<"END"; -

Welcome to the Geoscience Concept Inventory WebCenter

-

-Use the tabs to navigate the WebCenter and... -

    -
  • Review and comment on existing GCI questions
    • -
  • Submit a GCI question of your own
    • -
  • Create an online test for your students
    • -
  • View tutorials on creating online tests
    • -
-

-

For more information about writing and reviewing Concept Inventory questions -please refer to the GCI Workbook. - -END +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) = @_; + 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'}; - foreach my $envkey (sort(keys(%env))) { - my $button = 1; - my $switchserver=''; - 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, + my @ids = &Apache::lonnet::current_machine_ids(); + 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'; } @@ -1012,7 +1043,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; @@ -1038,7 +1076,7 @@ sub gather_roles { if ($role =~ /^cr\//) { my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role); if ($tremark) { $tremark.='
'; } - $tremark.=&mt('Defined by [_1] at [_2].',$rauthor,$rdomain); + $tremark.=&mt('Customrole defined by [_1].',$rauthor.':'.$rdomain); } $trole=Apache::lonnet::plaintext($role); my $ttype; @@ -1049,11 +1087,10 @@ sub gather_roles { if (($role eq 'ca') || ($role eq 'aa')) { my $home = &Apache::lonnet::homeserver($trest,$tdom); my $allowed=0; - my @ids=&Apache::lonnet::current_machine_ids(); foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } if (!$allowed) { $button=0; - $switchserver='otherserver='.$home.'&role='.$trolecode; + $switchserver='otherserver='.$home.'&role='.$trolecode; } #next if ($home eq 'no_host'); $home = &Apache::lonnet::hostname($home); @@ -1069,11 +1106,10 @@ sub gather_roles { my $home = &Apache::lonnet::homeserver ($env{'user.name'},$env{'user.domain'}); my $allowed=0; - my @ids=&Apache::lonnet::current_machine_ids(); foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } if (!$allowed) { $button=0; - $switchserver='otherserver='.$home.'&role='.$trolecode; + $switchserver='otherserver='.$home.'&role='.$trolecode; } #next if ($home eq 'no_host'); $home = &Apache::lonnet::hostname($home); @@ -1088,24 +1124,47 @@ sub gather_roles { $ttype = &Apache::loncommon::course_type($tcourseid); $trole = &Apache::lonnet::plaintext($role,$ttype,$tcourseid); if ($env{'course.'.$tcourseid.'.description'}) { + my $home=$env{'course.'.$tcourseid.'.home'}; $twhere=$env{'course.'.$tcourseid.'.description'}; $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey; + $twhere = &HTML::Entities::encode($twhere,'"<>&'); unless ($twhere eq &mt('Currently not available')) { $twhere.=' '. &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom). ''; + unless ($home && grep(/^\Q$home\E$/,@ids) && $loncaparev eq '') { + my $required = $env{'course.'.$tcourseid.'.internal.releaserequired'}; + if ($required ne '') { + ($switchserver,$switchwarning) = + &check_release_required($loncaparev,$tcourseid,$trolecode,$required); + if ($switchserver || $switchwarning) { + $button = 0; + } + } + } } } else { my %newhash=&Apache::lonnet::coursedescription($tcourseid); if (%newhash) { $sortkey=$role."\0".$tdom."\0".$newhash{'description'}. "\0".$envkey; - $twhere=$newhash{'description'}. - ' '. - &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom). - ''; + $twhere=&HTML::Entities::encode($newhash{'description'},'"<>&'). + ' '. + &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom). + ''; $ttype = $newhash{'type'}; $trole = &Apache::lonnet::plaintext($role,$ttype,$tcourseid); + my $home = $newhash{'home'}; + unless ($home && grep(/^\Q$home\E$/,@ids) && $loncaparev eq '') { + my $required = $newhash{'internal.releaserequired'}; + if ($required ne '') { + ($switchserver,$switchwarning) = + &check_release_required($loncaparev,$tcourseid,$trolecode,$required); + if ($switchserver || $switchwarning) { + $button = 0; + } + } + } } else { $twhere=&mt('Currently not available'); $env{'course.'.$tcourseid.'.description'}=$twhere; @@ -1129,7 +1188,7 @@ sub gather_roles { ($role_text,$role_text_end) = &build_roletext($trolecode,$tdom,$trest,$tstatus,$tryagain, $advanced,$tremark,$tbg,$trole,$twhere,$tpstart, - $tpend,$nochoose,$button,$switchserver,$reinit); + $tpend,$nochoose,$button,$switchserver,$reinit,$switchwarning); $roletext->{$envkey}=[$role_text,$role_text_end]; if (!$sortkey) {$sortkey=$twhere."\0".$envkey;} $sortrole->{$sortkey}=$envkey; @@ -1149,9 +1208,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); @@ -1164,7 +1229,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}; @@ -1237,10 +1302,12 @@ sub print_rolerows { if (ref($roletext->{$sortrole->{$which}}) eq 'ARRAY') { $output.= &Apache::loncommon::start_data_table_row(). $roletext->{$sortrole->{$which}}->[0]. - &Apache::loncommon::end_data_table_row(). - &Apache::loncommon::continue_data_table_row(). - $roletext->{$sortrole->{$which}}->[1]. &Apache::loncommon::end_data_table_row(); + if ($roletext->{$sortrole->{$which}}->[1] ne '') { + $output .= &Apache::loncommon::continue_data_table_row(). + $roletext->{$sortrole->{$which}}->[1]. + &Apache::loncommon::end_data_table_row(); + } } if ($sortrole->{$which} =~ m-dc\./($match_domain)/-) { if (ref($dcroles) eq 'HASH') { @@ -1399,7 +1466,7 @@ sub privileges_info { } sub build_roletext { - my ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$trole,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver,$reinit) = @_; + my ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$trole,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver,$reinit,$switchwarning) = @_; my ($roletext,$roletext_end); my $is_dc=($trolecode =~ m/^dc\./); my $rowspan=($is_dc) ? '' @@ -1417,6 +1484,13 @@ sub build_roletext { } else { $roletext.=(' '); } + if ($switchwarning) { + if ($tremark eq '') { + $tremark = $switchwarning; + } else { + $tremark .= '
'.$switchwarning; + } + } } elsif ($tstatus eq 'is') { $roletext.=''. ''.&mt("No suitable server could be found amongst servers in your own domain (which is also the course's domain)."); + } + } else { + $otherserver = $userdomserver; + } + } + if ($otherserver ne '') { + $switchserver = 'otherserver='.$otherserver.'&role='.$trolecode; + } + } + } + return ($switchserver,$warning); +} + sub courselink { my ($dcdom,$rowtype) = @_; my $courseform=&Apache::loncommon::selectcourse_link @@ -1667,16 +1799,18 @@ sub display_cc_role { unless ($rolekey =~/^error\:/) { if ($rolekey =~ m{^user\.role\.(cc|co)\./($match_domain)/($match_courseid)$}) { my $ccrole = $1; - my $tcourseid = $2.'_'.$3; - my $trolecode = $1.'./'.$2.'/'.$3; + my $tdom = $2; + my $trest = $3; + my $tcourseid = $tdom.'_'.$trest; + my $trolecode = $ccrole.'./'.$tdom.'/'.$trest; my $twhere; my $ttype; my $tbg='LC_roles_is'; my %newhash=&Apache::lonnet::coursedescription($tcourseid); if (%newhash) { $twhere=$newhash{'description'}. - ' '. - &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$2,$1). + ' '. + &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom). ''; $ttype = $newhash{'type'}; } else { @@ -1684,8 +1818,8 @@ sub display_cc_role { $env{'course.'.$tcourseid.'.description'}=$twhere; } my $trole = &Apache::lonnet::plaintext($ccrole,$ttype,$tcourseid); - $twhere.="
".&mt('Domain').":".$1; - ($roletext,$roletext_end) = &build_roletext($trolecode,$1,$2,'is',$tryagain,$advanced,'',$tbg,$trole,$twhere,'','','',1,''); + $twhere.="
".&mt('Domain').":".$tdom; + ($roletext,$roletext_end) = &build_roletext($trolecode,$tdom,$trest,'is',$tryagain,$advanced,'',$tbg,$trole,$twhere,'','','',1,''); } } return ($roletext,$roletext_end); @@ -1703,7 +1837,7 @@ sub adhoc_roles_row { my $carole = &Apache::lonnet::plaintext('ca'); my $selectcalink = &coauthorlink($dcdom,$rowtype); $output.=$ccrole.': '.$selectcclink - .' | '.$carole.': '.$selectcalink + .' | '.$carole.': '.$selectcalink.'' .&Apache::loncommon::end_data_table_row(); return $output; } @@ -1730,6 +1864,769 @@ 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 ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role); + 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++; + } + } + } + } + $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); + } + my $status_in_env = + &curr_role_status($currstart,$currend,$refresh,$update); + if ($status_in_env eq 'active') { + $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(/\./,$rolekey,2); + 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.').'

'; + } + 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; + foreach my $item (sort(keys(%newgroup))) { + if (&is_active_course($item,$refresh,$update,\%roleshash)) { + $groupmsg .= '
  • '. + &mt('[_1] with status: [_2].', + $item,$newgroup{$item}).'
    • '; + } + } + if ($groupmsg) { + $changemsg .= '
  • '. + &mt('Courses with new groups').'
    • '. + '
      '.$groupmsg.'
    '; + } + } + if (keys(%newrole) > 0) { + $changemsg .= '
  • '.&mt('New roles'). + '
      '; + foreach my $item (sort(keys(%newrole))) { + $changemsg .= '
    • '. + &mt('[_1] with status: [_2].', + $item,$newrole{$item}).'
      • '; + } + $changemsg .= '
    • '; + } + if (keys(%customprivchg) > 0) { + $changemsg .= '
  • '. + &mt('Custom roles with privilege changes'). + '
      '; + foreach my $item (sort(keys(%customprivchg))) { + $changemsg .= '
    • '.$item.'
      • '; + } + $changemsg .= '
    • '; + } + if (keys(%rolechange) > 0) { + $changemsg .= '
  • '. + &mt('Existing roles with status changes').'
    • '. + '
      '; + foreach my $item (sort(keys(%rolechange))) { + $changemsg .= '
    • '. + &mt('[_1] status now: [_2].',$item, + $rolechange{$item}).'
      • '; + } + $changemsg .= '
    '; + } + if (keys(%deletedroles) > 0) { + $changemsg .= '
  • '. + &mt('Existing roles now expired').'
    • '. + '
      '; + foreach my $item (sort(keys(%deletedroles))) { + $changemsg .= '
    • '.$item.'
      • '; + } + $changemsg .= '
    '; + } + } + 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))) { + if (ref($groupchange{$crs}) eq 'HASH') { + $groupchgmsg .= '
    • '.&mt('Course/Community: [_1]',''.$crs.'
        '); + foreach my $group (sort(keys(%{$groupchange{$crs}}))) { + $groupchgmsg .= '
      • '.&mt('Group: [_1] status now: [_2].',''.$group.'',$groupchange{$crs}{$group}).'
        • '; + } + $groupchgmsg .= '
      • '; + } + } + $groupchgmsg .= '
    '; + } + if ($groupchgmsg) { + $changemsg .= '
  • '. + &mt('Courses with changes in groups').'
    • '. + '
      '.$groupchgmsg.'
    '; + } + } + if ($changemsg) { + $msg .= '
      '.$changemsg.'
    '; + } + &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); + } + return $msg; +} + +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; + if ($env{'user.adv'}) { + if ($env{'form.display'} eq 'showall') { + push(@links,["javascript:rolesView('noshowall');",'edit-redo-22x22',&mt('Exclude expired roles')]); + } else { + push(@links,["javascript:rolesView('showall');",'edit-undo-22x22',&mt('Include expired roles')]); + } + } + 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 (&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 (($rolescount > 3) || ($env{'environment.recentroles'})) { + push(@links,['/adm/preferences?action=changerolespref&returnurl=/adm/roles','role_hotlist-22x22',&mt('Hotlist')]); + } + + 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__ @@ -1761,8 +2658,7 @@ course they should act on, etc. Both in handler determines via C's C<&allowed> function that a certain action is not allowed, C is used as error handler. This allows the user to select another role which may have permission to do -what they were trying to do. C can also be accessed via the -B button in the Remote Control. +what they were trying to do. =begin latex