X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/cf35ee04cddd7b9b39636499dd24b689443c0e97..4a10f694c4e0895df9145b46c18a8b9633e68926:/IkiWiki/CGI.pm?ds=sidebyside

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 3b1cab9a8..07319ad22 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -138,7 +138,6 @@ sub cgi_signin ($$) { #{{{
 	my $form = CGI::FormBuilder->new(
 		title => "signin",
 		name => "signin",
-		header => 1,
 		charset => "utf-8",
 		method => 'POST',
 		required => 'NONE',
@@ -306,7 +305,6 @@ sub cgi_editpage ($$) { #{{{
 	error($@) if $@;
 	my $form = CGI::FormBuilder->new(
 		fields => \@fields,
-		header => 1,
 		charset => "utf-8",
 		method => 'POST',
 		validate => {
@@ -316,6 +314,7 @@ sub cgi_editpage ($$) { #{{{
 		javascript => 0,
 		params => $q,
 		action => $config{cgiurl},
+		header => 0,
 		table => 0,
 		template => scalar template_params("editpage.tmpl"),
 		wikiname => $config{wikiname},
@@ -472,6 +471,7 @@ sub cgi_editpage ($$) { #{{{
 			$form->field(name => "type", type => 'select',
 				options => \@page_types);
 			$form->title(sprintf(gettext("creating %s"), pagetitle($page)));
+			
 		}
 		elsif ($form->field("do") eq "edit") {
 			check_canedit($page, $q, $session);
@@ -491,24 +491,28 @@ sub cgi_editpage ($$) { #{{{
 			$form->title(sprintf(gettext("editing %s"), pagetitle($page)));
 		}
 		
-		print $form->render(submit => \@buttons);
+		printheader($session);
+		print misctemplate($form->title, $form->render(submit => \@buttons));
 	}
 	else {
 		# save page
 		check_canedit($page, $q, $session);
-		if (! -e "$config{srcdir}/$file" &&
-		    $form->field("do") ne "create") {
+
+		my $exists=-e "$config{srcdir}/$file";
+
+		if ($form->field("do") ne "create" &&
+		    ! $exists && ! -e "$config{underlaydir}/$file") {
 			$form->tmpl_param("page_gone", 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);
+			printheader($session);
+			print misctemplate($form->title, $form->render(submit => \@buttons));
 			return;
 		}
-		elsif (-e "$config{srcdir}/$file" &&
-		       $form->field("do") eq "create") {
+		elsif ($form->field("do") eq "create" && $exists) {
 			$form->tmpl_param("creation_conflict", 1);
 			$form->field(name => "do", value => "edit", force => 1);
 			$form->tmpl_param("page_select", 0);
@@ -519,7 +523,8 @@ sub cgi_editpage ($$) { #{{{
 				value => readfile("$config{srcdir}/$file").
 				         "\n\n\n".$form->field("editcontent"),
 				force => 1);
-			print $form->render(submit => \@buttons);
+			printheader($session);
+			print misctemplate($form->title, $form->render(submit => \@buttons));
 			return;
 		}
 		
@@ -541,7 +546,8 @@ sub cgi_editpage ($$) { #{{{
 			$form->field(name => "page", type => 'hidden');
 			$form->field(name => "type", type => 'hidden');
 			$form->title(sprintf(gettext("editing %s"), $page));
-			print $form->render(submit => \@buttons);
+			printheader($session);
+			print misctemplate($form->title, $form->render(submit => \@buttons));
 			return;
 		}
 		
@@ -553,7 +559,7 @@ sub cgi_editpage ($$) { #{{{
 				$message=$form->field('comments');
 			}
 			
-			if ($form->field("do") eq "create") {
+			if (! $exists) {
 				rcs_add($file);
 			}
 
@@ -585,7 +591,8 @@ sub cgi_editpage ($$) { #{{{
 			$form->field(name => "page", type => 'hidden');
 			$form->field(name => "type", type => 'hidden');
 			$form->title(sprintf(gettext("editing %s"), $page));
-			print $form->render(submit => \@buttons);
+			printheader($session);
+			print misctemplate($form->title, $form->render(submit => \@buttons));
 			return;
 		}
 		else {
@@ -648,9 +655,6 @@ sub cgi (;$$) { #{{{
 		cgi_recentchanges($q);
 		return;
 	}
-	elsif ($do eq 'hyperestraier') {
-		cgi_hyperestraier();
-	}
 
 	# Need to lock the wiki before getting a session.
 	lockwiki();
@@ -684,7 +688,10 @@ sub cgi (;$$) { #{{{
 		print gettext("You are banned.");
 		cgi_savesession($session);
 	}
-	elsif ($do eq 'signin') {
+
+	run_hooks(sessioncgi => sub { shift->($q, $session) });
+
+	if ($do eq 'signin') {
 		cgi_signin($q, $session);
 		cgi_savesession($session);
 	}
@@ -697,21 +704,6 @@ sub cgi (;$$) { #{{{
 	elsif ($do eq 'create' || $do eq 'edit') {
 		cgi_editpage($q, $session);
 	}
-	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."/".titlepage($page).$add)}) {
-			$add=1 unless length $add;
-			$add++;
-		}
-		$q->param('page', $page.$add);
-		# now run same as create
-		$q->param('do', 'create');
-		cgi_editpage($q, $session);
-	}
 	elsif ($do eq 'postsignin') {
 		error(gettext("login failed, perhaps you need to turn on cookies?"));
 	}