--- loncom/lonenc.pm	2004/11/09 21:16:31	1.3
+++ loncom/lonenc.pm	2004/11/16 15:26:36	1.7
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # URL translation for encrypted filenames
 #
-# $Id: lonenc.pm,v 1.3 2004/11/09 21:16:31 albertel Exp $
+# $Id: lonenc.pm,v 1.7 2004/11/16 15:26:36 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,11 +44,14 @@ sub handler {
 	my $handle=$lonid->value;
         $handle=~s/\W//g;
         my $lonidsdir=$r->dir_config('lonIDsDir');
+	$ENV{'request.enc'}=1;
         if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) {
 # Initialize Environment
             &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
 # Decrypt URL and redirect
-	    $r->internal_redirect(&unencrypted($r->uri));
+	    &Apache::lonnet::logthis("args ".$r->args);
+	    &Apache::lonnet::logthis("uri ".$r->uri);
+	    $r->internal_redirect(&unencrypted($r->uri).'?'.$r->args);
 	    return OK;
 	} 
     }
@@ -79,6 +82,7 @@ sub unencrypted {
 				  pack("H16",substr($uri,$encidx,16))
 				  );
     }
+    $ENV{'request.enc'}=1;
     return substr($decuri,0,$cmdlength);
 }
 
@@ -100,6 +104,22 @@ sub encrypted {
     return '/enc/'.$cmdlength.'/'.&Apache::lonnet::escape($encuri);
 }
 
+sub check_encrypt {
+    my $str=shift;
+    if ($ENV{'request.enc'}) { return &Apache::lonenc::encrypted($str); }
+    return $str;
+}
+
+sub check_decrypt {
+    my ($str)=@_;
+    if (ref($str)) {
+	if ($$str=~m|^/enc/|) { $$str=&Apache::lonenc::unencrypted($$str); }
+	return;
+    }
+    if ($str=~m|^/enc/|) { return &Apache::lonenc::unencrypted($str); }
+    return $str;
+}
+
 1;
 __END__