--- rat/lonwrapper.pm 2020/10/26 00:02:48 1.49.2.7.2.5 +++ rat/lonwrapper.pm 2020/02/16 23:52:03 1.49.2.8 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Wrapper for external and binary files as standalone resources # -# $Id: lonwrapper.pm,v 1.49.2.7.2.5 2020/10/26 00:02:48 raeburn Exp $ +# $Id: lonwrapper.pm,v 1.49.2.8 2020/02/16 23:52:03 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,14 +37,10 @@ use Apache::lonlocal; use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::lonextresedit(); -use Apache::lonexttool(); -use LONCAPA qw(:DEFAULT :match); -use HTML::Entities(); # ================================================================ Main Handler sub wrapper { - my ($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation, - $title,$width,$height) = @_; + my ($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$title) = @_; my $forcereg; unless ($env{'form.folderpath'}) { @@ -56,7 +52,7 @@ sub wrapper { 'show' => 'Show content in pop-up window', ); - my ($anchor,$uselink); + my ($anchor,$uselink,$linktext); if ($is_ext) { if ($env{'form.symb'}) { (undef,undef,my $res) = &Apache::lonnet::decode_symb($env{'form.symb'}); @@ -98,7 +94,7 @@ sub wrapper { # do not obscure the Functions menu. # - unless (($env{'browser.mobile'}) || ($exttool eq 'window') || ($exttool eq 'tab') || $uselink) { + unless (($env{'browser.mobile'}) || $uselink) { $headjs = ' '."\n"; - } my $startpage = &Apache::loncommon::start_page('Menu',$headjs,$args); my $endpage = &Apache::loncommon::end_page(); @@ -121,52 +116,11 @@ var LCresizedef = 0; } } } - if (($env{'browser.mobile'}) || ($exttool eq 'window') || ($exttool eq 'tab')) { + if ($env{'browser.mobile'}) { my $output = $startpage; if ($is_pdf) { $linktext = &mt('Link to PDF (for mobile devices)'); $output .= &create_link($url,$anchor,$title,$linktext); - } elsif (($exttool eq 'window') || ($exttool eq 'tab')) { - if ($linktext eq '') { - $linktext = &mt('Launch External Tool'); - } - $url = &HTML::Entities::encode($url,'"<>&'); - if ($exttool eq 'tab') { - $output .= '
'. - ''. - $linktext.''. - '
'; - } else { - $output .= <<"ENDLINK"; - -
- -$linktext -
-ENDLINK - } - if ($explanation ne '') { - $output .= '
'.$explanation.'
'; - } } else { if ($uselink) { $linktext = &mt('Link to resource'); @@ -222,19 +176,18 @@ ENDLINK window.onload = function(){ if (LCresizedef) { LCnotready = 0; - \$(window).trigger('resize'); + \$(window).trigger('resize') }; } else { LCnotready = 1; } }; SCRIPT # javascript will position the iframe if window was resized (or zoomed) - my $dest = &HTML::Entities::encode($url.$anchor,'&<>"'); return < - + $endpage ENDFRAME @@ -269,47 +222,20 @@ sub handler { return OK if $r->header_only; my $url = $r->uri; - my ($is_ext,$brcrum,$absolute,$is_pdf,$exttool,$cdom,$cnum,$hostname, - $linktext,$explanation,$width,$height); + my ($is_ext,$brcrum,$absolute,$is_pdf,$cdom,$cnum,$hostname); for ($url){ s|^/adm/wrapper||; $is_ext = $_ =~ s|^/ext/|http://|; - s|http://https://|https://| if ($is_ext); + s|http://https://?|https://| if ($is_ext); s|:|:|g; } if ($url =~ /\.pdf$/i) { $is_pdf = 1; - } elsif ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) { - $cdom = $1; - $cnum = $2; - my $marker = $3; - $exttool = 'iframe'; - my $exttoolremote; - my %toolhash = &Apache::lonnet::get('exttool_'.$marker,['target','linktext','explanation','id','width','height'], - $cdom,$cnum); - if ($toolhash{'id'}) { - my %ltitools = &Apache::lonnet::get_domain_lti($cdom,'consumer'); - if (ref($ltitools{$toolhash{'id'}}) eq 'HASH') { - $exttoolremote = $ltitools{$toolhash{'id'}}{'url'}; - } - } - if ($toolhash{'target'} eq 'window') { - $exttool = 'window'; - $width = $toolhash{'width'}; - $height = $toolhash{'height'}; - } elsif ($toolhash{'target'} eq 'tab') { - $exttool = 'tab'; - } - if (($exttool eq 'window') || ($exttool eq 'tab')) { - $linktext = $toolhash{'linktext'}; - $explanation = $toolhash{'explanation'}; - } elsif (($exttoolremote =~ /^http:/) && ($ENV{'SERVER_PORT'} == 443)) { - $exttool = 'tab'; - } } - if (($is_ext) || ($exttool)) { + + if ($is_ext) { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['forceedit','register','folderpath','symb','idx','title','anchor']); if (($env{'form.forceedit'}) && @@ -326,12 +252,10 @@ sub handler { $url .= '#'.$env{'form.anchor'}; } } - my $type = 'ext'; - if ($exttool) { - $type = 'tool'; - } elsif (($url =~ /^http:/) && ($ENV{'SERVER_PORT'} == 443)) { + if (($url =~ /^http:/) && ($ENV{'SERVER_PORT'} == 443)) { $hostname = $r->hostname(); } + my $type = 'ext'; $r->print( &Apache::lonextresedit::display_editor($url,$env{'form.folderpath'}, $env{'form.symb'}, @@ -342,11 +266,7 @@ sub handler { my $crstype = &Apache::loncommon::course_type(); my $title = $env{'form.title'}; if ($title eq '') { - if ($is_ext) { - $title = &mt('External Resource'); - } else { - $title = &mt('External Tool'); - } + $title = &mt('External Resource'); } $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); @@ -356,7 +276,7 @@ sub handler { # # Actual URL # - if (($url=~/$LONCAPA::assess_re/) && (!$exttool)) { + if ($url=~/$LONCAPA::assess_re/) { # # This is uploaded homework # @@ -366,7 +286,7 @@ sub handler { # # This is not homework # - if (($is_ext) || ($exttool)) { + if ($is_ext) { $absolute = $env{'request.use_absolute'}; $ENV{'QUERY_STRING'} =~ s/(^|\&)symb=[^\&]*/$1/; $ENV{'QUERY_STRING'} =~ s/\&$//; @@ -377,12 +297,9 @@ sub handler { } # encrypt url if not external - unless ($is_ext) { - &Apache::lonenc::check_encrypt(\$url); - } + &Apache::lonenc::check_encrypt(\$url) if $url !~ /^https?\:/ ; - $r->print( wrapper($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool, - $linktext,$explanation,undef,$width,$height) ); + $r->print( wrapper($r,$url,$brcrum,$absolute,$is_ext,$is_pdf) ); } # not just the menu @@ -409,7 +326,7 @@ described at http://www.lon-capa.org. =over -=item wrapper($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,$title,$width,$height) +=item wrapper($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$title)) =over