--- rat/lonpage.pm	2004/08/29 19:25:34	1.59
+++ rat/lonpage.pm	2004/12/10 19:59:55	1.64
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.59 2004/08/29 19:25:34 raeburn Exp $
+# $Id: lonpage.pm,v 1.64 2004/12/10 19:59:55 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -232,13 +232,21 @@ 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);
+                              my %posthash=('request.prefix' => $prefix,
+					    'symb' => $symb);
 			      if ($ENV{'form.grade_target'} eq 'tex') {
 				  $posthash{'grade_target'}=$ENV{'form.grade_target'};
 				  $posthash{'textwidth'}=$ENV{'form.textwidth'};
@@ -257,8 +265,7 @@ sub handler {
                                }
 			      }
                               my $output=Apache::lonnet::ssi($src,%posthash);
-			      $output=~
-	    s/\/\/ BEGIN LON\-CAPA Internal.+\/\/ END LON\-CAPA Internal\s//gs;
+			      $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}//;
@@ -397,7 +404,8 @@ sub handler {
 # ------------------------------------------------------------------ Start form
 			  if ($nforms) {
 			      $r->print('<form method="post" action="'.
-					$requrl.'">');
+					&Apache::lonenc::check_encrypt($requrl)
+					.'">');
 			  }
 		      } elsif ($target eq 'tex') {
 			  $r->print('\documentclass{article}
@@ -413,7 +421,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]) {
@@ -424,19 +432,26 @@ sub handler {
                           my $avespan=$lcm/($#colcont+1);
                           for ($j=0;$j<=$#colcont;$j++) {
                               my $rid=$colcont[$j];
-                              my $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><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});
+			      if ($hash{'encrypted_'.$rid}) {
+				  $esrc=&Apache::lonenc::encrypted($esrc);
+			      }
+                              unless ($hash{'src_'.$rid} =~ m-^/uploaded/-) { 
+                                  $metainfo ='<a name="'.&Apache::lonnet::escape($esrc).'" />'.
+                                  '<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}).
@@ -504,6 +519,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>');