loncom/interface/lonnavdisplay.pm - diff

Return to lonnavdisplay.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonnavdisplay.pm between versions 1.22.4.10.2.3 and 1.39

version 1.22.4.10.2.3, 2023/01/20 23:15:35	version 1.39, 2022/06/11 04:32:23
Line 39 use Apache::lonnet;	Line 39 use Apache::lonnet;
use Apache::lonlocal;	use Apache::lonlocal;
use Apache::londocs();	use Apache::londocs();
use Apache::lonuserstate;	use Apache::lonuserstate;
	use LONCAPA::ltiutils;

sub handler {	sub handler {
my $r = shift;	my $r = shift;
Line 54 sub real_handler {	Line 55 sub real_handler {
return OK;	return OK;
}	}

# Check for critical messages and redirect if present.	# Check for critical messages and redirect if present.
my ($redirect,$url) = &Apache::loncommon::critical_redirect(300,'contents');	my ($redirect,$url) = &Apache::loncommon::critical_redirect(300,'contents');
if ($redirect) {	if ($redirect) {
&Apache::loncommon::content_type($r,'text/html');	&Apache::loncommon::content_type($r,'text/html');
Line 77 sub real_handler {	Line 78 sub real_handler {
$r->send_http_header;	$r->send_http_header;
$r->print(&Apache::loncommon::check_release_result(@reinit));	$r->print(&Apache::loncommon::check_release_result(@reinit));
return OK;	return OK;
}	} elsif ($result eq 'update') {
my ($cid,$cnum,$cdom);	my $cid = $env{'request.course.id'};
if ($result) {	my $cnum = $env{'course.'.$cid.'.num'};
$cid = $env{'request.course.id'};	my $cdom = $env{'course.'.$cid.'.domain'};
$cnum = $env{'course.'.$cid.'.num'};
$cdom = $env{'course.'.$cid.'.domain'};
}
if (($result eq 'main') \|\| ($result eq 'both')) {
&Apache::loncommon::content_type($r,'text/html');	&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;	$r->send_http_header;
&startpage($r);	&startpage($r);
Line 114 ENDCLOSE	Line 111 ENDCLOSE
return HTTP_NOT_ACCEPTABLE;	return HTTP_NOT_ACCEPTABLE;
}	}
}	}
if (($result eq 'both') \|\| ($result eq 'supp')) {
my $possdel;	my $course_type = &Apache::loncommon::course_type();
if ($result eq 'supp') {	if (($course_type eq 'Placement') && (!$env{'request.role.adv'})) {
$possdel = 1;	my $furl = &Apache::lonpageflip::first_accessible_resource();
}	if ($result eq 'update') {
my ($supplemental,$refs_updated) = &Apache::loncommon::get_supplemental($cnum,$cdom,'',$possdel);	&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
unless ($refs_updated) {	$r->print($closure.&Apache::loncommon::end_page());
&Apache::loncommon::set_supp_httprefs($cnum,$cdom,$supplemental,$possdel);	return OK;
	} else {
	&Apache::loncommon::content_type($r,'text/html');
	$r->header_out(Location => $furl);
	return REDIRECT;
	}
	}

	if ($env{'request.lti.login'}) {
	if ($env{'request.lti.uri'} ne '') {
	my $cid = $env{'request.course.id'};
	my $cnum = $env{'course.'.$cid.'.num'};
	my $cdom = $env{'course.'.$cid.'.domain'};
	my ($scope,$url) = &LONCAPA::ltiutils::lti_provider_scope($env{'request.lti.uri'},$cdom,$cnum);
	if (($scope eq 'map') \|\| ($scope eq 'resource')) {
	&Apache::loncommon::content_type($r,'text/html');
	$r->header_out(Location => $url);
	return REDIRECT;
	}
}	}
}	}

Line 355 sub startContentScreen {	Line 370 sub startContentScreen {

$r->print("\n".'<ul class="LC_TabContentBigger" id="mainnav">'."\n");	$r->print("\n".'<ul class="LC_TabContentBigger" id="mainnav">'."\n");
$r->print('<li'.(($mode eq 'navmaps')?' class="active"':'').'><a href="/adm/navmaps"><b>       '.&mt('Main Content').'       </b></a></li>'."\n");	$r->print('<li'.(($mode eq 'navmaps')?' class="active"':'').'><a href="/adm/navmaps"><b>       '.&mt('Main Content').'       </b></a></li>'."\n");
my $supptab;	my $allowed = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});
if ($env{'request.role.adv'}) {	my ($suppcount,$errors);
$supptab = 1;	unless ($allowed) {
} else {
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'};
$supptab = &Apache::lonnet::has_unhidden_suppfiles($cnum,$cdom);	($suppcount,$errors) = &Apache::lonnet::get_numsuppfiles($cnum,$cdom);
}	}
if ($supptab) {	if ($allowed \|\| $suppcount) {
$r->print('<li '.(($mode eq 'supplemental')?' class="active"':'').'><a href="/adm/supplemental"><b>'.&mt('Supplemental Content').'</b></a></li>');	$r->print('<li '.(($mode eq 'supplemental')?' class="active"':'').'><a href="/adm/supplemental"><b>'.&mt('Supplemental Content').'</b></a></li>');
}	}
$r->print('<li'.(($mode eq 'coursesearch')?' class="active"':'').'><a href="/adm/searchcourse"><b>     '.&mt('Content Search').'     </b></a></li>'."\n");	$r->print('<li'.(($mode eq 'coursesearch')?' class="active"':'').'><a href="/adm/searchcourse"><b>     '.&mt('Content Search').'     </b></a></li>'."\n");
	$r->print('<li'.(($mode eq 'courseindex')?' class="active"':'').'><a href="/adm/indexcourse"><b>      '.&mt('Content Index').'      </b></a></li>'."\n");
$r->print("\n".'</ul>'."\n");	$r->print("\n".'</ul>'."\n");
$r->print('<div class="LC_Box" style="clear:both;margin:0;"><div id="maincoursedoc" style="margin:0 0;padding:0 0;"><div class="LC_ContentBox" id="mainCourseDocuments" style="display: block;">');	$r->print('<div class="LC_Box" style="clear:both;margin:0;"><div id="maincoursedoc" style="margin:0 0;padding:0 0;"><div class="LC_ContentBox" id="mainCourseDocuments" style="display: block;">');
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.22.4.10.2.3
changed lines
	Added in v.1.39