version 1.79.2.2, 2017/01/23 01:56:26
|
version 1.80, 2015/06/18 20:19:06
|
Line 79 sub handler {
|
Line 79 sub handler {
|
} |
} |
return OK; |
return OK; |
} |
} |
|
|
sub print_request_form { |
sub print_request_form { |
my ($r,$origurl,$function) = @_; |
my ($r,$origurl,$function) = @_; |
my ($os,$browser,$bversion,$uname,$udom,$uhome,$urole,$usec,$email,$cid, |
my ($os,$browser,$bversion,$uhost,$uname,$udom,$uhome,$urole,$usec,$email,$cid, |
$cdom,$cnum,$ctitle,$ccode,$sectionlist,$lastname,$firstname,$server, |
$cdom,$cnum,$ctitle,$ccode,$sectionlist,$lastname,$firstname,$server, |
$formname,$public,$homeserver,$knownuser,$captcha_form,$captcha_error, |
$formname,$public,$homeserver); |
$captcha,$recaptcha_version); |
|
$function = &Apache::loncommon::get_users_function() if (!$function); |
$function = &Apache::loncommon::get_users_function() if (!$function); |
$ccode = ''; |
$ccode = ''; |
$os = $env{'browser.os'}; |
$os = $env{'browser.os'}; |
$browser = $env{'browser.type'}; |
$browser = $env{'browser.type'}; |
$bversion = $env{'browser.version'}; |
$bversion = $env{'browser.version'}; |
|
$uhost = $env{'request.host'}; |
if (($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public')) { |
if (($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public')) { |
$public = 1; |
$public = 1; |
} else { |
} else { |
Line 105 sub print_request_form {
|
Line 105 sub print_request_form {
|
} |
} |
} |
} |
} |
} |
if (($env{'user.name'} =~ /^$match_username$/) && |
|
($env{'user.domain'} =~ /^$match_domain$/) && (!$public)) { |
|
$knownuser = 1; |
|
} else { |
|
my $lonhost = $r->dir_config('lonHostID'); |
|
($captcha_form,$captcha_error,$captcha,$recaptcha_version) = |
|
&Apache::loncommon::captcha_display('login',$lonhost); |
|
} |
|
if ($homeserver) { |
if ($homeserver) { |
$uhome = $env{'user.home'}; |
$uhome = $env{'user.home'}; |
$urole = $env{'request.role'}; |
$urole = $env{'request.role'}; |
Line 153 sub print_request_form {
|
Line 145 sub print_request_form {
|
subj => 'Subject', |
subj => 'Subject', |
detd => 'Detailed Description', |
detd => 'Detailed Description', |
opfi => 'Optional file upload', |
opfi => 'Optional file upload', |
uplf => 'Upload a file (e.g., a screenshot) relevant to your help request (128 KB max.)', |
uplf => 'Upload a file (e.g., a screenshot) relevant to your help request (1 MB max.)', |
fini => 'Finish', |
fini => 'Finish', |
clfm => 'Clear Form', |
clfm => 'Clear Form', |
); |
); |
Line 269 function initialize_codes() {
|
Line 261 function initialize_codes() {
|
my $allidlist = $idlist{$codetitles[0]}; |
my $allidlist = $idlist{$codetitles[0]}; |
$jscript .= &Apache::courseclassifier::courseset_js_start($formname,$longtitles_str,$allidlist); |
$jscript .= &Apache::courseclassifier::courseset_js_start($formname,$longtitles_str,$allidlist); |
$jscript .= $scripttext; |
$jscript .= $scripttext; |
$jscript .= &Apache::courseclassifier::javascript_code_selections($formname,\@codetitles); |
$jscript .= &Apache::courseclassifier::javascript_code_selections($formname,@codetitles); |
$loaditems = ''; |
$loaditems = ''; |
} |
} |
} |
} |
Line 283 $jscript
|
Line 275 $jscript
|
$loaditems |
$loaditems |
// ]]> |
// ]]> |
</script> |
</script> |
|
<script type="text/javascript" src="/res/adm/includes/file_upload.js"></script> |
ENDJS |
ENDJS |
if ($recaptcha_version >=2) { |
|
$js.= "\n".'<script src="https://www.google.com/recaptcha/api.js"></script>'."\n"; |
|
} |
|
my %add_entries = ( |
my %add_entries = ( |
style => "margin-top:0px;margin-bottom:0px;", |
style => "margin-top:0px;margin-bottom:0px;", |
onload => "initialize_codes();", |
onload => "initialize_codes();", |
Line 340 ENDJS
|
Line 330 ENDJS
|
&Apache::lonhtmlcommon::row_closure(); |
&Apache::lonhtmlcommon::row_closure(); |
$num ++; |
$num ++; |
$i = $num%2; |
$i = $num%2; |
if ($knownuser) { |
if (($env{'user.name'} =~ /^$match_username$/) && (!$public)) { |
if ($homeserver) { |
if ($homeserver) { |
$output .= &Apache::lonhtmlcommon::row_title($html_lt{'emac'},undef,$css[$i]). |
$output .= &Apache::lonhtmlcommon::row_title($html_lt{'emac'},undef,$css[$i]). |
'<input type="text" size="50" name="cc" value="" /><br />'."\n". |
'<input type="text" size="50" name="cc" value="" /><br />'."\n". |
Line 354 ENDJS
|
Line 344 ENDJS
|
&HTML::Entities::encode($udom,'"<>&').'" />'."\n"; |
&HTML::Entities::encode($udom,'"<>&').'" />'."\n"; |
my $uname_input = '<input type="hidden" name="uname" value="'. |
my $uname_input = '<input type="hidden" name="uname" value="'. |
&HTML::Entities::encode($uname,'"<>&').'" />'."\n"; |
&HTML::Entities::encode($uname,'"<>&').'" />'."\n"; |
if ($knownuser) { |
if (($env{'user.name'} =~ /^$match_username$/) && |
|
($env{'user.domain'} =~ /^$match_domain$/) && (!$public)) { |
$output .= '<i>'.$html_lt{'unme'}.'</i>: '.$uname.' <i>'.$html_lt{'doma'}.'</i>: '.$udom.$udom_input.$uname_input; |
$output .= '<i>'.$html_lt{'unme'}.'</i>: '.$uname.' <i>'.$html_lt{'doma'}.'</i>: '.$udom.$udom_input.$uname_input; |
} else { |
} else { |
my $udomform = ''; |
my $udomform = ''; |
Line 514 ENDJS
|
Line 505 ENDJS
|
&Apache::lonhtmlcommon::row_closure(); |
&Apache::lonhtmlcommon::row_closure(); |
$num ++; |
$num ++; |
$i = $num%2; |
$i = $num%2; |
if ($knownuser) { |
if (($env{'user.name'} =~ /^$match_username$/) && (!$public)) { |
if ($homeserver) { |
if ($homeserver) { |
$output .= &Apache::lonhtmlcommon::row_title($html_lt{'opfi'},undef,$css[$i]). |
$output .= &Apache::lonhtmlcommon::row_title($html_lt{'opfi'},undef,$css[$i]) |
' <input type="file" name="screenshot" size="20" /><br />'. |
.' <input type="file" name="screenshot" class="flUpload" size="20" />' |
"\n".$html_lt{'uplf'}."\n". |
.'<input type="hidden" id="free_space" value="1048576" />' |
&Apache::lonhtmlcommon::row_closure(); |
.'<br />'."\n".$html_lt{'uplf'}."\n" |
|
.&Apache::lonhtmlcommon::row_closure(); |
$num ++; |
$num ++; |
$i = $num%2; |
$i = $num%2; |
} |
} |
} else { |
} else { |
if ($captcha_form) { |
my $lonhost = $r->dir_config('lonHostID'); |
|
my ($captchaform,$error) = |
|
&Apache::loncommon::captcha_display('login',$lonhost); |
|
if ($captchaform) { |
$output .= &Apache::lonhtmlcommon::row_title( |
$output .= &Apache::lonhtmlcommon::row_title( |
'<span title="'.&mt('required').'">'. |
'<span title="'.&mt('required').'">'. |
&mt('Validation'). |
&mt('Validation'). |
' <span class="LC_info">*</span></span>' |
' <span class="LC_info">*</span></span>' |
,undef,$css[$i]). |
,undef,$css[$i]). |
$captcha_form."\n". |
$captchaform."\n". |
&Apache::lonhtmlcommon::row_closure(); |
&Apache::lonhtmlcommon::row_closure(); |
$num ++; |
$num ++; |
$i = $num%2; |
$i = $num%2; |
Line 850 END
|
Line 845 END
|
if ((defined($env{'user.name'})) && (!$public)) { |
if ((defined($env{'user.name'})) && (!$public)) { |
if ($homeserver && $env{'form.screenshot.filename'}) { |
if ($homeserver && $env{'form.screenshot.filename'}) { |
$attachmentsize = length($env{'form.screenshot'}); |
$attachmentsize = length($env{'form.screenshot'}); |
if ($attachmentsize > 131072) { |
if ($attachmentsize > 1048576) { |
$displaymsg .= '<br /><span class="LC_warning">'. |
$displaymsg .= '<br /><span class="LC_warning">'. |
&mt('The uploaded screenshot file ([_1] bytes) included with your request exceeded the maximum allowed size - 128 KB, and has therefore been discarded.',$attachmentsize).'</span>'; |
&mt('The uploaded screenshot file ([_1] bytes) included with your request exceeded the maximum allowed size - 1 MB, and has therefore been discarded.',$attachmentsize).'</span>'; |
} else { |
} else { |
$attachmentpath=&Apache::lonnet::userfileupload('screenshot',undef,'helprequests'); |
$attachmentpath=&Apache::lonnet::userfileupload('screenshot',undef,'helprequests'); |
} |
} |