--- rat/lonpage.pm	2005/04/07 06:56:27	1.70
+++ rat/lonpage.pm	2008/12/21 04:29:47	1.87.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.70 2005/04/07 06:56:27 albertel Exp $
+# $Id: lonpage.pm,v 1.87.2.1 2008/12/21 04:29:47 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,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;
@@ -75,7 +78,7 @@ sub tracetable {
                     my $frid=$hash{'map_finish_'.$hash{'src_'.$rid}};
 	            $sofar=
                        &tracetable($sofar,$hash{'map_start_'.$hash{'src_'.$rid}},
-                       '&'.$frid.'&');
+                       '&'.$frid.$beenhere);
                     $sofar++;
                     if ($hash{'src_'.$frid}) {
                         my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$frid});
@@ -180,8 +183,10 @@ sub handler {
                   for ($i=0;$i<=$#rows;$i++) {
 		     if ($rows[$i]) {
                         my @colcont=split(/\&/,$rows[$i]);
-                        foreach (@colcont) {
-                           $symbhash{$hash{'src_'.$_}}=['page','notasymb'];
+                        foreach my $rid (@colcont) {
+			    my ($mapid,$resid)=split(/\./,$rid);
+			    $symbhash{$hash{'src_'.$rid}}=
+				[$hash{'src_'.$rid},$resid];
 		        }
 		     }
 		  }
@@ -201,8 +206,6 @@ sub handler {
                   my %ssivlink=();
                   my %ssialink=();
      
-                  my %metalink=();
-
                   my %cellemb=();
 
                   my $allscript='';
@@ -225,7 +228,6 @@ sub handler {
 			  if ($hash{'encrypted_'.$_}) {
 			      $src=&Apache::lonenc::encrypted($src);
 			  }
-                          $metalink{$_}=$src.'.meta';
                           $cellemb{$_}=
 			      &Apache::loncommon::fileembstyle($extension);
                           if ($cellemb{$_} eq 'ssi') {
@@ -235,6 +237,7 @@ sub handler {
 			      
 			      my $prefix=$_.'_';
                               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'};
@@ -243,18 +246,28 @@ sub handler {
 				  $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}//;
@@ -322,11 +335,11 @@ sub handler {
                                   $output=~s/\<form[^\>]*\>//gsi;
                                   $output=~s/\<\/form[^\>]*\>//gsi;
                                   $output=~
-				      s/\<((?:input|select|button|textarea)[^\>]+)name\s*\=\s*[\'\"]*([\w\.\:]+)[\'\"]*([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi;
+				      s/\<((?:input|select|button|textarea)[^\>]+)name\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi;
                               }
                               $thisdir=~s/\/[^\/]*$//;
 			      foreach (@rlinks) {
-				  unless (($_=~/^http:\/\//i) ||
+				  unless (($_=~/^https?\:\/\//i) ||
 					  ($_=~/^\//) ||
 					  ($_=~/^javascript:/i) ||
 					  ($_=~/^mailto:/i) ||
@@ -347,17 +360,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
 
@@ -365,34 +372,24 @@ 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,$allscript,
+								   {'force_register' => 1,
+								    'bgcolor'        => '#ffffff',}));
 # ------------------------------------------------------------------ Start form
 			  if ($nforms) {
-			      $r->print('<form method="post" action="'.
+			      $r->print('<form name="lonhomework" method="post"  enctype="multipart/form-data" action="'.
 					&Apache::lonenc::check_encrypt($requrl)
 					.'">');
 			  }
@@ -412,6 +409,7 @@ sub handler {
 		      } else {
 			  $r->print('<table width="100%" cols="'.$lcm.'" border="0">');
 		      }
+# generate rows
                       for ($i=0;$i<=$#rows;$i++) {
 			if ($rows[$i]) {
 			    unless ($target eq 'tex') {
@@ -421,52 +419,8 @@ sub handler {
                           my $avespan=$lcm/($#colcont+1);
                           for ($j=0;$j<=$#colcont;$j++) {
                               my $rid=$colcont[$j];
-                              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'})) && 
- ($hash{'src_'.$rid} !~ m-^/uploaded/-)) {
-				  my ($mapid,$resid)=split(/\./,$rid);
-                                 my $symb=
-                &Apache::lonnet::declutter($hash{'map_id_'.$mapid}).
-                '___'.$resid.'___'.
-		&Apache::lonnet::declutter($hash{'src_'.$rid});
-                                 $metainfo.=
-                  '<a href="/adm/grades?symb='.&Apache::lonnet::escape($symb).
-#                 '&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">'.
-                          '<img src="/adm/lonMisc/pgrd_button.gif" border=0>'.
-			  '</img></a>'.
-                  '<a href="/adm/parmset?symb='.&Apache::lonnet::escape($symb).
-#                          '" target="LONcatInfo">'.
-                          '" >'.
-                          '<img src="/adm/lonMisc/pprm_button.gif" border=0>'.
-			      '</img></a>';
-                              }
-                              $metainfo.='<br></br>';
+
+			      my $metainfo =&get_buttons(\%hash,$rid).'<br />';
 			    unless ($target eq 'tex') {
 				$r->print('<td colspan="'.$avespan.'"');
 			    }
@@ -501,13 +455,11 @@ sub handler {
                                       '.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>');
@@ -543,7 +495,8 @@ 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);
 		      }
@@ -575,6 +528,65 @@ sub handler {
   return OK; 
 }
 
+sub get_buttons {
+    my ($hash,$rid) = @_;
+
+    # which icons do we use?
+    my $extension='png';
+    if ($env{'environment.icons'} eq 'classic') { $extension='gif'; }
+
+    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);
+    }
+    if ($hash->{'src_'.$rid} !~ m-^/uploaded/-
+	&& !$env{'request.enc'}
+	&& ($env{'request.role.adv'}
+	    || !$hash->{'encrypted_'.$rid})) { 
+	$metainfo .='<a name="'.&escape($symb).'" />'.
+	    '<a href="'.$hash->{'src_'.$rid}.'.meta'.'" target="LONcatInfo">'.
+	    '<img src="/adm/lonMisc/cat_button.'.$extension.'" class="LC_icon" />'.
+	    '</a>';
+    }
+    $metainfo .= '<a href="/adm/evaluate?postdata='.
+	&escape($esrc).
+	'" target="LONcatInfo">'.
+	'<img src="/adm/lonMisc/eval_button.'.$extension.'" class="LC_icon" />'.
+	'</a>';
+    if (($hash->{'src_'.$rid}=~/\.(problem|exam|quiz|assess|survey|form)$/) &&
+	($hash->{'src_'.$rid} !~ m-^/uploaded/-)) {
+
+	if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) {
+	    $metainfo.=
+		'<a href="/adm/grades?symb='.&escape($symb).
+#               '&command=submission" target="LONcatInfo">'.
+		'&command=submission">'.
+		'<img src="/adm/lonMisc/subm_button.'.$extension.'" class="LC_icon" />'.
+		'</a>'.
+		'<a href="/adm/grades?symb='.&escape($symb).
+#               '&command=gradingmenu" target="LONcatInfo">'.
+		'&command=gradingmenu">'.
+		'<img src="/adm/lonMisc/pgrd_button.'.$extension.'" class="LC_icon" />'.
+		'</a>';
+	}
+	if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {
+	    $metainfo.=
+		'<a href="/adm/parmset?symb='.&escape($symb).
+#               '" target="LONcatInfo">'.
+		'" >'.
+		'<img src="/adm/lonMisc/pprm_button.'.$extension.'" class="LC_icon" />'.
+		'</a>';
+	}
+    }
+    return $metainfo;
+}
+
 1;
 __END__