Diff for /loncom/lonenc.pm between versions 1.11 and 1.12

version 1.11, 2005/04/07 06:56:20 version 1.12, 2006/03/22 19:37:44
Line 110  sub remove_noise { Line 110  sub remove_noise {
 }  }
   
 sub encrypted {  sub encrypted {
     my $uri=shift;      my ($uri,$force_enc) = @_;
     if ($env{'request.role.adv'}) { return($uri); }      if (!$force_enc && $env{'request.role.adv'}) { return($uri); }
     my $seed=&encryptseed();      my $seed=&encryptseed();
     unless ($seed) {      unless ($seed) {
  return $uri;   return $uri;
Line 147  sub check_decrypt { Line 147  sub check_decrypt {
 }  }
   
 sub encrypt_ref {  sub encrypt_ref {
     my ($token,$elements)=@_;      my ($token,$elements,$force_enc)=@_;
     my $html;      my $html;
     if ($env{'request.enc'}) {      &Apache::lonnet::logthis("hrrm $force_enc");
       if ($force_enc || $env{'request.enc'}) {
  while (my ($name,$value)= each(%{ $elements })) {   while (my ($name,$value)= each(%{ $elements })) {
     if (!$value) { next; }      if (!$value) { next; }
     my $href=&Apache::lonnet::hreflocation($Apache::lonxml::pwd[-1],$value);      my $href=&Apache::lonnet::hreflocation($Apache::lonxml::pwd[-1],$value);
     if ($href !~ /^http:/) { $href=&Apache::lonenc::encrypted($href); }      if ($href !~ /^http:/) {
    $href = &Apache::lonenc::encrypted($href,$force_enc);
       }
     $token->[2]->{$name}=$href;      $token->[2]->{$name}=$href;
  }   }
    delete($token->[2]->{'encrypturl'});
  $html = &Apache::edit::rebuild_tag($token);   $html = &Apache::edit::rebuild_tag($token);
     } else {      } else {
  $html = $token->[4];   $html = $token->[4];

Removed from v.1.11  
changed lines
  Added in v.1.12


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>