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 a72a95db82b6af7927ca2e1756b051f4014a0239..53e5ca84f237893ba5a2147285dc33d684b35093 100644 (file)
--- a/src/modules/m_noinvite.cpp
+++ b/src/modules/m_noinvite.cpp
@@ -1,123 +1,74 @@
-/*   +------------------------------------+
- *   | Inspire Internet Relay Chat Daemon |
- *   +------------------------------------+
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                   E-mail:
- *            <brain@chatspike.net>
- *            <Craig@chatspike.net>
- * 
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- * the file COPYING for details.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +V */
 
+class NoInvite : public SimpleChannelModeHandler
+{
+ public:
+       NoInvite(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'V') { }
+};
+
 class ModuleNoInvite : public Module
 {
-       Server *Srv;
-       
-       public:
- 
-               ModuleNoInvite(Server* Me)
-                       : Module::Module(Me)
-               {
-                       Srv = Me;
-                       Srv->AddExtendedMode('V',MT_CHANNEL,false,0,0);
-               }
+       NoInvite *ni;
+ public:
 
-               void Implements(char* List)
-               {
-                       List[I_On005Numeric] = List[I_OnUserPreInvite] = List[I_OnExtendedMode] = 1;
-               }
+       ModuleNoInvite(InspIRCd* Me) : Module(Me)
+       {
+               ni = new NoInvite(ServerInstance);
+               if (!ServerInstance->Modes->AddMode(ni))
+                       throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnUserPreInvite, I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
+       }
 
-               virtual void On005Numeric(std::string &output)
-               {
-                       std::stringstream line(output);
-                       std::string temp1, temp2;
+       virtual void On005Numeric(std::string &output)
+       {
+               ServerInstance->AddExtBanChar('V');
+       }
 
-                       while (!line.eof())
+       virtual int OnUserPreInvite(User* user,User* dest,Channel* channel, time_t timeout)
+       {
+               if (IS_LOCAL(user))
+               {
+                       if (CHANOPS_EXEMPT(ServerInstance, 'c') && channel->GetStatus(user) == STATUS_OP)
                        {
-                               line >> temp1;
-                               if (temp1.substr(0,10) == "CHANMODES=")
-                               {
-                                       // append the chanmode to the end
-                                       temp1 = temp1.substr(10,temp1.length());
-                                       temp1 = "CHANMODES=" + temp1 + "V";
-                               }
-                               temp2 = temp2 + temp1 + " ";
+                               return 0;
                        }
-                       if (temp2.length())
-                               output = temp2.substr(0,temp2.length()-1);
-               }
 
-
-               virtual int OnUserPreInvite(userrec* user,userrec* dest,chanrec* channel)
-               {
-                       if (channel->IsCustomModeSet('V'))
+                       if (channel->IsModeSet('V') || channel->IsExtBanned(user, 'V'))
                        {
-                               WriteServ(user->fd,"492 %s %s :Can't invite %s to channel (+V set)",user->nick, channel->name, dest->nick);
+                               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 int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
-               {
-                       // check if this is our mode character...
-                       if ((modechar == 'V') && (type == MT_CHANNEL))
-                       {
-                               return 1;
-                       }
-                       else
-                       {
-                               return 0;
-                       }
                }
 
-               virtual ~ModuleNoInvite()
-               {
-               }
-       
-               virtual Version GetVersion()
-               {
-                       return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
-               }
-};
+               return 0;
+       }
 
+       virtual ~ModuleNoInvite()
+       {
+               ServerInstance->Modes->DelMode(ni);
+               delete ni;
+       }
 
-class ModuleNoInviteFactory : public ModuleFactory
-{
-       public:
-               ModuleNoInviteFactory()
-               {
-               }
-       
-               ~ModuleNoInviteFactory()
-               {
-               }
-       
-               virtual Module * CreateModule(Server* Me)
-               {
-                       return new ModuleNoInvite(Me);
-               }
-       
+       virtual Version GetVersion()
+       {
+               return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+       }
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleNoInviteFactory;
-}
-
+MODULE_INIT(ModuleNoInvite)