]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/channels.cpp
Cache channel max bans value to save an O(n) loop of match() on every ban (etc) add
[user/henk/code/inspircd.git] / src / channels.cpp
index 8e5917d8564c8342a51ac398d7bf5a5e80b11267..4b1bc530914c8c37e9238bb397b978f1f2406d33 100644 (file)
-/*   +------------------------------------+
- *   | Inspire Internet Relay Chat Daemon |
- *   +------------------------------------+
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *   E-mail:
- *       <brain@chatspike.net>
- *       <Craig@chatspike.net>
- * 
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *     the file COPYING for details.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
+#include <stdarg.h>
+#include "configreader.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include <unistd.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/utsname.h>
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
 #include "modules.h"
-#include "dynamic.h"
-#include "commands.h"
 #include "wildcard.h"
-#include "message.h"
 #include "mode.h"
-#include "xline.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "typedefs.h"
-
-#ifdef GCC3
-#define nspace __gnu_cxx
-#else
-#define nspace std
-#endif
-
-extern ServerConfig* Config;
-
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern int WHOWAS_STALE;
-extern int WHOWAS_MAX;
-extern time_t TIME;
-extern chan_hash chanlist;
-
-using namespace std;
 
-std::vector<ModeParameter> custom_mode_params;
-
-chanrec* ForceChan(chanrec* Ptr,ucrec &a,userrec* user, int created);
-
-chanrec::chanrec()
+chanrec::chanrec(InspIRCd* Instance) : ServerInstance(Instance)
 {
-       *name = *custom_modes = *topic = *setby = *key = 0;
-       created = topicset = limit = binarymodes = 0;
-       internal_userlist.clear();
+       *name = *topic = *setby = *key = 0;
+       maxbans = created = topicset = limit = 0;
+       memset(&modes,0,64);
+       age = ServerInstance->Time(true);
 }
 
-void chanrec::SetCustomMode(char mode,bool mode_on)
+void chanrec::SetMode(char mode,bool mode_on)
 {
-       if (mode_on)
-       {
-               static char m[3];
-               m[0] = mode;
-               m[1] = '\0';
-               if (!strchr(this->custom_modes,mode))
-               {
-                       strlcat(custom_modes,m,MAXMODES);
-               }
-               log(DEBUG,"Custom mode %c set",mode);
-       }
-       else {
-
-               std::string a = this->custom_modes;
-               int pos = a.find(mode);
-               a.erase(pos,1);
-               strlcpy(this->custom_modes,a.c_str(),MAXMODES);
-
-               log(DEBUG,"Custom mode %c removed: modelist='%s'",mode,this->custom_modes);
-               this->SetCustomModeParam(mode,"",false);
-       }
+       modes[mode-65] = mode_on;
+       if (!mode_on)
+               this->SetModeParam(mode,"",false);
 }
 
 
-void chanrec::SetCustomModeParam(char mode,char* parameter,bool mode_on)
+void chanrec::SetModeParam(char mode,const char* parameter,bool mode_on)
 {
+       ServerInstance->Log(DEBUG,"SetModeParam called");
+       
+       CustomModeList::iterator n = custom_mode_params.find(mode);     
 
-       log(DEBUG,"SetCustomModeParam called");
-       ModeParameter M;
-       M.mode = mode;
-       strlcpy(M.channel,this->name,CHANMAX);
-       strlcpy(M.parameter,parameter,MAXBUF);
        if (mode_on)
        {
-               log(DEBUG,"Custom mode parameter %c %s added",mode,parameter);
-               custom_mode_params.push_back(M);
+               if (n == custom_mode_params.end())
+               {
+                       custom_mode_params[mode] = strdup(parameter);
+                       ServerInstance->Log(DEBUG,"Custom mode parameter %c %s added",mode,parameter);
+               }
+               else
+               {
+                       ServerInstance->Log(DEBUG, "Tried to set custom mode parameter for %c '%s' when it was already '%s'", mode, parameter, n->second);
+               }
        }
        else
        {
-               if (custom_mode_params.size())
+               if (n != custom_mode_params.end())
                {
-                       for (vector<ModeParameter>::iterator i = custom_mode_params.begin(); i < custom_mode_params.end(); i++)
-                       {
-                               if ((i->mode == mode) && (!strcasecmp(this->name,i->channel)))
-                               {
-                                       log(DEBUG,"Custom mode parameter %c %s removed",mode,parameter);
-                                       custom_mode_params.erase(i);
-                                       return;
-                               }
-                       }
+                       free(n->second);
+                       custom_mode_params.erase(n);
                }
-               log(DEBUG,"*** BUG *** Attempt to remove non-existent mode parameter!");
        }
 }
 
-bool chanrec::IsCustomModeSet(char mode)
+bool chanrec::IsModeSet(char mode)
 {
-       return (strchr(this->custom_modes,mode));
+       return modes[mode-65];
 }
 
-/* XXX - would it not be better to store a vector for each channel, rather than one huge list? -- w00t */
 std::string chanrec::GetModeParameter(char mode)
 {
-       if (custom_mode_params.size())
+       if (mode == 'k')
        {
-               for (vector<ModeParameter>::iterator i = custom_mode_params.begin(); i < custom_mode_params.end(); i++)
+               return this->key;
+       }
+       else if (mode == 'l')
+       {
+               return ConvToStr(this->limit);
+       }
+       else
+       {
+               CustomModeList::iterator n = custom_mode_params.find(mode);
+               if (n != custom_mode_params.end())
                {
-                       if ((i->mode == mode) && (!strcasecmp(this->name,i->channel)))
-                       {
-                               return i->parameter;
-                       }
+                       return n->second;
                }
+               return "";
        }
-       return "";
 }
 
 long chanrec::GetUserCounter()
@@ -160,94 +94,93 @@ long chanrec::GetUserCounter()
        return (this->internal_userlist.size());
 }
 
-void chanrec::AddUser(char* castuser)
+void chanrec::AddUser(userrec* user)
 {
-       internal_userlist[castuser] = castuser;
-       log(DEBUG,"Added casted user to channel's internal list");
+       internal_userlist[user] = user;
 }
 
-void chanrec::DelUser(char* castuser)
+unsigned long chanrec::DelUser(userrec* user)
 {
-       std::map<char*,char*>::iterator a = internal_userlist.find(castuser);
+       CUListIter a = internal_userlist.find(user);
+       
        if (a != internal_userlist.end())
        {
-               log(DEBUG,"Removed casted user from channel's internal list");
                internal_userlist.erase(a);
                /* And tidy any others... */
-               DelOppedUser(castuser);
-               DelHalfoppedUser(castuser);
-               DelVoicedUser(castuser);
-               return;
+               DelOppedUser(user);
+               DelHalfoppedUser(user);
+               DelVoicedUser(user);
        }
+       
+       return internal_userlist.size();
+}
+
+bool chanrec::HasUser(userrec* user)
+{
+       return (internal_userlist.find(user) != internal_userlist.end());
 }
 
-void chanrec::AddOppedUser(char* castuser)
+void chanrec::AddOppedUser(userrec* user)
 {
-       internal_op_userlist[castuser] = castuser;
-       log(DEBUG,"Added casted user to channel's internal list");
+       internal_op_userlist[user] = user;
 }
 
-void chanrec::DelOppedUser(char* castuser)
+void chanrec::DelOppedUser(userrec* user)
 {
-       std::map<char*,char*>::iterator a = internal_op_userlist.find(castuser);
+       CUListIter a = internal_op_userlist.find(user);
        if (a != internal_op_userlist.end())
        {
-               log(DEBUG,"Removed casted user from channel's internal list");
                internal_op_userlist.erase(a);
                return;
        }
 }
 
-void chanrec::AddHalfoppedUser(char* castuser)
+void chanrec::AddHalfoppedUser(userrec* user)
 {
-       internal_halfop_userlist[castuser] = castuser;
-       log(DEBUG,"Added casted user to channel's internal list");
+       internal_halfop_userlist[user] = user;
 }
 
-void chanrec::DelHalfoppedUser(char* castuser)
+void chanrec::DelHalfoppedUser(userrec* user)
 {
-       std::map<char*,char*>::iterator a = internal_halfop_userlist.find(castuser);
+       CUListIter a = internal_halfop_userlist.find(user);
+
        if (a != internal_halfop_userlist.end())
        {   
-               log(DEBUG,"Removed casted user from channel's internal list");
                internal_halfop_userlist.erase(a);
-               return; 
        }
 }
 
-void chanrec::AddVoicedUser(char* castuser)
+void chanrec::AddVoicedUser(userrec* user)
 {
-       internal_voice_userlist[castuser] = castuser;
-       log(DEBUG,"Added casted user to channel's internal list");
+       internal_voice_userlist[user] = user;
 }
 
-void chanrec::DelVoicedUser(char* castuser)
+void chanrec::DelVoicedUser(userrec* user)
 {
-       std::map<char*,char*>::iterator a = internal_voice_userlist.find(castuser);
+       CUListIter a = internal_voice_userlist.find(user);
+       
        if (a != internal_voice_userlist.end())
        {
-               log(DEBUG,"Removed casted user from channel's internal list");
                internal_voice_userlist.erase(a);
-               return; 
        }
 }
 
-std::map<char*,char*> *chanrec::GetUsers()
+CUList* chanrec::GetUsers()
 {
        return &internal_userlist;
 }
 
-std::map<char*,char*> *chanrec::GetOppedUsers()
+CUList* chanrec::GetOppedUsers()
 {
        return &internal_op_userlist;
 }
 
-std::map<char*,char*> *chanrec::GetHalfoppedUsers()
+CUList* chanrec::GetHalfoppedUsers()
 {
        return &internal_halfop_userlist;
 }
 
-std::map<char*,char*> *chanrec::GetVoicedUsers()
+CUList* chanrec::GetVoicedUsers()
 {
        return &internal_voice_userlist;
 }
@@ -256,66 +189,63 @@ std::map<char*,char*> *chanrec::GetVoicedUsers()
  * add a channel to a user, creating the record for it if needed and linking
  * it to the user record 
  */
-
-chanrec* add_channel(userrec *user, const char* cn, const char* key, bool override)
+chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bool override, const char* key)
 {
-       if ((!user) || (!cn))
-       {
-               log(DEFAULT,"*** BUG *** add_channel was given an invalid parameter");
-               return 0;
-       }
+       if (!user || !cn)
+               return NULL;
 
-       int created = 0;
+       bool new_channel = false;
        char cname[MAXBUF];
        int MOD_RESULT = 0;
        strlcpy(cname,cn,CHANMAX);
-       log(DEBUG,"cname='%s' cn='%s'",cname,cn);
 
-       log(DEBUG,"add_channel: %s %s",user->nick,cname);
+       std::string privs;
 
-       chanrec* Ptr = FindChan(cname);
+       chanrec* Ptr = Instance->FindChan(cname);
 
        if (!Ptr)
        {
-               if (user->fd > -1)
+               privs = "@";
+
+               if (IS_LOCAL(user) && override == false)
                {
                        MOD_RESULT = 0;
-                       FOREACH_RESULT(I_OnUserPreJoin,OnUserPreJoin(user,NULL,cname));
+                       FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,NULL,cname,privs));
                        if (MOD_RESULT == 1)
                                return NULL;
                }
 
                /* create a new one */
-               chanlist[cname] = new chanrec();
-               strlcpy(chanlist[cname]->name, cname,CHANMAX);
-               chanlist[cname]->binarymodes = CM_TOPICLOCK | CM_NOEXTERNAL;
-               chanlist[cname]->created = TIME;
-               *chanlist[cname]->topic = 0;
-               strlcpy(chanlist[cname]->setby, user->nick,NICKMAX);
-               chanlist[cname]->topicset = 0;
-               Ptr = chanlist[cname];
-               log(DEBUG,"add_channel: created: %s",cname);
-               /*
-                * set created to 2 to indicate user
-                * is the first in the channel
-                * and should be given ops
-                */
-               created = 2;
+               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 = Instance->Time();
+               *Ptr->topic = 0;
+               *Ptr->setby = 0;
+               Ptr->topicset = 0;
+               Instance->Log(DEBUG,"chanrec::JoinUser(): created: %s",cname);
+               new_channel = true;
        }
        else
        {
                /* Already on the channel */
-               if (has_channel(user,Ptr))
+               if (Ptr->HasUser(user))
                        return NULL;
 
                /*
                 * 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_OnUserPreJoin,OnUserPreJoin(user,Ptr,cname));
+                       FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,Ptr,cname,privs));
                        if (MOD_RESULT == 1)
                        {
                                return NULL;
@@ -325,357 +255,784 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
                                if (*Ptr->key)
                                {
                                        MOD_RESULT = 0;
-                                       FOREACH_RESULT(I_OnCheckKey,OnCheckKey(user, Ptr, key ? key : ""));
+                                       FOREACH_RESULT_I(Instance,I_OnCheckKey,OnCheckKey(user, Ptr, key ? key : ""));
                                        if (!MOD_RESULT)
                                        {
-                                               if (!key)
+                                               if ((!key) || strcmp(key,Ptr->key))
                                                {
-                                                       log(DEBUG,"add_channel: no key given in JOIN");
-                                                       WriteServ(user->fd,"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,"add_channel: bad key given in JOIN");
-                                                               WriteServ(user->fd,"475 %s %s :Cannot join channel (Incorrect key)",user->nick, Ptr->name);
-                                                               return NULL;
-                                                       }
-                                               }
                                        }
                                }
-                               if (Ptr->binarymodes & CM_INVITEONLY)
+                               if (Ptr->modes[CM_INVITEONLY])
                                {
                                        MOD_RESULT = 0;
-                                       irc::string xname(Ptr->name);
-                                       FOREACH_RESULT(I_OnCheckInvite,OnCheckInvite(user, Ptr));
+                                       FOREACH_RESULT_I(Instance,I_OnCheckInvite,OnCheckInvite(user, Ptr));
                                        if (!MOD_RESULT)
                                        {
-                                               log(DEBUG,"add_channel: channel is +i");
-                                               if (user->IsInvited(xname))
+                                               if (user->IsInvited(Ptr->name))
                                                {
                                                        /* user was invited to channel */
                                                        /* there may be an optional channel NOTICE here */
                                                }
                                                else
                                                {
-                                                       WriteServ(user->fd,"473 %s %s :Cannot join channel (Invite only)",user->nick, Ptr->name);
+                                                       user->WriteServ("473 %s %s :Cannot join channel (Invite only)",user->nick, Ptr->name);
                                                        return NULL;
                                                }
                                        }
-                                       user->RemoveInvite(xname);
+                                       user->RemoveInvite(Ptr->name);
                                }
                                if (Ptr->limit)
                                {
                                        MOD_RESULT = 0;
-                                       FOREACH_RESULT(I_OnCheckLimit,OnCheckLimit(user, Ptr));
+                                       FOREACH_RESULT_I(Instance,I_OnCheckLimit,OnCheckLimit(user, Ptr));
                                        if (!MOD_RESULT)
                                        {
-                                               if (usercount(Ptr) >= Ptr->limit)
+                                               if (Ptr->GetUserCounter() >= Ptr->limit)
                                                {
-                                                       WriteServ(user->fd,"471 %s %s :Cannot join channel (Channel is full)",user->nick, Ptr->name);
+                                                       user->WriteServ("471 %s %s :Cannot join channel (Channel is full)",user->nick, Ptr->name);
                                                        return NULL;
                                                }
                                        }
                                }
                                if (Ptr->bans.size())
                                {
-                                       log(DEBUG,"add_channel: about to walk banlist");
-                                       MOD_RESULT = 0;
-                                       FOREACH_RESULT(I_OnCheckBan,OnCheckBan(user, Ptr));
-                                       if (!MOD_RESULT)
+                                       if (Ptr->IsBanned(user))
                                        {
-                                               for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->bans.end(); i++)
-                                               {
-                                                       if ((match(user->GetFullHost(),i->data)) || (match(user->GetFullRealHost(),i->data)) || (match((char*)inet_ntoa(user->ip4),i->data)))
-                                                       {
-                                                               WriteServ(user->fd,"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,"Overridden checks");
-               }
-               created = 1;
-       }
-
-       log(DEBUG,"Passed channel checks");
-
-       for (unsigned int index =0; index < user->chans.size(); index++)
-       {
-               if (user->chans[index].channel == NULL)
-               {
-                       return ForceChan(Ptr,user->chans[index],user,created);
+                       Instance->Log(DEBUG,"chanrec::JoinUser(): Overridden checks");
                }
        }
 
-       /*
-        * XXX: If the user is an oper here, we can just extend their user->chans vector by one
-        * and put the channel in here. Same for remote users which are not bound by
-        * the channel limits. Otherwise, nope, youre boned.
+       /* 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)) /* was a check on fd < 0 */
+       if (!IS_LOCAL(user) || override == true) /* was a check on fd < 0 */
        {
-               ucrec a;
-               chanrec* c = ForceChan(Ptr,a,user,created);
-               user->chans.push_back(a);
-               return c;
+               return chanrec::ForceChan(Instance, Ptr, user, privs);
        }
        else if (*user->oper)
        {
                /* Oper allows extension up to the OPERMAXCHANS value */
                if (user->chans.size() < OPERMAXCHANS)
                {
-                       ucrec a;
-                       chanrec* c = ForceChan(Ptr,a,user,created);
-                       user->chans.push_back(a);
-                       return c;
+                       return chanrec::ForceChan(Instance, Ptr, user, privs);
                }
        }
-
-       log(DEBUG,"add_channel: user channel max exceeded: %s %s",user->nick,cname);
-       WriteServ(user->fd,"405 %s %s :You are on too many channels",user->nick, cname);
-       return NULL;
-}
-
-chanrec* ForceChan(chanrec* Ptr,ucrec &a,userrec* user, int created)
-{
-       if (created == 2)
+       else if (user->chans.size() < MAXCHANS)
        {
-               /* first user in is given ops */
-               a.uc_modes = UCMODE_OP;
-               Ptr->AddOppedUser((char*)user);
-       }
-       else
-       {
-               a.uc_modes = 0;
+               return chanrec::ForceChan(Instance, Ptr, user, privs);
        }
 
-       a.channel = Ptr;
-       Ptr->AddUser((char*)user);
-       WriteChannel(Ptr,user,"JOIN :%s",Ptr->name);
-       log(DEBUG,"Sent JOIN to client");
 
-       if (Ptr->topicset)
+       user->WriteServ("405 %s %s :You are on too many channels",user->nick, cname);
+
+       if (new_channel)
        {
-               WriteServ(user->fd,"332 %s %s :%s", user->nick, Ptr->name, Ptr->topic);
-               WriteServ(user->fd,"333 %s %s %s %lu", user->nick, Ptr->name, Ptr->setby, (unsigned long)Ptr->topicset);
+               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())
+               {
+                       Ptr->DelUser(user);
+                       DELETE(Ptr);
+                       Instance->chanlist->erase(n);
+               }
        }
 
-       userlist(user,Ptr);
-       WriteServ(user->fd,"366 %s %s :End of /NAMES list.", user->nick, Ptr->name);
-       FOREACH_MOD(I_OnUserJoin,OnUserJoin(user,Ptr));
-       return Ptr;
+       return NULL;
 }
 
-/*
- *remove a channel from a users record, and remove the record from memory
- * if the channel has become empty
- */
-
-chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool local)
+chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr, userrec* user, const std::string &privs)
 {
-       if ((!user) || (!cname))
+       userrec* dummyuser = new userrec(Instance);
+       std::string nick = user->nick;
+
+       dummyuser->SetFd(FD_MAGIC_NUMBER);
+       Ptr->AddUser(user);
+
+       /* Just in case they have no permissions */
+       user->chans[Ptr] = 0;
+
+       for (std::string::const_iterator x = privs.begin(); x != privs.end(); x++)
        {
-               log(DEFAULT,"*** BUG *** del_channel was given an invalid parameter");
-               return NULL;
+               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);
+
+                       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
+                                * must stick to ::find().
+                                */
+                               case '@':
+                                       user->chans[Ptr] |= UCMODE_OP;
+                               break;
+                               case '%':
+                                       user->chans[Ptr] |= UCMODE_HOP;
+                               break;
+                               case '+':
+                                       user->chans[Ptr] |= UCMODE_VOICE;
+                               break;
+                       }
+               }
        }
 
-       chanrec* Ptr = FindChan(cname);
+       delete dummyuser;
 
-       if (!Ptr)
-               return NULL;
+       Ptr->WriteChannel(user,"JOIN :%s",Ptr->name);
 
-       log(DEBUG,"del_channel: removing: %s %s",user->nick,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());
 
-       for (unsigned int i =0; i < user->chans.size(); i++)
+       /* Major improvement by Brain - we dont need to be calculating all this pointlessly for remote users */
+       if (IS_LOCAL(user))
        {
-               /* zap it from the channel list of the user */
-               if (user->chans[i].channel == Ptr)
+               if (Ptr->topicset)
                {
-                       if (reason)
-                       {
-                               FOREACH_MOD(I_OnUserPart,OnUserPart(user,Ptr,reason));
-                               WriteChannel(Ptr,user,"PART %s :%s",Ptr->name, reason);
-                       }
-                       else
+                       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);
+       }
+       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)))
                        {
-                               FOREACH_MOD(I_OnUserPart,OnUserPart(user,Ptr,""));
-                               WriteChannel(Ptr,user,"PART :%s",Ptr->name);
+                               return true;
                        }
-                       user->chans[i].uc_modes = 0;
-                       user->chans[i].channel = NULL;
-                       log(DEBUG,"del_channel: unlinked: %s %s",user->nick,Ptr->name);
-                       break;
                }
        }
+       return false;
+}
 
-       Ptr->DelUser((char*)user);
+/* chanrec::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.
+ */
+long chanrec::PartUser(userrec *user, const char* reason)
+{
+       if (!user)
+               return this->GetUserCounter();
 
-       /* if there are no users left on the channel */
-       if (!usercount(Ptr))
+       UCListIter i = user->chans.find(this);
+       if (i != user->chans.end())
        {
-               chan_hash::iterator iter = chanlist.find(Ptr->name);
-
-               log(DEBUG,"del_channel: destroying channel: %s",Ptr->name);
+               FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, reason ? reason : ""));
+               this->WriteChannel(user, "PART %s%s%s", this->name, reason ? " :" : "", reason ? reason : "");
+               user->chans.erase(i);
+               this->RemoveAllPrefixes(user);
+       }
 
+       if (!this->DelUser(user)) /* if there are no users left on the channel... */
+       {
+               chan_hash::iterator iter = ServerInstance->chanlist->find(this->name);
                /* kill the record */
-               if (iter != chanlist.end())
+               if (iter != ServerInstance->chanlist->end())
                {
-                       log(DEBUG,"del_channel: destroyed: %s",Ptr->name);
-                       FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(Ptr));
-                       delete Ptr;
-                       chanlist.erase(iter);
+                       ServerInstance->Log(DEBUG,"del_channel: destroyed: %s", this->name);
+                       FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(this));
+                       ServerInstance->chanlist->erase(iter);
                }
+               return 0;
        }
 
-       return NULL;
+       return this->GetUserCounter();
 }
 
-void server_kick_channel(userrec* user, chanrec* Ptr, char* reason, bool triggerevents)
+long chanrec::ServerKickUser(userrec* user, const char* reason, bool triggerevents)
 {
-       if ((!user) || (!Ptr) || (!reason))
-       {
-               return;
-       }
+       if (!user || !reason)
+               return this->GetUserCounter();
 
        if (IS_LOCAL(user))
        {
-               if (!has_channel(user,Ptr))
+               if (!this->HasUser(user))
                {
                        /* Not on channel */
-                       return;
+                       return this->GetUserCounter();
                }
        }
-       
+
        if (triggerevents)
        {
-               FOREACH_MOD(I_OnUserKick,OnUserKick(NULL,user,Ptr,reason));
+               FOREACH_MOD(I_OnUserKick,OnUserKick(NULL,user,this,reason));
        }
 
-       for (unsigned int i =0; i < user->chans.size(); i++)
+       UCListIter i = user->chans.find(this);
+       if (i != user->chans.end())
        {
-               if (user->chans[i].channel)
-               if (!strcasecmp(user->chans[i].channel->name,Ptr->name))
-               {
-                       WriteChannelWithServ(Config->ServerName,Ptr,"KICK %s %s :%s",Ptr->name, user->nick, reason);
-                       user->chans[i].uc_modes = 0;
-                       user->chans[i].channel = NULL;
-                       break;
-               }
+               this->WriteChannelWithServ(ServerInstance->Config->ServerName, "KICK %s %s :%s", this->name, user->nick, reason);
+               user->chans.erase(i);
+               this->RemoveAllPrefixes(user);
        }
 
-       Ptr->DelUser((char*)user);
-
-       if (!usercount(Ptr))
+       if (!this->DelUser(user))
        {
-               chan_hash::iterator iter = chanlist.find(Ptr->name);
-               log(DEBUG,"del_channel: destroying channel: %s",Ptr->name);
+               chan_hash::iterator iter = ServerInstance->chanlist->find(this->name);
                /* kill the record */
-               if (iter != chanlist.end())
+               if (iter != ServerInstance->chanlist->end())
                {
-                       log(DEBUG,"del_channel: destroyed: %s",Ptr->name);
-                       FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(Ptr));
-                       delete Ptr;
-                       chanlist.erase(iter);
+                       FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(this));
+                       ServerInstance->chanlist->erase(iter);
                }
+               return 0;
        }
+
+       return this->GetUserCounter();
 }
 
-void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason)
+long chanrec::KickUser(userrec *src, userrec *user, const char* reason)
 {
-       if ((!src) || (!user) || (!Ptr) || (!reason))
-       {
-               log(DEFAULT,"*** BUG *** kick_channel was given an invalid parameter");
-               return;
-       }
-
-       log(DEBUG,"kick_channel: removing: %s %s %s",user->nick,Ptr->name,src->nick);
+       if (!src || !user || !reason)
+               return this->GetUserCounter();
 
        if (IS_LOCAL(src))
        {
-               if (!has_channel(user,Ptr))
+               if (!this->HasUser(user))
                {
-                       WriteServ(src->fd,"441 %s %s %s :They are not on that channel",src->nick, user->nick, Ptr->name);
-                       return;
+                       src->WriteServ("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);
+                       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,Ptr,reason));
+                       FOREACH_RESULT(I_OnUserPreKick,OnUserPreKick(src,user,this,reason));
                        if (MOD_RESULT == 1)
-                               return;
+                               return this->GetUserCounter();
                }
                /* Set to -1 by OnUserPreKick if explicit allow was set */
                if (MOD_RESULT != -1)
                {
-                       FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(src,user,Ptr,AC_KICK));
-                       if ((MOD_RESULT == ACR_DENY) && (!is_uline(src->server)))
-                               return;
+                       FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(src,user,this,AC_KICK));
+                       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)))
                        {
-                               if ((cstatus(src,Ptr) < STATUS_HOP) || (cstatus(src,Ptr) < cstatus(user,Ptr)))
+                               int them = this->GetStatus(src);
+                               int us = this->GetStatus(user);
+                               if ((them < STATUS_HOP) || (them < us))
                                {
-                                       if (cstatus(src,Ptr) == STATUS_HOP)
-                                       {
-                                               WriteServ(src->fd,"482 %s %s :You must be a channel operator",src->nick, Ptr->name);
-                                       }
-                                       else
-                                       {
-                                               WriteServ(src->fd,"482 %s %s :You must be at least a half-operator",src->nick, Ptr->name);
-                                       }
-               
-                                       return;
+                                       src->WriteServ("482 %s %s :You must be a channel %soperator",src->nick, this->name, them == STATUS_HOP ? "" : "half-");
+                                       return this->GetUserCounter();
                                }
                        }
                }
        }
 
-       FOREACH_MOD(I_OnUserKick,OnUserKick(src,user,Ptr,reason));
+       FOREACH_MOD(I_OnUserKick,OnUserKick(src,user,this,reason));
 
-       for (unsigned int i =0; i < user->chans.size(); i++)
+       UCListIter i = user->chans.find(this);
+       if (i != user->chans.end())
        {
                /* zap it from the channel list of the user */
-               if (user->chans[i].channel)
+               this->WriteChannel(src, "KICK %s %s :%s", this->name, user->nick, reason);
+               user->chans.erase(i);
+               this->RemoveAllPrefixes(user);
+       }
+
+       if (!this->DelUser(user))
+       /* if there are no users left on the channel */
+       {
+               chan_hash::iterator iter = ServerInstance->chanlist->find(this->name);
+
+               /* kill the record */
+               if (iter != ServerInstance->chanlist->end())
                {
-                       if (!strcasecmp(user->chans[i].channel->name,Ptr->name))
+                       FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(this));
+                       ServerInstance->chanlist->erase(iter);
+               }
+               return 0;
+       }
+
+       return this->GetUserCounter();
+}
+
+void chanrec::WriteChannel(userrec* user, char* text, ...)
+{
+       char textbuffer[MAXBUF];
+       va_list argsPtr;
+
+       if (!user || !text)
+               return;
+
+       va_start(argsPtr, text);
+       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+       va_end(argsPtr);
+
+       this->WriteChannel(user, std::string(textbuffer));
+}
+
+void chanrec::WriteChannel(userrec* user, const std::string &text)
+{
+       CUList *ulist = this->GetUsers();
+       char tb[MAXBUF];
+
+       if (!user)
+               return;
+
+       snprintf(tb,MAXBUF,":%s %s",user->GetFullHost(),text.c_str());
+       std::string out = tb;
+
+       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+       {
+               if (IS_LOCAL(i->second))
+                       i->second->Write(out);
+       }
+}
+
+void chanrec::WriteChannelWithServ(const char* ServName, const char* text, ...)
+{
+       char textbuffer[MAXBUF];
+       va_list argsPtr;
+
+       if (!text)
+               return;
+
+       va_start(argsPtr, text);
+       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+       va_end(argsPtr);
+
+       this->WriteChannelWithServ(ServName, std::string(textbuffer));
+}
+
+void chanrec::WriteChannelWithServ(const char* ServName, const std::string &text)
+{
+       CUList *ulist = this->GetUsers();
+
+       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+       {
+               if (IS_LOCAL(i->second))
+                       i->second->WriteServ(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, ...)
+{
+       char textbuffer[MAXBUF];
+       va_list argsPtr;
+
+       if (!text)
+               return;
+
+       va_start(argsPtr, text);
+       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+       va_end(argsPtr);
+
+       this->WriteAllExceptSender(user, serversource, status, std::string(textbuffer));
+}
+
+void chanrec::WriteAllExcept(userrec* user, bool serversource, char status, CUList &except_list, char* text, ...)
+{
+       char textbuffer[MAXBUF];
+       va_list argsPtr;
+
+       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;
+       char tb[MAXBUF];
+
+       switch (status)
+       {
+               case '@':
+                       ulist = this->GetOppedUsers();
+                       break;
+               case '%':
+                       ulist = this->GetHalfoppedUsers();
+                       break;
+               case '+':
+                       ulist = this->GetVoicedUsers();
+                       break;
+               default:
+                       ulist = this->GetUsers();
+                       break;
+       }
+
+       snprintf(tb,MAXBUF,":%s %s",user->GetFullHost(),text.c_str());
+       std::string out = tb;
+
+       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+       {
+               if ((IS_LOCAL(i->second)) && (except_list.find(i->second) == except_list.end()))
+               {
+                       if (serversource)
+                               i->second->WriteServ(text);
+                       else
+                               i->second->Write(out);
+               }
+       }
+}
+
+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
+ */
+int chanrec::CountInvisible()
+{
+       int count = 0;
+       CUList *ulist= this->GetUsers();
+       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+       {
+               if (!(i->second->modes[UM_INVISIBLE]))
+                       count++;
+       }
+
+       return count;
+}
+
+char* chanrec::ChanModes(bool showkey)
+{
+       static char scratch[MAXBUF];
+       static char sparam[MAXBUF];
+       char* offset = scratch;
+       std::string extparam = "";
+
+       *scratch = '\0';
+       *sparam = '\0';
+
+       /* 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])
+               {
+                       *offset++ = n + 65;
+                       extparam = "";
+                       switch (n)
                        {
-                               WriteChannel(Ptr,src,"KICK %s %s :%s",Ptr->name, user->nick, reason);
-                               user->chans[i].uc_modes = 0;
-                               user->chans[i].channel = NULL;
-                               log(DEBUG,"del_channel: unlinked: %s %s",user->nick,Ptr->name);
+                               case CM_KEY:
+                                       extparam = (showkey ? this->key : "<key>");
+                               break;
+                               case CM_LIMIT:
+                                       extparam = ConvToStr(this->limit);
+                               break;
+                               case CM_NOEXTERNAL:
+                               case CM_TOPICLOCK:
+                               case CM_INVITEONLY:
+                               case CM_MODERATED:
+                               case CM_SECRET:
+                               case CM_PRIVATE:
+                                       /* We know these have no parameters */
+                               break;
+                               default:
+                                       extparam = this->GetModeParameter(n + 65);
                                break;
                        }
+                       if (extparam != "")
+                       {
+                               charlcat(sparam,' ',MAXBUF);
+                               strlcat(sparam,extparam.c_str(),MAXBUF);
+                       }
                }
        }
 
-       Ptr->DelUser((char*)user);
+       /* Null terminate scratch */
+       *offset = '\0';
+       strlcat(scratch,sparam,MAXBUF);
+       return scratch;
+}
 
-       /* if there are no users left on the channel */
-       if (!usercount(Ptr))
+/* 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)
+{
+       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);
+
+       int numusers = 0;
+       char* ptr = list + dlen;
+
+       CUList *ulist= this->GetUsers();
+
+       /* Improvement by Brain - this doesnt change in value, so why was it inside
+        * the loop?
+        */
+       bool has_user = this->HasUser(user);
+
+       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
        {
-               chan_hash::iterator iter = chanlist.find(Ptr->name);
+               if ((!has_user) && (i->second->modes[UM_INVISIBLE]))
+               {
+                       /*
+                        * user is +i, and source not on the channel, does not show
+                        * nick in NAMES list
+                        */
+                       continue;
+               }
 
-               log(DEBUG,"del_channel: destroying channel: %s",Ptr->name);
+               size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", this->GetPrefixChar(i->second), i->second->nick);
 
-               /* kill the record */
-               if (iter != chanlist.end())
+               curlen += ptrlen;
+               ptr += ptrlen;
+
+               numusers++;
+
+               if (curlen > (480-NICKMAX))
+               {
+                       /* list overflowed into multiple numerics */
+                       user->WriteServ(std::string(list));
+
+                       /* reset our lengths */
+                       dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, this->name);
+                       ptr = list + dlen;
+
+                       ptrlen = 0;
+                       numusers = 0;
+               }
+       }
+
+       /* if whats left in the list isnt empty, send it */
+       if (numusers)
+       {
+               user->WriteServ(std::string(list));
+       }
+
+       user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, this->name);
+}
+
+long chanrec::GetMaxBans()
+{
+       /* Return the cached value if there is one */
+       if (this->maxbans)
+               return this->maxbans;
+
+       /* If there isnt one, we have to do some O(n) hax to find it the first time. (ick) */
+       for (std::map<std::string,int>::iterator n = ServerInstance->Config->maxbans.begin(); n != ServerInstance->Config->maxbans.end(); n++)
+       {
+               if (match(this->name,n->first.c_str()))
+               {
+                       this->maxbans = n->second;
+                       return n->second;
+               }
+       }
+
+       /* Screw it, just return the default of 64 */
+       this->maxbans = 64;
+       return this->maxbans;
+}
+
+void chanrec::ResetMaxBans()
+{
+       this->maxbans = 0;
+}
+
+/* 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.
+ */
+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())
                {
-                       log(DEBUG,"del_channel: destroyed: %s",Ptr->name);
-                       FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(Ptr));
-                       delete Ptr;
-                       chanlist.erase(iter);
+                       /* 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;
                }
        }
+
+       *pf = 0;
+       return pf;
 }
 
+const char* chanrec::GetAllPrefixChars(userrec* user)
+{
+       static char prefix[MAXBUF];
+       int ctr = 0;
+       *prefix = 0;
+
+       prefixlist::iterator n = prefixes.find(user);
+       if (n != prefixes.end())
+       {
+               for (std::vector<prefixtype>::iterator x = n->second.begin(); x != n->second.end(); x++)
+               {
+                       prefix[ctr++] = x->first;
+               }
+       }
+
+       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;
+}
+
+int chanrec::GetStatusFlags(userrec *user)
+{
+       UCListIter i = user->chans.find(this);
+       if (i != user->chans.end())
+       {
+               return i->second;
+       }
+       return 0;
+}
+
+int chanrec::GetStatus(userrec *user)
+{
+       if (ServerInstance->ULine(user->server))
+               return STATUS_OP;
+
+       UCListIter i = user->chans.find(this);
+       if (i != user->chans.end())
+       {
+               if ((i->second & UCMODE_OP) > 0)
+               {
+                       return STATUS_OP;
+               }
+               if ((i->second & UCMODE_HOP) > 0)
+               {
+                       return STATUS_HOP;
+               }
+               if ((i->second & UCMODE_VOICE) > 0)
+               {
+                       return STATUS_VOICE;
+               }
+               return STATUS_NORMAL;
+       }
+       return STATUS_NORMAL;
+}
+
+void chanrec::SetPrefix(userrec* user, char prefix, unsigned int prefix_value, bool adding)
+{
+       ServerInstance->Log(DEBUG,"Setting prefix: %c on user %s in %s to %d", prefix, user->nick, this->name, 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<userrec*,pfxcontainer>(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);
+       }
+}