X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=ikiwiki;h=b57611b668c0d939ba4c7d8f64d5d7844677ff77;hp=c9a9262c7d4678e473026910413c7f7bc9837f2c;hb=0c7bcdaa297ef38f7596cc2298a6ed6714b0529a;hpb=f45eb2d5debfd1875277a42f6a742faaa38cad73

diff --git a/ikiwiki b/ikiwiki
index c9a9262c7..b57611b66 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -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));
@@ -580,16 +580,62 @@ 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";
+			}
+			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:",
+		      $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 +653,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;
 	}