}
# Any NEF files => default to processing
- my $ref = $dbh->selectrow_hashref("SELECT * FROM images WHERE vhost=? $where AND LOWER(filename) LIKE '%.nef' LIMIT 1",
+ my $ref = $dbh->selectrow_hashref("SELECT * FROM images WHERE vhost=? $where AND ( LOWER(filename) LIKE '%.nef' OR LOWER(filename) LIKE '%.cr2' ) LIMIT 1",
undef, $r->get_server_name)
and $defsettings{'xres'} = $defsettings{'yres'} = undef;
my %settings = %defsettings;
- for my $s qw(thumbxres thumbyres xres yres start num all infobox rot sel fullscreen model lens author) {
+ for my $s (qw(thumbxres thumbyres xres yres start num all infobox rot sel fullscreen model lens author)) {
my $val = $apr->param($s);
if (defined($val) && $val =~ /^(\d+)$/) {
$settings{$s} = $val;
}
- if (($s eq "num" || $s eq "xres" || $s eq "yres") && defined($val) && $val == -1) {
+ if ($s eq "num" && defined($val) && $val == -1) {
$settings{$s} = $val;
}
- if ($s eq "model" || $s eq "lens" || $s eq "author") {
+ if (($s eq "xres" || $s eq "yres") && defined($val) && ($val == -1 || $val == -2)) {
+ $settings{$s} = $val;
+ }
+ if (($s eq "model" || $s eq "lens" || $s eq "author") && defined($val)) {
$settings{$s} = Sesse::pr0n::Common::pretty_unescape($val);
}
}
my $filename = $ref->{'filename'};
my $uri = $infobox . $filename;
- if (defined($xres) && defined($yres) && $xres != -1) {
+ if (defined($xres) && defined($yres) && $xres != -1 && $xres != -2) {
$uri = "${xres}x$yres/$infobox$filename";
} elsif (defined($xres) && $xres == -1) {
$uri = "original/$infobox$filename";
my @alternatives = qw(320x256 512x384 640x480 800x600 1024x768 1152x864 1280x960 1400x1050 1600x1200 1920x1440 2048x1536);
chomp (my $unlimited = Sesse::pr0n::Templates::fetch_template($r, 'viewres-unlimited'));
chomp (my $original = Sesse::pr0n::Templates::fetch_template($r, 'viewres-original'));
- push @alternatives, [ $unlimited, undef, undef ];
+ push @alternatives, [ $unlimited, -2, -2 ];
push @alternatives, [ $original, -1, -1 ];
print_changes($r, $event, 'viewres', $settings, $defsettings,