Remove unneccessary temp value which caused a win32 problem by using uint32_t type.

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

diff --git a/src/modules/m_noinvite.cpp b/src/modules/m_noinvite.cpp
index cff191db061eb5b4b4c6dce90641ab5418ddff06..d4e38bd8653c2c864a861a872fd9fc91fd695acd 100644 (file)
--- a/src/modules/m_noinvite.cpp
+++ b/src/modules/m_noinvite.cpp
@@ -15,32 +15,10 @@
 
 /* $ModDesc: Provides support for unreal-style channel mode +V */
 
-class NoInvite : public ModeHandler
+class NoInvite : public SimpleChannelModeHandler
 {
  public:
-       NoInvite(InspIRCd* Instance) : ModeHandler(Instance, 'V', 0, 0, false, MODETYPE_CHANNEL, false) { }
-
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
-       {
-               if (adding)
-               {
-                       if (!channel->IsModeSet('V'))
-                       {
-                               channel->SetMode('V',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (channel->IsModeSet('V'))
-                       {
-                               channel->SetMode('V',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-
-               return MODEACTION_DENY;
-       }
+       NoInvite(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'V') { }
 };
 
 class ModuleNoInvite : public Module
@@ -60,11 +38,15 @@ class ModuleNoInvite : public Module
 
        virtual int OnUserPreInvite(User* user,User* dest,Channel* channel, time_t timeout)
        {
-               if (channel->IsModeSet('V'))
+               if (IS_LOCAL(user))
                {
-                       user->WriteServ("492 %s %s :Can't invite %s to channel (+V set)",user->nick, channel->name, dest->nick);
-                       return 1;
+                       if (channel->IsModeSet('V'))
+                       {
+                               user->WriteNumeric(ERR_NOCTCPALLOWED, "%s %s :Can't invite %s to channel (+V set)",user->nick.c_str(), channel->name.c_str(), dest->nick.c_str());
+                               return 1;
+                       }
                }
+
                return 0;
        }
 
@@ -73,10 +55,10 @@ class ModuleNoInvite : public Module
                ServerInstance->Modes->DelMode(ni);
                delete ni;
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
        }
 };