loncom/lonenc.pm - diff

Return to lonenc.pm CVS log

Up to [LON-CAPA] / loncom

Diff for /loncom/lonenc.pm between versions 1.15 and 1.18

version 1.15, 2006/05/30 12:45:12	version 1.18, 2006/12/08 22:04:57
Line 32 use strict;	Line 32 use strict;
use Apache::lonnet;	use Apache::lonnet;
use Crypt::IDEA;	use Crypt::IDEA;
use Time::HiRes qw(gettimeofday);	use Time::HiRes qw(gettimeofday);
use lib '/home/httpd/lib/perl/';
use LONCAPA;	use LONCAPA;

sub encryptseed {	sub encryptseed {
Line 47 sub unencrypted {	Line 46 sub unencrypted {
my $uri=shift;	my $uri=shift;
$uri=~s/^\/enc\/(\d+)\///;	$uri=~s/^\/enc\/(\d+)\///;
my $cmdlength=$1;	my $cmdlength=$1;
	# strip any added extension
	$uri=~s/\.[^.]*//;
my $seed=&encryptseed();	my $seed=&encryptseed();
unless ($seed) {	unless ($seed) {
return '/'.$uri;	return '/'.$uri;
Line 108 sub encrypted {	Line 109 sub encrypted {

sub check_encrypt {	sub check_encrypt {
my $str=shift;	my $str=shift;
if ($env{'request.enc'}) { return &Apache::lonenc::encrypted($str); }	if (ref($str)) {
	if ($env{'request.enc'}) { $$str = &Apache::lonenc::encrypted($$str); }
	return;
	} else {
	if ($env{'request.enc'}) { return &Apache::lonenc::encrypted($str); }
	}
return $str;	return $str;
}	}

Line 130 sub encrypt_ref {	Line 136 sub encrypt_ref {
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:/) {	if ($href !~ /^http:/) {
	# IE really wants an extension
	my ($extension) = ($href =~ m/(\.[^.]*)$/);
$href = &Apache::lonenc::encrypted($href,$force_enc);	$href = &Apache::lonenc::encrypted($href,$force_enc);
	$href .= $extension;
}	}
$token->[2]->{$name}=$href;	$token->[2]->{$name}=$href;
}	}

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

Removed from v.1.15
changed lines
	Added in v.1.18