]> sipb.mit.edu Git - ikiwiki.git/blobdiff - IkiWiki/CGI.pm
sipb-www / ikiwiki.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
reorg all the pages about rcs backends. Fix all links
[ikiwiki.git] / IkiWiki / CGI.pm
diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index aee80253ba94401e9b517f99f1dcc87b8549145b..e8df1fe1145dd4a37e6eebb3de1680dcfce99529 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -137,7 +137,7 @@ sub cgi_signin ($$) { #{{{
        error($@) if $@;
        my $form = CGI::FormBuilder->new(
                title => "signin",
-               header => 1,
+               name => "signin",
                charset => "utf-8",
                method => 'POST',
                required => 'NONE',
@@ -145,7 +145,7 @@ sub cgi_signin ($$) { #{{{
                params => $q,
                action => $config{cgiurl},
                header => 0,
-               template => scalar template_params("signin.tmpl"),
+               template => {type => 'div'},
                stylesheet => baseurl()."style.css",
        );
        my $buttons=["Login"];
@@ -157,7 +157,8 @@ sub cgi_signin ($$) { #{{{
                force => 1);
        
        run_hooks(formbuilder_setup => sub {
-               shift->(form => $form, cgi => $q, session => $session);
+               shift->(form => $form, cgi => $q, session => $session,
+                       buttons => $buttons);
        });
        
        decode_form_utf8($form);
@@ -206,6 +207,7 @@ sub cgi_prefs ($$) { #{{{
        error($@) if $@;
        my $form = CGI::FormBuilder->new(
                title => "preferences",
+               name => "preferences",
                header => 0,
                charset => "utf-8",
                method => 'POST',
@@ -216,20 +218,28 @@ sub cgi_prefs ($$) { #{{{
                javascript => 0,
                params => $q,
                action => $config{cgiurl},
-               template => scalar template_params("prefs.tmpl"),
+               template => {type => 'div'},
                stylesheet => baseurl()."style.css",
+               fieldsets => [
+                       [login => gettext("Login")],
+                       [preferences => gettext("Preferences")],
+                       [admin => gettext("Admin")]
+               ],
        );
        my $buttons=["Save Preferences", "Logout", "Cancel"];
 
        run_hooks(formbuilder_setup => sub {
-               shift->(form => $form, cgi => $q, session => $session);
+               shift->(form => $form, cgi => $q, session => $session,
+                       buttons => $buttons);
        });
        
        $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,
+               fieldset => "preferences",
                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)) {
@@ -296,8 +306,8 @@ sub cgi_editpage ($$) { #{{{
        eval q{use CGI::FormBuilder};
        error($@) if $@;
        my $form = CGI::FormBuilder->new(
+               title => "editpage",
                fields => \@fields,
-               header => 1,
                charset => "utf-8",
                method => 'POST',
                validate => {
@@ -307,12 +317,15 @@ sub cgi_editpage ($$) { #{{{
                javascript => 0,
                params => $q,
                action => $config{cgiurl},
+               header => 0,
                table => 0,
                template => scalar template_params("editpage.tmpl"),
+               wikiname => $config{wikiname},
        );
        
        run_hooks(formbuilder_setup => sub {
-               shift->(form => $form, cgi => $q, session => $session);
+               shift->(form => $form, cgi => $q, session => $session,
+                       buttons => \@buttons);
        });
        
        decode_form_utf8($form);
@@ -332,12 +345,16 @@ sub cgi_editpage ($$) { #{{{
        
        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));
                }
+               if (! $form->submitted) {
+                       $form->field(name => "rcsinfo",
+                               value => rcs_prepedit($file), force => 1);
+               }
        }
        else {
                $type=$form->param('type');
@@ -350,18 +367,16 @@ sub cgi_editpage ($$) { #{{{
                }
                $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 => "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,
@@ -371,16 +386,12 @@ sub cgi_editpage ($$) { #{{{
        $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 ($newfile && defined $from) {
+               if ($form->field("do") eq "create" && defined $from) {
                        redirect($q, "$config{url}/".htmlpage($from));
                }
-               elsif ($newfile) {
+               elsif ($form->field("do") eq "create") {
                        redirect($q, $config{url});
                }
                else {
@@ -389,25 +400,18 @@ sub cgi_editpage ($$) { #{{{
                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,
-                       filter($page, $content)))));
+                       filter($page, $page, $form->field('editcontent')), 0, 1))));
        }
-       else {
+       elsif ($form->submitted eq "Save Page") {
                $form->tmpl_param("page_preview", "");
        }
        $form->tmpl_param("page_conflict", "");
        
-       if (! $form->submitted || $form->submitted eq "Preview" || 
+       if ($form->submitted ne "Save Page" || 
            ! $form->validate) {
                if ($form->field("do") eq "create") {
                        my @page_locs;
@@ -466,11 +470,12 @@ sub cgi_editpage ($$) { #{{{
                        
                        $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)));
+                       
                }
                elsif ($form->field("do") eq "edit") {
                        check_canedit($page, $q, $session);
@@ -490,11 +495,42 @@ sub cgi_editpage ($$) { #{{{
                        $form->title(sprintf(gettext("editing %s"), pagetitle($page)));
                }
                
-               print $form->render(submit => \@buttons);
+               printheader($session);
+               print misctemplate($form->title, $form->render(submit => \@buttons));
        }
        else {
                # save page
                check_canedit($page, $q, $session);
+
+               my $exists=-e "$config{srcdir}/$file";
+
+               if ($form->field("do") ne "create" &&
+                   ! $exists && ! -e "$config{underlaydir}/$file") {
+                       $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));
+                       printheader($session);
+                       print misctemplate($form->title, $form->render(submit => \@buttons));
+                       return;
+               }
+               elsif ($form->field("do") eq "create" && $exists) {
+                       $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);
+                       printheader($session);
+                       print misctemplate($form->title, $form->render(submit => \@buttons));
+                       return;
+               }
                
                my $content=$form->field('editcontent');
 
@@ -510,13 +546,12 @@ sub cgi_editpage ($$) { #{{{
                        $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->title(sprintf(gettext("editing %s"), $page));
-                       print $form->render(submit => \@buttons);
+                       printheader($session);
+                       print misctemplate($form->title, $form->render(submit => \@buttons));
                        return;
                }
                
@@ -528,7 +563,7 @@ sub cgi_editpage ($$) { #{{{
                                $message=$form->field('comments');
                        }
                        
-                       if ($newfile) {
+                       if (! $exists) {
                                rcs_add($file);
                        }
 
@@ -555,13 +590,13 @@ sub cgi_editpage ($$) { #{{{
                                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->title(sprintf(gettext("editing %s"), $page));
-                       print $form->render(submit => \@buttons);
+                       printheader($session);
+                       print misctemplate($form->title, $form->render(submit => \@buttons));
                        return;
                }
                else {
@@ -624,9 +659,6 @@ sub cgi (;$$) { #{{{
                cgi_recentchanges($q);
                return;
        }
-       elsif ($do eq 'hyperestraier') {
-               cgi_hyperestraier();
-       }
 
        # Need to lock the wiki before getting a session.
        lockwiki();
@@ -660,7 +692,10 @@ sub cgi (;$$) { #{{{
                print gettext("You are banned.");
                cgi_savesession($session);
        }
-       elsif ($do eq 'signin') {
+
+       run_hooks(sessioncgi => sub { shift->($q, $session) });
+
+       if ($do eq 'signin') {
                cgi_signin($q, $session);
                cgi_savesession($session);
        }
@@ -673,21 +708,6 @@ sub cgi (;$$) { #{{{
        elsif ($do eq 'create' || $do eq 'edit') {
                cgi_editpage($q, $session);
        }
-       elsif ($do eq 'blog') {
-               my $page=titlepage(decode_utf8($q->param('title')));
-               $page=~s/(\/)/"__".ord($1)."__"/eg; # escape slashes too
-               # if the page already exists, munge it to be unique
-               my $from=$q->param('from');
-               my $add="";
-               while (exists $pagecase{lc "$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);
-       }
        elsif ($do eq 'postsignin') {
                error(gettext("login failed, perhaps you need to turn on cookies?"));
        }
wiki compiler