X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands.cpp;h=382783c71c65b298c1449223a02b3b7c944590b2;hb=e078fae142238765f279b50c309f22a5a0761ce4;hp=c31885483df4d404922c8678747078575898e409;hpb=aa66651cdc6e3aee74e8f0ed2c064fc3daa3fd05;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands.cpp b/src/commands.cpp
index c31885483..382783c71 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,97 +11,16 @@
  * ---------------------------------------------------
  */
 
+/* $Core: libIRCDcommands */
+
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
 #include "xline.h"
 #include "command_parse.h"
 
-bool InspIRCd::ULine(const char* server)
-{
-	if (!server)
-		return false;
-	if (!*server)
-		return true;
-
-	return (find(Config->ulines.begin(),Config->ulines.end(),server) != Config->ulines.end());
-}
-
-int InspIRCd::OperPassCompare(const char* data,const char* input, int tagnum)
-{
-	int MOD_RESULT = 0;
-	FOREACH_RESULT_I(this,I_OnOperCompare,OnOperCompare(data, input, tagnum))
-	if (MOD_RESULT == 1)
-		return 0;
-	if (MOD_RESULT == -1)
-		return 1;
-	return strcmp(data,input);
-}
-
-long InspIRCd::Duration(const char* str)
-{
-	char n_field[MAXBUF];
-	long total = 0;
-	n_field[0] = 0;
-
-	if ((!strchr(str,'s')) && (!strchr(str,'m')) && (!strchr(str,'h')) && (!strchr(str,'d')) && (!strchr(str,'w')) && (!strchr(str,'y')))
-	{
-		std::string n = str;
-		n += 's';
-		return Duration(n.c_str());
-	}
-	
-	for (char* i = (char*)str; *i; i++)
-	{
-		// if we have digits, build up a string for the value in n_field,
-		// up to 10 digits in size.
-		if ((*i >= '0') && (*i <= '9'))
-		{
-			strlcat(n_field,i,10);
-		}
-		else
-		{
-			// we dont have a digit, check for numeric tokens
-			switch (tolower(*i))
-			{
-				case 's':
-					total += atoi(n_field);
-				break;
-
-				case 'm':
-					total += (atoi(n_field)*duration_m);
-				break;
-
-				case 'h':
-					total += (atoi(n_field)*duration_h);
-				break;
-
-				case 'd':
-					total += (atoi(n_field)*duration_d);
-				break;
-
-				case 'w':
-					total += (atoi(n_field)*duration_w);
-				break;
-
-				case 'y':
-					total += (atoi(n_field)*duration_y);
-				break;
-			}
-			n_field[0] = 0;
-		}
-	}
-	// add trailing seconds
-	total += atoi(n_field);
-	
-	return total;
-}
-
 /* 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;
@@ -112,9 +31,9 @@ bool InspIRCd::HostMatchesEveryone(const std::string &mask, userrec* user)
 	if (Config->ConfValueBool(Config->config_data, "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 ((match(u->second->MakeHost(), mask, true)) || (match(u->second->MakeHostIP(), mask, true)))
 		{
 			matches++;
 		}
@@ -123,16 +42,16 @@ 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;
@@ -143,25 +62,25 @@ bool InspIRCd::IPMatchesEveryone(const std::string &ip, userrec* user)
 	if (Config->ConfValueBool(Config->config_data, "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 (match(u->second->GetIPString(),ip,true))
 			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;
@@ -172,19 +91,19 @@ bool InspIRCd::NickMatchesEveryone(const std::string &nick, userrec* user)
 	if (Config->ConfValueBool(Config->config_data, "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 (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;