]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/helperfuncs.cpp
FindNick, FindChan, ChanModes, UserList, CountInvisible, PurgeEmptyChannels, GetClass...
[user/henk/code/inspircd.git] / src / helperfuncs.cpp
index 5a144cac80f738b8a589b5bf50b5a01f727813de..8bfba1ca5f2c3aedc70b92ca98827c03fc8779e1 100644 (file)
@@ -16,7 +16,6 @@
 
 #include <stdarg.h>
 #include "inspircd_config.h"
-#include "inspircd.h"
 #include "configreader.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include "helperfuncs.h"
 #include "hashcomp.h"
 #include "typedefs.h"
+#include "inspircd.h"
 
-extern int MODCOUNT;
-extern ModuleList modules;
-extern ServerConfig *Config;
-extern InspIRCd* ServerInstance;
-extern time_t TIME;
-extern char lowermap[255];
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
-static int already_sent[MAX_DESCRIPTORS] = {0};
-extern std::vector<userrec*> all_opers;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-
-char LOG_FILE[MAXBUF];
-
-extern std::vector<userrec*> local_users;
-
-static char TIMESTR[26];
-static time_t LAST = 0;
-
-/* XXX: Used for speeding up WriteCommon operations */
-int uniq_id = 0;
-
-/** log()
- *  Write a line of text `text' to the logfile (and stdout, if in nofork) if the level `level'
- *  is greater than the configured loglevel.
- */
-void do_log(int level, const char *text, ...)
-{
-       va_list argsPtr;
-       char textbuffer[MAXBUF];
-
-       /* If we were given -debug we output all messages, regardless of configured loglevel */
-       if ((level < Config->LogLevel) && !Config->forcedebug)
-               return;
-
-       if (TIME != LAST)
-       {
-               struct tm *timeinfo = localtime(&TIME);
-
-               strlcpy(TIMESTR,asctime(timeinfo),26);
-               TIMESTR[24] = ':';
-               LAST = TIME;
-       }
-
-       if (Config->log_file)
-       {
-               va_start(argsPtr, text);
-               vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-               va_end(argsPtr);
-
-               if (Config->writelog)
-               {
-                       fprintf(Config->log_file,"%s %s\n",TIMESTR,textbuffer);
-                       fflush(Config->log_file);
-               }
-       }
-       
-       if (Config->nofork)
-       {
-               printf("%s %s\n", TIMESTR, textbuffer);
-       }
-}
-
-/** readfile()
- *  Read the contents of a file located by `fname' into a file_cache pointed at by `F'.
- *
- *  XXX - we may want to consider returning a file_cache or pointer to one, less confusing.
- */
-void readfile(file_cache &F, const char* fname)
-{
-       FILE* file;
-       char linebuf[MAXBUF];
-
-       log(DEBUG,"readfile: loading %s",fname);
-       F.clear();
-       file =  fopen(fname,"r");
-
-       if (file)
-       {
-               while (!feof(file))
-               {
-                       fgets(linebuf,sizeof(linebuf),file);
-                       linebuf[strlen(linebuf)-1]='\0';
-
-                       if (!*linebuf)
-                       {
-                               strcpy(linebuf,"  ");
-                       }
-
-                       if (!feof(file))
-                       {
-                               F.push_back(linebuf);
-                       }
-               }
-
-               fclose(file);
-       }
-       else
-       {
-               log(DEBUG,"readfile: failed to load file: %s",fname);
-       }
-
-       log(DEBUG,"readfile: loaded %s, %lu lines",fname,(unsigned long)F.size());
-}
-
-/** Write_NoFormat()
- *  Writes a given string in `text' to the socket on fd `sock' - only if the socket
- *  is a valid entry in the local FD table.
- */
-void Write_NoFormat(int sock, const char *text)
-{
-       char tb[MAXBUF];
-       int bytes;
-
-       if ((sock < 0) || (!text) || (sock > MAX_DESCRIPTORS))
-               return;
-
-       if (fd_ref_table[sock])
-       {
-               bytes = snprintf(tb,MAXBUF,"%s\r\n",text);
-
-               if (Config->GetIOHook(fd_ref_table[sock]->port))
-               {
-                       try
-                       {
-                               Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
-                       }
-                       catch (ModuleException& modexcept)
-                       {
-                               log(DEBUG,"Module exception caught: %s",modexcept.GetReason());
-                       }
-               }
-               else
-               {
-                       fd_ref_table[sock]->AddWriteBuf(tb);
-               }
-               ServerInstance->stats->statsSent += bytes;
-       }
-       else
-               log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!");
-}
-
-/** Write()
- *  Same as Write_NoFormat(), but formatted printf() style first.
- */
-void Write(int sock, char *text, ...)
-{
-       va_list argsPtr;
-       char textbuffer[MAXBUF];
-       char tb[MAXBUF];
-       int bytes;
-
-       if ((sock < 0) || (sock > MAX_DESCRIPTORS))
-               return;
-
-       if (!text)
-       {
-               log(DEFAULT,"*** BUG *** Write was given an invalid parameter");
-               return;
-       }
-
-       if (fd_ref_table[sock])
-       {
-
-               va_start(argsPtr, text);
-               vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-               va_end(argsPtr);
-               bytes = snprintf(tb,MAXBUF,"%s\r\n",textbuffer);
-
-               if (Config->GetIOHook(fd_ref_table[sock]->port))
-               {
-                       try
-                       {
-                               Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
-                       }
-                       catch (ModuleException& modexcept)
-                       {
-                               log(DEBUG,"Module exception caught: %s",modexcept.GetReason());
-                       }                                               
-               }
-               else
-               {
-                       fd_ref_table[sock]->AddWriteBuf(tb);
-               }
-               ServerInstance->stats->statsSent += bytes;
-       }
-       else
-               log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!");
-}
-
-/** WriteServ_NoFormat()
- *  Same as Write_NoFormat(), except prefixes `text' with `:server.name '.
- */
-void WriteServ_NoFormat(int sock, const char* text)
-{
-       char tb[MAXBUF];
-       int bytes;
-
-       if ((sock < 0) || (!text) || (sock > MAX_DESCRIPTORS))
-               return;
-
-       if (fd_ref_table[sock])
-       {
-               bytes = snprintf(tb,MAXBUF,":%s %s\r\n",Config->ServerName,text);
-
-               if (Config->GetIOHook(fd_ref_table[sock]->port))
-               {
-                       try
-                       {
-                               Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
-                       }
-                       catch (ModuleException& modexcept)
-                       {
-                               log(DEBUG,"Module exception caught: %s",modexcept.GetReason());
-                       }
-               }
-               else
-               {
-                       fd_ref_table[sock]->AddWriteBuf(tb);
-               }
-               ServerInstance->stats->statsSent += bytes;
-       }
-       else
-               log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!");
-}
-
-/** WriteServ()
- *  Same as Write(), except `text' is prefixed with `:server.name '.
- */
-void WriteServ(int sock, char* text, ...)
-{
-       va_list argsPtr;
-       char textbuffer[MAXBUF];
-
-       if ((sock < 0) || (sock > MAX_DESCRIPTORS))
-               return;
-
-       if (!text)
-       {
-               log(DEFAULT,"*** BUG *** WriteServ was given an invalid parameter");
-               return;
-       }
-
-       if (!fd_ref_table[sock])
-               return;
-
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-       
-       WriteServ_NoFormat(sock, textbuffer);
-}
-
-/** WriteFrom_NoFormat()
- * Write `text' to a socket with fd `sock' prefixed with `:n!u@h' - taken from
- * the nick, user, and host of `user'.
- */
-void WriteFrom_NoFormat(int sock, userrec *user, const char* text)
-{
-       char tb[MAXBUF];
-       int bytes;
-
-       if ((sock < 0) || (!text) || (!user) || (sock > MAX_DESCRIPTORS))
-               return;
-
-       if (fd_ref_table[sock])
-       {
-               bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),text);
-
-               if (Config->GetIOHook(fd_ref_table[sock]->port))
-               {
-                       try
-                       {
-                               Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
-                       }
-                       catch (ModuleException& modexcept)
-                       {
-                               log(DEBUG,"Module exception caught: %s",modexcept.GetReason());
-                       }
-               }
-               else
-               {
-                       fd_ref_table[sock]->AddWriteBuf(tb);
-               }
-               ServerInstance->stats->statsSent += bytes;
-       }
-       else
-               log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!");
-}
-
-/* write text from an originating user to originating user */
-
-void WriteFrom(int sock, userrec *user,char* text, ...)
-{
-       va_list argsPtr;
-       char textbuffer[MAXBUF];
-       char tb[MAXBUF];
-       int bytes;
-
-       if ((sock < 0) || (sock > MAX_DESCRIPTORS))
-               return;
-
-       if ((!text) || (!user))
-       {
-               log(DEFAULT,"*** BUG *** WriteFrom was given an invalid parameter");
-               return;
-       }
-
-       if (fd_ref_table[sock])
-       {
-
-               va_start(argsPtr, text);
-               vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-               va_end(argsPtr);
-               bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),textbuffer);
-
-               if (Config->GetIOHook(fd_ref_table[sock]->port))
-               {
-                       try
-                       {
-                               Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
-                       }
-                       catch (ModuleException& modexcept)
-                       {
-                               log(DEBUG,"Module exception caught: %s",modexcept.GetReason());
-                       }
-               }
-               else
-               {
-                       fd_ref_table[sock]->AddWriteBuf(tb);
-               }
-
-               ServerInstance->stats->statsSent += bytes;
-       }
-       else
-               log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!");
-}
-
-/* write text to an destination user from a source user (e.g. user privmsg) */
-
-void WriteTo(userrec *source, userrec *dest,char *data, ...)
-{
-       char textbuffer[MAXBUF];
-       va_list argsPtr;
-
-       if ((!dest) || (!data))
-       {
-               log(DEFAULT,"*** BUG *** WriteTo was given an invalid parameter");
-               return;
-       }
-
-       if (!IS_LOCAL(dest))
-               return;
-
-       va_start(argsPtr, data);
-       vsnprintf(textbuffer, MAXBUF, data, argsPtr);
-       va_end(argsPtr);
-
-       // if no source given send it from the server.
-       if (!source)
-       {
-               WriteServ_NoFormat(dest->fd,textbuffer);
-       }
-       else
-       {
-               WriteFrom_NoFormat(dest->fd,source,textbuffer);
-       }
-}
-
-void WriteTo_NoFormat(userrec *source, userrec *dest, const char *data)
-{
-       if ((!dest) || (!data))
-               return;
-
-       if (!source)
-       {
-               WriteServ_NoFormat(dest->fd,data);
-       }
-       else
-       {
-               WriteFrom_NoFormat(dest->fd,source,data);
-       }
-}
-
-/* write formatted text from a source user to all users on a channel
- * including the sender (NOT for privmsg, notice etc!) */
-
-void WriteChannel(chanrec* Ptr, userrec* user, char* text, ...)
-{
-       char textbuffer[MAXBUF];
-       va_list argsPtr;
-       CUList *ulist;
-
-       if ((!Ptr) || (!user) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter");
-               return;
-       }
-
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-
-       ulist = Ptr->GetUsers();
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if (i->second->fd != FD_MAGIC_NUMBER)
-                       WriteTo_NoFormat(user,i->second,textbuffer);
-       }
-}
-
-void WriteChannel_NoFormat(chanrec* Ptr, userrec* user, const char* text)
-{
-       CUList *ulist;
-
-       if ((!Ptr) || (!user) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter");
-               return;
-       }
-
-       ulist = Ptr->GetUsers();
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if (i->second->fd != FD_MAGIC_NUMBER)
-                       WriteTo_NoFormat(user,i->second,text);
-       }
-}
-
-
-/* write formatted text from a source user to all users on a channel
- * including the sender (NOT for privmsg, notice etc!) doesnt send to
- * users on remote servers */
-
-void WriteChannelLocal(chanrec* Ptr, userrec* user, char* text, ...)
-{
-       char textbuffer[MAXBUF];
-       va_list argsPtr;
-       CUList *ulist;
-
-       if ((!Ptr) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter");
-               return;
-       }
-
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-
-       ulist = Ptr->GetUsers();
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if ((i->second->fd != FD_MAGIC_NUMBER) && (i->second != user))
-               {
-                       if (!user)
-                       {
-                               WriteServ_NoFormat(i->second->fd,textbuffer);
-                       }
-                       else
-                       {
-                               WriteTo_NoFormat(user,i->second,textbuffer);
-                       }
-               }
-       }
-}
-
-void WriteChannelLocal_NoFormat(chanrec* Ptr, userrec* user, const char* text)
-{
-       CUList *ulist;
-
-       if ((!Ptr) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter");
-               return;
-       }
-
-       ulist = Ptr->GetUsers();
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if ((i->second->fd != FD_MAGIC_NUMBER) && (i->second != user))
-               {
-                       if (!user)
-                       {
-                               WriteServ_NoFormat(i->second->fd,text);
-                       }
-                       else
-                       {
-                               WriteTo_NoFormat(user,i->second,text);
-                       }
-               }
-       }
-}
-
-
-
-void WriteChannelWithServ(const char* ServName, chanrec* Ptr, const char* text, ...)
-{
-       char textbuffer[MAXBUF];
-       va_list argsPtr;
-       CUList *ulist;
-
-       if ((!Ptr) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** WriteChannelWithServ was given an invalid parameter");
-               return;
-       }
-
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-
-       ulist = Ptr->GetUsers();
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if (IS_LOCAL(i->second))
-                       WriteServ_NoFormat(i->second->fd,textbuffer);
-       }
-}
-
-void WriteChannelWithServ_NoFormat(const char* ServName, chanrec* Ptr, const char* text)
-{
-       CUList *ulist;
-
-       if ((!Ptr) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** WriteChannelWithServ was given an invalid parameter");
-               return;
-       }
-
-       ulist = Ptr->GetUsers();
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if (IS_LOCAL(i->second))
-                       WriteServ_NoFormat(i->second->fd,text);
-       }
-}
-
-
-
-/* write formatted text from a source user to all users on a channel except
- * for the sender (for privmsg etc) */
-
-void ChanExceptSender(chanrec* Ptr, userrec* user, char status, char* text, ...)
-{
-       char textbuffer[MAXBUF];
-       va_list argsPtr;
-       CUList *ulist;
-
-       if ((!Ptr) || (!user) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** ChanExceptSender was given an invalid parameter");
-               return;
-       }
-
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-
-       switch (status)
-       {
-               case '@':
-                       ulist = Ptr->GetOppedUsers();
-                       break;
-               case '%':
-                       ulist = Ptr->GetHalfoppedUsers();
-                       break;
-               case '+':
-                       ulist = Ptr->GetVoicedUsers();
-                       break;
-               default:
-                       ulist = Ptr->GetUsers();
-                       break;
-       }
-
-       log(DEBUG,"%d users to write to",ulist->size());
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if ((IS_LOCAL(i->second)) && (user != i->second))
-                       WriteFrom_NoFormat(i->second->fd,user,textbuffer);
-       }
-}
-
-void ChanExceptSender_NoFormat(chanrec* Ptr, userrec* user, char status, const char* text)
-{
-       CUList *ulist;
-
-       if ((!Ptr) || (!user) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** ChanExceptSender was given an invalid parameter");
-               return;
-       }
-
-       switch (status)
-       {
-               case '@':
-                       ulist = Ptr->GetOppedUsers();
-                       break;  
-               case '%':
-                       ulist = Ptr->GetHalfoppedUsers();
-                       break;
-               case '+':
-                       ulist = Ptr->GetVoicedUsers();
-                       break;
-               default:
-                       ulist = Ptr->GetUsers();
-                       break;
-       }
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if ((IS_LOCAL(i->second)) && (user != i->second))
-                       WriteFrom_NoFormat(i->second->fd,user,text);
-       }
-}
-
-std::string GetServerDescription(const char* servername)
-{
-       std::string description = "";
-
-       FOREACH_MOD(I_OnGetServerDescription,OnGetServerDescription(servername,description));
-
-       if (description != "")
-       {
-               return description;
-       }
-       else
-       {
-               // not a remote server that can be found, it must be me.
-               return Config->ServerDesc;
-       }
-}
-
-/* write a formatted string to all users who share at least one common
- * channel, including the source user e.g. for use in NICK */
-
-void WriteCommon(userrec *u, char* text, ...)
-{
-       char textbuffer[MAXBUF];
-       va_list argsPtr;
-       bool sent_to_at_least_one = false;
-
-       if (!u)
-       {
-               log(DEFAULT,"*** BUG *** WriteCommon was given an invalid parameter");
-               return;
-       }
-
-       if (u->registered != 7)
-       {
-               log(DEFAULT,"*** BUG *** WriteCommon on an unregistered user");
-               return;
-       }
-
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-
-       // XXX: Save on memset calls by using an ID. This clever trick thought of during discussion with nazzy and w00t.
-       uniq_id++;
-
-       for (std::vector<ucrec*>::const_iterator v = u->chans.begin(); v != u->chans.end(); v++)
-       {
-               if (((ucrec*)(*v))->channel)
-               {
-                       CUList *ulist= ((ucrec*)(*v))->channel->GetUsers();
-
-                       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-                       {
-                               if ((i->second->fd > -1) && (already_sent[i->second->fd] != uniq_id))
-                               {
-                                       already_sent[i->second->fd] = uniq_id;
-                                       WriteFrom_NoFormat(i->second->fd,u,textbuffer);
-                                       sent_to_at_least_one = true;
-                               }
-                       }
-               }
-       }
-
-       /*
-        * if the user was not in any channels, no users will receive the text. Make sure the user
-        * receives their OWN message for WriteCommon
-        */
-       if (!sent_to_at_least_one)
-       {
-               WriteFrom_NoFormat(u->fd,u,textbuffer);
-       }
-}
-
-void WriteCommon_NoFormat(userrec *u, const char* text)
-{
-       bool sent_to_at_least_one = false;
-
-       if (!u)
-       {
-               log(DEFAULT,"*** BUG *** WriteCommon was given an invalid parameter");
-               return;
-       }
-
-       if (u->registered != 7)
-       {
-               log(DEFAULT,"*** BUG *** WriteCommon on an unregistered user");
-               return;
-       }
-
-       // XXX: See comment in WriteCommon
-       uniq_id++;
-
-       for (std::vector<ucrec*>::const_iterator v = u->chans.begin(); v != u->chans.end(); v++)
-       {
-               if (((ucrec*)(*v))->channel)
-               {
-                       CUList *ulist= ((ucrec*)(*v))->channel->GetUsers();
-
-                       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-                       {
-                               if ((i->second->fd > -1) && (already_sent[i->second->fd] != uniq_id))
-                               {
-                                       already_sent[i->second->fd] = uniq_id;
-                                       WriteFrom_NoFormat(i->second->fd,u,text);
-                                       sent_to_at_least_one = true;
-                               }
-                       }
-               }
-       }
+extern int MODCOUNT;
+extern ModuleList modules;
+extern InspIRCd* ServerInstance;
+extern time_t TIME;
+extern char lowermap[255];
+extern std::vector<userrec*> all_opers;
 
-       /*
-        * if the user was not in any channels, no users will receive the text. Make sure the user
-        * receives their OWN message for WriteCommon
-        */
-       if (!sent_to_at_least_one)
-       {
-               WriteFrom_NoFormat(u->fd,u,text);
-       }
-}
+char LOG_FILE[MAXBUF];
 
+static char TIMESTR[26];
+static time_t LAST = 0;
 
-/* write a formatted string to all users who share at least one common
- * channel, NOT including the source user e.g. for use in QUIT
+/** Log()
+ *  Write a line of text `text' to the logfile (and stdout, if in nofork) if the level `level'
+ *  is greater than the configured loglevel.
  */
-
-void WriteCommonExcept(userrec *u, char* text, ...)
+void InspIRCd::Log(int level, const char* text, ...)
 {
-       char textbuffer[MAXBUF];
-       char oper_quit[MAXBUF];
-       bool quit_munge = false;
        va_list argsPtr;
-       int total;
-
-       if (!u)
-       {
-               log(DEFAULT,"*** BUG *** WriteCommon was given an invalid parameter");
-               return;
-       }
-
-       if (u->registered != 7)
-       {
-               log(DEFAULT,"*** BUG *** WriteCommon on an unregistered user");
-               return;
-       }
+       char textbuffer[MAXBUF];
 
        va_start(argsPtr, text);
-       total = vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
 
-       if ((Config->HideSplits) && (total > 6))
-       {
-               /* Yeah yeah, this is ugly. But its fast, live with it. */
-               char* check = textbuffer;
-
-               if ((*check++ == 'Q') && (*check++ == 'U') && (*check++ == 'I') && (*check++ == 'T') && (*check++ == ' ') && (*check++ == ':'))
-               {
-                       std::stringstream split(check);
-                       std::string server_one;
-                       std::string server_two;
+       InspIRCd::Log(level, std::string(textbuffer));
+}
 
-                       split >> server_one;
-                       split >> server_two;
+void InspIRCd::Log(int level, const std::string &text)
+{
+       if (!ServerInstance || !ServerInstance->Config)
+               return;
 
-                       if ((FindServerName(server_one)) && (FindServerName(server_two)))
-                       {
-                               strlcpy(oper_quit,textbuffer,MAXQUIT);
-                               strlcpy(check,"*.net *.split",MAXQUIT);
-                               quit_munge = true;
-                       }
-               }
-       }
+       /* If we were given -debug we output all messages, regardless of configured loglevel */
+       if ((level < ServerInstance->Config->LogLevel) && !ServerInstance->Config->forcedebug)
+               return;
 
-       if ((Config->HideBans) && (total > 13) && (!quit_munge))
+       if (TIME != LAST)
        {
-               char* check = textbuffer;
-
-               /* XXX - as above */
-               if ((*check++ == 'Q') && (*check++ == 'U') && (*check++ == 'I') && (*check++ == 'T') && (*check++ == ' ') && (*check++ == ':'))
-               {
-                       check++;
+               struct tm *timeinfo = localtime(&TIME);
 
-                       if ((*check++ == '-') && (*check++ == 'L') && (*check++ == 'i') && (*check++ == 'n') && (*check++ == 'e') && (*check++ == 'd') && (*check++ == ':'))
-                       {
-                               strlcpy(oper_quit,textbuffer,MAXQUIT);
-                               *(--check) = 0;         // We don't need to strlcpy, we just chop it from the :
-                               quit_munge = true;
-                       }
-               }
+               strlcpy(TIMESTR,asctime(timeinfo),26);
+               TIMESTR[24] = ':';
+               LAST = TIME;
        }
 
-       uniq_id++;
-
-       for (std::vector<ucrec*>::const_iterator v = u->chans.begin(); v != u->chans.end(); v++)
+       if (ServerInstance->Config->log_file && ServerInstance->Config->writelog)
        {
-               if (((ucrec*)(*v))->channel)
-               {
-                       CUList *ulist= ((ucrec*)(*v))->channel->GetUsers();
+               fprintf(ServerInstance->Config->log_file,"%s %s\n",TIMESTR,text.c_str());
+               fflush(ServerInstance->Config->log_file);
+       }
 
-                       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-                       {
-                               if (u != i->second)
-                               {
-                                       if ((i->second->fd > -1) && (already_sent[i->second->fd] != uniq_id))
-                                       {
-                                               already_sent[i->second->fd] = uniq_id;
-
-                                               if (quit_munge)
-                                               {
-                                                       WriteFrom_NoFormat(i->second->fd,u,*i->second->oper ? oper_quit : textbuffer);
-                                               }
-                                               else
-                                                       WriteFrom_NoFormat(i->second->fd,u,textbuffer);
-                                       }
-                               }
-                       }
-               }
+       if (ServerInstance->Config->nofork)
+       {
+               printf("%s %s\n", TIMESTR, text.c_str());
        }
 }
 
-void WriteCommonExcept_NoFormat(userrec *u, const char* text)
+std::string InspIRCd::GetServerDescription(const char* servername)
 {
-       if (!u)
-       {
-               log(DEFAULT,"*** BUG *** WriteCommon was given an invalid parameter");
-               return;
-       }
-       if (u->registered != 7)
-       {
-               log(DEFAULT,"*** BUG *** WriteCommon on an unregistered user");
-               return;
-       }
+       std::string description = "";
 
-       uniq_id++;
+       FOREACH_MOD(I_OnGetServerDescription,OnGetServerDescription(servername,description));
 
-       for (std::vector<ucrec*>::const_iterator v = u->chans.begin(); v != u->chans.end(); v++)
+       if (description != "")
        {
-               if (((ucrec*)(*v))->channel)
-               {
-                       CUList *ulist= ((ucrec*)(*v))->channel->GetUsers();
-
-                       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-                       {
-                               if (u != i->second)
-                               {
-                                       if ((i->second->fd > -1) && (already_sent[i->second->fd] != uniq_id))
-                                       {
-                                               already_sent[i->second->fd] = uniq_id;
-                                               WriteFrom_NoFormat(i->second->fd,u,text);
-                                       }
-                               }
-                       }
-               }
+               return description;
+       }
+       else
+       {
+               // not a remote server that can be found, it must be me.
+               return Config->ServerDesc;
        }
 }
 
-
 /* XXX - We don't use WriteMode for this because WriteMode is very slow and
  * this isnt. Basically WriteMode has to iterate ALL the users 'n' times for
  * the number of modes provided, e.g. if you send WriteMode 'og' to write to
@@ -931,48 +126,32 @@ void WriteCommonExcept_NoFormat(userrec *u, const char* text)
  * uses the oper list, which means if you have 2000 users but only 5 opers,
  * it iterates 5 times.
  */
-void WriteOpers(const char* text, ...)
+void InspIRCd::WriteOpers(const char* text, ...)
 {
        char textbuffer[MAXBUF];
        va_list argsPtr;
 
-       if (!text)
-       {
-               log(DEFAULT,"*** BUG *** WriteOpers was given an invalid parameter");
-               return;
-       }
-
        va_start(argsPtr, text);
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
 
-       WriteOpers_NoFormat(textbuffer);
+       this->WriteOpers(std::string(textbuffer));
 }
 
-void WriteOpers_NoFormat(const char* text)
+void InspIRCd::WriteOpers(const std::string &text)
 {
-       if (!text)
-       {
-               log(DEFAULT,"*** BUG *** WriteOpers_NoFormat was given an invalid parameter");
-               return;
-       }
-
        for (std::vector<userrec*>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
        {
                userrec* a = *i;
-
-               if (IS_LOCAL(a))
+               if (IS_LOCAL(a) && a->modes[UM_SERVERNOTICE])
                {
-                       if (a->modes[UM_SERVERNOTICE])
-                       {
-                               // send server notices to all with +s
-                               WriteServ(a->fd,"NOTICE %s :%s",a->nick,text);
-                       }
+                       // send server notices to all with +s
+                       a->WriteServ("NOTICE %s :%s",a->nick,text.c_str());
                }
        }
 }
 
-void ServerNoticeAll(char* text, ...)
+void InspIRCd::ServerNoticeAll(char* text, ...)
 {
        if (!text)
                return;
@@ -984,16 +163,16 @@ void ServerNoticeAll(char* text, ...)
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
 
-       snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s",Config->ServerName,textbuffer);
+       snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s",ServerInstance->Config->ServerName,textbuffer);
 
        for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
-               userrec* t = (userrec*)(*i);
-               WriteServ_NoFormat(t->fd,formatbuffer);
+               userrec* t = *i;
+               t->WriteServ(std::string(formatbuffer));
        }
 }
 
-void ServerPrivmsgAll(char* text, ...)
+void InspIRCd::ServerPrivmsgAll(char* text, ...)
 {
        if (!text)
                return;
@@ -1005,16 +184,16 @@ void ServerPrivmsgAll(char* text, ...)
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
 
-       snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s",Config->ServerName,textbuffer);
+       snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s",ServerInstance->Config->ServerName,textbuffer);
 
        for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
-               userrec* t = (userrec*)(*i);
-               WriteServ_NoFormat(t->fd,formatbuffer);
+               userrec* t = *i;
+               t->WriteServ(std::string(formatbuffer));
        }
 }
 
-void WriteMode(const char* modes, int flags, const char* text, ...)
+void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...)
 {
        char textbuffer[MAXBUF];
        int modelen;
@@ -1065,62 +244,7 @@ void WriteMode(const char* modes, int flags, const char* text, ...)
 
                if (send_to_user)
                {
-                       WriteServ(t->fd,"NOTICE %s :%s",t->nick,textbuffer);
-               }
-       }
-}
-
-void NoticeAll(userrec *source, bool local_only, char* text, ...)
-{
-       char textbuffer[MAXBUF];
-       char formatbuffer[MAXBUF];
-       va_list argsPtr;
-
-       if ((!text) || (!source))
-       {
-               log(DEFAULT,"*** BUG *** NoticeAll was given an invalid parameter");
-               return;
-       }
-
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-
-       snprintf(formatbuffer,MAXBUF,"NOTICE $* :%s",textbuffer);
-
-       for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
-       {
-               userrec* t = (userrec*)(*i);
-               WriteFrom_NoFormat(t->fd,source,formatbuffer);
-       }
-}
-
-
-void WriteWallOps(userrec *source, bool local_only, char* text, ...)
-{
-       char textbuffer[MAXBUF];
-       char formatbuffer[MAXBUF];
-       va_list argsPtr;
-
-       if ((!text) || (!source))
-       {
-               log(DEFAULT,"*** BUG *** WriteOpers was given an invalid parameter");
-               return;
-       }
-
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-
-       snprintf(formatbuffer,MAXBUF,"WALLOPS :%s",textbuffer);
-
-       for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
-       {
-               userrec* t = (userrec*)(*i);
-
-               if ((IS_LOCAL(t)) && (t->modes[UM_WALLOPS]))
-               {
-                       WriteTo_NoFormat(source,t,formatbuffer);
+                       t->WriteServ("NOTICE %s :%s",t->nick,textbuffer);
                }
        }
 }
@@ -1145,7 +269,7 @@ void strlower(char *n)
 
 /* Find a user record by nickname and return a pointer to it */
 
-userrec* Find(const std::string &nick)
+userrec* InspIRCd::FindNick(const std::string &nick)
 {
        user_hash::iterator iter = clientlist.find(nick);
 
@@ -1156,7 +280,7 @@ userrec* Find(const std::string &nick)
        return iter->second;
 }
 
-userrec* Find(const char* nick)
+userrec* InspIRCd::FindNick(const char* nick)
 {
        user_hash::iterator iter;
 
@@ -1173,15 +297,12 @@ userrec* Find(const char* nick)
 
 /* find a channel record by channel name and return a pointer to it */
 
-chanrec* FindChan(const char* chan)
+chanrec* InspIRCd::FindChan(const char* chan)
 {
        chan_hash::iterator iter;
 
        if (!chan)
-       {
-               log(DEFAULT,"*** BUG *** Findchan was given an invalid parameter");
                return NULL;
-       }
 
        iter = chanlist.find(chan);
 
@@ -1192,247 +313,35 @@ chanrec* FindChan(const char* chan)
        return iter->second;
 }
 
-
-long GetMaxBans(char* name)
-{
-       std::string x;
-       for (std::map<std::string,int>::iterator n = Config->maxbans.begin(); n != Config->maxbans.end(); n++)
-       {
-               x = n->first;
-               if (match(name,x.c_str()))
-               {
-                       return n->second;
-               }
-       }
-       return 64;
-}
-
-void purge_empty_chans(userrec* u)
-{
-       std::vector<chanrec*> to_delete;
-
-       // firstly decrement the count on each channel
-       for (std::vector<ucrec*>::iterator f = u->chans.begin(); f != u->chans.end(); f++)
-       {
-               ucrec* uc = (ucrec*)(*f);
-               if (uc->channel)
-               {
-                       if (uc->channel->DelUser(u) == 0)
-                       {
-                               /* No users left in here, mark it for deletion */
-                               to_delete.push_back(uc->channel);
-                               uc->channel = NULL;
-                       }
-               }
-       }
-
-       log(DEBUG,"purge_empty_chans: %d channels to delete",to_delete.size());
-
-       for (std::vector<chanrec*>::iterator n = to_delete.begin(); n != to_delete.end(); n++)
-       {
-               chanrec* thischan = (chanrec*)*n;
-               chan_hash::iterator i2 = chanlist.find(thischan->name);
-               if (i2 != chanlist.end())
-               {
-                       FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(i2->second));
-                       DELETE(i2->second);
-                       chanlist.erase(i2);
-               }
-       }
-
-       if (*u->oper)
-               DeleteOper(u);
-}
-
-
-char* chanmodes(chanrec *chan, bool showkey)
-{
-       static char scratch[MAXBUF];
-       static char sparam[MAXBUF];
-       char* offset = scratch;
-       std::string extparam = "";
-
-       if (!chan)
-       {
-               log(DEFAULT,"*** BUG *** chanmodes was given an invalid parameter");
-               *scratch = '\0';
-               return scratch;
-       }
-
-       *scratch = '\0';
-       *sparam = '\0';
-
-       /* This was still iterating up to 190, chanrec::custom_modes is only 64 elements -- Om */
-       for(int n = 0; n < 64; n++)
-       {
-               if(chan->modes[n])
-               {
-                       *offset++ = n+65;
-                       extparam = "";
-                       switch (n)
-                       {
-                               case CM_KEY:
-                                       extparam = (showkey ? chan->key : "<key>");
-                               break;
-                               case CM_LIMIT:
-                                       extparam = ConvToStr(chan->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 = chan->GetModeParameter(n+65);
-                               break;
-                       }
-                       if (extparam != "")
-                       {
-                               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 + */
-
-void userlist(userrec *user,chanrec *c)
-{
-       if ((!c) || (!user))
-       {
-               log(DEFAULT,"*** BUG *** userlist was given an invalid parameter");
-               return;
-       }
-
-       char list[MAXBUF];
-       size_t dlen, curlen;
-
-       dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
-
-       int numusers = 0;
-       char* ptr = list + dlen;
-
-       CUList *ulist= c->GetUsers();
-
-       /* Improvement by Brain - this doesnt change in value, so why was it inside
-        * the loop?
-        */
-       bool has_user = c->HasUser(user);
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               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;
-               }
-
-               size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", cmode(i->second, c), i->second->nick);
-
-               curlen += ptrlen;
-               ptr += ptrlen;
-
-               numusers++;
-
-               if (curlen > (480-NICKMAX))
-               {
-                       /* list overflowed into multiple numerics */
-                       WriteServ_NoFormat(user->fd,list);
-
-                       /* reset our lengths */
-                       dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
-                       ptr = list + dlen;
-
-                       ptrlen = 0;
-                       numusers = 0;
-               }
-       }
-
-       /* if whats left in the list isnt empty, send it */
-       if (numusers)
-       {
-               WriteServ_NoFormat(user->fd,list);
-       }
-}
-
-/*
- * 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 usercount_i(chanrec *c)
+chanrec* InspIRCd::FindChan(const std::string &chan)
 {
-       int count = 0;
+       chan_hash::iterator iter = chanlist.find(chan);
 
-       if (!c)
-               return 0;
-
-       CUList *ulist= c->GetUsers();
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if (!(i->second->modes[UM_INVISIBLE]))
-                       count++;
-       }
-
-       return count;
-}
+       if (iter == chanlist.end())
+               /* Couldn't find it */
+               return NULL;
 
-int usercount(chanrec *c)
-{
-       return (c ? c->GetUserCounter() : 0);
+       return iter->second;
 }
 
 
-/* looks up a users password for their connection class (<ALLOW>/<DENY> tags)
- * NOTE: If the <ALLOW> or <DENY> tag specifies an ip, and this user resolves,
- * then their ip will be taken as 'priority' anyway, so for example,
- * <connect allow="127.0.0.1"> will match joe!bloggs@localhost
- */
-ConnectClass GetClass(userrec *user)
-{
-       for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++)
-       {
-               if ((match(inet_ntoa(user->ip4),i->host.c_str())) || (match(user->host,i->host.c_str())))
-               {
-                       return *i;
-               }
-       }
-
-       return *(Config->Classes.begin());
-}
-
 /*
  * sends out an error notice to all connected clients (not to be used
  * lightly!)
  */
-void send_error(char *s)
+void InspIRCd::SendError(const char *s)
 {
-       log(DEBUG,"send_error: %s",s);
-
-       for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+       for (std::vector<userrec*>::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
        {
                userrec* t = (userrec*)(*i);
-               if (t->registered == 7)
+               if (t->registered == REG_ALL)
                {
-                       WriteServ(t->fd,"NOTICE %s :%s",t->nick,s);
+                       t->WriteServ("NOTICE %s :%s",t->nick,s);
                }
                else
                {
                        // fix - unregistered connections receive ERROR, not NOTICE
-                       Write(t->fd,"ERROR :%s",s);
+                       t->Write("ERROR :%s",s);
                }
        }
 }
@@ -1459,11 +368,11 @@ void Error(int status)
                log(DEFAULT,"[%d] %s", i, strings[i]);
        }
        free(strings);
-       WriteOpers("*** SIGSEGV: Please see the ircd.log for backtrace and report the error to http://www.inspircd.org/bugtrack/");
+       ServerInstance->WriteOpers("*** SIGSEGV: Please see the ircd.log for backtrace and report the error to http://www.inspircd.org/bugtrack/");
 #else
        log(DEFAULT,"You do not have execinfo.h so i could not backtrace -- on FreeBSD, please install the libexecinfo port.");
 #endif
-       send_error("Somebody screwed up... Whoops. IRC Server terminating.");
+       ServerInstance->SendError("Somebody screwed up... Whoops. IRC Server terminating.");
        signal(SIGSEGV, SIG_DFL);
        if (raise(SIGSEGV) == -1)
        {
@@ -1473,38 +382,37 @@ void Error(int status)
 }
 
 // this function counts all users connected, wether they are registered or NOT.
-int usercnt(void)
+int InspIRCd::usercnt()
 {
        return clientlist.size();
 }
 
 // this counts only registered users, so that the percentages in /MAP don't mess up when users are sitting in an unregistered state
-int registered_usercount(void)
+int InspIRCd::registered_usercount()
 {
        int c = 0;
 
        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
        {
-               if (i->second->registered == 7) c++;
+               c += (i->second->registered == REG_ALL);
        }
 
        return c;
 }
 
-int usercount_invisible(void)
+int InspIRCd::usercount_invisible()
 {
        int c = 0;
 
        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
        {
-               if ((i->second->registered == 7) && (i->second->modes[UM_INVISIBLE]))
-                       c++;
+               c += ((i->second->registered == REG_ALL) && (i->second->modes[UM_INVISIBLE]));
        }
 
        return c;
 }
 
-int usercount_opers(void)
+int InspIRCd::usercount_opers()
 {
        int c = 0;
 
@@ -1516,33 +424,33 @@ int usercount_opers(void)
        return c;
 }
 
-int usercount_unknown(void)
+int InspIRCd::usercount_unknown()
 {
        int c = 0;
 
        for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
                userrec* t = (userrec*)(*i);
-               if (t->registered != 7)
+               if (t->registered != REG_ALL)
                        c++;
        }
 
        return c;
 }
 
-long chancount(void)
+long InspIRCd::chancount()
 {
        return chanlist.size();
 }
 
-long local_count()
+long InspIRCd::local_count()
 {
        int c = 0;
 
        for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
                userrec* t = (userrec*)(*i);
-               if (t->registered == 7)
+               if (t->registered == REG_ALL)
                        c++;
        }
 
@@ -1551,32 +459,32 @@ long local_count()
 
 void ShowMOTD(userrec *user)
 {
-       if (!Config->MOTD.size())
+       if (!ServerInstance->Config->MOTD.size())
        {
-               WriteServ(user->fd,"422 %s :Message of the day file is missing.",user->nick);
+               user->WriteServ("422 %s :Message of the day file is missing.",user->nick);
                return;
        }
-       WriteServ(user->fd,"375 %s :%s message of the day", user->nick, Config->ServerName);
+       user->WriteServ("375 %s :%s message of the day", user->nick, ServerInstance->Config->ServerName);
 
-       for (unsigned int i = 0; i < Config->MOTD.size(); i++)
-               WriteServ(user->fd,"372 %s :- %s",user->nick,Config->MOTD[i].c_str());
+       for (unsigned int i = 0; i < ServerInstance->Config->MOTD.size(); i++)
+               user->WriteServ("372 %s :- %s",user->nick,ServerInstance->Config->MOTD[i].c_str());
 
-       WriteServ(user->fd,"376 %s :End of message of the day.", user->nick);
+       user->WriteServ("376 %s :End of message of the day.", user->nick);
 }
 
 void ShowRULES(userrec *user)
 {
-       if (!Config->RULES.size())
+       if (!ServerInstance->Config->RULES.size())
        {
-               WriteServ(user->fd,"NOTICE %s :Rules file is missing.",user->nick);
+               user->WriteServ("NOTICE %s :Rules file is missing.",user->nick);
                return;
        }
-       WriteServ(user->fd,"NOTICE %s :%s rules",user->nick,Config->ServerName);
+       user->WriteServ("NOTICE %s :%s rules",user->nick,ServerInstance->Config->ServerName);
 
-       for (unsigned int i = 0; i < Config->RULES.size(); i++)
-               WriteServ(user->fd,"NOTICE %s :%s",user->nick,Config->RULES[i].c_str());
+       for (unsigned int i = 0; i < ServerInstance->Config->RULES.size(); i++)
+               user->WriteServ("NOTICE %s :%s",user->nick,ServerInstance->Config->RULES[i].c_str());
 
-       WriteServ(user->fd,"NOTICE %s :End of %s rules.",user->nick,Config->ServerName);
+       user->WriteServ("NOTICE %s :End of %s rules.",user->nick,ServerInstance->Config->ServerName);
 }
 
 // this returns 1 when all modules are satisfied that the user should be allowed onto the irc server
@@ -1584,12 +492,12 @@ void ShowRULES(userrec *user)
 // registration timeout maximum seconds)
 bool AllModulesReportReady(userrec* user)
 {
-       if (!Config->global_implementation[I_OnCheckReady])
+       if (!ServerInstance->Config->global_implementation[I_OnCheckReady])
                return true;
 
        for (int i = 0; i <= MODCOUNT; i++)
        {
-               if (Config->implement_lists[i][I_OnCheckReady])
+               if (ServerInstance->Config->implement_lists[i][I_OnCheckReady])
                {
                        int res = modules[i]->OnCheckReady(user);
                        if (!res)
@@ -1772,69 +680,33 @@ bool IsValidChannelName(const char *chname)
        return true;
 }
 
-inline int charlcat(char* x,char y,int z)
-{
-       char* x__n = x;
-       int v = 0;
-
-       while(*x__n++)
-               v++;
-
-       if (v < z - 1)
-       {
-               *--x__n = y;
-               *++x__n = 0;
-       }
-
-       return v;
-}
-
-bool charremove(char* mp, char remove)
-{
-       char* mptr = mp;
-       bool shift_down = false;
-
-       while (*mptr)
-       {
-               if (*mptr == remove)
-               shift_down = true;
-
-               if (shift_down)
-                       *mptr = *(mptr+1);
-
-               mptr++;
-       }
-
-       return shift_down;
-}
-
 void OpenLog(char** argv, int argc)
 {
        if (!*LOG_FILE)
        {
-               if (Config->logpath == "")
+               if (ServerInstance->Config->logpath == "")
                {
-                       Config->logpath = GetFullProgDir(argv,argc) + "/ircd.log";
+                       ServerInstance->Config->logpath = GetFullProgDir(argv,argc) + "/ircd.log";
                }
        }
        else
        {
-               Config->log_file = fopen(LOG_FILE,"a+");
+               ServerInstance->Config->log_file = fopen(LOG_FILE,"a+");
 
-               if (!Config->log_file)
+               if (!ServerInstance->Config->log_file)
                {
-                       printf("ERROR: Could not write to logfile %s, bailing!\n\n",Config->logpath.c_str());
+                       printf("ERROR: Could not write to logfile %s, bailing!\n\n",ServerInstance->Config->logpath.c_str());
                        Exit(ERROR);
                }
                
                return;
        }
 
-       Config->log_file = fopen(Config->logpath.c_str(),"a+");
+       ServerInstance->Config->log_file = fopen(ServerInstance->Config->logpath.c_str(),"a+");
 
-       if (!Config->log_file)
+       if (!ServerInstance->Config->log_file)
        {
-               printf("ERROR: Could not write to logfile %s, bailing!\n\n",Config->logpath.c_str());
+               printf("ERROR: Could not write to logfile %s, bailing!\n\n",ServerInstance->Config->logpath.c_str());
                Exit(ERROR);
        }
 }
@@ -1851,10 +723,10 @@ void CheckRoot()
 
 void CheckDie()
 {
-       if (*Config->DieValue)
+       if (*ServerInstance->Config->DieValue)
        {
-               printf("WARNING: %s\n\n",Config->DieValue);
-               log(DEFAULT,"Uh-Oh, somebody didn't read their config file: '%s'",Config->DieValue);
+               printf("WARNING: %s\n\n",ServerInstance->Config->DieValue);
+               log(DEFAULT,"Uh-Oh, somebody didn't read their config file: '%s'",ServerInstance->Config->DieValue);
                Exit(ERROR);
        }
 }
@@ -1863,12 +735,12 @@ void CheckDie()
 void LoadAllModules(InspIRCd* ServerInstance)
 {
        char configToken[MAXBUF];
-       Config->module_names.clear();
+       ServerInstance->Config->module_names.clear();
        MODCOUNT = -1;
 
-       for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "module"); count++)
+       for (int count = 0; count < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "module"); count++)
        {
-               Config->ConfValue(Config->config_data, "module","name",count,configToken,MAXBUF);
+               ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "module","name",count,configToken,MAXBUF);
                printf("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n",configToken);
                
                if (!ServerInstance->LoadModule(configToken))