Always deny invite to users below halfop status, move OnUserPreInvite up to above...

[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 83331ed8ec77f8e08f5ba9b8df758042e91e74e3..53e5ca84f237893ba5a2147285dc33d684b35093 100644 (file)
--- a/src/modules/m_noinvite.cpp
+++ b/src/modules/m_noinvite.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,38 +12,13 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $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(userrec* source, userrec* dest, chanrec* 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
@@ -54,35 +29,46 @@ class ModuleNoInvite : public Module
        ModuleNoInvite(InspIRCd* Me) : Module(Me)
        {
                ni = new NoInvite(ServerInstance);
-               if (!ServerInstance->AddMode(ni, 'V'))
+               if (!ServerInstance->Modes->AddMode(ni))
                        throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnUserPreInvite, I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-       void Implements(char* List)
+       virtual void On005Numeric(std::string &output)
        {
-               List[I_OnUserPreInvite] = 1;
+               ServerInstance->AddExtBanChar('V');
        }
 
-       virtual int OnUserPreInvite(userrec* user,userrec* dest,chanrec* channel)
+       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 (CHANOPS_EXEMPT(ServerInstance, 'c') && channel->GetStatus(user) == STATUS_OP)
+                       {
+                               return 0;
+                       }
+
+                       if (channel->IsModeSet('V') || channel->IsExtBanned(user, '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;
        }
 
        virtual ~ModuleNoInvite()
        {
                ServerInstance->Modes->DelMode(ni);
-               DELETE(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);
        }
 };
 
-MODULE_INIT(ModuleNoInvite);
+MODULE_INIT(ModuleNoInvite)