Fix the cloaking module on C++98 compilers.

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

diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index 22a4ee0aaec2f10747ec1fe65bf08e9b13b0f34e..8cf6d1651459b6274b54de376e06482d8e6068b0 100644 (file)
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -1,78 +1,50 @@
-/*       +------------------------------------+
- *       | 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) 2013, 2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006, 2010 Craig Edwards <brain@inspircd.org>
  *
- * 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 users when they connect */
+#include "inspircd.h"
 
 class ModuleModesOnConnect : public Module
 {
  public:
-       ModuleModesOnConnect()  {
-               Implementation eventlist[] = { I_OnUserConnect, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
-               // for things like +x on connect, important, otherwise we have to resort to config order (bleh) -- w00t
-               ServerInstance->Modules->SetPriority(this, PRIORITY_FIRST);
-       }
-
-
-       virtual ~ModuleModesOnConnect()
+       Version GetVersion() CXX11_OVERRIDE
        {
+               return Version("Allows the server administrator to set user modes on connecting users.", VF_VENDOR);
        }
 
-       virtual Version GetVersion()
+       void OnUserConnect(LocalUser* user) CXX11_OVERRIDE
        {
-               return Version("Sets (and unsets) modes on users when they connect", VF_VENDOR);
-       }
-
-       virtual void OnUserConnect(LocalUser* user)
-       {
-               // Backup and zero out the disabled usermodes, so that we can override them here.
-               char save[64];
-               memcpy(save, ServerInstance->Config->DisabledUModes,
-                               sizeof(ServerInstance->Config->DisabledUModes));
-               memset(ServerInstance->Config->DisabledUModes, 0, 64);
-
-               ConfigTag* tag = user->MyClass->config;
-               std::string ThisModes = tag->getString("modes");
-               if (!ThisModes.empty())
-               {
-                       std::string buf;
-                       std::stringstream ss(ThisModes);
-
-                       std::vector<std::string> tokens;
-
-                       // split ThisUserModes into modes and mode params
-                       while (ss >> buf)
-                               tokens.push_back(buf);
-
-                       std::vector<std::string> modes;
-                       modes.push_back(user->nick);
-                       modes.push_back(tokens[0]);
+               const std::string modestr = user->MyClass->config->getString("modes");
+               if (modestr.empty())
+                       return;
 
-                       if (tokens.size() > 1)
-                       {
-                               // process mode params
-                               for (unsigned int k = 1; k < tokens.size(); k++)
-                               {
-                                       modes.push_back(tokens[k]);
-                               }
-                       }
+               CommandBase::Params params;
+               params.push_back(user->nick);
 
-                       ServerInstance->Parser->CallHandler("MODE", modes, user);
-               }
+               irc::spacesepstream modestream(modestr);
+               for (std::string modetoken; modestream.GetToken(modetoken); )
+                       params.push_back(modetoken);
 
-               memcpy(ServerInstance->Config->DisabledUModes, save, 64);
+               ServerInstance->Parser.CallHandler("MODE", params, user);
        }
 };