Gah, im forgetting to SetMode!

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

diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index d5757c002c2e1c5990b4d19e6d0bea5a0cb84c03..57ab1e91c0739d4e465c65d7a825223280001a9e 100644 (file)
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -21,20 +21,26 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style umode +B */
 
 class BotMode : public ModeHandler
 {
+ public:
        BotMode() : ModeHandler('B', 0, 0, false, MODETYPE_USER, false) { }
 
        ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
+               /* Only opers can change other users modes */
+               if ((source != dest) && (!*source->oper))
+                       return MODEACTION_DENY;
+
                if (adding)
                {
                        if (!dest->IsModeSet('B'))
                        {
-                               user->SetMode('B',true);
+                               dest->SetMode('B',true);
                                return MODEACTION_ALLOW;
                        }
                }
@@ -42,58 +48,46 @@ class BotMode : public ModeHandler
                {
                        if (dest->IsModeSet('B'))
                        {
-                               user->SetMode('B',false);
+                               dest->SetMode('B',false);
                                return MODEACTION_ALLOW;
                        }
                }
+               
+               return MODEACTION_DENY;
        }
 };
 
 class ModuleBotMode : public Module
 {
-       Server *Srv; 
+       Server *Srv;
+       BotMode* bm;
  public:
        ModuleBotMode(Server* Me)
                : Module::Module(Me)
        {
                Srv = Me;
-               
-               if (!Srv->AddExtendedMode('B',MT_CLIENT,false,0,0))
-               {
-                       Srv->Log(DEFAULT,"*** m_botmode: ERROR, failed to allocate user mode +B!");
-                       return;
-               }
+               bm = new BotMode();
+               Srv->AddMode(bm, 'B');
        }
 
        void Implements(char* List)
        {
-               List[I_OnWhois] = List[I_OnExtendedMode] = 1;
+               List[I_OnWhois] = 1;
        }
        
        virtual ~ModuleBotMode()
        {
+               DELETE(bm);
        }
        
        virtual Version GetVersion()
        {
                return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
        }
-       
-       virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
-       {
-               if ((modechar == 'B') && (type == MT_CLIENT))
-               {
-                       return 1;
-               }
-               else
-               {
-                       return 0;
-               }
-       }
 
        virtual void OnWhois(userrec* src, userrec* dst)
        {
-               if (dst->modes['B'-65])
+               if (dst->IsModeSet('B'))
                {
                        Srv->SendTo(NULL,src,"335 "+std::string(src->nick)+" "+std::string(dst->nick)+" :is a \2bot\2 on "+Srv->GetNetworkName());
                }
@@ -126,4 +120,3 @@ extern "C" void * init_module( void )
 {
        return new ModuleBotModeFactory;
 }
-