--- rat/lonpageflip.pm	2021/12/14 21:34:45	1.80.8.13
+++ rat/lonpageflip.pm	2021/06/07 19:04:20	1.104
@@ -2,7 +2,7 @@
 #
 # Page flip handler
 #
-# $Id: lonpageflip.pm,v 1.80.8.13 2021/12/14 21:34:45 raeburn Exp $
+# $Id: lonpageflip.pm,v 1.104 2021/06/07 19:04:20 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,6 +36,7 @@ use LONCAPA;
 use Apache::Constants qw(:common :http REDIRECT);
 use Apache::lonnet;
 use Apache::loncommon();
+use Apache::lonnavmaps();
 use Apache::lonuserstate;
 use Apache::lonlocal;
 use HTML::TokeParser;
@@ -98,9 +99,12 @@ sub hash_src {
 }
 
 sub move {
-    my ($next,$endupmap,$direction) = @_;
+    my ($next,$endupmap,$direction,$firstres) = @_;
     my $safecount=0;
     my $allowed=0;
+    my $deeplinkonly=0;
+    my $prev=$next;
+    my ($prevmapid)=split(/\./,$next);
     do {
 	($next,$endupmap)=&get_next_possible_move($next,$endupmap,$direction);
 
@@ -112,16 +116,37 @@ sub move {
 	    $allowed = 0;
 	} else {
 	    my $priv = &Apache::lonnet::allowed('bre',$url,$symb);
-	    $allowed = (($priv eq 'F') || ($priv eq '2'));
+	    $allowed = (($priv eq 'F') || ($priv eq '2') || ($priv eq 'A'));
 	}
+        $deeplinkonly = 0;
+        if ($hash{'deeplinkonly_'.$next}) {
+            my ($value,$level) = split(/:/,$hash{'deeplinkonly_'.$next});
+            if ($level eq 'resource') {
+                $deeplinkonly = 1;
+            } elsif ($level eq 'map') {
+                if ($mapid != $prevmapid) {
+                    $deeplinkonly = 1;
+                }
+            }
+        } elsif (($hash{'deeplinkonly_'.$prev}) && (!$firstres)) {
+            my ($value,$level) = split(/:/,$hash{'deeplinkonly_'.$prev});
+            if ($level eq 'resource') {
+                $deeplinkonly = 1;
+            } elsif ($level eq 'map') {
+                if ($mapid != $prevmapid) {
+                    $deeplinkonly = 1;
+                }
+            }
+        }
 	$safecount++;
     } while (   ($next)
 	     && ($next!~/\,/)
 	     && (
 		    (!$hash{'src_'.$next})
 		 || (
-		        (!$env{'request.role.adv'})
-		     &&  $hash{'randomout_'.$next}
+                        (!$env{'request.role.adv'})
+                     && (($hash{'randomout_'.$next})
+                     ||  ($deeplinkonly))
 		    )
 		 || (!$allowed)
 		)
@@ -231,31 +256,25 @@ 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);
 	}
-        if (!&Apache::lonnet::allowed('bre',$url,$args{'symb'})) {
+        my $priv = &Apache::lonnet::allowed('bre',$url,$args{'symb'});
+        my $allowed = (($priv eq 'F') || ($priv eq '2') || ($priv eq 'A'));
+        if (!$allowed) {
 # 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');
+	    my ($newrid,$newmap)=&move($hash{'first_rid'},$hash{'first_mapurl'},'forward',1);
 # 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 {
@@ -263,6 +282,29 @@ 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) = @_;
     return unless (ref($srcref) eq 'SCALAR');
@@ -283,7 +325,7 @@ sub check_http_req {
             unless ((&Apache::lonnet::uses_sts()) ||
                     (&Apache::lonnet::waf_allssl($hostname))) {
                 my ($url,$anchor) = ($$srcref =~ /^([^\#]+)(?:|(\#[^\#]+))$/);
-                $$srcref = $url . (($$srcref =~/\?/)? '&':'?') . 'usehttp=1' .$anchor;
+                $$srcref = $url . (($$srcref =~/\?/)? '&':'?') . 'usehttp=1' .$anchor; 
                 $usehttp = 1;
             }
         }
@@ -329,8 +371,8 @@ sub handler {
   my %cachehash=(); 
   my $multichoice=0;
   my %multichoicehash=();
-  my %prog_state=(); 
-  my ($redirecturl,$redirectsymb,$enc,$anchor);
+  my %prog_state=();
+  my ($redirecturl,$redirectsymb,$enc,$anchor,$deeplinklevel);
   my $next='';
   my $hostname = $r->hostname();
   my @possibilities=();
@@ -350,6 +392,22 @@ sub handler {
               $last=$hash{'last_known'};
               untie(%hash);
           }
+      } elsif ($direction eq 'firstanswerable') {
+          my $furl = &first_answerable_ressymb();
+          my $usehttp = &check_http_req(\$furl,$hostname);
+          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
@@ -428,7 +486,7 @@ sub handler {
 	    $newloc=$hash{'src_'.$id};
 	    if ($newloc) {
                 $usehttp = &check_http_req(\$newloc,$hostname);
-                if ($hash{'encrypted_'.$id}) {
+		if ($hash{'encrypted_'.$id}) { 
                     $newloc=&Apache::lonenc::encrypted($newloc);
                 }
                 if ($newloc =~ m{^(/adm/wrapper/ext/[^\#]+)(?:|(\#[^\#]+))$}) {
@@ -454,9 +512,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;
          }
       }
 #
@@ -475,15 +533,15 @@ sub handler {
 	     $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;
              }
          }
@@ -543,6 +601,9 @@ sub handler {
 	      } else {
 # -------------------------------------------------------------- No place to go
                   $multichoice=-1;
+                  if ($hash{'deeplinkonly_'.$rid}) {
+                      (my $value,$deeplinklevel) = split(/:/,$hash{'deeplinkonly_'.$rid});
+                  }
               }
 # ----------------- The program must come past this point to untie the big hash
 	      untie(%hash);
@@ -564,7 +625,7 @@ sub handler {
                      &Apache::lonnet::linklog($redirecturl,$currenturl);
 		  }
 # ------------------------------------- Check for and display critical messages
-                  my ($redirect, $url) = &Apache::loncommon::critical_redirect(300);
+                  my ($redirect, $url) = &Apache::loncommon::critical_redirect(300,'flip');
                   unless ($redirect) {
                       my $usehttp = &check_http_req(\$redirecturl,$hostname);
                       if (($usehttp) && ($hostname ne '')) {
@@ -584,7 +645,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 {
@@ -597,6 +658,11 @@ 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',
@@ -609,7 +675,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');
                   }
@@ -655,23 +722,49 @@ ENDSTART
                                   .'<p>'.$lt{'expupdate'}.'<br />'
                                   .$lt{'gonav'}.'</p>');
                       } else {
-                          $r->print(
-                              &Apache::loncommon::start_page('No Resource')
-                             .'<h2>'.$lt{'title'}.'</h2>'
-                             .'<p>'.$lt{'explain'}.'</p>');
+                          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'));
+                              if ($deeplinklevel eq 'resource') {
+                                  $r->print('<h2>'.$lt{'deeplink'}.'</h2>'
+                                           .'<p>'.$lt{'deeplinkres'}.'</p>');
+                              } elsif ($deeplinklevel eq 'map') {
+                                  $r->print('<h2>'.$lt{'title'}.'</h2>'
+                                           .'<p>'.$lt{'deeplinkmap'}.'</p>');
+                              } else {
+                                  $r->print('<h2>'.$lt{'title'}.'</h2>'
+                                           .'<p>'.$lt{'explain'}.'</p>');
+                              }
+                          }
                       }
 		  }
-                  if ((!@possibilities) && ($reinitcheck))  {
-                      $r->print(
-                          &Apache::lonhtmlcommon::actionbox(
-                              ['<a href="/adm/navmaps">'.$lt{'nav'}.'</a></li>'
-                              ]));
-                  } else {
-                      $r->print(
-                          &Apache::lonhtmlcommon::actionbox(
-                              ['<a href="/adm/flip?postdata=return:">'.$lt{'back'}.'</a></li>',
-                               '<a href="/adm/navmaps">'.$lt{'nav'}.'</a></li>'
-                              ]));
+                  unless (($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') ||
+                          ($env{'request.role.adv'})) {
+                      if ($deeplinklevel) {
+                          $r->print(
+                              &Apache::lonhtmlcommon::actionbox(
+                                  ['<a href="/adm/flip?postdata=return:">'.$lt{'back'}.'</a>']));
+                      } elsif ((!@possibilities) && ($reinitcheck))  {
+                          $r->print(
+                              &Apache::lonhtmlcommon::actionbox(
+                                  ['<a href="/adm/navmaps">'.$lt{'nav'}.'</a></li>'
+                                  ]));
+                      } else {
+                          $r->print(
+                              &Apache::lonhtmlcommon::actionbox(
+                                  ['<a href="/adm/flip?postdata=return:">'.$lt{'back'}.'</a></li>',
+                                   '<a href="/adm/navmaps">'.$lt{'nav'}.'</a></li>'
+                                  ]));
+                      }
+
                   }
                   $r->print(&Apache::loncommon::end_page());
       
@@ -682,7 +775,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; 
           }