X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/blobdiff_plain/6afb396354bdceab5f7354a2c4b9ccd3d3d4fae4..310c0de06d4ed52c5ba75ae08ed9ba5cc9073fbf:/ikiwiki

diff --git a/ikiwiki b/ikiwiki
index abeda29c2..a6860f248 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -448,7 +448,7 @@ sub rcs_recentchanges ($) { #{{{
 			elsif ($state eq 'body' && /$div/) {
 				my $committype="web";
 				if (defined $message[0] &&
-				    $message[0]->{line}=~/^web commit by (\w+)(.*)/) {
+				    $message[0]->{line}=~/^web commit by (\w+):?(.*)/) {
 					$user="$1";
 					$message[0]->{line}=$2;
 				}
@@ -456,8 +456,9 @@ sub rcs_recentchanges ($) { #{{{
 					$committype="svn";
 				}
 				
-				push @ret, { rev => $rev, user => $user,
-					commitype => $commitype,
+				push @ret, { rev => $rev,
+					user => htmllink("", $user, 1),
+					committype => $committype,
 					when => $when, message => [@message],
 					pages => [@pages] } if @pages;
 				return @ret if @ret >= $num;
@@ -720,7 +721,7 @@ sub cgi_recentchanges ($) { #{{{
 	print $q->header, $template->output;
 } #}}}
 
-sub userinfo_get ($$) { #{{
+sub userinfo_get ($$) { #{{{
 	my $user=shift;
 	my $field=shift;
 
@@ -731,9 +732,9 @@ sub userinfo_get ($$) { #{{
 		return "";
 	}
 	return $userdata->{$user}->{$field};
-} #}}
+} #}}}
 
-sub userinfo_set ($$) { #{{
+sub userinfo_set ($$) { #{{{
 	my $user=shift;
 	my $info=shift;
 	
@@ -747,7 +748,7 @@ sub userinfo_set ($$) { #{{
 	my $ret=Storable::lock_store($userdata, "$srcdir/.ikiwiki/userdb");
 	umask($oldmask);
 	return $ret;
-} #}}
+} #}}}
 
 sub cgi_signin ($$) { #{{{
 	my $q=shift;
@@ -916,8 +917,10 @@ sub cgi_editpage ($$) { #{{{
 		fields => [qw(do from page content comments)],
 		header => 1,
 		method => 'POST',
-		validate => {},
-		required => [qw{}],
+		validate => {
+			content => '/.+/',
+		},
+		required => [qw{content}],
 		javascript => 0,
 		params => $q,
 		action => $q->request_uri,
@@ -939,6 +942,10 @@ sub cgi_editpage ($$) { #{{{
 	$form->field(name => "content", type => "textarea", rows => 20,
 		cols => 80);
 	
+	if ($form->submitted eq "Cancel") {
+		print $q->redirect("$url/".htmlpage($page));
+		return;
+	}
 	if (! $form->submitted || ! $form->validate) {
 		if ($form->field("do") eq "create") {
 			if (exists $pagesources{lc($page)}) {
@@ -986,7 +993,7 @@ sub cgi_editpage ($$) { #{{{
 		
 		$form->tmpl_param("can_commit", $svn);
 		$form->tmpl_param("indexlink", indexlink());
-		print $form->render(submit => ["Save Page"]);
+		print $form->render(submit => ["Save Page", "Cancel"]);
 	}
 	else {
 		# save page