* Use a fieldset to set off the openid entry from the rest of the login

[git.ikiwiki.info.git] / IkiWiki / UserInfo.pm

diff --git a/IkiWiki/UserInfo.pm b/IkiWiki/UserInfo.pm
index 5c9d7dce686a86f0527585e92d017cc3c632b313..d0ef578c240a4a021afa424a8d7c8beb9246469a 100644 (file)
--- a/IkiWiki/UserInfo.pm
+++ b/IkiWiki/UserInfo.pm
@@ -15,12 +15,19 @@ sub userinfo_retrieve () { #{{{
 sub userinfo_store ($) { #{{{
        my $userinfo=shift;
        
 sub userinfo_store ($) { #{{{
        my $userinfo=shift;
        

+       my $newfile="$config{wikistatedir}/userdb.new";

        my $oldmask=umask(077);
        my $oldmask=umask(077);

-       my $ret=Storable::lock_store($userinfo, "$config{wikistatedir}/userdb");
+       my $ret=Storable::lock_store($userinfo, $newfile);

        umask($oldmask);
        umask($oldmask);

+       if (defined $ret && $ret) {
+               if (! rename($newfile, "$config{wikistatedir}/userdb")) {
+                       unlink($newfile);
+                       $ret=undef;
+               }
+       }

        return $ret;
 } #}}}
        return $ret;
 } #}}}

-       
+

 sub userinfo_get ($$) { #{{{
        my $user=shift;
        my $field=shift;
 sub userinfo_get ($$) { #{{{
        my $user=shift;
        my $field=shift;


@@ -87,12 +94,8 @@ sub set_banned_users (@) { #{{{
 
 sub commit_notify_list ($@) { #{{{
        my $committer=shift;
 
 sub commit_notify_list ($@) { #{{{
        my $committer=shift;

-       
-       my @pages;
-       foreach my $file (@_) {
-               push @pages, grep { $pagesources{$_} eq $file } keys %pagesources;
-       }
-       
+       my @pages = map pagename($_), @_;
+

        my @ret;
        my $userinfo=userinfo_retrieve();
        foreach my $user (keys %{$userinfo}) {
        my @ret;
        my $userinfo=userinfo_retrieve();
        foreach my $user (keys %{$userinfo}) {


@@ -101,7 +104,10 @@ sub commit_notify_list ($@) { #{{{
                    length $userinfo->{$user}->{subscriptions} &&
                    exists $userinfo->{$user}->{email} &&
                    length $userinfo->{$user}->{email} &&
                    length $userinfo->{$user}->{subscriptions} &&
                    exists $userinfo->{$user}->{email} &&
                    length $userinfo->{$user}->{email} &&

-                   grep { pagespec_match($_, $userinfo->{$user}->{subscriptions}) } @pages) {
+                   grep { pagespec_match($_,
+                                   $userinfo->{$user}->{subscriptions}, 
+                                   user => $committer) }
+                       map pagename($_), @_) {

                        push @ret, $userinfo->{$user}->{email};
                }
        }
                        push @ret, $userinfo->{$user}->{email};
                }
        }


@@ -112,7 +118,9 @@ sub send_commit_mails ($$$@) { #{{{
        my $messagesub=shift;
        my $diffsub=shift;
        my $user=shift;
        my $messagesub=shift;
        my $diffsub=shift;
        my $user=shift;

-       my @changed_pages=shift;
+       my @changed_pages=@_;
+
+       return unless @changed_pages;

 
        my @email_recipients=commit_notify_list($user, @changed_pages);
        if (@email_recipients) {
 
        my @email_recipients=commit_notify_list($user, @changed_pages);
        if (@email_recipients) {


@@ -123,14 +131,19 @@ sub send_commit_mails ($$$@) { #{{{
                my $diff=$diffsub->();
                my $message=$messagesub->();
 
                my $diff=$diffsub->();
                my $message=$messagesub->();
 

-               my $subject="update of $config{wikiname}'s ";
+               my $pagelist;

                if (@changed_pages > 2) {
                if (@changed_pages > 2) {

-                       $subject.="$changed_pages[0] $changed_pages[1] etc";
+                       $pagelist="$changed_pages[0] $changed_pages[1] ...";

                }
                else {
                }
                else {

-                       $subject.=join(" ", @changed_pages);
+                       $pagelist.=join(" ", @changed_pages);

                }
                }

-               $subject.=" by $user";
+               #translators: The three variables are the name of the wiki,
+               #translators: A list of one or more pages that were changed,
+               #translators: And the name of the user making the change.
+               #translators: This is used as the subject of a commit email.
+               my $subject=sprintf(gettext("update of %s's %s by %s"), 
+                       $config{wikiname}, $pagelist, $user);

 
                my $template=template("notifymail.tmpl");
                $template->param(
 
                my $template=template("notifymail.tmpl");
                $template->param(


@@ -144,11 +157,10 @@ sub send_commit_mails ($$$@) { #{{{
                defined(my $pid = fork) or error("Can't fork: $!");
                return if $pid;
                setsid() or error("Can't start a new session: $!");
                defined(my $pid = fork) or error("Can't fork: $!");
                return if $pid;
                setsid() or error("Can't start a new session: $!");

-               eval q{use POSIX ’setsid’};

                chdir '/';
                open STDIN, '/dev/null';
                open STDOUT, '>/dev/null';
                chdir '/';
                open STDIN, '/dev/null';
                open STDOUT, '>/dev/null';

-               open STDERR, '>&STDOUT' or error("Can’t dup stdout: $!");
+               open STDERR, '>&STDOUT' or error("Can't dup stdout: $!");

 
                unlockwiki(); # don't need to keep a lock on the wiki
 
 
                unlockwiki(); # don't need to keep a lock on the wiki
 


@@ -160,7 +172,7 @@ sub send_commit_mails ($$$@) { #{{{
                                From => "$config{wikiname} <$config{adminemail}>",
                                Subject => $subject,
                                Message => $template->output,
                                From => "$config{wikiname} <$config{adminemail}>",
                                Subject => $subject,
                                Message => $template->output,

-                       ) or error("Failed to send update notification mail");
+                       );

                }
 
                exit 0; # daemon process done
                }
 
                exit 0; # daemon process done