X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_denychans.cpp;h=f95c0b1079d4ce613b92b350ad9d6a3244855e26;hb=4a64082e31c3c3dfa97a1edfb8a3c97fe8d32ea7;hp=dbfe74400d1d5e7084b902dc2000f5f6e520c4ca;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp
index dbfe74400..f95c0b107 100644
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -23,18 +23,17 @@ class ModuleDenyChannels : public Module
 	ConfigReader *Conf;
 
  public:
-	ModuleDenyChannels(InspIRCd* Me) : Module(Me)
-	{
+	ModuleDenyChannels() 	{
 
-		Conf = new ConfigReader(ServerInstance);
+		Conf = new ConfigReader;
 		Implementation eventlist[] = { I_OnUserPreJoin, I_OnRehash };
 		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
-	virtual void OnRehash(User* user, const std::string &param)
+	virtual void OnRehash(User* user)
 	{
 		delete Conf;
-		Conf = new ConfigReader(ServerInstance);
+		Conf = new ConfigReader;
 		/* check for redirect validity and loops/chains */
 		for (int i =0; i < Conf->Enumerate("badchan"); i++)
 		{
@@ -82,11 +81,11 @@ class ModuleDenyChannels : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR,API_VERSION);
+		return Version("Implements config tags which allow blocking of joins to channels", VF_VENDOR,API_VERSION);
 	}
 
 
-	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+	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++)
 		{
@@ -94,7 +93,7 @@ class ModuleDenyChannels : public Module
 			{
 				if (IS_OPER(user) && Conf->ReadFlag("badchan","allowopers",j))
 				{
-					return 0;
+					return MOD_RES_PASSTHRU;
 				}
 				else
 				{
@@ -105,7 +104,7 @@ class ModuleDenyChannels : public Module
 					{
 						if (InspIRCd::Match(cname, Conf->ReadValue("goodchan", "name", i)))
 						{
-							return 0;
+							return MOD_RES_PASSTHRU;
 						}
 					}
 
@@ -116,17 +115,17 @@ 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());
-							return 1;
+							Channel::JoinUser(user,redirect.c_str(),false,"",false,ServerInstance->Time());
+							return MOD_RES_DENY;
 						}
 					}
 
 					user->WriteNumeric(926, "%s %s :Channel %s is forbidden: %s",user->nick.c_str(),cname,cname,reason.c_str());
-					return 1;
+					return MOD_RES_DENY;
 				}
 			}
 		}
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 };