2 files changed, 80 insertions, 5 deletions
diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp
index b467c01d5..4337df0f0 100644
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -67,11 +67,8 @@ class ModuleCloaking : public Module
 		// so we must be VERY careful to only act upon modes which
 		// we have claimed ourselves. This is a feature to allow
 		// modules to 'spy' on extended mode activity if they so wish.
-		log(DEBUG,"modechar=%c type=%d MT_CLIENT=%d",modechar,type,MT_CLIENT);
-		
 		if ((modechar == 'x') && (type == MT_CLIENT))
   		{
-  			Srv->Log(DEBUG,"Mode x being handled");
   			// OnExtendedMode gives us a void* as the target, we must cast
   			// it into a userrec* or a chanrec* depending on the value of
   			// the 'type' parameter (MT_CLIENT or MT_CHANNEL)
@@ -102,14 +99,14 @@ class ModuleCloaking : public Module
 					sprintf(ra,"%.8X",seed*s2*strlen(dest->host));
 					std::string b = Srv->GetNetworkName() + "-" + ra + a;
 					Srv->Log(DEBUG,"cloak: allocated "+b);
-					Srv->ChangeHost(user,b);
+					Srv->ChangeHost(dest,b);
 				}
 			}
 			else
   			{
   				// user is removing the mode, so just restore their real host
   				// and make it match the displayed one.
-				Srv->ChangeHost(user,user->host);
+				Srv->ChangeHost(dest,dest->host);
 			}
 			// this mode IS ours, and we have handled it. If we chose not to handle it,
 			// for example the user cannot cloak as they have a vhost or such, then
diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
new file mode 100644
index 000000000..66a5b056a
--- /dev/null
+++ b/src/modules/m_nonotice.cpp
@@ -0,0 +1,78 @@
+#include <stdio.h>
+
+#include "users.h"
+#include "channels.h"
+#include "modules.h"
+
+/* $ModDesc: Provides support for unreal-style channel mode +T */
+
+class ModuleNoNotice : public Module
+{
+	Server *Srv;
+	
+ public:
+ 
+	ModuleNoNotice()
+	{
+		Srv = new Server;
+		Srv->AddExtendedMode('T',MT_CHANNEL,false,0,0);
+	}
+	
+	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string text)
+	{
+		if (target_type == TYPE_CHANNEL)
+		{
+			chanrec* c = (chanrec*)dest;
+			if (c->IsCustomModeSet('T'))
+			{
+				if ((Srv->ChanMode(user,c) == '@') || (Srv->ChanMode(user,c) == '%'))
+				{
+					// ops and halfops can still /NOTICE the channel
+					return 0;
+				}
+				else
+				{
+					WriteServ(user->fd,"404 %s %s :Can't send NOTICE to channel (+T set)",user->nick, c->name);
+					return 1;
+				}
+			}
+		}
+		return 0;
+	}
+	
+	virtual ~ModuleNoNotice()
+	{
+		delete Srv;
+	}
+	
+	virtual Version GetVersion()
+	{
+		return Version(1,0,0,0);
+	}
+};
+
+
+class ModuleNoNoticeFactory : public ModuleFactory
+{
+ public:
+	ModuleNoNoticeFactory()
+	{
+	}
+	
+	~ModuleNoNoticeFactory()
+	{
+	}
+	
+	virtual Module * CreateModule()
+	{
+		return new ModuleNoNotice;
+	}
+	
+};
+
+
+extern "C" void * init_module( void )
+{
+	return new ModuleNoNoticeFactory;
+}
+