- $dbh->do('DELETE FROM shadow_files WHERE expires_at <= now() OR (event=? AND filename=?);',
- undef, $event, $filename)
- or dberror($r, "Couldn't prune shadow_files");
- $dbh->do('INSERT INTO shadow_files (event,filename,id,expires_at) VALUES (?,?,?,now() + interval \'30 seconds\');',
- undef, $event, $orig_filename, $newid)
- or dberror($r, "Couldn't add shadow file");
- $r->log->info("Added shadow entry for $event/$filename");
- }
-
- $r->content_type('text/plain; charset="utf-8"');
- $r->status(201);
- $r->print("OK");
-
- return Apache2::Const::OK;
- }
-
- # Used by the XP publishing wizard -- largely the same as the code above
- # but vastly simplified. Should we refactor?
- if ($r->method eq "POST") {
- my $apr = Apache2::Request->new($r);
- my $client_size = $apr->param('size');
- my $event = $apr->param('event');
-
- my $file = $apr->upload('image');
- my $filename = $file->filename();
- if ($client_size != $file->size()) {
- $r->content_type('text/plain; charset="utf-8"');
- $r->status(403);
- $r->print("Client-size resizing detected; refusing automatically");
-
- $r->log->info("Client-size resized upload of $event/$filename detected");
- return Apache2::Const::OK;
- }
-
- # Ugh, Windows XP seems to be sending this in... something that's not UTF-8, at least
- my $takenby_given = Sesse::pr0n::Common::guess_charset($apr->param('takenby'));
-
- if (defined($takenby_given) && $takenby_given !~ /^\s*$/ && $takenby_given !~ /[<>&]/ && length($takenby_given) <= 100) {
- $takenby = $takenby_given;
- }
-
- # Remove evil characters
- if ($filename =~ /[^a-zA-Z0-9._-]/) {
- $filename =~ tr/a-zA-Z0-9.-/_/c;
- }
-
- # Get the new ID
- my $ref = $dbh->selectrow_hashref("SELECT NEXTVAL('imageid_seq') AS id;");
- my $newid = $ref->{'id'};
- if (!defined($newid)) {
- dberror($r, "Couldn't get new ID");
- }
-
- # Autorename if we need to
- {
- my $ref = $dbh->selectrow_hashref("SELECT COUNT(*) AS numfiles FROM images WHERE event=? AND filename=?",
- undef, $event, $filename)
- or dberror($r, "Couldn't check for existing files");
- if ($ref->{'numfiles'} > 0) {
- $r->log->info("Renaming $filename to $newid.jpeg");
- $filename = "$newid.jpeg";
- }
- }
-
- {
- # Enable transactions and error raising temporarily
- local $dbh->{AutoCommit} = 0;
- local $dbh->{RaiseError} = 1;
- my $fname;
-
- # Try to insert this new file
- eval {
- $dbh->do('INSERT INTO images (id,event,uploadedby,takenby,filename) VALUES (?,?,?,?,?);',
- undef, $newid, $event, $user, $takenby, $filename);
- $dbh->do('UPDATE events SET last_update=CURRENT_TIMESTAMP WHERE id=?',
- undef, $event);
-
- # Now save the file to disk
- $fname = Sesse::pr0n::Common::get_disk_location($r, $newid);
- open NEWFILE, ">$fname"
- or die "$fname: $!";
-
- my $buf;
- $file->slurp($buf);
- print NEWFILE $buf or die "write($fname): $!";
- close NEWFILE or die "close($fname): $!";
-
- # Orient stuff correctly
- system("/usr/bin/exifautotran", $fname) == 0
- 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);
-
- # OK, we got this far, commit
- $dbh->commit;
-
- $r->log->notice("Successfully wrote $event/$filename to $fname");
- };
- if ($@) {
- # Some error occurred, rollback and bomb out
- $dbh->rollback;
- error($r, "Transaction aborted because $@");
- unlink($fname);
-
- $r->content_type('text/plain; charset="utf-8"');
- $r->status(500);
- $r->print("Error: $@");
- }
+ $dbh->do('DELETE FROM shadow_files WHERE expires_at <= now() OR (vhost=? AND event=? AND filename=?);',
+ undef, Sesse::pr0n::Common::get_server_name($r), $event, $filename)
+ or return dberror($r, "Couldn't prune shadow_files");
+ $dbh->do('INSERT INTO shadow_files (vhost,event,filename,id,expires_at) VALUES (?,?,?,?,now() + interval \'1 day\');',
+ undef, Sesse::pr0n::Common::get_server_name($r), $event, $orig_filename, $newid)
+ or return dberror($r, "Couldn't add shadow file");
+ Sesse::pr0n::Common::log_info($r, "Added shadow entry for $event/$filename");