--- loncom/auth/lonroles.pm 2024/09/07 01:49:32 1.269.2.39.2.10 +++ loncom/auth/lonroles.pm 2018/04/28 00:57:58 1.337 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # User Roles Screen # -# $Id: lonroles.pm,v 1.269.2.39.2.10 2024/09/07 01:49:32 raeburn Exp $ +# $Id: lonroles.pm,v 1.337 2018/04/28 00:57:58 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -140,97 +140,11 @@ use Apache::lonnavdisplay(); use Apache::loncoursequeueadmin; use Apache::longroup; use Apache::lonrss; +use Apache::lonplacementtest; use GDBM_File; use LONCAPA qw(:DEFAULT :match); use HTML::Entities; - -sub start_loading_course { - my ($r,$title,$only_body) = @_; - &Apache::loncommon::content_type($r,'text/html'); - &Apache::loncommon::no_cache($r); - $r->send_http_header; - if ($only_body) { - $r->print(&Apache::loncommon::start_page($title,undef,{'only_body' => 1, - 'add_progressbar' => 1})); - } else { - my $swinfo=&Apache::lonmenu::rawconfig(); - # Breadcrumbs - my $brcrum = [{'href' => '', - 'text' => $title},]; - my $start_page = &Apache::loncommon::start_page($title,undef, - {'bread_crumbs' => $brcrum, - 'bread_crumbs_nomenu' => 1, - 'links_disabled' => 1}); - $r->print(< -// - -ENDREDIR - } - return; -} - -sub finish_loading_course { - my ($r,$msg,$url,$only_body) = @_; - my $link = ''; - my $end_page = &Apache::loncommon::end_page(); - my $js_url = &js_escape($url); - my $remote_js; - if ($env{'environment.remote'} eq 'on') { - my ($menucoll,$deeplinkmenu,$menuref) = &Apache::loncommon::menucoll_in_effect(); - if ($menucoll) { - &Apache::lonnet::put('environment',{'remote' => 'off'}); - &Apache::lonnet::appenv({'environment.remote' => 'off'}); - my $menu_name = &Apache::lonmenu::get_menu_name(); - $remote_js = < a').removeAttr("aria-disabled"); - \$('.isDisabled').removeClass("isDisabled"); -REENABLE - } - $r->print(< -// - -$link -$end_page -END - return; -} sub redirect_user { my ($r,$title,$url,$msg) = @_; @@ -238,27 +152,27 @@ 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, - 'text' => 'Switching Role'},]; - my $start_page = &Apache::loncommon::start_page('Switching Role',undef, - {'redirect' => [1,$url], - 'bread_crumbs' => $brcrum,}); - my $end_page = &Apache::loncommon::end_page(); + my $start_page; + if ($env{'request.lti.login'}) { + $start_page = &Apache::loncommon::start_page(undef,undef, + {'redirect' => [0,$url],}).$msg; + } else { + # Breadcrumbs + my $brcrum = [{'href' => $url, + 'text' => 'Switching Role'},]; + $start_page = &Apache::loncommon::start_page('Switching Role',undef, + {'redirect' => [1,$url], + 'bread_crumbs' => $brcrum,}). + "\n

$msg

"; + } + my $end_page = &Apache::loncommon::end_page(); # Note to style police: # This must only replace the spaces, nothing else, or it bombs elsewhere. $url=~s/ /\%20/g; $r->print(< -// - -

$msg

$end_page ENDREDIR return; @@ -266,22 +180,29 @@ ENDREDIR sub error_page { my ($r,$error,$dest)=@_; - my %lt = &Apache::lonlocal::texthash( - pdc => 'Problems during Course Initialization', - tfp => 'The following problems occurred:', - con => 'Continue', + &Apache::loncommon::content_type($r,'text/html'); + &Apache::loncommon::no_cache($r); + $r->send_http_header; + return OK if $r->header_only; + # Breadcrumbs + my $brcrum = [{'href' => $dest, + 'text' => 'Problems during Course Initialization'},]; + $r->print(&Apache::loncommon::start_page('Problems during Course Initialization', + undef, + {'bread_crumbs' => $brcrum,}) ); - my $end_page = &Apache::loncommon::end_page(); - $dest = &HTML::Entities::encode($dest,'"<>&'); - $r->print(<$lt{'pdc'} -

$lt{'tfp'} -
-$error -


$lt{'con'} -$end_page -END - return; + $r->print( + ''. + '

'.&mt('The following problems occurred:'). + '
'. + $error. + '


'.&mt('Continue').'' + ); + $r->print(&Apache::loncommon::end_page()); } sub handler { @@ -307,130 +228,9 @@ sub handler { $update = $then; } - my ($norolelist,$blocked_by_ip,$blocked_type,$clientip); - $clientip = &Apache::lonnet::get_requestor_ip($r); - if (($env{'request.course.id'}) && ($env{'request.deeplink.login'})) { - my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'}; - my $deeplink_symb = &Apache::loncommon::deeplink_login_symb($cnum,$cdom); - if ($deeplink_symb) { - my ($menucoll,$deeplinkmenu,$menuref) = &Apache::loncommon::menucoll_in_effect(); - if (ref($menuref) eq 'HASH') { - unless (($menuref->{'role'}) || ($env{'request.role.adv'})) { - foreach my $envkey (keys(%env)) { - next unless ($envkey =~ /^form\./); - if ($envkey =~ m{\./($match_domain)/($match_courseid)(?:/(\w+)|$)}) { - unless (($1 eq $cdom) && ($2 eq $cnum)) { - delete($env{$envkey}); - } - } - } - if ($env{'form.selectrole'}) { - if ($env{'form.switchrole'} =~ m{\./($match_domain)/($match_courseid)(?:/(\w+)|$)}) { - unless (($1 eq $cdom) && ($2 eq $cnum)) { - delete($env{'form.selectrole'}); - delete($env{'form.switchrole'}); - } - } elsif ($env{'form.newrole'} =~ m{\./($match_domain)/($match_courseid)(?:/(\w+)|$)}) { - unless (($1 eq $cdom) && ($2 eq $cnum)) { - delete($env{'form.selectrole'}); - delete($env{'form.newrole'}); - } - } - } - $norolelist = 1; - } - } - } - } - - if ($env{'form.selectrole'}) { - my ($role,$cdom,$cnum,$rest); - if ($env{'form.switchrole'} =~ m{^(co|cc|in|ta|ep|ad|st|cr).*?\./($match_domain)/($match_courseid)(/(\w+)|$)}) { - ($role,$cdom,$cnum,$rest) = ($1,$2,$3,$4); - } elsif ($env{'form.newrole'} =~ m{^(co|cc|in|ta|ep|ad|st|cr).*?\./($match_domain)/($match_courseid)(/(\w+)|$)}) { - ($role,$cdom,$cnum,$rest) = ($1,$2,$3,$4); - } - if ($cdom ne '') { - my ($has_evb,$check_ipaccess,$showrole); - $showrole = 1; - my $checkrole = "cm./$cdom/$cnum"; - if ($rest ne '') { - $checkrole .= "/$rest"; - } - if ((&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) && - ($role ne 'st')) { - $has_evb = 1; - } - unless ($has_evb) { - my @machinedoms = &Apache::lonnet::current_machine_domains(); - my $udom = $env{'user.domain'}; - if ($udom eq $cdom) { - $check_ipaccess = 1; - } elsif (($udom ne '') && (grep(/^\Q$udom\E$/,@machinedoms))) { - $check_ipaccess = 1; - } else { - my $lonhost = $Apache::lonnet::perlvar{'lonHostID'}; - my $internet_names = &Apache::lonnet::get_internet_names($lonhost); - my $cprim = &Apache::lonnet::domain($cdom,'primary'); - my $cintdom = &Apache::lonnet::internet_dom($cprim); - if (($cintdom ne '') && (ref($internet_names) eq 'ARRAY')) { - if (grep(/^\Q$cintdom\E$/,@{$internet_names})) { - $check_ipaccess = 1; - } - } - } - if ($check_ipaccess) { - my ($ipaccessref,$cached)=&Apache::lonnet::is_cached_new('ipaccess',$cdom); - unless (defined($cached)) { - my %domconfig = - &Apache::lonnet::get_dom('configuration',['ipaccess'],$cdom); - $ipaccessref = &Apache::lonnet::do_cache_new('ipaccess',$cdom,$domconfig{'ipaccess'},1800); - } - if (ref($ipaccessref) eq 'HASH') { - foreach my $id (keys(%{$ipaccessref})) { - if (ref($ipaccessref->{$id}) eq 'HASH') { - my $range = $ipaccessref->{$id}->{'ip'}; - if ($range) { - my $type = 'exclude'; - if (&Apache::lonnet::ip_match($clientip,$range)) { - $type = 'include'; - } - if (ref($ipaccessref->{$id}->{'courses'}) eq 'HASH') { - if ($ipaccessref->{$id}->{'courses'}{$cdom.'_'.$cnum}) { - if ($type eq 'include') { - $showrole = 1; - last; - } else { - $showrole = 0; - } - } else { - if ($type eq 'include') { - $showrole = 0; - } else { - $showrole = 1; - } - } - } - } - } - } - } - } - } - unless ($showrole) { - $blocked_by_ip = 1; - $blocked_type = &Apache::loncommon::course_type($cdom.'_'.$cnum); - delete($env{'form.selectrole'}); - delete($env{'form.newrole'}); - } - } - } - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}); -# -------------------------------------------------- Check if setting hot list +# -------------------------------------------------- Check if setting hot list my $hotlist; if ($env{'form.action'} eq 'verify_and_change_rolespref') { $hotlist = &Apache::lonpreferences::verify_and_change_rolespref($r); @@ -461,8 +261,8 @@ sub handler { my $envkey; my %dcroles = (); - my %helpdeskroles = (); - my ($numdc,$numhelpdesk,$numadhoc) = + my %helpdeskroles = (); + my ($numdc,$numhelpdesk,$numadhoc) = &check_for_adhoc(\%dcroles,\%helpdeskroles,$update,$then); my $loncaparev = $r->dir_config('lonVersion'); @@ -508,7 +308,6 @@ sub handler { "request.course.sec" => '', "request.course.tied" => '', "request.course.timechecked" => '', - "request.course.suppupdated" => '', "request.role" => 'cm', "request.role.adv" => $env{'user.adv'}, "request.role.domain" => $env{'user.domain'}}); @@ -521,7 +320,7 @@ sub handler { if ($custom_adhoc) { my ($possroles,$description) = &Apache::lonnet::get_my_adhocroles($cdom.'_'.$cnum,1); if (ref($possroles) eq 'ARRAY') { - if (grep(/^\Q$rolename\E$/,@{$possroles})) { + if (grep(/^\Q$rolename\E$/,@{$possroles})) { if (&Apache::lonnet::check_adhoc_privs($cdom,$cnum,$update,$refresh,$now, "cr/$cdom/$cdom".'-domainconfig/'.$rolename,undef,$sec)) { &Apache::lonnet::appenv({"environment.internal.$cdom.$cnum.cr/$cdom/$cdom".'-domainconfig/'."$rolename.adhoc" => time}); @@ -533,8 +332,8 @@ sub handler { # 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 or DA trying to enter a course and needs privs to be created foreach my $envkey (keys(%env)) { - if ($numdc) { # Is this an ad-hoc Coordinator role? + if ($numdc) { if (my ($ccrole,$domain,$coursenum) = ($envkey =~ m-^form\.(cc|co)\./($match_domain)/($match_courseid)$-)) { if ($dcroles{$domain}) { @@ -625,10 +424,9 @@ sub handler { } last; } - } + } } } - foreach $envkey (keys(%env)) { next if ($envkey!~/^user\.role\./); my ($where,$trolecode,$role,$tstatus,$tend,$tstart); @@ -697,7 +495,6 @@ sub handler { my $end_page=&Apache::loncommon::end_page(); my $buttontext=&mt('Enter Course'); my $message=&mt('Successfully registered key'); - my $ip = &Apache::lonnet::get_requestor_ip(); my $assignresult= &Apache::lonnet::assign_access_key( $env{'form.newkey'}, @@ -706,8 +503,8 @@ sub handler { $env{'user.domain'}, $env{'user.name'}, &mt('Assigned from [_1] at [_2] for [_3]' - ,$ip - ,&Apache::lonlocal::locallocaltime($now) + ,$ENV{'REMOTE_ADDR'} + ,&Apache::lonlocal::locallocaltime() ,$trolecode) ); unless ($assignresult eq 'ok') { @@ -783,60 +580,12 @@ ENDENTERKEY } } } - my $crstype = &Apache::loncommon::course_type($cdom.'_'.$cnum); - $crstype = lc($crstype); - my ($msg,$critmsg_check,$title,$loadmsg,$only_body); - $critmsg_check = 1; - $title = &mt("Loading $crstype"); - $loadmsg = &mt("Please be patient while your $crstype loads"); - if (($env{'request.deeplink.login'}) && ($env{'request.linkprot'})) { - if ($env{'request.linkprot'} =~ /^\d+(c|d):\Q$env{'form.destinationurl'}\E$/) { - $title = &mt('Loading LON-CAPA session'); - $loadmsg = &mt('Please be patient while LON-CAPA loads'); - $only_body = 1; - $critmsg_check = 0; - } - } - my $preamble = '
'. - '
'. - $loadmsg. - '
'. - '
'; - my $closure = < -// - -ENDCLOSE - &start_loading_course($r,$title,$only_body); - my %prog_state = &Apache::lonhtmlcommon::Create_PrgWin($r,undef,$preamble); - &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Loading ...')); - $r->rflush(); - if ($critmsg_check) { - my $blockcrit = &Apache::loncommon::blocking_status('alert',$clientip,$cnum,$cdom,undef,1); - if ($blockcrit) { - my $checkrole = "cm./$cdom/$cnum"; - if ($csec ne '') { - $checkrole .= "/$csec"; - } - unless ((&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) && - ($trolecode !~ m{^st\./$cdom/$cnum})) { - $critmsg_check = 0; - } - } - } - my ($furl,$ferr)= - &Apache::lonuserstate::readmap($cdom.'/'.$cnum,$critmsg_check); - &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished!')); - &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); - $r->print($closure); - $r->rflush(); - if ($ferr) { - $furl = '/adm/roles?tryagain=1'; - } else { + my $msg; + my ($furl,$ferr)= + &Apache::lonuserstate::readmap($cdom.'/'.$cnum); + unless ($ferr) { &Apache::lonnet::appenv({'request.course.timechecked'=>$now}); - unless (($env{'form.switchrole'}) || + unless (($env{'form.switchrole'}) || ($env{"environment.internal.$cdom.$cnum.$role.adhoc"})) { &Apache::lonnet::put('nohist_crslastlogin', {$env{'user.name'}.':'.$env{'user.domain'}. @@ -864,6 +613,7 @@ ENDCLOSE 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'})) { @@ -877,7 +627,7 @@ ENDCLOSE } if (($env{'form.orgurl'}) && ($env{'form.orgurl'}!~/^\/adm\/flip/) && - ($env{'form.orgurl'} ne '/adm/roles')) { + ($env{'form.orgurl'} ne '/adm/roles')) { my $dest=$env{'form.orgurl'}; if ($env{'form.symb'}) { if ($dest =~ /\?/) { @@ -889,26 +639,9 @@ ENDCLOSE } if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; } &Apache::lonnet::appenv({'request.role.adv'=>$tadv}); - if ($ferr) { - if ($env{'form.orgurl'}) { - $furl .= '&orgurl='.&HTML::Entities::encode($env{'form.orgurl'},'<>&"'); - } - if ($env{'form.symb'}) { - $furl .= '&symb='.&HTML::Entities::encode($env{'form.symb'},'<>&"'); - } - } else { - &set_supplemental_access($cnum,$cdom); - } if (($ferr) && ($tadv)) { - &error_page($r,$ferr,$furl); + &error_page($r,$ferr,$dest); } else { - if ($env{'request.course.id'} eq $cdom.'_'.$cnum) { - if (($env{'form.orgurl'} ne '') && ($env{'form.symb'} ne '')) { - unless (&Apache::lonnet::symbverify($env{'form.symb'},$env{'form.orgurl'})) { - $dest=$env{'form.orgurl'}; - } - } - } if ($dest =~ m{^/adm/coursedocs\?folderpath}) { if ($env{'request.course.id'} eq $cdom.'_'.$cnum) { my $chome = &Apache::lonnet::homeserver($cnum,$cdom); @@ -916,53 +649,27 @@ ENDCLOSE $cdom.'_'.$cnum); } } - if ($ferr) { - if (!$env{'request.course.id'}) { - &Apache::lonnet::appenv( - {"request.course.id" => $cdom.'_'.$cnum}); - $r->print('

'. - &mt('Could not initialize [_1] at this time.', - $env{'course.'.$cdom.'_'.$cnum.'.description'}). - '

'. - '

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

'. - &Apache::loncommon::end_page()); - } - } else { - if ($env{'request.deeplink.login'}) { - &set_deeplink_target($cnum,$cdom); - } - $msg = '

'.&mt('Entering [_1] ...', - $env{'course.'.$cdom.'_'.$cnum.'.description'}). - '

'; - &finish_loading_course($r,$msg,$dest,$only_body); - } + $r->internal_redirect($dest); } - $r->rflush(); return OK; } else { if (!$env{'request.course.id'}) { &Apache::lonnet::appenv( {"request.course.id" => $cdom.'_'.$cnum}); - } + $furl='/adm/roles?tryagain=1'; + $msg='

' + .&mt('Could not initialize [_1] at this time.', + $env{'course.'.$cdom.'_'.$cnum.'.description'}) + .'

' + .'

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

' + .'

'.$ferr.'

'; + } if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; } &Apache::lonnet::appenv({'request.role.adv'=>$tadv}); - if ($ferr) { - if ($tadv) { - &error_page($r,$ferr,$furl); - } else { - $r->print('

'. - &mt('Could not initialize [_1] at this time.', - $env{'course.'.$cdom.'_'.$cnum.'.description'}). - '

'. - '

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

'. - &Apache::loncommon::end_page()); - } + + if (($ferr) && ($tadv)) { + &error_page($r,$ferr,$furl); } else { - &set_supplemental_access($cnum,$cdom); - if ($env{'request.deeplink.login'}) { - &set_deeplink_target($cnum,$cdom); - } # Check to see if the user is a CC entering a course # for the first time if ((($role eq 'cc') || ($role eq 'co')) @@ -970,6 +677,17 @@ ENDCLOSE $furl = "/adm/helper/course.initialization.helper"; # Send the user to the course they selected } elsif ($env{'request.course.id'}) { + if ((&Apache::loncommon::course_type() eq 'Placement') && + (!$env{'request.role.adv'})) { + my ($score,$incomplete) = + &Apache::lonplacementtest::check_completion(undef,undef,1); + if (($incomplete) && ($incomplete < 100)) { + &redirect_user($r, &mt('Entering [_1]', + $env{'course.'.$cdom.'_'.$cnum.'.description'}), + '/adm/placement', $msg); + return OK; + } + } my ($dest,$destsymb,$checkenc); $dest = $env{'form.destinationurl'}; $destsymb = $env{'form.destsymb'}; @@ -986,11 +704,8 @@ ENDCLOSE ($dest =~ m{^\Q/adm/wrapper/ext/\E(?!https:)})) { if ($ENV{'SERVER_PORT'} == 443) { my $hostname = $r->hostname(); - unless ((&Apache::lonnet::uses_sts()) || - (&Apache::lonnet::waf_allssl($hostname))) { - if ($hostname ne '') { - $dest = 'http://'.$hostname.$dest; - } + if ($hostname ne '') { + $dest = 'http://'.$hostname.$dest; } } } @@ -998,7 +713,7 @@ ENDCLOSE if ($env{'request.role.adv'}) { $dest = &Apache::lonenc::unencrypted($dest); if ($destsymb eq '') { - ($destsymb) = ($dest =~ /(?:\?|\&)symb=([^\&]*)/); + ($destsymb) = ($dest =~ /(?:\?|\&)symb=([^\&]*)/); $destsymb = &unescape($destsymb); } } @@ -1023,22 +738,18 @@ ENDCLOSE } } } - unless (($dest =~ m{^/enc/}) || ($dest =~ /(\?|\&)symb=.+___\d+___.+/)) { + unless (($dest =~ m{^/enc/}) || ($dest =~ /(\?|\&)symb=.+___\d+___.+/)) { if (($destsymb ne '') && ($destsymb !~ m{^/enc/})) { my $esc_symb = &escape($destsymb); $dest .= (($dest =~/\?/)? '&':'?').'symb='.$esc_symb; } } - if ($env{'form.ttoken'}) { - $dest .= (($dest =~/\?/)? '&':'?').'ttoken='.$env{'form.ttoken'}; - } - unless ($env{'request.deeplink.login'}) { - $msg = '

'.&mt('Entering [_1] ...', - $env{'course.'.$cdom.'_'.$cnum.'.description'}). - '

'; + my $title; + unless ($env{'request.lti.login'}) { + $title = &mt('Entering [_1]', + $env{'course.'.$cdom.'_'.$cnum.'.description'}); } - &finish_loading_course($r,$msg,$dest,$only_body); - $r->rflush(); + &redirect_user($r,$title,$dest,$msg); return OK; } if (&Apache::lonnet::allowed('whn', @@ -1049,62 +760,45 @@ ENDCLOSE ) { my $startpage = &courseloadpage($env{'request.course.id'}); unless ($startpage eq 'firstres') { - $msg = '

'.&mt('Entering [_1] ...', - $env{'course.'.$cdom.'_'.$cnum.'.description'}). - '

'; - &finish_loading_course($r,$msg,'/adm/whatsnew?refpage=start',$only_body); - $r->rflush(); - return OK; + $msg = &mt('Entering [_1] ...', + $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? - # - # $furl returned by lonuserstate::readmap() has format: - # $url?symb=escaped($symb). If the resource has the - # encrypturl parameter in effect, the entire string - # $url?symb=escaped($symb) is encrypted as a string - # beginning /enc/. - # - my ($access,$unencfurl,$unencsymb); - if ($furl =~ m{^(.+)(?:\?|\&)symb=([^&]+)(?:$|&)}) { - my ($poss_url,$poss_symb) = ($1,$2); - $unencsymb = &unescape($poss_symb); - $unencfurl = $poss_url; - } elsif ($furl =~ m{^/enc/}) { - my $unenc = &Apache::lonenc::unencrypted($furl); - if ($unenc =~ m{^(.+)(?:\?|\&)symb=([^&]+)(?:$|&)}) { - ($unencfurl,$unencsymb) = ($1,$2); - $unencsymb = &unescape($unencsymb); - } else { - $unencfurl = $unenc; - } + 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 { - $unencfurl = $furl; + $access = &Apache::lonnet::allowed('bre',$furl); } - if ($unencsymb) { - my $symb = &Apache::lonnet::symbclean($unencsymb); - if (($symb ne '') && (&Apache::lonnet::symbverify($symb,$unencfurl))) { - $access = &Apache::lonnet::allowed('bre',$unencfurl,$symb); - } else { - $access = &Apache::lonnet::allowed('bre',$unencfurl); - } - } else { - $access = &Apache::lonnet::allowed('bre',$unencfurl); - } - if ((!$access) || ($access eq 'B') || ($access eq 'D')) { + if (!$access) { $furl = &Apache::lonpageflip::first_accessible_resource(); - if ($furl eq '') { - $furl = '/adm/navmaps?showOnlyHomework=1'; - } + } elsif ($access eq 'B') { + $furl = '/adm/navmaps?showOnlyHomework=1'; + } + my $title; + if ($env{'request.lti.login'}) { + undef($msg); + } else { + $title = &mt('Entering [_1]', + $env{'course.'.$cdom.'_'.$cnum.'.description'}); + $msg = &mt('Entering [_1] ...', + $env{'course.'.$cdom.'_'.$cnum.'.description'}); } - $msg = '

'.&mt('Entering [_1] ...', - $env{'course.'.$cdom.'_'.$cnum.'.description'}). - '

'; - &finish_loading_course($r,$msg,$furl,$only_body); + &redirect_user($r,$title,$furl,$msg); } - $r->rflush(); - return OK; + return OK; } } # @@ -1117,12 +811,6 @@ ENDCLOSE $redirect_url .= $where; } $redirect_url .= '/'; - if ($env{'form.orgurl'} =~ /^\Q$redirect_url\E/) { - my ($path) = ($env{'form.orgurl'} =~ m{^(.+)/[^/]+$}); - if (($path ne '') && (-e $Apache::lonnet::perlvar{'lonDocRoot'}.$path)) { - $redirect_url = $env{'form.orgurl'}; - } - } &redirect_user($r,&mt('Entering Authoring Space'), $redirect_url); return OK; @@ -1173,11 +861,7 @@ ENDCLOSE $crumbtext = 'Courses'; $pagetitle = 'My Courses'; $recent = &mt('Recent Courses'); - $standby = &mt('Course selected. Please stand by.'); - } - if (($norolelist) && ((split(/:/,$env{'user.error.msg'}))[2])) { - $crumbtext = 'Access Denied'; - $pagetitle = 'Unauthorized'; + $standby = &mt('Course selected. Please stand by.'); } my $brcrum =[{href=>"/adm/roles",text=>$crumbtext}]; @@ -1190,16 +874,40 @@ ENDCLOSE if ($domdefs{'catauth'}) { $cattype = $domdefs{'catauth'}; } - my ($funcs,$crumbsright); - unless (($norolelist) && ((split(/:/,$env{'user.error.msg'}))[2])) { + my $placementonly; + if ($showcount == 1) { + if ($env{'request.course.id'}) { + if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') { + $placementonly = 1; + } + } else { + foreach my $rolecode (keys(%roles_in_env)) { + my ($cid) = ($rolecode =~ m{^\Quser.role.st./\E($match_domain/$match_courseid)(?:/|$)}); + if ($cid) { + my %coursedescription = + &Apache::lonnet::coursedescription($cid,{'one_time' => '1'}); + if ($coursedescription{'type'} eq 'Placement') { + $placementonly = 1; + } + last; + } + } + } + } + my ($start_page,$funcs); + if ($placementonly) { + $start_page=&Apache::loncommon::start_page($pagetitle,undef, + {bread_crumbs=>$brcrum,crstype=>'Placement'}); + } else { $funcs = &get_roles_functions($showcount,$cattype); + my $crumbsright; if ($env{'browser.mobile'}) { $crumbsright = $funcs; undef($funcs); } + $start_page=&Apache::loncommon::start_page($pagetitle,undef,{bread_crumbs=>$brcrum, + bread_crumbs_component=>$crumbsright}); } - 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.').'
'; @@ -1233,7 +941,7 @@ function rolesView (caller) { document.rolechoice.display.value = caller; } else { if ((caller == 'doupdate') || (caller == 'requestauthor') || - (caller == 'queued')) { + (caller == 'queued')) { document.rolechoice.state.value = caller; } } @@ -1303,16 +1011,8 @@ ENDHEADER } if ($nochoose) { $r->print("

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

\n". - &mt('This action is currently not authorized.').''); - if ($error && $norolelist) { - $r->print('

'. - &mt('As your session was launched from a web page external to LON-CAPA some course content may be unavailable, including the resource you were trying to access.'). - '

'. - '

'. - &mt('You may need to login to LON-CAPA directly, or re-launch from a different external system.'). - '

'); - } - $r->print(&Apache::loncommon::end_page()); + &mt('This action is currently not authorized.').''. + &Apache::loncommon::end_page()); return OK; } else { if ($updateresult || $reqauthor || $hotlist) { @@ -1325,7 +1025,7 @@ ENDHEADER } if ($hotlist) { $showresult .= $hotlist; - } + } $showresult .= ''; $r->print($showresult); } elsif ($env{'form.state'} eq 'queued') { @@ -1341,16 +1041,6 @@ ENDHEADER $r->print(''); $r->print(''); $r->print(''); - if ($blocked_by_ip) { - my $blocked_role = 'student'; - if ($blocked_type eq 'Community') { - $blocked_role = 'member'; - } - $r->print('

'. - &mt('The [_1] you selected is not available for access with a [_2] role from your current IP address: [_3].', - lc($blocked_type),$blocked_role,$clientip). - '

'); - } } $r->rflush(); @@ -1360,7 +1050,21 @@ ENDHEADER \%sortrole,\%roleclass,\%futureroles,\%timezones,$loncaparev); $refresh = $now; &Apache::lonnet::appenv({'user.refresh.time' => $refresh}); - if ((($cattype eq 'std') || ($cattype eq 'domonly')) && (!$env{'user.adv'})) { + if ($countactive == 1) { + if ($env{'request.course.id'}) { + if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') { + $placementonly = 1; + } + } elsif ($possiblerole) { + if ($possiblerole =~ m{^st\./($match_domain)/($match_courseid)(?:/|$)}) { + if ($env{'course.'.$1.'_'.$2.'.type'} eq 'Placement') { + $placementonly = 1; + } + } + } + } + if ((($cattype eq 'std') || ($cattype eq 'domonly')) && (!$env{'user.adv'}) && + (!$placementonly)) { if ($countactive > 0) { my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description'); my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); @@ -1382,33 +1086,9 @@ ENDHEADER } } - if ($norolelist) { - if ($env{'request.role'}) { - my ($roletext,$role_text_end) = &display_curr_role($env{'request.role'}); - if ($roletext) { - $r->print(&Apache::loncommon::start_data_table('LC_textsize_mobile'). - &Apache::loncommon::start_data_table_row(). - $roletext. - &Apache::loncommon::end_data_table_row()); - if ($role_text_end) { - $r->print(&Apache::loncommon::continue_data_table_row(). - $role_text_end. - &Apache::loncommon::end_data_table_row()); - } - $r->print(&Apache::loncommon::end_data_table()); - } - } - $r->print(&Apache::loncommon::end_page()); - return OK; - } - # No active roles if ($countactive==0) { - my $elapsed = 0; - if ($now && $update) { - $elapsed = $now - $update; - } - &requestcourse_advice($r,$cattype,$inrole,$elapsed); + &requestcourse_advice($r,$cattype,$inrole); $r->print(''); if ($countfuture) { $r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture)); @@ -1437,6 +1117,16 @@ ENDHEADER } $r->print(&Apache::loncommon::end_page()); return OK; + } elsif (($placementonly) && ($env{'request.role'} eq 'cm')) { + $r->print('

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

+ + '); + $r->rflush(); + $r->print(''); + $r->print(&Apache::loncommon::end_page()); + return OK; } # ----------------------------------------------------------------------- Table @@ -1584,6 +1274,7 @@ sub gather_roles { my $advanced = $env{'user.adv'}; my $tryagain = $env{'form.tryagain'}; my @ids = &Apache::lonnet::current_machine_ids(); + my (%willtrust,%trustchecked); if (ref($roles_in_env) eq 'HASH') { my %adhocdesc; foreach my $envkey (sort(keys(%{$roles_in_env}))) { @@ -1652,10 +1343,23 @@ sub gather_roles { if (($role eq 'ca') || ($role eq 'aa')) { my $home = &Apache::lonnet::homeserver($trest,$tdom); my $allowed=0; + my $prohibited; foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } if (!$allowed) { $button=0; - $switchserver='otherserver='.$home.'&role='.$trolecode; + unless ($trustchecked{$tdom}) { + if ((&Apache::lonnet::will_trust('othcoau',$tdom,$env{'user.domain'})) && + (&Apache::lonnet::will_trust('coremau',$env{'user.domain'},$tdom))) { + $willtrust{$tdom} = 1; + $trustchecked{$tdom} = 1; + } + } + if ($willtrust{$tdom}) { + $switchserver='otherserver='.$home.'&role='.$trolecode; + } else { + $prohibited = 1; + $tremark .= &mt('Session switch required but prohibited.'); + } } #next if ($home eq 'no_host'); $home = &Apache::lonnet::hostname($home); @@ -1664,7 +1368,9 @@ sub gather_roles { ': '.$tdom.'
'. ' '.&mt('Server').': '.$home; $env{'course.'.$tdom.'_'.$trest.'.description'}='ca'; - $tremark.=&Apache::lonhtmlcommon::authorbombs('/res/'.$tdom.'/'.$trest.'/'); + unless ($prohibited) { + $tremark.=&Apache::lonhtmlcommon::authorbombs('/res/'.$tdom.'/'.$trest.'/'); + } $sortkey=$role."$trest:$tdom"; } elsif ($role eq 'au') { # Authors @@ -1700,9 +1406,9 @@ sub gather_roles { foreach my $rolename (sort(keys(%{$domdef{'adhocroles'}}))) { if (ref($domdef{'adhocroles'}{$rolename}) eq 'HASH') { $adhocdesc{$tdom}{$rolename} = $domdef{'adhocroles'}{$rolename}{'desc'}; + $desc = $adhocdesc{$tdom}{$rolename}; } } - $desc = $adhocdesc{$tdom}{$rolename}; } } if ($desc ne '') { @@ -1763,6 +1469,9 @@ sub gather_roles { $skipcal = 1; } } + if ($ttype eq 'Placement') { + $ttype = 'Placement Test'; + } if ($tsection) { $twhere.='
'.&mt('Section').': '.$tsection; } @@ -1878,7 +1587,7 @@ sub roletable_headers { } sub roletypes { - my @types = ('Domain','Authoring Space','Course','Community','Unavailable','System'); + my @types = ('Domain','Authoring Space','Course','Placement Test','Community','Unavailable','System'); return @types; } @@ -1929,26 +1638,21 @@ sub print_rolerows { } sub findcourse_advice { - my ($r,$cattype,$elapsed) = @_; + my ($r,$cattype) = @_; my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description'); my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); if (&Apache::lonnet::auto_run(undef,$env{'user.domain'})) { - $r->print('

'.&mt('If you were expecting to see an active role listed for a particular course in the [_1] domain, it may be missing for one of the following reasons:',$domdesc).' + $r->print(&mt('If you were expecting to see an active role listed for a particular course in the [_1] domain, it may be missing for one of the following reasons:',$domdesc).'

  • '.&mt('The course has yet to be created.').'
  • '.&mt('Automatic enrollment of registered students has not been enabled for the course.').'
  • '.&mt('You are in a section of course for which automatic enrollment in the corresponding LON-CAPA course is not active.').'
  • '.&mt('The start date for automated enrollment has yet to be reached.').'
  • '.&mt('You registered for the course recently and there is a time lag between the time you register, and the time this information becomes available for the update of LON-CAPA course rosters.').'
    • -
  • '.&mt('Automated enrollment added you to the course in the time since you last logged-in.').' '.&mt('If that is the case you can use the "Check for changes" link in the gray Functions bar to update the list of your available course roles.').'
    • -

'); +
  • '.&mt('Automated enrollment added you to the course in the time since you last logged in.').' '.&mt('If that is the case you can use the "Check for changes" link in the gray Functions bar to update the list of your available course roles.').'
    • + '); } else { - $r->print('

    '.&mt('If you were expecting to see an active role listed for a particular course, that course may not have been created yet.').'

    '); - if ($elapsed > 600) { - $r->print('

    '.&mt('You may also have been assigned to a course in the time since you last logged-in, or checked for changes.'). - '
    '. - &mt('If that is the case you can use the "Check for changes" link in the gray Functions bar to update the list of your available course roles.').'

    '); - } + $r->print(&mt('If you were expecting to see an active role listed for a particular course, that course may not have been created yet.').'
    '); } if (($cattype eq 'std') || ($cattype eq 'domonly')) { $r->print('

    '.&mt('Self-Enrollment').'

    '. @@ -1960,7 +1664,7 @@ sub findcourse_advice { } sub requestcourse_advice { - my ($r,$cattype,$inrole,$elapsed) = @_; + my ($r,$cattype,$inrole) = @_; my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description'); my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); my (%can_request,%request_doms,$output); @@ -2021,7 +1725,7 @@ sub requestcourse_advice { } else { $r->print('

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

    '); } - &findcourse_advice($r,$cattype,$elapsed); + &findcourse_advice($r,$cattype); } return; } @@ -2141,7 +1845,7 @@ sub build_roletext { $trolecode."','".$buttonname.'\');" />'; } } - if (($trolecode !~ m/^(ca|aa)\./) && ($trest ne '') && (!$skipcal)) { + if (($trolecode !~ m/^(dc|ca|au|aa)\./) && (!$skipcal)) { $tremark.=&Apache::lonannounce::showday(time,1, &Apache::lonannounce::readcalendar($tdom.'_'.$trest)); } @@ -2179,7 +1883,7 @@ sub check_for_adhoc { my $numdc = 0; my $numhelpdesk = 0; my $numadhoc = 0; - my $num_custom_adhoc = 0; + my $num_custom_adhoc = 0; if (($env{'user.adv'}) || ($env{'user.rar'})) { foreach my $envkey (sort(keys(%env))) { if ($envkey=~/^user\.role\.(dc|dh|da)\.\/($match_domain)\/$/) { @@ -2398,7 +2102,7 @@ sub display_cc_role { } else { $twhere=&mt('Currently not available'); $env{'course.'.$tcourseid.'.description'}=$twhere; - $skipcal = 1; + $skipcal = 1; } my $trole = &Apache::lonnet::plaintext($ccrole,$ttype,$tcourseid); $twhere.="
    ".&mt('Domain').":".$tdom; @@ -2408,38 +2112,6 @@ sub display_cc_role { return ($roletext,$roletext_end); } -sub display_curr_role { - my ($currentrole) = @_; - my ($roletext,$roletext_end); - my $advanced = $env{'user.adv'}; - my $tryagain = $env{'form.tryagain'}; - my ($role,$rest) = split(m{\./},$currentrole,2); - unless (!defined($role) || $role eq '') { - if ($rest =~ m{^($match_domain)/($match_courseid)(?:/(\w+)|$)}) { - my $cdom = $1; - my $cnum = $2; - my $csec = $3; - my $cid = $cdom.'_'.$cnum; - my $ttype = $env{'course.'.$cid.'.type'}; - my $skipcal = 1; - my $tbg='LC_roles_is'; - my $twhere = $env{'course.'.$cid.'.description'}. - ' '. - &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$cnum,$cdom). - ''; - my $trole = &Apache::lonnet::plaintext($role,$ttype,$cid); - if ($csec) { - $twhere.= '  '.&mt('Section').': '.$csec; - } - if ($role ne 'st') { - $twhere.= '  '.&mt('Domain').': '.$cdom; - } - ($roletext,$roletext_end) = &build_roletext($currentrole,$cdom,$cnum,'is',$tryagain,$advanced,'',$tbg,$trole,$twhere,'','','',1,'','','',$skipcal); - } - } - return ($roletext,$roletext_end); -} - sub adhoc_roles_row { my ($dcdom,$rowtype) = @_; my $output = &Apache::loncommon::continue_data_table_row() @@ -2469,7 +2141,7 @@ sub adhoc_customroles_row { if ($tstart && $tstart>$limit) { $liverole = 0; } if ($tend && $tend <$limit) { $liverole = 0; } return unless ($liverole); - my %domdefaults = &Apache::lonnet::get_domain_defaults($dhdom); + my %domdefaults = &Apache::lonnet::get_domain_defaults($dhdom); if (ref($domdefaults{'adhocroles'}) eq 'HASH') { if (scalar(keys(%{$domdefaults{'adhocroles'}})) > 0) { return &Apache::loncommon::continue_data_table_row() @@ -2600,22 +2272,6 @@ sub update_session_roles { } } else { $newrole{$rolekey} = $status_in_db; - if ($role eq 'au') { - my %userenv = - &Apache::lonnet::userenvironment($env{'user.domain'}, - $env{'user.name'},'authoreditors'); - if ($userenv{'authoreditors'}) { - $userenv{'editors'} = $userenv{'authoreditors'}; - } else { - my %domdef = &Apache::lonnet::get_domain_defaults($env{'user.domain'}); - if ($domdef{'editors'} ne '') { - $userenv{'editors'} = $domdef{'editors'}; - } else { - $userenv{'editors'} = 'edit,xml'; - } - } - &Apache::lonnet::appenv(\%userenv); - } } } } @@ -2815,7 +2471,7 @@ sub update_session_roles { &curr_role_status($currstart,$currend,$refresh,$update); my ($rolekey) = ($envkey =~ /^user\.role\.(.+)$/); my ($role,$rest)=split(m{\./},$rolekey,2); - $rest = '/'.$rest; + $rest = '/'.$rest; if (&Apache::lonnet::delenv($envkey,undef,[$role])) { if ($status_in_env eq 'active') { if ($role eq 'gr') { @@ -3015,15 +2671,15 @@ sub update_session_roles { } my $groupdesc; unless (ref($curr_groups{$cdom.'_'.$cnum}) eq 'HASH') { - %{$curr_groups{$cdom.'_'.$cnum}} = + %{$curr_groups{$cdom.'_'.$cnum}} = &Apache::longroup::coursegroups($cdom,$cnum); } unless ((ref($groupdescs{$cdom.'_'.$cnum}) eq 'HASH') && ($groupdescs{$cdom.'_'.$cnum}{$group})) { - my %groupinfo = + my %groupinfo = &Apache::longroup::get_group_settings($curr_groups{$cdom.'_'.$cnum}{$group}); - $groupdescs{$cdom.'_'.$cnum}{$group} = + $groupdescs{$cdom.'_'.$cnum}{$group} = &unescape($groupinfo{'description'}); } $groupdesc = $groupdescs{$cdom.'_'.$cnum}{$group}; @@ -3142,7 +2798,7 @@ sub update_session_roles { my $cdom = $env{'course.'.$cid.'.domain'}; my $cnum = $env{'course.'.$cid.'.num'}; my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum); - my %groupdesc; + my %groupdesc; if (ref($groupchange{$crs}) eq 'HASH') { $groupchgmsg .= '
  • '.&mt('Course/Community: [_1]',''.$crsdesc.'
      '); foreach my $group (sort(keys(%{$groupchange{$crs}}))) { @@ -3375,7 +3031,7 @@ sub get_queued { if (ref($history{'details'}) eq 'HASH') { $description = $history{details}{'cdescr'}; } - @{$reqcrs{$reqtime}} = ($description,$showtype); + @{$reqcrs{$reqtime}} = ($description,$showtype); } } my @sortedtimes = sort {$a <=> $b} (keys(%reqcrs)); @@ -3438,42 +3094,6 @@ sub get_queued { $output.'
      '; } -sub set_deeplink_target { - my ($cnum,$cdom) = @_; - if (($cnum ne '') && ($cdom ne '')) { - my $deeplink_symb = &Apache::loncommon::deeplink_login_symb($cnum,$cdom); - if ($deeplink_symb ne '') { - my $deeplink; - if ($deeplink_symb =~ /\.(page|sequence)$/) { - my $mapname = &Apache::lonnet::deversion((&Apache::lonnet::decode_symb($deeplink_symb))[2]); - my $navmap = Apache::lonnavmaps::navmap->new(); - if (ref($navmap)) { - $deeplink = $navmap->get_mapparam(undef,$mapname,'0.deeplink'); - } - } elsif ($deeplink_symb ne '') { - $deeplink = &Apache::lonnet::EXT('resource.0.deeplink',$deeplink_symb); - } - if ($deeplink ne '') { - my ($state,$others,$listed,$scope,$protect,$display,$target) = split(/,/,$deeplink); - if ($target ne '') { - &Apache::lonnet::appenv({'request.deeplink.target' => $target}); - } elsif (exists($env{'request.deeplink.target'})) { - &Apache::lonnet::delenv('request.deeplink.target'); - } - } - } - } - return; -} - -sub set_supplemental_access { - my ($cnum,$cdom) = @_; - my ($supplemental,$refs_updated) = &Apache::loncommon::get_supplemental($cnum,$cdom); - unless ($refs_updated) { - &Apache::loncommon::set_supp_httprefs($cnum,$cdom,$supplemental); - } -} - 1; __END__