X-Git-Url: https://git.distorted.org.uk/~mdw/odin-cgi/blobdiff_plain/f22ba7c6dbec7a6e8b30d699e13909abe4d82589..6c2ef782119912a0e6a5615fc04f419a69b5ce66:/lib/Odin.pm diff --git a/lib/Odin.pm b/lib/Odin.pm index d9307b2..b91eb96 100644 --- a/lib/Odin.pm +++ b/lib/Odin.pm @@ -661,31 +661,34 @@ sub disable_redir ($$) { } $db; } -sub modify_redir ($$\%) { - my ($dom, $l, $r) = @_; +sub modify_redir ($\%@) { + my ($dom, $r, @l) = @_; my $db = open_db; check_fixup_redir $r; Odin::xact { clear_redir_reservations $db; - my ($recip, $st) = $db->selectrow_array - ("SELECT recip, st FROM odin_mailredir - WHERE lpart = ? AND dom = ? AND owner = ?", undef, - $l, $dom, $WHO); - if (!defined $recip) { Odin::fail "unknown local part `$l'"; } - elsif ($recip eq "") { $r->{recip} //= qualify_recip $WHO; } - if ($st ne "live") { $r->{st} = "live"; $r->{expire} //= -1; } - my @var = (); - my @val = (); - for my $v (keys %$r) { - push @var, $v; - push @val, $r->{$v}; + for my $l (@l) { + my %r = %$r; + my ($recip, $st) = $db->selectrow_array + ("SELECT recip, st FROM odin_mailredir + WHERE lpart = ? AND dom = ? AND owner = ?", undef, + $l, $dom, $WHO); + if (!defined $recip) { Odin::fail "unknown local part `$l'"; } + elsif ($recip eq "") { $r{recip} //= qualify_recip $WHO; } + if ($st ne "live") { $r{st} = "live"; $r{expire} //= -1; } + my @var = (); + my @val = (); + for my $v (keys %r) { + push @var, $v; + push @val, $r{$v}; + } + @var or fail "nothing to change"; + $db->do("UPDATE odin_mailredir SET " . + join(", ", map { "$_ = ?" } @var) . " " . + "WHERE lpart = ? AND dom = ?", undef, + @val, $l, $dom); } - @var or fail "nothing to change"; - $db->do("UPDATE odin_mailredir SET " . - join(", ", map { "$_ = ?" } @var) . " " . - "WHERE lpart = ? AND dom = ?", undef, - @val, $l, $dom); } $db; }