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)) {
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)))
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);