--- rat/lonpage.pm	2004/11/12 00:21:14	1.61
+++ rat/lonpage.pm	2007/05/23 14:57:51	1.78
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.61 2004/11/12 00:21:14 albertel Exp $
+# $Id: lonpage.pm,v 1.78 2007/05/23 14:57:51 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,24 +25,13 @@
 #
 # 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
-# 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;
@@ -50,6 +39,9 @@ use Apache::lonmenu;
 use HTML::TokeParser;
 use GDBM_File;
 use Apache::lonsequence;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+ 
 
 # -------------------------------------------------------------- Module Globals
 my %hash;
@@ -74,7 +66,7 @@ sub tracetable {
     my ($sofar,$rid,$beenhere)=@_;
     my $further=$sofar;
     my $randomout=0;
-    unless ($ENV{'request.role.adv'}) {
+    unless ($env{'request.role.adv'}) {
         $randomout = $hash{'randomout_'.$rid};
     }
     unless ($beenhere=~/\&$rid\&/) {
@@ -149,7 +141,7 @@ sub handler {
 # ------------------------------------------- Set document type for header only
 
   if ($r->header_only) {
-       if ($ENV{'browser.mathml'}) {
+       if ($env{'browser.mathml'}) {
            &Apache::loncommon::content_type($r,'text/xml');
        } else {
            &Apache::loncommon::content_type($r,'text/html'); 
@@ -162,7 +154,7 @@ 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');
@@ -170,8 +162,8 @@ sub handler {
       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
@@ -191,8 +183,10 @@ sub handler {
                   for ($i=0;$i<=$#rows;$i++) {
 		     if ($rows[$i]) {
                         my @colcont=split(/\&/,$rows[$i]);
-                        foreach (@colcont) {
-                           $symbhash{$hash{'src_'.$_}}='';
+                        foreach my $rid (@colcont) {
+			    my ($mapid,$resid)=split(/\./,$rid);
+			    $symbhash{$hash{'src_'.$rid}}=
+				[$hash{'src_'.$rid},$resid];
 		        }
 		     }
 		  }
@@ -241,27 +235,42 @@ sub handler {
 			      &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.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'};
+                              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{$_};
-                                  }
-                               }
+			      my $submitted=exists($env{'form.all_submit'});
+			      if (!$submitted) {
+				  foreach my $key (keys(%env)) {
+				      if ($key=~/^form.\Q$prefix\Esubmit_/) {
+					  $submitted=1;last;
+				      }
+				  }
+			      }
+                              if ($submitted) {
+				  foreach my $key (keys(%env)) {
+				      if ($key=~/^form.\Q$prefix\E/) {
+					  my $name=$key;
+					  $name=~s/^form.\Q$prefix\E//;
+					  $posthash{$name}=$env{$key};
+				      }
+				  }
+				  if (exists($env{'form.all_submit'})) {
+				      $posthash{'all_submit'}='yes';
+				  }
 			      }
                               my $output=Apache::lonnet::ssi($src,%posthash);
-			      $output=~s|//(\s*<!--)? BEGIN LON-CAPA Internal.+// END LON-CAPA Internal\s*(-->)?\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}//;
@@ -354,17 +363,11 @@ sub handler {
                   unless ($contents) {
                       &Apache::loncommon::content_type($r,'text/html');
                       $r->send_http_header;
-                      $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(&Apache::loncommon::start_page(undef,undef,
+							       {'force_register' => 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>');
+                      $r->print('<br /><br />'.&mt('Please use the LON-CAPA navigation arrows to move to another item in the course').
+				&Apache::loncommon::end_page());
                   } else {
 # ------------------------------------------------------------------ Build page
 
@@ -372,31 +375,20 @@ sub handler {
 		      unless ($target eq 'tex') {
 			  if ($isxml) {
 			      &Apache::loncommon::content_type($r,'text/xml');
-			      $r->send_http_header;
-			      $r->print($xmlheader);
 			  } else {
 			      &Apache::loncommon::content_type($r,'text/html');
-			      $r->send_http_header;
-			      $r->print('<html>');
 			  }
+			  $r->send_http_header;
 # ------------------------------------------------------------------------ Head
-			  $r->print("\n<head>\n".$allmeta);
 			  if ($allscript) {
-			      $r->print("\n<script language='JavaScript'>\n".
-					$allscript."\n</script>\n");
+			      $allscript .= 
+				  "\n<script type=\"text/javascript\">\n".
+				  $allscript."\n</script>\n";
 			  }
-			  $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::lonmenu::loadevents.
-               '" onUnload="'.&Apache::lonmenu::unloadevents.'">'.
-                              &Apache::lonmenu::menubuttons(undef,$target,1)
-					);
-			  }
+			  $r->print(&Apache::loncommon::start_page(undef,undef,
+								   {'force_register' => 1,
+								    'bgcolor'        => '#ffffff',}));
 # ------------------------------------------------------------------ Start form
 			  if ($nforms) {
 			      $r->print('<form method="post" action="'.
@@ -417,8 +409,12 @@ 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">');
 		      }
+# which icons do we use?
+                      my $extension='png';
+                      if ($env{'environment.icons'} eq 'classic') { $extension='gif'; }
+# generate rows
                       for ($i=0;$i<=$#rows;$i++) {
 			if ($rows[$i]) {
 			    unless ($target eq 'tex') {
@@ -429,26 +425,27 @@ sub handler {
                           for ($j=0;$j<=$#colcont;$j++) {
                               my $rid=$colcont[$j];
                               my $metainfo = '';
-                              print STDERR "src is $hash{'src_'.$rid}\n";
+			      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(&Apache::lonnet::declutter($hash{'src_'.$rid})).'" />'.
+                                  $metainfo ='<a name="'.&escape($symb).'" />'.
                                   '<a href="'.$metalink{$rid}.'" target="LONcatInfo">'.
-                                  '<img src="/adm/lonMisc/cat_button.gif" border=0>'.
+                                  '<img src="/adm/lonMisc/cat_button.'.$extension.'" border=0>'.
                                   '</img></a>';
                               }
-			      my $esrc=$hash{'src_'.$rid};
-			      if ($hash{'encrypted_'.$rid}) {
-				  $esrc=&Apache::lonenc::encrypted($esrc);
-			      }
                               $metainfo .= '<a href="/adm/evaluate?postdata='.
-		    &Apache::lonnet::escape(&Apache::lonnet::declutter($esrc)).
+				  &escape($esrc).
                                   '" target="LONcatInfo">'.
-                                  '<img src="/adm/lonMisc/eval_button.gif" border=0>'.
+                                  '<img src="/adm/lonMisc/eval_button.'.$extension.'" 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=
@@ -456,20 +453,20 @@ sub handler {
                 '___'.$resid.'___'.
 		&Apache::lonnet::declutter($hash{'src_'.$rid});
                                  $metainfo.=
-                  '<a href="/adm/grades?symb='.&Apache::lonnet::escape($symb).
+                  '<a href="/adm/grades?symb='.&escape($symb).
 #                 '&command=submission" target="LONcatInfo">'.
                   '&command=submission">'.
-                          '<img src="/adm/lonMisc/subm_button.gif" border=0>'.
+                          '<img src="/adm/lonMisc/subm_button.'.$extension.'" border=0>'.
 			  '</img></a>'.
-                  '<a href="/adm/grades?symb='.&Apache::lonnet::escape($symb).
+                  '<a href="/adm/grades?symb='.&escape($symb).
 #                  '&command=gradingmenu" target="LONcatInfo">'.
                   '&command=gradingmenu">'.
-                          '<img src="/adm/lonMisc/pgrd_button.gif" border=0>'.
+                          '<img src="/adm/lonMisc/pgrd_button.'.$extension.'" border=0>'.
 			  '</img></a>'.
-                  '<a href="/adm/parmset?symb='.&Apache::lonnet::escape($symb).
+                  '<a href="/adm/parmset?symb='.&escape($symb).
 #                          '" target="LONcatInfo">'.
                           '" >'.
-                          '<img src="/adm/lonMisc/pprm_button.gif" border=0>'.
+                          '<img src="/adm/lonMisc/pprm_button.'.$extension.'" border=0>'.
 			      '</img></a>';
                               }
                               $metainfo.='<br></br>';
@@ -502,18 +499,16 @@ 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 />');
-                                      } else {
-                                          $r->print('\hline');
-                                      }
+                                      } 
 				  }
 			      } elsif ($cellemb{$rid} eq 'img') {
                                   $r->print('>'.$metainfo.'<img src="'.
-                                    $hash{'src_'.$rid}.'"></img>');
+                                    $hash{'src_'.$rid}.'" />');
 			      } elsif ($cellemb{$rid} eq 'emb') {
                                   $r->print('>'.$metainfo.'<embed src="'.
                                     $hash{'src_'.$rid}.'"></embed>');
@@ -549,15 +544,19 @@ sub handler {
 			  (($nforms>1)?'submit':'hidden').'"></input></form>');
                       }
 		      unless ($target eq 'tex') {
-			  $r->print('</body>'.&Apache::lonxml::xmlend());
+			  $r->print(&Apache::loncommon::end_page({'discussion'
+								      => 1,}));
 		      } 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);
               }
@@ -572,7 +571,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;