X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_delaymsg.cpp;h=1a0734ed9b01506f3ec3d4949f5ad02602576847;hb=44e89aafb69fb266bdf780d12a31947bfff4e330;hp=7489f6dfa6a8d7cfe5874ac81a07f5ebf8d58bda;hpb=e80a1296a096ff2c495b3cd2a3913d5e5f6ec450;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_delaymsg.cpp b/src/modules/m_delaymsg.cpp
index 7489f6dfa..1a0734ed9 100644
--- a/src/modules/m_delaymsg.cpp
+++ b/src/modules/m_delaymsg.cpp
@@ -1,25 +1,28 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *	    the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
-#include <stdarg.h>
 
 /* $ModDesc: Provides channelmode +d <int>, to deny messages to a channel until <int> seconds. */
 
 class DelayMsgMode : public ModeHandler
 {
- private:
-	CUList empty;
  public:
 	LocalIntExt jointime;
 	DelayMsgMode(Module* Parent) : ModeHandler(Parent, "delaymsg", 'd', PARAM_SETONLY, MODETYPE_CHANNEL)
@@ -28,19 +31,6 @@ class DelayMsgMode : public ModeHandler
 		levelrequired = OP_VALUE;
 	}
 
-	ModePair ModeSet(User*, User*, Channel* channel, const std::string &parameter)
-	{
-		std::string climit = channel->GetModeParameter('d');
-		if (!climit.empty())
-		{
-			return std::make_pair(true, climit);
-		}
-		else
-		{
-			return std::make_pair(false, parameter);
-		}
-	}
-
 	bool ResolveModeConflict(std::string &their_param, const std::string &our_param, Channel*)
 	{
 		return (atoi(their_param.c_str()) < atoi(our_param.c_str()));
@@ -62,7 +52,6 @@ class ModuleDelayMsg : public Module
 		Implementation eventlist[] = { I_OnUserJoin, I_OnUserPreMessage};
 		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
-	~ModuleDelayMsg();
 	Version GetVersion();
 	void OnUserJoin(Membership* memb, bool sync, bool created, CUList&);
 	ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list);
@@ -72,6 +61,9 @@ ModeAction DelayMsgMode::OnModeChange(User* source, User* dest, Channel* channel
 {
 	if (adding)
 	{
+		if ((channel->IsModeSet('d')) && (channel->GetModeParameter('d') == parameter))
+			return MODEACTION_DENY;
+
 		/* Setting a new limit, sanity check */
 		long limit = atoi(parameter.c_str());
 
@@ -83,6 +75,9 @@ ModeAction DelayMsgMode::OnModeChange(User* source, User* dest, Channel* channel
 	}
 	else
 	{
+		if (!channel->IsModeSet('d'))
+			return MODEACTION_DENY;
+
 		/*
 		 * Clean up metadata
 		 */
@@ -94,18 +89,14 @@ ModeAction DelayMsgMode::OnModeChange(User* source, User* dest, Channel* channel
 	return MODEACTION_ALLOW;
 }
 
-ModuleDelayMsg::~ModuleDelayMsg()
-{
-}
-
 Version ModuleDelayMsg::GetVersion()
 {
-	return Version("Provides channelmode +d <int>, to deny messages to a channel until <int> seconds.", VF_COMMON | VF_VENDOR, API_VERSION);
+	return Version("Provides channelmode +d <int>, to deny messages to a channel until <int> seconds.", VF_VENDOR);
 }
 
 void ModuleDelayMsg::OnUserJoin(Membership* memb, bool sync, bool created, CUList&)
 {
-	if (memb->chan->IsModeSet('d'))
+	if ((IS_LOCAL(memb->user)) && (memb->chan->IsModeSet('d')))
 	{
 		djm.jointime.set(memb, ServerInstance->Time());
 	}
@@ -114,7 +105,7 @@ void ModuleDelayMsg::OnUserJoin(Membership* memb, bool sync, bool created, CULis
 ModResult ModuleDelayMsg::OnUserPreMessage(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
 {
 	/* Server origin */
-	if (!user)
+	if ((!user) || (!IS_LOCAL(user)))
 		return MOD_RES_PASSTHRU;
 
 	if (target_type != TYPE_CHANNEL)
@@ -125,7 +116,7 @@ ModResult ModuleDelayMsg::OnUserPreMessage(User* user, void* dest, int target_ty
 
 	if (!memb)
 		return MOD_RES_PASSTHRU;
-	
+
 	time_t ts = djm.jointime.get(memb);
 
 	if (ts == 0)