--- rat/lonpage.pm	2006/04/04 19:54:51	1.74
+++ rat/lonpage.pm	2006/12/12 18:49:27	1.76
@@ -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.76 2006/12/12 18:49:27 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;
@@ -426,13 +429,13 @@ sub handler {
 				  $esrc=&Apache::lonenc::encrypted($esrc);
 			      }
                               unless ($hash{'src_'.$rid} =~ m-^/uploaded/-) { 
-                                  $metainfo ='<a name="'.&Apache::lonnet::escape($symb).'" />'.
+                                  $metainfo ='<a name="'.&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).
+				  &escape($esrc).
                                   '" target="LONcatInfo">'.
                                   '<img src="/adm/lonMisc/eval_button.gif" border=0>'.
                                   '</img></a>';
@@ -446,17 +449,17 @@ 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></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></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>'.
@@ -539,7 +542,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);
 		      }