--- loncom/interface/lonsupportreq.pm 2004/12/30 21:16:38 1.20 +++ loncom/interface/lonsupportreq.pm 2006/05/30 12:46:09 1.35 @@ -1,13 +1,44 @@ +# +# $Id: lonsupportreq.pm,v 1.35 2006/05/30 12:46:09 www 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; +use Apache::lonacc(); +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + sub handler { my ($r) = @_; @@ -19,11 +50,11 @@ sub handler { } &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['origurl','function']); if ($r->uri eq '/adm/helpdesk') { - &Apache::loncommon::get_posted_cgi($r); + &Apache::lonacc::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 = &unescape($env{'form.origurl'}); + my $action = $env{'form.action'}; if ($action eq 'process') { &print_request_receipt($r,$origurl,$function); @@ -35,24 +66,28 @@ sub handler { sub print_request_form { my ($r,$origurl,$function) = @_; - my ($os,$browser,$bversion,$uhost,$uname,$udom,$uhome,$urole,$usec,$email,$cid,$cdom,$cnum,$ctitle,$ccode,$sectionlist,$lastname,$firstname,$server); - my $bodytag = &Apache::loncommon::bodytag('',$function,'topmargin="0",marginheight="0"',1); + my ($os,$browser,$bversion,$uhost,$uname,$udom,$uhome,$urole,$usec,$email,$cid,$cdom,$cnum,$ctitle,$ccode,$sectionlist,$lastname,$firstname,$server,$formname); my $tablecolor = &Apache::loncommon::designparm($function.'.tabbg'); if (($tablecolor eq '') || ($tablecolor eq '#FFFFFF')) { $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'}; - $server = $ENV{'SERVER_NAME'}; + $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'}; + $formname = 'logproblem'; + if ($origurl =~ m-^http://-) { + $server = $origurl; + } else { + $server = 'http://'.$ENV{'SERVER_NAME'}.$origurl; + } my $scripttag = (<<'END'); function validate() { if (validmail(document.logproblem.email) == false) { @@ -66,7 +101,7 @@ function validmail(field) { var str = field.value; if (window.RegExp) { var reg1str = "(@.*@)|(\\.\\.)|(@\\.)|(\\.@)|(^\\.)"; - var reg2str = "^.+\\@(\\[?)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,3}|[0-9]{1,3})(\\]?)$"; + var reg2str = "^.+\\@(\\[?)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,3}|[0-9]{1,3})(\\]?)$"; //" var reg1 = new RegExp(reg1str); var reg2 = new RegExp(reg2str); if (!reg1.test(str) && reg2.test(str)) { @@ -83,6 +118,7 @@ function validmail(field) { } } END + if ($cid =~ m/_/) { ($cdom,$cnum) = split/_/,$cid; } @@ -92,17 +128,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 = (); @@ -112,8 +148,12 @@ 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) { + $details_title = '
('.$codedom.')'; } my %coursecodes = (); my %codes = (); @@ -127,7 +167,11 @@ END my $totcodes = 0; my $format_reply; my $jscript = ''; - + my $loaditems = qq| +function initialize_codes() { + return; +} + |; if ($cdom) { $codedom = $cdom; } @@ -144,24 +188,30 @@ END $totcodes = &retrieve_instcodes(\%coursecodes,$codedom,$totcodes); } if ($totcodes > 0) { - $format_reply = &Apache::lonnet::auto_instcode_format($caller,$codedom,\%coursecodes,\%codes,\@codetitles,\%cat_titles,\%cat_order); if ($ccode eq '') { - my $numtypes = @codetitles; - &build_code_selections(\%codes,\@codetitles,\%cat_titles,\%cat_order,\%idlist,\%idnums,\%idlist_titles); - &javascript_code_selections($numtypes,\%cat_titles,\$jscript,\%idlist,\%idnums,\%idlist_titles,\@codetitles); - } - } - $r->print(< - - LON-CAPA support request - - -$bodytag -ENDHEAD + $format_reply = &Apache::lonnet::auto_instcode_format($caller,$codedom,\%coursecodes,\%codes,\@codetitles,\%cat_titles,\%cat_order); + if ($format_reply eq 'ok') { + my $numtypes = @codetitles; + &build_code_selections(\%codes,\@codetitles,\%cat_titles,\%cat_order,\%idlist,\%idnums,\%idlist_titles); + &javascript_code_selections($formname,$numtypes,\%cat_titles,\$jscript,\%idlist,\%idnums,\%idlist_titles,\@codetitles); + $loaditems = ''; + } + } + } + + my $js = ''; + my %add_entries = (topmargin => "0", + marginheight => "0", + onLoad =>"initialize_codes()",); + + my $start_page = + &Apache::loncommon::start_page('Support Request',$js, + { 'function' => $function, + 'add_entries' => \%add_entries, + 'only_body' => 1,}); + $r->print($start_page); + if ($r->uri eq '/adm/helpdesk') { &print_header($r,$origurl); } @@ -298,7 +348,7 @@ END
- http://$server$origurl + $server
@@ -337,7 +387,7 @@ END -
Course Details: + Course Details:$details_title
@@ -384,6 +434,11 @@ END } else { $longitems[0] = $idlist_titles{$codetitles[0]}; } + for (my $i=0; $i<@longitems; $i++) { + if ($longitems[$i] eq '') { + $longitems[$i] = $items[$i]; + } + } } else { @longitems = @items; } @@ -444,12 +499,13 @@ END END if ($sectionlist) { - $r->print("". + " \n"); foreach (sort keys %groupid) { if ($_ eq $groupid{$_} || $groupid{$_} eq '') { - $r->print("\n"); } else { - $r->print("\n"); } } $r->print(""); @@ -516,7 +572,7 @@ END END - if (defined($ENV{'user.name'})) { + if (defined($env{'user.name'})) { $r->print(< @@ -544,6 +600,7 @@ END END } + $r->print(< @@ -580,18 +637,18 @@ END - - END + $r->print(&Apache::loncommon::end_page()); return; } 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'}; my $to = $Apache::lonnet::perlvar{'lonSupportEMail'}; my $from = $admin; @@ -602,52 +659,58 @@ 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 $start_page = + &Apache::loncommon::start_page('Support request recorded',undef, + {'function' => $function, + 'add_entries' => { + topmargin => "0", + marginheight => "0", + }, + 'only_body' => 1,}); + $r->print(<<"END"); - - - LON-CAPA support request recorded - -$bodytag +$start_page
@@ -670,13 +733,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; @@ -687,9 +750,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 { @@ -698,13 +761,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 .= "
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) { + foreach (@cookievars) { + $supportmsg .= "$_: $cookies{$_}\n"; + } + foreach (@ENVvars) { $supportmsg .= "$_: $ENV{$_}\n"; } + foreach (@envvars) { + $supportmsg .= "$_: $env{$_}\n"; + } } my $msg = MIME::Lite->new( @@ -724,24 +799,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); @@ -794,11 +869,21 @@ END |); - foreach (@envvars) { - unless($ENV{$_} eq '') { + foreach (@cookievars) { + unless($cookies{$_} eq '') { + $r->print("$_: $cookies{$_}, "); + } + } + foreach (@ENVvars) { + unless($ENV{$_} eq '') { $r->print("$_: $ENV{$_}, "); } } + foreach (@envvars) { + unless($env{$_} eq '') { + $r->print("$_: $env{$_}, "); + } + } $r->print(" @@ -815,9 +900,8 @@ END - - "); + $r->print(&Apache::loncommon::end_page()); } sub print_header { @@ -834,7 +918,12 @@ sub print_header { ask => 'Ask helpdesk', getst => 'Getting started guide', back => 'Back to last location' - ); + ); + my ($getstartlink,$getstarttext); + if (-e $Apache::lonnet::perlvar{'lonDocRoot'}.'/adm/gettingstarted.html') { + $getstartlink = qq| $lt{'getst'}|; + $getstarttext = ' '.&mt('and the "Getting started" guide').' '; + } $r->print(<   @@ -851,8 +940,7 @@ sub print_header { - - + $getstartlink
(Login help) $lt{'login'} $helpdesk_link(Ask helpdesk) $lt{'ask'}  $lt{'getst'} $helpdesk_link(Ask helpdesk) $lt{'ask'}  (Back to last location) $lt{'back'} 
@@ -877,7 +965,7 @@ END $r->print(' '.&mt(' -Please read the "Log-in help" and "Getting started guide" if you can not log-in').'. '.&mt('If your problem is still unresolved, the form below can be used to send a question to the LON-CAPA helpdesk').'.
'.&mt('Note').': '.&mt('Student questions about course content should be directed to the course instructor').'.

+Please review the information in "Log-in help"').$getstarttext.' '.&mt('if you are unable to log-in').'. '.&mt('If your problem is still unresolved, the form below can be used to send a question to the LON-CAPA helpdesk').'.
'.&mt('Note').': '.&mt('Student questions about course content should be directed to the course instructor').'.

'); } @@ -888,10 +976,10 @@ Please read the "Log-in help" and "Getti 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); + $$coursecodes{$course} = &unescape($1); $totcodes ++; } } @@ -1107,7 +1195,7 @@ sub recurse_list { } sub javascript_code_selections { - my ($numcats,$cat_titles,$script_tag,$idlist,$idnums,$idlist_titles,$codetitles) = @_; + my ($formname,$numcats,$cat_titles,$script_tag,$idlist,$idnums,$idlist_titles,$codetitles) = @_; my $numtitles = @{$codetitles}; my @seltitles = (); for (my $j=0; $j<$numtitles; $j++) { @@ -1128,10 +1216,10 @@ function courseSet(caller) { var ids = new Array ("$seltitle_str"); var formitems = new Array ($numtitles); var longtitles = new Array ("$longtitles_str"); - var idyr = document.logproblem.Year.selectedIndex - var idsem = document.logproblem.Semester.selectedIndex - var iddept = document.logproblem.Department.selectedIndex - var idclass = document.logproblem.Number.selectedIndex + var idyr = document.$formname.Year.selectedIndex + var idsem = document.$formname.Semester.selectedIndex + var iddept = document.$formname.Department.selectedIndex + var idclass = document.$formname.Number.selectedIndex var idyears = new Array("$$idlist{$$codetitles[0]}"); END if ($longtitles[0]) { @@ -1194,68 +1282,99 @@ END } } $$script_tag .= (<