--- loncom/interface/lonsupportreq.pm 2007/05/07 14:02:45 1.43 +++ loncom/interface/lonsupportreq.pm 2010/07/09 14:40:20 1.57 @@ -1,5 +1,5 @@ # -# $Id: lonsupportreq.pm,v 1.43 2007/05/07 14:02:45 raeburn Exp $ +# $Id: lonsupportreq.pm,v 1.57 2010/07/09 14:40:20 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -58,9 +58,9 @@ sub handler { } my $function = $env{'form.function'}; my $origurl = &unescape($env{'form.origurl'}); - my $action = $env{'form.action'}; + my $command = $env{'form.command'}; - if ($action eq 'process') { + if ($command eq 'process') { &print_request_receipt($r,$origurl,$function); } else { &print_request_form($r,$origurl,$function); @@ -71,17 +71,17 @@ 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,$formname); - my $tablecolor = &Apache::loncommon::designparm($function.'.tabbg'); - if (($tablecolor eq '') || ($tablecolor eq '#FFFFFF')) { - $tablecolor = '#EEEE99'; - } + $function = &Apache::loncommon::get_users_function() if (!$function); $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'}; + my ($uname,$udom); + if (($env{'user.name'} ne 'public') && ($env{'user.domain'} ne 'public')) { + $uname = $env{'user.name'}; + $udom = $env{'user.domain'}; + } $uhome = $env{'user.home'}; $urole = $env{'request.role'}; $usec = $env{'request.course.sec'}; @@ -93,6 +93,8 @@ sub print_request_form { } else { $server = $machine.$origurl; } + my $showserver = $server; + $showserver =~ s/\?.*$//; my %lt = &Apache::lonlocal::texthash ( email => 'The e-mail address you entered', notv => 'is not a valid e-mail address', @@ -100,10 +102,13 @@ sub print_request_form { rdes => 'You must include a description', name => 'Name', subm => 'Submit Request', - emad => 'E-mail address', + emad => 'Your e-mail address', + emac => 'Cc', unme => 'username', doma => 'domain', - entr => 'Enter the username you use to log-in to your LON-CAPA system, and choose your domain.', + entu => 'Enter the username you use to log-in to LON-CAPA', + chdo => 'Choose your LON-CAPA domain', + entr => 'Enter the username you use to log-in to LON-CAPA, and your domain.', urlp => 'URL of page', phon => 'Phone', crsd => 'Course Details', @@ -117,7 +122,7 @@ sub print_request_form { 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)', + uplf => 'Upload a file (e.g., a screenshot) relevant to your help request (128 KB max.)', fini => 'Finish', clfm => 'Clear Form', ); @@ -140,8 +145,9 @@ function validate() { END $scripttag .= &Apache::lonhtmlcommon::javascript_valid_email(); - if ($cid =~ m/_/) { - ($cdom,$cnum) = split(/_/,$cid); + if ($cid) { + $cdom = $env{'course.'.$cid.'.domain'}; + $cnum = $env{'course.'.$cid.'.num'}; } if ($cdom && $cnum) { my %csettings = &Apache::lonnet::get('environment',['description','internal.coursecode','internal.sectionnums'],$cdom,$cnum); @@ -149,10 +155,12 @@ END $ccode = $csettings{'internal.coursecode'}; $sectionlist = $csettings{'internal.sectionnums'}; } - if ($env{'environment.critnotification'}) { + + if ($env{'environment.permanentemail'}) { + $email = $env{'environment.permanentemail'}; + } elsif ($env{'environment.critnotification'}) { $email = $env{'environment.critnotification'}; - } - if (!$email && $env{'environment.notification'}) { + } elsif ($env{'environment.notification'}) { $email = $env{'environment.notification'}; } if ($env{'environment.lastname'}) { @@ -167,11 +175,8 @@ END 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'}; - } + my $codedom = &get_domain(); my $details_title; if ($codedom) { $details_title = '
('.$codedom.')'; @@ -193,9 +198,6 @@ function initialize_codes() { return; } |; - if ($cdom) { - $codedom = $cdom; - } if ($cnum) { $coursecodes{$cnum} = $ccode; if ($ccode eq '') { @@ -225,118 +227,74 @@ function initialize_codes() { } } - my $js = ''; my %add_entries = (topmargin => "0", marginheight => "0", onLoad =>"initialize_codes()",); - my $start_page = - &Apache::loncommon::start_page('Support Request',$js, + + $r->print(&Apache::loncommon::start_page('Support Request',$js, { 'function' => $function, 'add_entries' => \%add_entries, - 'only_body' => 1,}); - $r->print($start_page); - + 'only_body' => 1,})); if ($r->uri eq '/adm/helpdesk') { &print_header($r,$origurl); } - $r->print(<<"END"); -
- - - - -
- - - - -
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -END - if (defined($env{'user.name'})) { - $r->print(< - - - - - - -END + $output .= &Apache::lonhtmlcommon::row_closure(); + $num ++; + $i = $num%2; + $output .= &Apache::lonhtmlcommon::row_title($lt{'subj'},undef,'LC_oddrow_value'). + ' '."\n". + &Apache::lonhtmlcommon::row_closure(). + &Apache::lonhtmlcommon::row_title($lt{'detd'},undef,'LC_evenrow_value'). + ' '. + &Apache::lonhtmlcommon::row_closure(); + $num ++; + $i = $num%2; + if (defined($uname)) { + $output .= &Apache::lonhtmlcommon::row_title($lt{'opfi'},undef,$css[$i]). + '
'.$lt{'uplf'}."\n". + &Apache::lonhtmlcommon::row_closure(); + $num ++; + $i = $num%2; } - - $r->print(< - -
- - - - -
$lt{'name'}: -
- 		- - - - -
-END + my @css = ('LC_evenrow_value','LC_oddrow_value'); + my $num = 1; + my $i = $num%2; + $r->print(''."\n"); + my $output = &Apache::lonhtmlcommon::start_pick_box(). + &Apache::lonhtmlcommon::row_title($lt{'name'},undef,$css[$num])."\n"; my $fullname = ''; if ((defined($lastname) && $lastname ne '') && (defined($firstname) && $firstname ne '')) { $fullname = "$firstname $lastname"; - $r->print("$fullname"); + $output .= $fullname.'&').'" />'; } else { if (defined($firstname) && $firstname ne '') { $fullname = $firstname; } elsif (defined($lastname) && $lastname ne '') { - $fullname= " $lastname"; + $fullname = " $lastname"; } - $r->print(''); + $output .= '&').'" />'; } - $r->print(<  -
-
-
-
- - - - -
$lt{'emad'}: -
- 		- - - - -
-
-
-
-
-
- - - - -
$lt{'unme'}/$lt{'doma'}: -
- 		- - - -
-END - my $udom_input = ''; - my $uname_input = ''; + $output .= '      '. + &Apache::lonhtmlcommon::row_closure()."\n"; + $num ++; + $i = $num%2; + $output .= &Apache::lonhtmlcommon::row_title($lt{'emad'},undef,$css[$i]). + '&').'" />
'."\n". + &Apache::lonhtmlcommon::row_closure(); + $num ++; + $i = $num%2; + if (defined($uname)) { + $output .= &Apache::lonhtmlcommon::row_title($lt{'emac'},undef,$css[$i]). + '
'."\n". + &Apache::lonhtmlcommon::row_closure(); + $num ++; + $i = $num%2; + } + $output .= &Apache::lonhtmlcommon::row_title("$lt{'unme'}/$lt{'doma'}",undef,$css[$i]); + my $udom_input = '&').'" />'; + my $uname_input = '&').'" />'; if (defined($uname) && defined($udom)) { - $r->print(''.$lt{'unme'}.': '.$uname.'  '.$lt{'doma'}.': '.$udom.$udom_input.$uname_input); + $output .= ''.$lt{'unme'}.': '.$uname.'  '.$lt{'doma'}.': '.$udom.$udom_input.$uname_input; } else { my $udomform = ''; my $unameform = ''; if (defined($udom)) { + $output .= $lt{'entu'}; + } elsif (defined($uname)) { + $output .= $lt{'chdo'}; + } else { + $output .= $lt{'entr'}; + } + $output .= '
'; + if (defined($udom)) { $udomform = ''.$lt{'doma'}.': '.$udom.$udom_input; } elsif (defined($uname)) { $unameform = ''.$lt{'unme'}.': '.$uname.'  '.$uname_input; @@ -348,105 +306,46 @@ END if ($unameform eq '') { $unameform= ''.$lt{'unme'}.':   '; } - $r->print($unameform.$udomform.'
'.$lt{'entr'}); + $output .= $unameform.$udomform; } - $r->print(< -
-
-
-
- - - - -
$lt{'urlp'}: -
- 		- - - - -
- $server -
-
-
-
- - - - -
$lt{'phon'} #: -
- 		- - - - -
-
-
-
-
-
- - - - -
$lt{'crsd'}:$details_title -
- 		- - - -
-END - if ($cnum) { + $output .= &Apache::lonhtmlcommon::row_closure(); + $num ++; + $i = $num%2; + $output .= &Apache::lonhtmlcommon::row_title("$lt{'urlp'}",undef,$css[$i]). + $showserver.'&').'" />'. + &Apache::lonhtmlcommon::row_closure(). + &Apache::lonhtmlcommon::row_title("$lt{'phon'}",undef,'LC_evenrow_value'). + '
'. + &Apache::lonhtmlcommon::row_closure(); + $num ++; + $i = $num%2; + $output .= &Apache::lonhtmlcommon::row_title("$lt{'crsd'}$details_title",undef,$css[$i]); + if ($cnum) { if ($coursecodes{$cnum}) { foreach my $item (@codetitles) { - $r->print(''.$item.': '.$codes{$cnum}{$item}.'; '); + $output .= ''.$item.': '.$codes{$cnum}{$item}.'; '; } - $r->print(' '); + $output .= ' &').'" />'; } else { - $r->print($lt{'enin'}.':  - '); + $output .= $lt{'enin'}.':  + '; } } else { if ($totcodes > 0) { my $numtitles = @codetitles; if ($numtitles == 0) { - $r->print($lt{'enin'}.':  - '); + $output .= $lt{'enin'}.':  + '; } else { + my @standardnames = &Apache::loncommon::get_standard_codeitems(); my $lasttitle = $numtitles; if ($numtitles > 4) { $lasttitle = 4; } - $r->print('
'.$codetitles[0].'
'."\n". - ''); + $output .= ''; for (my $i=1; $i<$numtitles; $i++) { - $r->print('' - ); + ''."\n"; } - $r->print('
'.$codetitles[0].'
'."\n". + '		'.$codetitles[$i].'
'."\n". - '		'.$codetitles[$i].'
'."\n". + ''."\n". - '
'); + $output .= '
'; if ($numtitles > 4) { - $r->print('

'.$codetitles[$numtitles].'
'."\n". - ''."\n". ''."\n". - ''."\n"); + ''."\n"; } } } else { - $r->print($lt{'enin'}.':  - '); + $output .= $lt{'enin'}.':  + '; } } if ($ctitle) { - $r->print('
'.$lt{'titl'}.': '.$ctitle.''); + $output .= '
'.$lt{'titl'}.': '.$ctitle. + '&').'" />'."\n"; } else { - $r->print('
'.$lt{'enct'}.':  - '); + $output .= '
'.$lt{'enct'}.':  + '."\n"; } - $r->print(< -
-
-
-
- - - - -
$lt{'secn'}: -
- 		- - - -
-END + $output .= &Apache::lonhtmlcommon::row_closure(); + $num ++; + $i = $num%2; + $output .= &Apache::lonhtmlcommon::row_title($lt{'secn'},undef,$css[$i]); if ($sectionlist) { - $r->print("". + " \n"; foreach my $id (sort(keys(%groupid))) { if ($id eq $groupid{$id} || $groupid{$id} eq '') { - $r->print(" \n"); + $output .= " \n"; } else { - $r->print(" \n"); + $output .= " \n"; } } - $r->print(""); + $output .= ""; } else { - $r->print(""); + $output .= ''; } - $r->print(< -
-
-
-
- - - - -
$lt{'subj'} -
- 		- - - - -
- -
-
-
-
- - - - -
$lt{'detd'}: -
- 		- - - - -
- -
-
-
-
- - - - -
$lt{'opfi'}: -
- 		- - - - -
-
$lt{'uplf'} -
-
-
-
- - - - -
$lt{'fini'}: -
- 		+ $output .= &Apache::lonhtmlcommon::row_title($lt{'fini'},undef,$css[$i]); + $output .= <
- -   + +     - +
-
-
-
- - - +END + $output .= &Apache::lonhtmlcommon::row_closure(1); + $output .= &Apache::lonhtmlcommon::end_pick_box(); + $r->print(< +
END $r->print(&Apache::loncommon::end_page()); return; @@ -676,73 +473,159 @@ sub print_request_receipt { my @cookievars = ('lonID'); my $admin = $Apache::lonnet::perlvar{'lonAdminMail'}; - my $to = $Apache::lonnet::perlvar{'lonSupportEMail'}; + my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; + my $defdom = &get_domain(); + my $to = &Apache::loncommon::build_recipient_list(undef,'helpdeskmail', + $defdom,$origmail); my $from = $admin; + my $bcc; + my %domconfig = + &Apache::lonnet::get_dom('configuration',['contacts'],$defdom); + if (ref($domconfig{'contacts'}) eq 'HASH') { + if (exists($domconfig{'contacts'}{'helpdeskmail'})) { + if (ref($domconfig{'contacts'}{'helpdeskmail'}) eq 'HASH') { + my $bccmail = $domconfig{'contacts'}{'helpdeskmail'}{'bcc'}; + if ($bccmail ne '') { + my @bccs = split(/,/,$bccmail); + my @ok_bccs; + foreach my $bcc (@bccs) { + $bcc =~ s/^\s+//g; + $bcc =~ s/\s+$//g; + if ($bcc =~ m/^[^\@]+\@[^\@]+$/) { + if (!(grep(/^\Q$bcc\E$/,@ok_bccs))) { + push(@ok_bccs,$bcc); + } + } + } + if (@ok_bccs > 0) { + $bcc = join(', ',@ok_bccs); + } + } + } + } + } my $reporttime = &Apache::lonlocal::locallocaltime(time); - my $fontcolor = &Apache::loncommon::designparm($function.'.font'); - my $vlinkcolor = &Apache::loncommon::designparm($function.'.vlink'); - my $tablecolor = &Apache::loncommon::designparm($function.'.tabbg'); 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'}; if ($coursecode eq '') { - if (defined($env{'form.Year'})) { - $coursecode .= $env{'form.Year'}; - } - if (defined($env{'form.Semester'})) { - $coursecode .= $env{'form.Semester'}; - } - if (defined($env{'form.Department'})) { - $coursecode .= $env{'form.Department'}; - } - if (defined($env{'form.Number'})) { - $coursecode .= $env{'form.Number'}; + my $totcodes = 0; + my %coursecodes; + $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$defdom,$totcodes); + my $coursecode; + my @standardnames = &Apache::loncommon::get_standard_codeitems(); + if ($totcodes > 0) { + $coursecode = &Apache::courseclassifier::instcode_from_selectors($defdom); + } + if ($coursecode eq '') { + foreach my $item (@standardnames) { + if ((defined($env{'form.'.$item})) && ($env{'form.'.$item} ne '-1')) { + $coursecode .= $env{'form.'.$item}; + } + } } } 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', + username => 'Name', + email => 'E-mail', + cc => 'Cc', + user => 'Username/domain', + phone => 'Phone', + crsi => 'Course Information', + subject => 'Subject', + description => 'Description', + sourceurl => 'URL', + 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| -$lt{'name'}: $env{'form.username'} + my (@ok_ccs,@bad_ccs,$badccmsg,$okcclist); + if ((defined($env{'user.name'})) && (defined($env{'form.cc'}))) { + my @ccs; + if ($env{'form.cc'} =~ /,/) { + @ccs = split(/,/,$env{'form.cc'}); + } else { + $env{'form.cc'} =~ s/^\s+//; + $env{'form.cc'} =~ s/\s+$//; + @ccs = $env{'form.cc'}; + } + foreach my $cc (@ccs) { + $cc =~ s/^\s+//g; + $cc =~ s/\s+$//g; + if ($cc =~ m/^[^\@]+\@[^\@]+$/) { + if (!(grep(/^\Q$cc\E$/,@ok_ccs))) { + push(@ok_ccs,$cc); + } + } elsif ($cc ne '') { + if (!(grep(/^\Q$cc\E$/,@bad_ccs))) { + push(@bad_ccs,$cc); + } + } + } + if (@ok_ccs > 0) { + $okcclist = join(', ',@ok_ccs); + } + if (@bad_ccs == 1) { + $badccmsg .= '
'.&mt('The following Cc e-mail address is invalid: ').$bad_ccs[0]; + } elsif (@bad_ccs > 1) { + my $bad_cc_string = join(', ',@bad_ccs); + $badccmsg .= '
'.&mt('The following Cc e-mail addresses are invalid: ').$bad_cc_string; + } + } + $env{'form.user'} = "'".$env{'form.uname'}.':'.$env{'form.udom'}."'"; + $env{'form.crsi'} = $env{'form.title'}.' - '.$coursecode.' - '.$lt{'sect'}.': '.$env{'form.section'}; + my $supportmsg = <#g; - my $displaymsg = qq| -$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
- |; +END + my $displaymsg; + foreach my $item ('username','email','cc','user','phone','crsi','subject','description','sourceurl') { + if ($env{'form.'.$item} ne '') { + if ($item eq 'description') { + my $descrip = $env{'form.description'}; + $descrip = &cleanup_html($descrip); + $descrip =~ s|[\n\r\f]|
|g; + $displaymsg .= + ''. + "$lt{$item}: $descrip
\n"; + } elsif ($item eq 'sourceurl') { + my $showurl = $env{'form.sourceurl'}; + $showurl =~ s/\?.*$//; + $showurl = &cleanup_html($showurl); + $displaymsg .= + ''. + "$lt{$item}: $showurl
\n"; + } elsif ($item eq 'cc') { + $displaymsg .= + ''. + "$lt{$item}: $okcclist
\n"; + } else { + my $showitem = $env{'form.'.$item}; + $showitem = &cleanup_html($showitem); + $displaymsg .= + ''. + "$lt{$item}: $showitem
\n"; + } + } + } + $displaymsg .= ''. + $lt{'date'}.': '.$reporttime.'
'."\n"; my $start_page = &Apache::loncommon::start_page('Support request recorded',undef, @@ -756,43 +639,71 @@ $lt{'date'}: $reporttime $r->print(<<"END"); $start_page - + END if ($r->uri eq '/adm/helpdesk') { &print_header($r,$url,'process'); } - if ($to =~ m/^[^\@]+\@[^\@]+$/) { - $r->print('

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

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

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

'); + my $bad_email = 0; + if ($to =~ /,/) { + my @ok_email; + foreach my $email (split(/,/,$to)) { + if ($email =~ m/^[^\@]+\@[^\@]+$/) { + if (!grep(/^\Q$email\E$/,@ok_email)) { + push(@ok_email,$email); + } + } + } + if (@ok_email > 0) { + $to = join(',',@ok_email); + } elsif ($admin =~ m/^[^\@]+\@[^\@]+$/) { + $to = $admin; } else { - $r->print(' + $bad_email = 1; + } + } elsif ($to !~ m/^[^\@]+\@[^\@]+$/) { + if ($admin =~ m/^[^\@]+\@[^\@]+$/) { + $to = $admin; + } else { + $bad_email = 1; + } + } + if ($bad_email) { + $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'; - } + } else { + $r->print('

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

'); } if (defined($env{'form.email'})) { + $env{'form.email'} =~ s/^\s+//; + $env{'form.email'} =~ s/\s+$//; if ($env{'form.email'} =~ m/^[^\@]+\@[^\@]+$/) { $from = $env{'form.email'}; } } + if (defined($env{'form.cc'})) { + if ($badccmsg) { + $displaymsg .= $badccmsg; + } + } + my $subject = $env{'form.subject'}; - $subject =~ s#(`)#'#g; - $subject =~ s#\$#\(\$\)#g; - $supportmsg =~ s#(`)#'#g; - $supportmsg =~ s#\$#\(\$\)#g; - $displaymsg =~ s#(`)#'#g; - $displaymsg =~ s#\$#\(\$\)#g; + $subject =~ s/(`)/'/g; + $subject =~ s/\$/\(\$\)/g; + $supportmsg =~ s/(`)/'/g; + $supportmsg =~ s/\$/\(\$\)/g; + $displaymsg =~ s/(`)/'/g; + $displaymsg =~ s/\$/\(\$\)/g; my $fname; my $attachmentpath = ''; my $attachmentsize = ''; - if (defined($env{'user.name'})) { + if ((defined($env{'user.name'})) && ($env{'user.name'} ne 'public') + && ($env{'user.domain'} ne 'public')) { if ($env{'form.screenshot.filename'}) { $attachmentsize = length($env{'form.screenshot'}); if ($attachmentsize > 131072) { @@ -811,7 +722,12 @@ END if ($attachmentpath =~ m-/([^/]+)$-) { $fname = $1; - $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'}); + $displaymsg .= '
' + .&mt('An uploaded screenshot file [_1] ([_2] bytes) was included in the request sent by [_3].' + ,''.$fname.'' + ,$attachmentsize + ,$env{'user.name'}.':'.$env{'user.domain'} + ); $supportmsg .= "\n"; foreach my $var (@cookievars) { $supportmsg .= "$var: $cookies{$var}\n"; @@ -831,6 +747,13 @@ END Type =>'TEXT', Data => $supportmsg, ); + if (@ok_ccs > 0) { + my $cc_string = join(', ',@ok_ccs); + $msg->add("Cc" => $cc_string); + } + if ($bcc ne '') { + $msg->add("Bcc" => $bcc); + } if ($attachmentpath) { my ($type, $encoding) = MIME::Types::by_suffix($attachmentpath); @@ -860,140 +783,78 @@ END ### Send it: $msg->send('sendmail'); - if ($attachmentpath =~ m#$Apache::lonnet::perlvar{'lonDaemons'}/tmp/helprequests/(\d+)/[^/]+#) { + if ($attachmentpath =~ m|$Apache::lonnet::perlvar{'lonDaemons'}/tmp/helprequests/(\d+)/[^/]+|) { unlink($attachmentpath); } - $r->print(qq| - $lt{'your'}:

- - - - -
- - - - -
- - - - -
- - - - - - - - - - - - -
- - - - -
$lt{'info'} -
- 		- - - - -
$displaymsg
-
-
-
- - - - -
$lt{'adin'} -
- 		- - - - -
- |); + $r->print(''.$lt{'your'}.':

'."\n"); + $r->print('
'. + &Apache::lonhtmlcommon::start_pick_box(). + &Apache::lonhtmlcommon::row_title($lt{'info'},undef,'LC_oddrow_value')."\n".$displaymsg."\n". + &Apache::lonhtmlcommon::row_closure(). + &Apache::lonhtmlcommon::row_title($lt{'adin'},undef,'LC_evenrow_value')); + my $envmsg; foreach my $var (@cookievars) { - unless($cookies{$var} eq '') { - $r->print("$var: $cookies{$var}, "); + if ($cookies{$var} ne '') { + $envmsg.= ''. + $var.': '.$cookies{$var}.', '; } } foreach my $var (@ENVvars) { - unless($ENV{$var} eq '') { - $r->print("$var: $ENV{$var}, "); + if ($ENV{$var} ne '') { + $envmsg .= ''. + $var.': '.$ENV{$var}.', '; } } foreach my $var (@envvars) { - unless($env{$var} eq '') { - $r->print("$var: $env{$var}, "); + if ($env{$var} ne '') { + $envmsg .= ''. + $var.': '.$env{$var}.', '; } } - $r->print(" -
-
-
-
-
- "); - $r->print(&Apache::loncommon::end_page()); + $envmsg =~ s/, $//; + $r->print($envmsg."\n". + &Apache::lonhtmlcommon::row_closure(1)."\n". + &Apache::lonhtmlcommon::end_pick_box(). + "\n". + &Apache::loncommon::end_page()); } sub print_header { - my ($r,$origurl,$action) = @_; + my ($r,$origurl,$command) = @_; my $location=&Apache::loncommon::lonhttpdurl("/adm"); - my $tablecolor = '#EEEE99'; my ($component_url); my $helpdesk_link = ''; - if ($action eq 'process') { + if ($command eq 'process') { $helpdesk_link = ''; } my %lt = &Apache::lonlocal::texthash ( login => 'Log-in help', ask => 'Ask helpdesk', getst => 'Getting started guide', - back => 'Back to last location' + back => 'Back to last location', + headline => 'help/support', ); - my ($getstartlink,$getstarttext); + my ($getstartlink,$reviewtext); if (-e $Apache::lonnet::perlvar{'lonDocRoot'}.'/adm/gettingstarted.html') { $getstartlink = qq| $lt{'getst'}|; - $getstarttext = ' '.&mt('and the "Getting started" guide').' '; + $reviewtext = &mt('Please review the information in "Log-in help" and the "Getting started" guide if you are unable to log-in.'); + } else { + $reviewtext = &mt('Please review the information in "Log-in help" if you are unable to log-in.'); } $r->print(<   -
  LON-CAPA help/support - - - - +
+ + + LON-CAPA $lt{'headline'} + +
- - - - -
- - - - -
- - - - $getstartlink - - -
($lt{'login'}) $lt{'login'} $helpdesk_link($lt{'ask'}) $lt{'ask'}  ($lt{'back'}) $lt{'back'} 
-
-
-
+ + + $getstartlink + +
@@ -1003,11 +864,14 @@ sub print_header {   END - unless ($action eq 'process') { + if ($command ne 'process') { $r->print(' - '.&mt(' -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').'.

+ '.$reviewtext.' ' +.&mt('If your problem is still unresolved, the form below can be used to send a question to the LON-CAPA helpdesk.').'
' +.''.&mt('Students').': '.&mt('Do not use this form to ask questions about course content.').' ' +.&mt('Contact your instructor instead.') +.'

'); } @@ -1016,4 +880,36 @@ Please review the information in "Log-in return; } +sub get_domain { + my $codedom; + if (exists($env{'form.codedom'})) { + $codedom = $env{'form.codedom'}; + } elsif ($env{'request.course.id'}) { + $codedom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + } elsif ($env{'request.role.domain'}) { + $codedom = $env{'request.role.domain'}; + } else { + $codedom = &Apache::lonnet::default_login_domain(); + } + return $codedom; +} + +sub cleanup_html { + my ($incoming) = @_; + my $outgoing; + if ($incoming ne '') { + $outgoing = $incoming; + $outgoing =~ s/\#/#/g; + $outgoing =~ s/\&/&/g; + $outgoing =~ s//>/g; + $outgoing =~ s/\(/(/g; + $outgoing =~ s/\)/)/g; + $outgoing =~ s/"/"/g; + $outgoing =~ s/'/'/g; + $outgoing =~ s/\$/$/g; + } + return $outgoing; +} + 1;