X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FWebDAV.pm;h=28ad780e0db2551aa6f80f1ebf2c5d4ebec8c11d;hp=8f30b7a0074d64052fc839c2b6190c10aaf88108;hb=6249c675acd3466bd808fb5d830027f7b9be5a9b;hpb=e8efcefae250ea2a5e5c248bb8f14d0f98074cb1

diff --git a/perl/Sesse/pr0n/WebDAV.pm b/perl/Sesse/pr0n/WebDAV.pm
index 8f30b7a..28ad780 100644
--- a/perl/Sesse/pr0n/WebDAV.pm
+++ b/perl/Sesse/pr0n/WebDAV.pm
@@ -247,7 +247,7 @@ EOF
 EOF
 	
 			return Apache2::Const::OK;
-		} elsif ($r->uri =~ m#^/webdav/upload/([a-zA-Z0-9-]+)/([a-zA-Z0-9._-]+)$#) {
+		} elsif ($r->uri =~ m#^/webdav/upload/([a-zA-Z0-9-]+)/([a-zA-Z0-9._()-]+)$#) {
 			# stat a single file
 			my ($event, $filename) = ($1, $2);
 			my ($fname, $size, $mtime);
@@ -491,7 +491,7 @@ EOF
 				# Make cache while we're at it.
 				# Don't do it for the resource forks Mac OS X loves to upload :-(
 				if ($filename !~ /^\._/) {
-					Sesse::pr0n::Common::ensure_cached($r, $filename, $newid, -1, -1, 1, 80, 64, 320, 256, -1, -1);
+					Sesse::pr0n::Common::ensure_cached($r, $filename, $newid, undef, undef, 1, 80, 64, 320, 256, -1, -1);
 				}
 				
 				# OK, we got this far, commit
@@ -602,7 +602,7 @@ EOF
 
 			# Try to insert this new file
 			eval {
-				$dbh->do('INSERT INTO images (id,vhost,event,uploadedby,takenby,filename) VALUES (?,?,?,?,?);',
+				$dbh->do('INSERT INTO images (id,vhost,event,uploadedby,takenby,filename) VALUES (?,?,?,?,?,?)',
 					undef, $newid, $r->get_server_name, $event, $user, $takenby, $filename);
 				$dbh->do('UPDATE events SET last_update=CURRENT_TIMESTAMP WHERE vhost=? AND event=?',
 					undef, $r->get_server_name, $event);
@@ -622,7 +622,7 @@ EOF
 					or die "/usr/bin/exifautotran: $!";
 
 				# Make cache while we're at it.
-				Sesse::pr0n::Common::ensure_cached($r, $filename, $newid, -1, -1, 1, 80, 64, 320, 256, -1, -1);
+				Sesse::pr0n::Common::ensure_cached($r, $filename, $newid, undef, undef, 1, 80, 64, 320, 256, -1, -1);
 				
 				# OK, we got this far, commit
 				$dbh->commit;