web commit by Bug

[git.ikiwiki.info.git] / IkiWiki / CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 29f3ecc89193959f25e1ae97572e3924fa6253a8..e219c8c1cce88317601f6f1853476e8f5b3f56d8 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -2,6 +2,8 @@
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

+use IkiWiki;
+use IkiWiki::UserInfo;

 
 package IkiWiki;
 
 
 package IkiWiki;
 


@@ -11,7 +13,7 @@ sub page_locked ($$;$) { #{{{
        my $nonfatal=shift;
        
        my $user=$session->param("name");
        my $nonfatal=shift;
        
        my $user=$session->param("name");

-       return if length $user && is_admin($user);
+       return if defined $user && is_admin($user);

 
        foreach my $admin (@{$config{adminuser}}) {
                my $locked_pages=userinfo_get($admin, "locked_pages");
 
        foreach my $admin (@{$config{adminuser}}) {
                my $locked_pages=userinfo_get($admin, "locked_pages");


@@ -28,6 +30,8 @@ sub page_locked ($$;$) { #{{{
 sub cgi_recentchanges ($) { #{{{
        my $q=shift;
        
 sub cgi_recentchanges ($) { #{{{
        my $q=shift;
        

+       unlockwiki();
+

        my $template=HTML::Template->new(
                filename => "$config{templatedir}/recentchanges.tmpl"
        );
        my $template=HTML::Template->new(
                filename => "$config{templatedir}/recentchanges.tmpl"
        );


@@ -36,6 +40,8 @@ sub cgi_recentchanges ($) { #{{{
                indexlink => indexlink(),
                wikiname => $config{wikiname},
                changelog => [rcs_recentchanges(100)],
                indexlink => indexlink(),
                wikiname => $config{wikiname},
                changelog => [rcs_recentchanges(100)],

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

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


@@ -47,7 +53,7 @@ sub cgi_signin ($$) { #{{{
        eval q{use CGI::FormBuilder};
        my $form = CGI::FormBuilder->new(
                title => "signin",
        eval q{use CGI::FormBuilder};
        my $form = CGI::FormBuilder->new(
                title => "signin",

-               fields => [qw(do page from name password confirm_password email)],
+               fields => [qw(do title page subpage from name password confirm_password email)],

                header => 1,
                method => 'POST',
                validate => {
                header => 1,
                method => 'POST',
                validate => {


@@ -59,16 +65,19 @@ sub cgi_signin ($$) { #{{{
                required => 'NONE',
                javascript => 0,
                params => $q,
                required => 'NONE',
                javascript => 0,
                params => $q,

-               action => $q->request_uri,
+               action => $config{cgiurl},

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

-                             "$config{templatedir}/signin.tmpl" : "")
+                             "$config{templatedir}/signin.tmpl" : ""),
+               stylesheet => styleurl(),

        );
        
        $form->field(name => "name", required => 0);
        $form->field(name => "do", type => "hidden");
        $form->field(name => "page", type => "hidden");
        );
        
        $form->field(name => "name", required => 0);
        $form->field(name => "do", type => "hidden");
        $form->field(name => "page", type => "hidden");

+       $form->field(name => "title", type => "hidden");

        $form->field(name => "from", type => "hidden");
        $form->field(name => "from", type => "hidden");

+       $form->field(name => "subpage", type => "hidden");

        $form->field(name => "password", type => "password", required => 0);
        $form->field(name => "confirm_password", type => "password", required => 0);
        $form->field(name => "email", required => 0);
        $form->field(name => "password", type => "password", required => 0);
        $form->field(name => "confirm_password", type => "password", required => 0);
        $form->field(name => "email", required => 0);


@@ -110,6 +119,7 @@ sub cgi_signin ($$) { #{{{
                                validate => sub {
                                        my $name=shift;
                                        length $name &&
                                validate => sub {
                                        my $name=shift;
                                        length $name &&

+                                       $name=~/$config{wiki_file_regexp}/ &&

                                        ! userinfo_get($name, "regdate");
                                },
                        );
                                        ! userinfo_get($name, "regdate");
                                },
                        );


@@ -140,10 +150,13 @@ sub cgi_signin ($$) { #{{{
                        $session->param("name", $form->field("name"));
                        if (defined $form->field("do") && 
                            $form->field("do") ne 'signin') {
                        $session->param("name", $form->field("name"));
                        if (defined $form->field("do") && 
                            $form->field("do") ne 'signin') {

-                               print $q->redirect(
-                                       "$config{cgiurl}?do=".$form->field("do").
-                                       "&page=".$form->field("page").
-                                       "&from=".$form->field("from"));;
+                               print $q->redirect(cgiurl(
+                                       do => $form->field("do"),
+                                       page => $form->field("page"),
+                                       title => $form->field("title"),
+                                       subpage => $form->field("subpage"),
+                                       from => $form->field("from"),
+                               ));

                        }
                        else {
                                print $q->redirect($config{url});
                        }
                        else {
                                print $q->redirect($config{url});


@@ -180,10 +193,9 @@ sub cgi_signin ($$) { #{{{
                        );
                        
                        eval q{use Mail::Sendmail};
                        );
                        
                        eval q{use Mail::Sendmail};

-                       my ($fromhost) = $config{cgiurl} =~ m!/([^/]+)!;

                        sendmail(
                                To => userinfo_get($user_name, "email"),
                        sendmail(
                                To => userinfo_get($user_name, "email"),

-                               From => "$config{wikiname} admin <".(getpwuid($>))[0]."@".$fromhost.">",
+                               From => "$config{wikiname} admin <$config{adminemail}>",

                                Subject => "$config{wikiname} information",
                                Message => $template->output,
                        ) or error("Failed to send mail");
                                Subject => "$config{wikiname} information",
                                Message => $template->output,
                        ) or error("Failed to send mail");


@@ -207,7 +219,8 @@ sub cgi_prefs ($$) { #{{{
        eval q{use CGI::FormBuilder};
        my $form = CGI::FormBuilder->new(
                title => "preferences",
        eval q{use CGI::FormBuilder};
        my $form = CGI::FormBuilder->new(
                title => "preferences",

-               fields => [qw(do name password confirm_password email locked_pages)],
+               fields => [qw(do name password confirm_password email 
+                             subscriptions locked_pages)],

                header => 0,
                method => 'POST',
                validate => {
                header => 0,
                method => 'POST',
                validate => {


@@ -219,9 +232,10 @@ sub cgi_prefs ($$) { #{{{
                required => 'NONE',
                javascript => 0,
                params => $q,
                required => 'NONE',
                javascript => 0,
                params => $q,

-               action => $q->request_uri,
+               action => $config{cgiurl},

                template => (-e "$config{templatedir}/prefs.tmpl" ?
                template => (-e "$config{templatedir}/prefs.tmpl" ?

-                             "$config{templatedir}/prefs.tmpl" : "")
+                             "$config{templatedir}/prefs.tmpl" : ""),
+               stylesheet => styleurl(),

        );
        my @buttons=("Save Preferences", "Logout", "Cancel");
        
        );
        my @buttons=("Save Preferences", "Logout", "Cancel");
        


@@ -231,6 +245,8 @@ sub cgi_prefs ($$) { #{{{
                value => $user_name, force => 1);
        $form->field(name => "password", type => "password");
        $form->field(name => "confirm_password", type => "password");
                value => $user_name, force => 1);
        $form->field(name => "password", type => "password");
        $form->field(name => "confirm_password", type => "password");

+       $form->field(name => "subscriptions", size => 50,
+               comment => "(".htmllink("", "GlobList", 1).")");

        $form->field(name => "locked_pages", size => 50,
                comment => "(".htmllink("", "GlobList", 1).")");
        
        $form->field(name => "locked_pages", size => 50,
                comment => "(".htmllink("", "GlobList", 1).")");
        


@@ -241,6 +257,8 @@ sub cgi_prefs ($$) { #{{{
        if (! $form->submitted) {
                $form->field(name => "email", force => 1,
                        value => userinfo_get($user_name, "email"));
        if (! $form->submitted) {
                $form->field(name => "email", force => 1,
                        value => userinfo_get($user_name, "email"));

+               $form->field(name => "subscriptions", force => 1,
+                       value => userinfo_get($user_name, "subscriptions"));

                $form->field(name => "locked_pages", force => 1,
                        value => userinfo_get($user_name, "locked_pages"));
        }
                $form->field(name => "locked_pages", force => 1,
                        value => userinfo_get($user_name, "locked_pages"));
        }


@@ -255,7 +273,7 @@ sub cgi_prefs ($$) { #{{{
                return;
        }
        elsif ($form->submitted eq "Save Preferences" && $form->validate) {
                return;
        }
        elsif ($form->submitted eq "Save Preferences" && $form->validate) {

-               foreach my $field (qw(password email locked_pages)) {
+               foreach my $field (qw(password email subscriptions locked_pages)) {

                        if (length $form->field($field)) {
                                userinfo_set($user_name, $field, $form->field($field)) || error("failed to set $field");
                        }
                        if (length $form->field($field)) {
                                userinfo_set($user_name, $field, $form->field($field)) || error("failed to set $field");
                        }


@@ -273,7 +291,7 @@ sub cgi_editpage ($$) { #{{{
 
        eval q{use CGI::FormBuilder};
        my $form = CGI::FormBuilder->new(
 
        eval q{use CGI::FormBuilder};
        my $form = CGI::FormBuilder->new(

-               fields => [qw(do rcsinfo from page content comments)],
+               fields => [qw(do rcsinfo subpage from page content comments)],

                header => 1,
                method => 'POST',
                validate => {
                header => 1,
                method => 'POST',
                validate => {


@@ -282,29 +300,34 @@ sub cgi_editpage ($$) { #{{{
                required => [qw{content}],
                javascript => 0,
                params => $q,
                required => [qw{content}],
                javascript => 0,
                params => $q,

-               action => $q->request_uri,
+               action => $config{cgiurl},

                table => 0,
                template => "$config{templatedir}/editpage.tmpl"
        );
        my @buttons=("Save Page", "Preview", "Cancel");
        
                table => 0,
                template => "$config{templatedir}/editpage.tmpl"
        );
        my @buttons=("Save Page", "Preview", "Cancel");
        

-       my ($page)=$form->param('page')=~/$config{wiki_file_regexp}/;
-       if (! defined $page || ! length $page || $page ne $q->param('page') ||
+       # This untaint is safe because titlepage removes any problimatic
+       # characters.
+       my ($page)=titlepage(possibly_foolish_untaint(lc($form->param('page'))));
+       if (! defined $page || ! length $page ||

            $page=~/$config{wiki_file_prune_regexp}/ || $page=~/^\//) {
                error("bad page name");
        }
        $page=lc($page);
        
        my $file=$page.$config{default_pageext};
            $page=~/$config{wiki_file_prune_regexp}/ || $page=~/^\//) {
                error("bad page name");
        }
        $page=lc($page);
        
        my $file=$page.$config{default_pageext};

-       my $newfile=1;

        if (exists $pagesources{lc($page)}) {
                $file=$pagesources{lc($page)};
        if (exists $pagesources{lc($page)}) {
                $file=$pagesources{lc($page)};

-               $newfile=0;
+       }
+       my $newfile=0;
+       if (! -e "$config{srcdir}/$file") {
+               $newfile=1;

        }
 
        $form->field(name => "do", type => 'hidden');
        $form->field(name => "from", type => 'hidden');
        $form->field(name => "rcsinfo", type => 'hidden');
        }
 
        $form->field(name => "do", type => 'hidden');
        $form->field(name => "from", type => 'hidden');
        $form->field(name => "rcsinfo", type => 'hidden');

+       $form->field(name => "subpage", type => 'hidden');

        $form->field(name => "page", value => "$page", force => 1);
        $form->field(name => "comments", type => "text", size => 80);
        $form->field(name => "content", type => "textarea", rows => 20,
        $form->field(name => "page", value => "$page", force => 1);
        $form->field(name => "comments", type => "text", size => 80);
        $form->field(name => "content", type => "textarea", rows => 20,


@@ -313,6 +336,8 @@ sub cgi_editpage ($$) { #{{{
        $form->tmpl_param("indexlink", indexlink());
        $form->tmpl_param("helponformattinglink",
                htmllink("", "HelpOnFormatting", 1));
        $form->tmpl_param("indexlink", indexlink());
        $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);


@@ -336,26 +361,22 @@ sub cgi_editpage ($$) { #{{{
        if (! $form->submitted || $form->submitted eq "Preview" || 
            ! $form->validate) {
                if ($form->field("do") eq "create") {
        if (! $form->submitted || $form->submitted eq "Preview" || 
            ! $form->validate) {
                if ($form->field("do") eq "create") {

-                       if (exists $pagesources{lc($page)}) {
-                               # hmm, someone else made the page in the
-                               # meantime?
-                               print $q->redirect("$config{url}/".htmlpage($page));
-                               return;
-                       }
-                       

                        my @page_locs;
                        my $best_loc;
                        my ($from)=$form->param('from')=~/$config{wiki_file_regexp}/;
                        if (! defined $from || ! length $from ||
                            $from ne $form->param('from') ||
                        my @page_locs;
                        my $best_loc;
                        my ($from)=$form->param('from')=~/$config{wiki_file_regexp}/;
                        if (! defined $from || ! length $from ||
                            $from ne $form->param('from') ||

-                           $from=~/$config{wiki_file_prune_regexp}/ || $from=~/^\//) {
+                           $from=~/$config{wiki_file_prune_regexp}/ ||
+                           $from=~/^\// ||
+                           $form->submitted eq "Preview") {

                                @page_locs=$best_loc=$page;
                        }
                        else {
                                my $dir=$from."/";
                                @page_locs=$best_loc=$page;
                        }
                        else {
                                my $dir=$from."/";

-                               $dir=~s![^/]+/$!!;
+                               $dir=~s![^/]+/+$!!;

                                
                                

-                               if ($page eq 'discussion') {
+                               if ((defined $form->param('subpage') && length $form->param('subpage')) ||
+                                   $page eq 'discussion') {

                                        $best_loc="$from/$page";
                                }
                                else {
                                        $best_loc="$from/$page";
                                }
                                else {


@@ -365,20 +386,27 @@ sub cgi_editpage ($$) { #{{{
                                push @page_locs, $dir.$page;
                                push @page_locs, "$from/$page";
                                while (length $dir) {
                                push @page_locs, $dir.$page;
                                push @page_locs, "$from/$page";
                                while (length $dir) {

-                                       $dir=~s![^/]+/$!!;
+                                       $dir=~s![^/]+/+$!!;

                                        push @page_locs, $dir.$page;
                                }
                                        push @page_locs, $dir.$page;
                                }

-
-                               @page_locs = grep {
-                                       ! exists $pagesources{lc($_)} &&
-                                       ! page_locked($_, $session, 1)
-                               } @page_locs;

                        }
 
                        }
 

+                       @page_locs = grep {
+                               ! exists $pagesources{lc($_)} &&
+                               ! page_locked($_, $session, 1)
+                       } @page_locs;
+                       
+                       if (! @page_locs) {
+                               # hmm, someone else made the page in the
+                               # meantime?
+                               print $q->redirect("$config{url}/".htmlpage($page));
+                               return;
+                       }
+                               

                        $form->tmpl_param("page_select", 1);
                        $form->field(name => "page", type => 'select',
                                options => \@page_locs, value => $best_loc);
                        $form->tmpl_param("page_select", 1);
                        $form->field(name => "page", type => 'select',
                                options => \@page_locs, value => $best_loc);

-                       $form->title("creating $page");
+                       $form->title("creating ".pagetitle($page));

                }
                elsif ($form->field("do") eq "edit") {
                        page_locked($page, $session);
                }
                elsif ($form->field("do") eq "edit") {
                        page_locked($page, $session);


@@ -386,7 +414,7 @@ sub cgi_editpage ($$) { #{{{
                            ! length $form->field('content')) {
                                my $content="";
                                if (exists $pagesources{lc($page)}) {
                            ! length $form->field('content')) {
                                my $content="";
                                if (exists $pagesources{lc($page)}) {

-                                       $content=readfile("$config{srcdir}/$pagesources{lc($page)}");
+                                       $content=readfile(srcfile($pagesources{lc($page)}));

                                        $content=~s/\n/\r\n/g;
                                }
                                $form->field(name => "content", value => $content,
                                        $content=~s/\n/\r\n/g;
                                }
                                $form->field(name => "content", value => $content,


@@ -394,7 +422,7 @@ sub cgi_editpage ($$) { #{{{
                        }
                        $form->tmpl_param("page_select", 0);
                        $form->field(name => "page", type => 'hidden');
                        }
                        $form->tmpl_param("page_select", 0);
                        $form->field(name => "page", type => 'hidden');

-                       $form->title("editing $page");
+                       $form->title("editing ".pagetitle($page));

                }
                
                print $form->render(submit => \@buttons);
                }
                
                print $form->render(submit => \@buttons);


@@ -406,7 +434,7 @@ sub cgi_editpage ($$) { #{{{
                my $content=$form->field('content');
                $content=~s/\r\n/\n/g;
                $content=~s/\r/\n/g;
                my $content=$form->field('content');
                $content=~s/\r\n/\n/g;
                $content=~s/\r/\n/g;

-               writefile("$config{srcdir}/$file", $content);
+               writefile($file, $config{srcdir}, $content);

                
                my $message="web commit ";
                if (length $session->param("name")) {
                
                my $message="web commit ";
                if (length $session->param("name")) {


@@ -456,6 +484,12 @@ sub cgi_editpage ($$) { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

+sub cgi_hyperestraier () { #{{{
+       # only works for GET requests
+       chdir("$config{wikistatedir}/hyperestraier") || error("chdir: $!");
+       exec("./".basename($config{cgiurl})) || error("estseek.cgi failed");
+} #}}}
+

 sub cgi () { #{{{
        eval q{use CGI};
        eval q{use CGI::Session};
 sub cgi () { #{{{
        eval q{use CGI};
        eval q{use CGI::Session};


@@ -464,26 +498,34 @@ sub cgi () { #{{{
        
        my $do=$q->param('do');
        if (! defined $do || ! length $do) {
        
        my $do=$q->param('do');
        if (! defined $do || ! length $do) {

-               error("\"do\" parameter missing");
+               if (defined $q->param('phrase')) {
+                       cgi_hyperestraier();
+               }
+               else {
+                       error("\"do\" parameter missing");
+               }

        }
        
        }
        

-       # This does not need a session.
+       # Things that do not need a session.

        if ($do eq 'recentchanges') {
                cgi_recentchanges($q);
                return;
        }
        if ($do eq 'recentchanges') {
                cgi_recentchanges($q);
                return;
        }

+       elsif ($do eq 'hyperestraier') {
+               cgi_hyperestraier();
+       }
+       
+       CGI::Session->name("ikiwiki_session_$config{wikiname}");

        
        

-       CGI::Session->name("ikiwiki_session");
-

        my $oldmask=umask(077);
        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);
        
        # Everything below this point needs the user to be signed in.
                { FileName => "$config{wikistatedir}/sessions.db" });
        umask($oldmask);
        
        # Everything below this point needs the user to be signed in.

-       if ((! $config{anonok} && ! defined $session->param("name") ||
-            ! defined $session->param("name") ||
-            ! userinfo_get($session->param("name"), "regdate")) || $do eq 'signin') {
+       if ((! $config{anonok} &&
+            (! defined $session->param("name") ||
+            ! userinfo_get($session->param("name"), "regdate"))) || $do eq 'signin') {

                cgi_signin($q, $session);
        
                # Force session flush with safe umask.
                cgi_signin($q, $session);
        
                # Force session flush with safe umask.


@@ -500,6 +542,20 @@ sub cgi () { #{{{
        elsif ($do eq 'prefs') {
                cgi_prefs($q, $session);
        }
        elsif ($do eq 'prefs') {
                cgi_prefs($q, $session);
        }

+       elsif ($do eq 'blog') {
+               my $page=titlepage(lc($q->param('title')));
+               # if the page already exists, munge it to be unique
+               my $from=$q->param('from');
+               my $add="";
+               while (exists $oldpagemtime{"$from/$page$add"}) {
+                       $add=1 unless length $add;
+                       $add++;
+               }
+               $q->param('page', $page.$add);
+               # now run same as create
+               $q->param('do', 'create');
+               cgi_editpage($q, $session);
+       }

        else {
                error("unknown do parameter");
        }
        else {
                error("unknown do parameter");
        }