--- loncom/lonenc.pm	2005/01/19 18:16:35	1.10
+++ loncom/lonenc.pm	2005/04/07 06:56:20	1.11
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # URL translation for encrypted filenames
 #
-# $Id: lonenc.pm,v 1.10 2005/01/19 18:16:35 albertel Exp $
+# $Id: lonenc.pm,v 1.11 2005/04/07 06:56:20 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,7 +30,7 @@ package Apache::lonenc;
 
 use strict;
 use Apache::Constants qw(:common :remotehost);
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::File();
 use Apache::loncommon;
 use Crypt::IDEA;
@@ -45,7 +45,7 @@ sub handler {
 	my $handle=$lonid->value;
         $handle=~s/\W//g;
         my $lonidsdir=$r->dir_config('lonIDsDir');
-	$ENV{'request.enc'}=1;
+	$env{'request.enc'}=1;
         if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) {
 # Initialize Environment
             &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
@@ -60,7 +60,7 @@ sub handler {
 }
 
 sub encryptseed {
-    my $seed=$ENV{'course.'.$ENV{'request.course.id'}.'.internal.encseed'};
+    my $seed=$env{'course.'.$env{'request.course.id'}.'.internal.encseed'};
     $seed=~s/[^0-9a-f]/0/g;
     $seed.='0123456789abcdef';
     $seed=substr($seed.$seed,0,32);
@@ -83,7 +83,7 @@ sub unencrypted {
 				  pack("H16",substr($uri,$encidx,16))
 				  );
     }
-    $ENV{'request.enc'}=1;
+    $env{'request.enc'}=1;
     $decuri=&remove_noise($decuri);
     return substr($decuri,0,$cmdlength);
 }
@@ -111,7 +111,7 @@ sub remove_noise {
 
 sub encrypted {
     my $uri=shift;
-    if ($ENV{'request.role.adv'}) { return($uri); }
+    if ($env{'request.role.adv'}) { return($uri); }
     my $seed=&encryptseed();
     unless ($seed) {
 	return $uri;
@@ -132,7 +132,7 @@ sub encrypted {
 
 sub check_encrypt {
     my $str=shift;
-    if ($ENV{'request.enc'}) { return &Apache::lonenc::encrypted($str); }
+    if ($env{'request.enc'}) { return &Apache::lonenc::encrypted($str); }
     return $str;
 }
 
@@ -149,7 +149,7 @@ sub check_decrypt {
 sub encrypt_ref {
     my ($token,$elements)=@_;
     my $html;
-    if ($ENV{'request.enc'}) {
+    if ($env{'request.enc'}) {
 	while (my ($name,$value)= each(%{ $elements })) {
 	    if (!$value) { next; }
 	    my $href=&Apache::lonnet::hreflocation($Apache::lonxml::pwd[-1],$value);