]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/helperfuncs.cpp
Decide that it wasn't quite appropriate :(
[user/henk/code/inspircd.git] / src / helperfuncs.cpp
index 897f9f890e0b1144cdd075375629a0807a8bbd49..6b7178e225b9f9b9b25f8bcd54e4cf15801531f5 100644 (file)
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *                <Craig@chatspike.net>
@@ -19,7 +19,6 @@ using namespace std;
 #include "inspircd_config.h"
 #include "inspircd.h"
 #include "inspircd_io.h"
-#include "inspircd_util.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/errno.h>
@@ -48,67 +47,43 @@ using namespace std;
 #include "inspstring.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
+#include "typedefs.h"
 
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
-
+extern ServerConfig *Config;
+extern InspIRCd* ServerInstance;
 extern time_t TIME;
-extern bool nofork;
 extern char lowermap[255];
-extern char ServerName[MAXBUF];
-extern char Network[MAXBUF];
-extern char ServerDesc[MAXBUF];
-extern char list[MAXBUF];
-
-extern int debugging;
-extern int LogLevel;
-
-extern std::stringstream config_f;
-
-
-
-extern FILE *log_file;
-extern userrec* fd_ref_table[65536];
-
-extern int statsAccept, statsRefused, statsUnknown, statsCollisions, statsDns, statsDnsGood, statsDnsBad, statsConnects, statsSent, statsRecv;
-
-static char already_sent[65536];
+static char list[MAXBUF];
+extern userrec* fd_ref_table[MAX_DESCRIPTORS];
+static char already_sent[MAX_DESCRIPTORS];
 extern std::vector<userrec*> all_opers;
-
-extern ClassVector Classes;
-
-typedef nspace::hash_map<std::string, userrec*, nspace::hash<string>, irc::StrHashComp> user_hash;
-typedef nspace::hash_map<std::string, chanrec*, nspace::hash<string>, irc::StrHashComp> chan_hash;
-typedef std::deque<command_t> command_table;
-
 extern user_hash clientlist;
 extern chan_hash chanlist;
-extern command_table cmdlist;
-extern file_cache MOTD;
-extern file_cache RULES;
+
+extern std::vector<userrec*> local_users;
 
 void log(int level,char *text, ...)
 {
-        char textbuffer[MAXBUF];
         va_list argsPtr;
-        time_t rawtime;
         struct tm * timeinfo;
-        if (level < LogLevel)
+        if (level < Config->LogLevel)
                 return;
+       char textbuffer[MAXBUF];
+        timeinfo = localtime(&TIME);
 
-        time(&rawtime);
-        timeinfo = localtime (&rawtime);
-
-        if (log_file)
+        if (Config->log_file)
         {
-                char b[MAXBUF];
+                char b[26];
                 va_start (argsPtr, text);
                 vsnprintf(textbuffer, MAXBUF, text, argsPtr);
                 va_end(argsPtr);
-                strlcpy(b,asctime(timeinfo),MAXBUF);
+                strlcpy(b,asctime(timeinfo),26);
                 b[24] = ':';    // we know this is the end of the time string
-                fprintf(log_file,"%s %s\n",b,textbuffer);
-                if (nofork)
+               if (Config->log_file)
+                       fprintf(Config->log_file,"%s %s\n",b,textbuffer);
+                if (Config->nofork)
                 {
                         // nofork enabled? display it on terminal too
                         printf("%s %s\n",b,textbuffer);
@@ -130,7 +105,7 @@ void readfile(file_cache &F, const char* fname)
                 {
                         fgets(linebuf,sizeof(linebuf),file);
                         linebuf[strlen(linebuf)-1]='\0';
-                        if (linebuf[0] == 0)
+                        if (!*linebuf)
                         {
                                 strcpy(linebuf,"  ");
                         }
@@ -148,19 +123,47 @@ void readfile(file_cache &F, const char* fname)
         log(DEBUG,"readfile: loaded %s, %lu lines",fname,(unsigned long)F.size());
 }
 
+void Write_NoFormat(int sock, const char *text)
+{
+       if ((sock < 0) || (!text) || (sock > MAX_DESCRIPTORS))
+               return;
+
+       char tb[MAXBUF];
+       int bytes = snprintf(tb,MAXBUF,"%s\r\n",text);
+       chop(tb);
+       if (fd_ref_table[sock])
+       {
+               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 cought: %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!!!");
+}
+
 void Write(int sock,char *text, ...)
 {
-        if (sock < 0)
+        if ((sock < 0) || (sock > MAX_DESCRIPTORS))
                 return;
         if (!text)
         {
                 log(DEFAULT,"*** BUG *** Write was given an invalid parameter");
                 return;
         }
-        char textbuffer[MAXBUF];
         va_list argsPtr;
-        char tb[MAXBUF];
-
+       char textbuffer[MAXBUF],tb[MAXBUF];
         va_start (argsPtr, text);
         vsnprintf(textbuffer, MAXBUF, text, argsPtr);
         va_end(argsPtr);
@@ -168,68 +171,160 @@ void Write(int sock,char *text, ...)
         chop(tb);
         if (fd_ref_table[sock])
         {
-                int MOD_RESULT = 0;
-                FOREACH_RESULT(OnRawSocketWrite(sock,tb,bytes));
-                fd_ref_table[sock]->AddWriteBuf(tb);
-                statsSent += bytes;
+               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 cought: %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!!!");
 }
 
+void WriteServ_NoFormat(int sock, const char* text)
+{
+       if ((sock < 0) || (!text) || (sock > MAX_DESCRIPTORS))
+               return;
+       char tb[MAXBUF];
+       int bytes = snprintf(tb,MAXBUF,":%s %s\r\n",Config->ServerName,text);
+       chop(tb);
+       if (fd_ref_table[sock])
+       {
+               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 cought: %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 a server formatted numeric response to a single socket */
 
 void WriteServ(int sock, char* text, ...)
 {
-        if (sock < 0)
+        if ((sock < 0) || (sock > MAX_DESCRIPTORS))
                 return;
         if (!text)
         {
                 log(DEFAULT,"*** BUG *** WriteServ was given an invalid parameter");
                 return;
         }
-        char textbuffer[MAXBUF],tb[MAXBUF];
         va_list argsPtr;
         va_start (argsPtr, text);
-
+       char textbuffer[MAXBUF],tb[MAXBUF];
         vsnprintf(textbuffer, MAXBUF, text, argsPtr);
         va_end(argsPtr);
-        int bytes = snprintf(tb,MAXBUF,":%s %s\r\n",ServerName,textbuffer);
+        int bytes = snprintf(tb,MAXBUF,":%s %s\r\n",Config->ServerName,textbuffer);
         chop(tb);
         if (fd_ref_table[sock])
         {
-                int MOD_RESULT = 0;
-                FOREACH_RESULT(OnRawSocketWrite(sock,tb,bytes));
-                fd_ref_table[sock]->AddWriteBuf(tb);
-                statsSent += bytes;
+               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 cought: %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!!!");
 }
 
+void WriteFrom_NoFormat(int sock, userrec *user, const char* text)
+{
+       if ((sock < 0) || (!text) || (!user) || (sock > MAX_DESCRIPTORS))
+               return;
+       char tb[MAXBUF];
+       int bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),text);
+       chop(tb);
+       if (fd_ref_table[sock])
+       {
+               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 cought: %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, ...)
 {
-        if (sock < 0)
+        if ((sock < 0) || (sock > MAX_DESCRIPTORS))
                 return;
         if ((!text) || (!user))
         {
                 log(DEFAULT,"*** BUG *** WriteFrom was given an invalid parameter");
                 return;
         }
-        char textbuffer[MAXBUF],tb[MAXBUF];
         va_list argsPtr;
         va_start (argsPtr, text);
-
+       char textbuffer[MAXBUF],tb[MAXBUF];
         vsnprintf(textbuffer, MAXBUF, text, argsPtr);
         va_end(argsPtr);
-        int bytes = snprintf(tb,MAXBUF,":%s!%s@%s %s\r\n",user->nick,user->ident,user->dhost,textbuffer);
+        int bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),textbuffer);
         chop(tb);
         if (fd_ref_table[sock])
         {
-                int MOD_RESULT = 0;
-                FOREACH_RESULT(OnRawSocketWrite(sock,tb,bytes));
-                fd_ref_table[sock]->AddWriteBuf(tb);
-                statsSent += bytes;
+               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 cought: %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!!!");
 }
@@ -243,9 +338,9 @@ void WriteTo(userrec *source, userrec *dest,char *data, ...)
                 log(DEFAULT,"*** BUG *** WriteTo was given an invalid parameter");
                 return;
         }
-        if (dest->fd == FD_MAGIC_NUMBER)
+        if (!IS_LOCAL(dest))
                 return;
-        char textbuffer[MAXBUF],tb[MAXBUF];
+       char textbuffer[MAXBUF],tb[MAXBUF];
         va_list argsPtr;
         va_start (argsPtr, data);
         vsnprintf(textbuffer, MAXBUF, data, argsPtr);
@@ -255,14 +350,28 @@ void WriteTo(userrec *source, userrec *dest,char *data, ...)
         // if no source given send it from the server.
         if (!source)
         {
-                WriteServ(dest->fd,":%s %s",ServerName,textbuffer);
+                WriteServ_NoFormat(dest->fd,textbuffer);
         }
         else
         {
-                WriteFrom(dest->fd,source,"%s",textbuffer);
+                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!) */
 
@@ -279,16 +388,34 @@ void WriteChannel(chanrec* Ptr, userrec* user, char* text, ...)
         vsnprintf(textbuffer, MAXBUF, text, argsPtr);
         va_end(argsPtr);
 
-        std::vector<char*> *ulist = Ptr->GetUsers();
-        for (unsigned int j = 0; j < ulist->size(); j++)
+        std::map<char*,char*> *ulist= Ptr->GetUsers();
+       for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
         {
-                char* o = (*ulist)[j];
+                char* o = i->second;
                 userrec* otheruser = (userrec*)o;
                 if (otheruser->fd != FD_MAGIC_NUMBER)
-                        WriteTo(user,otheruser,"%s",textbuffer);
+                        WriteTo_NoFormat(user,otheruser,textbuffer);
         }
 }
 
+void WriteChannel_NoFormat(chanrec* Ptr, userrec* user, const char* text)
+{
+        if ((!Ptr) || (!user) || (!text))
+        {
+                log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter");
+                return;
+        }
+        std::map<char*,char*> *ulist= Ptr->GetUsers();
+        for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
+        {
+                char* o = i->second;
+                userrec* otheruser = (userrec*)o;
+                if (otheruser->fd != FD_MAGIC_NUMBER)
+                        WriteTo_NoFormat(user,otheruser,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 */
@@ -306,25 +433,53 @@ void WriteChannelLocal(chanrec* Ptr, userrec* user, char* text, ...)
         vsnprintf(textbuffer, MAXBUF, text, argsPtr);
         va_end(argsPtr);
 
-        std::vector<char*> *ulist = Ptr->GetUsers();
-        for (unsigned int j = 0; j < ulist->size(); j++)
+        std::map<char*,char*> *ulist= Ptr->GetUsers();
+       for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
+        {
+                char* o = i->second;
+                userrec* otheruser = (userrec*)o;
+                if ((otheruser->fd != FD_MAGIC_NUMBER) && (otheruser != user))
+                {
+                        if (!user)
+                        {
+                                WriteServ_NoFormat(otheruser->fd,textbuffer);
+                        }
+                        else
+                        {
+                                WriteTo_NoFormat(user,otheruser,textbuffer);
+                        }
+                }
+        }
+}
+
+void WriteChannelLocal_NoFormat(chanrec* Ptr, userrec* user, const char* text)
+{
+        if ((!Ptr) || (!text))
+        {
+                log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter");
+                return;
+        }
+        std::map<char*,char*> *ulist= Ptr->GetUsers();
+        for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
         {
-                char* o = (*ulist)[j];
+                char* o = i->second;
                 userrec* otheruser = (userrec*)o;
-                if ((otheruser->fd != FD_MAGIC_NUMBER) && (otheruser->fd != -1) && (otheruser != user))
+                if ((otheruser->fd != FD_MAGIC_NUMBER) && (otheruser != user))
                 {
                         if (!user)
                         {
-                                WriteServ(otheruser->fd,"%s",textbuffer);
+                                WriteServ_NoFormat(otheruser->fd,text);
                         }
                         else
                         {
-                                WriteTo(user,otheruser,"%s",textbuffer);
+                                WriteTo_NoFormat(user,otheruser,text);
                         }
                 }
         }
 }
 
+
+
 void WriteChannelWithServ(char* ServName, chanrec* Ptr, char* text, ...)
 {
         if ((!Ptr) || (!text))
@@ -339,20 +494,39 @@ void WriteChannelWithServ(char* ServName, chanrec* Ptr, char* text, ...)
         va_end(argsPtr);
 
 
-        std::vector<char*> *ulist = Ptr->GetUsers();
-        for (unsigned int j = 0; j < ulist->size(); j++)
+        std::map<char*,char*> *ulist= Ptr->GetUsers();
+       for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
         {
-                char* o = (*ulist)[j];
+                char* o = i->second;
                 userrec* otheruser = (userrec*)o;
-                if (otheruser->fd != FD_MAGIC_NUMBER)
-                        WriteServ(otheruser->fd,"%s",textbuffer);
+                if (IS_LOCAL(otheruser))
+                        WriteServ_NoFormat(otheruser->fd,textbuffer);
         }
 }
 
+void WriteChannelWithServ_NoFormat(char* ServName, chanrec* Ptr, const char* text)
+{
+        if ((!Ptr) || (!text))
+        {
+                log(DEFAULT,"*** BUG *** WriteChannelWithServ was given an invalid parameter");
+                return;
+        }
+        std::map<char*,char*> *ulist= Ptr->GetUsers();
+        for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
+        {
+                char* o = i->second;
+                userrec* otheruser = (userrec*)o;
+                if (IS_LOCAL(otheruser))
+                        WriteServ_NoFormat(otheruser->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* text, ...)
+void ChanExceptSender(chanrec* Ptr, userrec* user, char status, char* text, ...)
 {
         if ((!Ptr) || (!user) || (!text))
         {
@@ -365,27 +539,75 @@ void ChanExceptSender(chanrec* Ptr, userrec* user, char* text, ...)
         vsnprintf(textbuffer, MAXBUF, text, argsPtr);
         va_end(argsPtr);
 
-        std::vector<char*> *ulist = Ptr->GetUsers();
-        for (unsigned int j = 0; j < ulist->size(); j++)
+        std::map<char*,char*> *ulist;
+       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 (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
         {
-                char* o = (*ulist)[j];
+                char* o = i->second;
                 userrec* otheruser = (userrec*)o;
-                if ((otheruser->fd != FD_MAGIC_NUMBER) && (user != otheruser))
-                        WriteFrom(otheruser->fd,user,"%s",textbuffer);
+                if ((IS_LOCAL(otheruser)) && (user != otheruser))
+                        WriteFrom_NoFormat(otheruser->fd,user,textbuffer);
+        }
+}
+
+void ChanExceptSender_NoFormat(chanrec* Ptr, userrec* user, char status, const char* text)
+{
+        if ((!Ptr) || (!user) || (!text))
+        {
+                log(DEFAULT,"*** BUG *** ChanExceptSender was given an invalid parameter");
+                return;
+        }
+        std::map<char*,char*> *ulist;
+        switch (status)
+        {
+                case '@':
+                        ulist = Ptr->GetOppedUsers();
+                break;  
+                case '%':
+                        ulist = Ptr->GetHalfoppedUsers();
+                break;
+                case '+':
+                        ulist = Ptr->GetVoicedUsers();
+                break;
+                default:
+                       ulist = Ptr->GetUsers();
+               break;
+        }
+        for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
+        {
+                char* o = i->second;
+                userrec* otheruser = (userrec*)o;
+                if ((IS_LOCAL(otheruser)) && (user != otheruser))
+                        WriteFrom_NoFormat(otheruser->fd,user,text);
         }
 }
 
 std::string GetServerDescription(char* servername)
 {
        std::string description = "";
-       FOREACH_MOD OnGetServerDescription(servername,description);
+       FOREACH_MOD(I_OnGetServerDescription,OnGetServerDescription(servername,description));
        if (description != "")
        {
                return description;
        }
        else
        {
-               return ServerDesc; // not a remote server that can be found, it must be me.
+               return Config->ServerDesc; // not a remote server that can be found, it must be me.
        }
 }
 
@@ -412,23 +634,68 @@ void WriteCommon(userrec *u, char* text, ...)
         va_end(argsPtr);
 
         // FIX: Stops a message going to the same person more than once
-        memset(&already_sent,0,65536);
+        memset(&already_sent,0,MAX_DESCRIPTORS);
 
         bool sent_to_at_least_one = false;
 
-        for (unsigned int i = 0; i < u->chans.size(); i++)
+       unsigned int y = u->chans.size();
+        for (unsigned int i = 0; i < y; i++)
+        {
+                if (u->chans[i].channel)
+                {
+                        std::map<char*,char*> *ulist= u->chans[i].channel->GetUsers();
+                       for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
+                        {
+                                char* o = i->second;
+                                userrec* otheruser = (userrec*)o;
+                                if ((otheruser->fd > -1) && (!already_sent[otheruser->fd]))
+                                {
+                                        already_sent[otheruser->fd] = 1;
+                                        WriteFrom_NoFormat(otheruser->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)
+{
+        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;
+        }
+        // FIX: Stops a message going to the same person more than once
+        memset(&already_sent,0,MAX_DESCRIPTORS);
+                
+        bool sent_to_at_least_one = false;
+                        
+        unsigned int y = u->chans.size();
+        for (unsigned int i = 0; i < y; i++)
         {
                 if (u->chans[i].channel)
                 {
-                        std::vector<char*> *ulist = u->chans[i].channel->GetUsers();
-                        for (unsigned int j = 0; j < ulist->size(); j++)
+                        std::map<char*,char*> *ulist= u->chans[i].channel->GetUsers();
+                        for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
                         {
-                                char* o = (*ulist)[j];
+                                char* o = i->second;
                                 userrec* otheruser = (userrec*)o;
-                                if ((otheruser->fd > 0) && (!already_sent[otheruser->fd]))
+                                if ((otheruser->fd > -1) && (!already_sent[otheruser->fd]))
                                 {
                                         already_sent[otheruser->fd] = 1;
-                                        WriteFrom(otheruser->fd,u,"%s",textbuffer);
+                                        WriteFrom_NoFormat(otheruser->fd,u,text);
                                         sent_to_at_least_one = true;
                                 }
                         }
@@ -438,10 +705,11 @@ void WriteCommon(userrec *u, char* text, ...)
         // receives their OWN message for WriteCommon
         if (!sent_to_at_least_one)
         {
-                WriteFrom(u->fd,u,"%s",textbuffer);
+                WriteFrom_NoFormat(u->fd,u,text);
         }
 }
 
+
 /* 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 */
 
@@ -459,28 +727,63 @@ void WriteCommonExcept(userrec *u, char* text, ...)
         }
 
         char textbuffer[MAXBUF];
+       char oper_quit[MAXBUF];
+       bool quit_munge = false;
+
         va_list argsPtr;
         va_start (argsPtr, text);
-        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+        int total = vsnprintf(textbuffer, MAXBUF, text, argsPtr);
         va_end(argsPtr);
 
-        memset(&already_sent,0,65536);
+       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;
+                       split >> server_one;
+                       split >> server_two;
+                       if ((FindServerName(server_one)) && (FindServerName(server_two)))
+                       {
+                               strlcpy(oper_quit,textbuffer,MAXBUF);
+                               strlcpy(check,"*.net *.split",MAXQUIT);
+                               quit_munge = true;
+                       }
+               }
+       }
 
-        for (unsigned int i = 0; i < u->chans.size(); i++)
+        memset(&already_sent,0,MAX_DESCRIPTORS);
+
+       unsigned int y = u->chans.size();
+        for (unsigned int i = 0; i < y; i++)
         {
                 if (u->chans[i].channel)
                 {
-                        std::vector<char*> *ulist = u->chans[i].channel->GetUsers();
-                        for (unsigned int j = 0; j < ulist->size(); j++)
+                        std::map<char*,char*> *ulist= u->chans[i].channel->GetUsers();
+                       for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
                         {
-                                char* o = (*ulist)[j];
+                                char* o = i->second;
                                 userrec* otheruser = (userrec*)o;
                                 if (u != otheruser)
                                 {
-                                        if ((otheruser->fd > 0) && (!already_sent[otheruser->fd]))
+                                        if ((otheruser->fd > -1) && (!already_sent[otheruser->fd]))
                                         {
                                                 already_sent[otheruser->fd] = 1;
-                                                WriteFrom(otheruser->fd,u,"%s",textbuffer);
+                                               if (quit_munge)
+                                               {
+                                                       if (*otheruser->oper)
+                                                       {
+                                                               WriteFrom_NoFormat(otheruser->fd,u,oper_quit);
+                                                       }
+                                                       else
+                                                       {
+                                                               WriteFrom_NoFormat(otheruser->fd,u,textbuffer);
+                                                       }
+                                               }
+                                               else WriteFrom_NoFormat(otheruser->fd,u,textbuffer);
                                         }
                                 }
                         }
@@ -488,6 +791,46 @@ void WriteCommonExcept(userrec *u, char* text, ...)
         }
 }
 
+void WriteCommonExcept_NoFormat(userrec *u, const char* text)
+{
+        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;
+        }
+
+        memset(&already_sent,0,MAX_DESCRIPTORS);
+
+        unsigned int y = u->chans.size();
+        for (unsigned int i = 0; i < y; i++)
+        {
+                if (u->chans[i].channel)
+                {
+                        std::map<char*,char*> *ulist= u->chans[i].channel->GetUsers();
+                        for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
+                        {
+                                char* o = i->second;
+                                userrec* otheruser = (userrec*)o;
+                                if (u != otheruser)
+                                {
+                                        if ((otheruser->fd > -1) && (!already_sent[otheruser->fd]))
+                                        {
+                                                already_sent[otheruser->fd] = 1;
+                                                WriteFrom_NoFormat(otheruser->fd,u,text);
+                                        }
+                                }
+                        }
+                }
+        }
+}
+
+
+
 void WriteOpers(char* text, ...)
 {
         if (!text)
@@ -505,7 +848,7 @@ void WriteOpers(char* text, ...)
         for (std::vector<userrec*>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
         {
                 userrec* a = *i;
-                if ((a) && (a->fd != FD_MAGIC_NUMBER))
+                if (IS_LOCAL(a))
                 {
                         if (strchr(a->modes,'s'))
                         {
@@ -527,12 +870,10 @@ void ServerNoticeAll(char* text, ...)
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
 
-       for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+       for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
-               if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER))
-               {
-                       WriteServ(i->second->fd,"NOTICE $%s :%s",ServerName,textbuffer);
-               }
+               userrec* t = (userrec*)(*i);
+               WriteServ(t->fd,"NOTICE $%s :%s",Config->ServerName,textbuffer);
        }
 }
 
@@ -547,84 +888,13 @@ void ServerPrivmsgAll(char* text, ...)
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
 
-       for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+       for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
-               if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER))
-               {
-                       WriteServ(i->second->fd,"PRIVMSG $%s :%s",ServerName,textbuffer);
-               }
+               userrec* t = (userrec*)(*i);
+               WriteServ(t->fd,"PRIVMSG $%s :%s",Config->ServerName,textbuffer);
        }
 }
 
-void NoticeAllOpers(userrec *source, bool local_only, char* text, ...)
-{
-        if ((!text) || (!source))
-        {
-                log(DEFAULT,"*** BUG *** NoticeAllOpers was given an invalid parameter");
-                return;
-        }
-
-        char textbuffer[MAXBUF];
-        va_list argsPtr;
-        va_start (argsPtr, text);
-        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-        va_end(argsPtr);
-
-        for (std::vector<userrec*>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
-        {
-                userrec* a = *i;
-                if ((a) && (a->fd != FD_MAGIC_NUMBER))
-                {
-                        if (strchr(a->modes,'s'))
-                        {
-                                // send server notices to all with +s
-                                WriteServ(a->fd,"NOTICE %s :*** Notice From %s: %s",a->nick,source->nick,textbuffer);
-                        }
-                }
-        }
-
-}
-// returns TRUE of any users on channel C occupy server 'servername'.
-
-bool ChanAnyOnThisServer(chanrec *c,char* servername)
-{
-        log(DEBUG,"ChanAnyOnThisServer");
-
-        std::vector<char*> *ulist = c->GetUsers();
-        for (unsigned int j = 0; j < ulist->size(); j++)
-        {
-                char* o = (*ulist)[j];
-                userrec* user = (userrec*)o;
-                if (!strcasecmp(user->server,servername))
-                        return true;
-        }
-        return false;
-}
-
-// returns true if user 'u' shares any common channels with any users on server 'servername'
-
-bool CommonOnThisServer(userrec* u,const char* servername)
-{
-        log(DEBUG,"ChanAnyOnThisServer");
-
-        for (unsigned int i = 0; i < u->chans.size(); i++)
-        {
-                if (u->chans[i].channel)
-                {
-                        std::vector<char*> *ulist = u->chans[i].channel->GetUsers();
-                        for (unsigned int j = 0; j < ulist->size(); j++)
-                        {
-                                char* o = (*ulist)[j];
-                                userrec* user = (userrec*)o;
-                                if (!strcasecmp(user->server,servername))
-                                        return true;
-                        }
-                }
-        }
-        return false;
-}
-
-
 void WriteMode(const char* modes, int flags, const char* text, ...)
 {
         if ((!text) || (!modes) || (!flags))
@@ -640,41 +910,37 @@ void WriteMode(const char* modes, int flags, const char* text, ...)
         va_end(argsPtr);
         int modelen = strlen(modes);
 
-        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+        for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
         {
-                if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER))
+               userrec* t = (userrec*)(*i);
+                bool send_to_user = false;
+                if (flags == WM_AND)
                 {
-                        bool send_to_user = false;
-
-                        if (flags == WM_AND)
+                        send_to_user = true;
+                        for (int n = 0; n < modelen; n++)
                         {
-                                send_to_user = true;
-                                for (int n = 0; n < modelen; n++)
+                                if (!hasumode(t,modes[n]))
                                 {
-                                        if (!hasumode(i->second,modes[n]))
-                                        {
-                                                send_to_user = false;
-                                                break;
-                                        }
+                                        send_to_user = false;
+                                        break;
                                 }
                         }
-                        else if (flags == WM_OR)
+                }
+                else if (flags == WM_OR)
+                {
+                        send_to_user = false;
+                        for (int n = 0; n < modelen; n++)
                         {
-                                send_to_user = false;
-                                for (int n = 0; n < modelen; n++)
+                                if (hasumode(t,modes[n]))
                                 {
-                                        if (hasumode(i->second,modes[n]))
-                                        {
-                                                send_to_user = true;
-                                                break;
-                                        }
+                                        send_to_user = true;
+                                        break;
                                 }
                         }
-
-                        if (send_to_user)
-                        {
-                                WriteServ(i->second->fd,"NOTICE %s :%s",i->second->nick,textbuffer);
-                        }
+                }
+                if (send_to_user)
+                {
+                        WriteServ(t->fd,"NOTICE %s :%s",t->nick,textbuffer);
                 }
         }
 }
@@ -693,12 +959,10 @@ void NoticeAll(userrec *source, bool local_only, char* text, ...)
         vsnprintf(textbuffer, MAXBUF, text, argsPtr);
         va_end(argsPtr);
 
-        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+        for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
         {
-                if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER))
-                {
-                        WriteFrom(i->second->fd,source,"NOTICE $* :%s",textbuffer);
-                }
+                userrec* t = (userrec*)(*i);
+                WriteFrom(t->fd,source,"NOTICE $* :%s",textbuffer);
         }
 
 }
@@ -718,14 +982,12 @@ void WriteWallOps(userrec *source, bool local_only, char* text, ...)
         vsnprintf(textbuffer, MAXBUF, text, argsPtr);
         va_end(argsPtr);
 
-        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+        for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
         {
-                if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER))
+               userrec* t = (userrec*)(*i);
+                if ((IS_LOCAL(t)) && (strchr(t->modes,'w')))
                 {
-                        if (strchr(i->second->modes,'w'))
-                        {
-                                WriteTo(source,i->second,"WALLOPS :%s",textbuffer);
-                        }
+                        WriteTo(source,t,"WALLOPS :%s",textbuffer);
                 }
         }
 }
@@ -762,6 +1024,18 @@ userrec* Find(std::string nick)
         return iter->second;
 }
 
+userrec* Find(const char* nick)
+{
+       if (!nick)
+               return NULL;
+       user_hash::iterator iter = clientlist.find(nick);
+       
+       if (iter == clientlist.end())
+               return NULL;
+
+       return iter->second;
+}
+
 /* find a channel record by channel name and return a pointer to it */
 
 chanrec* FindChan(const char* chan)
@@ -785,12 +1059,12 @@ chanrec* FindChan(const char* chan)
 long GetMaxBans(char* name)
 {
         char CM[MAXBUF];
-        for (int count = 0; count < ConfValueEnum("banlist",&config_f); count++)
+        for (int count = 0; count < Config->ConfValueEnum("banlist",&Config->config_f); count++)
         {
-                ConfValue("banlist","chan",count,CM,&config_f);
+               Config->ConfValue("banlist","chan",count,CM,&Config->config_f);
                 if (match(name,CM))
                 {
-                        ConfValue("banlist","limit",count,CM,&config_f);
+                        Config->ConfValue("banlist","limit",count,CM,&Config->config_f);
                         return atoi(CM);
                 }
         }
@@ -800,7 +1074,7 @@ long GetMaxBans(char* name)
 void purge_empty_chans(userrec* u)
 {
 
-        int go_again = 1, purge = 0;
+        int purge = 0;
 
         // firstly decrement the count on each channel
         for (unsigned int f = 0; f < u->chans.size(); f++)
@@ -823,9 +1097,11 @@ void purge_empty_chans(userrec* u)
                                 {
                                         log(DEBUG,"del_channel: destroyed: %s",i2->second->name);
                                         if (i2->second)
+                                       {
+                                               FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(i2->second));
                                                 delete i2->second;
+                                       }
                                         chanlist.erase(i2);
-                                        go_again = 1;
                                         purge++;
                                         u->chans[i].channel = NULL;
                                 }
@@ -842,57 +1118,41 @@ void purge_empty_chans(userrec* u)
 }
 
 
-char scratch[MAXBUF];
-char sparam[MAXBUF];
-
-char* chanmodes(chanrec *chan)
+char* chanmodes(chanrec *chan, bool showkey)
 {
+       static char scratch[MAXBUF];
+       static char sparam[MAXBUF];
+       char* offset = scratch;
+
         if (!chan)
         {
                 log(DEFAULT,"*** BUG *** chanmodes was given an invalid parameter");
-                strcpy(scratch,"");
+                *scratch = '\0';
                 return scratch;
         }
 
-        strcpy(scratch,"");
-        strcpy(sparam,"");
+        *scratch = '\0';
+        *sparam = '\0';
         if (chan->binarymodes & CM_NOEXTERNAL)
-        {
-                strlcat(scratch,"n",MAXMODES);
-        }
+               *offset++ = 'n';
         if (chan->binarymodes & CM_TOPICLOCK)
-        {
-                strlcat(scratch,"t",MAXMODES);
-        }
-        if (chan->key[0])
-        {
-                strlcat(scratch,"k",MAXMODES);
-        }
+               *offset++ = 't';
+        if (*chan->key)
+               *offset++ = 'k';
         if (chan->limit)
-        {
-                strlcat(scratch,"l",MAXMODES);
-        }
+               *offset++ = 'l';
         if (chan->binarymodes & CM_INVITEONLY)
-        {
-                strlcat(scratch,"i",MAXMODES);
-        }
+               *offset++ = 'i';
         if (chan->binarymodes & CM_MODERATED)
-        {
-                strlcat(scratch,"m",MAXMODES);
-        }
+               *offset++ = 'm';
         if (chan->binarymodes & CM_SECRET)
-        {
-                strlcat(scratch,"s",MAXMODES);
-        }
+               *offset++ = 's';
         if (chan->binarymodes & CM_PRIVATE)
-        {
-                strlcat(scratch,"p",MAXMODES);
-        }
-        if (chan->key[0])
-        {
-                strlcat(sparam," ",MAXBUF);
-                strlcat(sparam,chan->key,MAXBUF);
-        }
+                *offset++ = 'p';
+        if (*chan->key)
+       {
+               snprintf(sparam,MAXBUF," %s",showkey ? chan->key : "<key>");
+       }
         if (chan->limit)
         {
                 char foo[24];
@@ -901,8 +1161,9 @@ char* chanmodes(chanrec *chan)
         }
         if (*chan->custom_modes)
         {
-                strlcat(scratch,chan->custom_modes,MAXMODES);
-                for (int z = 0; chan->custom_modes[z] != 0; z++)
+               for (char* t = chan->custom_modes; *t; t++)
+                       *offset++ = *t;
+                for (int z = 0; chan->custom_modes[z]; z++)
                 {
                         std::string extparam = chan->GetModeParameter(chan->custom_modes[z]);
                         if (extparam != "")
@@ -912,7 +1173,8 @@ char* chanmodes(chanrec *chan)
                         }
                 }
         }
-        log(DEBUG,"chanmodes: %s %s%s",chan->name,scratch,sparam);
+       /* Null terminate scratch */
+       *offset = '\0';
         strlcat(scratch,sparam,MAXMODES);
         return scratch;
 }
@@ -931,10 +1193,10 @@ void userlist(userrec *user,chanrec *c)
 
         snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
 
-        std::vector<char*> *ulist = c->GetUsers();
-        for (unsigned int i = 0; i < ulist->size(); i++)
+        std::map<char*,char*> *ulist= c->GetUsers();
+        for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
         {
-                char* o = (*ulist)[i];
+                char* o = i->second;
                 userrec* otheruser = (userrec*)o;
                 if ((!has_channel(user,c)) && (strchr(otheruser->modes,'i')))
                 {
@@ -949,14 +1211,14 @@ void userlist(userrec *user,chanrec *c)
                 {
                         /* list overflowed into
                          * multiple numerics */
-                        WriteServ(user->fd,"%s",list);
+                        WriteServ_NoFormat(user->fd,list);
                         snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
                 }
         }
         /* if whats left in the list isnt empty, send it */
         if (list[strlen(list)-1] != ':')
         {
-                WriteServ(user->fd,"%s",list);
+                WriteServ_NoFormat(user->fd,list);
         }
 }
 
@@ -973,14 +1235,11 @@ int usercount_i(chanrec *c)
                 return 0;
         }
 
-        strcpy(list,"");
         for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
         {
-                if (i->second)
-                {
                         if (has_channel(i->second,c))
                         {
-                                if (isnick(i->second->nick))
+                                if (i->second->registered == 7)
                                 {
                                         if ((!has_channel(i->second,c)) && (strchr(i->second->modes,'i')))
                                         {
@@ -991,7 +1250,6 @@ int usercount_i(chanrec *c)
                                         count++;
                                 }
                         }
-                }
         }
         log(DEBUG,"usercount_i: %s %lu",c->name,(unsigned long)count);
         return count;
@@ -1000,62 +1258,41 @@ int usercount_i(chanrec *c)
 
 int usercount(chanrec *c)
 {
-        if (!c)
-        {
-                log(DEFAULT,"*** BUG *** usercount was given an invalid parameter");
-                return 0;
-        }
-        int count = c->GetUserCounter();
-        log(DEBUG,"usercount: %s %lu",c->name,(unsigned long)count);
-        return count;
+        return (c ? c->GetUserCounter() : 0);
 }
 
 
 // looks up a users password for their connection class (<ALLOW>/<DENY> tags)
 
-char* Passwd(userrec *user)
+ConnectClass GetClass(userrec *user)
 {
-        for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++)
+        for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++)
         {
-                if (match(user->host,i->host) && (i->type == CC_ALLOW))
+                if (match(user->host,i->host.c_str()))
                 {
-                        return i->pass;
+                        return *i;
                 }
         }
-        return "";
+        return *(Config->Classes.begin());
 }
 
-bool IsDenied(userrec *user)
-{
-        for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++)
-        {
-                if (match(user->host,i->host) && (i->type == CC_DENY))
-                {
-                        return true;
-                }
-        }
-        return false;
-}
-
-
-
-
 /* sends out an error notice to all connected clients (not to be used
  * lightly!) */
 
 void send_error(char *s)
 {
         log(DEBUG,"send_error: %s",s);
-        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+        for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
         {
-                if (isnick(i->second->nick))
+               userrec* t = (userrec*)(*i);
+               if (t->registered == 7)
                 {
-                        WriteServ(i->second->fd,"NOTICE %s :%s",i->second->nick,s);
-                }
+                               WriteServ(t->fd,"NOTICE %s :%s",t->nick,s);
+                       }
                 else
                 {
                         // fix - unregistered connections receive ERROR, not NOTICE
-                        Write(i->second->fd,"ERROR :%s",s);
+                        Write(t->fd,"ERROR :%s",s);
                 }
         }
 }
@@ -1096,28 +1333,26 @@ int usercount_invisible(void)
         int c = 0;
         for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
         {
-                if ((isnick(i->second->nick)) && (strchr(i->second->modes,'i'))) c++;
+                if ((i->second->registered == 7) && (strchr(i->second->modes,'i'))) c++;
         }
         return c;
 }
 
 int usercount_opers(void)
 {
-        int c = 0;
-        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
-        {
-                if ((isnick(i->second->nick)) && (strchr(i->second->modes,'o'))) c++;
-        }
+       int c = 0;
+       for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+               if (*i->second->oper) c++;
         return c;
 }
 
 int usercount_unknown(void)
 {
         int c = 0;
-
-        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+        for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
         {
-                if ((i->second->fd) && (i->second->registered != 7))
+               userrec* t = (userrec*)(*i);
+                if (t->registered != 7)
                         c++;
         }
         return c;
@@ -1131,49 +1366,62 @@ long chancount(void)
 long local_count()
 {
         int c = 0;
-        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+        for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
         {
-                if ((i->second->fd) && (isnick(i->second->nick)) && (!strcasecmp(i->second->server,ServerName))) c++;
+               userrec* t = (userrec*)(*i);
+                if (t->registered == 7) c++;
         }
         return c;
 }
 
 void ShowMOTD(userrec *user)
 {
-        char buf[65536];
+        static char mbuf[MAXBUF];
+       static char crud[MAXBUF];
         std::string WholeMOTD = "";
-        if (!MOTD.size())
+        if (!Config->MOTD.size())
         {
                 WriteServ(user->fd,"422 %s :Message of the day file is missing.",user->nick);
                 return;
         }
-        snprintf(buf,65535,":%s 375 %s :- %s message of the day\r\n", ServerName, user->nick, ServerName);
-        WholeMOTD = WholeMOTD + buf;
-        for (unsigned int i = 0; i != MOTD.size(); i++)
-        {
-                snprintf(buf,65535,":%s 372 %s :- %s\r\n", ServerName, user->nick, MOTD[i].c_str());
-                WholeMOTD = WholeMOTD + buf;
-        }
-        snprintf(buf,65535,":%s 376 %s :End of message of the day.\r\n", ServerName, user->nick);
-        WholeMOTD = WholeMOTD + buf;
+       snprintf(crud,MAXBUF,":%s 372 %s :- ", Config->ServerName, user->nick);
+        snprintf(mbuf,MAXBUF,":%s 375 %s :- %s message of the day\r\n", Config->ServerName, user->nick, Config->ServerName);
+        WholeMOTD = WholeMOTD + mbuf;
+        for (unsigned int i = 0; i < Config->MOTD.size(); i++)
+                WholeMOTD = WholeMOTD + std::string(crud) + Config->MOTD[i].c_str() + std::string("\r\n");
+        snprintf(mbuf,MAXBUF,":%s 376 %s :End of message of the day.\r\n", Config->ServerName, user->nick);
+        WholeMOTD = WholeMOTD + mbuf;
         // only one write operation
-        user->AddWriteBuf(WholeMOTD);
-        statsSent += WholeMOTD.length();
+       if (Config->GetIOHook(user->port))
+       {
+               try
+               {
+                       Config->GetIOHook(user->port)->OnRawSocketWrite(user->fd,(char*)WholeMOTD.c_str(),WholeMOTD.length());
+               }
+                catch (ModuleException& modexcept)
+                {
+                        log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); \
+                }
+
+       }
+       else
+       {
+               user->AddWriteBuf(WholeMOTD);
+       }
+        ServerInstance->stats->statsSent += WholeMOTD.length();
 }
 
 void ShowRULES(userrec *user)
 {
-        if (!RULES.size())
+        if (!Config->RULES.size())
         {
                 WriteServ(user->fd,"NOTICE %s :Rules file is missing.",user->nick);
                 return;
         }
-        WriteServ(user->fd,"NOTICE %s :%s rules",user->nick,ServerName);
-        for (unsigned int i = 0; i != RULES.size(); i++)
-        {
-                                WriteServ(user->fd,"NOTICE %s :%s",user->nick,RULES[i].c_str());
-        }
-        WriteServ(user->fd,"NOTICE %s :End of %s rules.",user->nick,ServerName);
+        WriteServ(user->fd,"NOTICE %s :%s rules",user->nick,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());
+        WriteServ(user->fd,"NOTICE %s :End of %s rules.",user->nick,Config->ServerName);
 }
 
 // this returns 1 when all modules are satisfied that the user should be allowed onto the irc server
@@ -1181,95 +1429,28 @@ void ShowRULES(userrec *user)
 // registration timeout maximum seconds)
 bool AllModulesReportReady(userrec* user)
 {
+       if (!Config->global_implementation[I_OnCheckReady])
+               return true;
         for (int i = 0; i <= MODCOUNT; i++)
         {
-                int res = modules[i]->OnCheckReady(user);
-                        if (!res)
-                                return false;
+               if (Config->implement_lists[i][I_OnCheckReady])
+               {
+                       int res = modules[i]->OnCheckReady(user);
+                       if (!res)
+                               return false;
+               }
         }
         return true;
 }
 
-void createcommand(char* cmd, handlerfunc f, char flags, int minparams,char* source)
-{
-        command_t comm;
-        /* create the command and push it onto the table */
-        strlcpy(comm.command,cmd,MAXBUF);
-        strlcpy(comm.source,source,MAXBUF);
-        comm.handler_function = f;
-        comm.flags_needed = flags;
-        comm.min_params = minparams;
-        comm.use_count = 0;
-        comm.total_bytes = 0;
-        cmdlist.push_back(comm);
-        log(DEBUG,"Added command %s (%lu parameters)",cmd,(unsigned long)minparams);
-}
-
-
-void SetupCommandTable(void)
-{
-        createcommand("USER",handle_user,0,4,"<core>");
-        createcommand("NICK",handle_nick,0,1,"<core>");
-        createcommand("QUIT",handle_quit,0,0,"<core>");
-        createcommand("VERSION",handle_version,0,0,"<core>");
-        createcommand("PING",handle_ping,0,1,"<core>");
-        createcommand("PONG",handle_pong,0,1,"<core>");
-        createcommand("ADMIN",handle_admin,0,0,"<core>");
-        createcommand("PRIVMSG",handle_privmsg,0,2,"<core>");
-        createcommand("INFO",handle_info,0,0,"<core>");
-        createcommand("TIME",handle_time,0,0,"<core>");
-        createcommand("WHOIS",handle_whois,0,1,"<core>");
-        createcommand("WALLOPS",handle_wallops,'o',1,"<core>");
-        createcommand("NOTICE",handle_notice,0,2,"<core>");
-        createcommand("JOIN",handle_join,0,1,"<core>");
-        createcommand("NAMES",handle_names,0,0,"<core>");
-        createcommand("PART",handle_part,0,1,"<core>");
-        createcommand("KICK",handle_kick,0,2,"<core>");
-        createcommand("MODE",handle_mode,0,1,"<core>");
-        createcommand("TOPIC",handle_topic,0,1,"<core>");
-        createcommand("WHO",handle_who,0,1,"<core>");
-        createcommand("MOTD",handle_motd,0,0,"<core>");
-        createcommand("RULES",handle_rules,0,0,"<core>");
-        createcommand("OPER",handle_oper,0,2,"<core>");
-        createcommand("LIST",handle_list,0,0,"<core>");
-        createcommand("DIE",handle_die,'o',1,"<core>");
-        createcommand("RESTART",handle_restart,'o',1,"<core>");
-        createcommand("KILL",handle_kill,'o',2,"<core>");
-        createcommand("REHASH",handle_rehash,'o',0,"<core>");
-        createcommand("LUSERS",handle_lusers,0,0,"<core>");
-        createcommand("STATS",handle_stats,0,1,"<core>");
-        createcommand("USERHOST",handle_userhost,0,1,"<core>");
-        createcommand("AWAY",handle_away,0,0,"<core>");
-        createcommand("ISON",handle_ison,0,0,"<core>");
-        createcommand("SUMMON",handle_summon,0,0,"<core>");
-        createcommand("USERS",handle_users,0,0,"<core>");
-        createcommand("INVITE",handle_invite,0,0,"<core>");
-        createcommand("PASS",handle_pass,0,1,"<core>");
-        createcommand("TRACE",handle_trace,'o',0,"<core>");
-        createcommand("WHOWAS",handle_whowas,0,1,"<core>");
-        createcommand("CONNECT",handle_connect,'o',1,"<core>");
-        createcommand("SQUIT",handle_squit,'o',0,"<core>");
-        createcommand("MODULES",handle_modules,0,0,"<core>");
-        createcommand("LINKS",handle_links,0,0,"<core>");
-        createcommand("MAP",handle_map,0,0,"<core>");
-        createcommand("KLINE",handle_kline,'o',1,"<core>");
-        createcommand("GLINE",handle_gline,'o',1,"<core>");
-        createcommand("ZLINE",handle_zline,'o',1,"<core>");
-        createcommand("QLINE",handle_qline,'o',1,"<core>");
-        createcommand("ELINE",handle_eline,'o',1,"<core>");
-        createcommand("LOADMODULE",handle_loadmodule,'o',1,"<core>");
-        createcommand("UNLOADMODULE",handle_unloadmodule,'o',1,"<core>");
-        createcommand("SERVER",handle_server,0,0,"<core>");
-       createcommand("COMMANDS",handle_commands,0,0,"<core>");
-}
-
 bool DirValid(char* dirandfile)
 {
         char work[MAXBUF];
+       char buffer[MAXBUF], otherdir[MAXBUF];
         strlcpy(work,dirandfile,MAXBUF);
         int p = strlen(work);
         // we just want the dir
-        while (strlen(work))
+        while (*work)
         {
                 if (work[p] == '/')
                 {
@@ -1278,7 +1459,6 @@ bool DirValid(char* dirandfile)
                 }
                 work[p--] = '\0';
         }
-        char buffer[MAXBUF], otherdir[MAXBUF];
         // Get the current working directory
         if( getcwd( buffer, MAXBUF ) == NULL )
                 return false;
@@ -1301,10 +1481,11 @@ bool DirValid(char* dirandfile)
 std::string GetFullProgDir(char** argv, int argc)
 {
         char work[MAXBUF];
+       char buffer[MAXBUF], otherdir[MAXBUF];
         strlcpy(work,argv[0],MAXBUF);
         int p = strlen(work);
         // we just want the dir
-        while (strlen(work))
+        while (*work)
         {
                 if (work[p] == '/')
                 {
@@ -1313,7 +1494,6 @@ std::string GetFullProgDir(char** argv, int argc)
                 }
                 work[p--] = '\0';
         }
-        char buffer[MAXBUF], otherdir[MAXBUF];
         // Get the current working directory
         if( getcwd( buffer, MAXBUF ) == NULL )
                 return "";
@@ -1324,3 +1504,59 @@ std::string GetFullProgDir(char** argv, int argc)
         return otherdir;
 }
 
+int InsertMode(std::string &output, const char* mode, unsigned short section)
+{
+       unsigned short currsection = 1;
+       unsigned int pos = output.find("CHANMODES=", 0) + 10; // +10 for the length of "CHANMODES="
+       
+       if(section > 4 || section == 0)
+       {
+               log(DEBUG, "InsertMode: CHANMODES doesn't have a section %dh :/", section);
+               return 0;
+       }
+       
+       for(; pos < output.size(); pos++)
+       {
+               if(section == currsection)
+                       break;
+                       
+               if(output[pos] == ',')
+                       currsection++;
+       }
+       
+       output.insert(pos, mode);
+       return 1;
+}
+
+bool IsValidChannelName(const char *chname)
+{
+               char *c;
+
+               /* check for no name - don't check for !*chname, as if it is empty, it won't be '#'! */
+               if (!chname || *chname != '#')
+               {
+                               return false;
+               }
+
+               c = (char *)chname + 1;
+               while (*c)
+               {
+                               switch (*c)
+                               {
+                                               case ' ':
+                                               case ',':
+                                               case 7:
+                                                               return false;
+                               }
+
+                               c++;
+               }
+               
+               /* too long a name - note funky pointer arithmetic here. */
+               if ((c - chname) > CHANMAX)
+               {
+                               return false;
+               }
+
+               return true;
+}