X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=ikiwiki;h=a9f76d3fe6e7e7b64124064399cd41ce8d177707;hp=78e0d2798b913e8fbc795c07619d0011d8c717e7;hb=71b33c979f97725cabb7923c618b016e4d6e35a3;hpb=ec18c1711f0bdf33587c1a13d91eded9d25e5441

diff --git a/ikiwiki b/ikiwiki
index 78e0d2798..a9f76d3fe 100755
--- 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_.:\/+]+$)/;
-my $wiki_file_prune_regexp=qr!((^|/).svn/|\.\.)!;
+my $wiki_file_prune_regexp=qr!((^|/).svn/|\.\.|^\.|\/\.|\.html?$)!;
 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) {
-		return "<a href=\"?\">?</a>$link"
+		return "<a href=\"$cgiurl?do=create&page=$link&from=$page\">?</a>$link"
 	}
 	
 	$bestlink=File::Spec->abs2rel($bestlink, dirname($page));
@@ -380,7 +380,7 @@ sub refresh () {
 			if (/$wiki_file_prune_regexp/) {
 				$File::Find::prune=1;
 			}
-			elsif (! -d $_ && ! /\.html$/ && ! /\/\./) {
+			elsif (! -d $_) {
 				my ($f)=/$wiki_file_regexp/; # untaint
 				if (! defined $f) {
 					warn("skipping bad filename $_\n");
@@ -512,7 +512,7 @@ sub gen_wrapper ($$) {
 	push @params, "--nosvn" if !$svn;
 	push @params, "--cgi" if $cgi;
 	push @params, "--url=$url" if $url;
-	push @params, "--cgiurl=$url" if $cgiurl;
+	push @params, "--cgiurl=$cgiurl" if $cgiurl;
 	my $params=join(" ", @params);
 	my $call='';
 	foreach my $p ($this, $this, @params) {
@@ -580,16 +580,63 @@ sub cgi () {
 		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");
 	}
+	$page=lc($page);
 	
 	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 $default_loc="";
+		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 {
+			@page_locs="$from/$page";
+			$from=dirname($from);
+			$default_loc="$from/$page";
+			while (length $from) {
+				push @page_locs, "$from/$page";
+				$from=dirname($from);
+			}
+			push @page_locs, $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: ($default_loc)",
+		      $q->popup_menu('page', \@page_locs, $default_loc),
+		      $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)}");
@@ -607,11 +654,11 @@ sub cgi () {
 		               -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->submit("Save Changes"),
+		      $q->submit("Save Page"),
 		      $q->end_form,
 		      $q->end_html;
 	}