Log Message:
-----------
since the subject line can be changed now, email filters would be wise
to rely on something more static. i've added X-WeBWorK-* headers to
accomodate this:
X-WeBWorK-Module
X-WeBWorK-Course
X-WeBWorK-User
X-WeBWorK-Section
X-WeBWorK-Recitation
X-WeBWorK-Set
X-WeBWorK-Problem
Modified Files:
--------------
webwork2/lib/WeBWorK/ContentGenerator:
Feedback.pm
Revision Data
-------------
Index: Feedback.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm,v
retrieving revision 1.31
retrieving revision 1.32
diff -Llib/WeBWorK/ContentGenerator/Feedback.pm -Llib/WeBWorK/ContentGenerator/Feedback.pm -u -r1.31 -r1.32
--- lib/WeBWorK/ContentGenerator/Feedback.pm
+++ lib/WeBWorK/ContentGenerator/Feedback.pm
@@ -194,13 +194,24 @@
|| "WeBWorK feedback from %c: %u set %s/prob %p"; # default if not entered
$subject =~ s/%([$chars])/defined $subject_map{$1} ? $subject_map{$1} : ""/eg;
+ my $headers = "X-Remote-Host: ".$r->get_remote_host()."\n";
+ $headers .= "X-WeBWorK-Module: $module\n" if defined $module;
+ $headers .= "X-WeBWorK-Course: $courseID\n" if defined $courseID;
+ if ($user) {
+ $headers .= "X-WeBWorK-User: ".$user->user_id."\n";
+ $headers .= "X-WeBWorK-Section: ".$user->section."\n";
+ $headers .= "X-WeBWorK-Recitation: ".$user->recitation."\n";
+ }
+ $headers .= "X-WeBWorK-Set: ".$set->set_id."\n" if $set;
+ $headers .= "X-WeBWorK-Problem: ".$problem->problem_id."\n" if $problem;
+
# bring up a mailer
my $mailer = Mail::Sender->new({
from => $sender,
to => join(",", @recipients),
smtp => $ce->{mail}->{smtpServer},
subject => $subject,
- headers => "X-Remote-Host: ".$r->get_remote_host(),
+ headers => $headers,
});
unless (ref $mailer) {
$self->feedbackForm($user, $returnURL,
|
