web commit by JonasSmedegaard: Linkify 2nd patch.

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

diff --git a/ikiwiki.in b/ikiwiki.in
index c37085bbc1a3884aeda085a7f138f2f8bf11ce6c..2aeaf94ecedc4ffd210d9c774dab983a58050f2d 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -30,7 +30,6 @@ sub getconfig () { #{{{
                        "wrappers!" => \$config{wrappers},
                        "usedirs!" => \$config{usedirs},
                        "getctime" => \$config{getctime},
-                       "wrappermode=i" => \$config{wrappermode},
                        "numbacklinks=i" => \$config{numbacklinks},
                        "rcs=s" => \$config{rcs},
                        "no-rcs" => sub { $config{rcs}="" },
@@ -50,7 +49,7 @@ sub getconfig () { #{{{
                        "httpauth!" => \$config{httpauth},
                        "userdir=s" => \$config{userdir},
                        "htmlext=s" => \$config{htmlext},
-                       "libdir" => \$config{libdir},
+                       "libdir=s" => \$config{libdir},
                        "exclude=s@" => sub {
                                push @{$config{wiki_file_prune_regexps}}, $_[1];
                        },
@@ -64,7 +63,10 @@ sub getconfig () { #{{{
                                $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];
@@ -111,12 +113,7 @@ sub getconfig () { #{{{
 sub main () { #{{{
        getconfig();
        
-       if ($config{cgi}) {
-               loadindex();
-               require IkiWiki::CGI;
-               cgi();
-       }
-       elsif ($config{setup}) {
+       if ($config{setup}) {
                require IkiWiki::Setup;
                setup();
        }
@@ -125,6 +122,11 @@ sub main () { #{{{
                require IkiWiki::Wrapper;
                gen_wrapper();
        }
+       elsif ($config{cgi}) {
+               loadindex();
+               require IkiWiki::CGI;
+               cgi();
+       }
        elsif ($config{render}) {
                require IkiWiki::Render;
                commandline_render();