]> sipb.mit.edu Git - ikiwiki.git/blobdiff - IkiWiki/CGI.pm
web commit by joey
[ikiwiki.git] / IkiWiki / CGI.pm
index e5cee9cb95fb0acd5a9ded69287b3f652ab6732f..cf6000314a15f3a07aa9a483f9b574b2da9b7bf2 100644 (file)
@@ -2,6 +2,7 @@
 
 use warnings;
 use strict;
+use IkiWiki;
 use IkiWiki::UserInfo;
 
 package IkiWiki;
@@ -12,14 +13,14 @@ sub page_locked ($$;$) { #{{{
        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;
-                       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.");
                }
        }
 
@@ -245,9 +246,9 @@ sub cgi_prefs ($$) { #{{{
        $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,
-               comment => "(".htmllink("", "GlobList", 1).")");
+               comment => "(".htmllink("", "", "GlobList", 1).")");
        
        if (! is_admin($user_name)) {
                $form->field(name => "locked_pages", type => "hidden");
@@ -290,13 +291,13 @@ sub cgi_editpage ($$) { #{{{
 
        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,
                method => 'POST',
                validate => {
-                       content => '/.+/',
+                       editcontent => '/.+/',
                },
-               required => [qw{content}],
+               required => [qw{editcontent}],
                javascript => 0,
                params => $q,
                action => $config{cgiurl},
@@ -329,12 +330,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 => "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",
-               htmllink("", "HelpOnFormatting", 1));
+               htmllink("", "", "HelpOnFormatting", 1));
        $form->tmpl_param("styleurl", styleurl());
        $form->tmpl_param("baseurl", "$config{url}/");
        if (! $form->submitted) {
@@ -350,7 +351,7 @@ sub cgi_editpage ($$) { #{{{
                require IkiWiki::Render;
                $form->tmpl_param("page_preview",
                        htmlize($config{default_pageext},
-                               linkify($form->field('content'), $page)));
+                               linkify($page, $page, $form->field('editcontent'))));
        }
        else {
                $form->tmpl_param("page_preview", "");
@@ -360,13 +361,6 @@ sub cgi_editpage ($$) { #{{{
        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}/;
@@ -395,13 +389,20 @@ sub cgi_editpage ($$) { #{{{
                                        $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);
@@ -409,14 +410,14 @@ sub cgi_editpage ($$) { #{{{
                }
                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;
                                }
-                               $form->field(name => "content", value => $content,
+                               $form->field(name => "editcontent", value => $content,
                                        force => 1);
                        }
                        $form->tmpl_param("page_select", 0);
@@ -430,7 +431,7 @@ sub cgi_editpage ($$) { #{{{
                # save page
                page_locked($page, $session);
                
-               my $content=$form->field('content');
+               my $content=$form->field('editcontent');
                $content=~s/\r\n/\n/g;
                $content=~s/\r/\n/g;
                writefile($file, $config{srcdir}, $content);
@@ -462,7 +463,7 @@ sub cgi_editpage ($$) { #{{{
                                $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');
@@ -483,26 +484,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;
        
+       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) {
-               if (defined $q->param('phrase')) {
-                       cgi_hyperestraier();
-               }
-               else {
-                       error("\"do\" parameter missing");
-               }
+               error("\"do\" parameter missing");
        }
        
        # Things that do not need a session.