Implement feature in bug #395 reported by stealth, and tidy up a bit

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

diff --git a/src/modules/m_services.cpp b/src/modules/m_services.cpp
index b8638d94a3f9a742dee71eab39e8585597ac4d85..fc07708c2b80d53a1b357ee77ca6692fd110819a 100644 (file)
--- a/src/modules/m_services.cpp
+++ b/src/modules/m_services.cpp
@@ -11,10 +11,10 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 static bool kludgeme = false;
 
@@ -209,7 +209,7 @@ class ModuleServices : public Module
        virtual void OnUserPostNick(userrec* user, const std::string &oldnick)
        {
                /* On nickchange, if they have +r, remove it */
-               if (user->IsModeSet('r'))
+               if (user->IsModeSet('r') && irc::string(user->nick) != oldnick)
                {
                        const char* modechange[2];
                        modechange[0] = user->nick;
@@ -307,27 +307,4 @@ class ModuleServices : public Module
 };
 
 
-class ModuleServicesFactory : public ModuleFactory
-{
- public:
-       ModuleServicesFactory()
-       {
-       }
-       
-       ~ModuleServicesFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleServices(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleServicesFactory;
-}
-
+MODULE_INIT(ModuleServices)