--- rat/lonpage.pm	2003/02/03 18:03:53	1.48
+++ rat/lonpage.pm	2004/09/14 01:21:49	1.60
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.48 2003/02/03 18:03:53 harris41 Exp $
+# $Id: lonpage.pm,v 1.60 2004/09/14 01:21:49 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -45,6 +45,8 @@ use Apache::Constants qw(:common :http);
 use Apache::lonnet();
 use Apache::loncommon();
 use Apache::lonxml();
+use Apache::lonlocal;
+use Apache::lonmenu;
 use HTML::TokeParser;
 use GDBM_File;
 use Apache::lonsequence;
@@ -71,66 +73,70 @@ sub euclid {
 sub tracetable {
     my ($sofar,$rid,$beenhere)=@_;
     my $further=$sofar;
+    my $randomout=0;
+    unless ($ENV{'request.role.adv'}) {
+        $randomout = $hash{'randomout_'.$rid};
+    }
     unless ($beenhere=~/\&$rid\&/) {
-       $beenhere.=$rid.'&';  
-
-       if (defined($hash{'is_map_'.$rid})) {
-           if ((defined($hash{'map_start_'.$hash{'src_'.$rid}})) &&
-               (defined($hash{'map_finish_'.$hash{'src_'.$rid}}))) {
-              my $frid=$hash{'map_finish_'.$hash{'src_'.$rid}};
-	      $sofar=
-                &tracetable($sofar,$hash{'map_start_'.$hash{'src_'.$rid}},
-                '&'.$frid.'&');
-              $sofar++;
-              if ($hash{'src_'.$frid}) {
-               my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$frid});
-               if (($brepriv eq '2') || ($brepriv eq 'F')) {
-                 if (defined($rows[$sofar])) {
-                   $rows[$sofar].='&'.$frid;
-                 } else {
-                   $rows[$sofar]=$frid;
-                 }
-	       }
-	      }
-	   }
-       } else {
-          $sofar++;
-          if ($hash{'src_'.$rid}) {
-           my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$rid});
-           if (($brepriv eq '2') || ($brepriv eq 'F')) {
-             if (defined($rows[$sofar])) {
-               $rows[$sofar].='&'.$rid;
-             } else {
-               $rows[$sofar]=$rid;
-             }
-	   }
-          }
-       }
-
-       if (defined($hash{'to_'.$rid})) {
-	  my $mincond=1;
-          my $next='';
-          foreach (split(/\,/,$hash{'to_'.$rid})) {
-              my $thiscond=
+        $beenhere.=$rid.'&';
+        unless ($randomout) {
+            if (defined($hash{'is_map_'.$rid})) {
+                if ((defined($hash{'map_start_'.$hash{'src_'.$rid}})) &&
+                    (defined($hash{'map_finish_'.$hash{'src_'.$rid}}))) {
+                    my $frid=$hash{'map_finish_'.$hash{'src_'.$rid}};
+	            $sofar=
+                       &tracetable($sofar,$hash{'map_start_'.$hash{'src_'.$rid}},
+                       '&'.$frid.'&');
+                    $sofar++;
+                    if ($hash{'src_'.$frid}) {
+                        my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$frid});
+                        if (($brepriv eq '2') || ($brepriv eq 'F')) {
+                            if (defined($rows[$sofar])) {
+                                $rows[$sofar].='&'.$frid;
+                            } else {
+                                $rows[$sofar]=$frid;
+                            }
+	                }
+	            }
+	        }
+            } else {
+                $sofar++;
+                if ($hash{'src_'.$rid}) {
+                    my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$rid});
+                    if (($brepriv eq '2') || ($brepriv eq 'F')) {
+                        if (defined($rows[$sofar])) {
+                            $rows[$sofar].='&'.$rid;
+                        } else {
+                            $rows[$sofar]=$rid;
+                        }
+	            }
+                }
+            }
+        }
+
+        if (defined($hash{'to_'.$rid})) {
+	    my $mincond=1;
+            my $next='';
+            foreach (split(/\,/,$hash{'to_'.$rid})) {
+                my $thiscond=
       &Apache::lonnet::directcondval($hash{'condid_'.$hash{'undercond_'.$_}});
-              if ($thiscond>=$mincond) {
-		  if ($next) {
-		      $next.=','.$_.':'.$thiscond;
-                  } else {
-                      $next=$_.':'.$thiscond;
-		  }
-                  if ($thiscond>$mincond) { $mincond=$thiscond; }
-	      }
-          }
-          foreach (split(/\,/,$next)) {
-              my ($linkid,$condval)=split(/\:/,$_);
-              if ($condval>=$mincond) {
-                my $now=&tracetable($sofar,$hash{'goesto_'.$linkid},$beenhere);
-                if ($now>$further) { $further=$now; }
-	      }
-          }
-
-       }
+                if ($thiscond>=$mincond) {
+		    if ($next) {
+		        $next.=','.$_.':'.$thiscond;
+                    } else {
+                        $next=$_.':'.$thiscond;
+		    }
+                    if ($thiscond>$mincond) { $mincond=$thiscond; }
+	        }
+            }
+            foreach (split(/\,/,$next)) {
+                my ($linkid,$condval)=split(/\:/,$_);
+                if ($condval>=$mincond) {
+                    my $now=&tracetable($sofar,$hash{'goesto_'.$linkid},$beenhere);
+                    if ($now>$further) { $further=$now; }
+	        }
+            }
+        }
     }
     return $further;
 }
@@ -144,9 +150,9 @@ sub handler {
 
   if ($r->header_only) {
        if ($ENV{'browser.mathml'}) {
-           $r->content_type('text/xml');
+           &Apache::loncommon::content_type($r,'text/xml');
        } else {
-           $r->content_type('text/html'); 
+           &Apache::loncommon::content_type($r,'text/html'); 
        }
        $r->send_http_header;
        return OK;
@@ -157,6 +163,12 @@ sub handler {
   my $number_of_columns = 1;
   my $requrl=$r->uri;  
   my $target = $ENV{'form.grade_target'};
+#  &Apache::lonnet::logthis("Got a target of $target");
+  if ($target eq 'meta') {
+      &Apache::loncommon::content_type($r,'text/html');
+      $r->send_http_header;
+      return OK;
+  }
 # ----------------------------------------------------------------- Tie db file
   if (($ENV{'request.course.fn'}) && (!$ENV{'form.forceselect'})) {
       my $fn=$ENV{'request.course.fn'};
@@ -227,6 +239,13 @@ sub handler {
 # --------------------------------------------------------- This is an SSI cell
 			      my $prefix=$_.'_';
                               my %posthash=('request.prefix' => $prefix);
+			      if ($ENV{'form.grade_target'} eq 'tex') {
+				  $posthash{'grade_target'}=$ENV{'form.grade_target'};
+				  $posthash{'textwidth'}=$ENV{'form.textwidth'};
+				  $posthash{'problem_split'}=$ENV{'form.problem_split'};
+				  $posthash{'latex_type'}=$ENV{'form.latex_type'};
+				  $posthash{'rndseed'}=$ENV{'form.rndseed'};
+			      }
                               if (($ENV{'form.'.$prefix.'submit'}) 
                                || ($ENV{'form.all_submit'})) {
                                foreach (keys %ENV) {
@@ -238,6 +257,8 @@ sub handler {
                                }
 			      }
                               my $output=Apache::lonnet::ssi($src,%posthash);
+			      $output=~
+	    s/\/\/ BEGIN LON\-CAPA Internal.+\/\/ END LON\-CAPA Internal\s//gs;
                               if ($target eq 'tex') {
 				  $output =~ s/^([^&]+)\\begin{document}//;
 				  $output =~ s/\\end{document}//;
@@ -328,45 +349,57 @@ sub handler {
                      } 
                   }
                   unless ($contents) {
-                      $r->content_type('text/html');
+                      &Apache::loncommon::content_type($r,'text/html');
                       $r->send_http_header;
-                      $r->print('<html><body>Empty page.</body></html>');
+                      $r->print('<html>'."\n".
+                                '<head>'."\n".
+                                &Apache::lonmenu::registerurl(1,undef)."\n".
+                                '</head>'."\n".
+                                '<body bgcolor="#FFFFFF" onLoad="'
+                                .&Apache::lonmenu::loadevents.
+                                '" onUnload="'.&Apache::lonmenu::unloadevents.'">'.
+                                 &Apache::lonmenu::menubuttons(undef,$target,1)
+                               );
+                      $r->print(&mt('This page is either empty or it only contains resources that are currently hidden').'. ');
+                      $r->print('<br /><br />'.&mt('Please use the LON-CAPA navigation arrows to move to another item in the course').'.</body></html>');
                   } else {
 # ------------------------------------------------------------------ Build page
 
 # ---------------------------------------------------------------- Send headers
 		      unless ($target eq 'tex') {
 			  if ($isxml) {
-			      $r->content_type('text/xml');
+			      &Apache::loncommon::content_type($r,'text/xml');
 			      $r->send_http_header;
 			      $r->print($xmlheader);
 			  } else {
-			      $r->content_type('text/html');
+			      &Apache::loncommon::content_type($r,'text/html');
 			      $r->send_http_header;
 			      $r->print('<html>');
 			  }
 # ------------------------------------------------------------------------ Head
 			  $r->print("\n<head>\n".$allmeta);
-			  $allscript=~
-			      s/\/\/ BEGIN LON\-CAPA Internal.+\/\/ END LON\-CAPA Internal\s//gs;
 			  if ($allscript) {
 			      $r->print("\n<script language='JavaScript'>\n".
 					$allscript."\n</script>\n");
 			  }
-			  $r->print(&Apache::lonxml::registerurl(1,undef));
+			  $r->print(&Apache::lonmenu::registerurl(1,undef));
 			  $r->print("\n</head>\n");
 # ------------------------------------------------------------------ Start body
 			  if ($isxml) {
 			      $r->print($xmlbody);
 			  } else {
-			      $r->print('<body bgcolor="#FFFFFF" onLoad="'.&Apache::lonxml::loadevents.'" onUnload="'.&Apache::lonxml::unloadevents.'">');
+			      $r->print(
+               '<body bgcolor="#FFFFFF" onLoad="'.&Apache::lonmenu::loadevents.
+               '" onUnload="'.&Apache::lonmenu::unloadevents.'">'.
+                              &Apache::lonmenu::menubuttons(undef,$target,1)
+					);
 			  }
 # ------------------------------------------------------------------ Start form
 			  if ($nforms) {
 			      $r->print('<form method="post" action="'.
 					$requrl.'">');
 			  }
-		      } else {
+		      } elsif ($target eq 'tex') {
 			  $r->print('\documentclass{article}
                                  \newcommand{\keephidden}[1]{}           
                                  \usepackage[dvips]{graphicx}
@@ -391,17 +424,24 @@ sub handler {
                           my $avespan=$lcm/($#colcont+1);
                           for ($j=0;$j<=$#colcont;$j++) {
                               my $rid=$colcont[$j];
-                              my $metainfo='<a href="'.
-                                    $metalink{$rid}.'" target="LONcatInfo">'.
-                          '<img src="/adm/lonMisc/cat_button.gif" border=0>'.
-			  '</img></a><a href="/adm/evaluate?postdata='.
-      &Apache::lonnet::escape(&Apache::lonnet::declutter($hash{'src_'.$rid}))
-      .'" target="LONcatInfo">'.
-                          '<img src="/adm/lonMisc/eval_button.gif" border=0>'.
-                          '</img></a>';
+                              my $metainfo = '';
+                              print STDERR "src is $hash{'src_'.$rid}\n";
+                              unless ($hash{'src_'.$rid} =~ m-^/uploaded/-) { 
+                                  $metainfo ='<a name="'.
+	&Apache::lonnet::escape(&Apache::lonnet::declutter($hash{'src_'.$rid})).'" />'.
+                                  '<a href="'.$metalink{$rid}.'" target="LONcatInfo">'.
+                                  '<img src="/adm/lonMisc/cat_button.gif" border=0>'.
+                                  '</img></a>';
+                              }
+                              $metainfo .= '<a href="/adm/evaluate?postdata='.
+	&Apache::lonnet::escape(&Apache::lonnet::declutter($hash{'src_'.$rid})).
+                                  '" target="LONcatInfo">'.
+                                  '<img src="/adm/lonMisc/eval_button.gif" border=0>'.
+                                  '</img></a>';
                               if (
  ($hash{'src_'.$rid}=~/\.(problem|exam|quiz|assess|survey|form)$/) &&
- (&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'}))) {
+ (&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) && 
+ ($hash{'src_'.$rid} !~ m-^/uploaded/-)) {
 				  my ($mapid,$resid)=split(/\./,$rid);
                                  my $symb=
                 &Apache::lonnet::declutter($hash{'map_id_'.$mapid}).
@@ -409,15 +449,18 @@ sub handler {
 		&Apache::lonnet::declutter($hash{'src_'.$rid});
                                  $metainfo.=
                   '<a href="/adm/grades?symb='.&Apache::lonnet::escape($symb).
-                  '&command=submission" target="LONcatInfo">'.
+#                 '&command=submission" target="LONcatInfo">'.
+                  '&command=submission">'.
                           '<img src="/adm/lonMisc/subm_button.gif" border=0>'.
 			  '</img></a>'.
                   '<a href="/adm/grades?symb='.&Apache::lonnet::escape($symb).
-                  '&command=gradingmenu" target="LONcatInfo">'.
+#                  '&command=gradingmenu" target="LONcatInfo">'.
+                  '&command=gradingmenu">'.
                           '<img src="/adm/lonMisc/pgrd_button.gif" border=0>'.
 			  '</img></a>'.
                   '<a href="/adm/parmset?symb='.&Apache::lonnet::escape($symb).
-                          '" target="LONcatInfo">'.
+#                          '" target="LONcatInfo">'.
+                          '" >'.
                           '<img src="/adm/lonMisc/pprm_button.gif" border=0>'.
 			      '</img></a>';
                               }
@@ -466,6 +509,10 @@ sub handler {
 			      } elsif ($cellemb{$rid} eq 'emb') {
                                   $r->print('>'.$metainfo.'<embed src="'.
                                     $hash{'src_'.$rid}.'"></embed>');
+                              } elsif (&Apache::lonnet::declutter($hash{'src_'.$rid}) !~/\.(sequence|page)$/) {
+                                  $r->print($metainfo.'<b>'.$hash{'title_'.$rid}.'</b><br />'.
+                                  &mt('It is recommended that you use an up-to-date virus scanner before handling this file.').'</p><p><table>'.
+                                  &Apache::londocs::entryline(0,&mt("Click to download or use your browser's Save Link function"),'/'.&Apache::lonnet::declutter($hash{'src_'.$rid})).'</table></p><br />');
                               }
 			      unless ($target eq 'tex') {
 				  $r->print('</td>');
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
<html><head>
<title>500 Internal Server Error</title>
</head><body>
<h1>Internal Server Error</h1>
<p>The server encountered an internal error or
misconfiguration and was unable to complete
your request.</p>
<p>Please contact the server administrator at 
 root@localhost to inform them of the time this error occurred,
 and the actions you performed just before this error.</p>
<p>More information about this error may be available
in the server error log.</p>
</body></html>