X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operchans.cpp;h=3c6b4cd59c96f72de160d9a208da70b6ef9bc009;hb=c77cc4f737c782c3a56d69da0eac82edd41d4976;hp=b3fc91e906906131e7c67a451fd3491401ba699e;hpb=d9d99cd02dadf34bfcc220734ba0c422f0acb3e6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index b3fc91e90..3c6b4cd59 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -22,8 +22,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for oper-only chans via the +O channel mode */
-
 class OperChans : public SimpleChannelModeHandler
 {
  public:
@@ -42,19 +40,12 @@ class ModuleOperChans : public Module
 	{
 	}
 
-	void init() CXX11_OVERRIDE
-	{
-		ServerInstance->Modules->AddService(oc);
-		Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric, I_OnUserPreJoin };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-	}
-
 	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
 	{
-		if (chan && chan->IsModeSet('O') && !user->IsOper())
+		if (chan && chan->IsModeSet(oc) && !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());
+			user->WriteNumeric(ERR_CANTJOINOPERSONLY, "%s :Only IRC operators may join %s (+O is set)",
+				chan->name.c_str(), chan->name.c_str());
 			return MOD_RES_DENY;
 		}
 		return MOD_RES_PASSTHRU;