version 1.79, 2022/08/30 11:41:27
|
version 1.82, 2023/05/22 21:20:56
|
Line 47 use Digest::MD5();
|
Line 47 use Digest::MD5();
|
# ================================================================ Main Handler |
# ================================================================ Main Handler |
sub wrapper { |
sub wrapper { |
my ($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation, |
my ($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation, |
$title,$width,$height,$reuse) = @_; |
$title,$width,$height,$reuse,$is_supp) = @_; |
|
|
my $forcereg; |
my $forcereg; |
unless ($env{'form.folderpath'}) { |
unless ($env{'form.folderpath'}) { |
Line 166 var LCresizedef = 0;
|
Line 166 var LCresizedef = 0;
|
if (($uselink) && ($title eq '')) { |
if (($uselink) && ($title eq '')) { |
if ($env{'form.symb'}) { |
if ($env{'form.symb'}) { |
$title=&Apache::lonnet::gettitle($env{'form.symb'}); |
$title=&Apache::lonnet::gettitle($env{'form.symb'}); |
} else { |
} elsif (!$is_supp) { |
my $symb=&Apache::lonnet::symbread($r->uri); |
my $symb=&Apache::lonnet::symbread($r->uri); |
if ($symb) { |
if ($symb) { |
$title=&Apache::lonnet::gettitle($symb); |
$title=&Apache::lonnet::gettitle($symb); |
Line 225 var LCresizedef = 0;
|
Line 225 var LCresizedef = 0;
|
unless ($reuse) { |
unless ($reuse) { |
my $resid; |
my $resid; |
if ($env{'request.course.id'}) { |
if ($env{'request.course.id'}) { |
unless ($env{'form.folderpath'} =~ /^supplemental/) { |
unless (($is_supp) || ($env{'form.folderpath'} =~ /^supplemental/)) { |
my $symb=&Apache::lonnet::symbread($r->uri); |
my $symb=&Apache::lonnet::symbread($r->uri); |
if ($symb) { |
if ($symb) { |
my $navmap = Apache::lonnavmaps::navmap->new(); |
my $navmap = Apache::lonnavmaps::navmap->new(); |
Line 384 sub handler {
|
Line 384 sub handler {
|
|
|
my $url = $r->uri; |
my $url = $r->uri; |
my ($is_ext,$brcrum,$absolute,$is_pdf,$exttool,$cdom,$cnum,$hostname, |
my ($is_ext,$brcrum,$absolute,$is_pdf,$exttool,$cdom,$cnum,$hostname, |
$linktext,$explanation,$width,$height,$reuse); |
$linktext,$explanation,$width,$height,$reuse,$is_supp); |
|
|
for ($url){ |
for ($url){ |
s|^/adm/wrapper||; |
s|^/adm/wrapper||; |
Line 425 sub handler {
|
Line 425 sub handler {
|
my %toolhash = &Apache::lonnet::get('exttool_'.$marker,['target','linktext','explanation','id','width','height'], |
my %toolhash = &Apache::lonnet::get('exttool_'.$marker,['target','linktext','explanation','id','width','height'], |
$cdom,$cnum); |
$cdom,$cnum); |
if ($toolhash{'id'}) { |
if ($toolhash{'id'}) { |
my %ltitools = &Apache::lonnet::get_domain_lti($cdom,'consumer'); |
my ($idx,%ltitools); |
if (ref($ltitools{$toolhash{'id'}}) eq 'HASH') { |
if ($toolhash{'id'} =~ /^c(\d+)$/) { |
$exttoolremote = $ltitools{$toolhash{'id'}}{'url'}; |
$idx = $1; |
|
%ltitools = &Apache::lonnet::get_course_lti($cnum,$cdom,'consumer'); |
|
} else { |
|
$idx = $toolhash{'id'}; |
|
%ltitools = &Apache::lonnet::get_domain_lti($cdom,'consumer'); |
|
} |
|
if (ref($ltitools{$idx}) eq 'HASH') { |
|
$exttoolremote = $ltitools{$idx}{'url'}; |
} |
} |
} |
} |
if ($toolhash{'target'} eq 'window') { |
if ($toolhash{'target'} eq 'window') { |
Line 460 sub handler {
|
Line 467 sub handler {
|
if ($env{'form.anchor'} ne '') { |
if ($env{'form.anchor'} ne '') { |
$url .= '#'.$env{'form.anchor'}; |
$url .= '#'.$env{'form.anchor'}; |
} |
} |
|
$is_supp = 1; |
} |
} |
my $type = 'ext'; |
my $type = 'ext'; |
if ($exttool) { |
if ($exttool) { |
Line 483 sub handler {
|
Line 491 sub handler {
|
$title = &mt('External Tool'); |
$title = &mt('External Tool'); |
} |
} |
} |
} |
|
$title = &HTML::Entities::encode($title,'\'"<>&'); |
|
$is_supp = 1; |
|
if ($env{'request.course.id'}) { |
|
$cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
&Apache::loncommon::validate_folderpath(1,'',$cnum,$cdom); |
|
} |
$brcrum = |
$brcrum = |
&Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); |
&Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); |
} |
} |
|
} elsif ($env{'request.course.id'}) { |
|
my $courseurl = &Apache::lonnet::courseid_to_courseurl($env{'request.course.id'}); |
|
$courseurl =~ s{^/}{}; |
|
if ($url =~ m{^\Q/uploaded/$courseurl/supplemental/\E}) { |
|
$is_supp = 1; |
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
|
['folderpath','title']); |
|
if ($env{'form.folderpath'}) { |
|
$cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
&Apache::loncommon::validate_folderpath(1,'',$cnum,$cdom); |
|
} |
|
my $title = $env{'form.title'}; |
|
$title = &HTML::Entities::encode($title,'\'"<>&'); |
|
my $crstype = &Apache::loncommon::course_type(); |
|
$brcrum = |
|
&Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); |
|
|
|
} |
} |
} |
|
|
# |
# |
Line 517 sub handler {
|
Line 551 sub handler {
|
} |
} |
|
|
$r->print( wrapper($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool, |
$r->print( wrapper($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool, |
$linktext,$explanation,undef,$width,$height,$reuse) ); |
$linktext,$explanation,undef,$width,$height,$reuse, |
|
$is_supp) ); |
|
|
} # not just the menu |
} # not just the menu |
|
|
Line 544 described at http://www.lon-capa.org.
|
Line 579 described at http://www.lon-capa.org.
|
|
|
=over |
=over |
|
|
=item wrapper($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,$title,$width,$height,$reuse) |
=item wrapper($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,$title,$width,$height,$reuse,$is_supp) |
|
|
=over |
=over |
|
|