X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_muteban.cpp;h=1445889aebc3f3b56826a905b0dc83c75f0daec6;hb=9ebd9cba72056c5b36696e166826afb981f25ebb;hp=8f0ac8bee0982e2665f095e1f9f33479421fd1f2;hpb=43847ec9c7e1a195163eb4c529f1c92fd1ace0a4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_muteban.cpp b/src/modules/m_muteban.cpp
index 8f0ac8bee..1445889ae 100644
--- a/src/modules/m_muteban.cpp
+++ b/src/modules/m_muteban.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -19,8 +19,7 @@ class ModuleQuietBan : public Module
 {
  private:
  public:
-	ModuleQuietBan(InspIRCd* Me) : Module(Me)
-	{
+	ModuleQuietBan() 	{
 		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric };
 		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
@@ -31,41 +30,27 @@ class ModuleQuietBan : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_VENDOR,API_VERSION);
+		return Version("Implements extban +b m: - mute bans",VF_OPTCOMMON|VF_VENDOR);
 	}
 
-	virtual int OnUserPreMessage(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual ModResult OnUserPreMessage(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
 	{
-		if (!IS_LOCAL(user))
-			return 0;
+		if (!IS_LOCAL(user) || target_type != TYPE_CHANNEL)
+			return MOD_RES_PASSTHRU;
 
-		if (target_type == TYPE_CHANNEL)
+		Channel* chan = static_cast<Channel*>(dest);
+		if (chan->GetExtBanStatus(user, 'm') == MOD_RES_DENY && chan->GetPrefixValue(user) < VOICE_VALUE)
 		{
-			if (((Channel *)dest)->IsExtBanned(user, 'm'))
-			{
-				user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Cannot send to " + ((Channel *)dest)->name + ", as you are muted");
-				return 1;
-			}
+			user->WriteNumeric(404, "%s %s :Cannot send to channel (you're muted)", user->nick.c_str(), chan->name.c_str());
+			return MOD_RES_DENY;
 		}
 
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual int OnUserPreNotice(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual ModResult OnUserPreNotice(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
 	{
-		if (!IS_LOCAL(user))
-			return 0;
-
-		if (target_type == TYPE_CHANNEL)
-		{
-			if (((Channel *)dest)->IsExtBanned(user, 'm'))
-			{
-				user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Cannot send to " + ((Channel *)dest)->name + ", as you are muted");
-				return 1;
-			}
-		}
-
-		return 0;
+		return OnUserPreMessage(user, dest, target_type, text, status, exempt_list);
 	}
 
 	virtual void On005Numeric(std::string &output)