diff options
| author | Florian Westphal <fw@strlen.de> | 2008-04-19 16:51:42 +0200 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2008-04-19 16:51:42 +0200 |
| commit | 11af32466fc7c7314e898443de60068549d16724 (patch) | |
| tree | 90173c239e5703d65f69d3b0110a6a97c89b32e9 | |
| parent | 5538115537e82bec69ca8b3d1f33377d3ba592a0 (diff) | |
| download | ngircd-11af32466fc7c7314e898443de60068549d16724.tar.gz ngircd-11af32466fc7c7314e898443de60068549d16724.zip | |
Channel_Mode: change order of if (set) and if (client) check.
| -rw-r--r-- | src/ngircd/irc-mode.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 51eeed7b..d711bf34 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -517,10 +517,9 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel ) continue; } - if (set) { - /* Set mode */ - if (client) { - /* Channel-User-Mode */ + if (client) { + /* Channel-User-Mode */ + if (set) { if (Channel_UserModeAdd(Channel, client, x[0])) { strlcat(the_args, " ", sizeof(the_args)); strlcat(the_args, Client_ID(client), sizeof(the_args)); @@ -529,16 +528,6 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel ) Client_Mask(client), Channel_Name(Channel), Channel_UserModes(Channel, client)); } } else { - /* Channel-Mode */ - if (Channel_ModeAdd( Channel, x[0])) { - strlcat(the_modes, x, sizeof(the_modes)); - Log(LOG_DEBUG, "Channel %s: Mode change, now \"%s\".", Channel_Name(Channel), Channel_Modes(Channel)); - } - } - } else { - /* Unset mode */ - if (client) { - /* Channel-User-Mode */ if (Channel_UserModeDel(Channel, client, x[0])) { strlcat(the_args, " ", sizeof(the_args)); strlcat(the_args, Client_ID(client), sizeof(the_args)); @@ -546,6 +535,14 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel ) Log(LOG_DEBUG, "User \"%s\": Mode change on %s, now \"%s\"", Client_Mask(client), Channel_Name(Channel), Channel_UserModes(Channel, client)); } + } + } else { + /* Channel-Mode */ + if (set) { + if (Channel_ModeAdd( Channel, x[0])) { + strlcat(the_modes, x, sizeof(the_modes)); + Log(LOG_DEBUG, "Channel %s: Mode change, now \"%s\".", Channel_Name(Channel), Channel_Modes(Channel)); + } } else { /* Channel-Mode */ if (Channel_ModeDel(Channel, x[0])) { |