'.$codetitles[0].'
'."\n".
'";
} else {
- $output .= '';
+ $output .= ''."\n";
}
$output .= &Apache::lonhtmlcommon::row_closure();
$num ++;
@@ -447,16 +481,32 @@ function initialize_codes() {
' '."\n".
&Apache::lonhtmlcommon::row_closure().
&Apache::lonhtmlcommon::row_title($lt{'detd'},undef,'LC_evenrow_value').
- ' '.
+ ' '."\n".
&Apache::lonhtmlcommon::row_closure();
$num ++;
$i = $num%2;
if (($env{'user.name'} =~ /^$match_username$/) && (!$public)) {
- $output .= &Apache::lonhtmlcommon::row_title($lt{'opfi'},undef,$css[$i]).
- '
'.$lt{'uplf'}."\n".
- &Apache::lonhtmlcommon::row_closure();
- $num ++;
- $i = $num%2;
+ if ($homeserver) {
+ $output .= &Apache::lonhtmlcommon::row_title($lt{'opfi'},undef,$css[$i]).
+ '
'.
+ "\n".$lt{'uplf'}."\n".
+ &Apache::lonhtmlcommon::row_closure();
+ $num ++;
+ $i = $num%2;
+ }
+ } else {
+ my $lonhost = $r->dir_config('lonHostID');
+ my ($captchaform,$error) =
+ &Apache::loncommon::captcha_display('login',$lonhost);
+ if ($captchaform) {
+ $output .= &Apache::lonhtmlcommon::row_title(&mt('Validation'),undef,
+ $css[$i])."\n".
+ $captchaform."\n".
+ &Apache::lonhtmlcommon::row_closure();
+ $num ++;
+ $i = $num%2;
+ }
}
$output .= &Apache::lonhtmlcommon::row_title($lt{'fini'},undef,$css[$i]);
$output .= <dir_config('lonHostID');
+ my ($captcha_chk,$captcha_error) =
+ &Apache::loncommon::captcha_response('login',$lonhost);
+ if ($captcha_chk != 1) {
+ $r->print(&Apache::loncommon::start_page('Support request failed',undef,
+ {'function' => $function,
+ 'add_entries' => {
+ topmargin => "0",
+ marginheight => "0",
+ },
+ 'only_body' => 1,}));
+ if ($r->uri eq '/adm/helpdesk') {
+ &print_header($r,$url,'process');
+ }
+ $r->print(''.&mt('Support request failed').''.
+ ''.
+ &mt('Validation of the code you entered failed.').
+ &Apache::loncommon::end_page());
+ return;
+ }
+ }
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');
@@ -565,8 +641,15 @@ sub print_request_receipt {
adin => 'Additional information recorded',
);
- my (@ok_ccs,@bad_ccs,$badccmsg,$okcclist);
- if ((defined($env{'user.name'})) && (defined($env{'form.cc'}))) {
+ my (@ok_ccs,@bad_ccs,$badccmsg,$okcclist,$homeserver);
+ unless ($public) {
+ if (($env{'user.name'} ne '') && ($env{'user.domain'} ne '')) {
+ $homeserver = &Apache::lonnet::homeserver($env{'user.name'},
+ $env{'user.domain'});
+ }
+ }
+
+ if (($homeserver) && (defined($env{'form.cc'}))) {
my @ccs;
if ($env{'form.cc'} =~ /,/) {
@ccs = split(/,/,$env{'form.cc'});
@@ -592,10 +675,11 @@ sub print_request_receipt {
$okcclist = join(', ',@ok_ccs);
}
if (@bad_ccs == 1) {
- $badccmsg .= '
'.&mt('The following Cc e-mail address is invalid: ').$bad_ccs[0];
+ if ($bad_ccs[0] ne '') {
+ $badccmsg .= '
'.&mt('The following Cc e-mail address is invalid: ').&cleanup_html($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;
+ $badccmsg .= '
'.&mt('The following Cc e-mail addresses are invalid: '). &cleanup_html(join(', ',@bad_ccs));
}
}
$env{'form.user'} = "'".$env{'form.uname'}.':'.$env{'form.udom'}."'";
@@ -631,9 +715,12 @@ END
''.
"$lt{$item}: $showurl
\n";
} elsif ($item eq 'cc') {
- $displaymsg .=
- ''.
- "$lt{$item}: $okcclist
\n";
+ if ($okcclist) {
+ my $showcclist = &cleanup_html($okcclist);
+ $displaymsg .=
+ ''.
+ "$lt{$item}: $showcclist
\n";
+ }
} else {
my $showitem = $env{'form.'.$item};
$showitem = &cleanup_html($showitem);
@@ -727,9 +814,8 @@ END
my $attachmentpath = '';
my $attachmentsize = '';
- if ((defined($env{'user.name'})) && ($env{'user.name'} ne 'public')
- && ($env{'user.domain'} ne 'public')) {
- if ($env{'form.screenshot.filename'}) {
+ if ((defined($env{'user.name'})) && (!$public)) {
+ if ($homeserver && $env{'form.screenshot.filename'}) {
$attachmentsize = length($env{'form.screenshot'});
if ($attachmentsize > 131072) {
$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);
@@ -772,9 +858,11 @@ END
Type =>'TEXT',
Data => $supportmsg,
);
- if (@ok_ccs > 0) {
- my $cc_string = join(', ',@ok_ccs);
- $msg->add("Cc" => $cc_string);
+ if ($homeserver) {
+ if (@ok_ccs > 0) {
+ my $cc_string = join(', ',@ok_ccs);
+ $msg->add("Cc" => $cc_string);
+ }
}
if ($bcc ne '') {
$msg->add("Bcc" => $bcc);
@@ -782,7 +870,7 @@ END
$msg->attr("content-type" => "text/plain");
$msg->attr("content-type.charset" => "UTF-8");
- if ($attachmentpath) {
+ if ($homeserver && $attachmentpath) {
my ($type, $encoding) = MIME::Types::by_suffix($attachmentpath);
$msg->attach(Type => $type,
Path => $attachmentpath,
@@ -855,11 +943,14 @@ sub print_header {
$helpdesk_link = '';
}
my %lt = &Apache::lonlocal::texthash (
- login => 'Log-in help',
- ask => 'Ask helpdesk',
- getst => 'Getting started guide',
- back => 'Back to last location',
+ login => 'Log-in help',
+ ask => 'Ask helpdesk',
+ getst => 'Getting started guide',
+ back => 'Back to last location',
headline => 'help/support',
+ stud => 'Students',
+ ifyo => 'If your problem is still unresolved, the form below can be used to send a question to the LON-CAPA helpdesk.',
+ cont => 'Contact your instructor instead.',
);
my ($getstartlink,$reviewtext);
if (-e $Apache::lonnet::perlvar{'lonDocRoot'}.'/adm/gettingstarted.html') {
@@ -868,42 +959,54 @@ sub print_header {
} else {
$reviewtext = &mt('Please review the information in "Log-in help" if you are unable to log-in.');
}
+ my $linkback;
if ($origurl eq '') {
- $origurl = 'javascript:history.go(-1)';
+ $linkback = 'javascript:history.go(-1)';
+ } else {
+ $linkback = &HTML::Entities::encode($origurl,'"<>&');
}
- $r->print(< | |
-
+ my $loginhelp = &Apache::lonauth::loginhelpdisplay();
+ if ($loginhelp eq '') {
+ $loginhelp = '/adm/loginproblems.html';
+ }
+ $r->print(<<"END");
+
+
+ | |
+
|
- |
+ |
-
- | |
+
+ | |
END
if ($command ne 'process') {
- $r->print('
+ my $stuwarn = &mt('Do [_1]not[_2] use this form to ask about course content.',
+ '','');
+ $r->print(<<"END");
- '.$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.')
-.'
+ | $reviewtext
+ $lt{'ifyo'}
+$lt{'stud'}:
+$stuwarn $lt{'cont'}
+
|
- ');
+
+END
}
$r->print('
');
@@ -913,8 +1016,11 @@ END
sub get_domain {
my $codedom;
if (exists($env{'form.codedom'})) {
- $codedom = $env{'form.codedom'};
- } elsif ($env{'request.course.id'}) {
+ if (&Apache::lonnet::domain($env{'form.codedom'}) ne '') {
+ return $env{'form.codedom'};
+ }
+ }
+ if ($env{'request.course.id'}) {
$codedom = $env{'course.'.$env{'request.course.id'}.'.domain'};
} elsif ($env{'request.role.domain'}) {
$codedom = $env{'request.role.domain'};
@@ -929,6 +1035,7 @@ sub cleanup_html {
my $outgoing;
if ($incoming ne '') {
$outgoing = $incoming;
+ $outgoing =~ s/;/;/g;
$outgoing =~ s/\#/#/g;
$outgoing =~ s/\&/&/g;
$outgoing =~ s/ | |