--- loncom/lonenc.pm	2006/04/07 22:15:34	1.14
+++ loncom/lonenc.pm	2006/05/30 19:47:28	1.16
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # URL translation for encrypted filenames
 #
-# $Id: lonenc.pm,v 1.14 2006/04/07 22:15:34 albertel Exp $
+# $Id: lonenc.pm,v 1.16 2006/05/30 19:47:28 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,7 +32,8 @@ use strict;
 use Apache::lonnet;
 use Crypt::IDEA;
 use Time::HiRes qw(gettimeofday);
-
+use LONCAPA;
+ 
 sub encryptseed {
     my $seed=$env{'course.'.$env{'request.course.id'}.'.internal.encseed'};
     $seed=~s/[^0-9a-f]/0/g;
@@ -49,7 +50,7 @@ sub unencrypted {
     unless ($seed) {
 	return '/'.$uri;
     }
-    $uri=&Apache::lonnet::unescape($uri);
+    $uri=&unescape($uri);
     my $cipher=new IDEA $seed;
     my $decuri='';
     for (my $encidx=0;$encidx<length($uri);$encidx+=16) {
@@ -101,7 +102,7 @@ sub encrypted {
 	$encuri.=unpack("H16",
 			$cipher->encrypt(substr($uri,$encidx,8)));
     }
-    return '/enc/'.$cmdlength.'/'.&Apache::lonnet::escape($encuri);
+    return '/enc/'.$cmdlength.'/'.&escape($encuri);
 }
 
 sub check_encrypt {