Fix PRIVMSG/NOTICE handler (II): keep command when forwarding to channels.

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

diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index 5caf7d0ce267fa68598cbca60c67414b29b15f03..d774e576af95882ae134c9b2341a205752709dc9 100644 (file)
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2005 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2008 by Alexander Barton (alex@barton.de)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,8 +17,6 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: channel.c,v 1.65 2008/02/05 16:31:35 fw Exp $";
-
 #include "imp.h"
 #include <assert.h>
 #include <stdlib.h>
@@ -183,30 +181,34 @@ Channel_Join( CLIENT *Client, char *Name )
 {
        CHANNEL *chan;
 
-       assert( Client != NULL );
-       assert( Name != NULL );
+       assert(Client != NULL);
+       assert(Name != NULL);
 
        /* Check that the channel name is valid */
-       if( ! Channel_IsValidName( Name )) {
-               IRC_WriteStrClient( Client, ERR_NOSUCHCHANNEL_MSG, Client_ID( Client ), Name );
+       if (! Channel_IsValidName(Name)) {
+               IRC_WriteStrClient(Client, ERR_NOSUCHCHANNEL_MSG,
+                                  Client_ID(Client), Name);
                return false;
        }
 
-       chan = Channel_Search( Name );
-       if( chan ) {
+       chan = Channel_Search(Name);
+       if(chan) {
                /* Check if the client is already in the channel */
-               if( Get_Cl2Chan( chan, Client )) return false;
-       }
-       else
-       {
-               /* If the specified channel doesn't exist, the channel is created */
-               chan = Channel_Create( Name );
-               if (!chan) return false;
+               if (Get_Cl2Chan(chan, Client))
+                       return false;
+       } else {
+               /* If the specified channel does not exist, the channel
+                * is now created */
+               chan = Channel_Create(Name);
+               if (!chan)
+                       return false;
        }
 
        /* Add user to Channel */
-       if( ! Add_Client( chan, Client )) return false;
-       else return true;
+       if (! Add_Client(chan, Client))
+               return false;
+
+       return true;
 } /* Channel_Join */
 
 
@@ -419,7 +421,7 @@ Channel_Next( CHANNEL *Chan )
 GLOBAL CHANNEL *
 Channel_Search( const char *Name )
 {
-       /* Channel-Struktur suchen */
+       /* Search channel structure */
 
        CHANNEL *c;
        UINT32 search_hash;
@@ -432,7 +434,7 @@ Channel_Search( const char *Name )
        {
                if( search_hash == c->hash )
                {
-                       /* lt. Hash-Wert: Treffer! */
+                       /* hash hit */
                        if( strcasecmp( Name, c->name ) == 0 ) return c;
                }
                c = c->next;
@@ -496,6 +498,10 @@ Channel_IsValidName( const char *Name )
 {
        assert( Name != NULL );
 
+#ifdef STRICT_RFC
+       if (strlen(Name) <= 1)
+               return false;
+#endif
        if (strchr("+#", Name[0]) == NULL)
                return false;
        if (strlen(Name) >= CHANNEL_NAME_LEN)
@@ -762,30 +768,21 @@ Can_Send_To_Channel(CHANNEL *Chan, CLIENT *From)
 
 
 GLOBAL bool
-Channel_Write(CHANNEL *Chan, CLIENT *From, CLIENT *Client, const char *Text)
-{
-       if (!Can_Send_To_Channel(Chan, From))
-               return IRC_WriteStrClient(From, ERR_CANNOTSENDTOCHAN_MSG, Client_ID(From), Channel_Name(Chan));
-
-       if (Client_Conn(From) > NONE)
-               Conn_UpdateIdle(Client_Conn(From));
-
-       return IRC_WriteStrChannelPrefix(Client, Chan, From, true,
-                       "PRIVMSG %s :%s", Channel_Name(Chan), Text);
-}
-
-
-GLOBAL bool
-Channel_Notice(CHANNEL *Chan, CLIENT *From, CLIENT *Client, const char *Text)
+Channel_Write(CHANNEL *Chan, CLIENT *From, CLIENT *Client, const char *Command,
+             bool SendErrors, const char *Text)
 {
-       if (!Can_Send_To_Channel(Chan, From))
-               return true; /* no error, see RFC 2812 */
+       if (!Can_Send_To_Channel(Chan, From)) {
+               if (! SendErrors)
+                       return CONNECTED;       /* no error, see RFC 2812 */
+               return IRC_WriteStrClient(From, ERR_CANNOTSENDTOCHAN_MSG,
+                                         Client_ID(From), Channel_Name(Chan));
+       }
 
        if (Client_Conn(From) > NONE)
                Conn_UpdateIdle(Client_Conn(From));
 
        return IRC_WriteStrChannelPrefix(Client, Chan, From, true,
-                       "NOTICE %s :%s", Channel_Name(Chan), Text);
+                       "%s %s :%s", Command, Channel_Name(Chan), Text);
 }
 
 
@@ -839,7 +836,7 @@ Add_Client( CHANNEL *Chan, CLIENT *Client )
        assert( Chan != NULL );
        assert( Client != NULL );
 
-       /* neue CL2CHAN-Struktur anlegen */
+       /* Create new CL2CHAN structure */
        cl2chan = (CL2CHAN *)malloc( sizeof( CL2CHAN ));
        if( ! cl2chan )
        {
@@ -850,7 +847,7 @@ Add_Client( CHANNEL *Chan, CLIENT *Client )
        cl2chan->client = Client;
        strcpy( cl2chan->modes, "" );
 
-       /* Verketten */
+       /* concatenate */
        cl2chan->next = My_Cl2Chan;
        My_Cl2Chan = cl2chan;
 
@@ -884,7 +881,7 @@ Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, const ch
        c = cl2chan->channel;
        assert( c != NULL );
 
-       /* Aus Verkettung loesen und freigeben */
+       /* maintain cl2chan list */
        if( last_cl2chan ) last_cl2chan->next = cl2chan->next;
        else My_Cl2Chan = cl2chan->next;
        free( cl2chan );
@@ -930,7 +927,7 @@ Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, const ch
                        }
        }
 
-       /* Wenn Channel nun leer und nicht pre-defined: loeschen */
+       /* When channel is empty and is not pre-defined, delete */
        if( ! strchr( Channel_Modes( Chan ), 'P' ))
        {
                if( ! Get_First_Cl2Chan( NULL, Chan )) Delete_Channel( Chan );
@@ -1030,7 +1027,7 @@ Get_Next_Cl2Chan( CL2CHAN *Start, CLIENT *Client, CHANNEL *Channel )
 static bool
 Delete_Channel( CHANNEL *Chan )
 {
-       /* Channel-Struktur loeschen */
+       /* delete channel structure */
 
        CHANNEL *chan, *last_chan;
 
@@ -1046,11 +1043,11 @@ Delete_Channel( CHANNEL *Chan )
 
        Log( LOG_DEBUG, "Freed channel structure for \"%s\".", Chan->name );
 
-       /* Invite- und Ban-Lists aufraeumen */
+       /* free invite and ban lists */
        Lists_Free( &chan->list_bans );
        Lists_Free( &chan->list_invites );
 
-       /* Neu verketten und freigeben */
+       /* maintain channel list */
        if( last_chan ) last_chan->next = chan->next;
        else My_Channels = chan->next;
        free( chan );