@@ -449,28 +527,59 @@ sub print_request_receipt {
my $to = &Apache::loncommon::build_recipient_list(undef,'helpdeskmail',
$defdom,$origmail);
my $from = $admin;
+ my $bcc;
+ my %domconfig =
+ &Apache::lonnet::get_dom('configuration',['contacts'],$defdom);
+ if (ref($domconfig{'contacts'}) eq 'HASH') {
+ if (exists($domconfig{'contacts'}{'helpdeskmail'})) {
+ if (ref($domconfig{'contacts'}{'helpdeskmail'}) eq 'HASH') {
+ my $bccmail = $domconfig{'contacts'}{'helpdeskmail'}{'bcc'};
+ if ($bccmail ne '') {
+ my @bccs = split(/,/,$bccmail);
+ my @ok_bccs;
+ foreach my $bcc (@bccs) {
+ $bcc =~ s/^\s+//g;
+ $bcc =~ s/\s+$//g;
+ if ($bcc =~ m/^[^\@]+\@[^\@]+$/) {
+ if (!(grep(/^\Q$bcc\E$/,@ok_bccs))) {
+ push(@ok_bccs,$bcc);
+ }
+ }
+ }
+ if (@ok_bccs > 0) {
+ $bcc = join(', ',@ok_bccs);
+ }
+ }
+ }
+ }
+ }
my $reporttime = &Apache::lonlocal::locallocaltime(time);
my @formvars = ('username','email','uname','udom','sourceurl','phone','section','coursecode','title','subject','description','screenshot');
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},\@formvars);
my $coursecode = $env{'form.coursecode'};
if ($coursecode eq '') {
- if (defined($env{'form.Year'})) {
- $coursecode .= $env{'form.Year'};
- }
- if (defined($env{'form.Semester'})) {
- $coursecode .= $env{'form.Semester'};
- }
- if (defined($env{'form.Department'})) {
- $coursecode .= $env{'form.Department'};
- }
- if (defined($env{'form.Number'})) {
- $coursecode .= $env{'form.Number'};
+ my $totcodes = 0;
+ my %coursecodes;
+ $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$defdom,$totcodes);
+ my @standardnames = &Apache::loncommon::get_standard_codeitems();
+ if ($totcodes > 0) {
+ my $noregexps = 1;
+ $coursecode =
+ &Apache::courseclassifier::instcode_from_selectors($defdom,$noregexps);
+ }
+ if ($coursecode eq '') {
+ foreach my $item (@standardnames) {
+ if ((defined($env{'form.'.$item})) && ($env{'form.'.$item} ne '-1')) {
+ $coursecode .= $env{'form.'.$item};
+ }
+ }
}
}
my %lt = &Apache::lonlocal::texthash (
username => 'Name',
- email => 'Email',
+ email => 'E-mail',
+ cc => 'Cc',
user => 'Username/domain',
phone => 'Phone',
crsi => 'Course Information',
@@ -479,22 +588,64 @@ sub print_request_receipt {
sourceurl => 'URL',
date => 'Date/Time',
secn => 'Section',
- asup => 'A support request has been sent to',
warn => 'Warning: Problem with support e-mail address',
your => 'Your support request contained the following information',
sect => 'section',
info => 'Information supplied',
adin => 'Additional information recorded',
);
-
+
+ my (@ok_ccs,@bad_ccs,$badccmsg,$okcclist,$public,$homeserver);
+ if (($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public')) {
+ $public = 1;
+ } else {
+ if (($env{'user.name'} ne '') && ($env{'user.domain'} ne '')) {
+ $homeserver = &Apache::lonnet::homeserver($env{'user.name'},
+ $env{'user.domain'});
+ }
+ }
+
+ if (($homeserver) && (defined($env{'form.cc'}))) {
+ my @ccs;
+ if ($env{'form.cc'} =~ /,/) {
+ @ccs = split(/,/,$env{'form.cc'});
+ } else {
+ $env{'form.cc'} =~ s/^\s+//;
+ $env{'form.cc'} =~ s/\s+$//;
+ @ccs = $env{'form.cc'};
+ }
+ foreach my $cc (@ccs) {
+ $cc =~ s/^\s+//g;
+ $cc =~ s/\s+$//g;
+ if ($cc =~ m/^[^\@]+\@[^\@]+$/) {
+ if (!(grep(/^\Q$cc\E$/,@ok_ccs))) {
+ push(@ok_ccs,$cc);
+ }
+ } elsif ($cc ne '') {
+ if (!(grep(/^\Q$cc\E$/,@bad_ccs))) {
+ push(@bad_ccs,$cc);
+ }
+ }
+ }
+ if (@ok_ccs > 0) {
+ $okcclist = join(', ',@ok_ccs);
+ }
+ if (@bad_ccs == 1) {
+ $badccmsg .= '
'.&mt('The following Cc e-mail address is invalid: ').$bad_ccs[0];
+ } elsif (@bad_ccs > 1) {
+ my $bad_cc_string = join(', ',@bad_ccs);
+ $badccmsg .= '
'.&mt('The following Cc e-mail addresses are invalid: ').$bad_cc_string;
+ }
+ }
$env{'form.user'} = "'".$env{'form.uname'}.':'.$env{'form.udom'}."'";
- $env{'form.csri'} = $env{'form.title'}.' - '.$coursecode.' - '.$lt{'sect'}.': '.$env{'form.section'};
+ $env{'form.crsi'} = $env{'form.title'}.' - '.$coursecode.' - '.$lt{'sect'}.': '.$env{'form.section'};
my $supportmsg = <|g;
+ $descrip = &cleanup_html($descrip);
+ $descrip =~ s|[\n\r\f]|
|g;
$displaymsg .=
''.
"$lt{$item}: $descrip
\n";
} elsif ($item eq 'sourceurl') {
my $showurl = $env{'form.sourceurl'};
$showurl =~ s/\?.*$//;
+ $showurl = &cleanup_html($showurl);
$displaymsg .=
''.
"$lt{$item}: $showurl
\n";
+ } elsif ($item eq 'cc') {
+ $displaymsg .=
+ ''.
+ "$lt{$item}: $okcclist
\n";
} else {
+ my $showitem = $env{'form.'.$item};
+ $showitem = &cleanup_html($showitem);
$displaymsg .=
''.
- "$lt{$item}: $env{'form.'.$item}
\n";
+ "$lt{$item}: $showitem
\n";
}
}
}
@@ -549,7 +708,9 @@ END
my @ok_email;
foreach my $email (split(/,/,$to)) {
if ($email =~ m/^[^\@]+\@[^\@]+$/) {
- push(@ok_email,$email);
+ if (!grep(/^\Q$email\E$/,@ok_email)) {
+ push(@ok_email,$email);
+ }
}
}
if (@ok_email > 0) {
@@ -566,20 +727,34 @@ END
$bad_email = 1;
}
}
- if ($bad_email) {
- $r->print('
- '.$lt{'warn'}.'
'.
-&mt('As the e-mail address provided for this LON-CAPA server ([_1]) does not appear to be a valid e-mail address, your support request has not been sent to the LON-CAPA support staff or administrator at your institution.',$to).' '.&mt('Instead a copy has been sent to the LON-CAPA support team at Michigan State University.'));
- $to = 'helpdesk@lon-capa.org';
+
+ my $message;
+ if (!$bad_email) {
+ $message = &Apache::lonhtmlcommon::confirm_success(
+ &mt('A support request has been sent to [_1]',''.$to.''));
} else {
- $r->print(''.$lt{'asup'}.' '.$to.'
');
+ $message = &Apache::lonhtmlcommon::confirm_success(
+ $lt{'warn'}.'
'
+ .&mt('As the e-mail address provided for this LON-CAPA server ([_1]) does not appear to be a valid e-mail address, your support request has [_2]not[_3] been sent to the LON-CAPA support staff or administrator at your institution.',''.$to.'','','')
+ .' '.&mt('Instead a copy has been sent to the LON-CAPA support team at Michigan State University.'),1);
+ $to = 'helpdesk@lon-capa.org';
}
+ $r->print(&Apache::loncommon::confirmwrapper($message));
+
if (defined($env{'form.email'})) {
+ $env{'form.email'} =~ s/^\s+//;
+ $env{'form.email'} =~ s/\s+$//;
if ($env{'form.email'} =~ m/^[^\@]+\@[^\@]+$/) {
$from = $env{'form.email'};
}
}
+ if (defined($env{'form.cc'})) {
+ if ($badccmsg) {
+ $displaymsg .= $badccmsg;
+ }
+ }
+
my $subject = $env{'form.subject'};
$subject =~ s/(`)/'/g;
$subject =~ s/\$/\(\$\)/g;
@@ -591,8 +766,9 @@ END
my $attachmentpath = '';
my $attachmentsize = '';
- if (defined($env{'user.name'})) {
- if ($env{'form.screenshot.filename'}) {
+ if ((defined($env{'user.name'})) && ($env{'user.name'} ne 'public')
+ && ($env{'user.domain'} ne 'public')) {
+ if ($homeserver && $env{'form.screenshot.filename'}) {
$attachmentsize = length($env{'form.screenshot'});
if ($attachmentsize > 131072) {
$displaymsg .= '
'.&mt('The uploaded screenshot file ([_1] bytes) included with your request exceeded the maximum allowed size - 128 KB, and has therefore been discarded.',$attachmentsize);
@@ -610,7 +786,12 @@ END
if ($attachmentpath =~ m-/([^/]+)$-) {
$fname = $1;
- $displaymsg .= '
'.&mt('An uploaded screenshot file \'[_1]\' ([_2] bytes) was included in the request sent by [_3].',$fname,$attachmentsize,$env{'user.name'}.': '.$env{'user.domain'});
+ $displaymsg .= '
'
+ .&mt('An uploaded screenshot file [_1] ([_2] bytes) was included in the request sent by [_3].'
+ ,''.$fname.''
+ ,$attachmentsize
+ ,$env{'user.name'}.':'.$env{'user.domain'}
+ );
$supportmsg .= "\n";
foreach my $var (@cookievars) {
$supportmsg .= "$var: $cookies{$var}\n";
@@ -630,8 +811,19 @@ END
Type =>'TEXT',
Data => $supportmsg,
);
+ if ($homeserver) {
+ if (@ok_ccs > 0) {
+ my $cc_string = join(', ',@ok_ccs);
+ $msg->add("Cc" => $cc_string);
+ }
+ }
+ if ($bcc ne '') {
+ $msg->add("Bcc" => $bcc);
+ }
+ $msg->attr("content-type" => "text/plain");
+ $msg->attr("content-type.charset" => "UTF-8");
- if ($attachmentpath) {
+ if ($homeserver && $attachmentpath) {
my ($type, $encoding) = MIME::Types::by_suffix($attachmentpath);
$msg->attach(Type => $type,
Path => $attachmentpath,
@@ -663,7 +855,8 @@ END
unlink($attachmentpath);
}
$r->print(''.$lt{'your'}.':
'."\n");
- $r->print(&Apache::lonhtmlcommon::start_pick_box('LC_helpform_receipt').
+ $r->print(''.
+ &Apache::lonhtmlcommon::start_pick_box().
&Apache::lonhtmlcommon::row_title($lt{'info'},undef,'LC_oddrow_value')."\n".$displaymsg."\n".
&Apache::lonhtmlcommon::row_closure().
&Apache::lonhtmlcommon::row_title($lt{'adin'},undef,'LC_evenrow_value'));
@@ -689,7 +882,8 @@ END
$envmsg =~ s/, $//;
$r->print($envmsg."\n".
&Apache::lonhtmlcommon::row_closure(1)."\n".
- &Apache::lonhtmlcommon::end_pick_box()."\n".
+ &Apache::lonhtmlcommon::end_pick_box().
+ "
\n".
&Apache::loncommon::end_page());
}
@@ -702,42 +896,63 @@ sub print_header {
$helpdesk_link = '';
}
my %lt = &Apache::lonlocal::texthash (
- login => 'Log-in help',
- ask => 'Ask helpdesk',
- getst => 'Getting started guide',
- back => 'Back to last location'
+ login => 'Log-in help',
+ ask => 'Ask helpdesk',
+ getst => 'Getting started guide',
+ back => 'Back to last location',
+ headline => 'help/support',
+ stud => 'Students',
+ ifyo => 'If your problem is still unresolved, the form below can be used to send a question to the LON-CAPA helpdesk.',
+ cont => 'Contact your instructor instead.',
);
- my ($getstartlink,$getstarttext);
+ my ($getstartlink,$reviewtext);
if (-e $Apache::lonnet::perlvar{'lonDocRoot'}.'/adm/gettingstarted.html') {
$getstartlink = qq| $lt{'getst'} | |;
- $getstarttext = ' '.&mt('and the "Getting started" guide').' ';
+ $reviewtext = &mt('Please review the information in "Log-in help" and the "Getting started" guide if you are unable to log-in.');
+ } else {
+ $reviewtext = &mt('Please review the information in "Log-in help" if you are unable to log-in.');
}
- $r->print(< | |
-
- |