--- rat/lonpage.pm	2001/12/17 00:57:59	1.30
+++ rat/lonpage.pm	2002/03/28 21:47:48	1.36
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.30 2001/12/17 00:57:59 harris41 Exp $
+# $Id: lonpage.pm,v 1.36 2002/03/28 21:47:48 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,6 +34,8 @@
 # YEAR=2001
 # 08/13/01,08/30,10/1 Gerd Kortemeyer
 # 12/16 Scott Harrison
+# YEAR=2002
+# 03/19 Gerd Kortemeyer
 #
 ###
 
@@ -304,7 +306,10 @@ sub handler {
                               $thisdir=~s/\/[^\/]*$//;
 			      foreach (@rlinks) {
 				  unless (($_=~/^http:\/\//i) ||
-                                          ($_=~/^\//)) {
+					  ($_=~/^\//) ||
+					  ($_=~/^javascript:/i) ||
+					  ($_=~/^mailto:/i) ||
+					  ($_=~/^\#/)) {
 				      my $newlocation=
 				    &Apache::lonnet::hreflocation($thisdir,$_);
                      $output=~s/(\"|\'|\=\s*)$_(\"|\'|\s|\>)/$1$newlocation$2/;
@@ -343,7 +348,7 @@ sub handler {
 			  $r->print("\n<script language='JavaScript'>\n".
                                    $allscript."\n</script>\n");
                       }
-                      $r->print(&Apache::lonxml::registerurl(1));
+                      $r->print(&Apache::lonxml::registerurl(1,undef));
                       $r->print("\n</head>\n");
 # ------------------------------------------------------------------ Start body
                       if ($isxml) {
@@ -370,7 +375,11 @@ sub handler {
                               my $metainfo='<a href="'.
                                     $metalink{$rid}.'" target="LONcatInfo">'.
                           '<img src="/adm/lonMisc/cat_button.gif" border=0>'.
-			  '</img></a>';
+			  '</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>';
                               if (
  ($hash{'src_'.$rid}=~/\.(problem|exam|quiz|assess|survey|form)$/) &&
  (&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'}))) {
@@ -380,15 +389,16 @@ sub handler {
                 '___'.$resid.'___'.
 		&Apache::lonnet::declutter($hash{'src_'.$rid});
                                  $metainfo.=
-                  '<a href="/adm/grades?symb='.$symb.
+                  '<a href="/adm/grades?symb='.&Apache::lonnet::escape($symb).
                   '&command=submission" target="LONcatInfo">'.
                           '<img src="/adm/lonMisc/subm_button.gif" border=0>'.
 			  '</img></a>'.
-                  '<a href="/adm/grades?symb='.$symb.
+                  '<a href="/adm/grades?symb='.&Apache::lonnet::escape($symb).
                   '&command=viewgrades" target="LONcatInfo">'.
                           '<img src="/adm/lonMisc/pgrd_button.gif" border=0>'.
 			  '</img></a>'.
-                  '<a href="/adm/parmset?symb='.$symb.'" target="LONcatInfo">'.
+                  '<a href="/adm/parmset?symb='.&Apache::lonnet::escape($symb).
+                          '" target="LONcatInfo">'.
                           '<img src="/adm/lonMisc/pprm_button.gif" border=0>'.
 			      '</img></a>';
                               }