--- loncom/lonenc.pm	2004/03/31 04:38:06	1.1
+++ loncom/lonenc.pm	2004/11/11 20:05:56	1.5
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # URL translation for encrypted filenames
 #
-# $Id: lonenc.pm,v 1.1 2004/03/31 04:38:06 www Exp $
+# $Id: lonenc.pm,v 1.5 2004/11/11 20:05:56 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,44 +44,59 @@ 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;
 	} 
     }
     return FORBIDDEN;
 }
 
+sub encryptseed {
+    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);
+    return pack("H32",$seed);
+}
+
 sub unencrypted {
     my $uri=shift;
     $uri=~s/^\/enc\/(\d+)\///;
-    &Apache::lonnet::logthis($uri);
     my $cmdlength=$1;
-    unless ($ENV{'course.'.$ENV{'request.course.id'}.'.internal.encseed'}) {
+    my $seed=&encryptseed();
+    unless ($seed) {
 	return '/'.$uri;
     }
     $uri=&Apache::lonnet::unescape($uri);
-    my $cipher=
-	new IDEA $ENV{'course.'.$ENV{'request.course.id'}.'.internal.encseed'};
-    &Apache::lonnet::logthis($ENV{'course.'.$ENV{'request.course.id'}.'.internal.encseed'});
+    my $cipher=new IDEA $seed;
     my $decuri='';
     for (my $encidx=0;$encidx<length($uri);$encidx+=16) {
 	$decuri.=$cipher->decrypt(
 				  pack("H16",substr($uri,$encidx,16))
 				  );
     }
+    $ENV{'request.enc'}=1;
     return substr($decuri,0,$cmdlength);
 }
 
 sub encrypted {
     my $uri=shift;
+    if ($ENV{'request.role.adv'}) { return($uri); }
+    my $seed=&encryptseed();
+    unless ($seed) {
+	return $uri;
+    }
     my $cmdlength=length($uri);
+    $uri.='00000000';
     my $encuri='';
-    my $cipher=
-	new IDEA $ENV{'course.'.$ENV{'request.course.id'}.'.internal.encseed'};
+    my $cipher=new IDEA $seed;
     for (my $encidx=0;$encidx<=$cmdlength;$encidx+=8) {
 	$encuri.=unpack("H16",
 			$cipher->encrypt(substr($uri,$encidx,8)));
@@ -89,6 +104,12 @@ 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;
+}
+
 1;
 __END__