version 1.90, 2017/01/23 19:51:52
|
version 1.93, 2017/10/13 20:37:35
|
Line 657 sub print_request_receipt {
|
Line 657 sub print_request_receipt {
|
my @ENVvars = ('HTTP_HOST','HTTP_USER_AGENT','REMOTE_ADDR','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 @envvars = ('browser.os','browser.type','browser.version','user.home','request.role'); |
my @loncvars = ('user.name','user.domain','request.course.sec','request.course.id'); |
my @loncvars = ('user.name','user.domain','request.course.sec','request.course.id'); |
my @cookievars = ('lonID'); |
my @cookievars; |
|
if ($ENV{'SERVER_PORT'} == 443) { |
|
@cookievars = ('lonLinkID'); |
|
} else { |
|
@cookievars = ('lonID'); |
|
} |
|
|
my $admin = $Apache::lonnet::perlvar{'lonAdminMail'}; |
my $admin = $Apache::lonnet::perlvar{'lonAdminMail'}; |
my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; |
my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; |
my $defdom = &get_domain(); |
my $defdom = &get_domain(); |
my ($to,$bcc,$addtext) = |
|
&Apache::loncommon::build_recipient_list(undef,'helpdeskmail', |
|
$defdom,$origmail); |
|
my $from = $admin; |
my $from = $admin; |
my %helpform; |
my %helpform; |
my %domconfig = |
my %domconfig = |
Line 878 $lt{'date'}: $reporttime
|
Line 880 $lt{'date'}: $reporttime
|
} |
} |
} |
} |
} |
} |
|
|
|
my ($requname,$requdom,$reqemail); |
|
foreach my $field ('uname','udom','email') { |
|
$env{'form.'.$field} =~ s/^\s+//; |
|
$env{'form.'.$field} =~ s/\s+$//; |
|
} |
|
if ($env{'form.uname'} =~ /^$match_username$/) { |
|
$requdom = $env{'form.udom'}; |
|
} |
|
if ($env{'form.udom'} =~ /^$match_domain$/) { |
|
$requdom = $env{'form.udom'}; |
|
} |
|
if ($env{'form.email'} =~ m/^[^\@]+\@[^\@]+$/) { |
|
$reqemail = $env{'form.email'}; |
|
} |
|
|
|
my $dom_in_effect; |
|
unless ($env{'user.domain'} eq 'public') { |
|
$dom_in_effect = $env{'user.domain'}; |
|
} |
|
if ($dom_in_effect eq '') { |
|
$dom_in_effect = $requdom; |
|
} |
|
if ($dom_in_effect eq '') { |
|
$dom_in_effect = $defdom; |
|
} |
|
|
$displaymsg .= '<span class="LC_helpform_receipt_cat">'. |
$displaymsg .= '<span class="LC_helpform_receipt_cat">'. |
$lt{'date'}.'</span>: '.$reporttime.'<br />'."\n"; |
$lt{'date'}.'</span>: '.$reporttime.'<br />'."\n"; |
|
|
Line 900 END
|
Line 929 END
|
&print_header($r,$url,'process'); |
&print_header($r,$url,'process'); |
} |
} |
my $bad_email = 0; |
my $bad_email = 0; |
|
my ($to,$bcc,$addtext) = |
|
&Apache::loncommon::build_recipient_list(undef,'helpdeskmail', |
|
$dom_in_effect,$origmail, |
|
$requname,$requdom, |
|
$reqemail); |
if ($to =~ /,/) { |
if ($to =~ /,/) { |
my @ok_email; |
my @ok_email; |
foreach my $email (split(/,/,$to)) { |
foreach my $email (split(/,/,$to)) { |
Line 937 END
|
Line 971 END
|
} |
} |
$r->print(&Apache::loncommon::confirmwrapper($message)); |
$r->print(&Apache::loncommon::confirmwrapper($message)); |
|
|
if (defined($env{'form.email'})) { |
if ($reqemail ne '') { |
$env{'form.email'} =~ s/^\s+//; |
$from = $reqemail; |
$env{'form.email'} =~ s/\s+$//; |
|
if ($env{'form.email'} =~ m/^[^\@]+\@[^\@]+$/) { |
|
$from = $env{'form.email'}; |
|
} |
|
} |
} |
|
|
if (defined($env{'form.cc'})) { |
if (defined($env{'form.cc'})) { |
Line 991 END
|
Line 1021 END
|
if ($$cookie{'lonID'} =~ /lonID=($LONCAPA::handle_re);/) { |
if ($$cookie{'lonID'} =~ /lonID=($LONCAPA::handle_re);/) { |
$cookies{'lonID'} = $1; |
$cookies{'lonID'} = $1; |
} |
} |
|
if ($$cookie{'lonLinkID'} =~ /lonLinkID=([a-f0-9]+_linked);/) { |
|
$cookies{'lonLinkID'} = $1; |
|
} |
if ($attachmentpath =~ m-/([^/]+)$-) { |
if ($attachmentpath =~ m-/([^/]+)$-) { |
$fname = $1; |
$fname = $1; |
$displaymsg .= '<br />' |
$displaymsg .= '<br />' |
Line 1032 END
|
Line 1064 END
|
foreach my $var (@loncvars) { |
foreach my $var (@loncvars) { |
$attachment_text .= "$var: $env{$var}\n"; |
$attachment_text .= "$var: $env{$var}\n"; |
} |
} |
$attachment_text = $envdata; |
|
} |
} |
|
|
if ($addtext) { |
if ($addtext) { |