--- rat/lonpageflip.pm 2023/01/20 23:34:08 1.80.8.13.2.3 +++ rat/lonpageflip.pm 2017/11/16 13:42:01 1.97 @@ -2,7 +2,7 @@ # # Page flip handler # -# $Id: lonpageflip.pm,v 1.80.8.13.2.3 2023/01/20 23:34:08 raeburn Exp $ +# $Id: lonpageflip.pm,v 1.97 2017/11/16 13:42:01 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -99,14 +99,9 @@ sub hash_src { } sub move { - my ($next,$endupmap,$direction,$firstres) = @_; + my ($next,$endupmap,$direction) = @_; my $safecount=0; my $allowed=0; - my $deeplinkonly=0; - my $deeplinkchecked; - my $deeplink_login_pc; - my $prev=$next; - my ($prevmapid)=split(/\./,$next); do { ($next,$endupmap)=&get_next_possible_move($next,$endupmap,$direction); @@ -117,83 +112,9 @@ sub move { if ($url eq '' || $symb eq '') { $allowed = 0; } else { - my $nodeeplinkcheck = 0; - if ($hash{'is_map_'.$next}) { - $nodeeplinkcheck = 1; - } - my $priv = &Apache::lonnet::allowed('bre',$url,$symb,'','','','',$nodeeplinkcheck); - $allowed = (($priv eq 'F') || ($priv eq '2') || ($priv eq 'A')); + my $priv = &Apache::lonnet::allowed('bre',$url,$symb); + $allowed = (($priv eq 'F') || ($priv eq '2')); } - $deeplinkonly = 0; - if ($hash{'deeplinkonly_'.$next}) { - my ($value,$level) = map { &unescape($_); } split(/:/,$hash{'deeplinkonly_'.$next}); - my ($state,$others,$listed,$scope,$protect) = split(/,/,$value); - unless (($state eq 'both') || ($hash{'is_map_'.$next})) { - if ($level eq 'resource') { - $deeplinkonly = 1; - } elsif ($level eq 'map') { - if ($scope eq 'rec') { - unless ($mapid == $prevmapid) { - unless ($deeplinkchecked) { - $deeplink_login_pc = &get_deeplink_login_pc(); - $deeplinkchecked = 1; - } - if ($deeplink_login_pc) { - my $poss_map_pc; - if ($hash{'is_map_'.$next}) { - $poss_map_pc = $hash{'map_pc_'.$url}; - } else { - $poss_map_pc = $hash{'map_pc_'.$hash{'map_id_'.$mapid}}; - } - unless ($deeplink_login_pc == $poss_map_pc) { - unless (grep(/^$deeplink_login_pc$/,split(/,/,$hash{'map_hierarchy_'.$poss_map_pc}))) { - $deeplinkonly = 1; - } - } - } else { - $deeplinkonly = 1; - } - } - } elsif ($mapid != $prevmapid) { - $deeplinkonly = 1; - } - } - } - } elsif (($hash{'deeplinkonly_'.$prev}) && (!$firstres)) { - my ($value,$level) = map { &unescape($_); } split(/:/,$hash{'deeplinkonly_'.$prev}); - my ($state,$others,$listed,$scope,$protect) = split(/,/,$value); - unless (($state eq 'both') || ($hash{'is_map_'.$prev})) { - if ($level eq 'resource') { - $deeplinkonly = 1; - } elsif ($level eq 'map') { - if ($scope eq 'rec') { - unless ($mapid == $prevmapid) { - unless ($deeplinkchecked) { - $deeplink_login_pc = &get_deeplink_login_pc(); - $deeplinkchecked = 1; - } - if ($deeplink_login_pc) { - my $poss_map_pc; - if ($hash{'is_map_'.$prev}) { - $poss_map_pc = $hash{'map_pc_'.$url}; - } else { - $poss_map_pc = $hash{'map_pc_'.$hash{'map_id_'.$mapid}}; - } - unless ($deeplink_login_pc == $poss_map_pc) { - unless (grep(/^$deeplink_login_pc$/,split(/,/,$hash{'map_hierarchy_'.$poss_map_pc}))) { - $deeplinkonly = 1; - } - } - } - } - } else { - if ($mapid != $prevmapid) { - $deeplinkonly = 1; - } - } - } - } - } $safecount++; } while ( ($next) && ($next!~/\,/) @@ -201,9 +122,7 @@ sub move { (!$hash{'src_'.$next}) || ( (!$env{'request.role.adv'}) - && (($hash{'randomout_'.$next}) - || ($deeplinkonly) - || ($hash{'deeplinkout_'.$next})) + && $hash{'randomout_'.$next} ) || (!$allowed) ) @@ -238,7 +157,7 @@ sub get_next_possible_move { } if ($thiscond>$mincond) { $mincond=$thiscond; } } - } + } foreach my $id (split(/\,/,$posnext)) { my ($linkid,$condval)=split(/\:/,$id); if ($condval>=$mincond) { @@ -280,7 +199,7 @@ sub get_next_possible_move { } if ($thiscond>$mincond) { $mincond=$thiscond; } } - } + } foreach my $id (split(/\,/,$posnext)) { my ($linkid,$condval)=split(/\:/,$id); if ($condval>=$mincond) { @@ -313,33 +232,23 @@ sub first_accessible_resource { if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'.db', &GDBM_READER(),0640)) { $furl=$hash{'first_url'}; - my (%args,$url,$argstr); - if ($furl =~ m{^/enc/}) { - ($url,$argstr) = split(/\?/,&Apache::lonenc::unencrypted($furl)); - } else { - ($url,$argstr) = split(/\?/,$furl); - } - foreach my $pair (split(/\&/,$argstr)) { + my %args; + my ($url,$args) = split(/\?/,$furl); + foreach my $pair (split(/\&/,$args)) { my ($name,$value) = split(/=/,$pair); $args{&unescape($name)} = &unescape($value); } - my $priv = &Apache::lonnet::allowed('bre',$url,$args{'symb'}); - my $allowed = (($priv eq 'F') || ($priv eq '2') || ($priv eq 'A')); - if (!$allowed) { + if (!&Apache::lonnet::allowed('bre',$url,$args{'symb'})) { # Wow, we cannot see this ... move forward to the next one that we can see - my ($newrid,$newmap)=&move($hash{'first_rid'},$hash{'first_mapurl'},'forward',1); + my ($newrid,$newmap)=&move($hash{'first_rid'},$hash{'first_mapurl'},'forward'); # Build the new URL - if ($newrid eq '') { - $furl = '/adm/navmaps'; - } else { - my ($newmapid,$newresid)=split(/\./,$newrid); - my $symb=&Apache::lonnet::encode_symb($newmap,$newresid,$hash{'src_'.$newrid}); - $furl=&add_get_param($hash{'src_'.$newrid},{ 'symb' => $symb }); - if ($hash{'encrypted_'.$newrid}) { - $furl=&Apache::lonenc::encrypted($furl); - } - } - } + my ($newmapid,$newresid)=split(/\./,$newrid); + my $symb=&Apache::lonnet::encode_symb($newmap,$newresid,$hash{'src_'.$newrid}); + $furl=&add_get_param($hash{'src_'.$newrid},{ 'symb' => $symb }); + if ($hash{'encrypted_'.$newrid}) { + $furl=&Apache::lonenc::encrypted($furl); + } + } untie(%hash); return $furl; } else { @@ -347,8 +256,31 @@ sub first_accessible_resource { } } +sub first_answerable_ressymb { + my $navmap = Apache::lonnavmaps::navmap->new; + return unless (ref($navmap)); + my $iterator = $navmap->getIterator(undef,undef,undef,1); + return unless (ref($iterator)); + my ($curRes,$result); + while ($curRes = $iterator->next()) { + if (ref($curRes) && $curRes->is_problem()) { + foreach my $part (@{$curRes->parts()}) { + if ($curRes->tries($part) < $curRes->maxtries($part)) { + $result = $curRes->link().'?symb='.$curRes->shown_symb(); + last; + } + } + } + } + if ($result) { + return $result; + } else { + return &first_accessible_resource(); + } +} + sub check_http_req { - my ($srcref,$hostname) = @_; + my ($srcref) = @_; return unless (ref($srcref) eq 'SCALAR'); my $usehttp; if ($env{'request.course.id'}) { @@ -357,19 +289,11 @@ sub check_http_req { if (($$srcref =~ m{^\Q/public/$cdom/$cnum/syllabus\E($|\?)}) && ($ENV{'SERVER_PORT'} == 443) && ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { - unless ((&Apache::lonnet::uses_sts()) || - (&Apache::lonnet::waf_allssl($hostname))) { - $$srcref .= (($$srcref =~/\?/)? '&':'?') . 'usehttp=1'; - $usehttp = 1; - } + $$srcref .= (($$srcref =~/\?/)? '&':'?') . 'usehttp=1'; + $usehttp = 1; } elsif (($$srcref =~ m{^\Q/adm/wrapper/ext/\E(?!https:)}) && ($ENV{'SERVER_PORT'} == 443)) { - unless ((&Apache::lonnet::uses_sts()) || - (&Apache::lonnet::waf_allssl($hostname))) { - my ($url,$anchor) = ($$srcref =~ /^([^\#]+)(?:|(\#[^\#]+))$/); - $$srcref = $url . (($$srcref =~/\?/)? '&':'?') . 'usehttp=1' .$anchor; - $usehttp = 1; - } + $usehttp = 1; } } return $usehttp; @@ -397,25 +321,6 @@ setTimeout(function() { END } -sub get_deeplink_login_pc { - my $deeplink_login_pc; - if (($env{'request.deeplink.login'}) && ($env{'request.course.id'})) { - my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - my $deeplink_symb = &Apache::loncommon::deeplink_login_symb($cnum,$cdom); - if ($deeplink_symb) { - my $loginmap; - if ($deeplink_symb =~ /\.(page|sequence)$/) { - $loginmap = &Apache::lonnet::clutter((&Apache::lonnet::decode_symb($deeplink_symb))[2]); - } else { - $loginmap = &Apache::lonnet::clutter((&Apache::lonnet::decode_symb($deeplink_symb))[0]); - } - $deeplink_login_pc = $hash{'map_pc_'.$loginmap}; - } - } - return $deeplink_login_pc; -} - # ================================================================ Main Handler sub handler { @@ -433,7 +338,7 @@ sub handler { my $multichoice=0; my %multichoicehash=(); my %prog_state=(); - my ($redirecturl,$redirectsymb,$enc,$anchor,$deeplinklevel); + my ($redirecturl,$redirectsymb,$enc,$anchor); my $next=''; my $hostname = $r->hostname(); my @possibilities=(); @@ -453,6 +358,22 @@ sub handler { $last=$hash{'last_known'}; untie(%hash); } + } elsif ($direction eq 'firstanswerable') { + my $furl = &first_answerable_ressymb(); + my $usehttp = &check_http_req(\$furl); + if (($usehttp) && ($hostname ne '')) { + $furl='http://'.$hostname.$furl; + } else { + $furl=&Apache::lonnet::absolute_url().$furl; + } + &Apache::loncommon::content_type($r,'text/html'); + $r->header_out(Location => $furl); + return REDIRECT; + } elsif ($direction eq 'endplacement') { + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + $r->print(&Apache::lonplacementtest::showresult()); + return OK; } if ($env{'request.course.id'}) { # Check if course needs to be re-initialized @@ -463,13 +384,9 @@ sub handler { $r->send_http_header; $r->print(&Apache::loncommon::check_release_result(@reinit)); return OK; - } - my ($cnum,$cdom); - if ($reinitcheck) { - $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - } - if (($reinitcheck eq 'main') || ($reinitcheck eq 'both')) { + } elsif ($reinitcheck eq 'update') { + my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; + my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; $preupdatepos = &Apache::lonnet::symbread($currenturl); unless ($direction eq 'return') { if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db', @@ -484,12 +401,12 @@ sub handler { my $preamble = '
'. '
'. &mt('Your course session is being updated because of recent changes by course personnel.'). - ' '.&mt('Please be patient').'.
'. + ' '.&mt('Please be patient.').'
'. '
'; %prog_state = &Apache::lonhtmlcommon::Create_PrgWin($r,undef,$preamble); &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Updating course')); my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum"); - &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished!')); + &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished')); if ($ferr) { &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); my $requrl = $r->uri; @@ -505,20 +422,10 @@ sub handler { } } } - if (($reinitcheck eq 'both') || ($reinitcheck eq 'supp')) { - my $possdel; - if ($reinitcheck eq 'supp') { - $possdel = 1; - } - my ($supplemental,$refs_updated) = &Apache::loncommon::get_supplemental($cnum,$cdom,'',$possdel); - unless ($refs_updated) { - &Apache::loncommon::set_supp_httprefs($cnum,$cdom,$supplemental); - } - } } if ($direction eq 'firstres') { my $furl=&first_accessible_resource(); - my $usehttp = &check_http_req(\$furl,$hostname); + my $usehttp = &check_http_req(\$furl); if (($usehttp) && ($hostname ne '')) { $furl='http://'.$hostname.$furl; } else { @@ -535,7 +442,7 @@ sub handler { return REDIRECT; } } - if ($direction eq 'return') { + if ($direction eq 'return') { # -------------------------------------------------------- Return to last known my ($newloc,$usehttp); if (($last) && (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'.db', @@ -544,15 +451,11 @@ sub handler { $id=$hash{'map_pc_'.&Apache::lonnet::clutter($murl)}.'.'.$id; $newloc=$hash{'src_'.$id}; if ($newloc) { - $usehttp = &check_http_req(\$newloc,$hostname); - if ($hash{'encrypted_'.$id}) { + $usehttp = &check_http_req(\$newloc); + if ($hash{'encrypted_'.$id}) { $newloc=&Apache::lonenc::encrypted($newloc); - } - if ($newloc =~ m{^(/adm/wrapper/ext/[^\#]+)(?:|(\#[^\#]+))$}) { - my ($url,$anchor) = ($1,$2); - if ($anchor) { - $newloc = $url.(($url=~/\?/)?'&':'?').'symb='.&escape($last).$anchor; - } + } elsif ($newloc =~ m{^(/adm/wrapper/ext/[^\#]+)\#([^\#]+)$}) { + $newloc = $1.&escape('#').$2; } } else { $newloc='/adm/navmaps'; @@ -571,9 +474,9 @@ sub handler { $r->print(&Apache::loncommon::end_page()); return OK; } else { - &Apache::loncommon::content_type($r,'text/html'); - $r->header_out(Location => $newloc); - return REDIRECT; + &Apache::loncommon::content_type($r,'text/html'); + $r->header_out(Location => $newloc); + return REDIRECT; } } # @@ -588,19 +491,20 @@ sub handler { $last=$hash{'last_known'}; untie(%hash); } + my $newloc; if ($last) { $currenturl=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($last))[2]); } else { my $newloc = &Apache::lonnet::absolute_url(). - '/adm/navmaps'; + '/adm/navmaps'; if ($reinitcheck eq 'update') { &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); $r->print(&reinited_js($newloc,$env{'request.course.id'},100)); $r->print(&Apache::loncommon::end_page()); return OK; } else { - &Apache::loncommon::content_type($r,'text/html'); - $r->header_out(Location => $newloc); + &Apache::loncommon::content_type($r,'text/html'); + $r->header_out(Location => $newloc); return REDIRECT; } } @@ -660,15 +564,6 @@ sub handler { } else { # -------------------------------------------------------------- No place to go $multichoice=-1; - if ($position && $env{'request.deeplink.login'}) { - my ($map,$resid,$url) = &Apache::lonnet::decode_symb($position); - my $mapid = $hash{'map_pc_'.&Apache::lonnet::clutter($map)}; - my $position_deeplink = $hash{'deeplinkonly_'.$mapid.'.'.$resid}; - if ($position_deeplink) { - (my $value,$deeplinklevel) = map { &unescape($_); } - split(/:/,$position_deeplink); - } - } } # ----------------- The program must come past this point to untie the big hash untie(%hash); @@ -692,7 +587,7 @@ sub handler { # ------------------------------------- Check for and display critical messages my ($redirect, $url) = &Apache::loncommon::critical_redirect(300,'flip'); unless ($redirect) { - my $usehttp = &check_http_req(\$redirecturl,$hostname); + my $usehttp = &check_http_req(\$redirecturl); if (($usehttp) && ($hostname ne '')) { $url='http://'.$hostname.$redirecturl; } else { @@ -710,7 +605,7 @@ sub handler { } if ($reinitcheck eq 'update') { &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); - $r->print(&reinited_js($url,$env{'request.course.id'},100)); + $r->print(&reinited_js($url,$env{'request.course.id'},100)); $r->print(&Apache::loncommon::end_page()); return OK; } else { @@ -723,11 +618,6 @@ sub handler { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; my %lt=&Apache::lonlocal::texthash('title' => 'End of Sequence', - 'deeplink' => 'No link available', - 'deeplinkres' => - 'Navigation to other content is unavailable when accessing content via deep-linking', - 'deeplinkmap' => - 'You have reached the end of the sequence of available materials for access via deep-linking', 'explain' => 'You have reached the end of the sequence of materials.', 'back' => 'Go Back', @@ -740,7 +630,8 @@ sub handler { 'type' => 'Type', 'update' => 'Content updated', 'expupdate' => 'As a result of a recent update to the sequence of materials, it is not possible to complete the page flip.', - 'gonav' => 'Go to the Contents page to select a resource to display.'); + 'gonav' => 'Go to the Contents page to select a resource to display.', + ); if (&Apache::loncommon::course_type() eq 'Community') { $lt{'nav'} = &mt('Community Contents'); } @@ -758,7 +649,7 @@ $lt{'pick'}: ENDSTART foreach my $id (@possibilities) { my $src = $multichoicehash{'src_'.$id}; - my $usehttp = &check_http_req(\$src,$hostname); + my $usehttp = &check_http_req(\$src); if (($usehttp) && ($hostname ne '')) { $src = 'http://'.$hostname.$src; } @@ -786,35 +677,37 @@ ENDSTART .'

'.$lt{'expupdate'}.'
' .$lt{'gonav'}.'

'); } else { - $r->print( - &Apache::loncommon::start_page('No Resource')); - if ($deeplinklevel eq 'resource') { - $r->print('

'.$lt{'deeplink'}.'

' - .'

'.$lt{'deeplinkres'}.'

'); - } elsif ($deeplinklevel eq 'map') { - $r->print('

'.$lt{'title'}.'

' - .'

'.$lt{'deeplinkmap'}.'

'); - } else { - $r->print('

'.$lt{'title'}.'

' - .'

'.$lt{'explain'}.'

'); + if (($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') && + (!$env{'request.role.adv'})) { + my ($score,$incomplete) = &Apache::lonplacementtest::check_completion(undef,undef,1); + if ($incomplete) { + $r->print(&Apache::lonplacementtest::showincomplete($incomplete)); + } else { + $r->print(&Apache::lonplacementtest::showresult(1)); + } + } else { + $r->print( + &Apache::loncommon::start_page('No Resource') + .'

'.$lt{'title'}.'

' + .'

'.$lt{'explain'}.'

'); } } } - if ($deeplinklevel) { - $r->print( - &Apache::lonhtmlcommon::actionbox( - [''.$lt{'back'}.''])); - } elsif ((!@possibilities) && ($reinitcheck)) { - $r->print( - &Apache::lonhtmlcommon::actionbox( - [''.$lt{'nav'}.'' - ])); - } else { - $r->print( - &Apache::lonhtmlcommon::actionbox( - [''.$lt{'back'}.'', - ''.$lt{'nav'}.'' - ])); + unless (($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') || + ($env{'request.role.adv'})) { + if ((!@possibilities) && ($reinitcheck)) { + $r->print( + &Apache::lonhtmlcommon::actionbox( + [''.$lt{'nav'}.'' + ])); + } else { + $r->print( + &Apache::lonhtmlcommon::actionbox( + [''.$lt{'back'}.'', + ''.$lt{'nav'}.'' + ])); + } + } $r->print(&Apache::loncommon::end_page()); @@ -825,7 +718,7 @@ ENDSTART if ($reinitcheck eq 'update') { &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); $r->print(&Apache::loncommon::end_page()); - } + } $env{'user.error.msg'}="/adm/flip:bre:0:1:Course Data Missing"; return HTTP_NOT_ACCEPTABLE; }