--- loncom/interface/lonfeedback.pm 2002/08/26 12:47:28 1.29 +++ loncom/interface/lonfeedback.pm 2002/10/25 13:57:28 1.35 @@ -1,7 +1,7 @@ # The LearningOnline Network # Feedback # -# $Id: lonfeedback.pm,v 1.29 2002/08/26 12:47:28 www Exp $ +# $Id: lonfeedback.pm,v 1.35 2002/10/25 13:57:28 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -50,6 +50,7 @@ use strict; use Apache::Constants qw(:common); use Apache::lonmsg(); use Apache::loncommon(); +use Apache::lontexconvert(); sub mail_screen { my ($r,$feedurl,$options) = @_; @@ -114,9 +115,8 @@ My question/comment/feedback:

- - ENDDOCUMENT +$r->print(&generate_preview_button().''); } sub fail_redirect { @@ -136,7 +136,7 @@ ENDFAILREDIR } sub redirect_back { - my ($r,$feedurl,$typestyle,$sendsomething,$status) = @_; + my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$status) = @_; $r->print (< Feedback sent @@ -147,7 +147,7 @@ sub redirect_back { $typestyle -Sent $sendsomething message(s). +Sent $sendsomething message(s), and $sendposts post(s). $status @@ -179,7 +179,7 @@ ENDNOREDIRTWO sub screen_header { my ($feedurl) = @_; my $options=''; - if (($feedurl=~/^\/res/) && ($feedurl!~/^\/res\/adm/)) { + if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) { $options= '

Feedback to resource author'; } @@ -227,6 +227,7 @@ sub resource_output { sub clear_out_html { my $message=$ENV{'form.comment'}; + $message=~s/\<\/*m\s*\>//g; $message=~s/\/\>\;/g; return $message; @@ -249,6 +250,11 @@ ENDCITE return ($email,$citations); } +sub secapply { + my $rec=shift; + return $rec; +} + sub decide_receiver { my ($feedurl) = @_; my $typestyle=''; @@ -263,7 +269,7 @@ sub decide_receiver { foreach (split(/\,/, $ENV{'course.'.$ENV{'request.course.id'}.'.question.email'}) ) { - $to{$_}=1; + if (my $rec=&secapply($_)) { $to{$rec}=1; } } } if ($ENV{'form.course'}) { @@ -271,7 +277,7 @@ sub decide_receiver { foreach (split(/\,/, $ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'}) ) { - $to{$_}=1; + if (my $rec=&secapply($_)) { $to{$rec}=1; } } } if ($ENV{'form.policy'}) { @@ -279,7 +285,7 @@ sub decide_receiver { foreach (split(/\,/, $ENV{'course.'.$ENV{'request.course.id'}.'.policy.email'}) ) { - $to{$_}=1; + if (my $rec=&secapply($_)) { $to{$rec}=1; } } } return ($typestyle,%to); @@ -293,7 +299,7 @@ sub send_msg { if ($_) { my $declutter=&Apache::lonnet::declutter($feedurl); unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$_), - 'Feedback ['.$declutter.']',$email,$citations) eq 'ok') { + 'Feedback ['.$declutter.']',$email,$citations)=~/ok/) { $status.='
Error sending message to '.$_.'
'; } else { $sendsomething++; @@ -358,6 +364,26 @@ sub adddiscuss { return $status.'
'; } +# ----------------------------------------------------------- Preview function + +sub show_preview { + my $r=shift; + my $message=&clear_out_html($ENV{'form.comment'}); + $message=~s/\n/\
/g; + $message=&Apache::lontexconvert::msgtexconverted($message); + $r->print('
'. + $message.'
'); +} + +sub generate_preview_button { + return(< + + + +ENDPREVIEW +} sub handler { my $r = shift; if ($r->header_only) { @@ -369,7 +395,7 @@ sub handler { # --------------------------- Get query string for limited number of parameters &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['hide','unhide','postdata']); + ['hide','unhide','postdata','preview']); if (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) { # ----------------------------------------------------------------- Hide/unhide @@ -399,9 +425,11 @@ sub handler { $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); - &redirect_back($r,'/res/'.$url,'Changed discussion status

','0'); - - + &redirect_back($r,&Apache::lonnet::clutter($url), + 'Changed discussion status

','0','0'); + } elsif ($ENV{'form.preview'}) { +# -------------------------------------------------------- User wants a preview + &show_preview($r); } else { # ------------------------------------------------------------- Normal feedback my $feedurl=$ENV{'form.postdata'}; @@ -410,6 +438,13 @@ sub handler { $feedurl=~s/^$ENV{'HTTP_HOST'}//; my $symb=&Apache::lonnet::symbread($feedurl); + unless ($symb) { + $symb=$ENV{'form.symb'}; + if ($symb) { + my ($map,$id,$url)=split(/\_\_\_/,$symb); + $feedurl=&Apache::lonnet::clutter($url); + } + } my $goahead=1; if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form)$/) { unless ($symb) { $goahead=0; } @@ -426,6 +461,8 @@ sub handler { ) || ($ENV{'request.course.id'} && ($feedurl!~m:^/adm:)) + || + ($ENV{'request.course.id'} && ($symb=~/^bulletin\_\_\_/)) ) { # --------------------------------------------------- Print login screen header unless ($ENV{'form.sendit'}) { @@ -460,17 +497,20 @@ sub handler { # Discussion? Store that. + my $numpost=0; if ($ENV{'form.discuss'}) { $typestyle.=&adddiscuss($symb,$message); + $numpost++; } if ($ENV{'form.anondiscuss'}) { $typestyle.=&adddiscuss($symb,$message,1); + $numpost++; } # Receipt screen and redirect back to where came from - &redirect_back($r,$feedurl,$typestyle,$numsent,$status); + &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$status); } } else {