rat/lonwrapper.pm - diff

Return to lonwrapper.pm CVS log

Up to [LON-CAPA] / rat

Diff for /rat/lonwrapper.pm between versions 1.49.2.4.2.1 and 1.65

version 1.49.2.4.2.1, 2017/06/22 02:11:30	version 1.65, 2017/11/30 14:41:30
Line 39 use Apache::lonhtmlcommon();	Line 39 use Apache::lonhtmlcommon();
use Apache::lonextresedit();	use Apache::lonextresedit();
use Apache::lonexttool();	use Apache::lonexttool();
use LONCAPA qw(:DEFAULT :match);	use LONCAPA qw(:DEFAULT :match);
	use HTML::Entities();

# ================================================================ Main Handler	# ================================================================ Main Handler
sub wrapper {	sub wrapper {
Line 49 sub wrapper {	Line 50 sub wrapper {
unless ($env{'form.folderpath'}) {	unless ($env{'form.folderpath'}) {
$forcereg = 1;	$forcereg = 1;
}	}

my %lt = &Apache::lonlocal::texthash(	my %lt = &Apache::lonlocal::texthash(
'noif' => 'No iframe support.',	'noif' => 'No iframe support.',
'show' => 'Show content in pop-up window',	'show' => 'Show content in pop-up window',
Line 84 sub wrapper {	Line 84 sub wrapper {

my $startpage = &Apache::loncommon::start_page('Menu',undef,$args);	my $startpage = &Apache::loncommon::start_page('Menu',undef,$args);
my $endpage = &Apache::loncommon::end_page();	my $endpage = &Apache::loncommon::end_page();

if (($env{'browser.mobile'}) \|\| ($exttool eq 'window') \|\| ($exttool eq 'tab')) {	if (($env{'browser.mobile'}) \|\| ($exttool eq 'window') \|\| ($exttool eq 'tab')) {
my $output = $startpage;	my $output = $startpage;
if ($is_pdf) {	if ($is_pdf) {
Line 105 sub wrapper {	Line 105 sub wrapper {
if ($linktext eq '') {	if ($linktext eq '') {
$linktext = &mt('Launch External Tool');	$linktext = &mt('Launch External Tool');
}	}
	$url = &HTML::Entities::encode($url,'"<>&');
if ($exttool eq 'tab') {	if ($exttool eq 'tab') {
$output .= '<div>'.	$output .= '<div>'.
'<a href="'.$url.'" target="LCExternalToolTab" style="padding:0;clear:both;margin:0;border:0">'.	'<a href="'.$url.'" target="LCExternalToolTab" style="padding:0;clear:both;margin:0;border:0">'.
Line 114 sub wrapper {	Line 115 sub wrapper {
$output .= <<"ENDLINK";	$output .= <<"ENDLINK";
<script type="text/javascript">	<script type="text/javascript">
// <![CDATA[	// <![CDATA[
var windowObjectReference = null;	var windowObjectReference = null;
var PreviousUrl;	var PreviousUrl;

function openSinglePopup(strUrl) {	function openSinglePopup(strUrl) {
if (windowObjectReference == null \|\| windowObjectReference.closed) {	if (windowObjectReference == null \|\| windowObjectReference.closed) {
windowObjectReference = window.open(strUrl, "LCExternalToolPopUp",	windowObjectReference = window.open(strUrl, "LCExternalToolPopUp",
Line 142 ENDLINK	Line 143 ENDLINK
$output .= '<div>'.$explanation.'</div>';	$output .= '<div>'.$explanation.'</div>';
}	}
} else {	} else {
	my $dest = &HTML::Entities::encode($url.$anchor,'&<>"');
$output .= '<div style="overflow:scroll; -webkit-overflow-scrolling:touch;">'."\n".	$output .= '<div style="overflow:scroll; -webkit-overflow-scrolling:touch;">'."\n".
'<iframe src="'.$url.$anchor.'" height="100%" width="100%" frameborder="0">'."\n".	'<iframe src="'.$dest.'" height="100%" width="100%" frameborder="0">'."\n".
"$lt{'noif'} $noiframe\n".	"$lt{'noif'} $noiframe\n".
"</iframe>\n".	"</iframe>\n".
"</div>\n";	"</div>\n";
Line 182 ENDLINK	Line 184 ENDLINK
window.onload = function(){ \$(window).trigger('resize') };	window.onload = function(){ \$(window).trigger('resize') };
SCRIPT	SCRIPT
# javascript will position the iframe if window was resized (or zoomed)	# javascript will position the iframe if window was resized (or zoomed)
	my $dest = &HTML::Entities::encode($url.$anchor,'&<>"');
return <<ENDFRAME;	return <<ENDFRAME;
$startpage	$startpage
$script	$script
<div class="LC_iframecontainer">	<div class="LC_iframecontainer">
<iframe src="$url$anchor">$lt{'noif'} $noiframe</iframe>	<iframe src="$dest">$lt{'noif'} $noiframe</iframe>
</div>	</div>
$endpage	$endpage
ENDFRAME	ENDFRAME
Line 201 sub handler {	Line 204 sub handler {
return OK if $r->header_only;	return OK if $r->header_only;

my $url = $r->uri;	my $url = $r->uri;
my ($is_ext,$brcrum,$absolute,$is_pdf,$exttool,$cdom,$cnum,	my ($is_ext,$brcrum,$absolute,$is_pdf,$exttool,$cdom,$cnum,$hostname,
$linktext,$explanation,$width,$height);	$linktext,$explanation,$width,$height);

for ($url){	for ($url){
s\|^/adm/wrapper\|\|;	s\|^/adm/wrapper\|\|;
Line 211 sub handler {	Line 214 sub handler {
s\|&colon;\|:\|g;	s\|&colon;\|:\|g;
}	}


if ($url =~ /\.pdf$/i) {	if ($url =~ /\.pdf$/i) {
$is_pdf = 1;	$is_pdf = 1;
} elsif ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) {	} elsif ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) {
Line 222 sub handler {	Line 226 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_ltitools($cdom);	my %ltitools = &Apache::lonnet::get_domain_lti($cdom,'consumer');
if (ref($ltitools{$toolhash{'id'}}) eq 'HASH') {	if (ref($ltitools{$toolhash{'id'}}) eq 'HASH') {
$exttoolremote = $ltitools{$toolhash{'id'}}{'url'};	$exttoolremote = $ltitools{$toolhash{'id'}}{'url'};
}	}
Line 232 sub handler {	Line 236 sub handler {
$width = $toolhash{'width'};	$width = $toolhash{'width'};
$height = $toolhash{'height'};	$height = $toolhash{'height'};
} elsif ($toolhash{'target'} eq 'tab') {	} elsif ($toolhash{'target'} eq 'tab') {
$exttool = 'tab';	$exttool = 'tab';
}	}
if (($exttool eq 'window') \|\| ($exttool eq 'tab')) {	if (($exttool eq 'window') \|\| ($exttool eq 'tab')) {
$linktext = $toolhash{'linktext'};	$linktext = $toolhash{'linktext'};
$explanation = $toolhash{'explanation'};	$explanation = $toolhash{'explanation'};
} elsif (($exttoolremote =~ /^http:/) && ($ENV{'SERVER_PORT'} == 443)) {	} elsif (($exttoolremote =~ /^http:/) && ($ENV{'SERVER_PORT'} == 443)) {
$exttool = 'tab';	$exttool = 'tab';
}	}
}	}

if (($is_ext) \|\| ($exttool)) {	if (($is_ext) \|\| ($exttool)) {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['forceedit','register','folderpath','symb','idx','title','anchor']);	['forceedit','register','folderpath','symb','idx','title','anchor']);
Line 262 sub handler {	Line 265 sub handler {
my $type = 'ext';	my $type = 'ext';
if ($exttool) {	if ($exttool) {
$type = 'tool';	$type = 'tool';
	} elsif (($url =~ /^http:/) && ($ENV{'SERVER_PORT'} == 443)) {
	$hostname = $r->hostname();
}	}
$r->print(	$r->print(
&Apache::lonextresedit::display_editor($url,$env{'form.folderpath'},	&Apache::lonextresedit::display_editor($url,$env{'form.folderpath'},
$env{'form.symb'},	$env{'form.symb'},
$env{'form.idx'},$type,$cdom,	$env{'form.idx'},$type,$cdom,
$cnum));	$cnum,$hostname));
return OK;	return OK;
} elsif ($env{'form.folderpath'} =~ /^supplemental/) {	} elsif ($env{'form.folderpath'} =~ /^supplemental/) {
my $crstype = &Apache::loncommon::course_type();	my $crstype = &Apache::loncommon::course_type();
my $title = $env{'form.title'};	my $title = $env{'form.title'};
if ($title eq '') {	if ($title eq '') {
$title = &mt('External Resource');	if ($is_ext) {
	$title = &mt('External Resource');
	} else {
	$title = &mt('External Tool');
	}
}	}
$brcrum =	$brcrum =
&Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);	&Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
Line 336 described at http://www.lon-capa.org.	Line 345 described at http://www.lon-capa.org.

=over	=over

=item wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$title))	=item wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$linktext,$explanation,$title,$width,$height)

=over	=over

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

Removed from v.1.49.2.4.2.1
changed lines
	Added in v.1.65