--- rat/lonpage.pm	2002/09/01 19:29:01	1.45
+++ rat/lonpage.pm	2005/06/29 19:02:14	1.71
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.45 2002/09/01 19:29:01 www Exp $
+# $Id: lonpage.pm,v 1.71 2005/06/29 19:02:14 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,27 +25,17 @@
 #
 # http://www.lon-capa.org/
 #
-# (TeX Content Handler
-#
-# YEAR=2000
-# 05/29/00,05/30 Gerd Kortemeyer)
-# 08/30,08/31,09/06,09/14,09/15,09/16,09/19,09/20,09/21,09/23,
-# 10/02,10/10,10/14,10/16,10/18,10/19,10/31,11/6,11/14,11/16,
-# YEAR=2001
-# 08/13/01,08/30,10/1 Gerd Kortemeyer
-# 12/16 Scott Harrison
-# YEAR=2002
-# 03/19 Gerd Kortemeyer
-#
 ###
 
 package Apache::lonpage;
 
 use strict;
 use Apache::Constants qw(:common :http);
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonxml();
+use Apache::lonlocal;
+use Apache::lonmenu;
 use HTML::TokeParser;
 use GDBM_File;
 use Apache::lonsequence;
@@ -72,66 +62,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,10 +138,10 @@ sub handler {
 # ------------------------------------------- Set document type for header only
 
   if ($r->header_only) {
-       if ($ENV{'browser.mathml'}) {
-           $r->content_type('text/xml');
+       if ($env{'browser.mathml'}) {
+           &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,10 +151,16 @@ sub handler {
                                           ['forceselect','launch']);
   my $number_of_columns = 1;
   my $requrl=$r->uri;  
-  my $target = $ENV{'form.grade_target'};
+  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'};
+  if (($env{'request.course.fn'}) && (!$env{'form.forceselect'})) {
+      my $fn=$env{'request.course.fn'};
       if (-e "$fn.db") {
           if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640)) {
 # ------------------------------------------------------------------- Hash tied
@@ -181,7 +181,7 @@ sub handler {
 		     if ($rows[$i]) {
                         my @colcont=split(/\&/,$rows[$i]);
                         foreach (@colcont) {
-                           $symbhash{$hash{'src_'.$_}}='';
+                           $symbhash{$hash{'src_'.$_}}=['page','notasymb'];
 		        }
 		     }
 		  }
@@ -221,24 +221,48 @@ sub handler {
                       $lcm*=($#colcont+1)/euclid($lcm,($#colcont+1));
                       foreach (@colcont) {
                           my $src=$hash{'src_'.$_};
-                          $src=~/\.(\w+)$/;
+			  my ($extension)=($src=~/\.(\w+)$/);
+			  if ($hash{'encrypted_'.$_}) {
+			      $src=&Apache::lonenc::encrypted($src);
+			  }
                           $metalink{$_}=$src.'.meta';
-                          $cellemb{$_}=Apache::loncommon::fileembstyle($1);
+                          $cellemb{$_}=
+			      &Apache::loncommon::fileembstyle($extension);
                           if ($cellemb{$_} eq 'ssi') {
 # --------------------------------------------------------- This is an SSI cell
+			      my ($mapid,$resid)=split(/\./,$_);
+			      my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$src);
+			      
 			      my $prefix=$_.'_';
-                              my %posthash=('request.prefix' => $prefix);
-                              if (($ENV{'form.'.$prefix.'submit'}) 
-                               || ($ENV{'form.all_submit'})) {
-                               foreach (keys %ENV) {
+                              my %posthash=('request.prefix' => $prefix,
+					    'LONCAPA_INTERNAL_no_discussion' => 'true',
+					    'symb' => $symb);
+			      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) {
 				  if ($_=~/^form.$prefix/) {
 				      my $name=$_;
                                       $name=~s/^form.$prefix//;
-                                      $posthash{$name}=$ENV{$_};
+                                      $posthash{$name}=$env{$_};
                                   }
                                }
 			      }
                               my $output=Apache::lonnet::ssi($src,%posthash);
+			      $output=~s|//(\s*<!--)? BEGIN LON-CAPA Internal.+// END LON-CAPA Internal\s*(-->)?\s||gs;
+                              if ($target eq 'tex') {
+				  $output =~ s/^([^&]+)\\begin{document}//;
+				  $output =~ s/\\end{document}//;
+				  $output = '\parbox{\minipagewidth}{ '.$output.' }';
+                                  #some additional cleanup necessary for LateX (due to limitations of table environment 
+				  $output =~ s/(\\vskip\s*\d+mm)\s*(\\\\)+/$1/g;
+			      }
                               my $parser=HTML::TokeParser->new(\$output);
                               my $token;
                               my $thisdir=$src;
@@ -322,46 +346,59 @@ 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.'">');
+					&Apache::lonenc::check_encrypt($requrl)
+					.'">');
 			  }
-		      } else {
-			  $r->print('\documentclass[letterpaper]{article}
+		      } elsif ($target eq 'tex') {
+			  $r->print('\documentclass{article}
                                  \newcommand{\keephidden}[1]{}           
                                  \usepackage[dvips]{graphicx}
                                  \usepackage{epsfig}
@@ -374,7 +411,7 @@ sub handler {
 			  $r->print('\begin{longtable}INSERTTHEHEADOFLONGTABLE\endfirsthead\endhead ');
 			  if ($number_of_columns le $lcm) {$number_of_columns=$lcm;};
 		      } else {
-			  $r->print('<table cols="'.$lcm.'" border="0">');
+			  $r->print('<table width="100%" cols="'.$lcm.'" border="0">');
 		      }
                       for ($i=0;$i<=$#rows;$i++) {
 			if ($rows[$i]) {
@@ -385,17 +422,29 @@ 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 = '';
+			      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});
+			      if ($hash{'encrypted_'.$rid}) {
+				  $symb=&Apache::lonenc::encrypted($symb);
+				  $esrc=&Apache::lonenc::encrypted($esrc);
+			      }
+                              unless ($hash{'src_'.$rid} =~ m-^/uploaded/-) { 
+                                  $metainfo ='<a name="'.&Apache::lonnet::escape($symb).'" />'.
+                                  '<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($esrc).
+                                  '" 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}).
@@ -403,15 +452,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>';
                               }
@@ -445,8 +497,8 @@ sub handler {
 				  unless ($target eq 'tex') {
 				      $r->print('</font>');
                                   }
-                                  if ($ENV{'course.'.
-                                      $ENV{'request.course.id'}.
+                                  if ($env{'course.'.
+                                      $env{'request.course.id'}.
                                       '.pageseparators'} eq 'yes') {
                                       unless($target eq 'tex') {
                                           $r->print('<hr />');
@@ -460,6 +512,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>');
@@ -479,7 +535,7 @@ sub handler {
 		      unless ($target eq 'tex') {
 			  $r->print("\n</table>");
 		      } else {
-			  $r->print('\end{longtable}');
+			  $r->print('\end{longtable}\strut');
 		      }
 # ---------------------------------------------------------------- Submit, etc.
                       if ($nforms) {
@@ -492,11 +548,14 @@ sub handler {
 		      } else {
 			  $r->print('\end{document}'.$number_of_columns);
 		      }
+		      &Apache::lonnet::symblist($requrl,%symbhash);
+		      my ($map,$id,$url)=&Apache::lonnet::decode_symb(&Apache::lonnet::symbread());
+		      &Apache::lonnet::symblist($map,'last_known'=>[$url,$id]);
 # -------------------------------------------------------------------- End page
                   }                  
 # ------------------------------------------------------------- End render page
               } else {
-                  $r->content_type('text/html');
+                  &Apache::loncommon::content_type($r,'text/html');
                   $r->send_http_header;
                   &Apache::lonsequence::viewmap($r,$requrl);
               }
@@ -511,7 +570,7 @@ sub handler {
           }
       } 
   }
-  $r->content_type('text/html');
+  &Apache::loncommon::content_type($r,'text/html');
   $r->send_http_header;
   &Apache::lonsequence::viewmap($r,$requrl);
   return OK;