--- loncom/interface/lonsupportreq.pm 2005/04/07 03:58:02 1.24 +++ loncom/interface/lonsupportreq.pm 2005/04/07 06:56:23 1.25 @@ -1,5 +1,5 @@ # -# $Id: lonsupportreq.pm,v 1.24 2005/04/07 03:58:02 albertel Exp $ +# $Id: lonsupportreq.pm,v 1.25 2005/04/07 06:56:23 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -47,9 +47,9 @@ sub handler { if ($r->uri eq '/adm/helpdesk') { &Apache::loncommon::get_posted_cgi($r); } - my $function = $ENV{'form.function'}; - my $origurl = &Apache::lonnet::unescape($ENV{'form.origurl'}); - my $action = $ENV{'form.action'}; + my $function = $env{'form.function'}; + my $origurl = &Apache::lonnet::unescape($env{'form.origurl'}); + my $action = $env{'form.action'}; if ($action eq 'process') { &print_request_receipt($r,$origurl,$function); @@ -68,16 +68,16 @@ sub print_request_form { $tablecolor = '#EEEE99'; } $ccode = ''; - $os = $ENV{'browser.os'}; - $browser = $ENV{'browser.type'}; - $bversion = $ENV{'browser.version'}; - $uhost = $ENV{'request.host'}; - $uname = $ENV{'user.name'}; - $udom = $ENV{'user.domain'}; - $uhome = $ENV{'user.home'}; - $urole = $ENV{'request.role'}; - $usec = $ENV{'request.course.sec'}; - $cid = $ENV{'request.course.id'}; + $os = $env{'browser.os'}; + $browser = $env{'browser.type'}; + $bversion = $env{'browser.version'}; + $uhost = $env{'request.host'}; + $uname = $env{'user.name'}; + $udom = $env{'user.domain'}; + $uhome = $env{'user.home'}; + $urole = $env{'request.role'}; + $usec = $env{'request.course.sec'}; + $cid = $env{'request.course.id'}; if ($origurl =~ m-^http://-) { $server = $origurl; } else { @@ -113,6 +113,7 @@ function validmail(field) { } } END + #" stupid emacs if ($cid =~ m/_/) { ($cdom,$cnum) = split/_/,$cid; } @@ -122,17 +123,17 @@ END $ccode = $csettings{'internal.coursecode'}; $sectionlist = $csettings{'internal.sectionnums'}; } - if ($ENV{'environment.critnotification'}) { - $email = $ENV{'environment.critnotification'}; + if ($env{'environment.critnotification'}) { + $email = $env{'environment.critnotification'}; } - if (!$email && $ENV{'environment.notification'}) { - $email = $ENV{'environment.notification'}; + if (!$email && $env{'environment.notification'}) { + $email = $env{'environment.notification'}; } - if ($ENV{'environment.lastname'}) { - $lastname = $ENV{'environment.lastname'}; + if ($env{'environment.lastname'}) { + $lastname = $env{'environment.lastname'}; } - if ($ENV{'environment.firstname'}) { - $firstname = $ENV{'environment.firstname'}; + if ($env{'environment.firstname'}) { + $firstname = $env{'environment.firstname'}; } my @sections = split/,/,$sectionlist; my %groupid = (); @@ -142,8 +143,8 @@ END } my $codedom = $Apache::lonnet::perlvar{'lonDefDomain'}; &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['codedom']); - if (exists($ENV{'form.codedom'})) { - $codedom = $ENV{'form.codedom'}; + if (exists($env{'form.codedom'})) { + $codedom = $env{'form.codedom'}; } my $details_title; if ($codedom) { @@ -564,7 +565,7 @@ END END - if (defined($ENV{'user.name'})) { + if (defined($env{'user.name'})) { $r->print(< @@ -650,44 +651,44 @@ sub print_request_receipt { 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'}; + my $coursecode = $env{'form.coursecode'}; if ($coursecode eq '') { - if (defined($ENV{'form.Year'})) { - $coursecode .= $ENV{'form.Year'}; + if (defined($env{'form.Year'})) { + $coursecode .= $env{'form.Year'}; } - if (defined($ENV{'form.Semester'})) { - $coursecode .= $ENV{'form.Semester'}; + if (defined($env{'form.Semester'})) { + $coursecode .= $env{'form.Semester'}; } - if (defined($ENV{'form.Department'})) { - $coursecode .= $ENV{'form.Department'}; + if (defined($env{'form.Department'})) { + $coursecode .= $env{'form.Department'}; } - if (defined($ENV{'form.Number'})) { - $coursecode .= $ENV{'form.Number'}; + if (defined($env{'form.Number'})) { + $coursecode .= $env{'form.Number'}; } } my $supportmsg = qq| -Name: $ENV{'form.username'} -Email: $ENV{'form.email'} -Username/domain: $ENV{'form.uname'} - $ENV{'form.udom'} -Tel: $ENV{'form.phone'} -Course Information: $ENV{'form.title'} - $coursecode - section: $ENV{'form.section'} -Subject: $ENV{'form.subject'} -Description: $ENV{'form.description'} -URL: $ENV{'form.sourceurl'} +Name: $env{'form.username'} +Email: $env{'form.email'} +Username/domain: $env{'form.uname'} - $env{'form.udom'} +Tel: $env{'form.phone'} +Course Information: $env{'form.title'} - $coursecode - section: $env{'form.section'} +Subject: $env{'form.subject'} +Description: $env{'form.description'} +URL: $env{'form.sourceurl'} Date/Time: $reporttime |; - my $descrip = $ENV{'form.description'}; + my $descrip = $env{'form.description'}; $descrip =~ s#\n#
#g; my $displaymsg = qq| -Name: $ENV{'form.username'}
-Email: $ENV{'form.email'}
-Username/domain: $ENV{'form.uname'} - $ENV{'form.udom'}
-Tel: $ENV{'form.phone'}
-Course Information: $ENV{'form.title'} - $coursecode - section: $ENV{'form.section'}
-Subject: $ENV{'form.subject'}
+Name: $env{'form.username'}
+Email: $env{'form.email'}
+Username/domain: $env{'form.uname'} - $env{'form.udom'}
+Tel: $env{'form.phone'}
+Course Information: $env{'form.title'} - $coursecode - section: $env{'form.section'}
+Subject: $env{'form.subject'}
Description: $descrip
-URL: $ENV{'form.sourceurl'}
+URL: $env{'form.sourceurl'}
Date/Time: $reporttime
|; my $html=&Apache::lonxml::xmlbegin(); @@ -719,13 +720,13 @@ END $to = 'helpdesk@lon-capa.org'; } } - if (defined($ENV{'form.email'})) { - if ($ENV{'form.email'} =~ m/^[^\@]+\@[^\@]+$/) { - $from = $ENV{'form.email'}; + if (defined($env{'form.email'})) { + if ($env{'form.email'} =~ m/^[^\@]+\@[^\@]+$/) { + $from = $env{'form.email'}; } } - my $subject = $ENV{'form.subject'}; + my $subject = $env{'form.subject'}; $subject =~ s#(`)#'#g; $subject =~ s#\$#\(\$\)#g; $supportmsg =~ s#(`)#'#g; @@ -736,9 +737,9 @@ END my $attachmentpath = ''; my $attachmentsize = ''; - if (defined($ENV{'user.name'})) { - if ($ENV{'form.screenshot.filename'}) { - $attachmentsize = length($ENV{'form.screenshot'}); + if (defined($env{'user.name'})) { + if ($env{'form.screenshot.filename'}) { + $attachmentsize = length($env{'form.screenshot'}); if ($attachmentsize > 131072) { $displaymsg .= "
The uploaded screenshot file ($attachmentsize bytes) included with your request exceeded the maximum allowed size - 128 KB, and has therefore been discarded."; } else { @@ -749,10 +750,10 @@ END if ($attachmentpath =~ m-/([^/]+)$-) { $fname = $1; - $displaymsg .= "
An uploaded screenshot file - $fname ($attachmentsize bytes) was included in the request sent by $ENV{'user.name'} from LON-CAPA domain: $ENV{'user.domain'}"; + $displaymsg .= "
An uploaded screenshot file - $fname ($attachmentsize bytes) was included in the request sent by $env{'user.name'} from LON-CAPA domain: $env{'user.domain'}"; $supportmsg .= "\n"; foreach (@envvars) { - $supportmsg .= "$_: $ENV{$_}\n"; + $supportmsg .= "$_: $env{$_}\n"; } } @@ -774,23 +775,19 @@ END } else { my $envdata = ''; foreach (@envvars) { - $envdata .= "$_: $ENV{$_}\n"; + $envdata .= "$_: $env{$_}\n"; } foreach (@loncvars) { - $envdata .= "$_: $ENV{$_}\n"; + $envdata .= "$_: $env{$_}\n"; } $msg->attach(Type => 'TEXT', Data => $envdata); } ### Send it: - # ->send can cause an sh launch which can pass all of %ENV along + # ->send can cause an sh launch which can pass all of %env along # which can be to large for /bin/sh's little mind - my %oldENV=%ENV; - undef(%ENV); $msg->send('sendmail'); - %ENV=%oldENV; - undef(%oldENV); if ($attachmentpath =~ m#$Apache::lonnet::perlvar{'lonDaemons'}/tmp/helprequests/(\d+)/[^/]+#) { unlink($attachmentpath); @@ -844,8 +841,8 @@ END |); foreach (@envvars) { - unless($ENV{$_} eq '') { - $r->print("$_: $ENV{$_}, "); + unless($env{$_} eq '') { + $r->print("$_: $env{$_}, "); } } $r->print("