albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Channel_Mode: change order of if (set) and if (client) check.

This commit is contained in:
Florian Westphal 2008-04-19 16:51:42 +02:00
parent 5538115537
commit 11af32466f
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/ngircd/irc-mode.c
View File

@ -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])) {