X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=b96b4588e92ad1fb95405c1cba549cfae53b1baf;hb=ed105d7fef72b5bb5f23e72fae40d6b4ffdcb5b8;hp=5e06e529de3c440bb7b6ff4f69afeafc3d86e56d;hpb=d02a5866d4fdedec9219aeca0a6048828b394fd2;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/channels.cpp b/src/channels.cpp index 5e06e529d..b96b4588e 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -16,29 +16,13 @@ using namespace std; -#include -#include -#include -#include -#include #include #include "configreader.h" #include "inspircd.h" -#include "hash_map.h" #include "users.h" -#include "ctables.h" -#include "globals.h" #include "modules.h" -#include "dynamic.h" -#include "commands.h" #include "wildcard.h" #include "mode.h" -#include "xline.h" -#include "inspstring.h" -#include "helperfuncs.h" -#include "typedefs.h" - -extern time_t TIME; chanrec::chanrec(InspIRCd* Instance) : ServerInstance(Instance) { @@ -46,6 +30,7 @@ chanrec::chanrec(InspIRCd* Instance) : ServerInstance(Instance) created = topicset = limit = 0; internal_userlist.clear(); memset(&modes,0,64); + age = ServerInstance->Time(true); } void chanrec::SetMode(char mode,bool mode_on) @@ -58,7 +43,7 @@ void chanrec::SetMode(char mode,bool mode_on) void chanrec::SetModeParam(char mode,const char* parameter,bool mode_on) { - log(DEBUG,"SetModeParam called"); + ServerInstance->Log(DEBUG,"SetModeParam called"); CustomModeList::iterator n = custom_mode_params.find(mode); @@ -67,11 +52,11 @@ void chanrec::SetModeParam(char mode,const char* parameter,bool mode_on) if (n == custom_mode_params.end()) { custom_mode_params[mode] = strdup(parameter); - log(DEBUG,"Custom mode parameter %c %s added",mode,parameter); + ServerInstance->Log(DEBUG,"Custom mode parameter %c %s added",mode,parameter); } else { - log(DEBUG, "Tried to set custom mode parameter for %c '%s' when it was already '%s'", mode, parameter, n->second); + ServerInstance->Log(DEBUG, "Tried to set custom mode parameter for %c '%s' when it was already '%s'", mode, parameter, n->second); } } else @@ -215,19 +200,23 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo if (!user || !cn) return NULL; - int created = 0; + bool new_channel = false; char cname[MAXBUF]; int MOD_RESULT = 0; strlcpy(cname,cn,CHANMAX); + std::string privs; + chanrec* Ptr = Instance->FindChan(cname); if (!Ptr) { - if (user->fd > -1) + privs = "@"; + + if (IS_LOCAL(user) && override == false) { MOD_RESULT = 0; - FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,NULL,cname)); + FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,NULL,cname,privs)); if (MOD_RESULT == 1) return NULL; } @@ -237,18 +226,17 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo Instance->chanlist[cname] = Ptr; strlcpy(Ptr->name, cname,CHANMAX); - Ptr->modes[CM_TOPICLOCK] = Ptr->modes[CM_NOEXTERNAL] = 1; - Ptr->created = TIME; + + /* As spotted by jilles, dont bother to set this on remote users */ + if (IS_LOCAL(user)) + Ptr->modes[CM_TOPICLOCK] = Ptr->modes[CM_NOEXTERNAL] = 1; + + Ptr->created = Instance->Time(); *Ptr->topic = 0; - strlcpy(Ptr->setby, user->nick,NICKMAX-1); + *Ptr->setby = 0; Ptr->topicset = 0; - log(DEBUG,"chanrec::JoinUser(): created: %s",cname); - /* - * set created to 2 to indicate user - * is the first in the channel - * and should be given ops - */ - created = 2; + Instance->Log(DEBUG,"chanrec::JoinUser(): created: %s",cname); + new_channel = true; } else { @@ -260,10 +248,10 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo * remote users are allowed us to bypass channel modes * and bans (used by servers) */ - if (IS_LOCAL(user)) /* was a check on fd > -1 */ + if (IS_LOCAL(user) && override == false) { MOD_RESULT = 0; - FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,Ptr,cname)); + FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,Ptr,cname,privs)); if (MOD_RESULT == 1) { return NULL; @@ -276,21 +264,11 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo FOREACH_RESULT_I(Instance,I_OnCheckKey,OnCheckKey(user, Ptr, key ? key : "")); if (!MOD_RESULT) { - if (!key) + if ((!key) || strcmp(key,Ptr->key)) { - log(DEBUG,"chanrec::JoinUser(): no key given in JOIN"); - user->WriteServ("475 %s %s :Cannot join channel (Requires key)",user->nick, Ptr->name); + user->WriteServ("475 %s %s :Cannot join channel (Incorrect channel key)",user->nick, Ptr->name); return NULL; } - else - { - if (strcmp(key,Ptr->key)) - { - log(DEBUG,"chanrec::JoinUser(): bad key given in JOIN"); - user->WriteServ("475 %s %s :Cannot join channel (Incorrect key)",user->nick, Ptr->name); - return NULL; - } - } } } if (Ptr->modes[CM_INVITEONLY]) @@ -328,40 +306,25 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo } if (Ptr->bans.size()) { - MOD_RESULT = 0; - FOREACH_RESULT_I(Instance,I_OnCheckBan,OnCheckBan(user, Ptr)); - char mask[MAXBUF]; - sprintf(mask,"%s!%s@%s",user->nick, user->ident, user->GetIPString()); - if (!MOD_RESULT) + if (Ptr->IsBanned(user)) { - for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->bans.end(); i++) - { - /* This allows CIDR ban matching - * - * Full masked host Full unmasked host IP with/without CIDR - */ - if ((match(user->GetFullHost(),i->data)) || (match(user->GetFullRealHost(),i->data)) || (match(mask, i->data, true))) - { - user->WriteServ("474 %s %s :Cannot join channel (You're banned)",user->nick, Ptr->name); - return NULL; - } - } + user->WriteServ("474 %s %s :Cannot join channel (You're banned)",user->nick, Ptr->name); + return NULL; } } } } else { - log(DEBUG,"chanrec::JoinUser(): Overridden checks"); + Instance->Log(DEBUG,"chanrec::JoinUser(): Overridden checks"); } - created = 1; } for (UserChanList::const_iterator index = user->chans.begin(); index != user->chans.end(); index++) { if ((*index)->channel == NULL) { - return chanrec::ForceChan(Instance, Ptr, *index, user, created); + return chanrec::ForceChan(Instance, Ptr, *index, user, privs); } } @@ -370,10 +333,10 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo * and put the channel in here. Same for remote users which are not bound by * the channel limits. Otherwise, nope, youre boned. */ - if (!IS_LOCAL(user)) /* was a check on fd < 0 */ + if (!IS_LOCAL(user) || override == true) /* was a check on fd < 0 */ { ucrec* a = new ucrec(); - chanrec* c = chanrec::ForceChan(Instance, Ptr,a,user,created); + chanrec* c = chanrec::ForceChan(Instance, Ptr, a, user, privs); user->chans.push_back(a); return c; } @@ -383,7 +346,7 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo if (user->chans.size() < OPERMAXCHANS) { ucrec* a = new ucrec(); - chanrec* c = chanrec::ForceChan(Instance, Ptr,a,user,created); + chanrec* c = chanrec::ForceChan(Instance, Ptr, a, user, privs); user->chans.push_back(a); return c; } @@ -391,9 +354,9 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo user->WriteServ("405 %s %s :You are on too many channels",user->nick, cname); - if (created == 2) + if (new_channel) { - log(DEBUG,"BLAMMO, Whacking channel."); + Instance->Log(DEBUG,"BLAMMO, Whacking channel."); /* Things went seriously pear shaped, so take this away. bwahaha. */ chan_hash::iterator n = Instance->chanlist.find(cname); if (n != Instance->chanlist.end()) @@ -425,42 +388,80 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo return NULL; } -chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr,ucrec *a,userrec* user, int created) +chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr,ucrec *a,userrec* user, const std::string &privs) { - if (created == 2) - { - /* first user in is given ops */ - a->uc_modes = UCMODE_OP; - Ptr->AddOppedUser(user); - } - else - { - a->uc_modes = 0; - } + userrec* dummyuser = new userrec(Instance); + std::string nick = user->nick; + + a->uc_modes = 0; + dummyuser->SetFd(FD_MAGIC_NUMBER); a->channel = Ptr; Ptr->AddUser(user); + user->ModChannelCount(1); + + for (std::string::const_iterator x = privs.begin(); x != privs.end(); x++) + { + const char status = *x; + ModeHandler* mh = Instance->Modes->FindPrefix(status); + if (mh) + { + Ptr->SetPrefix(user, status, mh->GetPrefixRank(), true); + /* Make sure that the mode handler knows this mode was now set */ + mh->OnModeChange(dummyuser, dummyuser, Ptr, nick, true); + } + } + + delete dummyuser; + Ptr->WriteChannel(user,"JOIN :%s",Ptr->name); + /* Theyre not the first ones in here, make sure everyone else sees the modes we gave the user */ + std::string ms = Instance->Modes->ModeString(user, Ptr); + if ((Ptr->GetUserCounter() > 1) && (ms.length())) + Ptr->WriteAllExceptSender(user, true, 0, "MODE %s +%s", Ptr->name, ms.c_str()); + /* Major improvement by Brain - we dont need to be calculating all this pointlessly for remote users */ if (IS_LOCAL(user)) { - log(DEBUG,"Sent JOIN to client"); if (Ptr->topicset) { user->WriteServ("332 %s %s :%s", user->nick, Ptr->name, Ptr->topic); user->WriteServ("333 %s %s %s %lu", user->nick, Ptr->name, Ptr->setby, (unsigned long)Ptr->topicset); } Ptr->UserList(user); - user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, Ptr->name); } FOREACH_MOD_I(Instance,I_OnUserJoin,OnUserJoin(user,Ptr)); + FOREACH_MOD_I(Instance,I_OnPostJoin,OnPostJoin(user,Ptr)); return Ptr; } +bool chanrec::IsBanned(userrec* user) +{ + char mask[MAXBUF]; + int MOD_RESULT = 0; + FOREACH_RESULT(I_OnCheckBan,OnCheckBan(user, this)); + if (!MOD_RESULT) + { + snprintf(mask, MAXBUF, "%s!%s@%s", user->nick, user->ident, user->GetIPString()); + for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++) + { + /* This allows CIDR ban matching + * + * Full masked host Full unmasked host IP with/without CIDR + */ + if ((match(user->GetFullHost(),i->data)) || (match(user->GetFullRealHost(),i->data)) || (match(mask, i->data, true))) + { + return true; + } + } + } + return false; +} + /* chanrec::PartUser - * remove a channel from a users record, and remove the record from the hash - * if the channel has become empty + * remove a channel from a users record, and return the number of users left. + * Therefore, if this function returns 0 the caller should delete the chanrec. */ long chanrec::PartUser(userrec *user, const char* reason) { @@ -472,18 +473,12 @@ long chanrec::PartUser(userrec *user, const char* reason) /* zap it from the channel list of the user */ if (user->chans[i]->channel == this) { - if (reason) - { - FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, reason)); - this->WriteChannel(user, "PART %s :%s", this->name, reason); - } - else - { - FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, "")); - this->WriteChannel(user, "PART :%s", this->name); - } + FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, reason ? reason : "")); + this->WriteChannel(user, "PART %s%s%s", this->name, reason ? " :" : "", reason ? reason : ""); user->chans[i]->uc_modes = 0; user->chans[i]->channel = NULL; + user->ModChannelCount(-1); + this->RemoveAllPrefixes(user); break; } } @@ -494,7 +489,7 @@ long chanrec::PartUser(userrec *user, const char* reason) /* kill the record */ if (iter != ServerInstance->chanlist.end()) { - log(DEBUG,"del_channel: destroyed: %s", this->name); + ServerInstance->Log(DEBUG,"del_channel: destroyed: %s", this->name); FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(this)); ServerInstance->chanlist.erase(iter); } @@ -530,6 +525,7 @@ long chanrec::ServerKickUser(userrec* user, const char* reason, bool triggereven this->WriteChannelWithServ(ServerInstance->Config->ServerName, "KICK %s %s :%s", this->name, user->nick, reason); user->chans[i]->uc_modes = 0; user->chans[i]->channel = NULL; + this->RemoveAllPrefixes(user); break; } } @@ -561,14 +557,14 @@ long chanrec::KickUser(userrec *src, userrec *user, const char* reason) src->WriteServ("441 %s %s %s :They are not on that channel",src->nick, user->nick, this->name); return this->GetUserCounter(); } - if ((is_uline(user->server)) && (!is_uline(src->server))) + if ((ServerInstance->ULine(user->server)) && (!ServerInstance->ULine(src->server))) { src->WriteServ("482 %s %s :Only a u-line may kick a u-line from a channel.",src->nick, this->name); return this->GetUserCounter(); } int MOD_RESULT = 0; - if (!is_uline(src->server)) + if (!ServerInstance->ULine(src->server)) { MOD_RESULT = 0; FOREACH_RESULT(I_OnUserPreKick,OnUserPreKick(src,user,this,reason)); @@ -579,23 +575,16 @@ long chanrec::KickUser(userrec *src, userrec *user, const char* reason) if (MOD_RESULT != -1) { FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(src,user,this,AC_KICK)); - if ((MOD_RESULT == ACR_DENY) && (!is_uline(src->server))) + if ((MOD_RESULT == ACR_DENY) && (!ServerInstance->ULine(src->server))) return this->GetUserCounter(); - if ((MOD_RESULT == ACR_DEFAULT) || (!is_uline(src->server))) + if ((MOD_RESULT == ACR_DEFAULT) || (!ServerInstance->ULine(src->server))) { int them = this->GetStatus(src); int us = this->GetStatus(user); if ((them < STATUS_HOP) || (them < us)) { - if (them == STATUS_HOP) - { - src->WriteServ("482 %s %s :You must be a channel operator",src->nick, this->name); - } - else - { - src->WriteServ("482 %s %s :You must be at least a half-operator",src->nick, this->name); - } + src->WriteServ("482 %s %s :You must be a channel %soperator",src->nick, this->name, them == STATUS_HOP ? "" : "half-"); return this->GetUserCounter(); } } @@ -612,6 +601,7 @@ long chanrec::KickUser(userrec *src, userrec *user, const char* reason) this->WriteChannel(src, "KICK %s %s :%s", this->name, user->nick, reason); (*i)->uc_modes = 0; (*i)->channel = NULL; + this->RemoveAllPrefixes(user); break; } } @@ -657,7 +647,7 @@ void chanrec::WriteChannel(userrec* user, const std::string &text) for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - if (i->second->fd != FD_MAGIC_NUMBER) + if (IS_LOCAL(i->second)) user->WriteTo(i->second,text); } } @@ -690,28 +680,40 @@ void chanrec::WriteChannelWithServ(const char* ServName, const std::string &text /* write formatted text from a source user to all users on a channel except * for the sender (for privmsg etc) */ -void chanrec::WriteAllExceptSender(userrec* user, char status, char* text, ...) +void chanrec::WriteAllExceptSender(userrec* user, bool serversource, char status, char* text, ...) { char textbuffer[MAXBUF]; va_list argsPtr; - if (!user || !text) + if (!text) return; va_start(argsPtr, text); vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - this->WriteAllExceptSender(user, status, std::string(textbuffer)); + this->WriteAllExceptSender(user, serversource, status, std::string(textbuffer)); } -void chanrec::WriteAllExceptSender(userrec* user, char status, const std::string& text) +void chanrec::WriteAllExcept(userrec* user, bool serversource, char status, CUList &except_list, char* text, ...) { - CUList *ulist; + char textbuffer[MAXBUF]; + va_list argsPtr; - if (!user) + if (!text) return; + va_start(argsPtr, text); + vsnprintf(textbuffer, MAXBUF, text, argsPtr); + va_end(argsPtr); + + this->WriteAllExcept(user, serversource, status, except_list, std::string(textbuffer)); +} + +void chanrec::WriteAllExcept(userrec* user, bool serversource, char status, CUList &except_list, const std::string &text) +{ + CUList *ulist; + switch (status) { case '@': @@ -730,11 +732,23 @@ void chanrec::WriteAllExceptSender(userrec* user, char status, const std::string for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - if ((IS_LOCAL(i->second)) && (user != i->second)) - i->second->WriteFrom(user,text); + if ((IS_LOCAL(i->second)) && (except_list.find(i->second) == except_list.end())) + { + if (serversource) + i->second->WriteServ(text); + else + i->second->WriteFrom(user,text); + } } } +void chanrec::WriteAllExceptSender(userrec* user, bool serversource, char status, const std::string& text) +{ + CUList except_list; + except_list[user] = user; + this->WriteAllExcept(user, serversource, status, except_list, std::string(text)); +} + /* * return a count of the users on a specific channel accounting for * invisible users who won't increase the count. e.g. for /LIST @@ -762,7 +776,7 @@ char* chanrec::ChanModes(bool showkey) *scratch = '\0'; *sparam = '\0'; - /* This was still iterating up to 190, chanrec::custom_modes is only 64 elements -- Om */ + /* This was still iterating up to 190, chanrec::modes is only 64 elements -- Om */ for(int n = 0; n < 64; n++) { if(this->modes[n]) @@ -810,6 +824,17 @@ void chanrec::UserList(userrec *user) { char list[MAXBUF]; size_t dlen, curlen; + int MOD_RESULT = 0; + + if (!IS_LOCAL(user)) + return; + + FOREACH_RESULT(I_OnUserList,OnUserList(user, this)); + ServerInstance->Log(DEBUG,"MOD_RESULT for UserList = %d",MOD_RESULT); + if (MOD_RESULT == 1) + return; + + ServerInstance->Log(DEBUG,"Using builtin NAMES list generation"); dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, this->name); @@ -834,7 +859,7 @@ void chanrec::UserList(userrec *user) continue; } - size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", this->GetStatusChar(i->second), i->second->nick); + size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", this->GetPrefixChar(i->second), i->second->nick); curlen += ptrlen; ptr += ptrlen; @@ -844,7 +869,7 @@ void chanrec::UserList(userrec *user) if (curlen > (480-NICKMAX)) { /* list overflowed into multiple numerics */ - user->WriteServ(list); + user->WriteServ(std::string(list)); /* reset our lengths */ dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, this->name); @@ -858,17 +883,17 @@ void chanrec::UserList(userrec *user) /* if whats left in the list isnt empty, send it */ if (numusers) { - user->WriteServ(list); + user->WriteServ(std::string(list)); } + + user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, this->name); } long chanrec::GetMaxBans() { - std::string x; for (std::map::iterator n = ServerInstance->Config->maxbans.begin(); n != ServerInstance->Config->maxbans.end(); n++) { - x = n->first; - if (match(this->name,x.c_str())) + if (match(this->name,n->first.c_str())) { return n->second; } @@ -879,30 +904,60 @@ long chanrec::GetMaxBans() /* returns the status character for a given user on a channel, e.g. @ for op, * % for halfop etc. If the user has several modes set, the highest mode - * the user has must be returned. */ + * the user has must be returned. + */ +const char* chanrec::GetPrefixChar(userrec *user) +{ + static char pf[2] = {0, 0}; + + prefixlist::iterator n = prefixes.find(user); + if (n != prefixes.end()) + { + if (n->second.size()) + { + /* If the user has any prefixes, their highest prefix + * will always be at the head of the list, as the list is + * sorted in rank order highest first (see SetPrefix() + * for reasons why) + */ + *pf = n->second.begin()->first; + return pf; + } + } -const char* chanrec::GetStatusChar(userrec *user) + *pf = 0; + return pf; +} + +const char* chanrec::GetAllPrefixChars(userrec* user) { - for (std::vector::const_iterator i = user->chans.begin(); i != user->chans.end(); i++) + static char prefix[MAXBUF]; + int ctr = 0; + *prefix = 0; + + prefixlist::iterator n = prefixes.find(user); + if (n != prefixes.end()) { - if ((*i)->channel == this) + for (std::vector::iterator x = n->second.begin(); x != n->second.end(); x++) { - if (((*i)->uc_modes & UCMODE_OP) > 0) - { - return "@"; - } - if (((*i)->uc_modes & UCMODE_HOP) > 0) - { - return "%"; - } - if (((*i)->uc_modes & UCMODE_VOICE) > 0) - { - return "+"; - } - return ""; + prefix[ctr++] = x->first; } } - return ""; + + prefix[ctr] = 0; + + return prefix; +} + +unsigned int chanrec::GetPrefixValue(userrec* user) +{ + prefixlist::iterator n = prefixes.find(user); + if (n != prefixes.end()) + { + if (n->second.size()) + return n->second.begin()->second; + } + return 0; } @@ -919,10 +974,9 @@ int chanrec::GetStatusFlags(userrec *user) } - int chanrec::GetStatus(userrec *user) { - if (is_uline(user->server)) + if (ServerInstance->ULine(user->server)) return STATUS_OP; for (std::vector::const_iterator i = user->chans.begin(); i != user->chans.end(); i++) @@ -947,4 +1001,51 @@ int chanrec::GetStatus(userrec *user) return STATUS_NORMAL; } +void chanrec::SetPrefix(userrec* user, char prefix, unsigned int prefix_value, bool adding) +{ + prefixlist::iterator n = prefixes.find(user); + prefixtype pfx = std::make_pair(prefix,prefix_value); + if (adding) + { + if (n != prefixes.end()) + { + if (std::find(n->second.begin(), n->second.end(), pfx) == n->second.end()) + { + n->second.push_back(pfx); + /* We must keep prefixes in rank order, largest first. + * This is for two reasons, firstly because x-chat *ass-u-me's* this + * state, and secondly it turns out to be a benefit to us later. + * See above in GetPrefix(). + */ + std::sort(n->second.begin(), n->second.end(), ModeParser::PrefixComparison); + } + } + else + { + pfxcontainer one; + one.push_back(pfx); + prefixes.insert(std::make_pair(user, one)); + } + } + else + { + if (n != prefixes.end()) + { + pfxcontainer::iterator x = std::find(n->second.begin(), n->second.end(), pfx); + if (x != n->second.end()) + n->second.erase(x); + } + } + ServerInstance->Log(DEBUG,"Added prefix %c to %s for %s, prefixlist size is now %d", prefix, this->name, user->nick, prefixes.size()); +} + +void chanrec::RemoveAllPrefixes(userrec* user) +{ + prefixlist::iterator n = prefixes.find(user); + if (n != prefixes.end()) + { + ServerInstance->Log(DEBUG,"Removed prefixes from %s for %s, prefixlist size is now %d", this->name, user->nick, prefixes.size()); + prefixes.erase(n); + } +}