X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b365d864c507c9f6e3374c1fb7c854ddb495aeae..7fc3a41cfde7328d26145ff7127782fc03c62d91:/IkiWiki/CGI.pm?ds=inline

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index aeccd31ac..d92bdd330 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -137,6 +137,7 @@ sub cgi_signin ($$) { #{{{
 	error($@) if $@;
 	my $form = CGI::FormBuilder->new(
 		title => "signin",
+		name => "signin",
 		header => 1,
 		charset => "utf-8",
 		method => 'POST',
@@ -145,7 +146,7 @@ sub cgi_signin ($$) { #{{{
 		params => $q,
 		action => $config{cgiurl},
 		header => 0,
-		template => scalar template_params("signin.tmpl"),
+		template => {type => 'div'},
 		stylesheet => baseurl()."style.css",
 	);
 	my $buttons=["Login"];
@@ -206,6 +207,7 @@ sub cgi_prefs ($$) { #{{{
 	error($@) if $@;
 	my $form = CGI::FormBuilder->new(
 		title => "preferences",
+		name => "preferences",
 		header => 0,
 		charset => "utf-8",
 		method => 'POST',
@@ -216,8 +218,13 @@ sub cgi_prefs ($$) { #{{{
 		javascript => 0,
 		params => $q,
 		action => $config{cgiurl},
-		template => scalar template_params("prefs.tmpl"),
+		template => {type => 'div'},
 		stylesheet => baseurl()."style.css",
+		fieldsets => [
+			[login => gettext("Login")],
+			[preferences => gettext("Preferences")],
+			[admin => gettext("Admin")]
+		],
 	);
 	my $buttons=["Save Preferences", "Logout", "Cancel"];
 
@@ -226,10 +233,12 @@ sub cgi_prefs ($$) { #{{{
 	});
 	
 	$form->field(name => "do", type => "hidden");
-	$form->field(name => "email", size => 50);
+	$form->field(name => "email", size => 50, fieldset => "preferences");
 	$form->field(name => "subscriptions", size => 50,
+		fieldset => "preferences",
 		comment => "(".htmllink("", "", "PageSpec", noimageinline => 1).")");
-	$form->field(name => "banned_users", size => 50);
+	$form->field(name => "banned_users", size => 50,
+		fieldset => "admin");
 	
 	my $user_name=$session->param("name");
 	if (! is_admin($user_name)) {
@@ -286,13 +295,11 @@ sub cgi_prefs ($$) { #{{{
 	}
 } #}}}
 
-sub cgi_editpage ($$;$) { #{{{
+sub cgi_editpage ($$) { #{{{
 	my $q=shift;
 	my $session=shift;
-	my $blogpost=shift;
 
-	my @fields=qw(do rcsinfo subpage from page type editcontent comments
-	              newfile);
+	my @fields=qw(do rcsinfo subpage from page type editcontent comments);
 	my @buttons=("Save Page", "Preview", "Cancel");
 	
 	eval q{use CGI::FormBuilder};
@@ -311,6 +318,7 @@ sub cgi_editpage ($$;$) { #{{{
 		action => $config{cgiurl},
 		table => 0,
 		template => scalar template_params("editpage.tmpl"),
+		wikiname => $config{wikiname},
 	);
 	
 	run_hooks(formbuilder_setup => sub {
@@ -323,9 +331,6 @@ sub cgi_editpage ($$;$) { #{{{
 	# characters.
 	my ($page)=$form->field('page');
 	$page=titlepage(possibly_foolish_untaint($page));
-	if ($blogpost) {
-		$page=~s/(\/)/"__".ord($1)."__"/eg;
-	}
 	if (! defined $page || ! length $page || file_pruned($page, $config{srcdir}) || $page=~/^\//) {
 		error("bad page name");
 	}
@@ -337,12 +342,16 @@ sub cgi_editpage ($$;$) { #{{{
 	
 	my $file;
 	my $type;
-	if (exists $pagesources{$page}) {
+	if (exists $pagesources{$page} && $form->field("do") ne "create") {
 		$file=$pagesources{$page};
 		$type=pagetype($file);
 		if (! defined $type) {
 			error(sprintf(gettext("%s is not an editable page"), $page));
 		}
+		if (! $form->submitted) {
+			$form->field(name => "rcsinfo",
+				value => rcs_prepedit($file), force => 1);
+		}
 	}
 	else {
 		$type=$form->param('type');
@@ -355,37 +364,31 @@ sub cgi_editpage ($$;$) { #{{{
 		}
 		$type=$config{default_pageext} unless defined $type;
 		$file=$page.".".$type;
+		if (! $form->submitted) {
+			$form->field(name => "rcsinfo", value => "", force => 1);
+		}
 	}
 
-
 	$form->field(name => "do", type => 'hidden');
 	$form->field(name => "from", type => 'hidden');
 	$form->field(name => "rcsinfo", type => 'hidden');
 	$form->field(name => "subpage", type => 'hidden');
-	$form->field(name => "page", value => $page, force => 1);
+	$form->field(name => "page", value => pagetitle($page, 1), force => 1);
 	$form->field(name => "type", value => $type, force => 1);
 	$form->field(name => "comments", type => "text", size => 80);
 	$form->field(name => "editcontent", type => "textarea", rows => 20,
 		cols => 80);
-	$form->field(name => "newfile", type => 'hidden');
 	$form->tmpl_param("can_commit", $config{rcs});
 	$form->tmpl_param("indexlink", indexlink());
 	$form->tmpl_param("helponformattinglink",
 		htmllink("", "", "HelpOnFormatting", noimageinline => 1));
 	$form->tmpl_param("baseurl", baseurl());
-	if (! $form->submitted) {
-		$form->field(name => "rcsinfo", value => rcs_prepedit($file),
-			force => 1);
-		$form->field(name => "newfile", 
-			value => ! -e "$config{srcdir}/$file",
-			force => 1);
-	}
 	
 	if ($form->submitted eq "Cancel") {
-		if ($form->field(name => "newfile") && defined $from) {
+		if ($form->field("do") eq "create" && defined $from) {
 			redirect($q, "$config{url}/".htmlpage($from));
 		}
-		elsif ($form->field(name => "newfile")) {
+		elsif ($form->field("do") eq "create") {
 			redirect($q, $config{url});
 		}
 		else {
@@ -394,17 +397,11 @@ sub cgi_editpage ($$;$) { #{{{
 		return;
 	}
 	elsif ($form->submitted eq "Preview") {
-		my $content=$form->field('editcontent');
-		my $comments=$form->field('comments');
-		$form->field(name => "editcontent",
-				value => $content, force => 1);
-		$form->field(name => "comments",
-				value => $comments, force => 1);
 		$form->tmpl_param("page_preview",
 			htmlize($page, $type,
 			linkify($page, "",
 			preprocess($page, $page,
-			filter($page, $content), 0, 1))));
+			filter($page, $form->field('editcontent')), 0, 1))));
 	}
 	else {
 		$form->tmpl_param("page_preview", "");
@@ -499,13 +496,29 @@ sub cgi_editpage ($$;$) { #{{{
 	else {
 		# save page
 		check_canedit($page, $q, $session);
-		if (! -e "$config{srcdir}/$file" && ! $form->field(name => 'newfile')){
+		if (! -e "$config{srcdir}/$file" &&
+		    $form->field("do") ne "create") {
 			$form->tmpl_param("page_gone", 1);
-			$form->field(name => "newfile",
-			             value => 1, force => 1);
+			$form->field(name => "do", value => "create", force => 1);
+			$form->tmpl_param("page_select", 0);
+			$form->field(name => "page", type => 'hidden');
+			$form->field(name => "type", type => 'hidden');
+			$form->title(sprintf(gettext("editing %s"), $page));
+			print $form->render(submit => \@buttons);
+			return;
+		}
+		elsif (-e "$config{srcdir}/$file" &&
+		       $form->field("do") eq "create") {
+			$form->tmpl_param("creation_conflict", 1);
+			$form->field(name => "do", value => "edit", force => 1);
 			$form->tmpl_param("page_select", 0);
 			$form->field(name => "page", type => 'hidden');
 			$form->field(name => "type", type => 'hidden');
+			$form->title(sprintf(gettext("editing %s"), $page));
+			$form->field("editcontent", 
+				value => readfile("$config{srcdir}/$file").
+				         "\n\n\n".$form->field("editcontent"),
+				force => 1);
 			print $form->render(submit => \@buttons);
 			return;
 		}
@@ -540,7 +553,7 @@ sub cgi_editpage ($$;$) { #{{{
 				$message=$form->field('comments');
 			}
 			
-			if ($form->field(name => "newfile")) {
+			if ($form->field("do") eq "create") {
 				rcs_add($file);
 			}
 
@@ -686,17 +699,18 @@ sub cgi (;$$) { #{{{
 	}
 	elsif ($do eq 'blog') {
 		my $page=decode_utf8($q->param('title'));
+		$page=~s/\///g; # no slashes in blog posts
 		# if the page already exists, munge it to be unique
 		my $from=$q->param('from');
 		my $add="";
-		while (exists $pagecase{lc "$from/$page$add"}) {
+		while (exists $pagecase{lc($from."/".titlepage($page).$add)}) {
 			$add=1 unless length $add;
 			$add++;
 		}
 		$q->param('page', $page.$add);
-		# now run same as create, except escape slashes too
+		# now run same as create
 		$q->param('do', 'create');
-		cgi_editpage($q, $session, 1);
+		cgi_editpage($q, $session);
 	}
 	elsif ($do eq 'postsignin') {
 		error(gettext("login failed, perhaps you need to turn on cookies?"));