...because every now and again, i have to do a massive commit.

[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 b354abf0afe9ae2ae1a60ffd0593d8e4523af502..7cc4ecc86c024d66156ae3073253477e7acb7421 100644 (file)
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -2,114 +2,80 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
 #include "inspircd.h"
-#include "modules.h"
 
 /* $ModDesc: Sets (and unsets) modes on opers when they oper up */
 
 class ModuleModesOnOper : public Module
 {
- private:
-
-       
-       ConfigReader *Conf;
-
  public:
-       ModuleModesOnOper(InspIRCd* Me)
-               : Module::Module(Me)
+       ModuleModesOnOper()
        {
-               
-               Conf = new ConfigReader;
+               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(const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
-               DELETE(Conf);
-               Conf = new ConfigReader;
        }
-       
+
        virtual ~ModuleModesOnOper()
        {
-               DELETE(Conf);
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_VENDOR);
+               return Version("Sets (and unsets) modes on opers when they oper up", VF_VENDOR);
        }
-       
-       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
                // to add modes to the user or -modes to take modes from the user.
-               for (int j =0; j < Conf->Enumerate("type"); j++)
+               std::string ThisOpersModes = user->oper->getConfig("modes");
+               if (!ThisOpersModes.empty())
                {
-                       std::string typen = Conf->ReadValue("type","name",j);
-                       if (!strcmp(typen.c_str(),user->oper))
-                       {
-                               std::string ThisOpersModes = Conf->ReadValue("type","modes",j);
-                               char first = *(ThisOpersModes.c_str());
-                               if ((first != '+') && (first != '-'))
-                                       ThisOpersModes = "+" + ThisOpersModes;
-                               if (ThisOpersModes != "")
-                               {
-                                       const char* modes[2];
-                                       modes[0] = user->nick;
-                                       modes[1] = ThisOpersModes.c_str();
-                                       ServerInstance->SendMode(modes,2,user);
-                               }
-                               break;
-                       }
+                       ApplyModes(user, ThisOpersModes);
                }
        }
-};
-
-// 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;
+               std::stringstream ss(smodes);
+               std::vector<std::string> tokens;
 
-extern "C" void * init_module( void )
-{
-       return new ModuleModesOnOperFactory;
-}
+               // split into modes and mode params
+               while (ss >> buf)
+                       tokens.push_back(buf);
+
+               std::vector<std::string> modes;
+               modes.push_back(u->nick);
+
+               // process mode params
+               for (unsigned int k = 0; k < tokens.size(); k++)
+               {
+                       modes.push_back(tokens[k]);
+               }
+
+               ServerInstance->SendMode(modes, u);
+               ServerInstance->PI->SendMode(u->uuid, ServerInstance->Modes->GetLastParseParams(), ServerInstance->Modes->GetLastParseTranslate());
+       }
+};
 
+MODULE_INIT(ModuleModesOnOper)