Merge pull request #1147 from SaberUK/insp20+gcc6

[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 6b5ca10f95de62d70a3c0425dd1b8b6a8a86b05a..8b49f685e73b5eef372a5f11ce031a240a57f24a 100644 (file)
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -1,16 +1,25 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   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 program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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/>.
  */
 
+
 #include "inspircd.h"
 
 /* $ModDesc: Sets (and unsets) modes on opers when they oper up */
@@ -18,15 +27,9 @@
 class ModuleModesOnOper : public Module
 {
  public:
-       ModuleModesOnOper()
-       {
-               Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
-       }
-
-
-       virtual void OnRehash(User* user)
+       void init()
        {
+               ServerInstance->Modules->Attach(I_OnPostOper, this);
        }
 
        virtual ~ModuleModesOnOper()
@@ -40,6 +43,9 @@ class ModuleModesOnOper : public Module
 
        virtual void OnPostOper(User* user, const std::string &opertype, const std::string &opername)
        {
+               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.
@@ -48,24 +54,6 @@ class ModuleModesOnOper : public Module
                {
                        ApplyModes(user, ThisOpersModes);
                }
-
-               if (!opername.empty()) // if user is local ..
-               {
-                       for (int i = 0;; i++)
-                       {
-                               ConfigTag* tag = ServerInstance->Config->ConfValue("oper", i);
-                               if (!tag)
-                                       break;
-                               if (tag->getString("name") != opername)
-                                       continue;
-                               ThisOpersModes = tag->getString("modes");
-                               if (!ThisOpersModes.empty())
-                               {
-                                       ApplyModes(user, ThisOpersModes);
-                               }
-                               break;
-                       }
-               }
        }
 
        void ApplyModes(User *u, std::string &smodes)
@@ -76,23 +64,14 @@ class ModuleModesOnOper : public Module
 
                std::string buf;
                std::stringstream ss(smodes);
-               std::vector<std::string> tokens;
+               std::vector<std::string> modes;
 
+               modes.push_back(u->nick);
                // 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]);
-               }
+                       modes.push_back(buf);
 
                ServerInstance->SendMode(modes, u);
-               ServerInstance->PI->SendMode(u->uuid, ServerInstance->Modes->GetLastParseParams(), ServerInstance->Modes->GetLastParseTranslate());
        }
 };