Introduce ModeProcessFlags, can be passed to ModeParser::Process() to indicate local...

[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 a49cb34e8e9aaf3d065c084717542febb2b161ca..4d4fcd998b7c42677e20b8c3fad851bfa4c8613b 100644 (file)
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -1,108 +1,74 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- 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.
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2005-2007 Craig Edwards <craigedwards@brainbox.cc>
  *
- * ---------------------------------------------------
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-using namespace std;
 
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+#include "inspircd.h"
 
 /* $ModDesc: Sets (and unsets) modes on opers when they oper up */
 
 class ModuleModesOnOper : public Module
 {
- private:
-
-       Server *Srv;
-       ConfigReader *Conf;
-
  public:
-       ModuleModesOnOper(Server* Me)
-               : Module::Module(Me)
+       void init() CXX11_OVERRIDE
        {
-               Srv = Me;
-               Conf = new ConfigReader;
+               ServerInstance->Modules->Attach(I_OnPostOper, this);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnOper] = 1;
-       }
-       
-       virtual ~ModuleModesOnOper()
+       Version GetVersion() CXX11_OVERRIDE
        {
-               delete Conf;
+               return Version("Sets (and unsets) modes on opers when they oper up", VF_VENDOR);
        }
-       
-       virtual Version GetVersion()
-       {
-               return Version(1,0,0,1,VF_VENDOR);
-       }
-       
-       virtual void OnOper(userrec* user, std::string opertype)
+
+       void OnPostOper(User* user, const std::string &opertype, const std::string &opername) CXX11_OVERRIDE
        {
+               if (!IS_LOCAL(user))
+                       return;
+
                // 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 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 != "")
-                               {
-                                       char* modes[2];
-                                       modes[0] = user->nick;
-                                       modes[1] = (char*)ThisOpersModes.c_str();
-                                       Srv->SendMode(modes,2,user);
-                               }
-                                break;
-                        }
-                }
+               std::string ThisOpersModes = user->oper->getConfig("modes");
+               if (!ThisOpersModes.empty())
+               {
+                       ApplyModes(user, ThisOpersModes);
+               }
        }
-};
-
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
 
-class ModuleModesOnOperFactory : public ModuleFactory
-{
- public:
-       ModuleModesOnOperFactory()
-       {
-       }
-       
-       ~ModuleModesOnOperFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(Server* Me)
+       void ApplyModes(User *u, std::string &smodes)
        {
-               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> modes;
 
-extern "C" void * init_module( void )
-{
-       return new ModuleModesOnOperFactory;
-}
+               modes.push_back(u->nick);
+               // split into modes and mode params
+               while (ss >> buf)
+                       modes.push_back(buf);
+
+               ServerInstance->Modes->Process(modes, u);
+       }
+};
 
+MODULE_INIT(ModuleModesOnOper)