This needs some general QA-ing. Add support to new parser (introduced in 1.1) for...

[user/henk/code/inspircd.git] / src / modules / m_restrictbanned.cpp

diff --git a/src/modules/m_restrictbanned.cpp b/src/modules/m_restrictbanned.cpp
index c37951eea3cbbf8369bcbadc0534f6df4fe3a586..b891d5659cd5ebf80df31d576796119e18f5123f 100644 (file)
--- a/src/modules/m_restrictbanned.cpp
+++ b/src/modules/m_restrictbanned.cpp
@@ -2,20 +2,15 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
@@ -52,7 +47,7 @@ class ModuleRestrictBanned : public Module
                if (!IS_LOCAL(user))
                        return 0;
 
-               if (channel->IsBanned(user) && channel->GetStatus(user) < STATUS_VOICE)
+               if (channel->GetStatus(user) < STATUS_VOICE && channel->IsBanned(user))
                {
                        /* banned, boned. drop the message. */
                        user->WriteServ("NOTICE "+std::string(user->nick)+" :*** You may not " + action + ", as you are banned on channel " + channel->name);