X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operchans.cpp;h=83d94bdb022d897b6dd46ac240619660a5d6eecd;hb=226a95aab09b9e1f43f61e78179bfa1135816c2d;hp=ae5ea79c944966499e975926f6abb81e314b846b;hpb=84a1569cd60daa64b1ae52a1fff62c0dc4d78850;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index ae5ea79c9..83d94bdb0 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -44,15 +44,14 @@ class ModuleOperChans : public Module
 
 	void init()
 	{
-		if (!ServerInstance->Modes->AddMode(&oc))
-			throw ModuleException("Could not add new modes!");
+		ServerInstance->Modules->AddService(oc);
 		Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric, I_OnUserPreJoin };
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	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)
 	{
-		if (chan && chan->IsModeSet('O') && !IS_OPER(user))
+		if (chan && chan->IsModeSet('O') && !user->IsOper())
 		{
 			user->WriteNumeric(ERR_CANTJOINOPERSONLY, "%s %s :Only IRC operators may join %s (+O is set)",
 				user->nick.c_str(), chan->name.c_str(), chan->name.c_str());
@@ -65,19 +64,15 @@ class ModuleOperChans : public Module
 	{
 		if ((mask.length() > 2) && (mask[0] == 'O') && (mask[1] == ':'))
 		{
-			if (IS_OPER(user) && InspIRCd::Match(user->oper->name, mask.substr(2)))
+			if (user->IsOper() && InspIRCd::Match(user->oper->name, mask.substr(2)))
 				return MOD_RES_DENY;
 		}
 		return MOD_RES_PASSTHRU;
 	}
 
-	void On005Numeric(std::string &output)
-	{
-		ServerInstance->AddExtBanChar('O');
-	}
-
-	~ModuleOperChans()
+	void On005Numeric(std::map<std::string, std::string>& tokens)
 	{
+		tokens["EXTBAN"].push_back('O');
 	}
 
 	Version GetVersion()