Merge pull request #971 from SaberUK/master+numeric-xline

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

diff --git a/src/commands.cpp b/src/commands.cpp
index d805a1f6591df580feb874adf6e82b4990747f12..c72a5dc73b09a11255839dca6811508656f95d44 100644 (file)
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -21,103 +21,7 @@
  */
 
 
-/* $Core */
-
 #include "inspircd.h"
-#include "xline.h"
-#include "command_parse.h"
-
-/* All other ircds when doing this check usually just look for a string of *@* or *. We're smarter than that, though. */
-
-bool InspIRCd::HostMatchesEveryone(const std::string &mask, User* user)
-{
-       long matches = 0;
-
-       ConfigTag* insane = Config->ConfValue("insane");
-
-       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)) ||
-                   (InspIRCd::Match(u->second->MakeHostIP(), mask, ascii_case_insensitive_map)))
-               {
-                       matches++;
-               }
-       }
-
-       if (!matches)
-               return false;
-
-       float percent = ((float)matches / (float)this->Users->clientlist->size()) * 100;
-       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);
-               return true;
-       }
-       return false;
-}
-
-bool InspIRCd::IPMatchesEveryone(const std::string &ip, User* user)
-{
-       long matches = 0;
-
-       ConfigTag* insane = Config->ConfValue("insane");
-
-       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))
-                       matches++;
-       }
-
-       if (!matches)
-               return false;
-
-       float percent = ((float)matches / (float)this->Users->clientlist->size()) * 100;
-       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);
-               return true;
-       }
-       return false;
-}
-
-bool InspIRCd::NickMatchesEveryone(const std::string &nick, User* user)
-{
-       long matches = 0;
-
-       ConfigTag* insane = Config->ConfValue("insane");
-
-       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))
-                       matches++;
-       }
-
-       if (!matches)
-               return false;
-
-       float percent = ((float)matches / (float)this->Users->clientlist->size()) * 100;
-       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);
-               return true;
-       }
-       return false;
-}
 
 CmdResult SplitCommand::Handle(const std::vector<std::string>& parms, User* u)
 {
@@ -127,7 +31,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", DEFAULT, "Unknown user type in command (uuid=%s)!", u->uuid.c_str());
+       ServerInstance->Logs->Log("COMMAND", LOG_DEFAULT, "Unknown user type in command (uuid=%s)!", u->uuid.c_str());
        return CMD_INVALID;
 }
 
@@ -145,4 +49,3 @@ CmdResult SplitCommand::HandleServer(const std::vector<std::string>&, FakeUser*)
 {
        return CMD_INVALID;
 }
-