X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FWebDAV.pm;h=71cd8ba13ea8f45763e8360d62e7ab814b67b314;hp=7298ffd105dc727c08fef07f1c6754f473eddd6a;hb=a8507a180fdcb9e5e78dd689d1be1fa08401441e;hpb=b14e19cdd4aa848f623687e5b0ac446f39c02b17 diff --git a/perl/Sesse/pr0n/WebDAV.pm b/perl/Sesse/pr0n/WebDAV.pm index 7298ffd..71cd8ba 100644 --- a/perl/Sesse/pr0n/WebDAV.pm +++ b/perl/Sesse/pr0n/WebDAV.pm @@ -3,7 +3,7 @@ use strict; use warnings; use Sesse::pr0n::Common qw(error dberror); -use Digest::SHA1; +use Digest::SHA; use MIME::Base64; use Apache2::Request; use Apache2::Upload; @@ -368,7 +368,7 @@ EOF } else { # check if we have a "shadow file" for this if (defined($autorename) && $autorename eq "autorename/") { - my $ref = $dbh->selectrow_hashref('SELECT id FROM shadow_files WHERE host=? AND event=? AND filename=? AND expires_at > now()', + my $ref = $dbh->selectrow_hashref('SELECT id FROM shadow_files WHERE vhost=? AND event=? AND filename=? AND expires_at > now()', undef, $r->get_server_name, $event, $filename); if (defined($ref)) { ($fname, $size, $mtime) = Sesse::pr0n::Common::stat_image_from_id($r, $ref->{'id'}); @@ -479,6 +479,7 @@ EOF Sesse::pr0n::Common::purge_cache($r, "/$event/"); # Now save the file to disk + Sesse::pr0n::Common::ensure_disk_location_exists($r, $newid); $fname = Sesse::pr0n::Common::get_disk_location($r, $newid); open NEWFILE, ">$fname" or die "$fname: $!"; @@ -665,7 +666,7 @@ EOF my ($event, $autorename, $filename) = ($1, $2, $3); $autorename = '' if (!defined($autorename)); - my $sha1 = Digest::SHA1::sha1_base64("/$event/$autorename$filename"); + my $sha1 = Digest::SHA::sha1_base64("/$event/$autorename$filename"); $r->status(200); $r->content_type('text/xml; charset=utf-8');