Add extra parameter to MySQLresult and SQLresult

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

diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index 6ebb659b61dae81e7f8fade02e64724184847393..a15cc67c5e215e5ae60571b1e01b7c371723c65d 100644 (file)
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -20,40 +20,71 @@
 #include "modules.h"
 #include "helperfuncs.h"
 
-/* $ModDesc: Provides support for unreal-style channel mode +c */
+/* $ModDesc: Provides support for channel mode +P to block all-CAPS channel messages and notices */
+
+class BlockCaps : public ModeHandler
+{
+ public:
+       BlockCaps() : ModeHandler('P', 0, 0, false, MODETYPE_CHANNEL, false) { }
+
+       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       {
+               if (adding)
+               {
+                       if (!channel->IsModeSet('P'))
+                       {
+                               channel->SetMode('P',true);
+                               return MODEACTION_ALLOW;
+                       }
+               }
+               else
+               {
+                       if (channel->IsModeSet('P'))
+                       {
+                               channel->SetMode('P',false);
+                               return MODEACTION_ALLOW;
+                       }
+               }
+
+               return MODEACTION_DENY;
+       }
+};
 
 class ModuleBlockCAPS : public Module
 {
        Server *Srv;
+       BlockCaps* bc;
 public:
        
        ModuleBlockCAPS(Server* Me) : Module::Module(Me)
        {
                Srv = Me;
-               Srv->AddExtendedMode('P', MT_CHANNEL, false, 0, 0);
+               bc = new BlockCaps;
+               Srv->AddMode(bc, 'P');
        }
 
        void Implements(char* List)
        {
-               List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnExtendedMode] = 1;
+               List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
        }
 
        virtual void On005Numeric(std::string &output)
        {
                InsertMode(output, "P", 4);
        }
-       
+
        virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
        {
                if (target_type == TYPE_CHANNEL)
                {
                        chanrec* c = (chanrec*)dest;
 
-                       if (c->IsCustomModeSet('P'))
+                       if (c->IsModeSet('P'))
                        {
-                               for(unsigned int i = 0; i < text.length(); i++)
+                               const char* i = text.c_str();
+                               for (; *i; i++)
                                {
-                                       if((text[i] < 'A') || (text[i] > 'Z'))
+                                       if (((*i != ' ') && (*i != '\t')) && ((*i < 'A') || (*i > 'Z')))
                                        {
                                                return 0;
                                        }
@@ -71,22 +102,9 @@ public:
                return OnUserPreMessage(user,dest,target_type,text,status);
        }
        
-       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 == 'P') && (type == MT_CHANNEL))
-               {
-                       log(DEBUG,"Allowing P change");
-                       return 1;
-               }
-               else
-               {
-                       return 0;
-               }
-       }
-
        virtual ~ModuleBlockCAPS()
        {
+               DELETE(bc);
        }
        
        virtual Version GetVersion()