Fixed bug #418 (incorrect numerics for part of /ADMIN and /USERS) - patch by Zaba

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

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 8e6627d1f5c8f35c5c0089c01c9ee3edce787668..1defef04711d9a38f8c8c3c8f218c1c3463b8eb4 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"
 
@@ -31,7 +27,7 @@ static time_t LAST = 0;
 void InspIRCd::Log(int level, const char* text, ...)
 {
        /* sanity check, just in case */
-       if (!this->Config)
+       if (!this->Config || !this->Logger)
                return;
 
        /* Do this check again here so that we save pointless vsnprintf calls */
@@ -51,7 +47,7 @@ void InspIRCd::Log(int level, const char* text, ...)
 void InspIRCd::Log(int level, const std::string &text)
 {
        /* sanity check, just in case */
-       if (!this->Config)
+       if (!this->Config || !this->Logger)
                return;
 
        /* If we were given -debug we output all messages, regardless of configured loglevel */
@@ -236,6 +232,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)
 {
+       if (!nick.empty() && isdigit(*nick.begin()))
+               return FindUUID(nick);
+
        user_hash::iterator iter = clientlist->find(nick);
 
        if (iter == clientlist->end())
@@ -247,6 +246,9 @@ userrec* InspIRCd::FindNick(const std::string &nick)
 
 userrec* InspIRCd::FindNick(const char* nick)
 {
+       if (isdigit(*nick))
+               return FindUUID(nick);
+
        user_hash::iterator iter = clientlist->find(nick);
        
        if (iter == clientlist->end())
@@ -255,6 +257,41 @@ userrec* InspIRCd::FindNick(const char* nick)
        return iter->second;
 }
 
+userrec* InspIRCd::FindNickOnly(const std::string &nick)
+{
+       user_hash::iterator iter = clientlist->find(nick);
+
+       if (iter == clientlist->end())
+               return NULL;
+
+       return iter->second;
+}
+
+userrec* InspIRCd::FindNickOnly(const char* nick)
+{
+       user_hash::iterator iter = clientlist->find(nick);
+
+       if (iter == clientlist->end())
+               return NULL;
+
+       return iter->second;
+}
+
+userrec *InspIRCd::FindUUID(const std::string &uid)
+{
+       return FindUUID(uid.c_str());
+}
+
+userrec *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)
 {
@@ -418,7 +455,7 @@ bool IsNickHandler::Call(const char* n)
 }
 
 /* return true for good ident, false else */
-bool InspIRCd::IsIdent(const char* n)
+bool IsIdentHandler::Call(const char* n)
 {
        if (!n || !*n)
                return false;
@@ -442,7 +479,7 @@ bool InspIRCd::IsIdent(const char* n)
 }
 
 /* open the proper logfile */
-void InspIRCd::OpenLog(char** argv, int argc)
+bool InspIRCd::OpenLog(char** argv, int argc)
 {
        Config->MyDir = Config->GetFullProgDir();
 
@@ -462,11 +499,12 @@ void InspIRCd::OpenLog(char** argv, int argc)
 
        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 = NULL;
+               return false;
        }
 
        this->Logger = new FileLogger(this, Config->log_file);
+       return true;
 }
 
 void InspIRCd::CheckRoot()
@@ -489,29 +527,6 @@ 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)
 {
        std::string copy_text = text;
@@ -533,4 +548,3 @@ void InspIRCd::SendWhoisLine(userrec* user, userrec* dest, int numeric, const ch
 
        this->SendWhoisLine(user, dest, numeric, std::string(textbuffer));
 }
-