- /* Member or not? -- That's the question! */
- if (!Channel_IsMemberOf(Channel, Origin))
- return IRC_WriteStrClient(Origin, RPL_CHANNELMODEIS_MSG,
- Client_ID(Origin), Channel_Name(Channel), Channel_Modes(Channel));
-
- /* The sender is a member: generate extended reply */
- strlcpy(the_modes, Channel_Modes(Channel), sizeof(the_modes));
- mode_ptr = the_modes;
- the_args[0] = '\0';
-
- while(*mode_ptr) {
- switch(*mode_ptr) {
- case 'l':
- snprintf(argadd, sizeof(argadd), " %lu", Channel_MaxUsers(Channel));
- strlcat(the_args, argadd, sizeof(the_args));
- break;
- case 'k':
- strlcat(the_args, " ", sizeof(the_args));
- strlcat(the_args, Channel_Key(Channel), sizeof(the_args));
- break;
+ if (!Channel_IsMemberOf(Channel, Origin)) {
+ /* Not a member: "simple" mode reply */
+ if (!IRC_WriteStrClient(Origin, RPL_CHANNELMODEIS_MSG,
+ Client_ID(Origin), Channel_Name(Channel),
+ Channel_Modes(Channel)))
+ return DISCONNECTED;
+ } else {
+ /* The sender is a member: generate extended reply */
+ strlcpy(the_modes, Channel_Modes(Channel), sizeof(the_modes));
+ mode_ptr = the_modes;
+ the_args[0] = '\0';
+
+ while(*mode_ptr) {
+ switch(*mode_ptr) {
+ case 'l':
+ snprintf(argadd, sizeof(argadd), " %lu",
+ Channel_MaxUsers(Channel));
+ strlcat(the_args, argadd, sizeof(the_args));
+ break;
+ case 'k':
+ strlcat(the_args, " ", sizeof(the_args));
+ strlcat(the_args, Channel_Key(Channel),
+ sizeof(the_args));
+ break;
+ }
+ mode_ptr++;