return Apache2::Const::OK;
}
+ # FIXME: People can rotate and delete across vhosts using this interface.
+ # We should add some sanity checks.
+
+ my @to_purge = ();
+
Sesse::pr0n::Common::header($r, "Rotation/deletion results");
{
# Enable transactions and error raising temporarily
- local $dbh->{AutoCommit} = 0;
local $dbh->{RaiseError} = 1;
my @params = $apr->param();
my $key;
for $key (@params) {
+ local $dbh->{AutoCommit} = 0;
+
# Rotation
if ($key =~ /^rot-(\d+)-(90|180|270)$/ && $apr->param($key) eq 'on') {
my ($id, $rotval) = ($1,$2);
my $fname = Sesse::pr0n::Common::get_disk_location($r, $id);
+ push @to_purge, Sesse::pr0n::Common::get_all_cache_urls($r, $dbh, $id);
(my $tmpfname = $fname) =~ s/\.jpg$/-tmp.jpg/;
- system("/usr/bin/jpegtran -rotate $rotval -copy all < '$fname' > '$tmpfname' && mv '$tmpfname' '$fname'") == 0
- or error($r, "Rotation of $id [/usr/bin/jpegtran -rotate $rotval -copy all < '$fname' > '$tmpfname' && mv '$tmpfname' '$fname'] failed: $!.");
+ system("/usr/bin/jpegtran -rotate $rotval -copy all < '$fname' > '$tmpfname' && /bin/mv '$tmpfname' '$fname'") == 0
+ or error($r, "Rotation of $id [/usr/bin/jpegtran -rotate $rotval -copy all < '$fname' > '$tmpfname' && /bin/mv '$tmpfname' '$fname'] failed: $!.");
$r->print(" <p>Rotated image ID `$id' by $rotval degrees.</p>\n");
if ($rotval == 90 || $rotval == 270) {
my $q = $dbh->do('UPDATE images SET height=width,width=height WHERE id=?', undef, $id)
or dberror($r, "Size clear of $id failed");
- $dbh->do('UPDATE events SET last_update=CURRENT_TIMESTAMP WHERE id=( SELECT event FROM images WHERE id=? )',
+ $dbh->do('UPDATE last_picture_cache SET last_update=CURRENT_TIMESTAMP WHERE (vhost,event)=( SELECT vhost,event FROM images WHERE id=? )',
undef, $id)
or dberror($r, "Cache invalidation at $id failed");
}
} elsif ($key =~ /^del-(\d+)$/ && $apr->param($key) eq 'on') {
my $id = $1;
+ push @to_purge, Sesse::pr0n::Common::get_all_cache_urls($r, $dbh, $id);
{
eval {
- $dbh->do('UPDATE events SET last_update=CURRENT_TIMESTAMP WHERE id=( SELECT event FROM images WHERE id=? )',
+ $dbh->do('UPDATE last_picture_cache SET last_update=CURRENT_TIMESTAMP WHERE (vhost,event)=( SELECT vhost,event FROM images WHERE id=? )',
undef, $id);
$dbh->do('INSERT INTO deleted_images SELECT * FROM images WHERE id=?',
undef, $id);
+ $dbh->do('DELETE FROM exif_info WHERE image=?',
+ undef, $id);
$dbh->do('DELETE FROM images WHERE id=?',
undef, $id);
};
}
}
}
+
+ my $event = $apr->param('event');
+ $dbh->do('UPDATE last_picture_cache SET last_update=CURRENT_TIMESTAMP WHERE vhost=? AND event=?', undef, $r->get_server_name, $event)
+ or dberror($r, "Cache invalidation failed");
+
+ push @to_purge, "/$event/";
+ push @to_purge, "/+all/";
+ Sesse::pr0n::Common::purge_cache($r, @to_purge);
Sesse::pr0n::Common::footer($r);