X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/odin-cgi/blobdiff_plain/fafab3ed4e7aff2275500662a3885a6b4d11f501..c68a55498f50946e8fca9361386e11769c63aa4e:/lib/Odin.pm

diff --git a/lib/Odin.pm b/lib/Odin.pm
index a89ba88..154fae0 100644
--- a/lib/Odin.pm
+++ b/lib/Odin.pm
@@ -501,7 +501,7 @@ sub redir_query ($$$;$@) {
 	     ("SELECT lpart, expire, recip, comment
 	       FROM odin_mailredir WHERE dom = ? AND owner = ?" .
 	       (defined $cond ? " AND $cond" : "") . " " .
-	      "ORDER BY expire", undef, $dom, $owner, @args)};
+	      "ORDER BY expire, lpart", undef, $dom, $owner, @args)};
 }
 
 sub clear_redir_reservations ($) {
@@ -550,7 +550,7 @@ sub gen_redir_name ($$) {
   my ($db, $gen) = @_;
 
   for (my $try = 0; $try < $MAIL_MAXGENTRY; $try++) {
-    my $l = $gen->gen;
+    my $l = lc $gen->gen;
     return $l
       unless $db->selectrow_arrayref
 	("SELECT 1 FROM odin_mailredir WHERE lpart = ? AND dom = ?",
@@ -574,23 +574,28 @@ sub check_fixup_redir ($) {
   }
 }
 
-sub new_redir ($$\%) {
-  my ($dom, $gen, $r) = @_;
+sub new_redir ($$\%;$) {
+  my ($dom, $gen, $r, $n) = @_;
   my $db = open_db;
-  my $l;
+  my @l;
 
+  $n //= 1;
   check_fixup_redir $r;
   Odin::xact {
     clear_redir_reservations $db;
-    $l = Odin::gen_redir_name $db, $gen;
-    insert_record $db, "odin_mailredir",
-      lpart => $l, dom => $dom, owner => $WHO, st => 'live',
-      recip => $r->{recip} // qualify_recip $Odin::WHO,
-      expire => $r->{expire} // -1,
-      comment => $r->{comment} // "";
+    while (@l < $n) {
+      my $l = Odin::gen_redir_name $db, $gen;
+      insert_record $db, "odin_mailredir",
+	lpart => $l, dom => $dom, st => 'live',
+	owner => $WHO, creator => $WHO,
+	recip => $r->{recip} // qualify_recip $Odin::WHO,
+	expire => $r->{expire} // -1,
+	comment => $r->{comment} // "";
+      push @l, $l;
+    }
     check_redir_limits $db;
   } $db;
-  return $l;
+  return @l;
 }
 
 sub reserve_redir ($$$) {
@@ -657,31 +662,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;
 }