X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banexception.cpp;h=44b93b457fb8afe9edb240cdfe8019c66f90d3c9;hb=9982ec4e5b027ed24b1fda5e6fd3ab35b98de1a7;hp=b10ed36042b62d50fb4503de031623d05e6eb2e4;hpb=58d7827bb1bd3d90f38a1c199f6f41ae9f24885c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index b10ed3604..44b93b457 100644
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -38,7 +38,11 @@
 class BanException : public ListModeBase
 {
  public:
-	BanException(Module* Creator) : ListModeBase(Creator, "banexception", 'e', "End of Channel Exception List", 348, 349, true) { }
+	BanException(Module* Creator)
+		: ListModeBase(Creator, "banexception", 'e', "End of Channel Exception List", 348, 349, true)
+	{
+		syntax = "<mask>";
+	}
 };
 
 
@@ -53,28 +57,24 @@ class ModuleBanException : public Module
 
 	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		tokens["EXCEPTS"] = "e";
+		tokens["EXCEPTS"] = ConvToStr(be.GetModeChar());
 	}
 
 	ModResult OnExtBanCheck(User *user, Channel *chan, char type) CXX11_OVERRIDE
 	{
-		if (chan != NULL)
-		{
-			ListModeBase::ModeList *list = be.GetList(chan);
+		ListModeBase::ModeList* list = be.GetList(chan);
+		if (!list)
+			return MOD_RES_PASSTHRU;
 
-			if (!list)
-				return MOD_RES_PASSTHRU;
+		for (ListModeBase::ModeList::iterator it = list->begin(); it != list->end(); it++)
+		{
+			if (it->mask.length() <= 2 || it->mask[0] != type || it->mask[1] != ':')
+				continue;
 
-			for (ListModeBase::ModeList::iterator it = list->begin(); it != list->end(); it++)
+			if (chan->CheckBan(user, it->mask.substr(2)))
 			{
-				if (it->mask[0] != type || it->mask[1] != ':')
-					continue;
-
-				if (chan->CheckBan(user, it->mask.substr(2)))
-				{
-					// They match an entry on the list, so let them pass this.
-					return MOD_RES_ALLOW;
-				}
+				// They match an entry on the list, so let them pass this.
+				return MOD_RES_ALLOW;
 			}
 		}
 
@@ -83,23 +83,19 @@ class ModuleBanException : public Module
 
 	ModResult OnCheckChannelBan(User* user, Channel* chan) CXX11_OVERRIDE
 	{
-		if (chan)
+		ListModeBase::ModeList* list = be.GetList(chan);
+		if (!list)
 		{
-			ListModeBase::ModeList *list = be.GetList(chan);
-
-			if (!list)
-			{
-				// No list, proceed normally
-				return MOD_RES_PASSTHRU;
-			}
+			// No list, proceed normally
+			return MOD_RES_PASSTHRU;
+		}
 
-			for (ListModeBase::ModeList::iterator it = list->begin(); it != list->end(); it++)
+		for (ListModeBase::ModeList::iterator it = list->begin(); it != list->end(); it++)
+		{
+			if (chan->CheckBan(user, it->mask))
 			{
-				if (chan->CheckBan(user, it->mask))
-				{
-					// They match an entry on the list, so let them in.
-					return MOD_RES_ALLOW;
-				}
+				// They match an entry on the list, so let them in.
+				return MOD_RES_ALLOW;
 			}
 		}
 		return MOD_RES_PASSTHRU;
@@ -112,7 +108,7 @@ class ModuleBanException : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for the +e channel mode", VF_VENDOR);
+		return Version("Provides channel mode +e, ban exceptions", VF_VENDOR);
 	}
 };