1 files changed, 13 insertions, 103 deletions

diff --git a/src/commands.cpp b/src/commands.cpp
index 5bf2aeb03..c5b34c72f 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -21,128 +21,38 @@
  */
 
 
-/* $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)
+CmdResult SplitCommand::Handle(User* user, const Params& parameters)
 {
-	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++)
+	switch (user->usertype)
 	{
-		if ((InspIRCd::MatchCIDR(u->second->MakeHost(), mask, ascii_case_insensitive_map)) ||
-		    (InspIRCd::MatchCIDR(u->second->MakeHostIP(), mask, ascii_case_insensitive_map)))
-		{
-			matches++;
-		}
-	}
+		case USERTYPE_LOCAL:
+			return HandleLocal(static_cast<LocalUser*>(user), parameters);
 
-	if (!matches)
-		return false;
+		case USERTYPE_REMOTE:
+			return HandleRemote(static_cast<RemoteUser*>(user), parameters);
 
-	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;
+		case USERTYPE_SERVER:
+			return HandleServer(static_cast<FakeUser*>(user), parameters);
 	}
-	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::MatchCIDR(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)
-{
-	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());
+	ServerInstance->Logs->Log("COMMAND", LOG_DEFAULT, "Unknown user type %d in command (uuid=%s)!",
+		user->usertype, user->uuid.c_str());
 	return CMD_INVALID;
 }
 
-CmdResult SplitCommand::HandleLocal(const std::vector<std::string>&, LocalUser*)
+CmdResult SplitCommand::HandleLocal(LocalUser* user, const Params& parameters)
 {
 	return CMD_INVALID;
 }
 
-CmdResult SplitCommand::HandleRemote(const std::vector<std::string>&, RemoteUser*)
+CmdResult SplitCommand::HandleRemote(RemoteUser* user, const Params& parameters)
 {
 	return CMD_INVALID;
 }
 
-CmdResult SplitCommand::HandleServer(const std::vector<std::string>&, FakeUser*)
+CmdResult SplitCommand::HandleServer(FakeUser* user, const Params& parameters)
 {
 	return CMD_INVALID;
 }
-