X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands.cpp;h=db2074d87e85dd82576a280230ec010f55fc58a3;hb=090e7b616104723960ab51d8faa966af333eb15d;hp=7f74471c8b040c8d26e6b4f913c36ac1aa0e3bcd;hpb=4bbca0643b56f26f73a05462d226b2dd8871626b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands.cpp b/src/commands.cpp
index 7f74471c8..db2074d87 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,27 +11,29 @@
  * ---------------------------------------------------
  */
 
+/* $Core */
+
 #include "inspircd.h"
-#include "wildcard.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, userrec* user)
+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))
+
+	if (!Config->ConfValue("insane","trigger", 0, itrigger, MAXBUF))
 		strlcpy(itrigger,"95.5",MAXBUF);
-	
-	if (Config->ConfValueBool(Config->config_data, "insane","hostmasks", 0))
+
+	if (Config->ConfValueBool("insane","hostmasks", 0))
 		return false;
-	
-	for (user_hash::iterator u = clientlist->begin(); u != clientlist->end(); u++)
+
+	for (user_hash::iterator u = this->Users->clientlist->begin(); u != this->Users->clientlist->end(); u++)
 	{
-		if ((match(u->second->MakeHost(),mask.c_str(),true)) || (match(u->second->MakeHostIP(),mask.c_str(),true)))
+		if ((InspIRCd::Match(u->second->MakeHost(), mask, ascii_case_insensitive_map)) ||
+		    (InspIRCd::Match(u->second->MakeHostIP(), mask, ascii_case_insensitive_map)))
 		{
 			matches++;
 		}
@@ -40,68 +42,68 @@ bool InspIRCd::HostMatchesEveryone(const std::string &mask, userrec* user)
 	if (!matches)
 		return false;
 
-	float percent = ((float)matches / (float)clientlist->size()) * 100;
+	float percent = ((float)matches / (float)this->Users->clientlist->size()) * 100;
 	if (percent > (float)atof(itrigger))
 	{
-		WriteOpers("*** \2WARNING\2: %s tried to set a G/K/E line mask of %s, which covers %.2f%% of the network!",user->nick,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;
 }
 
-bool InspIRCd::IPMatchesEveryone(const std::string &ip, userrec* 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))
+
+	if (!Config->ConfValue("insane","trigger",0,itrigger,MAXBUF))
 		strlcpy(itrigger,"95.5",MAXBUF);
-	
-	if (Config->ConfValueBool(Config->config_data, "insane","ipmasks",0))
+
+	if (Config->ConfValueBool("insane","ipmasks",0))
 		return false;
-	
-	for (user_hash::iterator u = clientlist->begin(); u != clientlist->end(); u++)
+
+	for (user_hash::iterator u = this->Users->clientlist->begin(); u != this->Users->clientlist->end(); u++)
 	{
-		if (match(u->second->GetIPString(),ip.c_str(),true))
+		if (InspIRCd::Match(u->second->GetIPString(), ip, ascii_case_insensitive_map))
 			matches++;
 	}
 
 	if (!matches)
 		return false;
 
-	float percent = ((float)matches / (float)clientlist->size()) * 100;
+	float percent = ((float)matches / (float)this->Users->clientlist->size()) * 100;
 	if (percent > (float)atof(itrigger))
 	{
-		WriteOpers("*** \2WARNING\2: %s tried to set a Z line mask of %s, which covers %.2f%% of the network!",user->nick,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;
 }
 
-bool InspIRCd::NickMatchesEveryone(const std::string &nick, userrec* 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))
+
+	if (!Config->ConfValue("insane","trigger",0,itrigger,MAXBUF))
 		strlcpy(itrigger,"95.5",MAXBUF);
-	
-	if (Config->ConfValueBool(Config->config_data, "insane","nickmasks",0))
+
+	if (Config->ConfValueBool("insane","nickmasks",0))
 		return false;
 
-	for (user_hash::iterator u = clientlist->begin(); u != clientlist->end(); u++)
+	for (user_hash::iterator u = this->Users->clientlist->begin(); u != this->Users->clientlist->end(); u++)
 	{
-		if (match(u->second->nick,nick.c_str()))
+		if (InspIRCd::Match(u->second->nick, nick))
 			matches++;
 	}
 
 	if (!matches)
 		return false;
 
-	float percent = ((float)matches / (float)clientlist->size()) * 100;
+	float percent = ((float)matches / (float)this->Users->clientlist->size()) * 100;
 	if (percent > (float)atof(itrigger))
 	{
-		WriteOpers("*** \2WARNING\2: %s tried to set a Q line mask of %s, which covers %.2f%% of the network!",user->nick,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;