X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonotice.cpp;h=5fe8a8c93cef9d031080d0b47d7b653248d82c09;hb=cccc3895cc0784458d730997186d3c0bc5db1539;hp=b80dd4070653d0951e8b51fbb9c5e9b889055493;hpb=1383dba43e463f292aea094d01f62f355946049d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index b80dd4070..5fe8a8c93 100644
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -5,7 +5,7 @@
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
+ *                <Craig@chatspike.net>
  *     
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
@@ -24,31 +24,61 @@ using namespace std;
 
 /* $ModDesc: Provides support for unreal-style channel mode +T */
 
+class NoNotice : public ModeHandler
+{
+ public:
+	NoNotice() : ModeHandler('T', 0, 0, false, MODETYPE_CHANNEL, false) { }
+
+	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	{
+		if (adding)
+		{
+			if (!channel->IsModeSet('T'))
+			{
+				channel->SetMode('T',true);
+				return MODEACTION_ALLOW;
+			}
+		}
+		else
+		{
+			if (channel->IsModeSet('T'))
+			{
+				channel->SetMode('T',false);
+				return MODEACTION_ALLOW;
+			}
+		}
+
+		return MODEACTION_DENY;
+	}
+};
+
 class ModuleNoNotice : public Module
 {
 	Server *Srv;
+	NoNotice* nt;
  public:
  
 	ModuleNoNotice(Server* Me)
 		: Module::Module(Me)
 	{
 		Srv = Me;
-		Srv->AddExtendedMode('T',MT_CHANNEL,false,0,0);
+		nt = new NoNotice();
+		Srv->AddMode(nt, 'T');
 	}
 
 	void Implements(char* List)
 	{
-		List[I_OnUserPreNotice] = List[I_On005Numeric] = List[I_OnExtendedMode] = 1;
+		List[I_OnUserPreNotice] = List[I_On005Numeric] = 1;
 	}
 	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text)
+	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
 	{
 		if (target_type == TYPE_CHANNEL)
 		{
 			chanrec* c = (chanrec*)dest;
-			if (c->IsCustomModeSet('T'))
+			if (c->IsModeSet('T'))
 			{
-				if ((Srv->ChanMode(user,c) == "@") || (Srv->ChanMode(user,c) == "%"))
+				if ((Srv->IsUlined(user->server)) || (Srv->ChanMode(user,c) == "@") || (Srv->ChanMode(user,c) == "%"))
 				{
 					// ops and halfops can still /NOTICE the channel
 					return 0;
@@ -63,40 +93,14 @@ class ModuleNoNotice : public Module
 		return 0;
 	}
 
-        virtual void On005Numeric(std::string &output)
-        {
-                std::stringstream line(output);
-                std::string temp1, temp2;
-                while (!line.eof())
-                {
-                        line >> temp1;
-                        if (temp1.substr(0,10) == "CHANMODES=")
-                        {
-                                // append the chanmode to the end
-                                temp1 = temp1.substr(10,temp1.length());
-                                temp1 = "CHANMODES=" + temp1 + "T";
-                        }
-                        temp2 = temp2 + temp1 + " ";
-                }
-		if (temp2.length())
-	                output = temp2.substr(0,temp2.length()-1);
-        }
-
-	virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
+	virtual void On005Numeric(std::string &output)
 	{
-		// check if this is our mode character...
-		if ((modechar == 'T') && (type == MT_CHANNEL))
-  		{
-			return 1;
-		}
-		else
-		{
-			return 0;
-		}
+		InsertMode(output,"T",4);
 	}
-	
+
 	virtual ~ModuleNoNotice()
 	{
+		DELETE(nt);
 	}
 	
 	virtual Version GetVersion()