]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/helperfuncs.cpp
Apply patch from BuildSmart that fixes a few issues on Mac with the logfile path...
[user/henk/code/inspircd.git] / src / helperfuncs.cpp
index c4c6f397b8db28a7c34eb464ac61f443a9931c7f..da3fa5e1bc38f184e465e80cc893b907fa73000b 100644 (file)
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-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>
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <sstream>
-#include <vector>
-#include <deque>
 #include <stdarg.h>
-#include "connection.h"
+#include "configreader.h"
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
 #include "modules.h"
-#include "dynamic.h"
 #include "wildcard.h"
-#include "message.h"
 #include "mode.h"
 #include "xline.h"
-#include "commands.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-
-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];
-extern std::vector<userrec*> all_opers;
+#include "exitcodes.h"
 
-extern ClassVector Classes;
+static char TIMESTR[26];
+static time_t LAST = 0;
 
-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;
-
-void log(int level,char *text, ...)
-{
-        char textbuffer[MAXBUF];
-        va_list argsPtr;
-        time_t rawtime;
-        struct tm * timeinfo;
-        if (level < LogLevel)
-                return;
-
-        time(&rawtime);
-        timeinfo = localtime (&rawtime);
-
-        if (log_file)
-        {
-                char b[MAXBUF];
-                va_start (argsPtr, text);
-                vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-                va_end(argsPtr);
-                strlcpy(b,asctime(timeinfo),MAXBUF);
-                b[24] = ':';    // we know this is the end of the time string
-                fprintf(log_file,"%s %s\n",b,textbuffer);
-                if (nofork)
-                {
-                        // nofork enabled? display it on terminal too
-                        printf("%s %s\n",b,textbuffer);
-                }
-        }
-}
-
-void readfile(file_cache &F, const char* fname)
+/** 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 InspIRCd::Log(int level, const char* text, ...)
 {
-        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[0] == 0)
-                        {
-                                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());
-}
+       /* Do this check again here so that we save pointless vsnprintf calls */
+       if ((level < Config->LogLevel) && !Config->forcedebug)
+               return;
 
-void Write(int sock,char *text, ...)
-{
-        if (sock < 0)
-                return;
-        if (!text)
-        {
-                log(DEFAULT,"*** BUG *** Write was given an invalid parameter");
-                return;
-        }
-        char textbuffer[MAXBUF];
-        va_list argsPtr;
-        char tb[MAXBUF];
-
-        va_start (argsPtr, text);
-        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-        va_end(argsPtr);
-        int bytes = snprintf(tb,MAXBUF,"%s\r\n",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;
-        }
-        else log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!");
-}
+       va_list argsPtr;
+       char textbuffer[65536];
 
-/* write a server formatted numeric response to a single socket */
+       va_start(argsPtr, text);
+       vsnprintf(textbuffer, 65536, text, argsPtr);
+       va_end(argsPtr);
 
-void WriteServ(int sock, char* text, ...)
-{
-        if (sock < 0)
-                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);
-
-        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-        va_end(argsPtr);
-        int bytes = snprintf(tb,MAXBUF,":%s %s\r\n",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;
-        }
-        else log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!");
+       this->Log(level, std::string(textbuffer));
 }
 
-/* write text from an originating user to originating user */
-
-void WriteFrom(int sock, userrec *user,char* text, ...)
+void InspIRCd::Log(int level, const std::string &text)
 {
-        if (sock < 0)
-                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);
-
-        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);
-        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;
-        }
-        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) */
+       if (!this->Config)
+               return;
 
-void WriteTo(userrec *source, userrec *dest,char *data, ...)
-{
-        if ((!dest) || (!data))
-        {
-                log(DEFAULT,"*** BUG *** WriteTo was given an invalid parameter");
-                return;
-        }
-        if (dest->fd == FD_MAGIC_NUMBER)
-                return;
-        char textbuffer[MAXBUF],tb[MAXBUF];
-        va_list argsPtr;
-        va_start (argsPtr, data);
-        vsnprintf(textbuffer, MAXBUF, data, argsPtr);
-        va_end(argsPtr);
-        chop(tb);
-
-        // if no source given send it from the server.
-        if (!source)
-        {
-                WriteServ(dest->fd,":%s %s",ServerName,textbuffer);
-        }
-        else
-        {
-                WriteFrom(dest->fd,source,"%s",textbuffer);
-        }
-}
+       /* If we were given -debug we output all messages, regardless of configured loglevel */
+       if ((level < Config->LogLevel) && !Config->forcedebug)
+               return;
 
-/* write formatted text from a source user to all users on a channel
- * including the sender (NOT for privmsg, notice etc!) */
+       if (Time() != LAST)
+       {
+               time_t local = Time();
+               struct tm *timeinfo = localtime(&local);
 
-void WriteChannel(chanrec* Ptr, userrec* user, char* text, ...)
-{
-        if ((!Ptr) || (!user) || (!text))
-        {
-                log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter");
-                return;
-        }
-        char textbuffer[MAXBUF];
-        va_list argsPtr;
-        va_start (argsPtr, text);
-        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-        va_end(argsPtr);
-
-        std::vector<char*> *ulist = Ptr->GetUsers();
-        for (unsigned int j = 0; j < ulist->size(); j++)
-        {
-                char* o = (*ulist)[j];
-                userrec* otheruser = (userrec*)o;
-                if (otheruser->fd != FD_MAGIC_NUMBER)
-                        WriteTo(user,otheruser,"%s",textbuffer);
-        }
-}
+               strlcpy(TIMESTR,asctime(timeinfo),26);
+               TIMESTR[24] = ':';
+               LAST = Time();
+       }
 
-/* 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 */
+       if (Config->log_file && Config->writelog)
+       {
+               std::string out = std::string(TIMESTR) + " " + text.c_str() + "\n";
+               this->Logger->WriteLogLine(out);
+       }
 
-void WriteChannelLocal(chanrec* Ptr, userrec* user, char* text, ...)
-{
-        if ((!Ptr) || (!text))
-        {
-                log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter");
-                return;
-        }
-        char textbuffer[MAXBUF];
-        va_list argsPtr;
-        va_start (argsPtr, text);
-        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-        va_end(argsPtr);
-
-        std::vector<char*> *ulist = Ptr->GetUsers();
-        for (unsigned int j = 0; j < ulist->size(); j++)
-        {
-                char* o = (*ulist)[j];
-                userrec* otheruser = (userrec*)o;
-                if ((otheruser->fd != FD_MAGIC_NUMBER) && (otheruser->fd != -1) && (otheruser != user))
-                {
-                        if (!user)
-                        {
-                                WriteServ(otheruser->fd,"%s",textbuffer);
-                        }
-                        else
-                        {
-                                WriteTo(user,otheruser,"%s",textbuffer);
-                        }
-                }
-        }
+       if (Config->nofork)
+       {
+               printf("%s %s\n", TIMESTR, text.c_str());
+       }
 }
 
-void WriteChannelWithServ(char* ServName, chanrec* Ptr, char* text, ...)
+std::string InspIRCd::GetServerDescription(const char* servername)
 {
-        if ((!Ptr) || (!text))
-        {
-                log(DEFAULT,"*** BUG *** WriteChannelWithServ was given an invalid parameter");
-                return;
-        }
-        char textbuffer[MAXBUF];
-        va_list argsPtr;
-        va_start (argsPtr, text);
-        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-        va_end(argsPtr);
-
-
-        std::vector<char*> *ulist = Ptr->GetUsers();
-        for (unsigned int j = 0; j < ulist->size(); j++)
-        {
-                char* o = (*ulist)[j];
-                userrec* otheruser = (userrec*)o;
-                if (otheruser->fd != FD_MAGIC_NUMBER)
-                        WriteServ(otheruser->fd,"%s",textbuffer);
-        }
-}
+       std::string description;
 
-/* write formatted text from a source user to all users on a channel except
- * for the sender (for privmsg etc) */
+       FOREACH_MOD_I(this,I_OnGetServerDescription,OnGetServerDescription(servername,description));
 
-void ChanExceptSender(chanrec* Ptr, userrec* user, char* text, ...)
-{
-        if ((!Ptr) || (!user) || (!text))
-        {
-                log(DEFAULT,"*** BUG *** ChanExceptSender was given an invalid parameter");
-                return;
-        }
-        char textbuffer[MAXBUF];
-        va_list argsPtr;
-        va_start (argsPtr, text);
-        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-        va_end(argsPtr);
-
-        std::vector<char*> *ulist = Ptr->GetUsers();
-        for (unsigned int j = 0; j < ulist->size(); j++)
-        {
-                char* o = (*ulist)[j];
-                userrec* otheruser = (userrec*)o;
-                if ((otheruser->fd != FD_MAGIC_NUMBER) && (user != otheruser))
-                        WriteFrom(otheruser->fd,user,"%s",textbuffer);
-        }
-}
-
-std::string GetServerDescription(char* servername)
-{
-       std::string description = "";
-       FOREACH_MOD OnGetServerDescription(servername,description);
-       if (description != "")
+       if (!description.empty())
        {
                return description;
        }
        else
        {
-               return ServerDesc; // not a remote server that can be found, it must be me.
+               // 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, ...)
+/* 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
+ * opers with globops, and you have 2000 users, thats 4000 iterations. WriteOpers
+ * uses the oper list, which means if you have 2000 users but only 5 opers,
+ * it iterates 5 times.
+ */
+void InspIRCd::WriteOpers(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;
-        }
-
-        char textbuffer[MAXBUF];
-        va_list argsPtr;
-        va_start (argsPtr, text);
-        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-        va_end(argsPtr);
-
-        // FIX: Stops a message going to the same person more than once
-        memset(&already_sent,0,65536);
-
-        bool sent_to_at_least_one = false;
-
-        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* otheruser = (userrec*)o;
-                                if ((otheruser->fd > 0) && (!already_sent[otheruser->fd]))
-                                {
-                                        already_sent[otheruser->fd] = 1;
-                                        WriteFrom(otheruser->fd,u,"%s",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(u->fd,u,"%s",textbuffer);
-        }
-}
+       char textbuffer[MAXBUF];
+       va_list argsPtr;
 
-/* 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 */
+       va_start(argsPtr, text);
+       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+       va_end(argsPtr);
 
-void WriteCommonExcept(userrec *u, 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;
-        }
-
-        char textbuffer[MAXBUF];
-        va_list argsPtr;
-        va_start (argsPtr, text);
-        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-        va_end(argsPtr);
-
-        memset(&already_sent,0,65536);
-
-        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* otheruser = (userrec*)o;
-                                if (u != otheruser)
-                                {
-                                        if ((otheruser->fd > 0) && (!already_sent[otheruser->fd]))
-                                        {
-                                                already_sent[otheruser->fd] = 1;
-                                                WriteFrom(otheruser->fd,u,"%s",textbuffer);
-                                        }
-                                }
-                        }
-                }
-        }
+       this->WriteOpers(std::string(textbuffer));
 }
 
-void WriteOpers(char* text, ...)
+void InspIRCd::WriteOpers(const std::string &text)
 {
-        if (!text)
-        {
-                log(DEFAULT,"*** BUG *** WriteOpers 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 :%s",a->nick,textbuffer);
-                        }
-                }
-        }
+       for (std::vector<userrec*>::iterator i = this->all_opers.begin(); i != this->all_opers.end(); i++)
+       {
+               userrec* a = *i;
+               if (IS_LOCAL(a) && a->modes[UM_SERVERNOTICE])
+               {
+                       // 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;
 
        char textbuffer[MAXBUF];
+       char formatbuffer[MAXBUF];
        va_list argsPtr;
        va_start (argsPtr, text);
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
 
-       for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+       snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s",Config->ServerName,textbuffer);
+
+       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 = *i;
+               t->WriteServ(std::string(formatbuffer));
        }
 }
 
-void ServerPrivmsgAll(char* text, ...)
+void InspIRCd::ServerPrivmsgAll(char* text, ...)
 {
        if (!text)
                return;
 
        char textbuffer[MAXBUF];
+       char formatbuffer[MAXBUF];
        va_list argsPtr;
        va_start (argsPtr, text);
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
 
-       for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+       snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s",Config->ServerName,textbuffer);
+
+       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 = *i;
+               t->WriteServ(std::string(formatbuffer));
        }
 }
 
-void NoticeAllOpers(userrec *source, bool local_only, char* text, ...)
+void InspIRCd::WriteMode(const char* modes, int flags, const 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);
-                        }
-                }
-        }
+       char textbuffer[MAXBUF];
+       int modelen;
+       va_list argsPtr;
 
-}
-// returns TRUE of any users on channel C occupy server 'servername'.
+       if (!text || !modes || !flags)
+       {
+               this->Log(DEFAULT,"*** BUG *** WriteMode was given an invalid parameter");
+               return;
+       }
 
-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;
+       va_start(argsPtr, text);
+       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+       va_end(argsPtr);
+       modelen = strlen(modes);
+
+       if (flags == WM_AND)
+       {
+               for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+               {
+                       userrec* t = *i;
+                       bool send_to_user = true;
+
+                       for (int n = 0; n < modelen; n++)
+                       {
+                               if (!t->modes[modes[n]-65])
+                               {
+                                       send_to_user = false;
+                                       break;
+                               }
+                       }
+                       if (send_to_user)
+                               t->WriteServ("NOTICE %s :%s",t->nick,textbuffer);
+               }
+       }
+       else
+       if (flags == WM_OR)
+       {
+               for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+               {
+                       userrec* t = *i;
+                       bool send_to_user = false;
+
+                       for (int n = 0; n < modelen; n++)
+                       {
+                               if (t->modes[modes[n]-65])
+                               {
+                                       send_to_user = true;
+                                       break;
+                               }
+                       }
+                       if (send_to_user)
+                               t->WriteServ("NOTICE %s :%s",t->nick,textbuffer);
+               }
+       }
 }
 
-// returns true if user 'u' shares any common channels with any users on server 'servername'
+/* Find a user record by nickname and return a pointer to it */
 
-bool CommonOnThisServer(userrec* u,const char* servername)
+userrec* InspIRCd::FindNick(const std::string &nick)
 {
-        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;
-}
+       user_hash::iterator iter = clientlist->find(nick);
 
+       if (iter == clientlist->end())
+               /* Couldn't find it */
+               return NULL;
 
-void WriteMode(const char* modes, int flags, const char* text, ...)
-{
-        if ((!text) || (!modes) || (!flags))
-        {
-                log(DEFAULT,"*** BUG *** WriteMode was given an invalid parameter");
-                return;
-        }
-
-        char textbuffer[MAXBUF];
-        va_list argsPtr;
-        va_start (argsPtr, text);
-        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-        va_end(argsPtr);
-        int modelen = strlen(modes);
-
-        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
-        {
-                if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER))
-                {
-                        bool send_to_user = false;
-
-                        if (flags == WM_AND)
-                        {
-                                send_to_user = true;
-                                for (int n = 0; n < modelen; n++)
-                                {
-                                        if (!hasumode(i->second,modes[n]))
-                                        {
-                                                send_to_user = false;
-                                                break;
-                                        }
-                                }
-                        }
-                        else if (flags == WM_OR)
-                        {
-                                send_to_user = false;
-                                for (int n = 0; n < modelen; n++)
-                                {
-                                        if (hasumode(i->second,modes[n]))
-                                        {
-                                                send_to_user = true;
-                                                break;
-                                        }
-                                }
-                        }
-
-                        if (send_to_user)
-                        {
-                                WriteServ(i->second->fd,"NOTICE %s :%s",i->second->nick,textbuffer);
-                        }
-                }
-        }
+       return iter->second;
 }
 
-void NoticeAll(userrec *source, bool local_only, char* text, ...)
+userrec* InspIRCd::FindNick(const char* nick)
 {
-        if ((!text) || (!source))
-        {
-                log(DEFAULT,"*** BUG *** NoticeAll 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 (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
-        {
-                if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER))
-                {
-                        WriteFrom(i->second->fd,source,"NOTICE $* :%s",textbuffer);
-                }
-        }
+       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 */
 
-void WriteWallOps(userrec *source, bool local_only, char* text, ...)
+chanrec* InspIRCd::FindChan(const char* chan)
 {
-        if ((!text) || (!source))
-        {
-                log(DEFAULT,"*** BUG *** WriteOpers 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 (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
-        {
-                if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER))
-                {
-                        if (strchr(i->second->modes,'w'))
-                        {
-                                WriteTo(source,i->second,"WALLOPS :%s",textbuffer);
-                        }
-                }
-        }
-}
+       chan_hash::iterator iter = chanlist->find(chan);
 
-/* convert a string to lowercase. Note following special circumstances
- * taken from RFC 1459. Many "official" server branches still hold to this
- * rule so i will too;
- *
- *  Because of IRC's scandanavian origin, the characters {}| are
- *  considered to be the lower case equivalents of the characters []\,
- *  respectively. This is a critical issue when determining the
- *  equivalence of two nicknames.
- */
+       if (iter == chanlist->end())
+               /* Couldn't find it */
+               return NULL;
 
-void strlower(char *n)
-{
-        if (n)
-        {
-                for (char* t = n; *t; t++)
-                        *t = lowermap[(unsigned)*t];
-        }
+       return iter->second;
 }
 
-/* Find a user record by nickname and return a pointer to it */
-
-userrec* Find(std::string nick)
+chanrec* InspIRCd::FindChan(const std::string &chan)
 {
-        user_hash::iterator iter = clientlist.find(nick);
+       chan_hash::iterator iter = chanlist->find(chan);
 
-        if (iter == clientlist.end())
-                /* Couldn't find it */
-                return NULL;
+       if (iter == chanlist->end())
+               /* Couldn't find it */
+               return NULL;
 
-        return iter->second;
+       return iter->second;
 }
 
-/* find a channel record by channel name and return a pointer to it */
-
-chanrec* FindChan(const char* chan)
+/*
+ * sends out an error notice to all connected clients (not to be used
+ * lightly!)
+ */
+void InspIRCd::SendError(const std::string &s)
 {
-        if (!chan)
-        {
-                log(DEFAULT,"*** BUG *** Findchan was given an invalid parameter");
-                return NULL;
-        }
-
-        chan_hash::iterator iter = chanlist.find(chan);
-
-        if (iter == chanlist.end())
-                /* Couldn't find it */
-                return NULL;
-
-        return iter->second;
+       for (std::vector<userrec*>::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
+       {
+               if ((*i)->registered == REG_ALL)
+               {
+                       (*i)->WriteServ("NOTICE %s :%s",(*i)->nick,s.c_str());
+               }
+               else
+               {
+                       /* Unregistered connections receive ERROR, not a NOTICE */
+                       (*i)->Write("ERROR :" + s);
+               }
+               /* This might generate a whole load of EAGAIN, but we dont really
+                * care about this, as if we call SendError something catastrophic
+                * has occured anyway, and we wont receive the events for these.
+                */
+               (*i)->FlushWriteBuf();
+       }
 }
 
-
-long GetMaxBans(char* name)
+// this function counts all users connected, wether they are registered or NOT.
+int InspIRCd::UserCount()
 {
-        char CM[MAXBUF];
-        for (int count = 0; count < ConfValueEnum("banlist",&config_f); count++)
-        {
-                ConfValue("banlist","chan",count,CM,&config_f);
-                if (match(name,CM))
-                {
-                        ConfValue("banlist","limit",count,CM,&config_f);
-                        return atoi(CM);
-                }
-        }
-        return 64;
+       return clientlist->size();
 }
 
-void purge_empty_chans(userrec* u)
+// this counts only registered users, so that the percentages in /MAP don't mess up when users are sitting in an unregistered state
+int InspIRCd::RegisteredUserCount()
 {
-
-        int go_again = 1, purge = 0;
-
-        // firstly decrement the count on each channel
-        for (unsigned int f = 0; f < u->chans.size(); f++)
-        {
-                if (u->chans[f].channel)
-                {
-                        u->chans[f].channel->DelUser((char*)u);
-                }
-        }
-
-        for (unsigned int i = 0; i < u->chans.size(); i++)
-        {
-                if (u->chans[i].channel)
-                {
-                        if (!usercount(u->chans[i].channel))
-                        {
-                                chan_hash::iterator i2 = chanlist.find(u->chans[i].channel->name);
-                                /* kill the record */
-                                if (i2 != chanlist.end())
-                                {
-                                        log(DEBUG,"del_channel: destroyed: %s",i2->second->name);
-                                        if (i2->second)
-                                                delete i2->second;
-                                        chanlist.erase(i2);
-                                        go_again = 1;
-                                        purge++;
-                                        u->chans[i].channel = NULL;
-                                }
-                        }
-                        else
-                        {
-                                log(DEBUG,"skipped purge for %s",u->chans[i].channel->name);
-                        }
-                }
-        }
-        log(DEBUG,"completed channel purge, killed %lu",(unsigned long)purge);
-
-        DeleteOper(u);
+       return clientlist->size() - this->UnregisteredUserCount();
 }
 
+int InspIRCd::ModeCount(const char mode)
+{
+       ModeHandler* mh = this->Modes->FindMode(mode, MODETYPE_USER);
 
-char scratch[MAXBUF];
-char sparam[MAXBUF];
+       if (mh)
+               return mh->GetCount();
+       else
+               return 0;
+}
 
-char* chanmodes(chanrec *chan)
+int InspIRCd::InvisibleUserCount()
 {
-        if (!chan)
-        {
-                log(DEFAULT,"*** BUG *** chanmodes was given an invalid parameter");
-                strcpy(scratch,"");
-                return scratch;
-        }
-
-        strcpy(scratch,"");
-        strcpy(sparam,"");
-        if (chan->binarymodes & CM_NOEXTERNAL)
-        {
-                strlcat(scratch,"n",MAXMODES);
-        }
-        if (chan->binarymodes & CM_TOPICLOCK)
-        {
-                strlcat(scratch,"t",MAXMODES);
-        }
-        if (chan->key[0])
-        {
-                strlcat(scratch,"k",MAXMODES);
-        }
-        if (chan->limit)
-        {
-                strlcat(scratch,"l",MAXMODES);
-        }
-        if (chan->binarymodes & CM_INVITEONLY)
-        {
-                strlcat(scratch,"i",MAXMODES);
-        }
-        if (chan->binarymodes & CM_MODERATED)
-        {
-                strlcat(scratch,"m",MAXMODES);
-        }
-        if (chan->binarymodes & CM_SECRET)
-        {
-                strlcat(scratch,"s",MAXMODES);
-        }
-        if (chan->binarymodes & CM_PRIVATE)
-        {
-                strlcat(scratch,"p",MAXMODES);
-        }
-        if (chan->key[0])
-        {
-                strlcat(sparam," ",MAXBUF);
-                strlcat(sparam,chan->key,MAXBUF);
-        }
-        if (chan->limit)
-        {
-                char foo[24];
-                sprintf(foo," %lu",(unsigned long)chan->limit);
-                strlcat(sparam,foo,MAXBUF);
-        }
-        if (*chan->custom_modes)
-        {
-                strlcat(scratch,chan->custom_modes,MAXMODES);
-                for (int z = 0; chan->custom_modes[z] != 0; z++)
-                {
-                        std::string extparam = chan->GetModeParameter(chan->custom_modes[z]);
-                        if (extparam != "")
-                        {
-                                strlcat(sparam," ",MAXBUF);
-                                strlcat(sparam,extparam.c_str(),MAXBUF);
-                        }
-                }
-        }
-        log(DEBUG,"chanmodes: %s %s%s",chan->name,scratch,sparam);
-        strlcat(scratch,sparam,MAXMODES);
-        return scratch;
+       return ModeCount('i');
 }
 
-
-/* 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)
+int InspIRCd::OperCount()
 {
-        if ((!c) || (!user))
-        {
-                log(DEFAULT,"*** BUG *** userlist was given an invalid parameter");
-                return;
-        }
-
-        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++)
-        {
-                char* o = (*ulist)[i];
-                userrec* otheruser = (userrec*)o;
-                if ((!has_channel(user,c)) && (strchr(otheruser->modes,'i')))
-                {
-                        /* user is +i, and source not on the channel, does not show
-                         * nick in NAMES list */
-                        continue;
-                }
-                strlcat(list,cmode(otheruser,c),MAXBUF);
-                strlcat(list,otheruser->nick,MAXBUF);
-                strlcat(list," ",MAXBUF);
-                if (strlen(list)>(480-NICKMAX))
-                {
-                        /* list overflowed into
-                         * multiple numerics */
-                        WriteServ(user->fd,"%s",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);
-        }
+       return this->all_opers.size();
 }
 
-/* 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)
+int InspIRCd::UnregisteredUserCount()
 {
-        int count = 0;
-
-        if (!c)
-        {
-                log(DEFAULT,"*** BUG *** usercount_i was given an invalid parameter");
-                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 ((!has_channel(i->second,c)) && (strchr(i->second->modes,'i')))
-                                        {
-                                                /* user is +i, and source not on the channel, does not show
-                                                 * nick in NAMES list */
-                                                continue;
-                                        }
-                                        count++;
-                                }
-                        }
-                }
-        }
-        log(DEBUG,"usercount_i: %s %lu",c->name,(unsigned long)count);
-        return count;
+       return this->unregistered_count;
 }
 
+long InspIRCd::ChannelCount()
+{
+       return chanlist->size();
+}
 
-int usercount(chanrec *c)
+long InspIRCd::LocalUserCount()
 {
-        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;
+       /* Doesnt count unregistered clients */
+       return (local_users.size() - this->UnregisteredUserCount());
 }
+       
+bool InspIRCd::IsChannel(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;
+       }
 
-// looks up a users password for their connection class (<ALLOW>/<DENY> tags)
+       c = (char *)chname + 1;
+       while (*c)
+       {
+               switch (*c)
+               {
+                       case ' ':
+                       case ',':
+                       case 7:
+                               return false;
+               }
 
-char* Passwd(userrec *user)
-{
-        for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++)
-        {
-                if (match(user->host,i->host) && (i->type == CC_ALLOW))
-                {
-                        return i->pass;
-                }
-        }
-        return "";
+               c++;
+       }
+               
+       /* too long a name - note funky pointer arithmetic here. */
+       if ((c - chname) > CHANMAX)
+       {
+                       return false;
+       }
+
+       return true;
 }
 
-bool IsDenied(userrec *user)
+bool InspIRCd::IsNick(const char* n)
 {
-        for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++)
-        {
-                if (match(user->host,i->host) && (i->type == CC_DENY))
-                {
-                        return true;
-                }
-        }
-        return false;
-}
+       if (!n || !*n)
+               return false;
+       int p = 0;
+       for (char* i = (char*)n; *i; i++, p++)
+       {
+               if ((*i >= 'A') && (*i <= '}'))
+               {
+                       /* "A"-"}" can occur anywhere in a nickname */
+                       continue;
+               }
 
+               if ((((*i >= '0') && (*i <= '9')) || (*i == '-')) && (i > n))
+               {
+                       /* "0"-"9", "-" can occur anywhere BUT the first char of a nickname */
+                       continue;
+               }
 
+               /* invalid character! abort */
+               return false;
+       }
 
+       /* too long? or not -- pointer arithmetic rocks */
+       return (p < NICKMAX - 1);
+}
 
-/* sends out an error notice to all connected clients (not to be used
- * lightly!) */
 
-void send_error(char *s)
+bool InspIRCd::IsIdent(const char* n)
 {
-        log(DEBUG,"send_error: %s",s);
-        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
-        {
-                if (isnick(i->second->nick))
-                {
-                        WriteServ(i->second->fd,"NOTICE %s :%s",i->second->nick,s);
-                }
-                else
-                {
-                        // fix - unregistered connections receive ERROR, not NOTICE
-                        Write(i->second->fd,"ERROR :%s",s);
-                }
-        }
-}
+       if (!n || !*n)
+               return false;
 
-void Error(int status)
-{
-        signal (SIGALRM, SIG_IGN);
-        signal (SIGPIPE, SIG_IGN);
-        signal (SIGTERM, SIG_IGN);
-        signal (SIGABRT, SIG_IGN);
-        signal (SIGSEGV, SIG_IGN);
-        signal (SIGURG, SIG_IGN);
-        signal (SIGKILL, SIG_IGN);
-        log(DEFAULT,"*** fell down a pothole in the road to perfection ***");
-        send_error("Error! Segmentation fault! save meeeeeeeeeeeeee *splat!*");
-        Exit(status);
-}
+       for (char* i = (char*)n; *i; i++)
+       {
+               if ((*i >= 'A') && (*i <= '}'))
+               {
+                       continue;
+               }
 
-// this function counts all users connected, wether they are registered or NOT.
-int usercnt(void)
-{
-        return clientlist.size();
-}
+               if (((*i >= '0') && (*i <= '9')) || (*i == '-') || (*i == '.'))
+               {
+                       continue;
+               }
 
-// 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 c = 0;
-        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
-        {
-                if (i->second->registered == 7) c++;
-        }
-        return c;
-}
+               return false;
+       }
 
-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++;
-        }
-        return c;
+       return true;
 }
 
-int usercount_opers(void)
+void InspIRCd::OpenLog(char** argv, int argc)
 {
-        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++;
-        }
-        return c;
-}
+       Config->MyDir = Config->GetFullProgDir();
 
-int usercount_unknown(void)
-{
-        int c = 0;
-
-        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
-        {
-                if ((i->second->fd) && (i->second->registered != 7))
-                        c++;
-        }
-        return c;
-}
+       if (!*this->LogFileName)
+       {
+               if (Config->logpath.empty())
+               {
+#ifndef DARWIN
+                       Config->logpath = Config->MyDir + "/ircd.log";
+#else
+                       Config->logpath = "/var/log/ircd.log";
+#endif
+               }
 
-long chancount(void)
-{
-        return chanlist.size();
-}
+               Config->log_file = fopen(Config->logpath.c_str(),"a+");
+       }
+       else
+       {
+               Config->log_file = fopen(this->LogFileName,"a+");
+       }
 
-long local_count()
-{
-        int c = 0;
-        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
-        {
-                if ((i->second->fd) && (isnick(i->second->nick)) && (i->second->server->fd > -1)) c++;
-        }
-        return c;
+       if (!Config->log_file)
+       {
+               printf("ERROR: Could not write to logfile %s: %s\n\n", Config->logpath.c_str(), strerror(errno));
+               Exit(EXIT_STATUS_LOG);
+       }
+
+       this->Logger = new FileLogger(this, Config->log_file);
 }
 
-void ShowMOTD(userrec *user)
+void InspIRCd::CheckRoot()
 {
-        char buf[65536];
-        std::string WholeMOTD = "";
-        if (!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;
-        // only one write operation
-        user->AddWriteBuf(WholeMOTD);
-        statsSent += WholeMOTD.length();
+#ifndef DARWIN
+       if (geteuid() == 0)
+       {
+               printf("WARNING!!! You are running an irc server as ROOT!!! DO NOT DO THIS!!!\n\n");
+               this->Log(DEFAULT,"Cant start as root");
+#else
+       if (geteuid() != 16)
+       {
+               printf("WARNING!!! You are not running inspircd as the ircdaemon user!!! YOU CAN NOT DO THIS!!!\n\n");
+               this->Log(DEFAULT,"Must start as user ircdaemon");
+#endif
+               Exit(EXIT_STATUS_ROOT);
+       }
 }
 
-void ShowRULES(userrec *user)
+void InspIRCd::CheckDie()
 {
-        if (!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);
+       if (*Config->DieValue)
+       {
+               printf("WARNING: %s\n\n",Config->DieValue);
+               this->Log(DEFAULT,"Died because of <die> tag: %s",Config->DieValue);
+               Exit(EXIT_STATUS_DIETAG);
+       }
 }
 
-// this returns 1 when all modules are satisfied that the user should be allowed onto the irc server
-// (until this returns true, a user will block in the waiting state, waiting to connect up to the
-// registration timeout maximum seconds)
-bool AllModulesReportReady(userrec* user)
+/* We must load the modules AFTER initializing the socket engine, now */
+void InspIRCd::LoadAllModules()
 {
-        for (int i = 0; i <= MODCOUNT; i++)
-        {
-                int res = modules[i]->OnCheckReady(user);
-                        if (!res)
-                                return false;
-        }
-        return true;
+       char configToken[MAXBUF];
+       Config->module_names.clear();
+       this->ModCount = -1;
+
+       for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "module"); count++)
+       {
+               Config->ConfValue(Config->config_data, "module", "name", count, configToken, MAXBUF);
+               printf_c("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n",configToken);
+               
+               if (!this->LoadModule(configToken))             
+               {
+                       this->Log(DEFAULT,"There was an error loading the module '%s': %s", configToken, this->ModuleError());
+                       printf_c("\n[\033[1;31m*\033[0m] There was an error loading the module '%s': %s\n\n", configToken, this->ModuleError());
+                       Exit(EXIT_STATUS_MODULE);
+               }
+       }
+       printf_c("\nA total of \033[1;32m%d\033[0m module%s been loaded.\n", this->ModCount+1, this->ModCount+1 == 1 ? " has" : "s have");
+       this->Log(DEFAULT,"Total loaded modules: %d", this->ModCount+1);
 }
 
-void createcommand(char* cmd, handlerfunc f, char flags, int minparams,char* source)
+void InspIRCd::SendWhoisLine(userrec* user, userrec* dest, int numeric, const std::string &text)
 {
-        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);
-}
+       std::string copy_text = text;
 
+       int MOD_RESULT = 0;
+       FOREACH_RESULT_I(this, I_OnWhoisLine, OnWhoisLine(user, dest, numeric, copy_text));
 
-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>");
+       if (!MOD_RESULT)
+               user->WriteServ("%d %s", numeric, copy_text.c_str());
 }
 
-bool DirValid(char* dirandfile)
+void InspIRCd::SendWhoisLine(userrec* user, userrec* dest, int numeric, const char* format, ...)
 {
-        char work[MAXBUF];
-        strlcpy(work,dirandfile,MAXBUF);
-        int p = strlen(work);
-        // we just want the dir
-        while (strlen(work))
-        {
-                if (work[p] == '/')
-                {
-                        work[p] = '\0';
-                        break;
-                }
-                work[p--] = '\0';
-        }
-        char buffer[MAXBUF], otherdir[MAXBUF];
-        // Get the current working directory
-        if( getcwd( buffer, MAXBUF ) == NULL )
-                return false;
-        chdir(work);
-        if( getcwd( otherdir, MAXBUF ) == NULL )
-                return false;
-        chdir(buffer);
-        if (strlen(otherdir) >= strlen(work))
-        {
-                otherdir[strlen(work)] = '\0';
-                if (!strcmp(otherdir,work))
-                {
-                        return true;
-                }
-                return false;
-        }
-        else return false;
-}
+       char textbuffer[MAXBUF];
+       va_list argsPtr;
+       va_start (argsPtr, format);
+       vsnprintf(textbuffer, MAXBUF, format, argsPtr);
+       va_end(argsPtr);
 
-std::string GetFullProgDir(char** argv, int argc)
-{
-        char work[MAXBUF];
-        strlcpy(work,argv[0],MAXBUF);
-        int p = strlen(work);
-        // we just want the dir
-        while (strlen(work))
-        {
-                if (work[p] == '/')
-                {
-                        work[p] = '\0';
-                        break;
-                }
-                work[p--] = '\0';
-        }
-        char buffer[MAXBUF], otherdir[MAXBUF];
-        // Get the current working directory
-        if( getcwd( buffer, MAXBUF ) == NULL )
-                return "";
-        chdir(work);
-        if( getcwd( otherdir, MAXBUF ) == NULL )
-                return "";
-        chdir(buffer);
-        return otherdir;
+       this->SendWhoisLine(user, dest, numeric, std::string(textbuffer));
 }