version 1.358, 2021/11/30 14:16:13
|
version 1.369, 2022/10/29 18:13:29
|
Line 149 my $registered_cleanup;
|
Line 149 my $registered_cleanup;
|
my $rosterupdates; |
my $rosterupdates; |
|
|
sub start_loading_course { |
sub start_loading_course { |
my ($r,$title) = @_; |
my ($r,$title,$only_body) = @_; |
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::no_cache($r); |
&Apache::loncommon::no_cache($r); |
$r->send_http_header; |
$r->send_http_header; |
my $swinfo=&Apache::lonmenu::rawconfig(); |
if ($only_body) { |
# Breadcrumbs |
$r->print(&Apache::loncommon::start_page($title,undef,{'only_body' => 1, |
my $brcrum = [{'href' => '', |
'add_progressbar' => 1})); |
'text' => $title},]; |
} else { |
my $start_page = &Apache::loncommon::start_page($title,undef, |
my $swinfo=&Apache::lonmenu::rawconfig(); |
{'bread_crumbs' => $brcrum, |
# Breadcrumbs |
'bread_crumbs_nomenu' => 1, |
my $brcrum = [{'href' => '', |
'links_disabled' => 1}); |
'text' => $title},]; |
$r->print(<<ENDREDIR); |
my $start_page = &Apache::loncommon::start_page($title,undef, |
|
{'bread_crumbs' => $brcrum, |
|
'bread_crumbs_nomenu' => 1, |
|
'links_disabled' => 1}); |
|
$r->print(<<ENDREDIR); |
$start_page |
$start_page |
<script type="text/javascript"> |
<script type="text/javascript"> |
// <![CDATA[ |
// <![CDATA[ |
Line 176 document.body.addEventListener('click',
|
Line 180 document.body.addEventListener('click',
|
// ]]> |
// ]]> |
</script> |
</script> |
ENDREDIR |
ENDREDIR |
|
} |
return; |
return; |
} |
} |
|
|
sub finish_loading_course { |
sub finish_loading_course { |
my ($r,$msg,$url) = @_; |
my ($r,$msg,$url,$only_body) = @_; |
my $link = '<div id="LC_course_loaded" style="display:none"><a href="'.$url.'">'.&mt('Continue').'</a></div>'; |
my $link = '<div id="LC_course_loaded" style="display:none"><a href="'. |
|
&HTML::Entities::encode($url,'"<>&').'">'.&mt('Continue').'</a></div>'; |
my $end_page = &Apache::loncommon::end_page(); |
my $end_page = &Apache::loncommon::end_page(); |
my $js_url = &js_escape($url); |
my $js_url = &js_escape($url); |
|
my $reenable; |
|
unless ($only_body) { |
|
$reenable = <<REENABLE; |
|
\$('.isDisabled > a').removeAttr("aria-disabled"); |
|
\$('.isDisabled').removeClass("isDisabled"); |
|
REENABLE |
|
} |
$r->print(<<END); |
$r->print(<<END); |
$msg |
$msg |
<script type="text/javascript"> |
<script type="text/javascript"> |
// <![CDATA[ |
// <![CDATA[ |
\$(document).ready(function() { |
\$(document).ready(function() { |
\$("#LC_course_loaded").css("display","block"); |
\$("#LC_course_loaded").css("display","block"); |
\$('.isDisabled > a').removeAttr("aria-disabled"); |
$reenable |
\$('.isDisabled').removeClass("isDisabled"); |
|
var url = "$js_url"; |
var url = "$js_url"; |
\$(location).attr('href',url); |
\$(location).attr('href',url); |
}); |
}); |
|
// ]]> |
</script> |
</script> |
$link |
$link |
$end_page |
$end_page |
Line 277 sub handler {
|
Line 290 sub handler {
|
$update = $then; |
$update = $then; |
} |
} |
|
|
my ($norolelist,$blocked_by_ip,$blocked_type,$blocked_ipaddr); |
my ($norolelist,$blocked_by_ip,$blocked_type,$clientip); |
|
$clientip = &Apache::lonnet::get_requestor_ip($r); |
if (($env{'request.course.id'}) && ($env{'request.deeplink.login'})) { |
if (($env{'request.course.id'}) && ($env{'request.deeplink.login'})) { |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
Line 358 sub handler {
|
Line 372 sub handler {
|
$ipaccessref = &Apache::lonnet::do_cache_new('ipaccess',$cdom,$domconfig{'ipaccess'},1800); |
$ipaccessref = &Apache::lonnet::do_cache_new('ipaccess',$cdom,$domconfig{'ipaccess'},1800); |
} |
} |
if (ref($ipaccessref) eq 'HASH') { |
if (ref($ipaccessref) eq 'HASH') { |
my $remote_ip = &Apache::lonnet::get_requestor_ip(); |
|
foreach my $id (keys(%{$ipaccessref})) { |
foreach my $id (keys(%{$ipaccessref})) { |
if (ref($ipaccessref->{$id}) eq 'HASH') { |
if (ref($ipaccessref->{$id}) eq 'HASH') { |
my $range = $ipaccessref->{$id}->{'ip'}; |
my $range = $ipaccessref->{$id}->{'ip'}; |
if ($range) { |
if ($range) { |
my $type = 'exclude'; |
my $type = 'exclude'; |
if (&Apache::lonnet::ip_match($remote_ip,$range)) { |
if (&Apache::lonnet::ip_match($clientip,$range)) { |
$type = 'include'; |
$type = 'include'; |
} |
} |
if (ref($ipaccessref->{$id}->{'courses'}) eq 'HASH') { |
if (ref($ipaccessref->{$id}->{'courses'}) eq 'HASH') { |
Line 386 sub handler {
|
Line 399 sub handler {
|
} |
} |
} |
} |
} |
} |
unless ($showrole) { |
|
$blocked_ipaddr = $remote_ip; |
|
} |
|
} |
} |
} |
} |
} |
} |
Line 489 sub handler {
|
Line 499 sub handler {
|
"request.course.sec" => '', |
"request.course.sec" => '', |
"request.course.tied" => '', |
"request.course.tied" => '', |
"request.course.timechecked" => '', |
"request.course.timechecked" => '', |
|
"request.course.suppupdated" => '', |
"request.role" => 'cm', |
"request.role" => 'cm', |
"request.role.adv" => $env{'user.adv'}, |
"request.role.adv" => $env{'user.adv'}, |
"request.role.domain" => $env{'user.domain'}}); |
"request.role.domain" => $env{'user.domain'}}); |
Line 764 ENDENTERKEY
|
Line 775 ENDENTERKEY
|
} |
} |
my $crstype = &Apache::loncommon::course_type($cdom.'_'.$cnum); |
my $crstype = &Apache::loncommon::course_type($cdom.'_'.$cnum); |
$crstype = lc($crstype); |
$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 = '<div id="LC_update_'.$cdom.'_'.$cnum.'" class="LC_info">'. |
my $preamble = '<div id="LC_update_'.$cdom.'_'.$cnum.'" class="LC_info">'. |
'<br />'. |
'<br />'. |
&mt("Please be patient while your $crstype loads"). |
$loadmsg. |
'<br /></div>'. |
'<br /></div>'. |
'<div style="padding:0;clear:both;margin:0;border:0"></div>'; |
'<div style="padding:0;clear:both;margin:0;border:0"></div>'; |
my $closure = <<ENDCLOSE; |
my $closure = <<ENDCLOSE; |
Line 776 ENDENTERKEY
|
Line 799 ENDENTERKEY
|
// ]]> |
// ]]> |
</script> |
</script> |
ENDCLOSE |
ENDCLOSE |
my $title = &mt("Loading $crstype"); |
&start_loading_course($r,$title,$only_body); |
&start_loading_course($r,$title); |
|
my %prog_state = &Apache::lonhtmlcommon::Create_PrgWin($r,undef,$preamble); |
my %prog_state = &Apache::lonhtmlcommon::Create_PrgWin($r,undef,$preamble); |
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Loading ...')); |
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Loading ...')); |
$r->rflush(); |
$r->rflush(); |
my ($msg,$blockcrit,$critmsg_check); |
if ($critmsg_check) { |
$critmsg_check = 1; |
my $blockcrit = &Apache::loncommon::blocking_status('alert',$clientip,$cnum,$cdom,undef,1); |
$blockcrit = &Apache::loncommon::blocking_status('alert',$cnum,$cdom,undef,1); |
if ($blockcrit) { |
if ($blockcrit) { |
my $checkrole = "cm./$cdom/$cnum"; |
my $checkrole = "cm./$cdom/$cnum"; |
if ($csec ne '') { |
if ($csec ne '') { |
$checkrole .= "/$csec"; |
$checkrole .= "/$csec"; |
} |
} |
unless ((&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) && |
unless ((&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) && |
($trolecode !~ m{^st\./$cdom/$cnum})) { |
($trolecode !~ m{^st\./$cdom/$cnum})) { |
$critmsg_check = 0; |
$critmsg_check = 0; |
} |
} |
} |
} |
} |
my ($furl,$ferr)= |
my ($furl,$ferr)= |
Line 832 ENDCLOSE
|
Line 854 ENDCLOSE
|
my ($feeds,$syllabus_time); |
my ($feeds,$syllabus_time); |
&Apache::lonrss::advertisefeeds($cnum,$cdom,undef,\$feeds); |
&Apache::lonrss::advertisefeeds($cnum,$cdom,undef,\$feeds); |
&Apache::lonnet::appenv({'request.course.feeds' => $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.'.updatedsyllabus'}) { |
unless (($env{'course.'.$cdom.'_'.$cnum.'.externalsyllabus'}) || |
unless (($env{'course.'.$cdom.'_'.$cnum.'.externalsyllabus'}) || |
($env{'course.'.$cdom.'_'.$cnum.'.uploadedsyllabus'})) { |
($env{'course.'.$cdom.'_'.$cnum.'.uploadedsyllabus'})) { |
Line 865 ENDCLOSE
|
Line 886 ENDCLOSE
|
if ($env{'form.symb'}) { |
if ($env{'form.symb'}) { |
$furl .= '&symb='.&HTML::Entities::encode($env{'form.symb'},'<>&"'); |
$furl .= '&symb='.&HTML::Entities::encode($env{'form.symb'},'<>&"'); |
} |
} |
|
} else { |
|
&set_supplemental_access($cnum,$cdom); |
} |
} |
if (($ferr) && ($tadv)) { |
if (($ferr) && ($tadv)) { |
&error_page($r,$ferr,$furl); |
&error_page($r,$ferr,$furl); |
Line 900 ENDCLOSE
|
Line 923 ENDCLOSE
|
($env{'request.lti.rosterid'} || $env{'request.lti.passbackid'})) { |
($env{'request.lti.rosterid'} || $env{'request.lti.passbackid'})) { |
&process_lti($r,$cdom,$cnum); |
&process_lti($r,$cdom,$cnum); |
} |
} |
|
if ($env{'request.deeplink.login'}) { |
|
&set_deeplink_target($cnum,$cdom); |
|
} |
$msg = '<p>'.&mt('Entering [_1] ...', |
$msg = '<p>'.&mt('Entering [_1] ...', |
$env{'course.'.$cdom.'_'.$cnum.'.description'}). |
$env{'course.'.$cdom.'_'.$cnum.'.description'}). |
'</p>'; |
'</p>'; |
&finish_loading_course($r,$msg,$dest); |
&finish_loading_course($r,$msg,$dest,$only_body); |
} |
} |
} |
} |
$r->rflush(); |
$r->rflush(); |
Line 927 ENDCLOSE
|
Line 953 ENDCLOSE
|
&Apache::loncommon::end_page()); |
&Apache::loncommon::end_page()); |
} |
} |
} else { |
} else { |
|
&set_supplemental_access($cnum,$cdom); |
if (($env{'request.lti.login'}) && |
if (($env{'request.lti.login'}) && |
($env{'request.lti.rosterid'} || $env{'request.lti.passbackid'})) { |
($env{'request.lti.rosterid'} || $env{'request.lti.passbackid'})) { |
&process_lti($r,$cdom,$cnum); |
&process_lti($r,$cdom,$cnum); |
} |
} |
|
if ($env{'request.deeplink.login'}) { |
|
&set_deeplink_target($cnum,$cdom); |
|
} |
# Check to see if the user is a CC entering a course |
# Check to see if the user is a CC entering a course |
# for the first time |
# for the first time |
if ((($role eq 'cc') || ($role eq 'co')) |
if ((($role eq 'cc') || ($role eq 'co')) |
Line 946 ENDCLOSE
|
Line 976 ENDCLOSE
|
$msg = '<p>'.&mt('Entering [_1] ...', |
$msg = '<p>'.&mt('Entering [_1] ...', |
$env{'course.'.$cdom.'_'.$cnum.'.description'}). |
$env{'course.'.$cdom.'_'.$cnum.'.description'}). |
'</p>'; |
'</p>'; |
&finish_loading_course($r,$msg,'/adm/placement'); |
&finish_loading_course($r,$msg,'/adm/placement',$only_body); |
$r->rflush(); |
$r->rflush(); |
return OK; |
return OK; |
} |
} |
Line 1013 ENDCLOSE
|
Line 1043 ENDCLOSE
|
if ($env{'form.ttoken'}) { |
if ($env{'form.ttoken'}) { |
$dest .= (($dest =~/\?/)? '&':'?').'ttoken='.$env{'form.ttoken'}; |
$dest .= (($dest =~/\?/)? '&':'?').'ttoken='.$env{'form.ttoken'}; |
} |
} |
unless ($env{'request.lti.login'}) { |
unless (($env{'request.lti.login'}) || ($env{'request.deeplink.login'})) { |
$msg = '<p>'.&mt('Entering [_1] ...', |
$msg = '<p>'.&mt('Entering [_1] ...', |
$env{'course.'.$cdom.'_'.$cnum.'.description'}). |
$env{'course.'.$cdom.'_'.$cnum.'.description'}). |
'</p>'; |
'</p>'; |
} |
} |
&finish_loading_course($r,$msg,$dest); |
&finish_loading_course($r,$msg,$dest,$only_body); |
$r->rflush(); |
$r->rflush(); |
return OK; |
return OK; |
} |
} |
Line 1033 ENDCLOSE
|
Line 1063 ENDCLOSE
|
$msg = '<p>'.&mt('Entering [_1] ...', |
$msg = '<p>'.&mt('Entering [_1] ...', |
$env{'course.'.$cdom.'_'.$cnum.'.description'}). |
$env{'course.'.$cdom.'_'.$cnum.'.description'}). |
'</p>'; |
'</p>'; |
&finish_loading_course($r,$msg,'/adm/whatsnew?refpage=start'); |
&finish_loading_course($r,$msg,'/adm/whatsnew?refpage=start',$only_body); |
$r->rflush(); |
$r->rflush(); |
return OK; |
return OK; |
} |
} |
Line 1081 ENDCLOSE
|
Line 1111 ENDCLOSE
|
} |
} |
if ($env{'request.lti.login'}) { |
if ($env{'request.lti.login'}) { |
undef($msg); |
undef($msg); |
&finish_loading_course($r,$msg,$furl); |
&finish_loading_course($r,$msg,$furl,$only_body); |
} else { |
} else { |
$msg = '<p>'.&mt('Entering [_1] ...', |
$msg = '<p>'.&mt('Entering [_1] ...', |
$env{'course.'.$cdom.'_'.$cnum.'.description'}). |
$env{'course.'.$cdom.'_'.$cnum.'.description'}). |
'</p>'; |
'</p>'; |
&finish_loading_course($r,$msg,$furl); |
&finish_loading_course($r,$msg,$furl,$only_body); |
} |
} |
} |
} |
$r->rflush(); |
$r->rflush(); |
Line 1103 ENDCLOSE
|
Line 1133 ENDCLOSE
|
$redirect_url .= $where; |
$redirect_url .= $where; |
} |
} |
$redirect_url .= '/'; |
$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_user($r,&mt('Entering Authoring Space'), |
$redirect_url); |
$redirect_url); |
return OK; |
return OK; |
Line 1354 ENDHEADER
|
Line 1390 ENDHEADER
|
} |
} |
$r->print('<h3><span class="LC_error">'. |
$r->print('<h3><span class="LC_error">'. |
&mt('The [_1] you selected is not available for access with a [_2] role from your current IP address: [_3].', |
&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,$blocked_ipaddr). |
lc($blocked_type),$blocked_role,$clientip). |
'</span></h3>'); |
'</span></h3>'); |
} |
} |
} |
} |
Line 1994 sub findcourse_advice {
|
Line 2030 sub findcourse_advice {
|
} else { |
} else { |
$r->print('<p>'.&mt('If you were expecting to see an active role listed for a particular course, that course may not have been created yet.').'</p>'); |
$r->print('<p>'.&mt('If you were expecting to see an active role listed for a particular course, that course may not have been created yet.').'</p>'); |
if ($elapsed > 600) { |
if ($elapsed > 600) { |
$r->print('<p>'.&mt('You may also have been assigned to a course in the time since you last logged-in, or checked for changes'). |
$r->print('<p>'.&mt('You may also have been assigned to a course in the time since you last logged-in, or checked for changes.'). |
'<br />'. |
'<br />'. |
&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.').'</p>'); |
&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.').'</p>'); |
} |
} |
Line 3549 sub ltienroll {
|
Line 3585 sub ltienroll {
|
} |
} |
} |
} |
|
|
|
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; |
1; |
__END__ |
__END__ |
|
|