--- loncom/interface/lonsupportreq.pm 2022/01/01 19:55:31 1.79.2.9
+++ loncom/interface/lonsupportreq.pm 2017/10/13 20:37:35 1.93
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Helpdesk request form
#
-# $Id: lonsupportreq.pm,v 1.79.2.9 2022/01/01 19:55:31 raeburn Exp $
+# $Id: lonsupportreq.pm,v 1.93 2017/10/13 20:37:35 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -29,8 +29,6 @@
package Apache::lonsupportreq;
use strict;
-use MIME::Types;
-use MIME::Lite;
use CGI::Cookie();
use Apache::Constants qw(:common);
use Apache::loncommon();
@@ -69,9 +67,7 @@ sub handler {
}
}
my $origurl = $env{'form.origurl'};
- if ($origurl =~ m{^https?://[^/]+(.*)$}) {
- $origurl = $1;
- }
+ $origurl =~ s{^https?://}{};
$origurl =~ s/(`)//g;
$origurl =~ s/\$/\(\$\)/g;
my $command = $env{'form.command'};
@@ -153,6 +149,7 @@ sub print_request_form {
}
}
+ my %coursecodes;
my %codes;
my @codetitles;
my %cat_titles;
@@ -160,7 +157,9 @@ sub print_request_form {
my %idlist;
my %idnums;
my %idlist_titles;
+ my $caller = 'global';
my $totcodes = 0;
+ my $format_reply;
my $jscript = '';
my $loaditems = qq|
function initialize_codes() {
@@ -168,17 +167,10 @@ function initialize_codes() {
}
|;
unless ($helpform{'course'} eq 'no') {
- my $instcats = &Apache::lonnet::get_dom_instcats($codedom);
- if (ref($instcats) eq 'HASH') {
- if ((ref($instcats->{'codetitles'}) eq 'ARRAY') && (ref($instcats->{'codes'}) eq 'HASH') &&
- (ref($instcats->{'cat_titles'}) eq 'HASH') && (ref($instcats->{'cat_order'}) eq 'HASH')) {
- %codes = %{$instcats->{'codes'}};
- @codetitles = @{$instcats->{'codetitles'}};
- %cat_titles = %{$instcats->{'cat_titles'}};
- %cat_order = %{$instcats->{'cat_order'}};
- $totcodes = scalar(keys(%codes));
- }
- if ($totcodes > 0) {
+ $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$codedom);
+ if ($totcodes > 0) {
+ $format_reply = &Apache::lonnet::auto_instcode_format($caller,$codedom,\%coursecodes,\%codes,\@codetitles,\%cat_titles,\%cat_order);
+ if ($format_reply eq 'ok') {
my $numtypes = @codetitles;
&Apache::courseclassifier::build_code_selections(\%codes,\@codetitles,\%cat_titles,\%cat_order,\%idlist,\%idnums,\%idlist_titles);
my ($scripttext,$longtitles) = &Apache::courseclassifier::javascript_definitions(\@codetitles,\%idlist,\%idlist_titles,\%idnums,\%cat_titles);
@@ -321,10 +313,9 @@ $jscript
$loaditems
// ]]>
+
ENDJS
- if ($knownuser) {
- $js .="\n".'';
- } elsif ($recaptcha_version >=2) {
+ if ($recaptcha_version >=2) {
$js.= "\n".''."\n";
}
my %add_entries = (
@@ -583,8 +574,8 @@ ENDJS
}
$showmax = ' ('.sprintf("%.2f",$showmax).' '.&mt('MB max.').')';
$output .= &Apache::lonhtmlcommon::row_title($html_lt{'opfi'},undef,$css[$i])
- .' '
- .''
+ .' '
+ .''
.'
'."\n".$html_lt{'uplf'}.$showmax."\n"
.&Apache::lonhtmlcommon::row_closure();
$num ++;
@@ -663,8 +654,7 @@ sub print_request_receipt {
return;
}
}
- my $ip = &Apache::lonnet::get_requestor_ip();
- my @ENVvars = ('HTTP_HOST','HTTP_USER_AGENT','SERVER_ADDR','SERVER_NAME');
+ my @ENVvars = ('HTTP_HOST','HTTP_USER_AGENT','REMOTE_ADDR','SERVER_ADDR','SERVER_NAME');
my @envvars = ('browser.os','browser.type','browser.version','user.home','request.role');
my @loncvars = ('user.name','user.domain','request.course.sec','request.course.id');
my @cookievars;
@@ -720,12 +710,8 @@ sub print_request_receipt {
$coursecode = $env{'form.coursecode'};
if ($coursecode eq '') {
my $totcodes = 0;
- my $instcats = &Apache::lonnet::get_dom_instcats($defdom);
- if (ref($instcats) eq 'HASH') {
- if (ref($instcats->{'codes'}) eq 'HASH') {
- $totcodes = scalar(keys(%{$instcats->{'codes'}}));
- }
- }
+ my %coursecodes;
+ $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$defdom);
my @standardnames = &Apache::loncommon::get_standard_codeitems();
if ($totcodes > 0) {
my $noregexps = 1;
@@ -901,7 +887,7 @@ $lt{'date'}: $reporttime
$env{'form.'.$field} =~ s/\s+$//;
}
if ($env{'form.uname'} =~ /^$match_username$/) {
- $requname = $env{'form.uname'};
+ $requdom = $env{'form.udom'};
}
if ($env{'form.udom'} =~ /^$match_domain$/) {
$requdom = $env{'form.udom'};
@@ -1052,7 +1038,6 @@ END
foreach my $var(@ENVvars) {
$supportmsg .= "$var: $ENV{$var}\n";
}
- $supportmsg .= "REMOTE_ADDR: $ip\n";
foreach my $var (@envvars) {
$supportmsg .= "$var: $env{$var}\n";
}
@@ -1073,7 +1058,6 @@ END
foreach my $var (@ENVvars) {
$attachment_text .= "$var: $ENV{$var}\n";
}
- $attachment_text .= "REMOTE_ADDR: $ip\n";
foreach my $var (@envvars) {
$attachment_text .= "$var: $env{$var}\n";
}
@@ -1092,39 +1076,9 @@ END
}
}
- my $msg = MIME::Lite->new(
- From => $from,
- To => $to,
- Subject => $subject,
- 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 ($homeserver && $attachmentpath) {
- my ($type, $encoding) = MIME::Types::by_suffix($attachmentpath);
- $msg->attach(Type => $type,
- Path => $attachmentpath,
- Filename => $fname
- );
-
- } elsif ($attachment_text ne '') {
- $msg->attach(Type => 'TEXT',
- Data => $attachment_text);
- }
-
-### Send it:
- $msg->send('sendmail');
+ # Compose and send a MIME email
+ &Apache::loncommon::mime_email($from, $to, $subject, $supportmsg, $cc_string, $bcc,
+ $attachmentpath, $fname, $attachment_text);
if ($attachmentpath =~ m|$Apache::lonnet::perlvar{'lonDaemons'}/tmp/helprequests/(\d+)/[^/]+|) {
unlink($attachmentpath);
@@ -1148,10 +1102,6 @@ END
$var.': '.$ENV{$var}.', ';
}
}
- if ($ip ne '') {
- $envmsg .= ''.
- 'REMOTE_ADDR: '.$ip.', ';
- }
foreach my $var (@envvars) {
if ($env{$var} ne '') {
$envmsg .= ''.