In the grand tradition of huge fucking commits:

[user/henk/code/inspircd.git] / src / helperfuncs.cpp

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index d4fef141b609b6a90ab50eeadf1794e0feacb8e4..a90dd01050063f5d83605c5cf326f65bfd29e968 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -13,11 +13,7 @@
 
 #include "inspircd.h"
 #include <stdarg.h>
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
-#include "mode.h"
 #include "xline.h"
 #include "exitcodes.h"
 
@@ -118,9 +114,9 @@ void InspIRCd::WriteOpers(const char* text, ...)
 
 void InspIRCd::WriteOpers(const std::string &text)
 {
-       for (std::vector<userrec*>::iterator i = this->all_opers.begin(); i != this->all_opers.end(); i++)
+       for (std::list<User*>::iterator i = this->all_opers.begin(); i != this->all_opers.end(); i++)
        {
-               userrec* a = *i;
+               User* a = *i;
                if (IS_LOCAL(a) && a->IsModeSet('s'))
                {
                        // send server notices to all with +s
@@ -143,9 +139,9 @@ void InspIRCd::ServerNoticeAll(char* text, ...)
 
        snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s",Config->ServerName,textbuffer);
 
-       for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+       for (std::vector<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
-               userrec* t = *i;
+               User* t = *i;
                t->WriteServ(std::string(formatbuffer));
        }
 }
@@ -164,9 +160,9 @@ void InspIRCd::ServerPrivmsgAll(char* text, ...)
 
        snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s",Config->ServerName,textbuffer);
 
-       for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+       for (std::vector<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
-               userrec* t = *i;
+               User* t = *i;
                t->WriteServ(std::string(formatbuffer));
        }
 }
@@ -190,9 +186,9 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...)
 
        if (flags == WM_AND)
        {
-               for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+               for (std::vector<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
                {
-                       userrec* t = *i;
+                       User* t = *i;
                        bool send_to_user = true;
 
                        for (int n = 0; n < modelen; n++)
@@ -211,9 +207,9 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...)
        }
        else if (flags == WM_OR)
        {
-               for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+               for (std::vector<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
                {
-                       userrec* t = *i;
+                       User* t = *i;
                        bool send_to_user = false;
 
                        for (int n = 0; n < modelen; n++)
@@ -234,9 +230,9 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...)
 }
 
 /* Find a user record by nickname and return a pointer to it */
-userrec* InspIRCd::FindNick(const std::string &nick)
+User* InspIRCd::FindNick(const std::string &nick)
 {
-       if (!nick.empty() && isnumeric(*nick.begin()))
+       if (!nick.empty() && isdigit(*nick.begin()))
                return FindUUID(nick);
 
        user_hash::iterator iter = clientlist->find(nick);
@@ -248,9 +244,9 @@ userrec* InspIRCd::FindNick(const std::string &nick)
        return iter->second;
 }
 
-userrec* InspIRCd::FindNick(const char* nick)
+User* InspIRCd::FindNick(const char* nick)
 {
-       if (isnumeric(*nick))
+       if (isdigit(*nick))
                return FindUUID(nick);
 
        user_hash::iterator iter = clientlist->find(nick);
@@ -261,28 +257,43 @@ userrec* InspIRCd::FindNick(const char* nick)
        return iter->second;
 }
 
-userrec *InspIRCd::FindUUID(const std::string &uid)
+User* InspIRCd::FindNickOnly(const std::string &nick)
 {
-       return InspIRCd::FindUUID(uid.c_str());
+       user_hash::iterator iter = clientlist->find(nick);
+
+       if (iter == clientlist->end())
+               return NULL;
+
+       return iter->second;
 }
 
-userrec *InspIRCd::FindUUID(const char *uid)
+User* InspIRCd::FindNickOnly(const char* nick)
 {
-       for (user_hash::const_iterator a = this->clientlist->begin(); a != this->clientlist->end(); a++)
-       {
-               userrec *u = a->second;
+       user_hash::iterator iter = clientlist->find(nick);
 
-               if (strcmp(u->uuid, uid) == 0)
-               {
-                       return u;
-               }
-       }
+       if (iter == clientlist->end())
+               return NULL;
 
-       return NULL;
+       return iter->second;
+}
+
+User *InspIRCd::FindUUID(const std::string &uid)
+{
+       return FindUUID(uid.c_str());
+}
+
+User *InspIRCd::FindUUID(const char *uid)
+{
+       user_hash::iterator finduuid = uuidlist->find(uid);
+
+       if (finduuid == uuidlist->end())
+               return NULL;
+
+       return finduuid->second;
 }
 
 /* find a channel record by channel name and return a pointer to it */
-chanrec* InspIRCd::FindChan(const char* chan)
+Channel* InspIRCd::FindChan(const char* chan)
 {
        chan_hash::iterator iter = chanlist->find(chan);
 
@@ -293,7 +304,7 @@ chanrec* InspIRCd::FindChan(const char* chan)
        return iter->second;
 }
 
-chanrec* InspIRCd::FindChan(const std::string &chan)
+Channel* InspIRCd::FindChan(const std::string &chan)
 {
        chan_hash::iterator iter = chanlist->find(chan);
 
@@ -307,7 +318,7 @@ chanrec* InspIRCd::FindChan(const std::string &chan)
 /* Send an error notice to all users, registered or not */
 void InspIRCd::SendError(const std::string &s)
 {
-       for (std::vector<userrec*>::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
+       for (std::vector<User*>::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
        {
                if ((*i)->registered == REG_ALL)
                {
@@ -516,30 +527,7 @@ void InspIRCd::CheckDie()
        }
 }
 
-/* We must load the modules AFTER initializing the socket engine, now */
-void InspIRCd::LoadAllModules()
-{
-       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 InspIRCd::SendWhoisLine(userrec* user, userrec* dest, int numeric, const std::string &text)
+void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const std::string &text)
 {
        std::string copy_text = text;
 
@@ -550,7 +538,7 @@ void InspIRCd::SendWhoisLine(userrec* user, userrec* dest, int numeric, const st
                user->WriteServ("%d %s", numeric, copy_text.c_str());
 }
 
-void InspIRCd::SendWhoisLine(userrec* user, userrec* dest, int numeric, const char* format, ...)
+void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const char* format, ...)
 {
        char textbuffer[MAXBUF];
        va_list argsPtr;
@@ -560,4 +548,3 @@ void InspIRCd::SendWhoisLine(userrec* user, userrec* dest, int numeric, const ch
 
        this->SendWhoisLine(user, dest, numeric, std::string(textbuffer));
 }
-