X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operchans.cpp;h=b8f7f2415d269a6e1c3b003dda34bcfe40ddf6fc;hb=117742632909d9bfd71fc4feb3304263558101b7;hp=7bc132515625fea795162c0d0179dd844109d0da;hpb=18f24e05d3730ba945c3c16d383149e0863ce743;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index 7bc132515..b8f7f2415 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -63,15 +63,14 @@ class ModuleOperChans : public Module
 
 	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
 	{
-		bool banned = false;
-
 		if (!IS_OPER(user))
 		{
 			if (chan)
 			{
 				if (chan->IsModeSet('O'))
 				{
-					banned = true;
+					user->WriteNumeric(ERR_CANTJOINOPERSONLY, "%s %s :Only IRC operators may join the channel %s (+O is set)",user->nick.c_str(), chan->name.c_str(), chan->name.c_str());
+					return 1;
 				}
 			}
 		}
@@ -79,16 +78,11 @@ class ModuleOperChans : public Module
 		{
 			if (chan && chan->IsExtBanned(user->oper, 'O'))
 			{
-				banned = true;
+				user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)", user->nick.c_str(),  chan->name.c_str());
+				return 1;
 			}
 		}
 
-		if (banned)
-		{
-			user->WriteNumeric(ERR_CANTJOINOPERSONLY, "%s %s :Only IRC operators may join the channel %s (+O is set)",user->nick.c_str(), chan->name.c_str(), chan->name.c_str());
-			return 1;
-		}
-
 		return 0;
 	}
 
@@ -100,7 +94,7 @@ class ModuleOperChans : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,2,0,0,VF_VENDOR|VF_COMMON,API_VERSION);
+		return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
 	}
 };