Lock the number of pictures per page at 250.

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

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index eca84793e1c6ebe0f338673a5a2ed0ff0cf3697c..5082486e996056142860ae70a0ec9410ef63e268 100644 (file)
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -41,8 +41,8 @@ sub handler {
 
        # Read the appropriate settings from the query string into the settings hash
        my %defsettings = (
-               thumbxres => 80,
-               thumbyres => 64,
+               thumbxres => 320,
+               thumbyres => 256,
                xres => -1,
                yres => -1,
                start => 1,
@@ -69,11 +69,6 @@ sub handler {
                undef, Sesse::pr0n::Common::get_server_name($r))
                and $defsettings{'xres'} = $defsettings{'yres'} = undef;
        
-       # Reduce the front page load when in overload mode.
-       if (Sesse::pr0n::Overload::is_in_overload($r)) {
-               $defsettings{'num'} = 100;
-       }
-               
        my %settings = %defsettings;
 
        for my $s (qw(thumbxres thumbyres xres yres start num all infobox rot sel fullscreen model lens author)) {
@@ -220,9 +215,7 @@ sub handler {
                        Sesse::pr0n::Templates::print_template($r, $io, "overloadmode");
                }
 
-               print_thumbsize($r, $io, $event, \%settings, \%defsettings);
                print_viewres($r, $io, $event, \%settings, \%defsettings);
-               print_pagelimit($r, $io, $event, \%settings, \%defsettings);
                print_infobox($r, $io, $event, \%settings, \%defsettings);
                print_selected($r, $io, $event, \%settings, \%defsettings) if ($num_selected > 0);
                print_fullscreen($r, $io, $event, \%settings, \%defsettings);
@@ -451,13 +444,6 @@ sub print_changes {
        $io->print("    </p>\n");
 }
 
-sub print_thumbsize {
-       my ($r, $io, $event, $settings, $defsettings) = @_;
-       my @alternatives = qw(80x64 120x96 160x128 240x192 320x256);
-
-       print_changes($r, $io, $event, 'thumbsize', $settings, $defsettings,
-                     'thumbxres', 'thumbyres', \@alternatives);
-}
 sub print_viewres {
        my ($r, $io, $event, $settings, $defsettings) = @_;
        my @alternatives = qw(320x256 512x384 640x480 800x600 1024x768 1152x864 1280x960 1400x1050 1600x1200 1920x1440 2048x1536 2304x1728);
@@ -470,38 +456,6 @@ sub print_viewres {
                      'xres', 'yres', \@alternatives);
 }
 
-sub print_pagelimit {
-       my ($r, $io, $event, $settings, $defsettings) = @_;
-       
-       my $title = Sesse::pr0n::Templates::fetch_template($r, 'imgsperpage');
-       chomp $title;
-       $io->print("    <p>$title:\n");
-       
-       # Get choices
-       chomp (my $unlimited = Sesse::pr0n::Templates::fetch_template($r, 'imgsperpage-unlimited'));
-       my @alternatives = qw(10 50 100 250 500);
-       push @alternatives, $unlimited;
-       
-       for my $num (@alternatives) {
-               my %newsettings = %$settings;
-
-               if ($num !~ /^\d+$/) { # unlimited
-                       $newsettings{'num'} = -1;
-               } else {
-                       $newsettings{'num'} = $num;
-               }
-
-               $io->print("      ");
-               if (eq_with_undef($settings->{'num'}, $newsettings{'num'})) {
-                       $io->print($num);
-               } else {
-                       Sesse::pr0n::Common::print_link($io, $num, "/$event/", \%newsettings, $defsettings);
-               }
-               $io->print("\n");
-       }
-       $io->print("    </p>\n");
-}
-
 sub print_infobox {
        my ($r, $io, $event, $settings, $defsettings) = @_;