web commit by webtest

[ikiwiki.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index 46140c9eab61f0af5504a9342cd5f519a15f3166..06627fc292e56a65b822a01fa76277343a62820d 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -446,13 +446,18 @@ sub rcs_recentchanges ($) { #{{{
                                $state='body';
                        }
                        elsif ($state eq 'body' && /$div/) {
+                               my $committype="web";
                                if (defined $message[0] &&
-                                   $message[0]=~/^web commit by (\w+)(.*)/) {
-                                       $user="$1 (web)";
-                                       $message[0]=$2;
+                                   $message[0]->{line}=~/^web commit by (\w+):?(.*)/) {
+                                       $user="$1";
+                                       $message[0]->{line}=$2;
+                               }
+                               else {
+                                       $committype="svn";
                                }
                                
                                push @ret, { rev => $rev, user => $user,
+                                       committype => $committype,
                                        when => $when, message => [@message],
                                        pages => [@pages] } if @pages;
                                return @ret if @ret >= $num;
@@ -715,7 +720,7 @@ sub cgi_recentchanges ($) { #{{{
        print $q->header, $template->output;
 } #}}}
 
-sub userinfo_get ($$) { #{{
+sub userinfo_get ($$) { #{{{
        my $user=shift;
        my $field=shift;
 
@@ -726,9 +731,9 @@ sub userinfo_get ($$) { #{{
                return "";
        }
        return $userdata->{$user}->{$field};
-} #}}
+} #}}}
 
-sub userinfo_set ($$) { #{{
+sub userinfo_set ($$) { #{{{
        my $user=shift;
        my $info=shift;
        
@@ -742,7 +747,7 @@ sub userinfo_set ($$) { #{{
        my $ret=Storable::lock_store($userdata, "$srcdir/.ikiwiki/userdb");
        umask($oldmask);
        return $ret;
-} #}}
+} #}}}
 
 sub cgi_signin ($$) { #{{{
        my $q=shift;
@@ -911,8 +916,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,