Remove the now unused global_vhost variable.

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

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index 760e2421206d27eb49da9295e25ce300ceb82b75..fbe6d3f3d9cf0fa63ff4bcd85dce0c64816ea66c 100644 (file)
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -164,8 +164,8 @@ sub handler {
                        undef, $r->get_server_name, $event)
                        or error($r, "Could not find event $event", 404, "File not found");
 
-               $date = HTML::Entities::encode_entities(Encode::decode_utf8($ref->{'date'}));
-               $name = HTML::Entities::encode_entities(Encode::decode_utf8($ref->{'name'}));
+               $date = HTML::Entities::encode_entities($ref->{'date'});
+               $name = HTML::Entities::encode_entities($ref->{'name'});
                $r->set_last_modified($ref->{'last_update'});
        }
                                
@@ -220,7 +220,6 @@ sub handler {
                $returnurl =~ s/&/&/g;
 
                Sesse::pr0n::Templates::print_template($r, "fullscreen-footer", {
-                       vhost => $r->get_server_name,
                        returnurl => $returnurl,
                        start => $settings{'start'} - 1,
                        sel => $settings{'sel'},
@@ -479,7 +478,7 @@ sub print_thumbsize {
 }
 sub print_viewres {
        my ($r, $event, $settings, $defsettings) = @_;
-       my @alternatives = qw(320x256 512x384 640x480 800x600 1024x768 1152x864 1280x960 1400x1050 1600x1200 1920x1440 2048x1536);
+       my @alternatives = qw(320x256 512x384 640x480 800x600 1024x768 1152x864 1280x960 1400x1050 1600x1200 1920x1440 2048x1536 2304x1728);
        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, -2, -2 ];