X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_denychans.cpp;h=ab92ae911094e6c0152b250fde7deaa007e06907;hb=46e56dedd37abe33af4e8b970d5b83729dc1ef05;hp=401642e0879786fad9af7ab9b66220fb5e0326c3;hpb=86775e2e98f55b3b88befe2daff0ca23f02f3155;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp
index 401642e08..ab92ae911 100644
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -17,29 +17,20 @@
 
 class ModuleDenyChannels : public Module
 {
- private:
-
-
-	ConfigReader *Conf;
-
  public:
-	ModuleDenyChannels(InspIRCd* Me) : Module(Me)
-	{
-
-		Conf = new ConfigReader(ServerInstance);
+	ModuleDenyChannels() 	{
 		Implementation eventlist[] = { I_OnUserPreJoin, I_OnRehash };
 		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
 	virtual void OnRehash(User* user)
 	{
-		delete Conf;
-		Conf = new ConfigReader(ServerInstance);
+		ConfigReader Conf;
 		/* check for redirect validity and loops/chains */
-		for (int i =0; i < Conf->Enumerate("badchan"); i++)
+		for (int i =0; i < Conf.Enumerate("badchan"); i++)
 		{
-			std::string name = Conf->ReadValue("badchan","name",i);
-			std::string redirect = Conf->ReadValue("badchan","redirect",i);
+			std::string name = Conf.ReadValue("badchan","name",i);
+			std::string redirect = Conf.ReadValue("badchan","redirect",i);
 
 			if (!redirect.empty())
 			{
@@ -51,14 +42,14 @@ class ModuleDenyChannels : public Module
 					throw ModuleException("Invalid badchan redirect, not a channel");
 				}
 
-				for (int j =0; j < Conf->Enumerate("badchan"); j++)
+				for (int j =0; j < Conf.Enumerate("badchan"); j++)
 				{
-					if (InspIRCd::Match(redirect, Conf->ReadValue("badchan","name",j)))
+					if (InspIRCd::Match(redirect, Conf.ReadValue("badchan","name",j)))
 					{
 						bool goodchan = false;
-						for (int k =0; k < Conf->Enumerate("goodchan"); k++)
+						for (int k =0; k < Conf.Enumerate("goodchan"); k++)
 						{
-							if (InspIRCd::Match(redirect, Conf->ReadValue("goodchan","name",k)))
+							if (InspIRCd::Match(redirect, Conf.ReadValue("goodchan","name",k)))
 								goodchan = true;
 						}
 
@@ -77,33 +68,33 @@ class ModuleDenyChannels : public Module
 
 	virtual ~ModuleDenyChannels()
 	{
-		delete Conf;
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR,API_VERSION);
+		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)
 	{
-		for (int j =0; j < Conf->Enumerate("badchan"); j++)
+		ConfigReader Conf;
+		for (int j =0; j < Conf.Enumerate("badchan"); j++)
 		{
-			if (InspIRCd::Match(cname, Conf->ReadValue("badchan","name",j)))
+			if (InspIRCd::Match(cname, Conf.ReadValue("badchan","name",j)))
 			{
-				if (IS_OPER(user) && Conf->ReadFlag("badchan","allowopers",j))
+				if (IS_OPER(user) && Conf.ReadFlag("badchan","allowopers",j))
 				{
 					return MOD_RES_PASSTHRU;
 				}
 				else
 				{
-					std::string reason = Conf->ReadValue("badchan","reason",j);
-					std::string redirect = Conf->ReadValue("badchan","redirect",j);
+					std::string reason = Conf.ReadValue("badchan","reason",j);
+					std::string redirect = Conf.ReadValue("badchan","redirect",j);
 
-					for (int i = 0; i < Conf->Enumerate("goodchan"); i++)
+					for (int i = 0; i < Conf.Enumerate("goodchan"); i++)
 					{
-						if (InspIRCd::Match(cname, Conf->ReadValue("goodchan", "name", i)))
+						if (InspIRCd::Match(cname, Conf.ReadValue("goodchan", "name", i)))
 						{
 							return MOD_RES_PASSTHRU;
 						}
@@ -116,7 +107,7 @@ class ModuleDenyChannels : public Module
 						if ((!newchan) || (!(newchan->IsModeSet('L'))))
 						{
 							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(ServerInstance,user,redirect.c_str(),false,"",false,ServerInstance->Time());
+							Channel::JoinUser(user,redirect.c_str(),false,"",false,ServerInstance->Time());
 							return MOD_RES_DENY;
 						}
 					}