Header update: 2007 -> 2008

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

diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index dbc34bcb5e6a11449395a5f50ec71824187229b3..7e96c86d7c44e0970141746353f3986a01cc5918 100644 (file)
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.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
@@ -11,12 +11,7 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <vector>
-#include "users.h"
-#include "channels.h"
 #include "inspircd.h"
-#include "modules.h"
 
 /* $ModDesc: Sets (and unsets) modes on opers when they oper up */
 
@@ -29,26 +24,24 @@ class ModuleModesOnOper : public Module
 
  public:
        ModuleModesOnOper(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
                Conf = new ConfigReader(ServerInstance);
+               Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnPostOper] = List[I_OnRehash] = 1;
-       }
 
-       virtual void OnRehash(userrec* user, const std::string &parameter)
+       virtual void OnRehash(User* user, const std::string &parameter)
        {
-               DELETE(Conf);
+               delete Conf;
                Conf = new ConfigReader(ServerInstance);
        }
        
        virtual ~ModuleModesOnOper()
        {
-               DELETE(Conf);
+               delete Conf;
        }
        
        virtual Version GetVersion()
@@ -56,7 +49,7 @@ class ModuleModesOnOper : public Module
                return Version(1,1,0,1,VF_VENDOR,API_VERSION);
        }
        
-       virtual void OnPostOper(userrec* user, const std::string &opertype)
+       virtual void OnPostOper(User* user, const std::string &opertype, const std::string &opername)
        {
                // whenever a user opers, go through the oper types, find their <type:modes>,
                // and if they have one apply their modes. The mode string can contain +modes
@@ -64,80 +57,69 @@ class ModuleModesOnOper : public Module
                for (int j =0; j < Conf->Enumerate("type"); j++)
                {
                        std::string typen = Conf->ReadValue("type","name",j);
-                       if (!strcmp(typen.c_str(),user->oper))
+                       if (typen == user->oper)
                        {
                                std::string ThisOpersModes = Conf->ReadValue("type","modes",j);
-                               char first = *(ThisOpersModes.c_str());
-                               if ((first != '+') && (first != '-'))
-                                       ThisOpersModes = "+" + ThisOpersModes;
-                               if (ThisOpersModes != "")
+                               if (!ThisOpersModes.empty())
                                {
-                                       std::string buf;
-                                       stringstream ss(ThisOpersModes);
-
-                                       vector<string> tokens;
-
-                                       // split ThisOperModes into modes and mode params
-                                       while (ss >> buf)
-                                               tokens.push_back(buf);
-
-                                       int size = tokens.size() + 1;
-                                       const char* modes[size];
-                                       modes[0] = user->nick;
-                                       modes[1] = (char*)tokens[0].c_str();
+                                       ApplyModes(user, ThisOpersModes);
+                               }
+                               break;
+                       }
+               }
 
-                                       if (tokens.size() > 1)
-                                       {
-                                               // process mode params
-                                               int i = 2;
-                                               for (unsigned int k = 1; k < tokens.size(); k++)
-                                               {
-                                                       modes[i] = (char*)tokens[k].c_str();
-                                                       ServerInstance->Log(DEBUG, "m_opermodes.so: got mode param: %s", modes[i]);
-                                                       i++;
-                                               }
-                                       }
-                                       std::deque<std::string> n;
-                                       Event rmode((char *)&n, NULL, "send_mode");
-                                       n.push_back(user->nick);
-                                       n.push_back(modes[0]);
-                                       for (unsigned int j = 1; j < tokens.size(); j++)
+               if (!opername.empty()) // if user is local ..
+               {
+                       for (int j = 0; j < Conf->Enumerate("oper"); j++)
+                       {
+                               if (opername == Conf->ReadValue("oper", "name", j))
+                               {
+                                       std::string ThisOpersModes = Conf->ReadValue("oper", "modes", j);
+                                       if (!ThisOpersModes.empty())
                                        {
-                                               n.push_back(modes[j]);
+                                               ApplyModes(user, ThisOpersModes);
                                        }
-                                       rmode.Send(ServerInstance);
-                                       ServerInstance->Log(DEBUG, "m_opermodes.so: new modes for %s: %s", modes[0], modes[1]);
-                                       ServerInstance->SendMode(modes, size, user);
+                                       break;
                                }
-                               break;
                        }
                }
        }
-};
-
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
 
-class ModuleModesOnOperFactory : public ModuleFactory
-{
- public:
-       ModuleModesOnOperFactory()
+       void ApplyModes(User *u, std::string &smodes)
        {
-       }
-       
-       ~ModuleModesOnOperFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleModesOnOper(Me);
-       }
-       
-};
+               char first = *(smodes.c_str());
+               if ((first != '+') && (first != '-'))
+                       smodes = "+" + smodes;
 
+               std::string buf;
+               stringstream ss(smodes);
+               vector<string> tokens;
 
-extern "C" void * init_module( void )
-{
-       return new ModuleModesOnOperFactory;
-}
+               // split into modes and mode params
+               while (ss >> buf)
+                       tokens.push_back(buf);
+
+               int size = tokens.size() + 1;
+               const char** modes = new const char*[size];
+               modes[0] = u->nick;
+
+               // process mode params
+               int i = 1;
+               for (unsigned int k = 0; k < tokens.size(); k++)
+               {
+                       modes[i] = tokens[k].c_str();
+                       i++;
+               }
+
+               std::deque<std::string> n;
+               Event rmode((char *)&n, NULL, "send_mode_explicit");
+               for (unsigned int j = 0; j < tokens.size(); j++)
+                       n.push_back(modes[j]);
+
+               rmode.Send(ServerInstance);
+               ServerInstance->SendMode(modes, size, u);
+               delete [] modes;
+       }
+};
 
+MODULE_INIT(ModuleModesOnOper)