changed add_contact() to not push 'group' contacts onto contact FIFO

diff --git a/src/spong-message.pl b/src/spong-message.pl
index 7c73134416eaa57b5e996b7efce216ea0564f28e..1d874ace28831664b52921a80dcbd085fb3c2944 100755 (executable)
--- a/src/spong-message.pl
+++ b/src/spong-message.pl
@@ -12,7 +12,7 @@
 # (2) Added rules based paging (Stephen Johnson  Nov 14, 1998)
 # (3) Added checks against Acks and downtime (Stephen Johnson  Mar 17, 1999)
 #
-# $Id: spong-message.pl,v 1.23 2000/12/24 20:43:14 sljohnson Exp $
+# $Id: spong-message.pl,v 1.24 2000/12/31 05:50:26 sljohnson Exp $
 
 use lib "@@LIBDIR@@";
 
@@ -684,7 +684,6 @@ sub add_contact {
    @con = @$foo;
    &debug("Adding contact " . (ref($contact) eq 'HASH' ? "hash: " .
           $contact->{'rcpt'} : ": " . $contact));
-   push @con,$contact;
    if ( ref($contact) eq 'HASH') {
       foreach $rcpt ( split /[, \t]+/, $contact->{'rcpt'} ) {
          if ( $HUMANS{$rcpt}->{'group'} ) {
@@ -699,13 +698,17 @@ sub add_contact {
                   { $newent->{'repeat'} = $contact->{'repeat'}; }
                &add_contact(\@con, $newent);
             }
-         }
+         } else {
+            push @con, $rcpt
+         } 
       }
    } elsif ( $HUMANS{$contact}->{'group'} ) {
       my $groupee;
       foreach $groupee ( split /[, \t]+/, $HUMANS{$contact}->{'group'} ) {
          &add_contact(\@con, $groupee);
       }
+   } else {
+      push @con,$contact;
    }
 }
 
@@ -899,7 +902,7 @@ sub load_msg_funcs {
 
    foreach $file (@files) {
       $file =~ /msg_(.*)$/;  $base = $1;
-      &debug("Loading messageing function $base");
+      &debug("Loading messaging function $base");
       eval { require "$msgfunc_path/$file"; };
       if ( $@ ) { &error("Could not load messaging function $base: $@"); }