]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/command_parse.cpp
Wheee, mass commit! this adds const stafety, throwing a compile error if anyone does...
[user/henk/code/inspircd.git] / src / command_parse.cpp
index d03cb9296054d7ae1033973e1c2d32479898f5cf..57a86b0cde18b1e0a42ffd0e87c08118aef2b9da 100644 (file)
@@ -1,26 +1,25 @@
-       /*       +------------------------------------+
+/*       +------------------------------------+
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
+/* $Core: libIRCDcommand_parse */
+
 #include "inspircd.h"
-#include "configreader.h"
-#include <algorithm>
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
 #include "xline.h"
 #include "socketengine.h"
 #include "socket.h"
 #include "command_parse.h"
+#include "exitcodes.h"
 
 /* Directory Searching for Unix-Only */
 #ifndef WIN32
 #include <dlfcn.h>
 #endif
 
-bool InspIRCd::ULine(const char* server)
-{
-       if (!server)
-               return false;
-       if (!*server)
-               return true;
-
-       return (Config->ulines.find(server) != Config->ulines.end());
-}
-
-bool InspIRCd::SilentULine(const char* server)
-{
-       std::map<irc::string,bool>::iterator n = Config->ulines.find(server);
-       if (n != Config->ulines.end())
-               return n->second;
-       else return false;
-}
-
-int InspIRCd::OperPassCompare(const char* data,const char* input, int tagnumber)
+int InspIRCd::PassCompare(Extensible* ex, const char* data,const char* input, const char* hashtype)
 {
        int MOD_RESULT = 0;
-       FOREACH_RESULT_I(this,I_OnOperCompare,OnOperCompare(data, input, tagnumber))
+       FOREACH_RESULT_I(this,I_OnPassCompare,OnPassCompare(ex, data, input, hashtype))
        if (MOD_RESULT == 1)
                return 0;
        if (MOD_RESULT == -1)
@@ -57,54 +38,6 @@ int InspIRCd::OperPassCompare(const char* data,const char* input, int tagnumber)
        return strcmp(data,input);
 }
 
-std::string InspIRCd::TimeString(time_t curtime)
-{
-       return std::string(ctime(&curtime),24);
-}
-
-/** Refactored by Brain, Jun 2007. Much faster with some clever O(1) array
- * lookups and pointer maths.
- */
-long InspIRCd::Duration(const std::string &str)
-{
-       unsigned char multiplier = 0;
-       long total = 0;
-       long times = 1;
-       long subtotal = 0;
-
-       /* Iterate each item in the string, looking for number or multiplier */
-       for (std::string::const_reverse_iterator i = str.rbegin(); i != str.rend(); ++i)
-       {
-               /* Found a number, queue it onto the current number */
-               if ((*i >= '0') && (*i <= '9'))
-               {
-                       subtotal = subtotal + ((*i - '0') * times);
-                       times = times * 10;
-               }
-               else
-               {
-                       /* Found something thats not a number, find out how much
-                        * it multiplies the built up number by, multiply the total
-                        * and reset the built up number.
-                        */
-                       if (subtotal)
-                               total += subtotal * duration_multi[multiplier];
-
-                       /* Next subtotal please */
-                       subtotal = 0;
-                       multiplier = *i;
-                       times = 1;
-               }
-       }
-       if (multiplier)
-       {
-               total += subtotal * duration_multi[multiplier];
-               subtotal = 0;
-       }
-       /* Any trailing values built up are treated as raw seconds */
-       return total + subtotal;
-}
-
 /* LoopCall is used to call a command classes handler repeatedly based on the contents of a comma seperated list.
  * There are two overriden versions of this method, one of which takes two potential lists and the other takes one.
  * We need a version which takes two potential lists for JOIN, because a JOIN may contain two lists of items at once,
@@ -115,7 +48,7 @@ long InspIRCd::Duration(const std::string &str)
  * The second version is much simpler and just has the one stream to read, and is used in NAMES, WHOIS, PRIVMSG etc.
  * Both will only parse until they reach ServerInstance->Config->MaxTargets number of targets, to stop abuse via spam.
  */
-int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** parameters, int pcnt, unsigned int splithere, unsigned int extra)
+int CommandParser::LoopCall(User* user, Command* CommandObj, const char* const* parameters, int pcnt, unsigned int splithere, unsigned int extra)
 {
        /* First check if we have more than one item in the list, if we don't we return zero here and the handler
         * which called us just carries on as it was.
@@ -133,23 +66,25 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p
         */
        irc::commasepstream items1(parameters[splithere]);
        irc::commasepstream items2(parameters[extra]);
-       std::string item = "*";
+       std::string extrastuff;
+       std::string item;
        unsigned int max = 0;
 
        /* Attempt to iterate these lists and call the command objech
         * which called us, for every parameter pair until there are
         * no more left to parse.
         */
-       while (((item = items1.GetToken()) != "") && (max++ < ServerInstance->Config->MaxTargets))
+       while (items1.GetToken(item) && (max++ < ServerInstance->Config->MaxTargets))
        {
                if (dupes.find(item.c_str()) == dupes.end())
                {
-                       const char* new_parameters[127];
+                       const char* new_parameters[MAXPARAMETERS];
 
-                       for (int t = 0; (t < pcnt) && (t < 127); t++)
+                       for (int t = 0; (t < pcnt) && (t < MAXPARAMETERS); t++)
                                new_parameters[t] = parameters[t];
 
-                       std::string extrastuff = items2.GetToken();
+                       if (!items2.GetToken(extrastuff))
+                               extrastuff = "";
 
                        new_parameters[splithere] = item.c_str();
                        new_parameters[extra] = extrastuff.c_str();
@@ -162,7 +97,7 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p
        return 1;
 }
 
-int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** parameters, int pcnt, unsigned int splithere)
+int CommandParser::LoopCall(User* user, Command* CommandObj, const char* const* parameters, int pcnt, unsigned int splithere)
 {
        /* First check if we have more than one item in the list, if we don't we return zero here and the handler
         * which called us just carries on as it was.
@@ -174,26 +109,24 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p
 
        /* Only one commasepstream here */
        irc::commasepstream items1(parameters[splithere]);
-       std::string item = "*";
+       std::string item;
        unsigned int max = 0;
 
        /* Parse the commasepstream until there are no tokens remaining.
         * Each token we parse out, call the command handler that called us
         * with it
         */
-       while (((item = items1.GetToken()) != "") && (max++ < ServerInstance->Config->MaxTargets))
+       while (items1.GetToken(item) && (max++ < ServerInstance->Config->MaxTargets))
        {
                if (dupes.find(item.c_str()) == dupes.end())
                {
-                       const char* new_parameters[127];
+                       const char* new_parameters[MAXPARAMETERS];
 
-                       for (int t = 0; (t < pcnt) && (t < 127); t++)
+                       for (int t = 0; (t < pcnt) && (t < MAXPARAMETERS); t++)
                                new_parameters[t] = parameters[t];
 
                        new_parameters[splithere] = item.c_str();
 
-                       parameters[splithere] = item.c_str();
-
                        /* Execute the command handler over and over. If someone pulls our user
                         * record out from under us (e.g. if we /kill a comma sep list, and we're
                         * in that list ourselves) abort if we're gone.
@@ -210,20 +143,23 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p
        return 1;
 }
 
-bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, userrec * user)
+bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, User * user)
 {
-       command_table::iterator n = cmdlist.find(commandname);
+       Commandable::iterator n = cmdlist.find(commandname);
 
        if (n != cmdlist.end())
        {
                if ((pcnt>=n->second->min_params) && (n->second->source != "<core>"))
                {
-                       if ((!n->second->flags_needed) || (user->modes[n->second->flags_needed-65]))
+                       if (IS_LOCAL(user) && n->second->flags_needed)
                        {
-                               if (n->second->flags_needed)
+                               if (user->IsModeSet(n->second->flags_needed))
                                {
-                                       return ((user->HasPermission(commandname)) || (ServerInstance->ULine(user->server)));
+                                       return (user->HasPermission(commandname));
                                }
+                       }
+                       else
+                       {
                                return true;
                        }
                }
@@ -231,9 +167,9 @@ bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, use
        return false;
 }
 
-command_t* CommandParser::GetHandler(const std::string &commandname)
+Command* CommandParser::GetHandler(const std::string &commandname)
 {
-       command_table::iterator n = cmdlist.find(commandname);
+       Commandable::iterator n = cmdlist.find(commandname);
        if (n != cmdlist.end())
                return n->second;
 
@@ -242,36 +178,86 @@ command_t* CommandParser::GetHandler(const std::string &commandname)
 
 // calls a handler function for a command
 
-CmdResult CommandParser::CallHandler(const std::string &commandname,const char** parameters, int pcnt, userrec *user)
+CmdResult CommandParser::CallHandler(const std::string &commandname,const char* const* parameters, int pcnt, User *user)
 {
-       command_table::iterator n = cmdlist.find(commandname);
+       Commandable::iterator n = cmdlist.find(commandname);
 
        if (n != cmdlist.end())
        {
                if (pcnt >= n->second->min_params)
                {
-                       if ((!n->second->flags_needed) || (user->modes[n->second->flags_needed-65]))
+                       bool bOkay = false;
+
+                       if (IS_LOCAL(user) && n->second->flags_needed)
                        {
-                               if (n->second->flags_needed)
-                               {
-                                       if ((user->HasPermission(commandname)) || (!IS_LOCAL(user)))
-                                       {
-                                               return n->second->Handle(parameters,pcnt,user);
-                                       }
-                               }
-                               else
+                               /* if user is local, and flags are needed .. */
+
+                               if (user->IsModeSet(n->second->flags_needed))
                                {
-                                       return n->second->Handle(parameters,pcnt,user);
+                                       /* if user has the flags, and now has the permissions, go ahead */
+                                       if (user->HasPermission(commandname))
+                                               bOkay = true;
                                }
                        }
+                       else
+                       {
+                               /* remote or no flags required anyway */
+                               bOkay = true;
+                       }
+
+                       if (bOkay)
+                       {
+                               return n->second->Handle(parameters,pcnt,user);
+                       }
                }
        }
        return CMD_INVALID;
 }
 
-void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
+void CommandParser::DoLines(User* current, bool one_only)
 {
-       const char *command_p[127];
+       // while there are complete lines to process...
+       unsigned int floodlines = 0;
+
+       while (current->BufferIsReady())
+       {
+               if (current->MyClass)
+               {
+                       if (ServerInstance->Time() > current->reset_due)
+                       {
+                               current->reset_due = ServerInstance->Time() + current->MyClass->GetThreshold();
+                               current->lines_in = 0;
+                       }
+
+                       if (++current->lines_in > current->MyClass->GetFlood() && current->MyClass->GetFlood())
+                       {
+                               ServerInstance->FloodQuitUser(current);
+                               return;
+                       }
+
+                       if ((++floodlines > current->MyClass->GetFlood()) && (current->MyClass->GetFlood() != 0))
+                       {
+                               ServerInstance->FloodQuitUser(current);
+                               return;
+                       }
+               }
+
+               // use GetBuffer to copy single lines into the sanitized string
+               std::string single_line = current->GetBuffer();
+               current->bytes_in += single_line.length();
+               current->cmds_in++;
+               if (single_line.length() > MAXBUF - 2)  // MAXBUF is 514 to allow for neccessary line terminators
+                       single_line.resize(MAXBUF - 2); // So to trim to 512 here, we use MAXBUF - 2
+
+               // ProcessBuffer returns false if the user has gone over penalty
+               if (!ServerInstance->Parser->ProcessBuffer(single_line, current) || one_only)
+                       break;
+       }
+}
+
+bool CommandParser::ProcessCommand(User *user, std::string &cmd)
+{
+       const char *command_p[MAXPARAMETERS];
        int items = 0;
        irc::tokenstream tokens(cmd);
        std::string command;
@@ -285,7 +271,7 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
        if (*command.c_str() == ':')
                tokens.GetToken(command);
 
-       while (tokens.GetToken(para[items]) && (items < 127))
+       while (tokens.GetToken(para[items]) && (items < MAXPARAMETERS))
        {
                command_p[items] = para[items].c_str();
                items++;
@@ -296,82 +282,94 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
        int MOD_RESULT = 0;
        FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,false,cmd));
        if (MOD_RESULT == 1) {
-               return;
+               return true;
        }
 
-       command_table::iterator cm = cmdlist.find(command);
+       /* find the command, check it exists */
+       Commandable::iterator cm = cmdlist.find(command);
        
-       if (cm != cmdlist.end())
+       if (cm == cmdlist.end())
        {
-               if (user)
+               if (user->registered == REG_ALL)
                {
-                       /* activity resets the ping pending timer */
-                       user->nping = ServerInstance->Time() + user->pingmax;
-                       if (cm->second->flags_needed)
-                       {
-                               if (!user->IsModeSet(cm->second->flags_needed))
-                               {
-                                       user->WriteServ("481 %s :Permission Denied - You do not have the required operator privileges",user->nick);
-                                       return;
-                               }
-                               if (!user->HasPermission(command))
-                               {
-                                       user->WriteServ("481 %s :Permission Denied - Oper type %s does not have access to command %s",user->nick,user->oper,command.c_str());
-                                       return;
-                               }
-                       }
-                       if ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled()))
-                       {
-                               /* command is disabled! */
-                               user->WriteServ("421 %s %s :This command has been disabled.",user->nick,command.c_str());
-                               return;
-                       }
-                       if (items < cm->second->min_params)
-                       {
-                               user->WriteServ("461 %s %s :Not enough parameters.", user->nick, command.c_str());
-                               /* If syntax is given, display this as the 461 reply */
-                               if ((ServerInstance->Config->SyntaxHints) && (user->registered == REG_ALL) && (cm->second->syntax.length()))
-                                       user->WriteServ("304 %s :SYNTAX %s %s", user->nick, cm->second->command.c_str(), cm->second->syntax.c_str());
-                               return;
-                       }
-                       if ((user->registered == REG_ALL) || (cm->second->WorksBeforeReg()))
-                       {
-                               /* ikky /stats counters */
-                               cm->second->use_count++;
-                               cm->second->total_bytes += cmd.length();
-
-                               int MOD_RESULT = 0;
-                               FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,true,cmd));
-                               if (MOD_RESULT == 1)
-                                       return;
-
-                               /*
-                                * WARNING: nothing may come after the
-                                * command handler call, as the handler
-                                * may free the user structure!
-                                */
-                               CmdResult result = cm->second->Handle(command_p,items,user);
-
-                               FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, items, user, result,cmd));
-                               return;
-                       }
-                       else
-                       {
-                               user->WriteServ("451 %s :You have not registered",command.c_str());
-                               return;
-                       }
+                       user->WriteServ("421 %s %s :Unknown command",user->nick,command.c_str());
                }
+               ServerInstance->stats->statsUnknown++;
+               return true;
        }
-       else if (user)
+
+       /* Modify the user's penalty */
+       bool do_more = true;
+       if (!user->ExemptFromPenalty)
        {
-               ServerInstance->stats->statsUnknown++;
-               user->WriteServ("421 %s %s :Unknown command",user->nick,command.c_str());
+               user->IncreasePenalty(cm->second->Penalty);
+               do_more = (user->Penalty < 10);
+               if (!do_more)
+                       user->OverPenalty = true;
+       }
+
+       /* activity resets the ping pending timer */
+       if (user->MyClass)
+               user->nping = ServerInstance->Time() + user->MyClass->GetPingTime();
+
+       if (cm->second->flags_needed)
+       {
+               if (!user->IsModeSet(cm->second->flags_needed))
+               {
+                       user->WriteServ("481 %s :Permission Denied - You do not have the required operator privileges",user->nick);
+                       return do_more;
+               }
+               if (!user->HasPermission(command))
+               {
+                       user->WriteServ("481 %s :Permission Denied - Oper type %s does not have access to command %s",user->nick,user->oper,command.c_str());
+                       return do_more;
+               }
+       }
+       if ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled()))
+       {
+               /* command is disabled! */
+               user->WriteServ("421 %s %s :This command has been disabled.",user->nick,command.c_str());
+               ServerInstance->SNO->WriteToSnoMask('d', "%s denied for %s (%s@%s)",
+                               command.c_str(), user->nick, user->ident, user->host);
+               return do_more;
+       }
+       if (items < cm->second->min_params)
+       {
+               user->WriteServ("461 %s %s :Not enough parameters.", user->nick, command.c_str());
+               if ((ServerInstance->Config->SyntaxHints) && (user->registered == REG_ALL) && (cm->second->syntax.length()))
+                       user->WriteServ("304 %s :SYNTAX %s %s", user->nick, cm->second->command.c_str(), cm->second->syntax.c_str());
+               return do_more;
+       }
+       if ((user->registered != REG_ALL) && (!cm->second->WorksBeforeReg()))
+       {
+               user->WriteServ("451 %s :You have not registered",command.c_str());
+               return do_more;
+       }
+       else
+       {
+               /* passed all checks.. first, do the (ugly) stats counters. */
+               cm->second->use_count++;
+               cm->second->total_bytes += cmd.length();
+
+               /* module calls too */
+               MOD_RESULT = 0;
+               FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,true,cmd));
+               if (MOD_RESULT == 1)
+                       return do_more;
+
+               /*
+                * WARNING: be careful, the user may be deleted soon
+                */
+               CmdResult result = cm->second->Handle(command_p,items,user);
+
+               FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, items, user, result,cmd));
+               return do_more;
        }
 }
 
 bool CommandParser::RemoveCommands(const char* source)
 {
-       command_table::iterator i,safei;
+       Commandable::iterator i,safei;
        for (i = cmdlist.begin(); i != cmdlist.end(); i++)
        {
                safei = i;
@@ -389,21 +387,22 @@ bool CommandParser::RemoveCommands(const char* source)
        return true;
 }
 
-void CommandParser::RemoveCommand(command_table::iterator safei, const char* source)
+void CommandParser::RemoveCommand(Commandable::iterator safei, const char* source)
 {
-       command_t* x = safei->second;
+       Command* x = safei->second;
        if (x->source == std::string(source))
        {
                cmdlist.erase(safei);
+               delete x;
        }
 }
 
-void CommandParser::ProcessBuffer(std::string &buffer,userrec *user)
+bool CommandParser::ProcessBuffer(std::string &buffer,User *user)
 {
        std::string::size_type a;
 
        if (!user)
-               return;
+               return true;
 
        while ((a = buffer.rfind("\n")) != std::string::npos)
                buffer.erase(a);
@@ -412,15 +411,14 @@ void CommandParser::ProcessBuffer(std::string &buffer,userrec *user)
 
        if (buffer.length())
        {
-               if (!user->muted)
-               {
-                       ServerInstance->Log(DEBUG,"C[%d] -> :%s %s",user->GetFd(), user->nick, buffer.c_str());
-                       this->ProcessCommand(user,buffer);
-               }
+               ServerInstance->Logs->Log("USERINPUT", DEBUG,"C[%d] I :%s %s",user->GetFd(), user->nick, buffer.c_str());
+               return this->ProcessCommand(user,buffer);
        }
+
+       return true;
 }
 
-bool CommandParser::CreateCommand(command_t *f, void* so_handle)
+bool CommandParser::CreateCommand(Command *f, void* so_handle)
 {
        if (so_handle)
        {
@@ -445,22 +443,21 @@ bool CommandParser::CreateCommand(command_t *f, void* so_handle)
 CommandParser::CommandParser(InspIRCd* Instance) : ServerInstance(Instance)
 {
        para.resize(128);
-       this->SetupCommandTable();
 }
 
-bool CommandParser::FindSym(void** v, void* h)
+bool CommandParser::FindSym(void** v, void* h, const std::string &name)
 {
        *v = dlsym(h, "init_command");
        const char* err = dlerror();
        if (err && !(*v))
        {
-               ServerInstance->Log(SPARSE, "Error loading core command: %s\n", err);
+               ServerInstance->Log(SPARSE, "Error loading core command %s: %s\n", name.c_str(), err);
                return false;
        }
        return true;
 }
 
-bool CommandParser::ReloadCommand(const char* cmd)
+bool CommandParser::ReloadCommand(const char* cmd, User* user)
 {
        char filename[MAXBUF];
        char commandname[MAXBUF];
@@ -475,7 +472,7 @@ bool CommandParser::ReloadCommand(const char* cmd)
 
        if (command != RFCCommands.end())
        {
-               command_t* cmdptr = cmdlist.find(commandname)->second;
+               Command* cmdptr = cmdlist.find(commandname)->second;
                cmdlist.erase(cmdlist.find(commandname));
 
                for (char* x = commandname; *x; x++)
@@ -487,7 +484,13 @@ bool CommandParser::ReloadCommand(const char* cmd)
                RFCCommands.erase(command);
 
                snprintf(filename, MAXBUF, "cmd_%s.so", commandname);
-               this->LoadCommand(filename);
+               const char* err = this->LoadCommand(filename);
+               if (err)
+               {
+                       if (user)
+                               user->WriteServ("NOTICE %s :*** Error loading 'cmd_%s.so': %s", user->nick, cmd, err);
+                       return false;
+               }
 
                return true;
        }
@@ -495,50 +498,62 @@ bool CommandParser::ReloadCommand(const char* cmd)
        return false;
 }
 
-CmdResult cmd_reload::Handle(const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_reload::Handle(const char* const* parameters, int /* pcnt */, User *user)
 {
        user->WriteServ("NOTICE %s :*** Reloading command '%s'",user->nick, parameters[0]);
-       if (ServerInstance->Parser->ReloadCommand(parameters[0]))
+       if (ServerInstance->Parser->ReloadCommand(parameters[0], user))
        {
                user->WriteServ("NOTICE %s :*** Successfully reloaded command '%s'", user->nick, parameters[0]);
-               ServerInstance->WriteOpers("*** RELOAD: %s reloaded the '%s' command.", user->nick, parameters[0]);
+               ServerInstance->SNO->WriteToSnoMask('A', "RELOAD: %s reloaded the '%s' command.", user->nick, parameters[0]);
                return CMD_SUCCESS;
        }
        else
        {
-               user->WriteServ("NOTICE %s :*** Could not reload command '%s'", user->nick, parameters[0]);
+               user->WriteServ("NOTICE %s :*** Could not reload command '%s' -- fix this problem, then /REHASH as soon as possible!", user->nick, parameters[0]);
                return CMD_FAILURE;
        }
 }
 
-void CommandParser::LoadCommand(const char* name)
+const char* CommandParser::LoadCommand(const char* name)
 {
        char filename[MAXBUF];
        void* h;
-       command_t* (*cmd_factory_func)(InspIRCd*);
+       Command* (*cmd_factory_func)(InspIRCd*);
+
+       /* Command already exists? Succeed silently - this is needed for REHASH */
+       if (RFCCommands.find(name) != RFCCommands.end())
+       {
+               ServerInstance->Log(DEBUG,"Not reloading command %s/%s, it already exists", LIBRARYDIR, name);
+               return NULL;
+       }
 
        snprintf(filename, MAXBUF, "%s/%s", LIBRARYDIR, name);
        h = dlopen(filename, RTLD_NOW | RTLD_GLOBAL);
 
        if (!h)
        {
-               ServerInstance->Log(SPARSE, "Error loading core command: %s", dlerror());
-               return;
+               const char* n = dlerror();
+               ServerInstance->Log(SPARSE, "Error loading core command %s: %s", name, n);
+               return n;
        }
 
-       if (this->FindSym((void **)&cmd_factory_func, h))
+       if (this->FindSym((void **)&cmd_factory_func, h, name))
        {
-               command_t* newcommand = cmd_factory_func(ServerInstance);
+               Command* newcommand = cmd_factory_func(ServerInstance);
                this->CreateCommand(newcommand, h);
        }
+       return NULL;
 }
 
-void CommandParser::SetupCommandTable()
+void CommandParser::SetupCommandTable(User* user)
 {
        RFCCommands.clear();
 
-       printf("\nLoading core commands");
-       fflush(stdout);
+       if (!user)
+       {
+               printf("\nLoading core commands");
+               fflush(stdout);
+       }
 
        DIR* library = opendir(LIBRARYDIR);
        if (library)
@@ -548,15 +563,103 @@ void CommandParser::SetupCommandTable()
                {
                        if (match(entry->d_name, "cmd_*.so"))
                        {
-                               printf(".");
-                               fflush(stdout);
-                               this->LoadCommand(entry->d_name);
+                               if (!user)
+                               {
+                                       printf(".");
+                                       fflush(stdout);
+                               }
+                               const char* err = this->LoadCommand(entry->d_name);
+                               if (err)
+                               {
+                                       if (user)
+                                       {
+                                               user->WriteServ("NOTICE %s :*** Failed to load core command %s: %s", user->nick, entry->d_name, err);
+                                       }
+                                       else
+                                       {
+                                               printf("Error loading %s: %s", entry->d_name, err);
+                                               exit(EXIT_STATUS_BADHANDLER);
+                                       }
+                               }
                        }
                }
                closedir(library);
-               printf("\n");
+               if (!user)
+                       printf("\n");
+       }
+
+       if (cmdlist.find("RELOAD") == cmdlist.end())
+               this->CreateCommand(new cmd_reload(ServerInstance));
+}
+
+int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, std::string &dest)
+{
+       User* user = NULL;
+       std::string item;
+       int translations = 0;
+       dest.clear();
+
+       switch (to)
+       {
+               case TR_NICK:
+                       /* Translate single nickname */
+                       user = ServerInstance->FindNick(source);
+                       if (user)
+                       {
+                               dest = user->uuid;
+                               translations++;
+                       }
+                       else
+                               dest = source;
+               break;
+               case TR_NICKLIST:
+               {
+                       /* Translate comma seperated list of nicknames */
+                       irc::commasepstream items(source);
+                       while (items.GetToken(item))
+                       {
+                               user = ServerInstance->FindNick(item);
+                               if (user)
+                               {
+                                       dest.append(user->uuid);
+                                       translations++;
+                               }
+                               else
+                                       dest.append(item);
+                               dest.append(",");
+                       }
+                       if (!dest.empty())
+                               dest.erase(dest.end() - 1);
+               }
+               break;
+               case TR_SPACENICKLIST:
+               {
+                       /* Translate space seperated list of nicknames */
+                       irc::spacesepstream items(source);
+                       while (items.GetToken(item))
+                       {
+                               user = ServerInstance->FindNick(item);
+                               if (user)
+                               {
+                                       dest.append(user->uuid);
+                                       translations++;
+                               }
+                               else
+                                       dest.append(item);
+                               dest.append(" ");
+                       }
+                       if (!dest.empty())
+                               dest.erase(dest.end() - 1);
+               }
+               break;
+               case TR_END:
+               case TR_TEXT:
+               default:
+                       /* Do nothing */
+                       dest = source;
+               break;
        }
 
-       this->CreateCommand(new cmd_reload(ServerInstance));
+       return translations;
 }