Rewrote the color codes parser to be one function, not two

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

diff --git a/src/commands.cpp b/src/commands.cpp
index a1a190502ec9e47be2ee4d4d43a1bbf4392e564e..c68c63cc51a426c62cecf67bcefa5cf415454307 100644 (file)
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -25,7 +25,7 @@ bool InspIRCd::HostMatchesEveryone(const std::string &mask, User* user)
 
        ConfigTag* insane = Config->ConfValue("insane");
 
-       if (!insane || !insane->getBool("hostmasks"))
+       if (insane->getBool("hostmasks"))
                return false;
 
        float itrigger = insane->getFloat("trigger", 95.5);
@@ -57,7 +57,7 @@ bool InspIRCd::IPMatchesEveryone(const std::string &ip, User* user)
 
        ConfigTag* insane = Config->ConfValue("insane");
 
-       if (!insane || !insane->getBool("ipmasks"))
+       if (insane->getBool("ipmasks"))
                return false;
 
        float itrigger = insane->getFloat("trigger", 95.5);
@@ -86,7 +86,7 @@ bool InspIRCd::NickMatchesEveryone(const std::string &nick, User* user)
 
        ConfigTag* insane = Config->ConfValue("insane");
 
-       if (!insane || !insane->getBool("nickmasks"))
+       if (insane->getBool("nickmasks"))
                return false;
 
        float itrigger = insane->getFloat("trigger", 95.5);
@@ -117,7 +117,7 @@ CmdResult SplitCommand::Handle(const std::vector<std::string>& parms, User* u)
                return HandleRemote(parms, IS_REMOTE(u));
        if (IS_SERVER(u))
                return HandleServer(parms, IS_SERVER(u));
-       ServerInstance->Logs->Log("COMMAND", ERROR, "Unknown user type in command (fd=%d)!", u->GetFd());
+       ServerInstance->Logs->Log("COMMAND", DEFAULT, "Unknown user type in command (uuid=%s)!", u->uuid.c_str());
        return CMD_INVALID;
 }