AMD64 warning 'fix' which tested fine when I added it seems to now...stop things...

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

diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index 3cce627589aee00c8c0fcf835714e232ec8924fa..f92bb9899b8970209e747ec715fa07bd3953946e 100644 (file)
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -24,9 +24,12 @@ using namespace std;
 
 /* $ModDesc: Provides support for unreal-style oper-override */
 
+typedef std::map<std::string,std::string> override_t;
+
 class ModuleOverride : public Module
 {
        Server *Srv;
+       override_t overrides;
        bool NoisyOverride;
        ConfigReader *Conf;
        
@@ -43,21 +46,28 @@ class ModuleOverride : public Module
                Conf = new ConfigReader;
                
                // read our config options (main config file)
-               NoisyOverride = Conf->ReadFlag("override","noisy",0);
+               OnRehash("");
        }
        
-       virtual void OnRehash(std::string parameter)
+       virtual void OnRehash(const std::string &parameter)
        {
                // on a rehash we delete our classes for good measure and create them again.
                delete Conf;
                Conf = new ConfigReader;
                // re-read our config options on a rehash
                NoisyOverride = Conf->ReadFlag("override","noisy",0);
+               overrides.clear();
+               for (int j =0; j < Conf->Enumerate("type"); j++)
+               {
+                       std::string typen = Conf->ReadValue("type","name",j);
+                       std::string tokenlist = Conf->ReadValue("type","override",j);
+                       overrides[typen] = tokenlist;
+               }
        }
 
        void Implements(char* List)
        {
-               List[I_OnRehash] = List[I_OnAccessCheck] = List[I_On005Numeric] = List[I_OnUserPreJoin] = 1;
+               List[I_OnRehash] = List[I_OnAccessCheck] = List[I_On005Numeric] = List[I_OnUserPreJoin] = List[I_OnUserPreKick] = 1;
        }
 
         virtual void On005Numeric(std::string &output)
@@ -68,40 +78,43 @@ class ModuleOverride : public Module
        virtual bool CanOverride(userrec* source, char* token)
        {
                // checks to see if the oper's type has <type:override>
-               for (int j =0; j < Conf->Enumerate("type"); j++)
+               override_t::iterator j = overrides.find(source->oper);
+               if (j != overrides.end())
                 {
-                       std::string typen = Conf->ReadValue("type","name",j);
-                       if (!strcmp(typen.c_str(),source->oper))
-                       {
-                               // its defined, return its value as a boolean for if the token is set
-                               std::string tokenlist = Conf->ReadValue("type","override",j);
-                               return strstr(tokenlist.c_str(),token);
-                        }
+                       // its defined, return its value as a boolean for if the token is set
+                       return strstr(j->second.c_str(),token);
                 }
                // its not defined at all, count as false
                return false;
        }
+
+       virtual int OnUserPreKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason)
+       {
+               if ((*source->oper) && (CanOverride(source,"KICK")))
+               {
+                       if (((Srv->ChanMode(source,chan) == "%") && (Srv->ChanMode(user,chan) == "@")) || (Srv->ChanMode(source,chan) == ""))
+                       {
+                               Srv->SendOpers("*** NOTICE: "+std::string(source->nick)+" Override-Kicked "+std::string(user->nick)+" on "+std::string(chan->name)+" ("+reason+")");
+                       }
+                       /* Returning -1 explicitly allows the kick */
+                       return -1;
+               }
+               return 0;
+       }
        
        virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type)
        {
-               if (strchr(source->modes,'o'))
+               if (*source->oper)
                {
                        if ((Srv) && (source) && (channel))
                        {
                                // Fix by brain - allow the change if they arent on channel - rely on boolean short-circuit
                                // to not check the other items in the statement if they arent on the channel
-                               if ((!Srv->IsOnChannel(source,channel)) || ((Srv->ChanMode(source,channel) != "%") && (Srv->ChanMode(source,channel) != "@")))
+                               std::string mode = Srv->ChanMode(source,channel);
+                               if ((!channel->HasUser(source)) || ((mode != "%") && (mode != "@")))
                                {
                                        switch (access_type)
                                        {
-                                               case AC_KICK:
-                                                       if (CanOverride(source,"KICK"))
-                                                       {
-                                                               Srv->SendOpers("*** NOTICE: "+std::string(source->nick)+" Override-Kicked "+std::string(dest->nick)+" on "+std::string(channel->name));
-                                                               return ACR_ALLOW;
-                                                       }
-                                                       else return ACR_DEFAULT;
-                                               break;
                                                case AC_DEOP:
                                                        if (CanOverride(source,"MODEDEOP"))
                                                        {
@@ -168,11 +181,11 @@ class ModuleOverride : public Module
        
        virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
        {
-               if (strchr(user->modes,'o'))
+               if (*user->oper)
                {
                        if (chan)
                        {
-                               if ((chan->binarymodes & CM_INVITEONLY) && (CanOverride(user,"INVITE")))
+                               if ((chan->modes[CM_INVITEONLY]) && (CanOverride(user,"INVITE")))
                                {
                                        if (NoisyOverride)
                                        {