Added ability to send and receive a challenge, dont do anything with it yet

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

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 338c472f5d24751efab9c7c551e84b899c988566..0532519a22abbe913afbeedfa0842767c5ccc2be 100644 (file)
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.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"
@@ -23,7 +18,7 @@ using namespace std;
 #include "configreader.h"
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for unreal-style GLOBOPS and umode +g */
+/* $ModDesc: Provides support for channel mode +N which prevents nick changes on channel */
 
 class NoNicks : public ModeHandler
 {
@@ -73,7 +68,7 @@ class ModuleNoNickChange : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_COMMON|VF_VENDOR);
+               return Version(1,1,0,1,VF_COMMON|VF_VENDOR,API_VERSION);
        }
 
        void Implements(char* List)
@@ -87,18 +82,15 @@ class ModuleNoNickChange : public Module
                irc::string me = ServerInstance->Config->ServerName;
                if (server == me)
                {
-                       for (std::vector<ucrec*>::iterator i = user->chans.begin(); i != user->chans.end(); i++)
+                       for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
                        {
-                               if (((ucrec*)(*i))->channel != NULL)
+                               chanrec* curr = i->first;
+                               if ((curr->IsModeSet('N')) && (!*user->oper))
                                {
-                                       chanrec* curr = ((ucrec*)(*i))->channel;
-                                       if ((curr->IsModeSet('N')) && (!*user->oper))
-                                       {
-                                               // don't allow the nickchange, theyre on at least one channel with +N set
-                                               // and theyre not an oper
-                                               user->WriteServ("447 %s :Can't change nickname while on %s (+N is set)",user->nick,curr->name);
-                                               return 1;
-                                       }
+                                       // don't allow the nickchange, theyre on at least one channel with +N set
+                                       // and theyre not an oper
+                                       user->WriteServ("447 %s :Can't change nickname while on %s (+N is set)", user->nick, curr->name);
+                                       return 1;
                                }
                        }
                }