foo

[git.ikiwiki.info.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index cb5c68610b0999b604a56b92f2881b4d2fbc814f..9e22d1dbcc34bd8d6d78b3886a65ede79c691b52 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -17,7 +17,7 @@ my ($srcdir, $destdir, %links, %oldlinks, %oldpagemtime, %renderedfiles,
     %pagesources);
 my $wiki_link_regexp=qr/\[\[([^\s]+)\]\]/;
 my $wiki_file_regexp=qr/(^[-A-Za-z0-9_.:\/+]+$)/;
     %pagesources);
 my $wiki_link_regexp=qr/\[\[([^\s]+)\]\]/;
 my $wiki_file_regexp=qr/(^[-A-Za-z0-9_.:\/+]+$)/;

-my $wiki_file_prune_regexp=qr!((^|/).svn/|\.\.|^.|\/\.|\.html?$)!;
+my $wiki_file_prune_regexp=qr!((^|/).svn/|\.\.|^\.|\/\.|\.html?$)!;

 my $verbose=0;
 my $wikiname="wiki";
 my $default_pagetype=".mdwn";
 my $verbose=0;
 my $wikiname="wiki";
 my $default_pagetype=".mdwn";


@@ -183,7 +183,7 @@ sub htmllink ($$) {
                $bestlink=htmlpage($bestlink);
        }
        if (! grep { $_ eq $bestlink } values %renderedfiles) {
                $bestlink=htmlpage($bestlink);
        }
        if (! grep { $_ eq $bestlink } values %renderedfiles) {

-               return "<a href=\"?\">?</a>$link"
+               return "<a href=\"$cgiurl?do=create&page=$link&from=$page\">?</a>$link"

        }
        
        $bestlink=File::Spec->abs2rel($bestlink, dirname($page));
        }
        
        $bestlink=File::Spec->abs2rel($bestlink, dirname($page));


@@ -580,16 +580,62 @@ sub cgi () {
                error("\"do\" parameter missing");
        }
        
                error("\"do\" parameter missing");
        }
        

-       my ($page)=$q->param('page')=~/$wiki_file_regexp/; # untaint
+       my ($page)=$q->param('page')=~/$wiki_file_regexp/;

        if (! defined $page || ! length $page || $page ne $q->param('page') ||
            $page=~/$wiki_file_prune_regexp/ || $page=~/^\//) {
                error("bad page name");
        }
        if (! defined $page || ! length $page || $page ne $q->param('page') ||
            $page=~/$wiki_file_prune_regexp/ || $page=~/^\//) {
                error("bad page name");
        }

+       $page=lc($page);

        
        my $action=$q->request_uri;
        $action=~s/\?.*//;
        
        
        my $action=$q->request_uri;
        $action=~s/\?.*//;
        

-       if ($do eq 'edit') {
+       if ($do eq 'create') {
+               if (exists $pagesources{lc($page)}) {
+                       # hmm, someone else made the page in the meantime?
+                       print $q->redirect("$url/".htmlpage($page));
+               }
+
+               my @page_locs;
+               my ($from)=$q->param('from')=~/$wiki_file_regexp/;
+               if (! defined $from || ! length $from ||
+                   $from ne $q->param('from') ||
+                   $from=~/$wiki_file_prune_regexp/ || $from=~/^\//) {
+                       @page_locs=$page;
+               }
+               else {
+                       my $dir=$from."/";
+                       $dir=~s/[^/]+\/$//;
+                       push @page_locs, $dir.$page;
+                       push @page_locs, "$from/$page";
+                       while (length $dir) {
+                               $dir=~s/[^/]+\/$//;
+                               push @page_locs, $dir.$page;
+                       }
+               }
+               
+               $q->param("do", "save");
+               print $q->header,
+                     $q->start_html("$wikiname: Creating $page"),
+                     $q->h1("$wikiname: Creating $page"),
+                     $q->start_form(-action => $action),
+                     $q->hidden('do'),
+                     "Select page location:",
+                     $q->popup_menu('page', \@page_locs),
+                     $q->textarea(-name => 'content',
+                              -default => "",
+                              -rows => 20,
+                              -columns => 80),
+                     $q->br,
+                     "Optional comment about this change:",
+                     $q->br,
+                     $q->textfield(-name => "comments", -size => 80),
+                     $q->br,
+                     $q->submit("Save Page"),
+                     $q->end_form,
+                     $q->end_html;
+       }
+       elsif ($do eq 'edit') {

                my $content="";
                if (exists $pagesources{lc($page)}) {
                        $content=readfile("$srcdir/$pagesources{lc($page)}");
                my $content="";
                if (exists $pagesources{lc($page)}) {
                        $content=readfile("$srcdir/$pagesources{lc($page)}");


@@ -607,11 +653,11 @@ sub cgi () {
                               -rows => 20,
                               -columns => 80),
                      $q->br,
                               -rows => 20,
                               -columns => 80),
                      $q->br,

-                     "Optional comment about this change",
+                     "Optional comment about this change:",

                      $q->br,
                      $q->textfield(-name => "comments", -size => 80),
                      $q->br,
                      $q->br,
                      $q->textfield(-name => "comments", -size => 80),
                      $q->br,

-                     $q->submit("Save Changes"),
+                     $q->submit("Save Page"),

                      $q->end_form,
                      $q->end_html;
        }
                      $q->end_form,
                      $q->end_html;
        }