web commit by WillThompson: Safety of arbitrary regexen

[ikiwiki.git] / IkiWiki / CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 9e85e1f4402d8399f0714cba1d9cf34f470d3efe..fa2287e82d4e20033076d259996f6097ae96575c 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -39,6 +39,7 @@ sub cgi_recentchanges ($) { #{{{
                wikiname => $config{wikiname},
                changelog => [rcs_recentchanges(100)],
                styleurl => styleurl(),
                wikiname => $config{wikiname},
                changelog => [rcs_recentchanges(100)],
                styleurl => styleurl(),

+               baseurl => "$config{url}/",

        );
        print $q->header, $template->output;
 } #}}}
        );
        print $q->header, $template->output;
 } #}}}


@@ -62,7 +63,8 @@ sub cgi_signin ($$) { #{{{
                required => 'NONE',
                javascript => 0,
                params => $q,
                required => 'NONE',
                javascript => 0,
                params => $q,

-               action => $q->request_uri,
+               # Why was this added?
+               #action => $q->request_uri,

                header => 0,
                template => (-e "$config{templatedir}/signin.tmpl" ?
                              "$config{templatedir}/signin.tmpl" : ""),
                header => 0,
                template => (-e "$config{templatedir}/signin.tmpl" ?
                              "$config{templatedir}/signin.tmpl" : ""),


@@ -329,6 +331,7 @@ sub cgi_editpage ($$) { #{{{
        $form->tmpl_param("helponformattinglink",
                htmllink("", "HelpOnFormatting", 1));
        $form->tmpl_param("styleurl", styleurl());
        $form->tmpl_param("helponformattinglink",
                htmllink("", "HelpOnFormatting", 1));
        $form->tmpl_param("styleurl", styleurl());

+       $form->tmpl_param("baseurl", "$config{url}/");

        if (! $form->submitted) {
                $form->field(name => "rcsinfo", value => rcs_prepedit($file),
                        force => 1);
        if (! $form->submitted) {
                $form->field(name => "rcsinfo", value => rcs_prepedit($file),
                        force => 1);


@@ -509,7 +512,7 @@ sub cgi () { #{{{
        CGI::Session->name("ikiwiki_session_$config{wikiname}");
        
        my $oldmask=umask(077);
        CGI::Session->name("ikiwiki_session_$config{wikiname}");
        
        my $oldmask=umask(077);

-       my $session = CGI::Session->new("driver:db_file", $q,
+       my $session = CGI::Session->new("driver:DB_File", $q,

                { FileName => "$config{wikistatedir}/sessions.db" });
        umask($oldmask);
        
                { FileName => "$config{wikistatedir}/sessions.db" });
        umask($oldmask);