--- loncom/interface/lonsupportreq.pm 2006/12/22 20:51:27 1.42 +++ loncom/interface/lonsupportreq.pm 2007/09/05 05:46:19 1.44 @@ -1,5 +1,5 @@ # -# $Id: lonsupportreq.pm,v 1.42 2006/12/22 20:51:27 albertel Exp $ +# $Id: lonsupportreq.pm,v 1.44 2007/09/05 05:46:19 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -32,6 +32,7 @@ use MIME::Lite; use CGI::Cookie(); use Apache::Constants qw(:common); use Apache::loncommon(); +use Apache::lonhtmlcommon; use Apache::lonnet; use Apache::lonlocal; use Apache::lonacc(); @@ -57,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); @@ -70,10 +71,7 @@ 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'}; @@ -92,6 +90,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', @@ -102,7 +102,9 @@ sub print_request_form { 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.', + 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', @@ -116,7 +118,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', ); @@ -138,31 +140,10 @@ function validate() { } 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 reg1 = new RegExp(reg1str); - var reg2 = new RegExp(reg2str); - if (!reg1.test(str) && reg2.test(str)) { - return true; - } - return false; - } - else - { - if(str.indexOf("@") >= 0) { - return true; - } - return false; - } -} -END - - if ($cid =~ m/_/) { - ($cdom,$cnum) = split(/_/,$cid); + $scripttag .= &Apache::lonhtmlcommon::javascript_valid_email(); + 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); @@ -170,10 +151,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'}) { @@ -246,118 +229,60 @@ 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 + $output .= &Apache::lonhtmlcommon::row_closure(). + &Apache::lonhtmlcommon::row_title($lt{'subj'},undef,'LC_evenrow_value'). + ' '."\n". + &Apache::lonhtmlcommon::row_closure(). + &Apache::lonhtmlcommon::row_title($lt{'detd'},undef,'LC_oddrow_value'). + ' '. + &Apache::lonhtmlcommon::row_closure(); + my $lastrow = 'LC_evenrow_value'; if (defined($env{'user.name'})) { - $r->print(< - - - - - - -END + $output .= &Apache::lonhtmlcommon::row_title($lt{'opfi'},undef,'LC_evenrow_value'). + '
'.$lt{'uplf'}."\n". + &Apache::lonhtmlcommon::row_closure(); + $lastrow = 'LC_oddrow_value'; } - - $r->print(< - -
- - - - -
$lt{'name'}: -
- 		- - - - -
-END + $r->print(''."\n"); + my $output = &Apache::lonhtmlcommon::start_pick_box(). + &Apache::lonhtmlcommon::row_title($lt{'name'},undef,'LC_oddrow_value')."\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". + &Apache::lonhtmlcommon::row_title($lt{'emad'},undef,'LC_evenrow_value'). + '&').'" />
'."\n". + &Apache::lonhtmlcommon::row_closure(). + &Apache::lonhtmlcommon::row_title("$lt{'unme'}/$lt{'doma'}",undef,'LC_oddrow_value'); + 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; @@ -369,105 +294,41 @@ 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 + $output .= &Apache::lonhtmlcommon::row_closure(). + &Apache::lonhtmlcommon::row_title("$lt{'urlp'}",undef,'LC_evenrow_value'). + $showserver.'&').'" />'. + &Apache::lonhtmlcommon::row_closure(). + &Apache::lonhtmlcommon::row_title("$lt{'phon'}",undef,'LC_oddrow_value'). + '
'. + &Apache::lonhtmlcommon::row_closure(). + &Apache::lonhtmlcommon::row_title("$lt{'crsd'}$details_title",undef,'LC_evenrow_value'); 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 $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(). + &Apache::lonhtmlcommon::row_title($lt{'secn'},undef,'LC_oddrow_value'); 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,$lastrow); + $output .= <
- -   + +     - +
-
-
-
- - - +END + $output .= &Apache::lonhtmlcommon::row_closure(1); + $output .= &Apache::lonhtmlcommon::end_pick_box(); + $r->print(< +
END $r->print(&Apache::loncommon::end_page()); return; @@ -700,9 +453,6 @@ sub print_request_receipt { my $to = $Apache::lonnet::perlvar{'lonSupportEMail'}; my $from = $admin; 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); @@ -722,48 +472,62 @@ sub print_request_receipt { } } 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 => 'Email', + 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'} + + $env{'form.user'} = "'".$env{'form.uname'}.':'.$env{'form.udom'}."'"; + $env{'form.csri'} = $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','user','phone','crsi','subject','description','sourceurl') { + if ($env{'form.'.$item} ne '') { + if ($item eq 'description') { + my $descrip = $env{'form.description'}; + $descrip =~ s|\n|
|g; + $displaymsg .= + ''. + "$lt{$item}: $descrip
\n"; + } elsif ($item eq 'sourceurl') { + my $showurl = $env{'form.sourceurl'}; + $showurl =~ s/\?.*$//; + $displaymsg .= + ''. + "$lt{$item}: $showurl
\n"; + } else { + $displaymsg .= + ''. + "$lt{$item}: $env{'form.'.$item}
\n"; + } + } + } + $displaymsg .= ''. + $lt{'date'}.': '.$reporttime.'
'."\n"; my $start_page = &Apache::loncommon::start_page('Support request recorded',undef, @@ -777,7 +541,7 @@ $lt{'date'}: $reporttime $r->print(<<"END"); $start_page - + END if ($r->uri eq '/adm/helpdesk') { @@ -803,12 +567,12 @@ END } 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 = ''; @@ -832,7 +596,7 @@ 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"; @@ -881,99 +645,46 @@ 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('LC_helpform_receipt'). + &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 ( @@ -991,30 +702,12 @@ sub print_header { @@ -1024,11 +717,11 @@ sub print_header { END - unless ($action eq 'process') { + if ($command ne 'process') { $r->print(' '); }
 
  LON-CAPA help/support - - - - +
- - - - -
- - - - -
- - - - $getstartlink - - -
($lt{'login'}) $lt{'login'} $helpdesk_link($lt{'ask'}) $lt{'ask'}  ($lt{'back'}) $lt{'back'} 
-
-
-
+ + + $getstartlink + +
 
'.&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').'.

+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('Students').': '.&mt('Do not use this form to ask questions about course content.').' '.&mt('Contact your instructor instead.').'