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 9a388684f5d6284b1434a8214717af3fa8280829..c68c63cc51a426c62cecf67bcefa5cf415454307 100644 (file)
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -21,15 +21,15 @@
 
 bool InspIRCd::HostMatchesEveryone(const std::string &mask, User* user)
 {
-       char itrigger[MAXBUF];
        long matches = 0;
 
-       if (!Config->ConfValue(Config->config_data, "insane","trigger", 0, itrigger, MAXBUF))
-               strlcpy(itrigger,"95.5",MAXBUF);
+       ConfigTag* insane = Config->ConfValue("insane");
 
-       if (Config->ConfValueBool(Config->config_data, "insane","hostmasks", 0))
+       if (insane->getBool("hostmasks"))
                return false;
 
+       float itrigger = insane->getFloat("trigger", 95.5);
+
        for (user_hash::iterator u = this->Users->clientlist->begin(); u != this->Users->clientlist->end(); u++)
        {
                if ((InspIRCd::Match(u->second->MakeHost(), mask, ascii_case_insensitive_map)) ||
@@ -43,9 +43,9 @@ bool InspIRCd::HostMatchesEveryone(const std::string &mask, User* user)
                return false;
 
        float percent = ((float)matches / (float)this->Users->clientlist->size()) * 100;
-       if (percent > (float)atof(itrigger))
+       if (percent > itrigger)
        {
-               SNO->WriteToSnoMask('A', "\2WARNING\2: %s tried to set a G/K/E line mask of %s, which covers %.2f%% of the network!",user->nick.c_str(),mask.c_str(),percent);
+               SNO->WriteToSnoMask('a', "\2WARNING\2: %s tried to set a G/K/E line mask of %s, which covers %.2f%% of the network!",user->nick.c_str(),mask.c_str(),percent);
                return true;
        }
        return false;
@@ -53,15 +53,15 @@ bool InspIRCd::HostMatchesEveryone(const std::string &mask, User* user)
 
 bool InspIRCd::IPMatchesEveryone(const std::string &ip, User* user)
 {
-       char itrigger[MAXBUF];
        long matches = 0;
 
-       if (!Config->ConfValue(Config->config_data, "insane","trigger",0,itrigger,MAXBUF))
-               strlcpy(itrigger,"95.5",MAXBUF);
+       ConfigTag* insane = Config->ConfValue("insane");
 
-       if (Config->ConfValueBool(Config->config_data, "insane","ipmasks",0))
+       if (insane->getBool("ipmasks"))
                return false;
 
+       float itrigger = insane->getFloat("trigger", 95.5);
+
        for (user_hash::iterator u = this->Users->clientlist->begin(); u != this->Users->clientlist->end(); u++)
        {
                if (InspIRCd::Match(u->second->GetIPString(), ip, ascii_case_insensitive_map))
@@ -72,9 +72,9 @@ bool InspIRCd::IPMatchesEveryone(const std::string &ip, User* user)
                return false;
 
        float percent = ((float)matches / (float)this->Users->clientlist->size()) * 100;
-       if (percent > (float)atof(itrigger))
+       if (percent > itrigger)
        {
-               SNO->WriteToSnoMask('A', "\2WARNING\2: %s tried to set a Z line mask of %s, which covers %.2f%% of the network!",user->nick.c_str(),ip.c_str(),percent);
+               SNO->WriteToSnoMask('a', "\2WARNING\2: %s tried to set a Z line mask of %s, which covers %.2f%% of the network!",user->nick.c_str(),ip.c_str(),percent);
                return true;
        }
        return false;
@@ -82,15 +82,15 @@ bool InspIRCd::IPMatchesEveryone(const std::string &ip, User* user)
 
 bool InspIRCd::NickMatchesEveryone(const std::string &nick, User* user)
 {
-       char itrigger[MAXBUF];
        long matches = 0;
 
-       if (!Config->ConfValue(Config->config_data, "insane","trigger",0,itrigger,MAXBUF))
-               strlcpy(itrigger,"95.5",MAXBUF);
+       ConfigTag* insane = Config->ConfValue("insane");
 
-       if (Config->ConfValueBool(Config->config_data, "insane","nickmasks",0))
+       if (insane->getBool("nickmasks"))
                return false;
 
+       float itrigger = insane->getFloat("trigger", 95.5);
+
        for (user_hash::iterator u = this->Users->clientlist->begin(); u != this->Users->clientlist->end(); u++)
        {
                if (InspIRCd::Match(u->second->nick, nick))
@@ -101,10 +101,38 @@ bool InspIRCd::NickMatchesEveryone(const std::string &nick, User* user)
                return false;
 
        float percent = ((float)matches / (float)this->Users->clientlist->size()) * 100;
-       if (percent > (float)atof(itrigger))
+       if (percent > itrigger)
        {
-               SNO->WriteToSnoMask('A', "\2WARNING\2: %s tried to set a Q line mask of %s, which covers %.2f%% of the network!",user->nick.c_str(),nick.c_str(),percent);
+               SNO->WriteToSnoMask('a', "\2WARNING\2: %s tried to set a Q line mask of %s, which covers %.2f%% of the network!",user->nick.c_str(),nick.c_str(),percent);
                return true;
        }
        return false;
 }
+
+CmdResult SplitCommand::Handle(const std::vector<std::string>& parms, User* u)
+{
+       if (IS_LOCAL(u))
+               return HandleLocal(parms, IS_LOCAL(u));
+       if (IS_REMOTE(u))
+               return HandleRemote(parms, IS_REMOTE(u));
+       if (IS_SERVER(u))
+               return HandleServer(parms, IS_SERVER(u));
+       ServerInstance->Logs->Log("COMMAND", DEFAULT, "Unknown user type in command (uuid=%s)!", u->uuid.c_str());
+       return CMD_INVALID;
+}
+
+CmdResult SplitCommand::HandleLocal(const std::vector<std::string>&, LocalUser*)
+{
+       return CMD_INVALID;
+}
+
+CmdResult SplitCommand::HandleRemote(const std::vector<std::string>&, RemoteUser*)
+{
+       return CMD_INVALID;
+}
+
+CmdResult SplitCommand::HandleServer(const std::vector<std::string>&, FakeUser*)
+{
+       return CMD_INVALID;
+}
+