web commit by JoshTriplett: Escape code with ``

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

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index e62bcf477601ec38be1178ba3ce3207c1e588293..3b1cab9a8d3ac75edbaa4e5d5bfb8354ab5d68e1 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -137,6 +137,7 @@ sub cgi_signin ($$) { #{{{
        error($@) if $@;
        my $form = CGI::FormBuilder->new(
                title => "signin",
        error($@) if $@;
        my $form = CGI::FormBuilder->new(
                title => "signin",

+               name => "signin",

                header => 1,
                charset => "utf-8",
                method => 'POST',
                header => 1,
                charset => "utf-8",
                method => 'POST',


@@ -145,7 +146,7 @@ sub cgi_signin ($$) { #{{{
                params => $q,
                action => $config{cgiurl},
                header => 0,
                params => $q,
                action => $config{cgiurl},
                header => 0,

-               template => scalar template_params("signin.tmpl"),
+               template => {type => 'div'},

                stylesheet => baseurl()."style.css",
        );
        my $buttons=["Login"];
                stylesheet => baseurl()."style.css",
        );
        my $buttons=["Login"];


@@ -180,13 +181,20 @@ sub cgi_signin ($$) { #{{{
 sub cgi_postsignin ($$) { #{{{
        my $q=shift;
        my $session=shift;
 sub cgi_postsignin ($$) { #{{{
        my $q=shift;
        my $session=shift;

-
+       

        # Continue with whatever was being done before the signin process.
        # Continue with whatever was being done before the signin process.

-       my $postsignin=CGI->new($session->param("postsignin"));
-       $session->clear("postsignin");
-       cgi($postsignin, $session);
-       cgi_savesession($session);
-       exit;
+       if (defined $session->param("postsignin")) {
+               my $postsignin=CGI->new($session->param("postsignin"));
+               $session->clear("postsignin");
+               cgi($postsignin, $session);
+               cgi_savesession($session);
+               exit;
+       }
+       else {
+               # This can occur, for example, if a user went to the signin
+               # url via a bookmark.
+               redirect($q, $config{url});
+       }

 } #}}}
 
 sub cgi_prefs ($$) { #{{{
 } #}}}
 
 sub cgi_prefs ($$) { #{{{


@@ -199,6 +207,7 @@ sub cgi_prefs ($$) { #{{{
        error($@) if $@;
        my $form = CGI::FormBuilder->new(
                title => "preferences",
        error($@) if $@;
        my $form = CGI::FormBuilder->new(
                title => "preferences",

+               name => "preferences",

                header => 0,
                charset => "utf-8",
                method => 'POST',
                header => 0,
                charset => "utf-8",
                method => 'POST',


@@ -209,8 +218,13 @@ sub cgi_prefs ($$) { #{{{
                javascript => 0,
                params => $q,
                action => $config{cgiurl},
                javascript => 0,
                params => $q,
                action => $config{cgiurl},

-               template => scalar template_params("prefs.tmpl"),
+               template => {type => 'div'},

                stylesheet => baseurl()."style.css",
                stylesheet => baseurl()."style.css",

+               fieldsets => [
+                       [login => gettext("Login")],
+                       [preferences => gettext("Preferences")],
+                       [admin => gettext("Admin")]
+               ],

        );
        my $buttons=["Save Preferences", "Logout", "Cancel"];
 
        );
        my $buttons=["Save Preferences", "Logout", "Cancel"];
 


@@ -219,10 +233,12 @@ sub cgi_prefs ($$) { #{{{
        });
        
        $form->field(name => "do", type => "hidden");
        });
        
        $form->field(name => "do", type => "hidden");

-       $form->field(name => "email", size => 50);
+       $form->field(name => "email", size => 50, fieldset => "preferences");

        $form->field(name => "subscriptions", size => 50,
        $form->field(name => "subscriptions", size => 50,

+               fieldset => "preferences",

                comment => "(".htmllink("", "", "PageSpec", noimageinline => 1).")");
                comment => "(".htmllink("", "", "PageSpec", noimageinline => 1).")");

-       $form->field(name => "banned_users", size => 50);
+       $form->field(name => "banned_users", size => 50,
+               fieldset => "admin");

        
        my $user_name=$session->param("name");
        if (! is_admin($user_name)) {
        
        my $user_name=$session->param("name");
        if (! is_admin($user_name)) {


@@ -302,6 +318,7 @@ sub cgi_editpage ($$) { #{{{
                action => $config{cgiurl},
                table => 0,
                template => scalar template_params("editpage.tmpl"),
                action => $config{cgiurl},
                table => 0,
                template => scalar template_params("editpage.tmpl"),

+               wikiname => $config{wikiname},

        );
        
        run_hooks(formbuilder_setup => sub {
        );
        
        run_hooks(formbuilder_setup => sub {


@@ -325,12 +342,16 @@ sub cgi_editpage ($$) { #{{{
        
        my $file;
        my $type;
        
        my $file;
        my $type;

-       if (exists $pagesources{$page}) {
+       if (exists $pagesources{$page} && $form->field("do") ne "create") {

                $file=$pagesources{$page};
                $type=pagetype($file);
                if (! defined $type) {
                        error(sprintf(gettext("%s is not an editable page"), $page));
                }
                $file=$pagesources{$page};
                $type=pagetype($file);
                if (! defined $type) {
                        error(sprintf(gettext("%s is not an editable page"), $page));
                }

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

        }
        else {
                $type=$form->param('type');
        }
        else {
                $type=$form->param('type');


@@ -343,18 +364,16 @@ sub cgi_editpage ($$) { #{{{
                }
                $type=$config{default_pageext} unless defined $type;
                $file=$page.".".$type;
                }
                $type=$config{default_pageext} unless defined $type;
                $file=$page.".".$type;

-       }
-
-       my $newfile=0;
-       if (! -e "$config{srcdir}/$file") {
-               $newfile=1;
+               if (! $form->submitted) {
+                       $form->field(name => "rcsinfo", value => "", force => 1);
+               }

        }
 
        $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 => "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 => "page", value => pagetitle($page, 1), force => 1);

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


@@ -364,16 +383,12 @@ sub cgi_editpage ($$) { #{{{
        $form->tmpl_param("helponformattinglink",
                htmllink("", "", "HelpOnFormatting", noimageinline => 1));
        $form->tmpl_param("baseurl", baseurl());
        $form->tmpl_param("helponformattinglink",
                htmllink("", "", "HelpOnFormatting", noimageinline => 1));
        $form->tmpl_param("baseurl", baseurl());

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

        
        if ($form->submitted eq "Cancel") {
        
        if ($form->submitted eq "Cancel") {

-               if ($newfile && defined $from) {
+               if ($form->field("do") eq "create" && defined $from) {

                        redirect($q, "$config{url}/".htmlpage($from));
                }
                        redirect($q, "$config{url}/".htmlpage($from));
                }

-               elsif ($newfile) {
+               elsif ($form->field("do") eq "create") {

                        redirect($q, $config{url});
                }
                else {
                        redirect($q, $config{url});
                }
                else {


@@ -382,18 +397,11 @@ sub cgi_editpage ($$) { #{{{
                return;
        }
        elsif ($form->submitted eq "Preview") {
                return;
        }
        elsif ($form->submitted eq "Preview") {

-               my $content=$form->field('editcontent');
-               my $comments=$form->field('comments');
-               $form->field(name => "editcontent",
-                               value => $content, force => 1);
-               $form->field(name => "comments",
-                               value => $comments, force => 1);
-               $config{rss}=$config{atom}=0; # avoid preview writing a feed!

                $form->tmpl_param("page_preview",
                        htmlize($page, $type,
                        linkify($page, "",
                        preprocess($page, $page,
                $form->tmpl_param("page_preview",
                        htmlize($page, $type,
                        linkify($page, "",
                        preprocess($page, $page,

-                       filter($page, $content)))));
+                       filter($page, $page, $form->field('editcontent')), 0, 1))));

        }
        else {
                $form->tmpl_param("page_preview", "");
        }
        else {
                $form->tmpl_param("page_preview", "");


@@ -459,8 +467,8 @@ sub cgi_editpage ($$) { #{{{
                        
                        $form->tmpl_param("page_select", 1);
                        $form->field(name => "page", type => 'select',
                        
                        $form->tmpl_param("page_select", 1);
                        $form->field(name => "page", type => 'select',

-                               options => { map { $_ => pagetitle($_, 1) } @editable_locs },
-                               value => $best_loc);
+                               options => [ map { pagetitle($_, 1) } @editable_locs ],
+                               value => pagetitle($best_loc, 1));

                        $form->field(name => "type", type => 'select',
                                options => \@page_types);
                        $form->title(sprintf(gettext("creating %s"), pagetitle($page)));
                        $form->field(name => "type", type => 'select',
                                options => \@page_types);
                        $form->title(sprintf(gettext("creating %s"), pagetitle($page)));


@@ -488,6 +496,32 @@ sub cgi_editpage ($$) { #{{{
        else {
                # save page
                check_canedit($page, $q, $session);
        else {
                # save page
                check_canedit($page, $q, $session);

+               if (! -e "$config{srcdir}/$file" &&
+                   $form->field("do") ne "create") {
+                       $form->tmpl_param("page_gone", 1);
+                       $form->field(name => "do", value => "create", force => 1);
+                       $form->tmpl_param("page_select", 0);
+                       $form->field(name => "page", type => 'hidden');
+                       $form->field(name => "type", type => 'hidden');
+                       $form->title(sprintf(gettext("editing %s"), $page));
+                       print $form->render(submit => \@buttons);
+                       return;
+               }
+               elsif (-e "$config{srcdir}/$file" &&
+                      $form->field("do") eq "create") {
+                       $form->tmpl_param("creation_conflict", 1);
+                       $form->field(name => "do", value => "edit", force => 1);
+                       $form->tmpl_param("page_select", 0);
+                       $form->field(name => "page", type => 'hidden');
+                       $form->field(name => "type", type => 'hidden');
+                       $form->title(sprintf(gettext("editing %s"), $page));
+                       $form->field("editcontent", 
+                               value => readfile("$config{srcdir}/$file").
+                                        "\n\n\n".$form->field("editcontent"),
+                               force => 1);
+                       print $form->render(submit => \@buttons);
+                       return;
+               }

                
                my $content=$form->field('editcontent');
 
                
                my $content=$form->field('editcontent');
 


@@ -503,8 +537,6 @@ sub cgi_editpage ($$) { #{{{
                        $form->tmpl_param("failed_save", 1);
                        $form->tmpl_param("error_message", $@);
                        $form->field("editcontent", value => $content, force => 1);
                        $form->tmpl_param("failed_save", 1);
                        $form->tmpl_param("error_message", $@);
                        $form->field("editcontent", value => $content, force => 1);

-                       $form->field(name => "comments", value => $form->field('comments'), force => 1);
-                       $form->field("do", "edit)");

                        $form->tmpl_param("page_select", 0);
                        $form->field(name => "page", type => 'hidden');
                        $form->field(name => "type", type => 'hidden');
                        $form->tmpl_param("page_select", 0);
                        $form->field(name => "page", type => 'hidden');
                        $form->field(name => "type", type => 'hidden');


@@ -521,7 +553,7 @@ sub cgi_editpage ($$) { #{{{
                                $message=$form->field('comments');
                        }
                        
                                $message=$form->field('comments');
                        }
                        

-                       if ($newfile) {
+                       if ($form->field("do") eq "create") {

                                rcs_add($file);
                        }
 
                                rcs_add($file);
                        }
 


@@ -548,8 +580,7 @@ sub cgi_editpage ($$) { #{{{
                                force => 1);
                        $form->tmpl_param("page_conflict", 1);
                        $form->field("editcontent", value => $conflict, force => 1);
                                force => 1);
                        $form->tmpl_param("page_conflict", 1);
                        $form->field("editcontent", value => $conflict, force => 1);

-                       $form->field(name => "comments", value => $form->field('comments'), force => 1);
-                       $form->field("do", "edit)");
+                       $form->field("do", "edit", force => 1);

                        $form->tmpl_param("page_select", 0);
                        $form->field(name => "page", type => 'hidden');
                        $form->field(name => "type", type => 'hidden');
                        $form->tmpl_param("page_select", 0);
                        $form->field(name => "page", type => 'hidden');
                        $form->field(name => "type", type => 'hidden');


@@ -667,12 +698,12 @@ sub cgi (;$$) { #{{{
                cgi_editpage($q, $session);
        }
        elsif ($do eq 'blog') {
                cgi_editpage($q, $session);
        }
        elsif ($do eq 'blog') {

-               my $page=titlepage(decode_utf8($q->param('title')));
-               $page=~s/(\/)/"__".ord($1)."__"/eg; # escape slashes too
+               my $page=decode_utf8($q->param('title'));
+               $page=~s/\///g; # no slashes in blog posts

                # if the page already exists, munge it to be unique
                my $from=$q->param('from');
                my $add="";
                # if the page already exists, munge it to be unique
                my $from=$q->param('from');
                my $add="";

-               while (exists $pagecase{lc "$from/$page$add"}) {
+               while (exists $pagecase{lc($from."/".titlepage($page).$add)}) {

                        $add=1 unless length $add;
                        $add++;
                }
                        $add=1 unless length $add;
                        $add++;
                }