--- loncom/publisher/loncfile.pm 2008/09/24 17:30:18 1.90 +++ loncom/publisher/loncfile.pm 2009/01/15 18:31:19 1.92 @@ -9,7 +9,7 @@ # and displays a page showing the results of the action. # # -# $Id: loncfile.pm,v 1.90 2008/09/24 17:30:18 raeburn Exp $ +# $Id: loncfile.pm,v 1.92 2009/01/15 18:31:19 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -159,7 +159,7 @@ sub URLToPath { my $Url = shift; &Debug($r, "UrlToPath got: $Url"); $Url=~ s/\/+/\//g; - $Url=~ s/^http\:\/\/[^\/]+//; + $Url=~ s/^https?\:\/\/[^\/]+//; $Url=~ s/^\///; $Url=~ s/(\~|priv\/)($match_username)\//\/home\/$2\/public_html\//; &Debug($r, "Returning $Url \n"); @@ -361,7 +361,10 @@ sub cleanDest { my ($newpath)=($dest=~m|(.*)/|); $newpath=&relativeDest($fn,$newpath,$uname); if (! -d "$newpath") { - $request->print("

".&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).'"')."

"); + $request->print("

" + .&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).'"') + ."

"); $dest=~s|.*/||; } }