Sync helpop chmodes s and p with docs

[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 e19bb94146e21d152f8f61d51aa29fb764bfe7ff..8cf6d1651459b6274b54de376e06482d8e6068b0 100644 (file)
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -1,10 +1,11 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   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) 2007 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2006, 2010 Craig Edwards <brain@inspircd.org>
  *
  * 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
@@ -22,65 +23,28 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Sets (and unsets) modes on users when they connect */
-
 class ModuleModesOnConnect : public Module
 {
  public:
-       void init() CXX11_OVERRIDE
-       {
-               ServerInstance->Modules->Attach(I_OnUserConnect, this);
-       }
-
-       void Prioritize()
-       {
-               // for things like +x on connect, important, otherwise we have to resort to config order (bleh) -- w00t
-               ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIORITY_FIRST);
-       }
-
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Sets (and unsets) modes on users when they connect", VF_VENDOR);
+               return Version("Allows the server administrator to set user modes on connecting users.", VF_VENDOR);
        }
 
        void OnUserConnect(LocalUser* user) CXX11_OVERRIDE
        {
-               // 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);
        }
 };