--- loncom/auth/lonroles.pm 2016/10/27 22:53:48 1.269.2.28 +++ loncom/auth/lonroles.pm 2012/08/14 17:35:04 1.271 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # User Roles Screen # -# $Id: lonroles.pm,v 1.269.2.28 2016/10/27 22:53:48 raeburn Exp $ +# $Id: lonroles.pm,v 1.271 2012/08/14 17:35:04 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -128,7 +128,7 @@ package Apache::lonroles; use strict; use Apache::lonnet; use Apache::lonuserstate(); -use Apache::Constants qw(:common REDIRECT); +use Apache::Constants qw(:common); use Apache::File(); use Apache::lonmenu; use Apache::loncommon; @@ -138,8 +138,6 @@ 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; @@ -151,7 +149,6 @@ sub redirect_user { &Apache::loncommon::content_type($r,'text/html'); &Apache::loncommon::no_cache($r); $r->send_http_header; - my $swinfo=&Apache::lonmenu::rawconfig(); # Breadcrumbs my $brcrum = [{'href' => $url, @@ -166,11 +163,6 @@ sub redirect_user { $url=~s/ /\%20/g; $r->print(< -// -

$msg

$end_page ENDREDIR @@ -208,14 +200,6 @@ sub handler { my $r = shift; - # Check for critical messages and redirect if present. - my ($redirect,$url) = &Apache::loncommon::critical_redirect(300); - if ($redirect) { - &Apache::loncommon::content_type($r,'text/html'); - $r->header_out(Location => $url); - return REDIRECT; - } - my $now=time; my $then=$env{'user.login.time'}; my $refresh=$env{'user.refresh.time'}; @@ -227,17 +211,9 @@ sub handler { $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') { + if ($env{'form.doupdate'}) { my $show_course=&Apache::loncommon::show_course(); my $checkingtxt; if ($show_course) { @@ -245,24 +221,107 @@ sub handler { } else { $checkingtxt = &mt('Checking for new roles ...'); } - $updateresult = $checkingtxt; + $updateresult = ''.$checkingtxt.''; $updateresult .= &update_session_roles(); &Apache::lonnet::appenv({'user.update.time' => $now}); $update = $now; - &Apache::loncoursequeueadmin::reqauthor_check(); + &reqauthor_check(); } # -------------------------------------------------- Check for author requests + my $reqauthor; - if ($env{'form.state'} eq 'requestauthor') { - $reqauthor = &Apache::loncoursequeueadmin::process_reqauthor(\$update); + if ($env{'form.requestauthor'}) { + if ($env{'environment.canrequest.author'}) { + unless (&is_active_author()) { + my $queued = &reqauthor_check(); + my $skipreq; + if ($queued =~ /^approval:\d+$/) { + my ($status,$timestamp) = split(/:/,$env{'environment.requestauthorqueued'}); + if ($status eq 'approval') { + $reqauthor = ''. + &mt('A request for authoring space submitted on [_1] is awaiting approval', + &Apache::lonlocal::locallocaltime($timestamp)). + ''; + } + $skipreq = 1; + } elsif ($queued =~ /^approved:\d+$/) { + my %roleshash = &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},'userroles', + ['active'],['au'],[$env{'user.domain'}]); + if (keys(%roleshash) > 0) { + $skipreq = 1; + } + } + unless ($skipreq) { + my (@inststatuses,%domconfig); + %domconfig = + &Apache::lonnet::get_dom('configuration', + ['requestauthor'],$env{'user.domain'}); + my $val = &Apache::loncoursequeueadmin::get_processtype('requestauthor',$env{'user.name'}, + $env{'user.domain'},$env{'user.adv'}, + $env{'user.domain'},undef, + \@inststatuses,\%domconfig); + if ($val eq 'automatic') { + my $start = $now-1; + if (&Apache::lonnet::assignrole($env{'user.domain'},$env{'user.name'},'/'.$env{'user.domain'}.'/', + 'au',undef,$start,undef,undef,'requestauthor') eq 'ok') { + $reqauthor = ''. + &mt('Access to authoring space has been activated').'
'; + &update_session_roles(); + &Apache::lonnet::appenv({'user.update.time' => $now}); + $update = $now; + } else { + $reqauthor = ''. + &mt('An error occurred while activating your access to authoring space'); + } + } elsif ($val eq 'approval') { + my $domconfiguser = &Apache::lonnet::get_domainconfiguser($env{'user.domain'}); + if (&Apache::lonnet::put('requestauthorqueue',{ $env{'user.name'}.'_'.$val => $now }, + $env{'user.domain'},$domconfiguser) eq 'ok') { + my %userrequest = ( + author => { + timestamp => $now, + status => $val, + }, + author_status => $val, + ); + my $req_notifylist; + if (ref($domconfig{'requestauthor'}) eq 'HASH') { + if (ref($domconfig{'requestauthor'}{'notify'}) eq 'HASH') { + my $req_notifylist = $domconfig{'requestauthor'}{'notify'}{'approval'}; + if ($req_notifylist) { + my $fullname = &Apache::loncommon::plainname($env{'user.name'}, + $env{'user.domain'}); + my $sender = $env{'user.name'}.':'.$env{'user.domain'}; + my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description'); + &Apache::loncoursequeueadmin::send_selfserve_notification($req_notifylist, + "$fullname ($env{'user.name'}:$env{'user.domain'})",undef,$domdesc, + $now,'authorreq',$sender); + } + } + } + my $userresult = + &Apache::lonnet::put('requestauthor',\%userrequest,$env{'user.domain'},$env{'user.name'}); + $reqauthor = ''. + &mt('Your request for authoring space has been submitted for approval.'). + ''; + &Apache::lonnet::appenv({'environment.requestauthorqueued' => $val.':'.$now}); + } else { + $reqauthor = ''. + &mt('An error occurred saving your request for authoring space.'). + ''; + } + } + } + } + } } my $envkey; my %dcroles = (); - my %dhroles = (); - my ($numdc,$numdh,$numadhoc) = &check_for_adhoc(\%dcroles,\%dhroles,$update,$then); - my $loncaparev = $r->dir_config('lonVersion'); + my $numdc = &check_fordc(\%dcroles,$update,$then); + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}); + my $loncaparev = $Apache::lonnet::perlvar{'lonVersion'}; # ================================================================== Roles Init if ($env{'form.selectrole'}) { @@ -270,15 +329,8 @@ sub handler { my $locknum=&Apache::lonnet::get_locks(); if ($locknum) { return 409; } - my $custom_adhoc; if ($env{'form.newrole'}) { $env{'form.'.$env{'form.newrole'}}=1; -# Check if this is a Domain Helpdesk role trying to enter a course - if ($env{'form.newrole'} =~ m{^cr/($match_domain)/\1\-domainconfig/\w+\./\1/$match_courseid$}) { - if ($dhroles{$1}) { - $custom_adhoc = 1; - } - } } if ($env{'request.course.id'}) { # Check if user is CC trying to select a course role @@ -300,142 +352,82 @@ sub handler { &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.course.tied" => '', - "request.course.timechecked" => '', - "request.role" => 'cm', - "request.role.adv" => $env{'user.adv'}, - "request.role.domain" => $env{'user.domain'}}); -# Check if Domain Helpdesk role trying to enter a course needs privs to be created - if ($env{'form.newrole'} =~ m{^cr/($match_domain)/\1\-domainconfig/(\w+)\./\1/($match_courseid)$}) { - my $cdom = $1; - my $rolename = $2; - my $cnum = $3; - if ($custom_adhoc) { - my %adhocroles = &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'}, - 'adhocroles.'.$cdom); - if (keys(%adhocroles)) { - my @adhoc = split(',',$adhocroles{'adhocroles.'.$cdom}); - if (grep(/^\Q$rolename\E$/,@adhoc)) { - if (&Apache::lonnet::check_adhoc_privs($cdom,$cnum,$update,$refresh,$now, - "cr/$cdom/$cdom".'-domainconfig/'.$rolename)) { - &Apache::lonnet::appenv({"environment.internal.$cdom.$cnum.cr/$cdom/$cdom".'-domainconfig/'."$rolename.adhoc" => time}); - } - } - } - } - } elsif (($numdc > 0) || ($numdh > 0)) { + &Apache::lonnet::appenv({"request.course.id" => '', + "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 -# Check if user is a DH trying to enter a course and needs privs to be created - foreach my $envkey (keys(%env)) { - if ($numdc) { + if ($numdc > 0) { + 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}) { - if (&Apache::lonnet::check_adhoc_privs($domain,$coursenum, - $update,$refresh,$now,$ccrole)) { - &Apache::lonnet::appenv({"environment.internal.$domain.$coursenum.$ccrole.adhoc" => time}); - } + if (my ($ccrole,$domain,$coursenum) = + ($envkey =~ m-^form\.(cc|co)\./($match_domain)/($match_courseid)$-)) { + if ($dcroles{$domain}) { + &Apache::lonnet::check_adhoc_privs($domain,$coursenum, + $update,$refresh,$now,$ccrole); + } + last; + } +# Is this an ad-hoc CA-role? + if (my ($domain,$user) = + ($envkey =~ m-^form\.ca\./($match_domain)/($match_username)$-)) { + if (($domain eq $env{'user.domain'}) && ($user eq $env{'user.name'})) { + delete($env{$envkey}); + $env{'form.au./'.$domain.'/'} = 1; + 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; + $r->internal_redirect($switchserver); } last; } -# Is this an ad-hoc CA-role? - if (my ($domain,$user) = - ($envkey =~ m-^form\.ca\./($match_domain)/($match_username)$-)) { - if (($domain eq $env{'user.domain'}) && ($user eq $env{'user.name'})) { - delete($env{$envkey}); - $env{'form.au./'.$domain.'/'} = 1; + if (my ($castart,$caend) = ($env{'user.role.ca./'.$domain.'/'.$user} =~ /^(\d*)\.(\d*)$/)) { + if (((($castart) && ($castart < $now)) || !$castart) && + ((!$caend) || (($caend) && ($caend > $now)))) { my ($server_status,$home) = &check_author_homeserver($user,$domain); if ($server_status eq 'switchserver') { - my $trolecode = 'au./'.$domain.'/'; + my $trolecode = 'ca./'.$domain.'/'.$user; my $switchserver = '/adm/switchserver?otherserver='.$home.'&role='.$trolecode; $r->internal_redirect($switchserver); - return OK; } last; } - if (my ($castart,$caend) = ($env{'user.role.ca./'.$domain.'/'.$user} =~ /^(\d*)\.(\d*)$/)) { - if (((($castart) && ($castart < $now)) || !$castart) && - ((!$caend) || (($caend) && ($caend > $now)))) { - 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; - $r->internal_redirect($switchserver); - return OK; - } - last; - } - } - # Check if author blocked ca-access - my %blocked=&Apache::lonnet::get('environment',['domcoord.author'],$domain,$user); - if ($blocked{'domcoord.author'} eq 'blocked') { - delete($env{$envkey}); - $env{'user.error.msg'}=':::1:User '.$user.' in domain '.$domain.' blocked domain coordinator access'; - last; - } - 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,$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}); - } - } else { - delete($env{$envkey}); - } + } + # Check if author blocked ca-access + my %blocked=&Apache::lonnet::get('environment',['domcoord.author'],$domain,$user); + if ($blocked{'domcoord.author'} eq 'blocked') { + delete($env{$envkey}); + $env{'user.error.msg'}=':::1:User '.$user.' in domain '.$domain.' blocked domain coordinator access'; last; } - } - if ($numdh) { -# Is this an ad hoc custom role in a course/community? - if (my ($domain,$rolename,$coursenum) = ($envkey =~ m{^form\.cr/($match_domain)/\1\-domainconfig/(\w+)\./\1/($match_courseid)$})) { - if ($dhroles{$domain}) { - my @adhoc; - if ($env{'environment.adhocroles.'.$domain}) { - @adhoc = split(',',$env{'environment.adhocroles.'.$domain}); - } else { - my %adhocroles = &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'}, - 'adhocroles.'.$domain); - if (keys(%adhocroles)) { - @adhoc = split(',',$adhocroles{'adhocroles.'.$domain}); - } - } - if ((@adhoc > 0) && ($rolename ne '')) { - if (grep(/^\Q$rolename\E$/,@adhoc)) { - if (&Apache::lonnet::check_adhoc_privs($domain,$coursenum,$update,$refresh,$now, - "cr/$domain/$domain".'-domainconfig/'.$rolename)) { - &Apache::lonnet::appenv({"environment.internal.$domain.$coursenum.cr/$domain/$domain". - '-domainconfig/'."$rolename.adhoc" => time}); - } - } else { - delete($env{$envkey}); - } - } else { - delete($env{$envkey}); + 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,$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); } } else { delete($env{$envkey}); } - last; + } else { + delete($env{$envkey}); } - } + last; + } } } - 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,$update,$refresh,$now,\$role,\$where, @@ -451,13 +443,30 @@ sub handler { my %curr_reqd_hash = &Apache::lonnet::userenvironment($cdom,$cnum,'internal.releaserequired'); if ($curr_reqd_hash{'internal.releaserequired'} ne '') { my ($switchserver,$switchwarning) = - &Apache::loncommon::check_release_required($loncaparev,$cdom.'_'.$cnum,$trolecode, - $curr_reqd_hash{'internal.releaserequired'}); + &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; - $r->print(&Apache::loncommon::check_release_result($switchwarning,$switchserver)); + 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; } } @@ -580,39 +589,16 @@ ENDENTERKEY if (($cnum) && ($role ne 'ca') && ($role ne 'aa')) { 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}); - } - } - } - } + my ($furl,$ferr)= + &Apache::lonuserstate::readmap($cdom.'/'.$cnum); if (($env{'form.orgurl'}) && - ($env{'form.orgurl'}!~/^\/adm\/flip/) && - ($env{'form.orgurl'} ne '/adm/roles')) { + ($env{'form.orgurl'}!~/^\/adm\/flip/)) { my $dest=$env{'form.orgurl'}; if ($env{'form.symb'}) { if ($dest =~ /\?/) { $dest .= '&'; } else { - $dest .= '?'; + $dest .= '?' } $dest .= 'symb='.$env{'form.symb'}; } @@ -651,60 +637,24 @@ 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.'.$cdom.'_'.$cnum.'.course.helper.not.run'})) { + && ($env{'course.' . $courseid .'.course.helper.not.run'})) { $furl = "/adm/helper/course.initialization.helper"; # Send the user to the course they selected } elsif ($env{'request.course.id'}) { - 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; - } + 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; } &redirect_user($r, &mt('Entering [_1]', - $env{'course.'.$cdom.'_'.$cnum.'.description'}), + $env{'course.'.$courseid.'.description'}), $dest, $msg); return OK; } @@ -714,39 +664,25 @@ ENDENTERKEY $env{'request.course.id'}.'/' .$env{'request.course.sec'}) ) { - my $startpage = &courseloadpage($env{'request.course.id'}); + my $startpage = &courseloadpage($courseid); unless ($startpage eq 'firstres') { $msg = &mt('Entering [_1] ...', - $env{'course.'.$env{'request.course.id'}.'.description'}); + $env{'course.'.$courseid.'.description'}); &redirect_user($r, &mt('New in course'), '/adm/whatsnew?refpage=start', $msg); return OK; } } } - # Are we allowed to look at the first resource? - my $access; - 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 - $access = &Apache::lonnet::allowed('bre',$exturl,$symb); - # For other resources just check for permission - } else { - $access = &Apache::lonnet::allowed('bre',$furl); - } - if (!$access) { - $furl = &Apache::lonpageflip::first_accessible_resource(); - } elsif ($access eq 'B') { - $furl = '/adm/navmaps?showOnlyHomework=1'; - } +# Are we allowed to look at the first resource? + if ($furl !~ m|^/adm/|) { +# Guess not ... + $furl=&Apache::lonpageflip::first_accessible_resource(); + } $msg = &mt('Entering [_1] ...', - $env{'course.'.$cdom.'_'.$cnum.'.description'}); + $env{'course.'.$courseid.'.description'}); &redirect_user($r, &mt('Entering [_1]', - $env{'course.'.$cdom.'_'.$cnum.'.description'}), + $env{'course.'.$courseid.'.description'}), $furl, $msg); } return OK; @@ -762,7 +698,7 @@ ENDENTERKEY $redirect_url .= $where; } $redirect_url .= '/'; - &redirect_user($r,&mt('Entering Authoring Space'), + &redirect_user($r,&mt('Entering Construction Space'), $redirect_url); return OK; } @@ -772,12 +708,6 @@ ENDENTERKEY $redirect_url); return OK; } - if ($role eq 'dh') { - my $redirect_url = '/adm/menu/'; - &redirect_user($r,&mt('Loading Domain Helpdesk Menu'), - $redirect_url); - return OK; - } if ($role eq 'sc') { my $redirect_url = '/adm/grades?command=scantronupload'; &redirect_user($r,&mt('Loading Data Upload Page'), @@ -800,39 +730,22 @@ 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 %domdefs=&Apache::lonnet::get_domain_defaults($env{'user.domain'}); - my $cattype = 'std'; - if ($domdefs{'catauth'}) { - $cattype = $domdefs{'catauth'}; - } - my $funcs = &get_roles_functions($showcount,$cattype); - my $crumbsright; - if ($env{'browser.mobile'}) { - $crumbsright = $funcs; - undef($funcs); - } - my $start_page=&Apache::loncommon::start_page($pagetitle,undef,{bread_crumbs=>$brcrum, - bread_crumbs_component=>$crumbsright}); - &js_escape(\$standby); - 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 $start_page=&Apache::loncommon::start_page($pagetitle,undef,{bread_crumbs=>$brcrum}); + 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(< @@ -855,17 +768,16 @@ function enterrole (thisform,rolecode,bu } } -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(); +function setToUpdate(thisform) { + thisform.doupdate.value='1'; + thisform.selectrole.value=''; + thisform.submit(); +} + +function setToRequestAuthor(thisform) { + thisform.requestauthor.value='1'; + thisform.selectrole.value=''; + thisform.submit(); } // ]]> @@ -934,54 +846,124 @@ ENDHEADER &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 ($updateresult || $reqauthor) { + $r->print('
'. + $updateresult. + $reqauthor. + '
'); } 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($update,$refresh,$now,$reinit,$nochoose,\%roles_in_env,\%roletext, - \%sortrole,\%roleclass,\%futureroles,\%timezones,$loncaparev); + &gather_roles($update,$refresh,$now,$reinit,$nochoose,\%roletext,\%sortrole,\%roleclass, + \%futureroles,\%timezones,$loncaparev); $refresh = $now; &Apache::lonnet::appenv({'user.refresh.time' => $refresh}); - if ((($cattype eq 'std') || ($cattype eq 'domonly')) && (!$env{'user.adv'})) { + my $updatebutton = &mt('Check for role changes'); + my $show_course=&Apache::loncommon::show_course(); + if ($show_course) { + $updatebutton = &mt('Check for new courses'); + } + my $do_update; + unless (($env{'form.source'} eq 'login') || ($env{'form.doupdate'})) { + $do_update = ''. + ''; + } + my ($requestauthor,$requestcrs); + unless ($reqauthor) { + if ($env{'environment.canrequest.author'}) { + unless (&is_active_author()) { + my ($status,$timestamp) = split(/:/,$env{'environment.requestauthorqueued'}); + if ($status eq 'approval') { + $requestauthor = &mt('A request for authoring space submitted on [_1] is awaiting approval',&Apache::lonlocal::locallocaltime($timestamp)); + } elsif (($status eq 'approved') && ($do_update)) { + my %roleshash = &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},'userroles', + ['active'],['au'],[$env{'user.domain'}]); + if (keys(%roleshash)) { + $requestauthor = &mt('Your request for an author role has been approved.').'
'; + if ($show_course) { + $requestauthor .= &mt('Use the "Check for new courses" button to update your list of roles.'); + } else { + $requestauthor .= &mt('Use the "Check for new roles" button to update your list of roles.'); + } + $requestauthor = ''.$requestauthor.''; + } + } + unless ($requestauthor) { + $requestauthor = + ''. + ''; + } + } + } + } + my $do_update; + unless (($env{'form.source'} eq 'login') || ($env{'form.doupdate'})) { + $do_update = ''. + ''; + } + if ($env{'user.adv'}) { + my $showall = '