Fix some issues with the WebDAV server and post-10.4 OS X.

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

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index 8bd8aba7f57871ab8e5c4ba7089c2357ff860d03..0fbd82893b41051d8a944eecbf3228844a899e10 100644 (file)
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -214,14 +214,27 @@ sub handler {
 
                my $returnurl = "http://" . $r->get_server_name . "/" . $event . "/" .
                        Sesse::pr0n::Common::get_query_string(\%settings_no_fullscreen, \%defsettings);
+               
+               my %settings_bookmark = %settings;
+               $settings_bookmark{'start'} = $defsettings{'start'};
+               my $bookmark_url_base = "http://" . $r->get_server_name . "/" . $event . "/" .
+                       Sesse::pr0n::Common::get_query_string(\%settings_bookmark, \%defsettings);
+
+               if ($bookmark_url_base =~ /\?/) {
+                       $bookmark_url_base .= ';start=';
+               } else {
+                       $bookmark_url_base .= '?start=';
+               }
 
                # *whistle*
                $returnurl =~ s/&/&/g;
+               $bookmark_url_base =~ s/&/&/g;
 
                Sesse::pr0n::Templates::print_template($r, "fullscreen-footer", {
                        vhost => $r->get_server_name,
                        start => $settings{'start'} - 1,
                        returnurl => $returnurl,
+                       bookmarkurlbase => $bookmark_url_base,
                        sel => $settings{'sel'},
                        infobox => $infobox
                });