X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=52e8faca9006384fd925f8199bfc614b32f0f81e;hb=3f971b447fae258a92f2cc6645497cce93f1c04e;hp=d33caa34c6190d88fe458128adce490f7c2531c4;hpb=4bbca0643b56f26f73a05462d226b2dd8871626b;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/channels.cpp b/src/channels.cpp index d33caa34c..52e8faca9 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,20 +11,33 @@ * --------------------------------------------------- */ +/* $Core: libIRCDchannels */ + #include "inspircd.h" #include #include "wildcard.h" #include "mode.h" -chanrec::chanrec(InspIRCd* Instance) : ServerInstance(Instance) +Channel::Channel(InspIRCd* Instance, const std::string &cname, 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 " + cname); + + (*(ServerInstance->chanlist))[cname.c_str()] = this; + strlcpy(this->name, cname.c_str(), CHANMAX); + this->created = ts ? ts : ServerInstance->Time(); + 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) @@ -32,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); @@ -51,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) { @@ -73,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->nick; } -unsigned long chanrec::DelUser(userrec* user) +unsigned long Channel::DelUser(User* user) { CUListIter a = internal_userlist.find(user); @@ -99,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->nick; } -void chanrec::DelOppedUser(userrec* user) +void Channel::DelOppedUser(User* user) { CUListIter a = internal_op_userlist.find(user); if (a != internal_op_userlist.end()) @@ -119,12 +132,12 @@ void chanrec::DelOppedUser(userrec* user) } } -void chanrec::AddHalfoppedUser(userrec* user) +void Channel::AddHalfoppedUser(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); @@ -134,12 +147,12 @@ void chanrec::DelHalfoppedUser(userrec* user) } } -void chanrec::AddVoicedUser(userrec* user) +void Channel::AddVoicedUser(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); @@ -149,27 +162,27 @@ 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 chanrec::SetDefaultModes() +void Channel::SetDefaultModes() { irc::spacesepstream list(ServerInstance->Config->DefaultModes); std::string modeseq; @@ -177,9 +190,6 @@ void chanrec::SetDefaultModes() list.GetToken(modeseq); - userrec* dummyuser = new userrec(ServerInstance); - dummyuser->SetFd(FD_MAGIC_NUMBER); - for (std::string::iterator n = modeseq.begin(); n != modeseq.end(); ++n) { ModeHandler* mode = ServerInstance->Modes->FindMode(*n, MODETYPE_CHANNEL); @@ -190,18 +200,16 @@ void chanrec::SetDefaultModes() else parameter.clear(); - mode->OnModeChange(dummyuser, dummyuser, this, parameter, true); + mode->OnModeChange(ServerInstance->FakeClient, ServerInstance->FakeClient, this, parameter, true); } } - - delete dummyuser; } /* * 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; @@ -209,7 +217,7 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo char cname[MAXBUF]; int MOD_RESULT = 0; std::string privs; - chanrec *Ptr; + Channel *Ptr; /* * We don't restrict the number of channels that remote users or users that are override-joining may be in. @@ -223,7 +231,7 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo { if (user->chans.size() >= user->GetMaxChans()) { - user->WriteServ("405 %s %s :You are on too many channels",user->nick, cn); + user->WriteNumeric(405, "%s %s :You are on too many channels",user->nick, cn); return NULL; } } @@ -233,7 +241,7 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo { if (user->chans.size() >= Instance->Config->OperMaxChans) { - user->WriteServ("405 %s %s :You are on too many channels",user->nick, cn); + user->WriteNumeric(405, "%s %s :You are on too many channels",user->nick, cn); return NULL; } } @@ -241,7 +249,7 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo { if (user->chans.size() >= Instance->Config->MaxChans) { - user->WriteServ("405 %s %s :You are on too many channels",user->nick, cn); + user->WriteNumeric(405, "%s %s :You are on too many channels",user->nick, cn); return NULL; } } @@ -259,7 +267,7 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo if (!IS_LOCAL(user)) { if (!TS) - Instance->Log(DEBUG,"*** BUG *** chanrec::JoinUser called for REMOTE user '%s' on channel '%s' but no TS given!", user->nick, cn); + Instance->Logs->Log("CHANNEL",DEBUG,"*** BUG *** Channel::JoinUser called for REMOTE user '%s' on channel '%s' but no TS given!", user->nick, cn); } else { @@ -274,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->SetDefaultModes(); - - Ptr->created = TS ? TS : Instance->Time(); - Ptr->age = Ptr->created; - *Ptr->topic = 0; - *Ptr->setby = 0; - Ptr->topicset = 0; + Ptr = new Channel(Instance, cname, TS); } else { @@ -318,7 +312,7 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo { if ((!key) || strcmp(key,Ptr->key)) { - user->WriteServ("475 %s %s :Cannot join channel (Incorrect channel key)",user->nick, Ptr->name); + user->WriteNumeric(475, "%s %s :Cannot join channel (Incorrect channel key)",user->nick, Ptr->name); return NULL; } } @@ -331,7 +325,7 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo { if (!user->IsInvited(Ptr->name)) { - user->WriteServ("473 %s %s :Cannot join channel (Invite only)",user->nick, Ptr->name); + user->WriteNumeric(473, "%s %s :Cannot join channel (Invite only)",user->nick, Ptr->name); return NULL; } } @@ -345,7 +339,7 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo { if (Ptr->GetUserCounter() >= Ptr->limit) { - user->WriteServ("471 %s %s :Cannot join channel (Channel is full)",user->nick, Ptr->name); + user->WriteNumeric(471, "%s %s :Cannot join channel (Channel is full)",user->nick, Ptr->name); return NULL; } } @@ -354,7 +348,7 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo { if (Ptr->IsBanned(user)) { - user->WriteServ("474 %s %s :Cannot join channel (You're banned)",user->nick, Ptr->name); + user->WriteNumeric(474, "%s %s :Cannot join channel (You're banned)",user->nick, Ptr->name); return NULL; } } @@ -362,16 +356,18 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo } } - return chanrec::ForceChan(Instance, Ptr, user, privs); + /* As spotted by jilles, dont bother to set this on remote users */ + if (IS_LOCAL(user) && Ptr->GetUserCounter() == 1) + Ptr->SetDefaultModes(); + + 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 */ @@ -383,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 '@': @@ -410,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); @@ -427,8 +418,8 @@ chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr, userrec* user, con { 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); + user->WriteNumeric(332, "%s %s :%s", user->nick, Ptr->name, Ptr->topic); + user->WriteNumeric(333, "%s %s %s %lu", user->nick, Ptr->name, Ptr->setby, (unsigned long)Ptr->topicset); } Ptr->UserList(user); } @@ -436,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; @@ -459,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; @@ -488,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; @@ -497,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; @@ -534,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; @@ -543,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; @@ -554,12 +553,12 @@ long chanrec::KickUser(userrec *src, userrec *user, const char* reason) { if (!this->HasUser(user)) { - src->WriteServ("441 %s %s %s :They are not on that channel",src->nick, user->nick, this->name); + src->WriteNumeric(441, "%s %s %s :They are not on that channel",src->nick, user->nick, this->name); return this->GetUserCounter(); } 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); + src->WriteNumeric(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; @@ -584,7 +583,7 @@ long chanrec::KickUser(userrec *src, userrec *user, const char* reason) int us = this->GetStatus(user); if ((them < STATUS_HOP) || (them < us)) { - src->WriteServ("482 %s %s :You must be a channel %soperator",src->nick, this->name, them == STATUS_HOP ? "" : "half-"); + src->WriteNumeric(482, "%s %s :You must be a channel %soperator",src->nick, this->name, them == STATUS_HOP ? "" : "half-"); return this->GetUserCounter(); } } @@ -612,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; @@ -621,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, const char* text, ...) { char textbuffer[MAXBUF]; va_list argsPtr; @@ -636,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]; @@ -654,7 +657,7 @@ void chanrec::WriteChannel(userrec* user, const std::string &text) } } -void chanrec::WriteChannelWithServ(const char* ServName, const char* text, ...) +void Channel::WriteChannelWithServ(const char* ServName, const char* text, ...) { char textbuffer[MAXBUF]; va_list argsPtr; @@ -669,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]; @@ -686,7 +689,7 @@ 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, bool serversource, char status, char* text, ...) +void Channel::WriteAllExceptSender(User* user, bool serversource, char status, const char* text, ...) { char textbuffer[MAXBUF]; va_list argsPtr; @@ -701,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, const char* text, ...) { char textbuffer[MAXBUF]; va_list argsPtr; @@ -716,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]; @@ -752,7 +755,7 @@ void chanrec::WriteAllExcept(userrec* user, bool serversource, char status, CULi } } -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->nick; @@ -763,7 +766,7 @@ 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(); @@ -776,7 +779,7 @@ int chanrec::CountInvisible() return count; } -char* chanrec::ChanModes(bool showkey) +char* Channel::ChanModes(bool showkey) { static char scratch[MAXBUF]; static char sparam[MAXBUF]; @@ -786,7 +789,7 @@ 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]) @@ -830,20 +833,30 @@ 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, CUList *ulist) +void Channel::UserList(User *user, CUList *ulist) { char list[MAXBUF]; size_t dlen, curlen; int MOD_RESULT = 0; + bool call_modules = true; if (!IS_LOCAL(user)) return; FOREACH_RESULT(I_OnUserList,OnUserList(user, this, ulist)); if (MOD_RESULT == 1) - return; + call_modules = false; + + if (MOD_RESULT != -1) + { + if ((this->IsModeSet('s')) && (!this->HasUser(user))) + { + user->WriteNumeric(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,"%s %c %s :", user->nick, this->IsModeSet('s') ? '@' : this->IsModeSet('p') ? '*' : '=', this->name); int numusers = 0; char* ptr = list + dlen; @@ -870,14 +883,19 @@ void chanrec::UserList(userrec *user, CUList *ulist) if (i->first->Visibility && !i->first->Visibility->VisibleTo(user)) continue; - 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; + std::string prefixlist = this->GetPrefixChar(i->first); + std::string nick = i->first->nick; - curlen += ptrlen; - ptr += ptrlen; - - numusers++; + if (call_modules) + { + FOREACH_MOD(I_OnNamesListItem, OnNamesListItem(user, i->first, this, prefixlist, nick)); + + /* Nick was nuked, a module wants us to skip it */ + if (nick.empty()) + continue; + } + + size_t ptrlen = 0; if (curlen > (480-NICKMAX)) { @@ -885,24 +903,31 @@ void chanrec::UserList(userrec *user, CUList *ulist) 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,"%s %c %s :", user->nick, this->IsModeSet('s') ? '@' : this->IsModeSet('p') ? '*' : '=', this->name); ptr = list + dlen; ptrlen = 0; numusers = 0; } + + ptrlen = snprintf(ptr, MAXBUF, "%s%s ", prefixlist.c_str(), nick.c_str()); + + curlen += ptrlen; + ptr += ptrlen; + + numusers++; } /* if whats left in the list isnt empty, send it */ if (numusers) { - user->WriteServ(std::string(list)); + user->WriteNumeric(353,std::string(list)); } - user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, this->name); + user->WriteNumeric(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) @@ -923,7 +948,7 @@ long chanrec::GetMaxBans() return this->maxbans; } -void chanrec::ResetMaxBans() +void Channel::ResetMaxBans() { this->maxbans = 0; } @@ -932,7 +957,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}; @@ -955,7 +980,8 @@ 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; @@ -975,7 +1001,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()) @@ -986,7 +1012,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()) @@ -996,7 +1022,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; @@ -1021,7 +1047,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); @@ -1044,7 +1070,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 @@ -1058,7 +1084,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())