loncom/lonnet/perl/lonnet.pm - diff

Return to lonnet.pm CVS log

Up to [LON-CAPA] / loncom / lonnet / perl

version 1.267, 2002/08/13 14:37:52	version 1.269, 2002/08/17 18:58:28
Line 3082 sub receipt {	Line 3082 sub receipt {
# ------------------------------------------------------------ Serves up a file	# ------------------------------------------------------------ Serves up a file
# returns either the contents of the file or a -1	# returns either the contents of the file or a -1
sub getfile {	sub getfile {
my $file=shift;	my $file=shift;
	if ($file=~/^\/*uploaded\//) { # user file
	my $ua=new LWP::UserAgent;
	my $request=new HTTP::Request('GET',&tokenwrapper($file));
	my $response=$ua->request($request);
	if ($response->is_success()) {
	return $response->content;
	} else {
	return -1;
	}
	} else { # normal file from res space
&repcopy($file);	&repcopy($file);
if (! -e $file ) { return -1; };	if (! -e $file ) { return -1; };
my $fh=Apache::File->new($file);	my $fh=Apache::File->new($file);
my $a='';	my $a='';
while (<$fh>) { $a .=$_; }	while (<$fh>) { $a .=$_; }
return $a	return $a;
	}
}	}

sub filelocation {	sub filelocation {
Line 3135 sub declutter {	Line 3146 sub declutter {
return $thisfn;	return $thisfn;
}	}

	# ------------------------------------------------------------- Clutter up URLs

	sub clutter {
	my $thisfn='/'.&declutter(shift);
	unless ($thisfn=~/^\/(uploaded\|adm)\//) { $thisfn='/res'.$thisfn; }
	return $thisfn;
	}

# -------------------------------------------------------- Escape Special Chars	# -------------------------------------------------------- Escape Special Chars

sub escape {	sub escape {