moved invite/ban lists to channel structure

[ngircd-alex.git] / src / ngircd / irc-channel.c

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index 5a19628525f972fa5bdea95601ad9002fb599235..7b92c2b009bd165594a3272d60428fcd4dea9af1 100644 (file)
--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-channel.c,v 1.38 2006/11/05 13:03:48 fw Exp $";
+static char UNUSED id[] = "$Id: irc-channel.c,v 1.39 2006/12/07 17:57:20 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -122,8 +122,8 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
                                chan = Channel_Search( channame );
                                assert( chan != NULL );
 
-                               is_banned = Lists_CheckBanned( target, chan );
-                               is_invited = Lists_CheckInvited( target, chan );
+                               is_banned = Lists_Check(Channel_GetListBans(chan), target );
+                               is_invited = Lists_Check(Channel_GetListInvites(chan), target );
 
                                /* Testen, ob Client gebanned ist */
                                if(( is_banned == true) &&  ( is_invited == false ))
@@ -178,7 +178,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
                         * commands) in this list become deleted when a user
                         * joins a channel this way. */
                        chan = Channel_Search( channame );
-                       if( chan != NULL ) (void)Lists_CheckInvited( target, chan );
+                       if( chan != NULL ) (void)Lists_Check(Channel_GetListInvites(chan), target);
                }
 
                /* Channel joinen (und ggf. anlegen) */