--- loncom/interface/lonfeedback.pm 2021/01/04 03:43:30 1.370.2.5 +++ loncom/interface/lonfeedback.pm 2015/09/30 21:04:04 1.371 @@ -1,7 +1,7 @@ # The LearningOnline Network # Feedback # -# $Id: lonfeedback.pm,v 1.370.2.5 2021/01/04 03:43:30 raeburn Exp $ +# $Id: lonfeedback.pm,v 1.371 2015/09/30 21:04:04 musolffc Exp $ # # Copyright Michigan State University Board of Trustees # @@ -44,8 +44,8 @@ use HTML::LCParser(); #use HTML::Tidy::libXML; use Apache::lonspeller(); use Apache::longroup; -use Archive::Zip qw( :ERROR_CODES ); -use LONCAPA qw(:DEFAULT :match); +use Cwd; +use LONCAPA; sub discussion_open { my ($status,$symb)=@_; @@ -696,29 +696,21 @@ END #Create zip file in prtspool - if (($env{'user.name'} =~ /^$match_username$/) - && ($env{'user.domain'} =~ /^$match_domain$/)) { - 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) { - $discussion .= &mt('Download the zip file from [_1]Discussion Posting Archive[_2]', + my $imszipfile = '/prtspool/'. + $env{'user.name'}.'_'.$env{'user.domain'}.'_'. + time.'_'.rand(1000000000).'.zip'; + my $cwd = &getcwd(); + my $imszip = '/home/httpd/'.$imszipfile; + chdir $tempexport; + open(OUTPUT, "zip -r $imszip * 2> /dev/null |"); + close(OUTPUT); + chdir $cwd; + $discussion .= &mt('Download the zip file from [_1]Discussion Posting Archive[_2]', '','').'
'; - } else { - $discussion .= &mt('Failed to create zip file').'
'; - } - if ($copyresult) { - $discussion .= ''. - &mt('The following errors occurred during export:'). - '
'.$copyresult; - } - } else { - $discussion .= '

'. - &mt('Unfortunately you will not be able to retrieve an archive of the discussion posts at this time, because there was a problem creating the zip file.').'

'; + if ($copyresult) { + $discussion .= ''. + &mt('The following errors occurred during export:'). + '
'.$copyresult; } } } else { @@ -855,7 +847,7 @@ sub send_feedback_link { &discussion_link($ressymb, ''.&mt('Post Discussion').'', + '" border="0" />'.&mt('Post Discussion').'', 'replydisc'). ''; } @@ -866,7 +858,7 @@ sub send_message_link { &discussion_link($ressymb, ''.&mt('Send Feedback').'', + '" border="0" />'.&mt('Send Feedback').'', 'sendmessageonly'). ''; return $output; @@ -941,7 +933,7 @@ sub postingform_display { $currnewattach,$currdelold,$group,$crstype) = @_; my $newattachmsg; my %lt = &Apache::lonlocal::texthash( - 'note' => 'Note: in anonymous discussion, your name is visible only to course faculty', + 'note' => 'Note: in anonymous discussion, your name is visible only to course faculty', 'title' => 'Title', 'podi' => 'Post Discussion', 'poan' => 'Post Anonymous Discussion', @@ -1293,7 +1285,7 @@ sub build_posting_display { if (&editing_allowed($escsymb.':::'.$idx,$group)) { if (($env{'user.domain'} eq $contrib{$idx.':senderdomain'}) && ($env{'user.name'} eq $contrib{$idx.':sendername'})) { $sender.=' '. - &discussion_link($ressymb,&mt('Edit'),'editdisc',$idx,$$newpostsflag,$prevread,&group_args($group)); + &discussion_link($symb,&mt('Edit'),'editdisc',$idx,$$newpostsflag,$prevread,&group_args($group)); unless ($seehidden) { my $grpargs = &group_args($group); $sender.=" '; } else { - $$discussionitems[$idx].=' '.&discussion_link($ressymb,''.&mt('Like').'','like',$idx,$$newpostsflag,$prevread,&group_args($group),&mt("Like this posting")); + $$discussionitems[$idx].=' '.&discussion_link($symb,''.&mt('Like').'','like',$idx,$$newpostsflag,$prevread,&group_args($group),&mt("Like this posting")); } if ($userunlikes{$idx}) { $$discussionitems[$idx].=''.&mt('You unlike this posting').''; } else { - $$discussionitems[$idx].=' '.&discussion_link($ressymb,''.&mt('Unlike').'','unlike',$idx,$$newpostsflag,$prevread,&group_args($group),&mt("Unlike this posting")); + $$discussionitems[$idx].=' '.&discussion_link($symb,''.&mt('Unlike').'','unlike',$idx,$$newpostsflag,$prevread,&group_args($group),&mt("Unlike this posting")); } } } @@ -1544,7 +1536,7 @@ sub build_posting_display { $$discussionitems[$idx] .= '  '.&mt('This post has been edited by the author.'); if ($seehidden) { $$discussionitems[$idx] .= '  '. - &discussion_link($ressymb,&mt('Display all versions'),'allversions',$idx,$$newpostsflag,$prevread,&group_args($group)); + &discussion_link($symb,&mt('Display all versions'),'allversions',$idx,$$newpostsflag,$prevread,&group_args($group)); } $$discussionitems[$idx].='
'.&mt('Earlier version(s) were posted on: '); if ($contrib{$idx.':history'} =~ m/:/) { @@ -1776,11 +1768,14 @@ sub mail_screen { my %lt = &Apache::lonlocal::texthash( 'myqu' => 'Question/comment/feedback:', + 'title' => 'Title', 'reta' => 'Retained attachments', 'atta' => 'Attachment', ); - if ($env{'form.editdisc'} || $env{'form.replydisc'}){ - $lt{'myqu'} = &mt('Post Discussion'); + if($env{'form.editdisc'} || $env{'form.replydisc'}){ + %lt = &Apache::lonlocal::texthash( + 'myqu' => 'Post Discussion', + ); } my $restitle = &get_resource_title($caller_symb,$feedurl); my $quote=''; @@ -2055,8 +2050,8 @@ END } else { $r->print(< -$lt{'atta'} $attachmaxtext: - +$lt{'atta'} $attachmaxtext: +

END } @@ -3170,7 +3165,7 @@ sub adddiscuss { if (($symb) && ($email)) { my $now = time; if ($env{'form.editdisc'}) { - $contrib{'ip'}=&Apache::lonnet::get_requestor_ip(); + $contrib{'ip'}=$ENV{'REMOTE_ADDR'}; $contrib{'host'}=$Apache::lonnet::perlvar{'lonHostID'}; $contrib{'timestamp'} = $now; $contrib{'history'} = ''; @@ -3504,7 +3499,7 @@ sub modify_attachments { document.modattachments.action = document.modattachments.origpage.value; document.modattachments.submit(); } - + END @@ -3547,8 +3542,8 @@ END $r->print(''.$subject.''); $r->print(&Apache::lonhtmlcommon::row_closure()); $r->print(&Apache::lonhtmlcommon::row_title($lt{'adda'})); - $r->print('' - .'' + $r->print('' + .'' .' '.$attachmaxtext); if(($idx)||(ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)){