X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=cab05caeb1b7a607c3faba8d2c74d6c1a58431d4;hb=59643d29385fd4fbfed7a5720e90e2c9ffd1fd21;hp=00f8dbce6f466a502676e33cdbaf78669ab13251;hpb=3759fe0ba2420bd564abb4b034582ea0866907aa;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/channels.cpp b/src/channels.cpp index 00f8dbce6..cab05caeb 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -11,23 +11,33 @@ * --------------------------------------------------- */ -#include -#include "configreader.h" +/* $Core: libIRCDchannels */ + #include "inspircd.h" -#include "users.h" -#include "modules.h" +#include #include "wildcard.h" #include "mode.h" -chanrec::chanrec(InspIRCd* Instance) : ServerInstance(Instance) +Channel::Channel(InspIRCd* Instance, const std::string &name, time_t ts) : ServerInstance(Instance) { - *name = *topic = *setby = *key = 0; - maxbans = created = topicset = limit = 0; + chan_hash::iterator findchan = ServerInstance->chanlist->find(name); + if (findchan != Instance->chanlist->end()) + throw CoreException("Cannot create duplicate channel " + name); + + (*(ServerInstance->chanlist))[name.c_str()] = this; + strlcpy(this->name, name.c_str(), CHANMAX); + this->created = ts ? ts : ServerInstance->Time(true); + this->age = this->created; + + + + + *topic = *setby = *key = 0; + maxbans = topicset = limit = 0; memset(&modes,0,64); - age = ServerInstance->Time(true); } -void chanrec::SetMode(char mode,bool mode_on) +void Channel::SetMode(char mode,bool mode_on) { modes[mode-65] = mode_on; if (!mode_on) @@ -35,7 +45,7 @@ void chanrec::SetMode(char mode,bool mode_on) } -void chanrec::SetModeParam(char mode,const char* parameter,bool mode_on) +void Channel::SetModeParam(char mode,const char* parameter,bool mode_on) { CustomModeList::iterator n = custom_mode_params.find(mode); @@ -54,12 +64,12 @@ void chanrec::SetModeParam(char mode,const char* parameter,bool mode_on) } } -bool chanrec::IsModeSet(char mode) +bool Channel::IsModeSet(char mode) { return modes[mode-65]; } -std::string chanrec::GetModeParameter(char mode) +std::string Channel::GetModeParameter(char mode) { switch (mode) { @@ -76,17 +86,17 @@ std::string chanrec::GetModeParameter(char mode) } } -long chanrec::GetUserCounter() +long Channel::GetUserCounter() { return (this->internal_userlist.size()); } -void chanrec::AddUser(userrec* user) +void Channel::AddUser(User* user) { - internal_userlist[user] = user; + internal_userlist[user] = user->nick; } -unsigned long chanrec::DelUser(userrec* user) +unsigned long Channel::DelUser(User* user) { CUListIter a = internal_userlist.find(user); @@ -102,17 +112,17 @@ unsigned long chanrec::DelUser(userrec* user) return internal_userlist.size(); } -bool chanrec::HasUser(userrec* user) +bool Channel::HasUser(User* user) { return (internal_userlist.find(user) != internal_userlist.end()); } -void chanrec::AddOppedUser(userrec* user) +void Channel::AddOppedUser(User* user) { - internal_op_userlist[user] = user; + internal_op_userlist[user] = user->nick; } -void chanrec::DelOppedUser(userrec* user) +void Channel::DelOppedUser(User* user) { CUListIter a = internal_op_userlist.find(user); if (a != internal_op_userlist.end()) @@ -122,12 +132,12 @@ void chanrec::DelOppedUser(userrec* user) } } -void chanrec::AddHalfoppedUser(userrec* user) +void Channel::AddHalfoppedUser(User* user) { - internal_halfop_userlist[user] = user; + internal_halfop_userlist[user] = user->nick; } -void chanrec::DelHalfoppedUser(userrec* user) +void Channel::DelHalfoppedUser(User* user) { CUListIter a = internal_halfop_userlist.find(user); @@ -137,12 +147,12 @@ void chanrec::DelHalfoppedUser(userrec* user) } } -void chanrec::AddVoicedUser(userrec* user) +void Channel::AddVoicedUser(User* user) { - internal_voice_userlist[user] = user; + internal_voice_userlist[user] = user->nick; } -void chanrec::DelVoicedUser(userrec* user) +void Channel::DelVoicedUser(User* user) { CUListIter a = internal_voice_userlist.find(user); @@ -152,50 +162,117 @@ void chanrec::DelVoicedUser(userrec* user) } } -CUList* chanrec::GetUsers() +CUList* Channel::GetUsers() { return &internal_userlist; } -CUList* chanrec::GetOppedUsers() +CUList* Channel::GetOppedUsers() { return &internal_op_userlist; } -CUList* chanrec::GetHalfoppedUsers() +CUList* Channel::GetHalfoppedUsers() { return &internal_halfop_userlist; } -CUList* chanrec::GetVoicedUsers() +CUList* Channel::GetVoicedUsers() { return &internal_voice_userlist; } +void Channel::SetDefaultModes() +{ + irc::spacesepstream list(ServerInstance->Config->DefaultModes); + std::string modeseq; + std::string parameter; + + list.GetToken(modeseq); + + for (std::string::iterator n = modeseq.begin(); n != modeseq.end(); ++n) + { + ModeHandler* mode = ServerInstance->Modes->FindMode(*n, MODETYPE_CHANNEL); + if (mode) + { + if (mode->GetNumParams(true)) + list.GetToken(parameter); + else + parameter.clear(); + + mode->OnModeChange(ServerInstance->FakeClient, ServerInstance->FakeClient, this, parameter, true); + } + } +} + /* * add a channel to a user, creating the record for it if needed and linking * it to the user record */ -chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bool override, const char* key, time_t TS) +Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool override, const char* key, bool bursting, time_t TS) { if (!user || !cn) return NULL; - bool new_channel = false; char cname[MAXBUF]; int MOD_RESULT = 0; - strlcpy(cname,cn,CHANMAX); - std::string privs; + Channel *Ptr; - chanrec* Ptr = Instance->FindChan(cname); + /* + * We don't restrict the number of channels that remote users or users that are override-joining may be in. + * We restrict local users to MaxChans channels. + * We restrict local operators to OperMaxChans channels. + * This is a lot more logical than how it was formerly. -- w00t + */ + if (IS_LOCAL(user) && !override) + { + if (user->GetMaxChans()) + { + if (user->chans.size() >= user->GetMaxChans()) + { + user->WriteServ("405 %s %s :You are on too many channels",user->nick, cn); + return NULL; + } + } + else + { + if (IS_OPER(user)) + { + if (user->chans.size() >= Instance->Config->OperMaxChans) + { + user->WriteServ("405 %s %s :You are on too many channels",user->nick, cn); + return NULL; + } + } + else + { + if (user->chans.size() >= Instance->Config->MaxChans) + { + user->WriteServ("405 %s %s :You are on too many channels",user->nick, cn); + return NULL; + } + } + } + } + + strlcpy(cname, cn, CHANMAX); + Ptr = Instance->FindChan(cname); if (!Ptr) { - if ((!IS_LOCAL(user)) && (!TS)) - Instance->Log(DEBUG,"*** BUG *** chanrec::JoinUser called for REMOTE user '%s' on channel '%s' but no TS given!", user->nick, cn); - - privs = "@"; + /* + * Fix: desync bug was here, don't set @ on remote users - spanningtree handles their permissions. bug #358. -- w00t + */ + if (!IS_LOCAL(user)) + { + if (!TS) + Instance->Log(DEBUG,"*** BUG *** Channel::JoinUser called for REMOTE user '%s' on channel '%s' but no TS given!", user->nick, cn); + } + else + { + privs = "@"; + } if (IS_LOCAL(user) && override == false) { @@ -205,21 +282,7 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo return NULL; } - /* create a new one */ - Ptr = new chanrec(Instance); - (*(Instance->chanlist))[cname] = Ptr; - - strlcpy(Ptr->name, cname,CHANMAX); - - /* 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 = TS ? TS : Instance->Time(); - *Ptr->topic = 0; - *Ptr->setby = 0; - Ptr->topicset = 0; - new_channel = true; + Ptr = new Channel(Instance, cname, TS); } else { @@ -254,18 +317,13 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo } } } - if (Ptr->modes[CM_INVITEONLY]) + if (Ptr->IsModeSet('i')) { MOD_RESULT = 0; FOREACH_RESULT_I(Instance,I_OnCheckInvite,OnCheckInvite(user, Ptr)); if (!MOD_RESULT) { - if (user->IsInvited(Ptr->name)) - { - /* user was invited to channel */ - /* there may be an optional channel NOTICE here */ - } - else + if (!user->IsInvited(Ptr->name)) { user->WriteServ("473 %s %s :Cannot join channel (Invite only)",user->nick, Ptr->name); return NULL; @@ -298,52 +356,18 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo } } - /* NOTE: If the user is an oper here, we can extend their user->chans by up to - * OperMaxchans. For remote users which are not bound by the channel limits, - * we can extend infinitely. Otherwise, nope, youre restricted to MaxChans. - */ - if (!IS_LOCAL(user) || override == true) - { - return chanrec::ForceChan(Instance, Ptr, user, privs); - } - else if (*user->oper) - { - /* Oper allows extension up to the OperMaxchans value */ - if (user->chans.size() < Instance->Config->OperMaxChans) - { - return chanrec::ForceChan(Instance, Ptr, user, privs); - } - } - else if (user->chans.size() < Instance->Config->MaxChans) - { - return chanrec::ForceChan(Instance, Ptr, user, privs); - } - - - user->WriteServ("405 %s %s :You are on too many channels",user->nick, cname); - - if (new_channel) - { - /* Things went seriously pear shaped, so take this away. bwahaha. */ - chan_hash::iterator n = Instance->chanlist->find(cname); - if (n != Instance->chanlist->end()) - { - Ptr->DelUser(user); - DELETE(Ptr); - Instance->chanlist->erase(n); - } - } + /* As spotted by jilles, dont bother to set this on remote users */ + if (IS_LOCAL(user) && Ptr->GetUserCounter() == 1) + Ptr->SetDefaultModes(); - return NULL; + return Channel::ForceChan(Instance, Ptr, user, privs, bursting); } -chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr, userrec* user, const std::string &privs) +Channel* Channel::ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const std::string &privs, bool bursting) { - userrec* dummyuser = new userrec(Instance); std::string nick = user->nick; bool silent = false; - dummyuser->SetFd(FD_MAGIC_NUMBER); Ptr->AddUser(user); /* Just in case they have no permissions */ @@ -355,18 +379,15 @@ chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr, userrec* user, con ModeHandler* mh = Instance->Modes->FindPrefix(status); if (mh) { + /* Set, and make sure that the mode handler knows this mode was now set */ 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); + mh->OnModeChange(Instance->FakeClient, Instance->FakeClient, Ptr, nick, true); switch (mh->GetPrefix()) { - /* These logic ops are SAFE IN THIS CASE - * because if the entry doesnt exist, - * addressing operator[] creates it. - * If they do exist, it points to it. - * At all other times where we dont want - * to create an item if it doesnt exist, we + /* These logic ops are SAFE IN THIS CASE because if the entry doesnt exist, + * addressing operator[] creates it. If they do exist, it points to it. + * At all other times where we dont want to create an item if it doesnt exist, we * must stick to ::find(). */ case '@': @@ -382,9 +403,7 @@ chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr, userrec* user, con } } - delete dummyuser; - - FOREACH_MOD_I(Instance,I_OnUserJoin,OnUserJoin(user, Ptr, silent)); + FOREACH_MOD_I(Instance,I_OnUserJoin,OnUserJoin(user, Ptr, bursting, silent)); if (!silent) Ptr->WriteChannel(user,"JOIN :%s",Ptr->name); @@ -408,7 +427,7 @@ chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr, userrec* user, con return Ptr; } -bool chanrec::IsBanned(userrec* user) +bool Channel::IsBanned(User* user) { char mask[MAXBUF]; int MOD_RESULT = 0; @@ -431,11 +450,11 @@ bool chanrec::IsBanned(userrec* user) return false; } -/* chanrec::PartUser +/* Channel::PartUser * 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. + * Therefore, if this function returns 0 the caller should delete the Channel. */ -long chanrec::PartUser(userrec *user, const char* reason) +long Channel::PartUser(User *user, const char* reason) { bool silent = false; @@ -460,7 +479,11 @@ long chanrec::PartUser(userrec *user, const char* reason) /* kill the record */ if (iter != ServerInstance->chanlist->end()) { - FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(this)); + int MOD_RESULT = 0; + FOREACH_RESULT_I(ServerInstance,I_OnChannelPreDelete, OnChannelPreDelete(this)); + if (MOD_RESULT == 1) + return 1; // delete halted by module + FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(this)); ServerInstance->chanlist->erase(iter); } return 0; @@ -469,7 +492,7 @@ long chanrec::PartUser(userrec *user, const char* reason) return this->GetUserCounter(); } -long chanrec::ServerKickUser(userrec* user, const char* reason, bool triggerevents) +long Channel::ServerKickUser(User* user, const char* reason, bool triggerevents) { bool silent = false; @@ -506,7 +529,11 @@ long chanrec::ServerKickUser(userrec* user, const char* reason, bool triggereven /* kill the record */ if (iter != ServerInstance->chanlist->end()) { - FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(this)); + int MOD_RESULT = 0; + FOREACH_RESULT_I(ServerInstance,I_OnChannelPreDelete, OnChannelPreDelete(this)); + if (MOD_RESULT == 1) + return 1; // delete halted by module + FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(this)); ServerInstance->chanlist->erase(iter); } return 0; @@ -515,7 +542,7 @@ long chanrec::ServerKickUser(userrec* user, const char* reason, bool triggereven return this->GetUserCounter(); } -long chanrec::KickUser(userrec *src, userrec *user, const char* reason) +long Channel::KickUser(User *src, User *user, const char* reason) { bool silent = false; @@ -584,7 +611,11 @@ long chanrec::KickUser(userrec *src, userrec *user, const char* reason) /* kill the record */ if (iter != ServerInstance->chanlist->end()) { - FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(this)); + int MOD_RESULT = 0; + FOREACH_RESULT_I(ServerInstance,I_OnChannelPreDelete, OnChannelPreDelete(this)); + if (MOD_RESULT == 1) + return 1; // delete halted by module + FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(this)); ServerInstance->chanlist->erase(iter); } return 0; @@ -593,7 +624,7 @@ long chanrec::KickUser(userrec *src, userrec *user, const char* reason) return this->GetUserCounter(); } -void chanrec::WriteChannel(userrec* user, char* text, ...) +void Channel::WriteChannel(User* user, char* text, ...) { char textbuffer[MAXBUF]; va_list argsPtr; @@ -608,7 +639,7 @@ void chanrec::WriteChannel(userrec* user, char* text, ...) this->WriteChannel(user, std::string(textbuffer)); } -void chanrec::WriteChannel(userrec* user, const std::string &text) +void Channel::WriteChannel(User* user, const std::string &text) { CUList *ulist = this->GetUsers(); char tb[MAXBUF]; @@ -621,12 +652,12 @@ void chanrec::WriteChannel(userrec* user, const std::string &text) for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - if (IS_LOCAL(i->second)) - i->second->Write(out); + if (IS_LOCAL(i->first)) + i->first->Write(out); } } -void chanrec::WriteChannelWithServ(const char* ServName, const char* text, ...) +void Channel::WriteChannelWithServ(const char* ServName, const char* text, ...) { char textbuffer[MAXBUF]; va_list argsPtr; @@ -641,7 +672,7 @@ void chanrec::WriteChannelWithServ(const char* ServName, const char* text, ...) this->WriteChannelWithServ(ServName, std::string(textbuffer)); } -void chanrec::WriteChannelWithServ(const char* ServName, const std::string &text) +void Channel::WriteChannelWithServ(const char* ServName, const std::string &text) { CUList *ulist = this->GetUsers(); char tb[MAXBUF]; @@ -651,14 +682,14 @@ void chanrec::WriteChannelWithServ(const char* ServName, const std::string &text for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - if (IS_LOCAL(i->second)) - i->second->Write(out); + if (IS_LOCAL(i->first)) + i->first->Write(out); } } /* 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, bool serversource, char status, char* text, ...) +void Channel::WriteAllExceptSender(User* user, bool serversource, char status, char* text, ...) { char textbuffer[MAXBUF]; va_list argsPtr; @@ -673,7 +704,7 @@ void chanrec::WriteAllExceptSender(userrec* user, bool serversource, char status this->WriteAllExceptSender(user, serversource, status, std::string(textbuffer)); } -void chanrec::WriteAllExcept(userrec* user, bool serversource, char status, CUList &except_list, char* text, ...) +void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList &except_list, char* text, ...) { char textbuffer[MAXBUF]; va_list argsPtr; @@ -688,7 +719,7 @@ void chanrec::WriteAllExcept(userrec* user, bool serversource, char status, CULi 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) +void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList &except_list, const std::string &text) { CUList *ulist; char tb[MAXBUF]; @@ -714,20 +745,20 @@ void chanrec::WriteAllExcept(userrec* user, bool serversource, char status, CULi for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - if ((IS_LOCAL(i->second)) && (except_list.find(i->second) == except_list.end())) + if ((IS_LOCAL(i->first)) && (except_list.find(i->first) == except_list.end())) { if (serversource) - i->second->WriteServ(text); + i->first->WriteServ(text); else - i->second->Write(out); + i->first->Write(out); } } } -void chanrec::WriteAllExceptSender(userrec* user, bool serversource, char status, const std::string& text) +void Channel::WriteAllExceptSender(User* user, bool serversource, char status, const std::string& text) { CUList except_list; - except_list[user] = user; + except_list[user] = user->nick; this->WriteAllExcept(user, serversource, status, except_list, std::string(text)); } @@ -735,20 +766,20 @@ void chanrec::WriteAllExceptSender(userrec* user, bool serversource, char status * return a count of the users on a specific channel accounting for * invisible users who won't increase the count. e.g. for /LIST */ -int chanrec::CountInvisible() +int Channel::CountInvisible() { int count = 0; CUList *ulist= this->GetUsers(); for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - if (!(i->second->modes[UM_INVISIBLE])) + if (!(i->first->IsModeSet('i'))) count++; } return count; } -char* chanrec::ChanModes(bool showkey) +char* Channel::ChanModes(bool showkey) { static char scratch[MAXBUF]; static char sparam[MAXBUF]; @@ -758,13 +789,13 @@ char* chanrec::ChanModes(bool showkey) *scratch = '\0'; *sparam = '\0'; - /* This was still iterating up to 190, chanrec::modes is only 64 elements -- Om */ + /* This was still iterating up to 190, Channel::modes is only 64 elements -- Om */ for(int n = 0; n < 64; n++) { if(this->modes[n]) { *offset++ = n + 65; - extparam = ""; + extparam.clear(); switch (n) { case CM_KEY: @@ -785,7 +816,7 @@ char* chanrec::ChanModes(bool showkey) extparam = this->GetModeParameter(n + 65); break; } - if (extparam != "") + if (!extparam.empty()) { charlcat(sparam,' ',MAXBUF); strlcat(sparam,extparam.c_str(),MAXBUF); @@ -802,7 +833,7 @@ char* chanrec::ChanModes(bool showkey) /* compile a userlist of a channel into a string, each nick seperated by * spaces and op, voice etc status shown as @ and +, and send it to 'user' */ -void chanrec::UserList(userrec *user) +void Channel::UserList(User *user, CUList *ulist) { char list[MAXBUF]; size_t dlen, curlen; @@ -811,16 +842,25 @@ void chanrec::UserList(userrec *user) if (!IS_LOCAL(user)) return; - FOREACH_RESULT(I_OnUserList,OnUserList(user, this)); + FOREACH_RESULT(I_OnUserList,OnUserList(user, this, ulist)); if (MOD_RESULT == 1) return; + if (MOD_RESULT != -1) + { + if ((this->IsModeSet('s')) && (!this->HasUser(user))) + { + user->WriteServ("401 %s %s :No such nick/channel",user->nick, this->name); + return; + } + } - dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, this->name); + dlen = curlen = snprintf(list,MAXBUF,"353 %s %c %s :", user->nick, this->IsModeSet('s') ? '@' : this->IsModeSet('p') ? '*' : '=', this->name); int numusers = 0; char* ptr = list + dlen; - CUList *ulist= this->GetUsers(); + if (!ulist) + ulist = this->GetUsers(); /* Improvement by Brain - this doesnt change in value, so why was it inside * the loop? @@ -829,7 +869,7 @@ void chanrec::UserList(userrec *user) for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - if ((!has_user) && (i->second->modes[UM_INVISIBLE])) + if ((!has_user) && (i->first->IsModeSet('i'))) { /* * user is +i, and source not on the channel, does not show @@ -838,10 +878,12 @@ void chanrec::UserList(userrec *user) continue; } - if (i->second->Visibility && !i->second->Visibility->VisibleTo(user)) + if (i->first->Visibility && !i->first->Visibility->VisibleTo(user)) continue; - size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", this->GetPrefixChar(i->second), i->second->nick); + size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", this->GetPrefixChar(i->first), i->second.c_str()); + /* OnUserList can change this - reset it back to normal */ + i->second = i->first->nick; curlen += ptrlen; ptr += ptrlen; @@ -854,7 +896,7 @@ void chanrec::UserList(userrec *user) user->WriteServ(std::string(list)); /* reset our lengths */ - dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, this->name); + dlen = curlen = snprintf(list,MAXBUF,"353 %s %c %s :", user->nick, this->IsModeSet('s') ? '@' : this->IsModeSet('p') ? '*' : '=', this->name); ptr = list + dlen; ptrlen = 0; @@ -871,7 +913,7 @@ void chanrec::UserList(userrec *user) user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, this->name); } -long chanrec::GetMaxBans() +long Channel::GetMaxBans() { /* Return the cached value if there is one */ if (this->maxbans) @@ -892,7 +934,7 @@ long chanrec::GetMaxBans() return this->maxbans; } -void chanrec::ResetMaxBans() +void Channel::ResetMaxBans() { this->maxbans = 0; } @@ -901,7 +943,7 @@ void chanrec::ResetMaxBans() * % for halfop etc. If the user has several modes set, the highest mode * the user has must be returned. */ -const char* chanrec::GetPrefixChar(userrec *user) +const char* Channel::GetPrefixChar(User *user) { static char pf[2] = {0, 0}; @@ -924,7 +966,7 @@ const char* chanrec::GetPrefixChar(userrec *user) return pf; } -const char* chanrec::GetAllPrefixChars(userrec* user) +const char* Channel::GetAllPrefixChars(User* user) { static char prefix[MAXBUF]; int ctr = 0; @@ -944,7 +986,7 @@ const char* chanrec::GetAllPrefixChars(userrec* user) return prefix; } -unsigned int chanrec::GetPrefixValue(userrec* user) +unsigned int Channel::GetPrefixValue(User* user) { prefixlist::iterator n = prefixes.find(user); if (n != prefixes.end()) @@ -955,7 +997,7 @@ unsigned int chanrec::GetPrefixValue(userrec* user) return 0; } -int chanrec::GetStatusFlags(userrec *user) +int Channel::GetStatusFlags(User *user) { UCListIter i = user->chans.find(this); if (i != user->chans.end()) @@ -965,7 +1007,7 @@ int chanrec::GetStatusFlags(userrec *user) return 0; } -int chanrec::GetStatus(userrec *user) +int Channel::GetStatus(User *user) { if (ServerInstance->ULine(user->server)) return STATUS_OP; @@ -990,7 +1032,7 @@ int chanrec::GetStatus(userrec *user) return STATUS_NORMAL; } -void chanrec::SetPrefix(userrec* user, char prefix, unsigned int prefix_value, bool adding) +void Channel::SetPrefix(User* user, char prefix, unsigned int prefix_value, bool adding) { prefixlist::iterator n = prefixes.find(user); prefixtype pfx = std::make_pair(prefix,prefix_value); @@ -1013,7 +1055,7 @@ void chanrec::SetPrefix(userrec* user, char prefix, unsigned int prefix_value, b { pfxcontainer one; one.push_back(pfx); - prefixes.insert(std::make_pair(user, one)); + prefixes.insert(std::make_pair(user, one)); } } else @@ -1027,7 +1069,7 @@ void chanrec::SetPrefix(userrec* user, char prefix, unsigned int prefix_value, b } } -void chanrec::RemoveAllPrefixes(userrec* user) +void Channel::RemoveAllPrefixes(User* user) { prefixlist::iterator n = prefixes.find(user); if (n != prefixes.end())