X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_restrictchans.cpp;h=8fac7527bef64b1f56648aee151a374fe6c20231;hb=46e56dedd37abe33af4e8b970d5b83729dc1ef05;hp=02d7d6a3ab31739f844c2ef93b04e2ca45d8e936;hpb=d28ea800260665af77bedf267f83c8518117a114;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp
index 02d7d6a3a..8fac7527b 100644
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 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.
@@ -17,45 +17,39 @@
 
 class ModuleRestrictChans : public Module
 {
-
-
-	std::map<irc::string,int> allowchans;
+	std::set<irc::string> allowchans;
 
 	void ReadConfig()
 	{
-		ConfigReader* MyConf = new ConfigReader(ServerInstance);
 		allowchans.clear();
-		for (int i = 0; i < MyConf->Enumerate("allowchannel"); i++)
+		ConfigTagList tags = ServerInstance->Config->ConfTags("allowchannel");
+		for(ConfigIter i = tags.first; i != tags.second; ++i)
 		{
-			std::string txt;
-			txt = MyConf->ReadValue("allowchannel", "name", i);
-			irc::string channel = txt.c_str();
-			allowchans[channel] = 1;
+			ConfigTag* tag = i->second;
+			std::string txt = tag->getString("name");
+			allowchans.insert(txt.c_str());
 		}
-		delete MyConf;
 	}
 
  public:
-	ModuleRestrictChans(InspIRCd* Me)
-		: Module(Me)
+	ModuleRestrictChans()
 	{
-
 		ReadConfig();
 		Implementation eventlist[] = { I_OnUserPreJoin, I_OnRehash };
 		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
-	virtual void OnRehash(User* user, const std::string &parameter)
+	virtual void OnRehash(User* user)
 	{
 		ReadConfig();
 	}
 
 
-	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)
 	{
 		irc::string x = cname;
 		if (!IS_LOCAL(user))
-			return 0;
+			return MOD_RES_PASSTHRU;
 
 		// channel does not yet exist (record is null, about to be created IF we were to allow it)
 		if (!chan)
@@ -64,10 +58,10 @@ class ModuleRestrictChans : public Module
 			if ((!IS_OPER(user)) && (allowchans.find(x) == allowchans.end()))
 			{
 				user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Only IRC operators may create new channels",user->nick.c_str(),cname);
-				return 1;
+				return MOD_RES_DENY;
 			}
 		}
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
 	virtual ~ModuleRestrictChans()
@@ -76,7 +70,7 @@ class ModuleRestrictChans : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_VENDOR,API_VERSION);
+		return Version("Only opers may create new channels if this module is loaded",VF_VENDOR);
 	}
 };