Converted more stuff to 'Implements' system

[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 dfdf86b6172de936421ed1f203fe448b8c5efd4b..c2b18b49b09b92c37a723bcda69eff610b154ad6 100644 (file)
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -14,34 +14,38 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
+#include "hashcomp.h"
 
 /* $ModDesc: Provides support for unreal-style GLOBOPS and umode +g */
 
-Server *Srv;
-
 class ModuleNoNickChange : public Module
 {
+       Server *Srv;
+       
  public:
-       ModuleNoNickChange()
+       ModuleNoNickChange(Server* Me)
+               : Module::Module(Me)
        {
-               Srv = new Server;
+               Srv = Me;
                
                Srv->AddExtendedMode('N',MT_CHANNEL,false,0,0);
        }
        
        virtual ~ModuleNoNickChange()
        {
-               delete Srv;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1);
+               return Version(1,0,0,1,VF_STATIC|VF_VENDOR);
        }
 
         virtual void On005Numeric(std::string &output)
@@ -59,14 +63,17 @@ class ModuleNoNickChange : public Module
                         }
                         temp2 = temp2 + temp1 + " ";
                 }
-                output = temp2.substr(0,temp2.length()-1);
+               if (temp2.length())
+                       output = temp2.substr(0,temp2.length()-1);
         }
        
        virtual int OnUserPreNick(userrec* user, std::string newnick)
        {
-               if (!strcasecmp(user->server,Srv->GetServerName().c_str()))
+               irc::string server = user->server;
+               irc::string me = Srv->GetServerName().c_str();
+               if (server == me)
                {
-                       for (int i =0; i != MAXCHANS; i++)
+                       for (int i =0; i < user->chans.size(); i++)
                        {
                                if (user->chans[i].channel != NULL)
                                {
@@ -115,9 +122,9 @@ class ModuleNoNickChangeFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(Server* Me)
        {
-               return new ModuleNoNickChange;
+               return new ModuleNoNickChange(Me);
        }
        
 };