X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_denychans.cpp;h=184134025730d7d404faa09d0f582b15ac7dcda4;hb=acccaa39641500b8a691db4136e6571102a438ed;hp=d4dcdec5a15b70e501491181888f6138543a3a75;hpb=46a39046196f55b52336e19662bb7bac85b731ac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp
index d4dcdec5a..184134025 100644
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -22,51 +22,52 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Implements config tags which allow blocking of joins to channels */
-
 class ModuleDenyChannels : public Module
 {
+	ChanModeReference redirectmode;
+
  public:
-	ModuleDenyChannels() 	{
-		Implementation eventlist[] = { I_OnUserPreJoin, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+	ModuleDenyChannels()
+		: redirectmode(this, "redirect")
+	{
 	}
 
-	virtual void OnRehash(User* user)
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
-		ConfigReader Conf;
 		/* check for redirect validity and loops/chains */
-		for (int i =0; i < Conf.Enumerate("badchan"); i++)
+		ConfigTagList tags = ServerInstance->Config->ConfTags("badchan");
+		for (ConfigIter i = tags.first; i != tags.second; ++i)
 		{
-			std::string name = Conf.ReadValue("badchan","name",i);
-			std::string redirect = Conf.ReadValue("badchan","redirect",i);
+			std::string name = i->second->getString("name");
+			std::string redirect = i->second->getString("redirect");
 
 			if (!redirect.empty())
 			{
 
-				if (!ServerInstance->IsChannel(redirect.c_str(), ServerInstance->Config->Limits.ChanMax))
+				if (!ServerInstance->IsChannel(redirect))
 				{
-					if (user)
-						user->WriteServ("NOTICE %s :Invalid badchan redirect '%s'", user->nick.c_str(), redirect.c_str());
+					if (status.srcuser)
+						status.srcuser->WriteNotice("Invalid badchan redirect '" + redirect + "'");
 					throw ModuleException("Invalid badchan redirect, not a channel");
 				}
 
-				for (int j =0; j < Conf.Enumerate("badchan"); j++)
+				for (ConfigIter j = tags.first; j != tags.second; ++j)
 				{
-					if (InspIRCd::Match(redirect, Conf.ReadValue("badchan","name",j)))
+					if (InspIRCd::Match(redirect, j->second->getString("name")))
 					{
 						bool goodchan = false;
-						for (int k =0; k < Conf.Enumerate("goodchan"); k++)
+						ConfigTagList goodchans = ServerInstance->Config->ConfTags("badchan");
+						for (ConfigIter k = goodchans.first; k != goodchans.second; ++k)
 						{
-							if (InspIRCd::Match(redirect, Conf.ReadValue("goodchan","name",k)))
+							if (InspIRCd::Match(redirect, k->second->getString("name")))
 								goodchan = true;
 						}
 
 						if (!goodchan)
 						{
 							/* <badchan:redirect> is a badchan */
-							if (user)
-								user->WriteServ("NOTICE %s :Badchan %s redirects to badchan %s", user->nick.c_str(), name.c_str(), redirect.c_str());
+							if (status.srcuser)
+								status.srcuser->WriteNotice("Badchan " + name + " redirects to badchan " + redirect);
 							throw ModuleException("Badchan redirect loop");
 						}
 					}
@@ -75,53 +76,50 @@ class ModuleDenyChannels : public Module
 		}
 	}
 
-	virtual ~ModuleDenyChannels()
-	{
-	}
-
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Implements config tags which allow blocking of joins to channels", VF_VENDOR);
 	}
 
 
-	virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
 	{
-		ConfigReader Conf;
-		for (int j =0; j < Conf.Enumerate("badchan"); j++)
+		ConfigTagList tags = ServerInstance->Config->ConfTags("badchan");
+		for (ConfigIter j = tags.first; j != tags.second; ++j)
 		{
-			if (InspIRCd::Match(cname, Conf.ReadValue("badchan","name",j)))
+			if (InspIRCd::Match(cname, j->second->getString("name")))
 			{
-				if (IS_OPER(user) && Conf.ReadFlag("badchan","allowopers",j))
+				if (user->IsOper() && j->second->getBool("allowopers"))
 				{
 					return MOD_RES_PASSTHRU;
 				}
 				else
 				{
-					std::string reason = Conf.ReadValue("badchan","reason",j);
-					std::string redirect = Conf.ReadValue("badchan","redirect",j);
+					std::string reason = j->second->getString("reason");
+					std::string redirect = j->second->getString("redirect");
 
-					for (int i = 0; i < Conf.Enumerate("goodchan"); i++)
+					ConfigTagList goodchans = ServerInstance->Config->ConfTags("goodchan");
+					for (ConfigIter i = goodchans.first; i != goodchans.second; ++i)
 					{
-						if (InspIRCd::Match(cname, Conf.ReadValue("goodchan", "name", i)))
+						if (InspIRCd::Match(cname, i->second->getString("name")))
 						{
 							return MOD_RES_PASSTHRU;
 						}
 					}
 
-					if (ServerInstance->IsChannel(redirect.c_str(), ServerInstance->Config->Limits.ChanMax))
+					if (ServerInstance->IsChannel(redirect))
 					{
 						/* simple way to avoid potential loops: don't redirect to +L channels */
 						Channel *newchan = ServerInstance->FindChan(redirect);
-						if ((!newchan) || (!(newchan->IsModeSet('L'))))
+						if ((!newchan) || (!newchan->IsModeSet(redirectmode)))
 						{
-							user->WriteNumeric(926, "%s %s :Channel %s is forbidden, redirecting to %s: %s",user->nick.c_str(),cname,cname,redirect.c_str(), reason.c_str());
-							Channel::JoinUser(user,redirect.c_str(),false,"",false,ServerInstance->Time());
+							user->WriteNumeric(926, "%s :Channel %s is forbidden, redirecting to %s: %s", cname.c_str(),cname.c_str(),redirect.c_str(), reason.c_str());
+							Channel::JoinUser(user, redirect);
 							return MOD_RES_DENY;
 						}
 					}
 
-					user->WriteNumeric(926, "%s %s :Channel %s is forbidden: %s",user->nick.c_str(),cname,cname,reason.c_str());
+					user->WriteNumeric(926, "%s :Channel %s is forbidden: %s", cname.c_str(),cname.c_str(),reason.c_str());
 					return MOD_RES_DENY;
 				}
 			}