Pedantic clean

[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 207079da05e24caa4d5abeddcaead62fa5d10a09..07d10aad5a2faef31d00d66ab341599eeb391054 100644 (file)
--- a/src/modules/m_services.cpp
+++ b/src/modules/m_services.cpp
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 static bool kludgeme = false;
@@ -28,7 +25,7 @@ class Channel_r : public ModeHandler
  public:
        Channel_r(InspIRCd* Instance) : ModeHandler(Instance, 'r', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                // only a u-lined server may add or remove the +r mode.
                if ((ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server || (strchr(source->nick,'.'))))
@@ -52,7 +49,7 @@ class User_r : public ModeHandler
  public:
        User_r(InspIRCd* Instance) : ModeHandler(Instance, 'r', 0, 0, false, MODETYPE_USER, false) { }
 
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                if ((kludgeme) || (ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server || (strchr(source->nick,'.'))))
                {
@@ -78,7 +75,7 @@ class Channel_R : public ModeHandler
  public:
        Channel_R(InspIRCd* Instance) : ModeHandler(Instance, 'R', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                if (adding)
                {
@@ -108,7 +105,7 @@ class User_R : public ModeHandler
  public:
        User_R(InspIRCd* Instance) : ModeHandler(Instance, 'R', 0, 0, false, MODETYPE_USER, false) { }
 
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                if (adding)
                {
@@ -138,7 +135,7 @@ class Channel_M : public ModeHandler
  public:
        Channel_M(InspIRCd* Instance) : ModeHandler(Instance, 'M', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                if (adding)
                {
@@ -173,7 +170,7 @@ class ModuleServices : public Module
        User_R* m5;
  public:
        ModuleServices(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
                m1 = new Channel_r(ServerInstance);
@@ -182,8 +179,8 @@ class ModuleServices : public Module
                m4 = new User_r(ServerInstance);
                m5 = new User_R(ServerInstance);
 
-               if (!ServerInstance->AddMode(m1, 'r') || !ServerInstance->AddMode(m2, 'R') || !ServerInstance->AddMode(m3, 'M')
-                       || !ServerInstance->AddMode(m4, 'r') || !ServerInstance->AddMode(m5, 'R'))
+               if (!ServerInstance->AddMode(m1) || !ServerInstance->AddMode(m2) || !ServerInstance->AddMode(m3)
+                       || !ServerInstance->AddMode(m4) || !ServerInstance->AddMode(m5))
                {
                        throw ModuleException("Could not add user and channel modes!");
                }
@@ -192,7 +189,7 @@ class ModuleServices : public Module
        }
 
        /* <- :stitch.chatspike.net 307 w00t w00t :is a registered nick */
-       virtual void OnWhois(userrec* source, userrec* dest)
+       virtual void OnWhois(User* source, User* dest)
        {
                if (dest->IsModeSet('r'))
                {
@@ -206,10 +203,10 @@ class ModuleServices : public Module
                List[I_OnWhois] = List[I_OnUserPostNick] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1;
        }
 
-       virtual void OnUserPostNick(userrec* user, const std::string &oldnick)
+       virtual void OnUserPostNick(User* 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;
@@ -220,14 +217,17 @@ class ModuleServices : public Module
                }
        }
        
-       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
+               if (!IS_LOCAL(user))
+                       return 0;
+
                if (target_type == TYPE_CHANNEL)
                {
-                       chanrec* c = (chanrec*)dest;
+                       Channel* c = (Channel*)dest;
                        if ((c->IsModeSet('M')) && (!user->IsModeSet('r')))
                        {
-                               if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)) || (!strcmp(user->server,"")))
+                               if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)))
                                {
                                        // user is ulined, can speak regardless
                                        return 0;
@@ -239,7 +239,7 @@ class ModuleServices : public Module
                }
                if (target_type == TYPE_USER)
                {
-                       userrec* u = (userrec*)dest;
+                       User* u = (User*)dest;
                        if ((u->IsModeSet('R')) && (!user->IsModeSet('r')))
                        {
                                if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)))
@@ -255,12 +255,12 @@ class ModuleServices : public Module
                return 0;
        }
        
-       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                return OnUserPreMessage(user,dest,target_type,text,status, exempt_list);
        }
        
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
        {
                if (chan)
                {
@@ -290,11 +290,11 @@ class ModuleServices : public Module
                ServerInstance->Modes->DelMode(m3);
                ServerInstance->Modes->DelMode(m4);
                ServerInstance->Modes->DelMode(m5);
-               DELETE(m1);
-               DELETE(m2);
-               DELETE(m3);
-               DELETE(m4);
-               DELETE(m5);
+               delete m1;
+               delete m2;
+               delete m3;
+               delete m4;
+               delete m5;
        }
        
        virtual Version GetVersion()
@@ -304,27 +304,4 @@ class ModuleServices : public Module
 };
 
 
-class ModuleServicesFactory : public ModuleFactory
-{
- public:
-       ModuleServicesFactory()
-       {
-       }
-       
-       ~ModuleServicesFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleServices(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleServicesFactory;
-}
-
+MODULE_INIT(ModuleServices)