loncom/interface/londocs.pm - diff

Return to londocs.pm CVS log

Up to [LON-CAPA] / loncom / interface

version 1.489, 2012/07/05 21:33:39	version 1.490, 2012/07/06 22:46:06
Line 3464 sub decompression_phase_one {	Line 3464 sub decompression_phase_one {
my ($dir,$file,$warning,$error,$output);	my ($dir,$file,$warning,$error,$output);
my ($destination,$dir_root,$londocroot,$docudom,$docuname,$container,$hiddenelem)=	my ($destination,$dir_root,$londocroot,$docudom,$docuname,$container,$hiddenelem)=
&decompression_info();	&decompression_info();
if ($env{'form.archiveurl'} !~ m{^/uploaded/\Q$docudom/$docuname/docs/\E(?:default\|supplemental\|\d+).*/([^/]+)$}) {	if ($env{'form.archiveurl'} !~ m{^/uploaded/\Q$docudom/$docuname/\E(?:docs\|supplemental)/(?:default\|\d+).*/([^/]+)$}) {
$error = &mt('Archive file "[_1]" not in the expected location.',$env{'form.archiveurl'});	$error = &mt('Archive file "[_1]" not in the expected location.',$env{'form.archiveurl'});
} else {	} else {
my $file = $1;	my $file = $1;