--- loncom/interface/lonwhatsnew.pm	2006/05/01 19:37:34	1.54
+++ loncom/interface/lonwhatsnew.pm	2006/05/30 12:46:09	1.55
@@ -1,5 +1,5 @@
 #
-# $Id: lonwhatsnew.pm,v 1.54 2006/05/01 19:37:34 albertel Exp $
+# $Id: lonwhatsnew.pm,v 1.55 2006/05/30 12:46:09 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,6 +39,8 @@ use Apache::lonuserstate;
 use Apache::Constants qw(:common :http);
 use Time::Local;
 use GDBM_File;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
 
 #----------------------------
 # handler
@@ -807,7 +809,7 @@ sub check_bombed {
         my @bombs = split(/,/, $errors);
         my $errorcount = scalar(@bombs);
         my $errorlink = '<a href="/adm/email?display='.
-                        &Apache::lonnet::escape($bombs[0]).'">'.
+                        &escape($bombs[0]).'">'.
                         $title.'</a>';
         $$bombed{$symb}{errorcount} = $errorcount;
         $$bombed{$symb}{errorlink} = $errorlink;
@@ -870,8 +872,8 @@ sub check_thresholds {
         $$triggered{$symb}{title} = $resource->title;
         foreach my $part (@parts) {
             if (exists($stats{$part}{users})) {
-                my $resetname = 'reset_'.&Apache::lonnet::escape($symb."\0".$part);
-                my $resettitle = 'title_'.&Apache::lonnet::escape($symb."\0".$part);
+                my $resetname = 'reset_'.&escape($symb."\0".$part);
+                my $resettitle = 'title_'.&escape($symb."\0".$part);
                 if ($$triggered{$symb}{numparts}) {
                     $$triggered{$symb}{text} .= '<tr bgcolor="'.$rowColor.'">'."\n";
                 }
@@ -887,7 +889,7 @@ sub check_thresholds {
                      <td align="right"><small>'.$stats{$part}{attempts}.'</small></td>
                      <td align="right"><small>'.$stats{$part}{degdiff}.'</small></td>
                      <td align="right"><small>'.$lastreset{$part}.'</small></td>
-                     <td align="right"><small><input type="checkbox" name="'.$resetname.'" /><input type="hidden" name="'.$resettitle.'" value="'.&Apache::lonnet::escape($$triggered{$symb}{title}).'" /></td>
+                     <td align="right"><small><input type="checkbox" name="'.$resetname.'" /><input type="hidden" name="'.$resettitle.'" value="'.&escape($$triggered{$symb}{title}).'" /></td>
                     </tr>';
                 $$triggered{$symb}{numparts} ++;
             }
@@ -958,8 +960,8 @@ sub process_reset {
     my %titles = ();
     foreach my $key (keys(%env)) {
         next if ($key !~ /^form\.reset_(.+)$/);
-        my $title = &Apache::lonnet::unescape($env{'form.title_'.$1});
-        my $reset_item = &Apache::lonnet::unescape($1);
+        my $title = &unescape($env{'form.title_'.$1});
+        my $reset_item = &unescape($1);
         my %curr_aggregates = &Apache::lonnet::dump('nohist_resourcetracker',$dom,$crs,$reset_item);
         my %aggregates = ();
         my ($symb,$part) = split(/\0/,$reset_item);
@@ -1017,7 +1019,7 @@ sub getnormalmail {
 
     my @messages = sort(&Apache::lonnet::getkeys('nohist_email'));
     foreach my $message (@messages) {
-	my $msgid=&Apache::lonnet::escape($message);
+	my $msgid=&escape($message);
         my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)=
             &Apache::lonmsg::unpackmsgid($msgid);
         if (($fromcid) && ($fromcid eq $env{'request.course.id'})) {
@@ -1133,7 +1135,7 @@ sub display_handgrade {
             }
             my ($map,$id,$url)=&Apache::lonnet::decode_symb($res);
             my $linkurl=&Apache::lonnet::clutter($url);
-            $linkurl .= '?symb='.&Apache::lonnet::escape($res);
+            $linkurl .= '?symb='.&escape($res);
                                                                                
             $r->print('<tr bgcolor="'.$rowColor.'"><td><a href="'.$linkurl.'"><small>'.$$ungraded{$res}{title}.'</small></a></td><td align="right"><small>'.$$ungraded{$res}{count}.'</small></td></tr>');
             $rowNum ++;
@@ -1204,7 +1206,7 @@ sub display_abovethreshold {
             if ($$triggered{$res}{numparts} > 1) {
                 $rowspan = 'rowspan="'.$$triggered{$res}{numparts}.'"';
             }
-            $linkurl .= '?symb='.&Apache::lonnet::escape($res);
+            $linkurl .= '?symb='.&escape($res);
             $r->print('<tr bgcolor="'.$rowColor.'"><td '.$rowspan.'><a href="'.$linkurl.'"><small>'.$$triggered{$res}{title}.'</small></a></td>'.$$triggered{$res}{text});
             $warningnum ++;
         }
@@ -1238,7 +1240,7 @@ sub display_versionchanges {
             }
             my ($map,$id,$url)=&Apache::lonnet::decode_symb($item);
             my $linkurl=&Apache::lonnet::clutter($url);
-            $linkurl .= '?symb='.&Apache::lonnet::escape($item);
+            $linkurl .= '?symb='.&escape($item);
 
             $r->print('<tr bgcolor="'.$rowColor.'"><td><small><a href="'.$linkurl.'">'.$$res_title{$item}.'</a></small></td><td><small>'.$$changed{$item}{'revdate'}.'</small></td><td><small>'.$$changed{$item}{'current'}.'</small></td><td><small>'.$$changed{$item}{'version'}.'</small></td></tr>');
             $changenum ++;