X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_services_account.cpp;h=1f9daf452f16baa3a3c99c167185c56bb801249d;hb=7f00015727fab50e37de46aa90d218b31c852c87;hp=562e98fa46de188f0e147a6276b44e0798ea0214;hpb=124bc04e841f9ca527b99c37563f19a85dec63fc;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 562e98fa4..1f9daf452 100644
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -2,20 +2,15 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
@@ -127,9 +122,8 @@ class ModuleServicesAccount : public Module
 		m1 = new AChannel_R(ServerInstance);
 		m2 = new AChannel_M(ServerInstance);
 		m3 = new AUser_R(ServerInstance);
-		ServerInstance->AddMode(m1, 'R');
-		ServerInstance->AddMode(m2, 'M');
-		ServerInstance->AddMode(m3, 'R');
+		if (!ServerInstance->AddMode(m1, 'R') || !ServerInstance->AddMode(m2, 'M') || !ServerInstance->AddMode(m3, 'R'))
+			throw ModuleException("Could not add new modes!");
 	}
 
 	/* <- :twisted.oscnet.org 330 w00t2 w00t2 w00t :is logged in as */
@@ -150,9 +144,13 @@ class ModuleServicesAccount : public Module
 		List[I_OnSyncUserMetaData] = List[I_OnUserQuit] = List[I_OnCleanup] = List[I_OnDecodeMetaData] = 1;
 	}
 
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
+	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		std::string *account;
+
+		if (!IS_LOCAL(user))
+			return 0;
+
 		user->GetExt("accountname", account);
 		
 		if (target_type == TYPE_CHANNEL)
@@ -161,7 +159,7 @@ class ModuleServicesAccount : public Module
 			
 			if ((c->IsModeSet('M')) && (!account))
 			{
-				if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)) || (!strcmp(user->server,"")))
+				if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)))
 				{
 					// user is ulined, can speak regardless
 					return 0;
@@ -192,9 +190,9 @@ class ModuleServicesAccount : public Module
 		return 0;
 	}
 	 
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
+	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
-		return OnUserPreMessage(user, dest, target_type, text, status);
+		return OnUserPreMessage(user, dest, target_type, text, status, exempt_list);
 	}
 	 
 	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
@@ -245,7 +243,7 @@ class ModuleServicesAccount : public Module
 	}
 
 	// when a user quits, tidy up their metadata
-	virtual void OnUserQuit(userrec* user, const std::string &message)
+	virtual void OnUserQuit(userrec* user, const std::string &message, const std::string &oper_message)
 	{
 		std::string* account;
 		user->GetExt("accountname", account);
@@ -285,8 +283,9 @@ class ModuleServicesAccount : public Module
 		if ((target_type == TYPE_USER) && (extname == "accountname"))
 		{	
 			userrec* dest = (userrec*)target;
+			
 			/* logging them out? */
-			if (extdata == "")
+			if (extdata.empty())
 			{
 				std::string* account;
 				dest->GetExt("accountname", account);