For pictures taken on manual, set both aperture and shutter as bold.

[pr0n] / perl / Sesse / pr0n / WebDAV.pm

diff --git a/perl/Sesse/pr0n/WebDAV.pm b/perl/Sesse/pr0n/WebDAV.pm
index c38e7b2f159a1888822dc3d3d230b5011bdf7056..2fa9112b88f91f05b19cf85789e042d48e8de71a 100644 (file)
--- a/perl/Sesse/pr0n/WebDAV.pm
+++ b/perl/Sesse/pr0n/WebDAV.pm
@@ -11,7 +11,7 @@ use Apache2::Upload;
 sub handler {
        my $r = shift;
        my $dbh = Sesse::pr0n::Common::get_dbh();
-       
+                       
        $r->headers_out->{'DAV'} = "1,2";
 
        # We only handle depth=0, depth=1 (cf. the RFC)
@@ -405,6 +405,9 @@ EOF
                
                my ($event, $autorename, $filename) = ($1, $2, $3);
                my $size = $r->headers_in->{'content-length'};
+               if (!defined($size)) {
+                       $size = $r->headers_in->{'x-expected-entity-length'};
+               }
                my $orig_filename = $filename;
 
                # Remove evil characters
@@ -423,7 +426,7 @@ EOF
                # gnome-vfs and mac os x love to make zero-byte files,
                # make them happy
                # 
-               if ($r->headers_in->{'content-length'} == 0 || $filename =~ /^\.(_|DS_Store)/) {
+               if ($size == 0 || $filename =~ /^\.(_|DS_Store)/) {
                        $dbh->do('DELETE FROM fake_files WHERE expires_at <= now() OR (event=? AND vhost=? AND filename=?);',
                                undef, $event, $r->get_server_name, $filename)
                                or dberror($r, "Couldn't prune fake_files");
@@ -436,7 +439,7 @@ EOF
                        $r->log->info("Fake upload of $event/$filename");
                        return Apache2::Const::OK;
                }
-
+                       
                # Get the new ID
                my $ref = $dbh->selectrow_hashref("SELECT NEXTVAL('imageid_seq') AS id;");
                my $newid = $ref->{'id'};
@@ -470,6 +473,7 @@ EOF
                                        undef, $newid, $r->get_server_name, $event, $user, $takenby, $filename);
                                $dbh->do('UPDATE last_picture_cache SET last_update=CURRENT_TIMESTAMP WHERE vhost=? AND event=?',
                                        undef, $r->get_server_name, $event);
+                               Sesse::pr0n::Common::purge_cache($r, "/$event/");
 
                                # Now save the file to disk
                                $fname = Sesse::pr0n::Common::get_disk_location($r, $newid);
@@ -477,8 +481,7 @@ EOF
                                        or die "$fname: $!";
 
                                my $buf;
-                               my $content_length = $r->headers_in->{'content-length'};
-                               if ($r->read($buf, $content_length)) {
+                               if ($r->read($buf, $size)) {
                                        print NEWFILE $buf or die "write($fname): $!";
                                }
 
@@ -564,7 +567,7 @@ EOF
                        my $ref = $q->fetchrow_hashref;
 
                        if ($ref->{'cnt'} == 0) {
-                               my @errors = Sesse::pr0n::Common::add_new_event($dbh, $ne_id, $ne_date, $ne_desc, $r->get_server_name);
+                               my @errors = Sesse::pr0n::Common::add_new_event($r, $dbh, $ne_id, $ne_date, $ne_desc);
                                if (scalar @errors > 0) {
                                        die "Couldn't add new event $ne_id: " . join(', ', @errors);
                                }