err = ERR_CHANNELISFULL;
else if ((chptr->mode.mode & MODE_REGONLY) && !IsAccount(sptr))
err = ERR_NEEDREGGEDNICK;
+ else if ((chptr->mode.mode & MODE_SSLCHAN) && !IsSSL(sptr))
+ err = ERR_SSLCHANNEL;
else if (find_ban(sptr, chptr->banlist))
err = ERR_BANNEDFROMCHAN;
else if (*chptr->mode.key && (!key || strcmp(key, chptr->mode.key)))
case ERR_BANNEDFROMCHAN: err = 'b'; break;
case ERR_BADCHANNELKEY: err = 'k'; break;
case ERR_NEEDREGGEDNICK: err = 'r'; break;
+ case ERR_SSLCHANNEL: err = 'S'; break;
default: err = '?'; break;
}
/* send accountability notice */
override = 1;
}
- if(!err && !override && !IsInvited(sptr, chptr) && chptr->mode.access && chptr->mode.access > 0 && chptr->mode.access < 500 && feature_bool(FEAT_CHMODE_A_ENABLE)) {
+ if(!err && !override && !IsInvited(sptr, chptr) && chptr->mode.access && chptr->mode.access > 0 && chptr->mode.access <= 500 && feature_bool(FEAT_CHMODE_A_ENABLE)) {
//We have to check the users channel access...
struct Client *acptr;
if(feature_str(FEAT_CHMODE_A_TARGET) && (acptr = FindUser(feature_str(FEAT_CHMODE_A_TARGET))) && IsNetServ(acptr) && IsService(cli_user(acptr)->server)) {
do_names(sptr, chptrb, NAMES_ALL|NAMES_EON);
}
} else {
+ if(find_member_link(chptrb, sptr))
+ continue; //we have already joined this channel
//first of all check if we may even join this channel
int err2 = 0;
if (chptrb->users == 0 && !chptrb->mode.apass[0] && !(chptrb->mode.mode & MODE_PERSIST)) {
err2 = ERR_CHANNELISFULL;
else if ((chptrb->mode.mode & MODE_REGONLY) && !IsAccount(sptr))
err2 = ERR_NEEDREGGEDNICK;
+ else if ((chptrb->mode.mode & MODE_SSLCHAN) && !IsSSL(sptr))
+ err2 = ERR_SSLCHANNEL;
else if (find_ban(sptr, chptrb->banlist))
err2 = ERR_BANNEDFROMCHAN;
else if (*chptrb->mode.key && (!key || strcmp(key, chptrb->mode.key)))
}
if (err) {
- switch(err) {
- case ERR_NEEDREGGEDNICK:
- send_reply(sptr,
- ERR_NEEDREGGEDNICK,
- chptr->chname,
- feature_str(FEAT_URLREG));
- break;
- default:
+ const char *error = NULL;
+ if (err == ERR_CHANNELISFULL)
+ error = feature_str(FEAT_ERR_CHANNELISFULL);
+ else if (err == ERR_INVITEONLYCHAN)
+ error = feature_str(FEAT_ERR_INVITEONLYCHAN);
+ else if (err == ERR_BANNEDFROMCHAN)
+ error = feature_str(FEAT_ERR_BANNEDFROMCHAN);
+ else if (err == ERR_BADCHANNELKEY)
+ error = feature_str(FEAT_ERR_BADCHANNELKEY);
+ else if (err == ERR_NEEDREGGEDNICK)
+ error = feature_str(FEAT_ERR_NEEDREGGEDNICK);
+ else if (err == ERR_SSLCHANNEL)
+ error = feature_str(FEAT_ERR_SSLCHANNEL);
+ else if (err == ERR_JOINACCESS)
+ error = feature_str(FEAT_ERR_JOINACCESS);
+
+ if (error)
+ send_reply(sptr, err, chptr->chname, error);
+ else
send_reply(sptr, err, chptr->chname);
- break;
- }
continue;
}