X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_invisible.cpp;h=b903941647d60bd6e9c97fb3d695c1c0b01d091e;hb=52671661f8fdca0b61aec8009b4bc7de9bc00166;hp=2986f43c6497c99c89d082429492f302566a0ddf;hpb=12b9855339a3bbd05cc0636588ea68bf8db390f5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_invisible.cpp b/src/modules/m_invisible.cpp
index 2986f43c6..b90394164 100644
--- a/src/modules/m_invisible.cpp
+++ b/src/modules/m_invisible.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
@@ -47,13 +47,13 @@ class InvisibleMode : public ModeHandler
 
 	~InvisibleMode()
 	{
-		for (user_hash::iterator i = ServerInstance->clientlist->begin(); i != ServerInstance->clientlist->end(); i++)
+		for (user_hash::iterator i = ServerInstance->Users->clientlist->begin(); i != ServerInstance->Users->clientlist->end(); i++)
 			if (i->second->Visibility == qo)
 				i->second->Visibility = NULL;
 		delete qo;
 	}
 
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
 	{
 		if (source != dest)
 			return MODEACTION_DENY;
@@ -74,7 +74,7 @@ class InvisibleMode : public ModeHandler
 
 			if (!ok)
 			{
-				source->WriteServ("481 %s :Permission Denied - You do not have access to become invisible via user mode +Q", source->nick);
+				source->WriteNumeric(481, "%s :Permission Denied - You do not have access to become invisible via user mode +Q", source->nick);
 				return MODEACTION_DENY;
 			}
 
@@ -114,9 +114,9 @@ class InvisibleMode : public ModeHandler
 							i->first->WriteServ("MODE %s +%s", f->first->name, n.c_str());
 					}
 				}
-
-				ServerInstance->WriteOpers("*** \2NOTICE\2: Oper %s has become %svisible (%sQ)", dest->GetFullHost(), adding ? "in" : "", adding ? "+" : "-");
 			}
+
+			ServerInstance->SNO->WriteToSnoMask('A', "\2NOTICE\2: Oper %s has become %svisible (%sQ)", dest->GetFullHost(), adding ? "in" : "", adding ? "+" : "-");
 			return MODEACTION_ALLOW;
 		}
 		else
@@ -135,7 +135,7 @@ class InvisibleDeOper : public ModeWatcher
 	{
 	}
 
-	bool BeforeMode(User* source, User* dest, Channel* channel, std::string &param, bool adding, ModeType type)
+	bool BeforeMode(User* source, User* dest, Channel* channel, std::string &param, bool adding, ModeType type, bool)
 	{
 		/* Users who are opers and have +Q get their +Q removed when they deoper */
 		if ((!adding) && (dest->IsModeSet('Q')))
@@ -159,14 +159,14 @@ class ModuleInvisible : public Module
 	{
 		conf = new ConfigReader(ServerInstance);
 		qm = new InvisibleMode(ServerInstance);
-		if (!ServerInstance->AddMode(qm))
+		if (!ServerInstance->Modes->AddMode(qm))
 			throw ModuleException("Could not add new modes!");
 		ido = new InvisibleDeOper(ServerInstance);
-		if (!ServerInstance->AddModeWatcher(ido))
+		if (!ServerInstance->Modes->AddModeWatcher(ido))
 			throw ModuleException("Could not add new mode watcher on usermode +o!");
 
 		/* Yeah i know people can take this out. I'm not about to obfuscate code just to be a pain in the ass. */
-		ServerInstance->ServerNoticeAll("*** m_invisible.so has just been loaded on this network. For more information, please visit http://inspircd.org/wiki/Modules/invisible");
+		ServerInstance->Users->ServerNoticeAll("*** m_invisible.so has just been loaded on this network. For more information, please visit http://inspircd.org/wiki/Modules/invisible");
 		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserJoin, I_OnUserPart, I_OnUserQuit, I_OnRehash };
 		ServerInstance->Modules->Attach(eventlist, this, 6);
 	}
@@ -182,22 +182,18 @@ class ModuleInvisible : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserQuit] = List[I_OnRehash] = 1;
-	}
 	
-	virtual void OnUserJoin(User* user, Channel* channel, bool &silent)
+	virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent)
 	{
 		if (user->IsModeSet('Q'))
 		{
 			silent = true;
 			/* Because we silenced the event, make sure it reaches the user whos joining (but only them of course) */
 			this->WriteCommonFrom(user, channel, "JOIN %s", channel->name);
-			ServerInstance->WriteOpers("*** \2NOTICE\2: Oper %s has joined %s invisibly (+Q)", user->GetFullHost(), channel->name);
+			ServerInstance->SNO->WriteToSnoMask('A', "\2NOTICE\2: Oper %s has joined %s invisibly (+Q)", user->GetFullHost(), channel->name);
 		}
 	}
 
@@ -249,7 +245,7 @@ class ModuleInvisible : public Module
 			User* target = (User*)dest;
 			if(target->IsModeSet('Q') && !*user->oper)
 			{
-				user->WriteServ("401 %s %s :No such nick/channel",user->nick, target->nick);
+				user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, target->nick);
 				return 1;
 			}
 		}
@@ -262,7 +258,7 @@ class ModuleInvisible : public Module
 	}
 
 	/* Fix by Eric @ neowin.net, thanks :) -- Brain */
-	void WriteCommonFrom(User *user, Channel* channel, const char* text, ...)
+	void WriteCommonFrom(User *user, Channel* channel, const char* text, ...) CUSTOM_PRINTF(4,5)
 	{
 		va_list argsPtr;
 		char textbuffer[MAXBUF];