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 937abecc1eb056bd5c32189f2a41312b125f5553..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 */
 
 
@@ -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);
 }