--- loncom/interface/lonsupportreq.pm	2004/12/31 20:29:27	1.22
+++ loncom/interface/lonsupportreq.pm	2005/04/12 00:20:00	1.28
@@ -1,12 +1,39 @@
+#
+# $Id: lonsupportreq.pm,v 1.28 2005/04/12 00:20:00 raeburn Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
+
 package Apache::lonsupportreq;
 
 use strict;
 use lib qw(/home/httpd/lib/perl);
 use MIME::Types;
 use MIME::Lite;
+use CGI::Cookie();
 use Apache::Constants qw(:common);
 use Apache::loncommon();
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::lonlocal;
 
 sub handler {
@@ -21,9 +48,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);
@@ -42,16 +69,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 {
@@ -87,6 +114,7 @@ function validmail(field) {
     }
 }
 END
+    #" stupid emacs
     if ($cid =~ m/_/) {
         ($cdom,$cnum) = split/_/,$cid;
     }
@@ -96,17 +124,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 = ();
@@ -116,8 +144,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) {
@@ -166,8 +194,9 @@ function initialize_codes() {
             }
         }
     }
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDHEAD);
-<html>
+$html
 <head>
  <title>LON-CAPA support request</title>
 <script type"text/javascript">
@@ -537,7 +566,7 @@ END
 	    </td>
 	   </tr>
 END
-    if (defined($ENV{'user.name'})) {
+    if (defined($env{'user.name'})) {
         $r->print(<<END);
            <tr>
             <td width="140" bgcolor="$tablecolor">
@@ -609,8 +638,10 @@ END
 
 sub print_request_receipt {
     my ($r,$url,$function) = @_;
-    my @envvars = ('lonID','HTTP_HOST','HTTP_USER_AGENT','REMOTE_ADDR','SERVER_ADDR','SERVER_NAME','browser.os','browser.type','browser.version','user.home','request.role');
+    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 = ('lonID');
 
     my $bodytag = &Apache::loncommon::bodytag('',$function,'topmargin="0" marginheight="0"',1);
     my $admin = $Apache::lonnet::perlvar{'lonAdminMail'};
@@ -623,48 +654,49 @@ 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#<br />#g;
     my $displaymsg = qq|
-<font color="$fontcolor">Name:</font><font color="$vlinkcolor"> $ENV{'form.username'}</font><br />
-<font color="$fontcolor">Email: </font><font color="$vlinkcolor">$ENV{'form.email'}</font><br />
-<font color="$fontcolor">Username/domain: </font><font color="$vlinkcolor">$ENV{'form.uname'} - $ENV{'form.udom'}</font><br />
-<font color="$fontcolor">Tel: </font><font color="$vlinkcolor">$ENV{'form.phone'}</font><br />
-<font color="$fontcolor">Course Information: </font><font color="$vlinkcolor">$ENV{'form.title'} - $coursecode - section: $ENV{'form.section'}</font><br />
-<font color="$fontcolor">Subject: </font><font color="$vlinkcolor">$ENV{'form.subject'}</font><br />
+<font color="$fontcolor">Name:</font><font color="$vlinkcolor"> $env{'form.username'}</font><br />
+<font color="$fontcolor">Email: </font><font color="$vlinkcolor">$env{'form.email'}</font><br />
+<font color="$fontcolor">Username/domain: </font><font color="$vlinkcolor">$env{'form.uname'} - $env{'form.udom'}</font><br />
+<font color="$fontcolor">Tel: </font><font color="$vlinkcolor">$env{'form.phone'}</font><br />
+<font color="$fontcolor">Course Information: </font><font color="$vlinkcolor">$env{'form.title'} - $coursecode - section: $env{'form.section'}</font><br />
+<font color="$fontcolor">Subject: </font><font color="$vlinkcolor">$env{'form.subject'}</font><br />
 <font color="$fontcolor">Description: </font><font color="$vlinkcolor">$descrip</font><br />
-<font color="$fontcolor">URL: </font><font color="$vlinkcolor">$ENV{'form.sourceurl'}</font><br />
+<font color="$fontcolor">URL: </font><font color="$vlinkcolor">$env{'form.sourceurl'}</font><br />
 <font color="$fontcolor">Date/Time: </font><font color="$vlinkcolor">$reporttime</font><br />
     |;
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<"END");
-<html>
+$html
 <head>
  <title>LON-CAPA support request recorded</title>
 </head>
@@ -691,13 +723,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;
@@ -708,9 +740,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 .= "<br />The uploaded screenshot file ($attachmentsize bytes) included with your request exceeded the maximum allowed size - 128 KB, and has therefore been discarded.";
             } else {
@@ -719,13 +751,25 @@ END
         }
     }
 
+    my %cookies = ();
+    my $cookie=CGI::Cookie->parse($r->header_in('Cookie'));
+    if ($$cookie{'lonID'} =~ /lonID=(\w+);/) {
+        $cookies{'lonID'} = $1;
+    }
+
     if ($attachmentpath =~ m-/([^/]+)$-) {
         $fname = $1;
-        $displaymsg .= "<br />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 .= "<br />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) {
+        foreach (@cookievars) {
+            $supportmsg .= "$_: $cookies{$_}\n";
+        }
+        foreach (@ENVvars) {
             $supportmsg .= "$_: $ENV{$_}\n";
         }
+        foreach (@envvars) {
+            $supportmsg .= "$_: $env{$_}\n";
+        }
     }
  
     my $msg = MIME::Lite->new(
@@ -745,24 +789,24 @@ END
 
     } else {
         my $envdata = '';
-        foreach (@envvars) {
+        foreach (@cookievars) {
+            $envdata .= "$_: $cookies{$_}\n";
+        }
+        foreach (@ENVvars) {
             $envdata .= "$_: $ENV{$_}\n";
         }
+        foreach (@envvars) {
+            $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
-    # 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);
@@ -815,11 +859,21 @@ END
               <tr>
                <td>
     |);
-    foreach (@envvars) {
-        unless($ENV{$_} eq '') { 
+    foreach (@cookievars) {
+        unless($cookies{$_} eq '') {
+            $r->print("$_:&nbsp;<font color='$vlinkcolor'>$cookies{$_}</font>, ");
+        }
+    }
+    foreach (@ENVvars) {
+        unless($ENV{$_} eq '') {
             $r->print("$_:&nbsp;<font color='$vlinkcolor'>$ENV{$_}</font>, ");
         }
     }
+    foreach (@envvars) {
+        unless($env{$_} eq '') { 
+            $r->print("$_:&nbsp;<font color='$vlinkcolor'>$env{$_}</font>, ");
+        }
+    }
     $r->print("
                </td>
               </tr>
@@ -913,7 +967,7 @@ Please review the information in "Log-in
 
 sub retrieve_instcodes {
     my ($coursecodes,$codedom,$totcodes) = @_;
-    my %courses = &Apache::lonnet::courseiddump($codedom,'.',1,'.','.');
+    my %courses = &Apache::lonnet::courseiddump($codedom,'.',1,'.','.','.');
     foreach my $course (keys %courses) {
         if ($courses{$course} =~ m/^[^:]*:([^:]+)/) {
             $$coursecodes{$course} = &Apache::lonnet::unescape($1);