Commit Diff
Diff:
1aaf54ac24e8e24d5a3ce5b7b00a775f5237d7a9
fee591b7597dfd9b438b6902d7971787dfd69d60
Commit:
fee591b7597dfd9b438b6902d7971787dfd69d60
Tree:
c7c39e1f44e535d94bf74c99830b6a92a8818cbe
Author:
Alexander Barton <alex@barton.de>
Committer:
Alexander Barton <alex@barton.de>
Date:
Mon Aug 27 19:15:12 2012 UTC
Message:
Remove Can_Send_To_Channel_Identified() Move the functionality directly into Can_Send_To_Channel() function. There should be no functional change ...
blob - 1d1645f2e342e4ee9f01de8ea478ab2fc5eaea93
blob + 0f21a459c3a6644c0f14b2c581f8a45aca154bdc
--- src/ngircd/channel.c
+++ src/ngircd/channel.c
@@ -832,6 +832,10 @@ Can_Send_To_Channel(CHANNEL *Chan, CLIENT *From)
if (strchr(Channel_Modes(Chan), 'n') && !is_member)
return false;
+ if (strchr(Channel_Modes(Chan), 'M') && !Client_HasMode(From, 'R')
+ && !Client_HasMode(From, 'o'))
+ return false;
+
if (is_op || has_voice)
return true;
@@ -845,22 +849,6 @@ Can_Send_To_Channel(CHANNEL *Chan, CLIENT *From)
}
-static bool
-Can_Send_To_Channel_Identified(CHANNEL *Chan, CLIENT *From)
-{
- if ((Client_ThisServer() == From) || Client_HasMode(From, 'o'))
- return true;
-
- if (strchr(Channel_Modes(Chan), 'M') && !Client_HasMode(From, 'R'))
- return false;
-
- if (Lists_Check(&Chan->list_excepts, From))
- return true;
-
- return !Lists_Check(&Chan->list_bans, From);
-}
-
-
GLOBAL bool
Channel_Write(CHANNEL *Chan, CLIENT *From, CLIENT *Client, const char *Command,
bool SendErrors, const char *Text)
@@ -872,13 +860,6 @@ Channel_Write(CHANNEL *Chan, CLIENT *From, CLIENT *Cli
Client_ID(From), Channel_Name(Chan));
}
- if (!Can_Send_To_Channel_Identified(Chan, From)) {
- if (! SendErrors)
- return CONNECTED;
- return IRC_WriteStrClient(From, ERR_CANNOTSENDTOCHAN_MSG,
- Client_ID(From), Channel_Name(Chan));
- }
-
if (Client_Conn(From) > NONE)
Conn_UpdateIdle(Client_Conn(From));
IRCNow