Added #include for strings.h to fix compiler warnings.

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

diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index 0b2b1ff18afe97c528f981c14bd0deefa68ae3f5..57ca90a39d7a4ec96e581b903b9831a869d94247 100644 (file)
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -17,12 +17,13 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: channel.c,v 1.42 2002/12/30 17:15:42 alex Exp $";
+static char UNUSED id[] = "$Id: channel.c,v 1.44 2004/01/17 03:17:49 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 
 #include "conn-func.h"
 #include "client.h"
@@ -669,7 +670,7 @@ Channel_Write( CHANNEL *Chan, CLIENT *From, CLIENT *Client, CHAR *Text )
 {
        BOOLEAN is_member, has_voice, is_op, ok;
 
-       /* Okay, Ziel ist ein Channel */
+       /* Okay, target is a channel */
        is_member = has_voice = is_op = FALSE;
        if( Channel_IsMemberOf( Chan, From ))
        {
@@ -678,14 +679,21 @@ Channel_Write( CHANNEL *Chan, CLIENT *From, CLIENT *Client, CHAR *Text )
                if( strchr( Channel_UserModes( Chan, From ), 'o' )) is_op = TRUE;
        }
 
-       /* pruefen, ob Client in Channel schreiben darf */
+       /* Check weather client is allowed to write to channel */
        ok = TRUE;
        if( strchr( Channel_Modes( Chan ), 'n' ) && ( ! is_member )) ok = FALSE;
        if( strchr( Channel_Modes( Chan ), 'm' ) && ( ! is_op ) && ( ! has_voice )) ok = FALSE;
+       
+       /* Is the client banned? */
+       if( Lists_CheckBanned( From, Chan ))
+       {
+               /* Client is banned, bus is he channel operator or has voice? */
+               if(( ! has_voice ) && ( ! is_op )) ok = FALSE;
+       }
 
        if( ! ok ) return IRC_WriteStrClient( From, ERR_CANNOTSENDTOCHAN_MSG, Client_ID( From ), Channel_Name( Chan ));
 
-       /* Text senden */
+       /* Send text */
        if( Client_Conn( From ) > NONE ) Conn_UpdateIdle( Client_Conn( From ));
        return IRC_WriteStrChannelPrefix( Client, Chan, From, TRUE, "PRIVMSG %s :%s", Channel_Name( Chan ), Text );
 } /* Channel_Write */