--- loncom/interface/lonsupportreq.pm 2004/12/31 20:29:27 1.22 +++ loncom/interface/lonsupportreq.pm 2006/12/21 18:32:54 1.41 @@ -1,13 +1,44 @@ +# +# $Id: lonsupportreq.pm,v 1.41 2006/12/21 18:32:54 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; +use Apache::lonacc(); +use Apache::courseclassifier; +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,42 +66,81 @@ 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" onLoad="initialize_codes()"',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'}; - if ($origurl =~ m-^http://-) { + $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'; + my $machine = &Apache::lonnet::absolute_url(); + if ($origurl =~ m-^https?://-) { $server = $origurl; } else { - $server = 'http://'.$ENV{'SERVER_NAME'}.$origurl; + $server = $machine.$origurl; } - my $scripttag = (<<'END'); + my %lt = &Apache::lonlocal::texthash ( + email => 'The e-mail address you entered', + notv => 'is not a valid e-mail address', + rsub => 'You must include a subject', + rdes => 'You must include a description', + name => 'Name', + subm => 'Submit Request', + emad => 'E-mail address', + unme => 'username', + doma => 'domain', + entr => 'Enter the username you use to log-in to your LON-CAPA system, and choose your domain.', + urlp => 'URL of page', + phon => 'Phone', + crsd => 'Course Details', + enin => 'Enter institutional course code', + pick => 'Pick', + enct => 'Enter course title', + secn => 'Section Number', + sele => 'Select', + titl => 'Title', + lsec => 'LON-CAPA sec', + subj => 'Subject', + detd => 'Detailed Description', + opfi => 'Optional file upload', + uplf => 'Upload a file (e.g., a screenshot) relevant to your support request (128 KB max. size)', + fini => 'Finish', + clfm => 'Clear Form', + ); + my $scripttag = (<<"END"); function validate() { if (validmail(document.logproblem.email) == false) { - alert("The e-mail address you entered: "+document.logproblem.email.value+" is not a valid e-mail address."); + alert("$lt{'email'}: "+document.logproblem.email.value+" $lt{'notv'}."); + return; + } + if (document.logproblem.subject.value == '') { + alert("$lt{'rsub'}."); + return; + } + if (document.logproblem.description.value == '') { + alert("$lt{'rdes'}."); return; } document.logproblem.submit(); } +END + $scripttag .= <<'END'; 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)) { @@ -87,8 +157,9 @@ function validmail(field) { } } END + if ($cid =~ m/_/) { - ($cdom,$cnum) = split/_/,$cid; + ($cdom,$cnum) = split(/_/,$cid); } if ($cdom && $cnum) { my %csettings = &Apache::lonnet::get('environment',['description','internal.coursecode','internal.sectionnums'],$cdom,$cnum); @@ -96,41 +167,41 @@ 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'}; - } - my @sections = split/,/,$sectionlist; - my %groupid = (); - foreach (@sections) { - my ($sec,$grp) = split/:/,$_; + if ($env{'environment.firstname'}) { + $firstname = $env{'environment.firstname'}; + } + my @sections = split(/,/,$sectionlist); + my %groupid; + foreach my $section (@sections) { + my ($sec,$grp) = split(/:/,$section); $groupid{$sec} = $grp; } 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 = (); - my @codetitles = (); - my %cat_titles = (); - my %cat_order = (); - my %idlist = (); - my %idnums = (); - my %idlist_titles = (); + my %coursecodes; + my %codes; + my @codetitles; + my %cat_titles; + my %cat_order; + my %idlist; + my %idnums; + my %idlist_titles; my $caller = 'global'; my $totcodes = 0; my $format_reply; @@ -146,37 +217,45 @@ function initialize_codes() { if ($cnum) { $coursecodes{$cnum} = $ccode; if ($ccode eq '') { - $totcodes = &retrieve_instcodes(\%coursecodes,$codedom,$totcodes); + $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$codedom,$totcodes); } else { $coursecodes{$cnum} = $ccode; $caller = $cnum; $totcodes ++; } } else { - $totcodes = &retrieve_instcodes(\%coursecodes,$codedom,$totcodes); + $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$codedom,$totcodes); } if ($totcodes > 0) { if ($ccode eq '') { $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($numtypes,\%cat_titles,\$jscript,\%idlist,\%idnums,\%idlist_titles,\@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); + my $longtitles_str = join('","',@{$longtitles}); + my $allidlist = $idlist{$codetitles[0]}; + $jscript .= &Apache::courseclassifier::courseset_js_start($formname,$longtitles_str,$allidlist); + $jscript .= $scripttext; + $jscript .= &Apache::courseclassifier::javascript_code_selections($formname,@codetitles); $loaditems = ''; } } } - $r->print(< - - LON-CAPA support request - - -$bodytag -ENDHEAD + + 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); } @@ -196,7 +275,7 @@ ENDHEAD -
Name: + $lt{'name'}:
@@ -219,7 +298,7 @@ END $r->print(''); } $r->print(<  +        @@ -234,7 +313,7 @@ END -
E-mail address: + $lt{'emad'}:
@@ -258,7 +337,7 @@ END -
username/domain: + $lt{'unme'}/$lt{'doma'}:
@@ -271,23 +350,23 @@ END my $udom_input = ''; my $uname_input = ''; if (defined($uname) && defined($udom)) { - $r->print('username: '.$uname.'  domain: '.$udom.$udom_input.$uname_input); + $r->print(''.$lt{'unme'}.': '.$uname.'  '.$lt{'doma'}.': '.$udom.$udom_input.$uname_input); } else { my $udomform = ''; my $unameform = ''; if (defined($udom)) { - $udomform = 'domain: '.$udom.$udom_input; + $udomform = ''.$lt{'doma'}.': '.$udom.$udom_input; } elsif (defined($uname)) { - $unameform = 'username: '.$uname.'  '.$uname_input; + $unameform = ''.$lt{'unme'}.': '.$uname.'  '.$uname_input; } if ($udomform eq '') { - $udomform = 'domain: '; + $udomform = ''.$lt{'doma'}.': '; $udomform .= &Apache::loncommon::select_dom_form($codedom,'udom'); } if ($unameform eq '') { - $unameform= 'username:   '; + $unameform= ''.$lt{'unme'}.':   '; } - $r->print($unameform.$udomform.'
Enter the username you use to log-in to your LON-CAPA system, and choose your domain.'); + $r->print($unameform.$udomform.'
'.$lt{'entr'}); } $r->print(< @@ -304,7 +383,7 @@ END -
URL of page: + $lt{'urlp'}:
@@ -328,7 +407,7 @@ END -
Phone #: + $lt{'phon'} #:
@@ -352,7 +431,7 @@ END -
Course Details:$details_title + $lt{'crsd'}:$details_title
@@ -364,19 +443,19 @@ END END if ($cnum) { if ($coursecodes{$cnum}) { - foreach (@codetitles) { - $r->print(''.$_.': '.$codes{$cnum}{$_}.'; '); + foreach my $item (@codetitles) { + $r->print(''.$item.': '.$codes{$cnum}{$item}.'; '); } $r->print(' '); } else { - $r->print('Enter institutional course code:  + $r->print($lt{'enin'}.':  '); } } else { if ($totcodes > 0) { my $numtitles = @codetitles; if ($numtitles == 0) { - $r->print('Enter institutional course code:  + $r->print($lt{'enin'}.':  '); } else { my $lasttitle = $numtitles; @@ -385,17 +464,17 @@ END } $r->print('' ); @@ -423,19 +502,19 @@ END if ($numtitles > 4) { $r->print('

'.$codetitles[$numtitles].'
'."\n". ''."\n"); } } } else { - $r->print('Enter institutional course code:  + $r->print($lt{'enin'}.':  '); } } if ($ctitle) { - $r->print('
Title: '.$ctitle.''); + $r->print('
'.$lt{'titl'}.': '.$ctitle.''); } else { - $r->print('
Enter course title:  + $r->print('
'.$lt{'enct'}.':  '); } $r->print(<
'.$codetitles[0].'
'."\n". '		'.$codetitles[$i].'
'."\n". ''."\n". '
-
Section Number: + $lt{'secn'}:
@@ -465,12 +544,12 @@ END END if ($sectionlist) { $r->print(""); @@ -492,7 +571,7 @@ END -
Subject + $lt{'subj'}
@@ -516,7 +595,7 @@ END -
Detailed description: + $lt{'detd'}:
@@ -537,13 +616,13 @@ END END - if (defined($ENV{'user.name'})) { + if (defined($env{'user.name'})) { $r->print(< -
Optional file upload: + $lt{'opfi'}:
@@ -552,7 +631,7 @@ END
-
Upload a file (e.g., a screenshot) relevant to your support request (128 KB max. size). +
$lt{'uplf'}
@@ -565,12 +644,13 @@ END END } + $r->print(< -
Finish: + $lt{'fini'}:
@@ -580,11 +660,11 @@ END -   +     - + @@ -601,18 +681,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; @@ -623,52 +703,76 @@ 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 %lt = &Apache::lonlocal::texthash ( + name => 'Name', + email => 'Email', + unme => 'Username/domain', + tel => 'Tel', + crsi => 'Course Information', + subj => 'Subject', + desc => 'Description', + date => 'Date/Time', + secn => 'Section', + asup => 'A support request has been sent to', + warn => 'Warning: Problem with support e-mail address', + your => 'Your support request contained the following information', + sect => 'section', + info => 'Information supplied', + adin => 'Additional information recorded', + ); + 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'} -Date/Time: $reporttime +$lt{'name'}: $env{'form.username'} +$lt{'email'}: $env{'form.email'} +$lt{'unme'}: $env{'form.uname'} - $env{'form.udom'} +$lt{'tel'}: $env{'form.phone'} +$lt{'crsi'}: $env{'form.title'} - $coursecode - $lt{'secn'}: $env{'form.section'} +$lt{'subj'}: $env{'form.subject'} +$lt{'desc'}: $env{'form.description'} +URL: $env{'form.sourceurl'} +$lt{'date'}: $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'}
-Description: $descrip
-URL: $ENV{'form.sourceurl'}
-Date/Time: $reporttime
+$lt{'name'}: $env{'form.username'}
+$lt{'email'}: $env{'form.email'}
+$lt{'unme'}: $env{'form.uname'} - $env{'form.udom'}
+$lt{'tel'}: $env{'form.phone'}
+$lt{'crsi'}: $env{'form.title'} - $coursecode - $lt{'sect'}: $env{'form.section'}
+$lt{'subj'}: $env{'form.subject'}
+$lt{'desc'}: $descrip
+URL: $env{'form.sourceurl'}
+$lt{'date'}: $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
@@ -677,27 +781,25 @@ END &print_header($r,$url,'process'); } if ($to =~ m/^[^\@]+\@[^\@]+$/) { - $r->print("

A support request has been sent to $to

"); + $r->print('

'.$lt{'asup'}.' '.$to.'

'); } else { $to = $admin; if ($to =~ m/^[^\@]+\@[^\@]+$/) { - $r->print("

A support request has been sent to $to

"); -END + $r->print('

'.$lt{'asup'}.' '.$to.'

'); } else { - $r->print(<Warning: Problem with support e-mail address -As the e-mail address provided for this LON-CAPA server ($to) does not appear to be a valid e-mail address, your support request has not been sent to the LON-CAPA support staff or administrator at your institution. Instead a copy has been sent to the LON-CAPA support team at Michigan State University. -END + $r->print(' +

'.$lt{'warn'}.'

'. +&mt('As the e-mail address provided for this LON-CAPA server ([_1]) does not appear to be a valid e-mail address, your support request has not been sent to the LON-CAPA support staff or administrator at your institution.',$to).' '.&mt('Instead a copy has been sent to the LON-CAPA support team at Michigan State University.')); $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,23 +810,35 @@ 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."; + $displaymsg .= '
'.&mt('The uploaded screenshot file ([_1] bytes) included with your request exceeded the maximum allowed size - 128 KB, and has therefore been discarded.',$attachmentsize); } else { $attachmentpath=&Apache::lonnet::userfileupload('screenshot',undef,'helprequests'); } } } + my %cookies; + my $cookie=CGI::Cookie->parse($r->header_in('Cookie')); + if ($$cookie{'lonID'} =~ /lonID=($LONCAPA::handle_re);/) { + $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 .= '
'.&mt('An uploaded screenshot file - [_1] ([_2] bytes) was included in the request sent by [_3] from LON-CAPA domain',$fname,$attachmentsize,$env{'user.name'}.': '.$env{'user.domain'}); $supportmsg .= "\n"; - foreach (@envvars) { - $supportmsg .= "$_: $ENV{$_}\n"; + foreach my $var (@cookievars) { + $supportmsg .= "$var: $cookies{$var}\n"; + } + foreach my $var(@ENVvars) { + $supportmsg .= "$var: $ENV{$var}\n"; + } + foreach my $var (@envvars) { + $supportmsg .= "$var: $env{$var}\n"; } } @@ -745,30 +859,30 @@ END } else { my $envdata = ''; - foreach (@envvars) { - $envdata .= "$_: $ENV{$_}\n"; + foreach my $var (@cookievars) { + $envdata .= "$var: $cookies{$var}\n"; } - foreach (@loncvars) { - $envdata .= "$_: $ENV{$_}\n"; + foreach my $var (@ENVvars) { + $envdata .= "$var: $ENV{$var}\n"; + } + foreach my $var (@envvars) { + $envdata .= "$var: $env{$var}\n"; + } + foreach my $var (@loncvars) { + $envdata .= "$var: $env{$var}\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); } $r->print(qq| - Your support request contained the following information:

+ $lt{'your'}:

@@ -783,7 +897,7 @@ END -
Information supplied + $lt{'info'}
@@ -805,7 +919,7 @@ END 		-
Additional information recorded + $lt{'adin'}
@@ -815,9 +929,19 @@ END
|); - foreach (@envvars) { - unless($ENV{$_} eq '') { - $r->print("$_: $ENV{$_}, "); + foreach my $var (@cookievars) { + unless($cookies{$var} eq '') { + $r->print("$var: $cookies{$var}, "); + } + } + foreach my $var (@ENVvars) { + unless($ENV{$var} eq '') { + $r->print("$var: $ENV{$var}, "); + } + } + foreach my $var (@envvars) { + unless($env{$var} eq '') { + $r->print("$var: $env{$var}, "); } } $r->print(" @@ -836,9 +960,8 @@ END
- - "); + $r->print(&Apache::loncommon::end_page()); } sub print_header { @@ -876,9 +999,9 @@ sub print_header { - - $getstartlink - + + $getstartlink +
(Login help) $lt{'login'} $helpdesk_link(Ask helpdesk) $lt{'ask'}  (Back to last location) $lt{'back'} ($lt{'login'}) $lt{'login'} $helpdesk_link($lt{'ask'}) $lt{'ask'}  ($lt{'back'}) $lt{'back'} 
@@ -911,404 +1034,4 @@ Please review the information in "Log-in return; } -sub retrieve_instcodes { - my ($coursecodes,$codedom,$totcodes) = @_; - my %courses = &Apache::lonnet::courseiddump($codedom,'.',1,'.','.'); - foreach my $course (keys %courses) { - if ($courses{$course} =~ m/^[^:]*:([^:]+)/) { - $$coursecodes{$course} = &Apache::lonnet::unescape($1); - $totcodes ++; - } - } - return $totcodes; -} - -sub build_code_selections { - my ($codes,$codetitles,$cat_titles,$cat_order,$idlist,$idnums,$idlist_titles) = @_; - my %idarrays = (); - for (my $i=1; $i<@{$codetitles}; $i++) { - %{$idarrays{$$codetitles[$i]}} = (); - } - foreach my $cid (sort keys %{$codes}) { - &recurse_list($cid,$codetitles,$codes,0,\%idarrays); - } - for (my $num=0; $num<@{$codetitles}; $num++) { - if ($num == 0) { - my @contents = (); - my @contents_titles = (); - &sort_cats($num,$cat_order,$codetitles,\@{$idarrays{$$codetitles[0]}},\@contents); - if (defined($$cat_titles{$$codetitles[0]})) { - foreach (@contents) { - push @contents_titles, $$cat_titles{$$codetitles[0]}{$_}; - } - } - $$idlist{$$codetitles[0]} = join('","',@contents); - $$idnums{$$codetitles[0]} = scalar(@contents); - if (defined($$cat_titles{$$codetitles[0]})) { - $$idlist_titles{$$codetitles[0]} = join('","',@contents_titles); - } - } elsif ($num == 1) { - %{$$idlist{$$codetitles[1]}} = (); - %{$$idlist_titles{$$codetitles[1]}} = (); - foreach my $key_a (keys %{$idarrays{$$codetitles[1]}}) { - my @sorted_a = (); - my @sorted_a_titles = (); - &sort_cats($num,$cat_order,$codetitles,\@{$idarrays{$$codetitles[1]}{$key_a}},\@sorted_a); - if (defined($$cat_titles{$$codetitles[1]})) { - foreach (@sorted_a) { - push @sorted_a_titles, $$cat_titles{$$codetitles[1]}{$_}; - } - } - $$idlist{$$codetitles[1]}{$key_a} = join('","',@sorted_a); - $$idnums{$$codetitles[1]}{$key_a} = scalar(@sorted_a); - if (defined($$cat_titles{$$codetitles[1]})) { - $$idlist_titles{$$codetitles[1]}{$key_a} = join('","',@sorted_a_titles); - } - } - } elsif ($num == 2) { - %{$$idlist{$$codetitles[2]}} = (); - %{$$idlist_titles{$$codetitles[2]}} = (); - foreach my $key_a (keys %{$idarrays{$$codetitles[2]}}) { - %{$$idlist{$$codetitles[2]}{$key_a}} = (); - %{$$idlist_titles{$$codetitles[2]}{$key_a}} = (); - foreach my $key_b (keys %{$idarrays{$$codetitles[2]}{$key_a}}) { - my @sorted_b = (); - my @sorted_b_titles = (); - &sort_cats($num,$cat_order,$codetitles,\@{$idarrays{$$codetitles[2]}{$key_a}{$key_b}},\@sorted_b); - if (defined($$cat_titles{$$codetitles[2]})) { - foreach (@sorted_b) { - push @sorted_b_titles, $$cat_titles{$$codetitles[2]}{$_}; - } - } - $$idlist{$$codetitles[2]}{$key_a}{$key_b} = join('","',@sorted_b); - $$idnums{$$codetitles[2]}{$key_a}{$key_b} = scalar(@sorted_b); - if (defined($$cat_titles{$$codetitles[2]})) { - $$idlist_titles{$$codetitles[2]}{$key_a}{$key_b} = join('","',@sorted_b_titles); - } - } - } - } elsif ($num == 3) { - %{$$idlist{$$codetitles[3]}} = (); - foreach my $key_a (keys %{$idarrays{$$codetitles[3]}}) { - %{$$idlist{$$codetitles[3]}{$key_a}} = (); - foreach my $key_b (keys %{$idarrays{$$codetitles[3]}{$key_a}}) { - %{$$idlist{$$codetitles[3]}{$key_a}{$key_b}} = (); - foreach my $key_c (keys %{$idarrays{$$codetitles[3]}{$key_a}{$key_b}}) { - my @sorted_c = (); - my @sorted_c_titles = (); - &sort_cats($num,$cat_order,$codetitles,\@{$idarrays{$$codetitles[3]}{$key_a}{$key_b}{$key_c}},\@sorted_c); - if (defined($$cat_titles{$$codetitles[3]})) { - foreach (@sorted_c) { - push @sorted_c_titles, $$cat_titles{$$codetitles[3]}{$_}; - } - } - $$idlist{$$codetitles[3]}{$key_a}{$key_b}{$key_c} = join('","',@sorted_c); - $$idnums{$$codetitles[3]}{$key_a}{$key_b}{$key_c} = scalar(@sorted_c); - if (defined($$cat_titles{$$codetitles[3]})) { - $$idlist_titles{$$codetitles[2]}{$key_a}{$key_b} = join('","',@sorted_c_titles); - } - } - } - } - } elsif ($num == 4) { - %{$$idlist{$$codetitles[4]}} = (); - foreach my $key_a (keys %{$idarrays{$$codetitles[4]}}) { - %{$$idlist{$$codetitles[4]}{$key_a}} = (); - foreach my $key_b (keys %{$idarrays{$$codetitles[4]}{$key_a}}) { - %{$$idlist{$$codetitles[4]}{$key_a}{$key_b}} = (); - foreach my $key_c (keys %{$idarrays{$$codetitles[4]}{$key_a}{$key_b}}) { - %{$$idlist{$$codetitles[4]}{$key_a}{$key_b}{$key_c}} = (); - foreach my $key_d (keys %{$idarrays{$$codetitles[4]}{$key_a}{$key_b}{$key_c}}) { - my @sorted_d = (); - my @sorted_d_titles = (); - &sort_cats($num,$cat_order,$codetitles,$idarrays{$$codetitles[4]}{$key_a}{$key_b}{$key_c}{$key_d},\@sorted_d); - if (defined($$cat_titles{$$codetitles[4]})) { - foreach (@sorted_d) { - push @sorted_d_titles, $$cat_titles{$$codetitles[4]}{$_}; - } - } - $$idlist{$$codetitles[4]}{$key_a}{$key_b}{$key_c}{$key_d} = join('","',@sorted_d); - $$idnums{$$codetitles[4]}{$key_a}{$key_b}{$key_c}{$key_d} = scalar(@sorted_d); - } - } - } - } - } - } -} - -sub sort_cats { - my ($num,$cat_order,$codetitles,$idsarrayref,$sorted) = @_; - my @unsorted = @{$idsarrayref}; - if (defined($$cat_order{$$codetitles[$num]})) { - foreach (@{$$cat_order{$$codetitles[$num]}}) { - if (grep/^$_$/,@unsorted) { - push @{$sorted}, $_; - } - } - } else { - @{$sorted} = sort (@unsorted); - } -} - - -sub recurse_list { - my ($cid,$codetitles,$codes,$num,$idarrays) = @_; - if ($num == 0) { - if (!grep/^$$codes{$cid}{$$codetitles[0]}$/,@{$$idarrays{$$codetitles[0]}}) { - push @{$$idarrays{$$codetitles[0]}}, $$codes{$cid}{$$codetitles[0]}; - } - } elsif ($num == 1) { - if (defined($$idarrays{$$codetitles[1]}{$$codes{$cid}{$$codetitles[0]}})) { - if (!grep/^$$codes{$cid}{$$codetitles[1]}$/,@{$$idarrays{$$codetitles[1]}{$$codes{$cid}{$$codetitles[0]}}}) { - push @{$$idarrays{$$codetitles[1]}{$$codes{$cid}{$$codetitles[0]}}}, $$codes{$cid}{$$codetitles[1]}; - } - } else { - @{$$idarrays{$$codetitles[1]}{$$codes{$cid}{$$codetitles[0]}}} = ("$$codes{$cid}{$$codetitles[1]}"); - } - } elsif ($num == 2) { - if (defined($$idarrays{$$codetitles[2]}{$$codes{$cid}{$$codetitles[0]}})) { - if (defined($$idarrays{$$codetitles[2]}{$$codes{$cid}{$$codetitles[0]}}{$$codes{$cid}{$$codetitles[1]}})) { - if (!grep/^$$codes{$cid}{$$codetitles[2]}$/,@{$$idarrays{$$codetitles[2]}{$$codes{$cid}{$$codetitles[0]}}{$$codes{$cid}{$$codetitles[1]}}}) { - push @{$$idarrays{$$codetitles[2]}{$$codes{$cid}{$$codetitles[0]}}{$$codes{$cid}{$$codetitles[1]}}}, $$codes{$cid}{$$codetitles[2]}; - } - } else { - @{$$idarrays{$$codetitles[2]}{$$codes{$cid}{$$codetitles[0]}}{$$codes{$cid}{$$codetitles[1]}}} = ("$$codes{$cid}{$$codetitles[2]}"); - } - } else { - %{$$idarrays{$$codetitles[2]}{$$codes{$cid}{$$codetitles[0]}}} = (); - @{$$idarrays{$$codetitles[2]}{$$codes{$cid}{$$codetitles[0]}}{$$codes{$cid}{$$codetitles[1]}}} = ("$$codes{$cid}{$$codetitles[2]}"); - } - } elsif ($num == 3) { - if (defined($$idarrays{$$codetitles[3]}{$$codes{$cid}{$$codetitles[0]}})) { - if (defined($$idarrays{$$codetitles[3]}{$$codes{$cid}{$$codetitles[0]}}{$$codes{$cid}{$$codetitles[1]}})) { - if (defined($$idarrays{$$codetitles[3]}{$$codes{$cid}{$$codetitles[0]}}{$$codes{$cid}{$$codetitles[1]}}{$$codes{$cid}{$$codetitles[2]}})) { - if (!grep/^$$codes{$cid}{$$codetitles[3]}$/,@{$$idarrays{$$codetitles[3]}{$$codes{$cid}{$$codetitles[0]}}{$$codes{$cid}{$$codetitles[1]}}{$$codes{$cid}{$$codetitles[2]}}}) { - push @{$$idarrays{$$codetitles[3]}{$$codes{$cid}{$$codetitles[0]}}{$$codes{$cid}{$$codetitles[1]}}{$$codes{$cid}{$$codetitles[2]}}}, $$codes{$cid}{$$codetitles[3]}; - } - } else { - @{$$idarrays{$$codetitles[3]}{$$codes{$cid}{$$codetitles[0]}}{$$codes{$cid}{$$codetitles[1]}}{$$codes{$cid}{$$codetitles[2]}}} = ("$$codes{$cid}{$$codetitles[3]}"); - } - } else { - %{$$idarrays{$$codetitles[3]}{$$codes{$cid}{$$codetitles[0]}}{$$codes{$cid}{$$codetitles[1]}}} = (); - @{$$idarrays{$$codetitles[3]}{$$codes{$cid}{$$codetitles[0]}}{$$codes{$cid}{$$codetitles[1]}}{$$codes{$cid}{$$codetitles[2]}}} = ("$$codes{$cid}{$$codetitles[3]}"); - } - } else { - %{$$idarrays{$$codetitles[3]}{$$codes{$cid}{$$codetitles[0]}}} = (); - %{$$idarrays{$$codetitles[3]}{$$codes{$cid}{$$codetitles[0]}}{$$codes{$cid}{$$codetitles[1]}}} = (); - @{$$idarrays{$$codetitles[3]}{$$codes{$cid}{$$codetitles[0]}}{$$codes{$cid}{$$codetitles[1]}}{$$codes{$cid}{$$codetitles[2]}}} = ("$$codes{$cid}{$$codetitles[3]}"); - } - } elsif ($num == 4) { - if (defined($$idarrays{$$codetitles[4]}{$$codes{$cid}{$$codetitles[0]}})) { - if (defined($$idarrays{$$codetitles[4]}{$$codes{$cid}{$$codetitles[0]}}{$$codes{$cid}{$$codetitles[1]}})) { - if (defined($$idarrays{$$codetitles[4]}{$$codes{$cid}{$$codetitles[0]}}{$$codes{$cid}{$$codetitles[1]}}{$$codes{$cid}{$$codetitles[2]}})) { - if (defined($$idarrays{$$codetitles[4]}{$$codes{$cid}{$$codetitles[0]}}{$$codes{$cid}{$$codetitles[1]}}{$$codes{$cid}{$$codetitles[2]}}{$$codes{$cid}{$$codetitles[3]}})) { - if (!grep/^$$codes{$cid}{$$codetitles[4]}$/,@{$$idarrays{$$codetitles[4]}{$$codes{$cid}{$$codetitles[0]}}{$$codes{$cid}{$$codetitles[1]}}{$$codes{$cid}{$$codetitles[2]}}{$$codes{$cid}{$$codetitles[3]}}}) { - push @{$$idarrays{$$codetitles[4]}{$$codes{$cid}{$$codetitles[0]}}{$$codes{$cid}{$$codetitles[1]}}{$$codes{$cid}{$$codetitles[2]}}{$$codes{$cid}{$$codetitles[3]}}}, $$codes{$cid}{$$codetitles[4]}; - } - } else { - @{$$idarrays{$$codetitles[4]}{$$codes{$cid}{$$codetitles[0]}}{$$codes{$cid}{$$codetitles[1]}}{$$codes{$cid}{$$codetitles[2]}}{$$codes{$cid}{$$codetitles[3]}}} = ("$$codes{$cid}{$$codetitles[4]}"); - } - } else { - %{$$idarrays{$$codetitles[4]}{$$codes{$cid}{$$codetitles[0]}}{$$codes{$cid}{$$codetitles[1]}}{$$codes{$cid}{$$codetitles[2]}}} = (); - @{$$idarrays{$$codetitles[4]}{$$codes{$cid}{$$codetitles[0]}}{$$codes{$cid}{$$codetitles[1]}}{$$codes{$cid}{$$codetitles[2]}}{$$codes{$cid}{$$codetitles[3]}}} = ("$$codes{$cid}{$$codetitles[4]}"); - } - } else { - %{$$idarrays{$$codetitles[4]}{$$codes{$cid}{$$codetitles[0]}}{$$codes{$cid}{$$codetitles[1]}}} = (); - %{$$idarrays{$$codetitles[4]}{$$codes{$cid}{$$codetitles[0]}}{$$codes{$cid}{$$codetitles[1]}}{$$codes{$cid}{$$codetitles[2]}}} = (); - @{$$idarrays{$$codetitles[4]}{$$codes{$cid}{$$codetitles[0]}}{$$codes{$cid}{$$codetitles[1]}}{$$codes{$cid}{$$codetitles[2]}}{$$codes{$cid}{$$codetitles[3]}}} = ("$$codes{$cid}{$$codetitles[4]}"); - } - } else { - %{$$idarrays{$$codetitles[4]}{$$codes{$cid}{$$codetitles[0]}}} = (); - %{$$idarrays{$$codetitles[4]}{$$codes{$cid}{$$codetitles[0]}}{$$codes{$cid}{$$codetitles[1]}}} = (); - %{$$idarrays{$$codetitles[4]}{$$codes{$cid}{$$codetitles[0]}}{$$codes{$cid}{$$codetitles[1]}}{$$codes{$cid}{$$codetitles[2]}}} = (); - @{$$idarrays{$$codetitles[4]}{$$codes{$cid}{$$codetitles[0]}}{$$codes{$cid}{$$codetitles[1]}}{$$codes{$cid}{$$codetitles[1]}}{$$codes{$cid}{$$codetitles[3]}}} = ("$$codes{$cid}{$$codetitles[3]}"); - } - } - $num ++; - if ($num <@{$codetitles}) { - &recurse_list($cid,$codetitles,$codes,$num,$idarrays); - } -} - -sub javascript_code_selections { - my ($numcats,$cat_titles,$script_tag,$idlist,$idnums,$idlist_titles,$codetitles) = @_; - my $numtitles = @{$codetitles}; - my @seltitles = (); - for (my $j=0; $j<$numtitles; $j++) { - $seltitles[$j] = 'id'.$$codetitles[$j]; - } - my $seltitle_str = join('","',@seltitles); - my @longtitles = (); - for (my $i=0; $i<$numtitles; $i++) { - if (defined($$cat_titles{$$codetitles[$i]})) { - $longtitles[$i] = 1; - } else { - $longtitles[$i] = 0; - } - } - my $longtitles_str = join('","',@longtitles); - $$script_tag .= <