--- rat/lonpage.pm 2024/07/03 02:38:40 1.111.2.16 +++ rat/lonpage.pm 2017/06/21 16:01:40 1.120.4.1 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Page Handler # -# $Id: lonpage.pm,v 1.111.2.16 2024/07/03 02:38:40 raeburn Exp $ +# $Id: lonpage.pm,v 1.120.4.1 2017/06/21 16:01:40 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -41,9 +41,8 @@ use Apache::lonxml(); use Apache::lonlocal; use Apache::lonmenu; use Apache::lonhomework; -use Apache::lonenc(); +use Apache::lonparmset; use HTML::TokeParser; -use HTML::Entities(); use GDBM_File; use Apache::lonsequence; use lib '/home/httpd/lib/perl/'; @@ -101,9 +100,7 @@ sub tracetable { } else { $sofar++; if ($hash{'src_'.$rid}) { - my ($mapid,$resid)=split(/\./,$rid); - my $symb = &Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$hash{'src_'.$rid}); - my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$rid},$symb); + my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$rid}); if (($brepriv eq '2') || ($brepriv eq 'F')) { if (defined($rows[$sofar])) { $rows[$sofar].='&'.$rid; @@ -188,9 +185,6 @@ sub handler { my $fn=$env{'request.course.fn'}; if (-e "$fn.db") { my %buttonshide; - my $hostname = $r->hostname(); - my $lonhost = $r->dir_config('lonHostID'); - my $ip = &Apache::lonnet::get_host_ip($lonhost); if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640)) { # ------------------------------------------------------------------- Hash tied my $firstres=$hash{'map_start_'.$requrl}; @@ -198,16 +192,24 @@ sub handler { if (($firstres) && ($lastres)) { # ------------------------------------------------------------- Countdown Timer my $now = time; - my ($pagefirstaccess,%hastimeleft,%countdowndisp); + my ($pagefirstaccess,%hastimeleft,%countdowndisp,%donebutton, + %donebtnextra,%buttonbytime,$donetime,$symbtosetdone); my ($pagesymb,$courseid,$domain,$name)=&Apache::lonnet::whichuser(); + unless ($pagesymb) { + $pagesymb=&Apache::lonnet::symbread($requrl); + } if ($pagesymb && ($courseid ne '') && ($domain ne '') && ($name ne '')) { my %times=&Apache::lonnet::get('firstaccesstimes', [$courseid."\0".$pagesymb], $domain,$name); if ($times{$courseid."\0".$pagesymb} =~ /^\d+$/) { $pagefirstaccess = $times{$courseid."\0".$pagesymb}; + if ($pagefirstaccess && $env{'form.LC_interval_done'} eq 'true') { + $donetime = $now - $pagefirstaccess; + } } } + # ----------------------------------------------------------------- Render page @rows=(); @@ -225,6 +227,27 @@ sub handler { my ($mapid,$resid)=split(/\./,$rid); $symbhash{$hash{'src_'.$rid}}= [$hash{'src_'.$rid},$resid]; + if (($donetime) && ($symbtosetdone eq '')) { + my $src = $hash{'src_'.$rid}; + if ($hash{'encrypted_'.$rid}) { + $src=&Apache::lonenc::encrypted($src); + } + my ($mapid,$resid)=split(/\./,$rid); + my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$src); + if ($src =~ /$LONCAPA::assess_re/) { + my @interval=&Apache::lonnet::EXT("resource.0.interval",$symb); + if (@interval > 1) { + if (($interval[1] eq 'map') && ($pagefirstaccess)) { + my ($timelimit) = ($interval[0] =~ /^(\d+)/); + if ($timelimit) { + if ($pagefirstaccess + $timelimit > $now) { + $symbtosetdone = $symb; + } + } + } + } + } + } } } } @@ -238,7 +261,6 @@ sub handler { my $nforms=0; my $nuploads=0; my $ntimers=0; - my $hasnumresp; my %turninpaths; my %multiresps; my $turninparent; @@ -249,8 +271,6 @@ sub handler { my %ssilink=(); my %ssivlink=(); my %ssialink=(); - my %cssrefs=(); - my %httpref=(); my %cellemb=(); my %cellexternal=(); @@ -262,6 +282,16 @@ sub handler { my $xmlheader=''; my $xmlbody=''; +# ---------------------------------------------------------- Handle Done button + + # Set the event timer to zero if the "done button" was clicked. + if ($donetime && $symbtosetdone) { + &Apache::lonparmset::storeparm_by_symb_inner($symbtosetdone,'0_interval', + 2,$donetime,'date_interval', + $name,$domain); + undef($env{'form.LC_interval_done'}); + } + # --------------------------------------------- Get SSI output, post parameters for ($i=0;$i<=$#rows;$i++) { @@ -272,79 +302,28 @@ sub handler { foreach (@colcont) { my $src=$hash{'src_'.$_}; my $plainsrc = $src; - my $anchor; - if ($hash{'ext_'.$_} eq 'true:') { - $cellexternal{$_}=($hash{'ext_'.$_} eq 'true:'); - $src =~ s{^/ext/}{http://}; - $src =~ s{http://https://}{https://}; - if ($src =~ /(\#[^#]+)$/) { - $anchor = $1; - $src =~ s/\#[^#]+$//; - } - } - my $unencsrc = $src; my ($extension)=($src=~/\.(\w+)$/); + $cellexternal{$_}=($hash{'ext_'.$_} eq 'true:'); if ($hash{'encrypted_'.$_}) { $src=&Apache::lonenc::encrypted($src); } my ($mapid,$resid)=split(/\./,$_); - my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$plainsrc); + my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$src); unless ($env{'request.role.adv'}) { $buttonshide{$symb} = &Apache::lonnet::EXT("resource.0.buttonshide",$symb); } $cellemb{$_}= &Apache::loncommon::fileembstyle($extension); if ($cellexternal{$_}) { - if (($target eq 'tex') || ($target eq 'tex_answer')) { - my $shown = $src.$anchor; - if (($hash{'encrypted_'.$_}) && (!$env{'request.role.adv'})) { - $shown = &mt('URL not shown (encrypted)'); - } - my $title=&Apache::lonnet::gettitle($symb); - $title = &Apache::lonxml::latex_special_symbols($title); - $shown = &Apache::lonxml::latex_special_symbols($shown); - $ssibody{$_} = ' \strut \\\\ \textit{'.$title.'} \strut \\\\ '.$shown.'\\\\'; - } else { - my $showsrc = $src; - my ($is_pdf,$title,$linktext); - if ($unencsrc =~ /\.pdf$/i) { - $is_pdf = 1; - } - if (($hash{'encrypted_'.$_}) && ($symb)) { - $title=&Apache::lonnet::gettitle(&Apache::lonenc::encrypted($symb)); - } else { - $title=&Apache::lonnet::gettitle($symb); - } - if ($env{'browser.mobile'}) { - if ($is_pdf) { - $linktext = &mt('Link to PDF (for mobile devices)'); - $ssibody{$_} = &create_extlink($unencsrc,$anchor,$title,$linktext); - } else { - $linktext = &mt('Link to resource'); - $ssibody{$_} = &create_extlink($unencsrc,$anchor,$title,$linktext); - } - } else { - my $absolute = $env{'request.use_absolute'}; - my $uselink = &Apache::loncommon::is_nonframeable($unencsrc,$absolute,$hostname,$ip); - if (($uselink) || (($ENV{'SERVER_PORT'} == 443) && ($unencsrc =~ m{^http://}))) { - $linktext = &mt('Link to resource'); - $ssibody{$_} = &create_extlink($unencsrc,$anchor,$title,$linktext); - } else { - if (($hash{'encrypted_'.$_}) && ($symb) && (!$env{'request.role.adv'})) { - $showsrc .= '?symb='.&Apache::lonenc::encrypted($symb); - } elsif ($anchor) { - $showsrc .= $anchor; - } - $ssibody{$_} = <No iframe support! + unless (($target eq 'tex') || ($target eq 'tex_answer')) { + $ssibody{$_} = <No iframe support! ENDEXT - } - } } } elsif ($cellemb{$_} eq 'ssi') { # --------------------------------------------------------- This is an SSI cell - my $prefix='p_'.$_.'_'; - my $idprefix='p_'.join('_',($mapid,$resid,'')); + my $prefix=$_.'_'; + my $idprefix= join('_',($mapid,$resid,'')); my %posthash=('request.prefix' => $prefix, 'LONCAPA_INTERNAL_no_discussion' => 'true', 'symb' => $symb); @@ -357,31 +336,26 @@ ENDEXT $posthash{'rndseed'}=$env{'form.rndseed'}; $posthash{'answer_output_mode'} = $env{'form.answer_output_mode'}; } - my $submitted=$env{'form.all_submit_pressed'}; + my $submitted=exists($env{'form.all_submit'}); if (!$submitted) { foreach my $key (keys(%env)) { - if ($key=~/^\Qform.$prefix\Esubmit_(.+)_pressed$/) { - if ($env{$key}) { - $submitted=1; - last; - } + if ($key=~/^form.\Q$prefix\Esubmit_/) { + $submitted=1;last; } - } + } } if ($submitted) { foreach my $key (keys(%env)) { - if ($key=~/^\Qform.$prefix\E/) { + if ($key=~/^form.\Q$prefix\E/) { my $name=$key; - $name=~s/^\Qform.$prefix\E//; + $name=~s/^form.\Q$prefix\E//; $posthash{$name}=$env{$key}; - } + } } - if ($env{'form.all_submit_pressed'}) { + if (exists($env{'form.all_submit'})) { $posthash{'all_submit'}='yes'; } - } elsif ($env{'form.'.$prefix.'markaccess'} eq 'yes') { - $posthash{'markaccess'} = $env{'form.'.$prefix.'markaccess'}; - } + } if ($env{'environment.remote'} eq 'on') { $posthash{'inhibitmenu'} = 'yes'; } @@ -406,7 +380,6 @@ ENDEXT my $bodydef=0; my $thisxml=0; my @rlinks=(); - my @css_hrefs=(); if ($output=~/\?xml/) { $isxml=1; $thisxml=1; @@ -449,14 +422,6 @@ ENDEXT ($bodydef==0)) { $allscript.="\n\n" .$parser->get_text('/script'); - } elsif (($token->[1] eq 'link') && - ($bodydef==0)) { - if (($token->[2]->{'href'} !~ m{^/adm/}) && - ($token->[2]->{'rel'} eq 'stylesheet')) { - $css_hrefs[$#css_hrefs+1]= - $token->[2]->{'href'}; - - } } } } @@ -476,17 +441,10 @@ ENDEXT $ntimers++; $hastimer = 1; } - unless ($hasnumresp) { - if ($output=~/\]+class\s*=\s*['"]*[^'">]*LC_numresponse_text\W/) { - $hasnumresp = 1; - } - } $output=~ s/\<((?:input|select|button|textarea)[^\>]+)name\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi; $output=~ s/\<((?:input|select|button|textarea)[^\>]+)id\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\>]*)\>/\<$1 id="$idprefix$2" $3\>/gsi; - $output=~ - s/(\Qthis.form.elements['\E)(HW(?:VAL|CHK)_[^']+\'\]\.(?:value=\'|checked))/$1$prefix$2/gsi; if ($hastimer) { $output=~ s/\<(input[^\>]+name=\Q"$prefix\Eaccessbutton"[^\>]+)(?:\Qdocument.markaccess.submit();\E)([^\>]*)\>/\<$1pageTimer(this.form,'$prefix')$2\>/gsi; @@ -506,6 +464,8 @@ ENDEXT $output=~ s/(\Q)/$1$idprefix$2$3$4/g; 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 '') { @@ -530,7 +490,8 @@ ENDEXT undef(%Apache::lonhomework::history); my $probstatus = &Apache::lonnet::EXT("resource.0.problemstatus",$symb); if (($status eq 'CAN_ANSWER') || (($status eq 'CANNOT_ANSWER') && - (($probstatus eq 'no') || ($probstatus eq 'no_feedback_ever')))) { + (($probstatus eq 'no') || ($probstatus eq 'no_feedback_ever'))) || + (($status eq 'NOT_YET_VIEWED') && ($posthash{'markaccess'} eq 'yes'))) { my ($slothastime,$timerhastime); if ($slot_name ne '') { if (ref($slot) eq 'HASH') { @@ -543,11 +504,26 @@ ENDEXT my $duedate = &Apache::lonnet::EXT("resource.0.duedate",$symb); my @interval=&Apache::lonnet::EXT("resource.0.interval",$symb); if (@interval > 1) { - my $first_access=&Apache::lonnet::get_first_access($interval[1],$symb); + my $first_access; + if ($interval[1] eq 'map') { + my $ignorecache; + if ($env{'form.'.$prefix.'markaccess'} eq 'yes') { + $ignorecache = 1; + } + $first_access=&Apache::lonnet::get_first_access($interval[1],undef,$pagesymb,$ignorecache); + if (($first_access) && (!$pagefirstaccess)) { + $pagefirstaccess = $first_access; + } + } else { + $first_access=&Apache::lonnet::get_first_access($interval[1],$symb); + } if ($first_access > 0) { - my $timeremains = $first_access+$interval[0] - $now; - if ($timeremains > 0) { - $timerhastime = $timeremains; + my ($timelimit) = ($interval[0] =~ /^(\d+)/); + if ($timelimit) { + my $timeremains = $timelimit + $first_access - $now; + if ($timeremains > 0) { + $timerhastime = $timeremains; + } } } } @@ -559,6 +535,28 @@ ENDEXT $countdowndisp{$symb} = 'inline'; if ((@interval > 1) && ($timerhastime)) { $hastimeleft{$symb} = $timerhastime; + if ($pagefirstaccess) { + my ($timelimit,$usesdone,$donebuttontext,$proctor,$secret); + ($timelimit,my $donesuffix) = split(/_/,$interval[0],2); + if ($donesuffix =~ /^done\:([^\:]+)\:(.*)$/) { + $usesdone = 'done'; + $donebuttontext = $1; + (undef,$proctor,$secret) = split(/_/,$2); + } elsif ($donesuffix =~ /^done(|_.+)$/) { + $donebuttontext = &mt('Done'); + ($usesdone,$proctor,$secret) = split(/_/,$donesuffix); + } + if ($usesdone eq 'done') { + $donebutton{$symb} = $timelimit; + push(@{$buttonbytime{$timelimit}},$symb); + $donebtnextra{$symb} = { + text => $donebuttontext, + proctor => $proctor, + secret => $secret, + type => $interval[1], + }; + } + } } else { $hastimeleft{$symb} = $slothastime; } @@ -566,6 +564,9 @@ ENDEXT $hastimeleft{$symb} = $duedate - $now; $countdowndisp{$symb} = 'none'; } + unless ($donebutton{$symb}) { + $donebutton{$symb} = 0; + } } } } @@ -583,41 +584,19 @@ ENDEXT $output=~s/(\"|\'|\=\s*)$_(\"|\'|\s|\>)/$1$newlocation$2/; } } - foreach my $css_href (@css_hrefs) { - next if ($css_href eq ''); - unless ($css_href =~ m{https?://}) { - my $proburl = &Apache::lonnet::clutter($plainsrc); - unless ($css_href =~ m{^/}) { - my $probdir = $proburl; - $probdir=~s/\/[^\/]*$//; - $css_href = &Apache::lonnet::hreflocation($probdir,$css_href); - } - if ($css_href =~ m{^/(res|uploaded)/}) { - unless (($env{'httpref.'.$css_href}) || - ($httpref{'httpref.'.$css_href}) || - (&Apache::lonnet::is_on_map($css_href))) { - if ($env{'httpref.'.$proburl}) { - $proburl = $env{'httpref.'.$proburl}; - } - $httpref{'httpref.'.$css_href} = $proburl; - } - } - } - $cssrefs{$css_href} = 1; - } # -------------------------------------------------- Deal with Applet codebases $output=~s/(\]+)(codebase\=[^\S\>]+)*([^\>]*)\>/$1.($2?$2:' codebase="'.$thisdir.'"').$3.'>'/gei; $ssibody{$_}=$output; # ---------------------------------------------------------------- End SSI cell } } - } + } } unless ($contents) { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; $r->print(&Apache::loncommon::start_page(undef,undef, - {'force_register' => 1})); + {'force_register' => 1,})); $r->print(&mt('This page is either empty or it only contains resources that are currently hidden').'. '); $r->print('

'.&mt('Please use the LON-CAPA navigation arrows to move to another item in the course'). &Apache::loncommon::end_page()); @@ -640,9 +619,7 @@ ENDEXT "\n\n"; } if (($nforms) && ($nuploads)) { - $allscript .= &Apache::lonhtmlcommon::file_submissionchk_js(\%turninpaths,\%multiresps). - ''; + $allscript .= &Apache::lonhtmlcommon::file_submissionchk_js(\%turninpaths,\%multiresps); } if (($nforms) && (&Apache::lonhtmlcommon::htmlareabrowser())) { my %textarea_args = ( @@ -660,7 +637,6 @@ ENDEXT '// ]]>'. "\n\n"; } - &Apache::lonhtmlcommon::clear_breadcrumb_tools(); if (keys(%hastimeleft)) { my (%uniquetimes,%uniquedisplays); foreach my $item (values(%hastimeleft)) { @@ -670,8 +646,9 @@ ENDEXT $uniquetimes{$item} = 1; } } - if (keys(%uniquetimes) == 1) { - my (%uniquedisplays,%uniquedones,$currdisp); + if (scalar(keys(%uniquetimes)) == 1) { + my (%uniquedisplays,%uniquedones,$currdisp,$donebuttontime, + $donebuttonextras); if (keys(%countdowndisp)) { foreach my $item (values(%countdowndisp)) { if (exists($uniquedisplays{$item})) { @@ -685,7 +662,25 @@ ENDEXT $currdisp = $countdowndisplay[0]; } } - &add_countdown_timer($currdisp); + if (keys(%donebutton)) { + foreach my $item (values(%donebutton)) { + if (exists($uniquedones{$item})) { + $uniquedones{$item} ++; + } else { + $uniquedones{$item} = 1; + } + } + my @donebuttons = sort { $ <=> $b } (keys(%uniquedones)); + if (scalar(@donebuttons) == 1) { + if ($donebuttons[0]) { + $donebuttontime = $donebuttons[0]; + if (ref($buttonbytime{$donebuttontime}) eq 'ARRAY') { + $donebuttonextras = $donebtnextra{$buttonbytime{$donebuttontime}->[0]}; + } + } + } + } + &add_countdown_timer($currdisp,$donebuttontime,$donebuttonextras); } } my $pagebuttonshide; @@ -704,21 +699,6 @@ ENDEXT } } } - if (keys(%cssrefs)) { - my $links; - if (keys(%cssrefs)) { - foreach my $css_href (keys(%cssrefs)) { - next unless ($css_href =~ m{^(/res/|/uploaded/|https?://)}); - $links .= ''."\n"; - } - } - if ($links) { - if (keys(%httpref)) { - &Apache::lonnet::appenv(\%httpref); - } - $allscript .= "\n$links"; - } - } # ------------------------------------------------------------------ Start body $r->print(&Apache::loncommon::start_page(undef,$allscript, {'force_register' => 1, @@ -769,7 +749,7 @@ ENDEXT my $avespan=$lcm/($#colcont+1); for ($j=0;$j<=$#colcont;$j++) { my $rid=$colcont[$j]; - my $metainfo =&get_buttons(\%hash,$rid,\%buttonshide,$hostname).'
'; + my $metainfo =&get_buttons(\%hash,$rid,\%buttonshide).'
'; unless (($target eq 'tex') || ($target eq 'tex_answer')) { $r->print('print('>'); } - $r->print($ssibody{$rid}); + unless (($cellexternal{$rid}) && + ($target eq 'tex') && ($target eq 'tex_answer')) { + $r->print($ssibody{$rid}); + } unless (($target eq 'tex') || ($target eq 'tex_answer')) { $r->print(''); } @@ -856,17 +839,12 @@ ENDEXT $r->print( ''. - ''. ''); } unless (($target eq 'tex') || ($target eq 'tex_answer')) { - my $args = {'discussion' => 1}; - if ($hasnumresp) { - $args->{'dashjs'} = 1; - } - $r->print(&Apache::loncommon::end_page($args)); + $r->print(&Apache::loncommon::end_page({'discussion' + => 1,})); } else { $r->print('\end{document}'.$number_of_columns); } @@ -877,30 +855,9 @@ ENDEXT } # ------------------------------------------------------------- End render page } else { - if ($hash{'map_type_'.$hash{'map_pc_'.$requrl}} eq 'none') { - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - $r->print(&Apache::loncommon::start_page(undef,undef, - {'force_register' => 1,})); - my $crstype = &Apache::loncommon::course_type(); - if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { - $r->print(''.&mt('Missing composite page file.').'
'. - &mt("You may want to use the $crstype Editor to remove this item.")); - } else { - if ($crstype eq 'Placement') { - $r->print(''.&mt('Missing page').''); - } else { - $r->print(''. - &mt('This resource was unavailable when your '.lc($crstype).' session was loaded').'
'. - &mt("Please use 'Contents' to list items available in the $crstype.").''); - } - } - $r->print(&Apache::loncommon::end_page()); - } else { - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - &Apache::lonsequence::viewmap($r,$requrl); - } + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + &Apache::lonsequence::viewmap($r,$requrl); } # ------------------------------------------------------------------ Untie hash unless (untie(%hash)) { @@ -920,52 +877,37 @@ ENDEXT } sub get_buttons { - my ($hash,$rid,$buttonshide,$hostname) = @_; + my ($hash,$rid,$buttonshide) = @_; + my $metainfo = ''; + my $esrc=&Apache::lonnet::declutter($hash->{'src_'.$rid}); my ($mapid,$resid)=split(/\./,$rid); my $symb=&Apache::lonnet::encode_symb($hash->{'map_id_'.$mapid}, $resid, $hash->{'src_'.$rid}); - my ($aname,$shownsymb); - if (($hash->{'encrypted_'.$rid}) && (!$env{'request.role.adv'})) { - $aname = 'LC_'.$rid; - $shownsymb = &Apache::lonenc::encrypted($symb); - } else { - $shownsymb = $symb; - my $dispsymb = $symb; - if ($symb =~ /\#([^\#]+)$/) { - my $escan = &escape('#'); - $dispsymb =~ s/#([^\#]+)$/$escan$1/; - } - $aname = &escape($dispsymb); - } - my $metainfo = ''; unless ($env{'request.role.adv'}) { if ($buttonshide->{$symb} eq 'yes') { - return $metainfo; + return; } } - my $crs_sec = $env{'request.course.id'} . (($env{'request.course.sec'} ne '') - ? "/$env{'request.course.sec'}" - : ''); - my $esrc=&Apache::lonnet::declutter($hash->{'src_'.$rid}); if ($hash->{'encrypted_'.$rid}) { + $symb=&Apache::lonenc::encrypted($symb); $esrc=&Apache::lonenc::encrypted($esrc); } if ($hash->{'src_'.$rid} !~ m-^/uploaded/- - && $hash->{'src_'.$rid} !~ m{^/ext/} + && $hash->{'src_'.$rid} !~ m{^https?://} && !$env{'request.enc'} && ($env{'request.role.adv'} || !$hash->{'encrypted_'.$rid})) { - $metainfo .= ''. + $metainfo .=''. + ''. ''.&mt('Show Metadata').''. ''; } if (($hash->{'src_'.$rid} !~ m{^/uploaded/}) && - ($hash->{'src_'.$rid} !~ m{^/ext/})) { + ($hash->{'src_'.$rid} !~ m{^https?://})) { $metainfo .= ''. @@ -977,8 +919,7 @@ sub get_buttons { if (($hash->{'src_'.$rid}=~/$LONCAPA::assess_re/) && ($hash->{'src_'.$rid} !~ m-^/uploaded/-)) { - if ((&Apache::lonnet::allowed('mgr',$crs_sec)) || - (&Apache::lonnet::allowed('vgr',$crs_sec))) { + if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) { $metainfo.= ''. @@ -986,10 +927,7 @@ sub get_buttons { ''.&mt('View Submissions for a Student or a Group of Students').''. - ''; - } - if (&Apache::lonnet::allowed('mgr',$crs_sec)) { - $metainfo.= + ''. ''. '&command=gradingmenu">'. @@ -998,8 +936,7 @@ sub get_buttons { ' title="'.&mt('Content Grades').'" />'. ''; } - if ((&Apache::lonnet::allowed('opa',$crs_sec)) || - (&Apache::lonnet::allowed('vpa',$crs_sec))) { + if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) { $metainfo.= ''. @@ -1010,64 +947,23 @@ sub get_buttons { ''; } } - if ($env{'request.course.id'}) { + if (($env{'request.course.id'}) && (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) { my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; my $file=&Apache::lonnet::declutter($hash->{'src_'.$rid}); - my $editbutton = ''; - if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { - my ($cfile,$home,$switchserver,$forceedit,$forceview) = - &Apache::lonnet::can_edit_resource($file,$cnum,$cdom,$hash->{'src_'.$rid},$symb); - if ($cfile ne '') { - my $jscall = &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,$switchserver, - $forceedit,1,$symb,$shownsymb, - undef,&escape($env{'form.title'}), - $hostname); - if ($jscall) { - $editbutton = 1; - my $icon = 'pcstr.png'; - my $label = &mt('Edit'); - my $title = &mt('Edit this resource'); - my $pic = ''.$label.''; - $metainfo .= ' '.$pic.''; - } - } - } - if ((!$editbutton) && ($file=~/$LONCAPA::assess_re/)) { - my $url = &Apache::lonnet::clutter($file); - my $viewsrcbutton; - if ((&Apache::lonnet::allowed('cre','/')) && - (&Apache::lonnet::metadata($url,'sourceavail') eq 'open')) { - $viewsrcbutton = 1; - } elsif (&Apache::lonnet::allowed('vxc',$crs_sec)) { - if ($url =~ m{^\Q/res/$cdom/\E($LONCAPA::match_username)/}) { - my $auname = $1; - if (($env{'request.course.adhocsrcaccess'} ne '') && - (grep(/^\Q$auname\E$/,split(/,/,$env{'request.course.adhocsrcaccess'})))) { - $viewsrcbutton = 1; - } elsif ((&Apache::lonnet::metadata($url,'sourceavail') eq 'open') && - (&Apache::lonnet::allowed('bre',$crs_sec))) { - $viewsrcbutton = 1; - } - } - } - if ($viewsrcbutton) { + my ($cfile,$home,$switchserver,$forceedit,$forceview) = + &Apache::lonnet::can_edit_resource($file,$cnum,$cdom,$hash->{'src_'.$rid},$symb); + if ($cfile ne '') { + my $jscall = &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,$switchserver, + $forceedit,1,$symb,undef, + &escape($env{'form.title'})); + if ($jscall) { my $icon = 'pcstr.png'; - my $label = &mt('View Source'); - my $title = &mt('View source code'); - my $jsrid = $rid; - $jsrid =~ s/\./_/g; - my $showurl = &escape(&Apache::lonenc::check_encrypt($url)); + my $label = &mt('Edit'); + my $title = &mt('Edit this resource'); my $pic = ''.$label.''; - $metainfo .= ' '.$pic.''."\n". - '\n"; + $metainfo .= ' '.$pic.''; } } } @@ -1075,19 +971,33 @@ sub get_buttons { } sub add_countdown_timer { - my ($currdisp) = @_; - my ($collapse,$expand,$alttxt,$title); + my ($currdisp,$donebuttontime,$donebuttonextras) = @_; + my ($collapse,$expand,$alttxt,$title,$donebutton); if ($currdisp eq 'inline') { $collapse = '► '; } else { $expand = '◄ '; } + if ($donebuttontime) { + my ($type,$proctor,$donebuttontext); + if (ref($donebuttonextras) eq 'HASH') { + $proctor = $donebuttonextras->{'proctor'}; + $donebuttontext = $donebuttonextras->{'text'}; + $type = $donebuttonextras->{'type'}; + } else { + $donebuttontext = &mt('Done'); + $type = 'map'; + } + $donebutton = + &Apache::lonmenu::done_button_js($type,'','',$proctor,$donebuttontext); + } unless ($env{'environment.icons'} eq 'iconsonly') { $alttxt = &mt('Timer'); $title = $alttxt.' '; } my $desc = &mt('Countdown to due date/time'); my $output = < $collapse @@ -1097,20 +1007,11 @@ $collapse $expand $alttxt$title END + &Apache::lonhtmlcommon::clear_breadcrumb_tools(); &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$output); return; } -sub create_extlink { - my ($url,$anchor,$title,$linktext) = @_; - my $shownlink; - unless ($title eq '') { - $shownlink = ''.$title.'
'; - } - my $dest = &HTML::Entities::encode($url.$anchor,'&<>"'); - $shownlink .= ''.$linktext.''; - return $shownlink; -} 1; __END__