version 1.94.2.1, 2010/07/30 22:40:53
|
version 1.97, 2011/11/07 20:06:29
|
Line 214 sub handler {
|
Line 214 sub handler {
|
my $lcm=1; |
my $lcm=1; |
my $contents=0; |
my $contents=0; |
my $nforms=0; |
my $nforms=0; |
|
my $nuploads=0; |
|
my %turninpaths; |
|
my %multiresps; |
|
my $turninparent; |
|
|
my %ssibody=(); |
my %ssibody=(); |
my %ssibgcolor=(); |
my %ssibgcolor=(); |
Line 352 sub handler {
|
Line 356 sub handler {
|
$nforms++; |
$nforms++; |
$output=~s/\<form[^\>]*\>//gsi; |
$output=~s/\<form[^\>]*\>//gsi; |
$output=~s/\<\/form[^\>]*\>//gsi; |
$output=~s/\<\/form[^\>]*\>//gsi; |
|
if ($output=~/\<input[^\>]+name\s*=\s*[\'\"]*HWFILE/) { |
|
$nuploads++; |
|
} |
$output=~ |
$output=~ |
s/\<((?:input|select|button|textarea)[^\>]+)name\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi; |
s/\<((?:input|select|button|textarea)[^\>]+)name\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi; |
|
if ($nuploads) { |
|
$output=~ |
|
s/\<(input[^\>]+name=\"\Q$prefix\EHWFILE[^\>]+)\s*id\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\)]*)\>/\<$1 id="$prefix$2" $3\>/gsi; |
|
($turninpaths{$prefix},$multiresps{$prefix}) = |
|
&Apache::loncommon::get_turnedin_filepath($symb,$env{'user.name'},$env{'user.domain'}); |
|
if ($turninparent eq '') { |
|
$turninparent = $turninpaths{$prefix}; |
|
$turninparent =~ s{(/[^/]+)$}{}; |
|
} |
|
} |
|
$output=~ |
|
s/\<((?:input|select)[^\>]+\Qjavascript:setSubmittedPart\E)\(\s*[\'\"]([^\'\"]+)[\'\"]*\s*\)/\<$1('$2','$prefix')/gsi; |
} |
} |
$thisdir=~s/\/[^\/]*$//; |
$thisdir=~s/\/[^\/]*$//; |
foreach (@rlinks) { |
foreach (@rlinks) { |
Line 401 sub handler {
|
Line 420 sub handler {
|
$allscript. |
$allscript. |
"\n</script>\n"; |
"\n</script>\n"; |
} |
} |
|
if (($nforms) && ($nuploads)) { |
|
$allscript .= &Apache::lonhtmlcommon::file_submissionchk_js(\%turninpaths,\%multiresps); |
|
} |
# ------------------------------------------------------------------ Start body |
# ------------------------------------------------------------------ Start body |
$r->print(&Apache::loncommon::start_page(undef,$allscript, |
$r->print(&Apache::loncommon::start_page(undef,$allscript, |
{'force_register' => 1, |
{'force_register' => 1, |
'bgcolor' => '#ffffff',})); |
'bgcolor' => '#ffffff',})); |
# ------------------------------------------------------------------ Start form |
# ------------------------------------------------------------------ Start form |
if ($nforms) { |
if ($nforms) { |
$r->print('<form name="lonhomework" method="post" enctype="multipart/form-data" action="'. |
my $fmtag = '<form name="lonhomework" method="post" enctype="multipart/form-data"'; |
|
if ($nuploads) { |
|
my $multi; |
|
if ($nuploads > 1) { |
|
$multi = 1; |
|
} |
|
$fmtag .= 'onsubmit="return file_submission_check(this,'."'$turninparent','$multi'".');"'; |
|
} |
|
$fmtag .= ' action="'. |
&Apache::lonenc::check_encrypt($requrl) |
&Apache::lonenc::check_encrypt($requrl) |
.'">'); |
.'">'; |
|
$r->print($fmtag); |
} |
} |
} elsif (($target eq 'tex') || ($target eq 'tex_answer')) { |
} elsif (($target eq 'tex') || ($target eq 'tex_answer')) { |
# I think this is not needed as the header |
# I think this is not needed as the header |
Line 553 sub handler {
|
Line 584 sub handler {
|
sub get_buttons { |
sub get_buttons { |
my ($hash,$rid) = @_; |
my ($hash,$rid) = @_; |
|
|
# which icons do we use? |
|
my $extension='png'; |
|
if ($env{'environment.icons'} eq 'classic') { $extension='gif'; } |
|
|
|
my $metainfo = ''; |
my $metainfo = ''; |
my $esrc=&Apache::lonnet::declutter($hash->{'src_'.$rid}); |
my $esrc=&Apache::lonnet::declutter($hash->{'src_'.$rid}); |
my ($mapid,$resid)=split(/\./,$rid); |
my ($mapid,$resid)=split(/\./,$rid); |
Line 573 sub get_buttons {
|
Line 600 sub get_buttons {
|
|| !$hash->{'encrypted_'.$rid})) { |
|| !$hash->{'encrypted_'.$rid})) { |
$metainfo .='<a name="'.&escape($symb).'" />'. |
$metainfo .='<a name="'.&escape($symb).'" />'. |
'<a href="'.$hash->{'src_'.$rid}.'.meta'.'" target="LONcatInfo">'. |
'<a href="'.$hash->{'src_'.$rid}.'.meta'.'" target="LONcatInfo">'. |
'<img src="/adm/lonMisc/cat_button.'.$extension.'" class="LC_icon" />'. |
'<img src="/adm/lonMisc/cat_button.png" class="LC_icon" />'. |
'</a>'; |
'</a>'; |
} |
} |
$metainfo .= '<a href="/adm/evaluate?postdata='. |
$metainfo .= '<a href="/adm/evaluate?postdata='. |
&escape($esrc). |
&escape($esrc). |
'" target="LONcatInfo">'. |
'" target="LONcatInfo">'. |
'<img src="/adm/lonMisc/eval_button.'.$extension.'" class="LC_icon" />'. |
'<img src="/adm/lonMisc/eval_button.png" class="LC_icon" />'. |
'</a>'; |
'</a>'; |
if (($hash->{'src_'.$rid}=~/\.(problem|exam|quiz|assess|survey|form)$/) && |
if (($hash->{'src_'.$rid}=~/$LONCAPA::assess_re/) && |
($hash->{'src_'.$rid} !~ m-^/uploaded/-)) { |
($hash->{'src_'.$rid} !~ m-^/uploaded/-)) { |
|
|
if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) { |
if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) { |
Line 589 sub get_buttons {
|
Line 616 sub get_buttons {
|
'<a href="/adm/grades?symb='.&escape($symb). |
'<a href="/adm/grades?symb='.&escape($symb). |
# '&command=submission" target="LONcatInfo">'. |
# '&command=submission" target="LONcatInfo">'. |
'&command=submission">'. |
'&command=submission">'. |
'<img src="/adm/lonMisc/subm_button.'.$extension.'" class="LC_icon" />'. |
'<img src="/adm/lonMisc/subm_button.png" class="LC_icon" />'. |
'</a>'. |
'</a>'. |
'<a href="/adm/grades?symb='.&escape($symb). |
'<a href="/adm/grades?symb='.&escape($symb). |
# '&command=gradingmenu" target="LONcatInfo">'. |
# '&command=gradingmenu" target="LONcatInfo">'. |
'&command=gradingmenu">'. |
'&command=gradingmenu">'. |
'<img src="/adm/lonMisc/pgrd_button.'.$extension.'" class="LC_icon" />'. |
'<img src="/adm/lonMisc/pgrd_button.png" class="LC_icon" />'. |
'</a>'; |
'</a>'; |
} |
} |
if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) { |
if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) { |
Line 602 sub get_buttons {
|
Line 629 sub get_buttons {
|
'<a href="/adm/parmset?symb='.&escape($symb). |
'<a href="/adm/parmset?symb='.&escape($symb). |
# '" target="LONcatInfo">'. |
# '" target="LONcatInfo">'. |
'" >'. |
'" >'. |
'<img src="/adm/lonMisc/pprm_button.'.$extension.'" class="LC_icon" />'. |
'<img src="/adm/lonMisc/pprm_button.png" class="LC_icon" />'. |
'</a>'; |
'</a>'; |
} |
} |
} |
} |