some design work on rename/delete

[git.ikiwiki.info.git] / ikiwiki.in

diff --git a/ikiwiki.in b/ikiwiki.in
index 6242865ee4206cb7b4a760ed7dc705a5b4c5a07a..3bb881c4320f246b1edd4f9af80014149036d9e4 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -29,20 +29,18 @@ sub getconfig () { #{{{
                        "render=s" => \$config{render},
                        "wrappers!" => \$config{wrappers},
                        "usedirs!" => \$config{usedirs},
                        "render=s" => \$config{render},
                        "wrappers!" => \$config{wrappers},
                        "usedirs!" => \$config{usedirs},

+                       "prefix-directives!" => \$config{prefix_directives},

                        "getctime" => \$config{getctime},
                        "getctime" => \$config{getctime},

-                       "wrappermode=i" => \$config{wrappermode},

                        "numbacklinks=i" => \$config{numbacklinks},
                        "rcs=s" => \$config{rcs},
                        "no-rcs" => sub { $config{rcs}="" },
                        "cgi!" => \$config{cgi},
                        "discussion!" => \$config{discussion},
                        "w3mmode!" => \$config{w3mmode},
                        "numbacklinks=i" => \$config{numbacklinks},
                        "rcs=s" => \$config{rcs},
                        "no-rcs" => sub { $config{rcs}="" },
                        "cgi!" => \$config{cgi},
                        "discussion!" => \$config{discussion},
                        "w3mmode!" => \$config{w3mmode},

-                       "notify!" => \$config{notify},

                        "url=s" => \$config{url},
                        "cgiurl=s" => \$config{cgiurl},
                        "historyurl=s" => \$config{historyurl},
                        "diffurl=s" => \$config{diffurl},
                        "url=s" => \$config{url},
                        "cgiurl=s" => \$config{cgiurl},
                        "historyurl=s" => \$config{historyurl},
                        "diffurl=s" => \$config{diffurl},

-                       "svnrepo" => \$config{svnrepo},

                        "svnpath" => \$config{svnpath},
                        "adminemail=s" => \$config{adminemail},
                        "timeformat=s" => \$config{timeformat},
                        "svnpath" => \$config{svnpath},
                        "adminemail=s" => \$config{adminemail},
                        "timeformat=s" => \$config{timeformat},


@@ -64,7 +62,10 @@ sub getconfig () { #{{{
                                $config{underlaydir}=possibly_foolish_untaint($_[1])
                        },
                        "wrapper:s" => sub {
                                $config{underlaydir}=possibly_foolish_untaint($_[1])
                        },
                        "wrapper:s" => sub {

-                               $config{wrapper}=$_[1] ? $_[1] : "ikiwiki-wrap"
+                               $config{wrapper}=$_[1] ? possibly_foolish_untaint($_[1]) : "ikiwiki-wrap"
+                       },
+                       "wrappermode=i" => sub {
+                               $config{wrappermode}=possibly_foolish_untaint($_[1])

                        },
                        "plugin=s@" => sub {
                                push @{$config{plugin}}, $_[1];
                        },
                        "plugin=s@" => sub {
                                push @{$config{plugin}}, $_[1];


@@ -111,12 +112,7 @@ sub getconfig () { #{{{
 sub main () { #{{{
        getconfig();
        
 sub main () { #{{{
        getconfig();
        

-       if ($config{cgi}) {
-               loadindex();
-               require IkiWiki::CGI;
-               cgi();
-       }
-       elsif ($config{setup}) {
+       if ($config{setup}) {

                require IkiWiki::Setup;
                setup();
        }
                require IkiWiki::Setup;
                setup();
        }


@@ -125,15 +121,19 @@ sub main () { #{{{
                require IkiWiki::Wrapper;
                gen_wrapper();
        }
                require IkiWiki::Wrapper;
                gen_wrapper();
        }

+       elsif ($config{cgi}) {
+               require IkiWiki::CGI;
+               eval {cgi()};
+               if ($@) {
+                       cgierror($@);
+               }
+       }

        elsif ($config{render}) {
                require IkiWiki::Render;
                commandline_render();
        }
        elsif ($config{post_commit} && ! commit_hook_enabled()) {
        elsif ($config{render}) {
                require IkiWiki::Render;
                commandline_render();
        }
        elsif ($config{post_commit} && ! commit_hook_enabled()) {

-               if ($config{notify}) {
-                       loadindex();
-                       rcs_notify();
-               }
+               # do nothing

        }
        else {
                lockwiki();
        }
        else {
                lockwiki();


@@ -141,7 +141,6 @@ sub main () { #{{{
                require IkiWiki::Render;
                rcs_update();
                refresh();
                require IkiWiki::Render;
                rcs_update();
                refresh();

-               rcs_notify() if $config{notify};

                saveindex();
        }
 } #}}}
                saveindex();
        }
 } #}}}