');
+ if ($bad_email) {
+ $r->print(&Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($message,$bad_email)).'
');
+ }
+ if ($reqemail ne '') {
+ $from = $reqemail;
+ }
if (defined($env{'form.cc'})) {
if ($badccmsg) {
@@ -668,14 +1063,27 @@ END
my $fname;
my $attachmentpath = '';
- my $attachmentsize = '';
- if (defined($env{'user.name'})) {
- if ($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);
- } else {
- $attachmentpath=&Apache::lonnet::userfileupload('screenshot',undef,'helprequests');
+ my $showsize = '';
+
+ if ((defined($env{'user.name'})) && (!$public)) {
+ if ($homeserver && $env{'form.screenshot.filename'}) {
+ unless ($helpform{'screenshot'} eq 'no') {
+ my $attachmentsize = length($env{'form.screenshot'});
+ my $max = 1048576;
+ my $showmax = 1.00;
+ if ($helpform{'maxsize'} =~ /^\d+\.\d*$/) {
+ $max *= $helpform{'maxsize'};
+ $showmax = $helpform{'maxsize'};
+ }
+ $showmax = '('.sprintf("%.2f",$showmax).' MB)';
+ $showsize = $attachmentsize/1048576;
+ $showsize = '('.sprintf("%.2f",$showsize).' MB)';
+ if ($attachmentsize > $max) {
+ $displaymsg .= '
'.
+ &mt('The uploaded screenshot file [_1] included with your request exceeded the maximum allowed size [_2], and has therefore been discarded.',$showsize,$showmax).'';
+ } else {
+ $attachmentpath=&Apache::lonnet::userfileupload('screenshot',undef,'helprequests');
+ }
}
}
}
@@ -685,13 +1093,26 @@ END
if ($$cookie{'lonID'} =~ /lonID=($LONCAPA::handle_re);/) {
$cookies{'lonID'} = $1;
}
-
+ if ($$cookie{'lonLinkID'} =~ /lonLinkID=([a-f0-9]+_linked);/) {
+ $cookies{'lonLinkID'} = $1;
+ }
+ my $lti_info;
+ if (($env{'request.lti.login'}) && ($env{'request.course.id'})) {
+ my $ltidom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ if ($ltidom) {
+ my %lti = &Apache::lonnet::get_domain_lti($ltidom,'provider');
+ if (ref($lti{$env{'request.lti.login'}}) eq 'HASH') {
+ if ($lti{$env{'request.lti.login'}}{'consumer'}) {
+ $lti_info = "LTI consumer: ".$lti{$env{'request.lti.login'}}{'consumer'}."\n";
+ }
+ }
+ }
+ }
if ($attachmentpath =~ m-/([^/]+)$-) {
$fname = $1;
$displaymsg .= '
'
- .&mt('An uploaded screenshot file [_1] ([_2] bytes) was included in the request sent by [_3].'
- ,'
'.$fname.''
- ,$attachmentsize
+ .&mt('An uploaded screenshot file [_1] was included in the request sent by [_2].'
+ ,''.$fname.' '.$showsize,
,$env{'user.name'}.':'.$env{'user.domain'}
);
$supportmsg .= "\n";
@@ -701,56 +1122,66 @@ END
foreach my $var(@ENVvars) {
$supportmsg .= "$var: $ENV{$var}\n";
}
+ $supportmsg .= "REMOTE_ADDR: $ip\n";
foreach my $var (@envvars) {
$supportmsg .= "$var: $env{$var}\n";
}
+ if ($lti_info) {
+ $supportmsg .= $lti_info;
+ }
}
-
- my $msg = MIME::Lite->new(
- From => $from,
- To => $to,
- Subject => $subject,
- Type =>'TEXT',
- Data => $supportmsg,
- );
- if (@ok_ccs > 0) {
- my $cc_string = join(', ',@ok_ccs);
- $msg->add("Cc" => $cc_string);
- }
-
- if ($attachmentpath) {
- my ($type, $encoding) = MIME::Types::by_suffix($attachmentpath);
- $msg->attach(Type => $type,
- Path => $attachmentpath,
- Filename => $fname
- );
- } else {
- my $envdata = '';
+ my $cc_string;
+ if ($homeserver) {
+ if (@ok_ccs > 0) {
+ $cc_string = join(', ',@ok_ccs);
+ }
+ }
+
+ my $attachment_text = '';
+ unless ($homeserver && $attachmentpath) {
foreach my $var (@cookievars) {
- $envdata .= "$var: $cookies{$var}\n";
+ $attachment_text .= "$var: $cookies{$var}\n";
}
foreach my $var (@ENVvars) {
- $envdata .= "$var: $ENV{$var}\n";
+ $attachment_text .= "$var: $ENV{$var}\n";
}
+ $attachment_text .= "REMOTE_ADDR: $ip\n";
foreach my $var (@envvars) {
- $envdata .= "$var: $env{$var}\n";
+ $attachment_text .= "$var: $env{$var}\n";
}
foreach my $var (@loncvars) {
- $envdata .= "$var: $env{$var}\n";
+ $attachment_text .= "$var: $env{$var}\n";
+ }
+ if ($lti_info) {
+ $attachment_text .= $lti_info;
}
- $msg->attach(Type => 'TEXT',
- Data => $envdata);
}
-### Send it:
- $msg->send('sendmail');
+ if ($addtext) {
+ my ($addloc,$addstr) = split(/:/,$addtext,2);
+ $addstr = &unescape($addstr);
+ if ($addloc eq 's') {
+ $subject = $addstr.' '.$subject;
+ } elsif ($addloc eq 'b') {
+ $supportmsg = $addstr."\n".$supportmsg;
+ }
+ }
+ if ($bad_email) {
+ $r->print(''.$lt{'belo'}.'
'.
+ $lt{'ifyk'}."\n");
+ } else {
+ # Compose and send a MIME email
+ &Apache::loncommon::mime_email($from,'',$to,$subject,$supportmsg,$cc_string,
+ $bcc,$attachmentpath,$fname,$attachment_text);
+ $r->print(''.$lt{'your'}.':'."\n");
+ }
if ($attachmentpath =~ m|$Apache::lonnet::perlvar{'lonDaemons'}/tmp/helprequests/(\d+)/[^/]+|) {
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'));
@@ -767,6 +1198,10 @@ END
$var.': '.$ENV{$var}.', ';
}
}
+ if ($ip ne '') {
+ $envmsg .= ''.
+ 'REMOTE_ADDR: '.$ip.', ';
+ }
foreach my $var (@envvars) {
if ($env{$var} ne '') {
$envmsg .= ''.
@@ -776,7 +1211,12 @@ END
$envmsg =~ s/, $//;
$r->print($envmsg."\n".
&Apache::lonhtmlcommon::row_closure(1)."\n".
- &Apache::lonhtmlcommon::end_pick_box()."\n".
+ &Apache::lonhtmlcommon::end_pick_box().
+ '
');
+ unless ($bad_email) {
+ $r->print('
'.&Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($message)).'
');
+ }
+ $r->print("
+ LON-CAPA $lt{'headline'}
+ 
