* Honor LC_CTIME when formatting a time for display. Thanks, Faidon

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

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 067886c70d49c1eed93865b8f867584a73a06605..30af53586fac6d6bee7326f5828fe773e3faf63c 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -2,7 +2,9 @@
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

+use IkiWiki;

 use IkiWiki::UserInfo;
 use IkiWiki::UserInfo;

+use encoding 'utf8'; # force use of utf8 for io layer

 
 package IkiWiki;
 
 
 package IkiWiki;
 


@@ -12,14 +14,14 @@ 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");
                if (globlist_match($page, userinfo_get($admin, "locked_pages"))) {
                        return 1 if $nonfatal;
 
        foreach my $admin (@{$config{adminuser}}) {
                my $locked_pages=userinfo_get($admin, "locked_pages");
                if (globlist_match($page, userinfo_get($admin, "locked_pages"))) {
                        return 1 if $nonfatal;

-                       error(htmllink("", $page, 1)." is locked by ".
-                             htmllink("", $admin, 1)." and cannot be edited.");
+                       error(htmllink("", "", $page, 1)." is locked by ".
+                             htmllink("", "", $admin, 1)." and cannot be edited.");

                }
        }
 
                }
        }
 


@@ -42,7 +44,8 @@ sub cgi_recentchanges ($) { #{{{
                styleurl => styleurl(),
                baseurl => "$config{url}/",
        );
                styleurl => styleurl(),
                baseurl => "$config{url}/",
        );

-       print $q->header, $template->output;
+       require Encode;
+       print $q->header(-charset=>'utf-8'), Encode::decode_utf8($template->output);

 } #}}}
 
 sub cgi_signin ($$) { #{{{
 } #}}}
 
 sub cgi_signin ($$) { #{{{


@@ -54,6 +57,7 @@ sub cgi_signin ($$) { #{{{
                title => "signin",
                fields => [qw(do title page subpage from name password confirm_password email)],
                header => 1,
                title => "signin",
                fields => [qw(do title page subpage from name password confirm_password email)],
                header => 1,

+               charset => "utf-8",

                method => 'POST',
                validate => {
                        confirm_password => {
                method => 'POST',
                validate => {
                        confirm_password => {


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

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

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


@@ -171,7 +175,7 @@ sub cgi_signin ($$) { #{{{
                                $form->field(name => "confirm_password", type => "hidden");
                                $form->field(name => "email", type => "hidden");
                                $form->text("Registration successful. Now you can Login.");
                                $form->field(name => "confirm_password", type => "hidden");
                                $form->field(name => "email", type => "hidden");
                                $form->text("Registration successful. Now you can Login.");

-                               print $session->header();
+                               print $session->header(-charset=>'utf-8');

                                print misctemplate($form->title, $form->render(submit => ["Login"]));
                        }
                        else {
                                print misctemplate($form->title, $form->render(submit => ["Login"]));
                        }
                        else {


@@ -201,12 +205,12 @@ sub cgi_signin ($$) { #{{{
                        
                        $form->text("Your password has been emailed to you.");
                        $form->field(name => "name", required => 0);
                        
                        $form->text("Your password has been emailed to you.");
                        $form->field(name => "name", required => 0);

-                       print $session->header();
+                       print $session->header(-charset=>'utf-8');

                        print misctemplate($form->title, $form->render(submit => ["Login", "Register", "Mail Password"]));
                }
        }
        else {
                        print misctemplate($form->title, $form->render(submit => ["Login", "Register", "Mail Password"]));
                }
        }
        else {

-               print $session->header();
+               print $session->header(-charset=>'utf-8');

                print misctemplate($form->title, $form->render(submit => ["Login", "Register", "Mail Password"]));
        }
 } #}}}
                print misctemplate($form->title, $form->render(submit => ["Login", "Register", "Mail Password"]));
        }
 } #}}}


@@ -221,6 +225,7 @@ sub cgi_prefs ($$) { #{{{
                fields => [qw(do name password confirm_password email 
                              subscriptions locked_pages)],
                header => 0,
                fields => [qw(do name password confirm_password email 
                              subscriptions locked_pages)],
                header => 0,

+               charset => "utf-8",

                method => 'POST',
                validate => {
                        confirm_password => {
                method => 'POST',
                validate => {
                        confirm_password => {


@@ -245,9 +250,9 @@ sub cgi_prefs ($$) { #{{{
        $form->field(name => "password", type => "password");
        $form->field(name => "confirm_password", type => "password");
        $form->field(name => "subscriptions", size => 50,
        $form->field(name => "password", type => "password");
        $form->field(name => "confirm_password", type => "password");
        $form->field(name => "subscriptions", size => 50,

-               comment => "(".htmllink("", "GlobList", 1).")");
+               comment => "(".htmllink("", "", "GlobList", 1).")");

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

-               comment => "(".htmllink("", "GlobList", 1).")");
+               comment => "(".htmllink("", "", "GlobList", 1).")");

        
        if (! is_admin($user_name)) {
                $form->field(name => "locked_pages", type => "hidden");
        
        if (! is_admin($user_name)) {
                $form->field(name => "locked_pages", type => "hidden");


@@ -280,7 +285,7 @@ sub cgi_prefs ($$) { #{{{
                $form->text("Preferences saved.");
        }
        
                $form->text("Preferences saved.");
        }
        

-       print $session->header();
+       print $session->header(-charset=>'utf-8');

        print misctemplate($form->title, $form->render(submit => \@buttons));
 } #}}}
 
        print misctemplate($form->title, $form->render(submit => \@buttons));
 } #}}}
 


@@ -290,13 +295,14 @@ 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 subpage from page content comments)],
+               fields => [qw(do rcsinfo subpage from page editcontent comments)],

                header => 1,
                header => 1,

+               charset => "utf-8",

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

-                       content => '/.+/',
+                       editcontent => '/.+/',

                },
                },

-               required => [qw{content}],
+               required => [qw{editcontent}],

                javascript => 0,
                params => $q,
                action => $config{cgiurl},
                javascript => 0,
                params => $q,
                action => $config{cgiurl},


@@ -329,12 +335,12 @@ sub cgi_editpage ($$) { #{{{
        $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 => "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 => "editcontent", type => "textarea", rows => 20,

                cols => 80);
        $form->tmpl_param("can_commit", $config{rcs});
        $form->tmpl_param("indexlink", indexlink());
        $form->tmpl_param("helponformattinglink",
                cols => 80);
        $form->tmpl_param("can_commit", $config{rcs});
        $form->tmpl_param("indexlink", indexlink());
        $form->tmpl_param("helponformattinglink",

-               htmllink("", "HelpOnFormatting", 1));
+               htmllink("", "", "HelpOnFormatting", 1));

        $form->tmpl_param("styleurl", styleurl());
        $form->tmpl_param("baseurl", "$config{url}/");
        if (! $form->submitted) {
        $form->tmpl_param("styleurl", styleurl());
        $form->tmpl_param("baseurl", "$config{url}/");
        if (! $form->submitted) {


@@ -348,9 +354,17 @@ sub cgi_editpage ($$) { #{{{
        }
        elsif ($form->submitted eq "Preview") {
                require IkiWiki::Render;
        }
        elsif ($form->submitted eq "Preview") {
                require IkiWiki::Render;

+               # Apparently FormBuilder doesn't not treat input as
+               # utf-8, so decode from it.
+               require Encode;
+               my $content = Encode::decode_utf8($form->field('editcontent'));
+               $form->field(name => "editcontent",
+                               value => $content, force => 1);
+               $form->field(name => "comments",
+                               value => Encode::decode_utf8($form->field('comments')), force => 1);

                $form->tmpl_param("page_preview",
                        htmlize($config{default_pageext},
                $form->tmpl_param("page_preview",
                        htmlize($config{default_pageext},

-                               linkify($form->field('content'), $page)));
+                               linkify($page, $page, $content)));

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


@@ -360,13 +374,6 @@ 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}/;
                        my @page_locs;
                        my $best_loc;
                        my ($from)=$form->param('from')=~/$config{wiki_file_regexp}/;


@@ -395,13 +402,20 @@ sub cgi_editpage ($$) { #{{{
                                        $dir=~s![^/]+/+$!!;
                                        push @page_locs, $dir.$page;
                                }
                                        $dir=~s![^/]+/+$!!;
                                        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);


@@ -409,14 +423,14 @@ sub cgi_editpage ($$) { #{{{
                }
                elsif ($form->field("do") eq "edit") {
                        page_locked($page, $session);
                }
                elsif ($form->field("do") eq "edit") {
                        page_locked($page, $session);

-                       if (! defined $form->field('content') || 
-                           ! length $form->field('content')) {
+                       if (! defined $form->field('editcontent') || 
+                           ! length $form->field('editcontent')) {

                                my $content="";
                                if (exists $pagesources{lc($page)}) {
                                        $content=readfile(srcfile($pagesources{lc($page)}));
                                        $content=~s/\n/\r\n/g;
                                }
                                my $content="";
                                if (exists $pagesources{lc($page)}) {
                                        $content=readfile(srcfile($pagesources{lc($page)}));
                                        $content=~s/\n/\r\n/g;
                                }

-                               $form->field(name => "content", value => $content,
+                               $form->field(name => "editcontent", value => $content,

                                        force => 1);
                        }
                        $form->tmpl_param("page_select", 0);
                                        force => 1);
                        }
                        $form->tmpl_param("page_select", 0);


@@ -430,13 +444,17 @@ sub cgi_editpage ($$) { #{{{
                # save page
                page_locked($page, $session);
                
                # save page
                page_locked($page, $session);
                

-               my $content=$form->field('content');
+               # Decode utf-8 since FormBuilder does not
+               require Encode;
+               my $content=Encode::decode_utf8($form->field('editcontent'));
+

                $content=~s/\r\n/\n/g;
                $content=~s/\r/\n/g;
                writefile($file, $config{srcdir}, $content);
                
                my $message="web commit ";
                $content=~s/\r\n/\n/g;
                $content=~s/\r/\n/g;
                writefile($file, $config{srcdir}, $content);
                
                my $message="web commit ";

-               if (length $session->param("name")) {
+               if (defined $session->param("name") && 
+                   length $session->param("name")) {

                        $message.="by ".$session->param("name");
                }
                else {
                        $message.="by ".$session->param("name");
                }
                else {


@@ -444,7 +462,7 @@ sub cgi_editpage ($$) { #{{{
                }
                if (defined $form->field('comments') &&
                    length $form->field('comments')) {
                }
                if (defined $form->field('comments') &&
                    length $form->field('comments')) {

-                       $message.=": ".$form->field('comments');
+                       $message.=Encode::decode_utf8(": ".$form->field('comments'));

                }
                
                if ($config{rcs}) {
                }
                
                if ($config{rcs}) {


@@ -462,7 +480,7 @@ sub cgi_editpage ($$) { #{{{
                                $form->field(name => "rcsinfo", value => rcs_prepedit($file),
                                        force => 1);
                                $form->tmpl_param("page_conflict", 1);
                                $form->field(name => "rcsinfo", value => rcs_prepedit($file),
                                        force => 1);
                                $form->tmpl_param("page_conflict", 1);

-                               $form->field("content", value => $conflict, force => 1);
+                               $form->field("editcontent", value => $conflict, force => 1);

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


@@ -483,26 +501,21 @@ 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};
        
        my $q=CGI->new;
        
 sub cgi () { #{{{
        eval q{use CGI};
        eval q{use CGI::Session};
        
        my $q=CGI->new;
        

+       if (exists $hooks{cgi}) {
+               foreach my $id (keys %{$hooks{cgi}}) {
+                       $hooks{cgi}{$id}{call}->($q);
+               }
+       }
+       

        my $do=$q->param('do');
        if (! defined $do || ! length $do) {
        my $do=$q->param('do');
        if (! defined $do || ! length $do) {

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

        }
        
        # Things that do not need a session.
        }
        
        # Things that do not need a session.