]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/channels.cpp
code tidyups
[user/henk/code/inspircd.git] / src / channels.cpp
index 573289db918027d73f71482fdce0d3999b3c0862..b0de06267ed7c1e81fbdbc5a1b5c16012acfeb04 100644 (file)
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
+/* $Core: libIRCDchannels */
 
-#include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include "inspircd_util.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 <stdarg.h>
 #include "wildcard.h"
-#include "message.h"
 #include "mode.h"
-#include "xline.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
 
-#ifdef GCC3
-#define nspace __gnu_cxx
-#else
-#define nspace std
-#endif
+Channel::Channel(InspIRCd* Instance, const std::string &cname, time_t ts) : ServerInstance(Instance)
+{
+       chan_hash::iterator findchan = ServerInstance->chanlist->find(cname);
+       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;
 
-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 startup_time;
-extern std::vector<std::string> module_names;
-extern int boundPortCount;
-extern std::stringstream config_f;
-extern time_t TIME;
 
-using namespace std;
 
-std::vector<ModeParameter> custom_mode_params;
+       *topic = *setby = *key = 0;
+       maxbans = topicset = limit = 0;
+       memset(&modes,0,64);
+}
 
-chanrec::chanrec()
+void Channel::SetMode(char mode,bool mode_on)
 {
-       strcpy(name,"");
-       strcpy(custom_modes,"");
-       strcpy(topic,"");
-       strcpy(setby,"");
-       strcpy(key,"");
-       created = topicset = limit = 0;
-       binarymodes = 0;
-       internal_userlist.clear();
+       modes[mode-65] = mode_on;
+       if (!mode_on)
+               this->SetModeParam(mode,"",false);
 }
 
-void chanrec::SetCustomMode(char mode,bool mode_on)
+
+void Channel::SetModeParam(char mode,const char* parameter,bool mode_on)
 {
-       if (mode_on) {
-               static char m[3];
-               m[0] = mode;
-               m[1] = '\0';
-               if (!strchr(this->custom_modes,mode))
+       CustomModeList::iterator n = custom_mode_params.find(mode);     
+
+       if (mode_on)
+       {
+               if (n == custom_mode_params.end())
+                       custom_mode_params[mode] = strdup(parameter);
+       }
+       else
+       {
+               if (n != custom_mode_params.end())
                {
-                       strlcat(custom_modes,m,MAXMODES);
+                       free(n->second);
+                       custom_mode_params.erase(n);
                }
-               log(DEBUG,"Custom mode %c set",mode);
        }
-       else {
+}
 
-               std::string a = this->custom_modes;
-               int pos = a.find(mode);
-               a.erase(pos,1);
-               strncpy(this->custom_modes,a.c_str(),MAXMODES);
+bool Channel::IsModeSet(char mode)
+{
+       return modes[mode-65];
+}
 
-               log(DEBUG,"Custom mode %c removed: modelist='%s'",mode,this->custom_modes);
-               this->SetCustomModeParam(mode,"",false);
+std::string Channel::GetModeParameter(char mode)
+{
+       switch (mode)
+       {
+               case 'k':
+                       return this->key;
+               case 'l':
+                       return ConvToStr(this->limit);
+               default:
+                       CustomModeList::iterator n = custom_mode_params.find(mode);
+                       if (n != custom_mode_params.end())
+                               return n->second;
+                       return "";
+               break;
        }
 }
 
+long Channel::GetUserCounter()
+{
+       return (this->internal_userlist.size());
+}
 
-void chanrec::SetCustomModeParam(char mode,char* parameter,bool mode_on)
+void Channel::AddUser(User* user)
 {
+       internal_userlist[user] = user->nick;
+}
 
-       log(DEBUG,"SetCustomModeParam called");
-       ModeParameter M;
-       M.mode = mode;
-       strlcpy(M.channel,this->name,CHANMAX);
-       strlcpy(M.parameter,parameter,MAXBUF);
-       if (mode_on)
+unsigned long Channel::DelUser(User* user)
+{
+       CUListIter a = internal_userlist.find(user);
+       
+       if (a != internal_userlist.end())
+       {
+               internal_userlist.erase(a);
+               /* And tidy any others... */
+               DelOppedUser(user);
+               DelHalfoppedUser(user);
+               DelVoicedUser(user);
+       }
+       
+       return internal_userlist.size();
+}
+
+bool Channel::HasUser(User* user)
+{
+       return (internal_userlist.find(user) != internal_userlist.end());
+}
+
+void Channel::AddOppedUser(User* user)
+{
+       internal_op_userlist[user] = user->nick;
+}
+
+void Channel::DelOppedUser(User* user)
+{
+       CUListIter a = internal_op_userlist.find(user);
+       if (a != internal_op_userlist.end())
+       {
+               internal_op_userlist.erase(a);
+               return;
+       }
+}
+
+void Channel::AddHalfoppedUser(User* user)
+{
+       internal_halfop_userlist[user] = user->nick;
+}
+
+void Channel::DelHalfoppedUser(User* user)
+{
+       CUListIter a = internal_halfop_userlist.find(user);
+
+       if (a != internal_halfop_userlist.end())
+       {   
+               internal_halfop_userlist.erase(a);
+       }
+}
+
+void Channel::AddVoicedUser(User* user)
+{
+       internal_voice_userlist[user] = user->nick;
+}
+
+void Channel::DelVoicedUser(User* user)
+{
+       CUListIter a = internal_voice_userlist.find(user);
+       
+       if (a != internal_voice_userlist.end())
+       {
+               internal_voice_userlist.erase(a);
+       }
+}
+
+CUList* Channel::GetUsers()
+{
+       return &internal_userlist;
+}
+
+CUList* Channel::GetOppedUsers()
+{
+       return &internal_op_userlist;
+}
+
+CUList* Channel::GetHalfoppedUsers()
+{
+       return &internal_halfop_userlist;
+}
+
+CUList* Channel::GetVoicedUsers()
+{
+       return &internal_voice_userlist;
+}
+
+void Channel::SetDefaultModes()
+{
+       ServerInstance->Logs->Log("CHANNELS", DEBUG, "SetDefaultModes %s", ServerInstance->Config->DefaultModes);
+       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 
+ */
+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;
+
+       char cname[MAXBUF];
+       int MOD_RESULT = 0;
+       std::string privs;
+       Channel *Ptr;
+
+       /*
+        * 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->WriteNumeric(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->WriteNumeric(405, "%s %s :You are on too many channels",user->nick, cn);
+                                       return NULL;
+                               }
+                       }
+                       else
+                       {
+                               if (user->chans.size() >= Instance->Config->MaxChans)
+                               {
+                                       user->WriteNumeric(405, "%s %s :You are on too many channels",user->nick, cn);
+                                       return NULL;
+                               }
+                       }
+               }
+       }
+
+       strlcpy(cname, cn, CHANMAX);
+       Ptr = Instance->FindChan(cname);
+
+       if (!Ptr)
        {
-               log(DEBUG,"Custom mode parameter %c %s added",mode,parameter);
-               custom_mode_params.push_back(M);
+               /*
+                * 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->Logs->Log("CHANNEL",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)
+               {
+                       MOD_RESULT = 0;
+                       FOREACH_RESULT_I(Instance,I_OnUserPreJoin, OnUserPreJoin(user, NULL, cname, privs, key ? key : ""));
+                       if (MOD_RESULT == 1)
+                               return NULL;
+               }
+
+               Ptr = new Channel(Instance, cname, TS);
        }
        else
        {
-               if (custom_mode_params.size())
+               /* Already on the channel */
+               if (Ptr->HasUser(user))
+                       return NULL;
+
+               /*
+                * remote users are allowed us to bypass channel modes
+                * and bans (used by servers)
+                */
+               if (IS_LOCAL(user) && override == false)
                {
-                       for (vector<ModeParameter>::iterator i = custom_mode_params.begin(); i < custom_mode_params.end(); i++)
+                       MOD_RESULT = 0;
+                       FOREACH_RESULT_I(Instance,I_OnUserPreJoin, OnUserPreJoin(user, Ptr, cname, privs, key ? key : ""));
+                       if (MOD_RESULT == 1)
+                       {
+                               return NULL;
+                       }
+                       else if (MOD_RESULT == 0)
                        {
-                               if ((i->mode == mode) && (!strcasecmp(this->name,i->channel)))
+                               if (*Ptr->key)
+                               {
+                                       MOD_RESULT = 0;
+                                       FOREACH_RESULT_I(Instance,I_OnCheckKey,OnCheckKey(user, Ptr, key ? key : ""));
+                                       if (!MOD_RESULT)
+                                       {
+                                               if ((!key) || strcmp(key,Ptr->key))
+                                               {
+                                                       user->WriteNumeric(475, "%s %s :Cannot join channel (Incorrect channel key)",user->nick, Ptr->name);
+                                                       return NULL;
+                                               }
+                                       }
+                               }
+                               if (Ptr->IsModeSet('i'))
                                {
-                                       log(DEBUG,"Custom mode parameter %c %s removed",mode,parameter);
-                                       custom_mode_params.erase(i);
-                                       return;
+                                       MOD_RESULT = 0;
+                                       FOREACH_RESULT_I(Instance,I_OnCheckInvite,OnCheckInvite(user, Ptr));
+                                       if (!MOD_RESULT)
+                                       {
+                                               if (!user->IsInvited(Ptr->name))
+                                               {
+                                                       user->WriteNumeric(473, "%s %s :Cannot join channel (Invite only)",user->nick, Ptr->name);
+                                                       return NULL;
+                                               }
+                                       }
+                                       user->RemoveInvite(Ptr->name);
+                               }
+                               if (Ptr->limit)
+                               {
+                                       MOD_RESULT = 0;
+                                       FOREACH_RESULT_I(Instance,I_OnCheckLimit,OnCheckLimit(user, Ptr));
+                                       if (!MOD_RESULT)
+                                       {
+                                               if (Ptr->GetUserCounter() >= Ptr->limit)
+                                               {
+                                                       user->WriteNumeric(471, "%s %s :Cannot join channel (Channel is full)",user->nick, Ptr->name);
+                                                       return NULL;
+                                               }
+                                       }
+                               }
+                               if (Ptr->bans.size())
+                               {
+                                       if (Ptr->IsBanned(user))
+                                       {
+                                               user->WriteNumeric(474, "%s %s :Cannot join channel (You're banned)",user->nick, Ptr->name);
+                                               return NULL;
+                                       }
                                }
                        }
                }
-               log(DEBUG,"*** BUG *** Attempt to remove non-existent mode parameter!");
        }
+
+       /* As spotted by jilles, dont bother to set this on remote users */
+       if (IS_LOCAL(user) && Ptr->GetUserCounter() == 0)
+               Ptr->SetDefaultModes();
+
+       return Channel::ForceChan(Instance, Ptr, user, privs, bursting);
 }
 
-bool chanrec::IsCustomModeSet(char mode)
+Channel* Channel::ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const std::string &privs, bool bursting)
 {
-       return (strchr(this->custom_modes,mode));
+       std::string nick = user->nick;
+       bool silent = false;
+
+       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++)
+       {
+               const char status = *x;
+               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);
+                       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
+                                * 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;
+                       }
+               }
+       }
+
+       FOREACH_MOD_I(Instance,I_OnUserJoin,OnUserJoin(user, Ptr, bursting, silent));
+
+       if (!silent)
+               Ptr->WriteChannel(user,"JOIN :%s",Ptr->name);
+
+       /* Theyre not the first ones in here, make sure everyone else sees the modes we gave the user */
+       std::string ms = Instance->Modes->ModeString(user, Ptr);
+       if ((Ptr->GetUserCounter() > 1) && (ms.length()))
+               Ptr->WriteAllExceptSender(user, true, 0, "MODE %s +%s", Ptr->name, ms.c_str());
+
+       /* Major improvement by Brain - we dont need to be calculating all this pointlessly for remote users */
+       if (IS_LOCAL(user))
+       {
+               if (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);
+       }
+       FOREACH_MOD_I(Instance,I_OnPostJoin,OnPostJoin(user, Ptr));
+       return Ptr;
 }
 
-std::string chanrec::GetModeParameter(char mode)
+bool Channel::IsBanned(User* user)
 {
-       if (custom_mode_params.size())
+       char mask[MAXBUF];
+       int MOD_RESULT = 0;
+       FOREACH_RESULT(I_OnCheckBan,OnCheckBan(user, this));
+
+       if (MOD_RESULT == -1)
+               return true;
+       else if (MOD_RESULT == 0)
        {
-               for (vector<ModeParameter>::iterator i = custom_mode_params.begin(); i < custom_mode_params.end(); i++)
+               snprintf(mask, MAXBUF, "%s!%s@%s", user->nick, user->ident, user->GetIPString());
+               for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++)
                {
-                       if ((i->mode == mode) && (!strcasecmp(this->name,i->channel)))
+                       /* This allows CIDR ban matching
+                        * 
+                        *        Full masked host                      Full unmasked host                   IP with/without CIDR
+                        */
+                       if ((match(user->GetFullHost(),i->data)) || (match(user->GetFullRealHost(),i->data)) || (match(mask, i->data, true)))
                        {
-                               return i->parameter;
+                               return true;
                        }
                }
        }
-       return "";
+       return false;
 }
 
-long chanrec::GetUserCounter()
+bool Channel::IsExtBanned(User *user, char type)
 {
-       return (this->internal_userlist.size());
+       // XXX. do we need events?
+       char mask[MAXBUF];
+       char *maskptr;
+
+       snprintf(mask, MAXBUF, "%s!%s@%s", user->nick, user->ident, user->GetIPString());
+
+       for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++)
+       {
+               if (i->data[0] != type || i->data[1] != ':')
+                       continue;
+
+               // Iterate past char and : to get to the mask without doing a data copy(!)
+               maskptr = i->data;
+               maskptr++; // past the char
+               maskptr++; // past the :
+
+               /* This allows CIDR ban matching
+                * 
+                *        Full masked host                             Full unmasked host                     IP with/without CIDR
+                */
+               if ((match(user->GetFullHost(), maskptr)) || (match(user->GetFullRealHost(), maskptr)) || (match(mask, maskptr, true)))
+               {
+                       return true;
+               }
+       }
+
+       return false;
+}
+
+/* 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 Channel.
+ */
+long Channel::PartUser(User *user, const char* reason)
+{
+       bool silent = false;
+
+       if (!user)
+               return this->GetUserCounter();
+
+       UCListIter i = user->chans.find(this);
+       if (i != user->chans.end())
+       {
+               FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, reason ? reason : "", silent));
+
+               if (!silent)
+                       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 != ServerInstance->chanlist->end())
+               {
+                       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;
+       }
+
+       return this->GetUserCounter();
 }
 
-void chanrec::AddUser(char* castuser)
+long Channel::ServerKickUser(User* user, const char* reason, bool triggerevents, const char* servername)
 {
-       internal_userlist.push_back(castuser);
-       log(DEBUG,"Added casted user to channel's internal list");
+       bool silent = false;
+
+       if (!user || !reason)
+               return this->GetUserCounter();
+
+       if (IS_LOCAL(user))
+       {
+               if (!this->HasUser(user))
+               {
+                       /* Not on channel */
+                       return this->GetUserCounter();
+               }
+       }
+
+       if (servername == NULL || *ServerInstance->Config->HideWhoisServer)
+               servername = ServerInstance->Config->ServerName;
+
+       if (triggerevents)
+       {
+               FOREACH_MOD(I_OnUserKick,OnUserKick(NULL, user, this, reason, silent));
+       }
+
+       UCListIter i = user->chans.find(this);
+       if (i != user->chans.end())
+       {
+               if (!silent)
+                       this->WriteChannelWithServ(servername, "KICK %s %s :%s", this->name, user->nick, reason);
+
+               user->chans.erase(i);
+               this->RemoveAllPrefixes(user);
+       }
+
+       if (!this->DelUser(user))
+       {
+               chan_hash::iterator iter = ServerInstance->chanlist->find(this->name);
+               /* kill the record */
+               if (iter != ServerInstance->chanlist->end())
+               {
+                       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;
+       }
+
+       return this->GetUserCounter();
 }
 
-void chanrec::DelUser(char* castuser)
+long Channel::KickUser(User *src, User *user, const char* reason)
 {
-       for (std::vector<char*>::iterator a = internal_userlist.begin(); a < internal_userlist.end(); a++)
+       bool silent = false;
+
+       if (!src || !user || !reason)
+               return this->GetUserCounter();
+
+       if (IS_LOCAL(src))
        {
-               if (*a == castuser)
+               if (!this->HasUser(user))
                {
-                       log(DEBUG,"Removed casted user from channel's internal list");
-                       internal_userlist.erase(a);
+                       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->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;
+
+               if (!ServerInstance->ULine(src->server))
+               {
+                       MOD_RESULT = 0;
+                       FOREACH_RESULT(I_OnUserPreKick,OnUserPreKick(src,user,this,reason));
+                       if (MOD_RESULT == 1)
+                               return this->GetUserCounter();
+               }
+               /* Set to -1 by OnUserPreKick if explicit allow was set */
+               if (MOD_RESULT != -1)
+               {
+                       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) || (!ServerInstance->ULine(src->server)))
+                       {
+                               int them = this->GetStatus(src);
+                               int us = this->GetStatus(user);
+                               if ((them < STATUS_HOP) || (them < us))
+                               {
+                                       src->WriteNumeric(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, this, reason, silent));
+
+       UCListIter i = user->chans.find(this);
+       if (i != user->chans.end())
+       {
+               /* zap it from the channel list of the user */
+               if (!silent)
+                       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())
+               {
+                       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;
+       }
+
+       return this->GetUserCounter();
+}
+
+void Channel::WriteChannel(User* user, const 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 Channel::WriteChannel(User* 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->first))
+                       i->first->Write(out);
+       }
+}
+
+void Channel::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 Channel::WriteChannelWithServ(const char* ServName, const std::string &text)
+{
+       CUList *ulist = this->GetUsers();
+       char tb[MAXBUF];
+
+       snprintf(tb,MAXBUF,":%s %s",ServName ? ServName : ServerInstance->Config->ServerName, text.c_str());
+       std::string out = tb;
+
+       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+       {
+               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 Channel::WriteAllExceptSender(User* user, bool serversource, char status, 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->WriteAllExceptSender(user, serversource, status, std::string(textbuffer));
+}
+
+void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList &except_list, 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->WriteAllExcept(user, serversource, status, except_list, std::string(textbuffer));
+}
+
+void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList &except_list, const std::string &text)
+{
+       CUList *ulist = this->GetUsers();
+       char tb[MAXBUF];
+
+       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->first)) && (except_list.find(i->first) == except_list.end()))
+               {
+                       /* User doesnt have the status we're after */
+                       if (status && !strchr(this->GetAllPrefixChars(i->first), status))
+                               continue;
+
+                       if (serversource)
+                               i->first->WriteServ(text);
+                       else
+                               i->first->Write(out);
+               }
+       }
+}
+
+void Channel::WriteAllExceptSender(User* user, bool serversource, char status, const std::string& text)
+{
+       CUList except_list;
+       except_list[user] = user->nick;
+       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 Channel::CountInvisible()
+{
+       int count = 0;
+       CUList *ulist= this->GetUsers();
+       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+       {
+               if (!(i->first->IsModeSet('i')))
+                       count++;
+       }
+
+       return count;
+}
+
+char* Channel::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, Channel::modes is only 64 elements -- Om */
+       for(int n = 0; n < 64; n++)
+       {
+               if(this->modes[n])
+               {
+                       *offset++ = n + 65;
+                       extparam.clear();
+                       switch (n)
+                       {
+                               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.empty())
+                       {
+                               charlcat(sparam,' ',MAXBUF);
+                               strlcat(sparam,extparam.c_str(),MAXBUF);
+                       }
+               }
+       }
+
+       /* Null terminate scratch */
+       *offset = '\0';
+       strlcat(scratch,sparam,MAXBUF);
+       return scratch;
+}
+
+/* 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 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)
+               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;
                }
        }
-       log(DEBUG,"BUG BUG BUG! Attempt to remove an uncasted user from the internal list of %s!",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;
+
+       if (!ulist)
+               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++)
+       {
+               if ((!has_user) && (i->first->IsModeSet('i')))
+               {
+                       /*
+                        * user is +i, and source not on the channel, does not show
+                        * nick in NAMES list
+                        */
+                       continue;
+               }
+
+               if (i->first->Visibility && !i->first->Visibility->VisibleTo(user))
+                       continue;
+
+               std::string prefixlist = this->GetPrefixChar(i->first);
+               std::string nick = i->first->nick;
+
+               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))
+               {
+                       /* list overflowed into multiple numerics */
+                       user->WriteServ(std::string(list));
+
+                       /* reset our lengths */
+                       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->WriteNumeric(353,std::string(list));
+       }
+
+       user->WriteNumeric(366, "%s %s :End of /NAMES list.", user->nick, this->name);
 }
 
-std::vector<char*> *chanrec::GetUsers()
+long Channel::GetMaxBans()
 {
-       return &internal_userlist;
+       /* 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 Channel::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* Channel::GetPrefixChar(User *user)
+{
+       static char pf[2] = {0, 0};
+       
+       prefixlist::iterator n = prefixes.find(user);
+       if (n != prefixes.end())
+       {
+               if (n->second.size())
+               {
+                       /* If the user has any prefixes, their highest prefix
+                        * will always be at the head of the list, as the list is
+                        * sorted in rank order highest first (see SetPrefix()
+                        * for reasons why)
+                        */
+                       *pf = n->second.begin()->first;
+                       return pf;
+               }
+       }
+
+       *pf = 0;
+       return pf;
 }
+
+
+const char* Channel::GetAllPrefixChars(User* 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 Channel::GetPrefixValue(User* user)
+{
+       prefixlist::iterator n = prefixes.find(user);
+       if (n != prefixes.end())
+       {
+               if (n->second.size())
+                       return n->second.begin()->second;
+       }
+       return 0;
+}
+
+int Channel::GetStatusFlags(User *user)
+{
+       UCListIter i = user->chans.find(this);
+       if (i != user->chans.end())
+       {
+               return i->second;
+       }
+       return 0;
+}
+
+int Channel::GetStatus(User *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 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);
+       if (adding)
+       {
+               if (n != prefixes.end())
+               {
+                       if (std::find(n->second.begin(), n->second.end(), pfx) == n->second.end())
+                       {
+                               n->second.push_back(pfx);
+                               /* We must keep prefixes in rank order, largest first.
+                                * This is for two reasons, firstly because x-chat *ass-u-me's* this
+                                * state, and secondly it turns out to be a benefit to us later.
+                                * See above in GetPrefix().
+                                */
+                               std::sort(n->second.begin(), n->second.end(), ModeParser::PrefixComparison);
+                       }
+               }
+               else
+               {
+                       pfxcontainer one;
+                       one.push_back(pfx);
+                       prefixes.insert(std::make_pair<User*,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);
+               }
+       }
+}
+
+void Channel::RemoveAllPrefixes(User* user)
+{
+       prefixlist::iterator n = prefixes.find(user);
+       if (n != prefixes.end())
+       {
+               prefixes.erase(n);
+       }
+}
+