--- loncom/interface/lonfeedback.pm 2017/11/12 17:41:32 1.376 +++ loncom/interface/lonfeedback.pm 2018/04/14 17:52:43 1.379 @@ -1,7 +1,7 @@ # The LearningOnline Network # Feedback # -# $Id: lonfeedback.pm,v 1.376 2017/11/12 17:41:32 raeburn Exp $ +# $Id: lonfeedback.pm,v 1.379 2018/04/14 17:52:43 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -674,7 +674,7 @@ END $newpostsflag,$group, $prevread,$markondisp,$seehidden); $discussion .= "\n"; - } + } if ($outputtarget eq 'export') { if ($manifestok) { while ($currdepth > 0) { @@ -698,14 +698,14 @@ END if (($env{'user.name'} =~ /^$match_username$/) && ($env{'user.domain'} =~ /^$match_domain$/)) { - my $now = time(); + my $now = time(); my $imszipfile = '/prtspool/'. join('_',$env{'user.name'},$env{'user.domain'},$now). '_'.rand(1000000000).'.zip'; my $zip = Archive::Zip->new(); $zip->addTree($tempexport); my $imszip = '/home/httpd/'.$imszipfile; - if ($zip->writeToFileNamed($imszip) == AZ_OK) { + if ($zip->writeToFileNamed($imszip) == AZ_OK) { $discussion .= &mt('Download the zip file from [_1]Discussion Posting Archive[_2]', '','').'
'; } else { @@ -2840,6 +2840,10 @@ sub redirect_back { my $start_page= &Apache::loncommon::start_page('Feedback sent',undef,\%parms); my $end_page = &Apache::loncommon::end_page(); + my $windowname = 'loncapaclient'; + if ($env{'request.lti.login'}) { + $windowname .= 'lti'; + } $r->print(< @@ -2848,7 +2852,7 @@ $typestyle $blog $toolarge $status -
+ $prevtag $sorttag $statustag @@ -4047,11 +4051,15 @@ sub handler { 'only_body' => 1, 'add_entries' => \%onload}); my $end_page = &Apache::loncommon::end_page(); + my $windowname = 'loncapaclient'; + if ($env{'request.lti.login'}) { + $windowname .= 'lti'; + } $r->print (< $textline - +
$end_page @@ -4552,6 +4560,8 @@ ENDREDIR ($env{'request.course.id'} && ($feedurl!~m:^/adm:)) || ($env{'request.course.id'} && ($symb=~/^bulletin\_\_\_/)) + || + (($env{'request.course.id'} && ($feedurl =~ /ext\.tool$/))) ) { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header;