loncom/publisher/loncfile.pm - diff

Return to loncfile.pm CVS log

Up to [LON-CAPA] / loncom / publisher

version 1.90, 2008/09/24 17:30:18	version 1.92, 2009/01/15 18:31:19
Line 159 sub URLToPath {	Line 159 sub URLToPath {
my $Url = shift;	my $Url = shift;
&Debug($r, "UrlToPath got: $Url");	&Debug($r, "UrlToPath got: $Url");
$Url=~ s/\/+/\//g;	$Url=~ s/\/+/\//g;
$Url=~ s/^http\:\/\/[^\/]+//;	$Url=~ s/^https?\:\/\/[^\/]+//;
$Url=~ s/^\///;	$Url=~ s/^\///;
$Url=~ s/(\~\|priv\/)($match_username)\//\/home\/$2\/public_html\//;	$Url=~ s/(\~\|priv\/)($match_username)\//\/home\/$2\/public_html\//;
&Debug($r, "Returning $Url \n");	&Debug($r, "Returning $Url \n");
Line 361 sub cleanDest {	Line 361 sub cleanDest {
my ($newpath)=($dest=~m\|(.*)/\|);	my ($newpath)=($dest=~m\|(.*)/\|);
$newpath=&relativeDest($fn,$newpath,$uname);	$newpath=&relativeDest($fn,$newpath,$uname);
if (! -d "$newpath") {	if (! -d "$newpath") {
$request->print("<p><span class=\"LC_error\">".&mt('You have requested to create file in directory [_1] which doesn\'t exist. The requested directory path has been removed from the requested file name.','"'.&display($newpath).'"')."</span></p>");	$request->print("<p><span class=\"LC_error\">"
	.&mt("You have requested to create file in directory [_1] which doesn't exist. The requested directory path has been removed from the requested file name."
	,'"'.&display($newpath).'"')
	."</span></p>");
$dest=~s\|.*/\|\|;	$dest=~s\|.*/\|\|;
}	}
}	}