--- loncom/interface/lonhtmlcommon.pm	2006/05/29 16:01:22	1.129
+++ loncom/interface/lonhtmlcommon.pm	2006/05/30 12:46:09	1.130
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.129 2006/05/29 16:01:22 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.130 2006/05/30 12:46:09 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,6 +60,8 @@ use Time::Local;
 use Time::HiRes;
 use Apache::lonlocal;
 use Apache::lonnet;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
 
 ##############################################
 ##############################################
@@ -93,7 +95,7 @@ sub authorbombs {
 
 sub recent_filename {
     my $area=shift;
-    return 'nohist_recent_'.&Apache::lonnet::escape($area);
+    return 'nohist_recent_'.&escape($area);
 }
 
 sub store_recent {
@@ -115,7 +117,7 @@ sub store_recent {
     }
 # store new value
     &Apache::lonnet::put($file,{ $name => 
-				 time.'&'.&Apache::lonnet::escape($value) });
+				 time.'&'.&escape($value) });
 }
 
 sub remove_recent {
@@ -134,7 +136,7 @@ sub select_recent {
 	unless ($_=~/^error\:/) {
 	    my $escaped = &Apache::loncommon::escape_url($_);
 	    $return.="\n<option value='$escaped'>".
-		&Apache::lonnet::unescape((split(/\&/,$recent{$_}))[1]).
+		&unescape((split(/\&/,$recent{$_}))[1]).
 		'</option>';
 	}
     }
@@ -158,7 +160,7 @@ sub get_recent {
     my $idx = 1;
     foreach (reverse sort keys %time_hash) {
        $return_hash{$time_hash{$_}} =
-                  &Apache::lonnet::unescape((split(/\&/,$recent{$_}))[1]);
+                  &unescape((split(/\&/,$recent{$_}))[1]);
        if ($n && ($idx++ >= $n)) {last;}
     }
 
@@ -1079,7 +1081,7 @@ sub disablelink {
     if (defined($#fields)) {
 	unless ($#fields>=0) { return ''; }
     }
-    return '<a href="'.&HTML::Entities::encode('/adm/preferences?action=set_wysiwyg&wysiwyg=off&returnurl=','<>&"').&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'">'.&mt('Disable WYSIWYG Editor').'</a>';
+    return '<a href="'.&HTML::Entities::encode('/adm/preferences?action=set_wysiwyg&wysiwyg=off&returnurl=','<>&"').&escape($ENV{'REQUEST_URI'}).'">'.&mt('Disable WYSIWYG Editor').'</a>';
 }
 
 sub enablelink {
@@ -1087,7 +1089,7 @@ sub enablelink {
     if (defined($#fields)) {
 	unless ($#fields>=0) { return ''; }
     }
-    return '<a href="'.&HTML::Entities::encode('/adm/preferences?action=set_wysiwyg&wysiwyg=on&returnurl=','<>&"').&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'">'.&mt('Enable WYSIWYG Editor').'</a>';
+    return '<a href="'.&HTML::Entities::encode('/adm/preferences?action=set_wysiwyg&wysiwyg=on&returnurl=','<>&"').&escape($ENV{'REQUEST_URI'}).'">'.&mt('Enable WYSIWYG Editor').'</a>';
 }
 
 # ----------------------------------------- Script to activate only some fields