modes[mode-65] = mode_on;
}
-void Channel::SetMode(char mode, std::string parameter)
+void Channel::SetModeParam(char mode, std::string parameter)
{
CustomModeList::iterator n = custom_mode_params.find(mode);
// always erase, even if changing, so that the map gets the new value
*/
Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool override, const char* key, bool bursting, time_t TS)
{
- if (!user || !cn)
+ // Fix: unregistered users could be joined using /SAJOIN
+ if (!user || !cn || user->registered != REG_ALL)
return NULL;
char cname[MAXBUF];
return this->GetUserCounter();
}
-long Channel::ServerKickUser(User* user, const char* reason, bool triggerevents, const char* servername)
+long Channel::ServerKickUser(User* user, const char* reason, const char* servername)
{
bool silent = false;
if (servername == NULL || *ServerInstance->Config->HideWhoisServer)
servername = ServerInstance->Config->ServerName;
- if (triggerevents)
- {
- FOREACH_MOD(I_OnUserKick,OnUserKick(NULL, user, this, reason, silent));
- }
+ FOREACH_MOD(I_OnUserKick,OnUserKick(NULL, user, this, reason, silent));
UCListIter i = user->chans.find(this);
if (i != user->chans.end())