X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusermanager.cpp;h=538feaade093e2d1bc2cb36e3eb3c6002b7c97ea;hb=e35772f19024fb12edda9cff19d3812272f444db;hp=c7d9a61a1921a8dad3025a201a872a7a6e0b2047;hpb=f2febe8ff61766f1b57305fae873071de4526d58;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index c7d9a61a1..538feaade 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -23,6 +23,7 @@
 #include "inspircd.h"
 #include "xline.h"
 #include "bancache.h"
+#include "iohook.h"
 
 UserManager::UserManager()
 	: clientlist(new user_hash)
@@ -62,7 +63,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 	UserIOHandler* eh = &New->eh;
 
 	/* Give each of the modules an attempt to hook the user for I/O */
-	FOREACH_MOD(I_OnHookIO, OnHookIO(eh, via));
+	FOREACH_MOD(OnHookIO, (eh, via));
 
 	if (eh->GetIOHook())
 	{
@@ -111,7 +112,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 	 * Check connect class settings and initialise settings into User.
 	 * This will be done again after DNS resolution. -- w00t
 	 */
-	New->CheckClass();
+	New->CheckClass(ServerInstance->Config->CCOnConnect);
 	if (New->quitting)
 		return;
 
@@ -128,8 +129,8 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 		{
 			/* user banned */
 			ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCache: Positive hit for " + New->GetIPString());
-			if (!ServerInstance->Config->MoronBanner.empty())
-				New->WriteNotice("*** " +  ServerInstance->Config->MoronBanner);
+			if (!ServerInstance->Config->XLineMessage.empty())
+				New->WriteNotice("*** " +  ServerInstance->Config->XLineMessage);
 			this->QuitUser(New, b->Reason);
 			return;
 		}
@@ -161,11 +162,11 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 	if (ServerInstance->Config->RawLog)
 		New->WriteNotice("*** Raw I/O logging is enabled on this server. All messages, passwords, and commands are being recorded.");
 
-	FOREACH_MOD(I_OnSetUserIP,OnSetUserIP(New));
+	FOREACH_MOD(OnSetUserIP, (New));
 	if (New->quitting)
 		return;
 
-	FOREACH_MOD(I_OnUserInit,OnUserInit(New));
+	FOREACH_MOD(OnUserInit, (New));
 }
 
 void UserManager::QuitUser(User *user, const std::string &quitreason, const char* operreason)
@@ -199,7 +200,7 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 
 	if (user->registered == REG_ALL)
 	{
-		FOREACH_MOD(I_OnUserQuit,OnUserQuit(user, reason, oper_reason));
+		FOREACH_MOD(OnUserQuit, (user, reason, oper_reason));
 		user->WriteCommonQuit(reason, oper_reason);
 	}
 
@@ -210,7 +211,7 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 	if (IS_LOCAL(user))
 	{
 		LocalUser* lu = IS_LOCAL(user);
-		FOREACH_MOD(I_OnUserDisconnect,OnUserDisconnect(lu));
+		FOREACH_MOD(OnUserDisconnect, (lu));
 		lu->eh.Close();
 	}
 
@@ -315,19 +316,6 @@ void UserManager::ServerNoticeAll(const char* text, ...)
 	}
 }
 
-/* return how many users have a given mode e.g. 'a' */
-int UserManager::ModeCount(const char mode)
-{
-	int c = 0;
-	for(user_hash::iterator i = clientlist->begin(); i != clientlist->end(); ++i)
-	{
-		User* u = i->second;
-		if (u->modes[mode-65])
-			c++;
-	}
-	return c;
-}
-
 void UserManager::GarbageCollect()
 {
 	// Reset the already_sent IDs so we don't wrap it around and drop a message