--- rat/lonpage.pm	2006/04/04 19:54:51	1.74
+++ rat/lonpage.pm	2007/06/25 23:10:26	1.82
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.74 2006/04/04 19:54:51 albertel Exp $
+# $Id: lonpage.pm,v 1.82 2007/06/25 23:10:26 albertel 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;
@@ -267,7 +270,7 @@ sub handler {
 				  }
 			      }
                               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}//;
@@ -335,7 +338,7 @@ 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) {
@@ -408,6 +411,10 @@ sub handler {
 		      } else {
 			  $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') {
@@ -425,42 +432,45 @@ sub handler {
 				  $symb=&Apache::lonenc::encrypted($symb);
 				  $esrc=&Apache::lonenc::encrypted($esrc);
 			      }
-                              unless ($hash{'src_'.$rid} =~ m-^/uploaded/-) { 
-                                  $metainfo ='<a name="'.&Apache::lonnet::escape($symb).'" />'.
+                              if ($hash{'src_'.$rid} !~ m-^/uploaded/-
+				  && !$env{'request.enc'}
+				  && ($env{'request.role.adv'}
+				      || !$hash{'encrypted_'.$rid})) { 
+                                  $metainfo ='<a name="'.&escape($symb).'" />'.
                                   '<a href="'.$metalink{$rid}.'" target="LONcatInfo">'.
-                                  '<img src="/adm/lonMisc/cat_button.gif" border=0>'.
-                                  '</img></a>';
+                                  '<img src="/adm/lonMisc/cat_button.'.$extension.'" class="LC_icon" />'.
+                                  '</a>';
                               }
                               $metainfo .= '<a href="/adm/evaluate?postdata='.
-				  &Apache::lonnet::escape($esrc).
+				  &escape($esrc).
                                   '" target="LONcatInfo">'.
-                                  '<img src="/adm/lonMisc/eval_button.gif" border=0>'.
-                                  '</img></a>';
+                                  '<img src="/adm/lonMisc/eval_button.'.$extension.'" class="LC_icon" />'.
+                                  '</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).
+				  my $symb= &Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$hash{'src_'.$rid});
+				  if ($hash{'encrypted_'.$resid}) { 
+				      $symb = &Apache::lonenc::encrypt($symb);
+				  }
+				  $metainfo.=
+                  '<a href="/adm/grades?symb='.&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).
+                          '<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.gif" border=0>'.
-			  '</img></a>'.
-                  '<a href="/adm/parmset?symb='.&Apache::lonnet::escape($symb).
+                          '<img src="/adm/lonMisc/pgrd_button.'.$extension.'" class="LC_icon" />'.
+			  '</a>'.
+                  '<a href="/adm/parmset?symb='.&escape($symb).
 #                          '" target="LONcatInfo">'.
                           '" >'.
-                          '<img src="/adm/lonMisc/pprm_button.gif" border=0>'.
-			      '</img></a>';
+                          '<img src="/adm/lonMisc/pprm_button.'.$extension.'" class="LC_icon" />'.
+			      '</a>';
                               }
                               $metainfo.='<br></br>';
 			    unless ($target eq 'tex') {
@@ -497,13 +507,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>');
@@ -539,7 +547,8 @@ sub handler {
 			  (($nforms>1)?'submit':'hidden').'"></input></form>');
                       }
 		      unless ($target eq 'tex') {
-			  $r->print(&Apache::loncommon::end_page());
+			  $r->print(&Apache::loncommon::end_page({'discussion'
+								      => 1,}));
 		      } else {
 			  $r->print('\end{document}'.$number_of_columns);
 		      }