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 7551d32f30b5459f068789339595a240c325c1b2..8cf6d1651459b6274b54de376e06482d8e6068b0 100644 (file)
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -1,137 +1,51 @@
-/*       +------------------------------------+
- *       | 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) 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 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 <vector>
-#include "users.h"
-#include "channels.h"
 #include "inspircd.h"
-#include "modules.h"
-#include "wildcard.h"
-
-/* $ModDesc: Sets (and unsets) modes on users when they connect */
 
 class ModuleModesOnConnect : public Module
 {
- private:
-
-       ConfigReader *Conf;
-
  public:
-       ModuleModesOnConnect(InspIRCd* Me)
-               : Module::Module(Me)
-       {
-               
-               Conf = new ConfigReader(ServerInstance);
-       }
-
-       void Implements(char* List)
+       Version GetVersion() CXX11_OVERRIDE
        {
-               List[I_OnPostConnect] = List[I_OnRehash] = 1;
+               return Version("Allows the server administrator to set user modes on connecting users.", VF_VENDOR);
        }
 
-       virtual void OnRehash(const std::string &parameter)
+       void OnUserConnect(LocalUser* user) CXX11_OVERRIDE
        {
-               DELETE(Conf);
-               Conf = new ConfigReader(ServerInstance);
-       }
-       
-       virtual ~ModuleModesOnConnect()
-       {
-               DELETE(Conf);
-       }
-       
-       virtual Version GetVersion()
-       {
-               return Version(1,0,0,1,VF_VENDOR);
-       }
-       
-       virtual void OnPostConnect(userrec* user)
-       {
-               if (!IS_LOCAL(user))
+               const std::string modestr = user->MyClass->config->getString("modes");
+               if (modestr.empty())
                        return;
 
-               ServerInstance->Log(DEBUG,"Post connect for mode setting");
-               for (int j = 0; j < Conf->Enumerate("connect"); j++)
-               {
-                       std::string hostn = Conf->ReadValue("connect","allow",j);
-                       if ((match(user->GetIPString(),hostn.c_str(),true)) || (match(user->host,hostn.c_str())))
-                       {
-                               ServerInstance->Log(DEBUG,"Found matching connect block '%s'",hostn.c_str());
-                               std::string ThisModes = Conf->ReadValue("connect","modes",j);
-                               if (ThisModes != "")
-                               {
-                                       std::string buf;
-                                       stringstream ss(ThisModes);
-
-                                       vector<string> tokens;
-
-                                       // split ThisUserModes into modes and mode params
-                                       while (ss >> buf)
-                                               tokens.push_back(buf);
+               CommandBase::Params params;
+               params.push_back(user->nick);
 
-                                       int size = tokens.size() + 1;
-                                       const char* modes[size];
-                                       modes[0] = user->nick;
-                                       modes[1] = tokens[0].c_str();
+               irc::spacesepstream modestream(modestr);
+               for (std::string modetoken; modestream.GetToken(modetoken); )
+                       params.push_back(modetoken);
 
-                                       if (tokens.size() > 1)
-                                       {
-                                               // process mode params
-                                               int i = 2;
-                                               for (unsigned int k = 1; k < tokens.size(); k++)
-                                               {
-                                                       modes[i] = tokens[k].c_str();
-                                                       i++;
-                                               }
-                                       }
-
-                                       ServerInstance->SendMode(modes, size, user);
-                               }
-                               break;
-                       }
-               }
+               ServerInstance->Parser.CallHandler("MODE", params, user);
        }
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleModesOnConnectFactory : public ModuleFactory
-{
- public:
-       ModuleModesOnConnectFactory()
-       {
-       }
-       
-       ~ModuleModesOnConnectFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleModesOnConnect(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleModesOnConnectFactory;
-}
-
+MODULE_INIT(ModuleModesOnConnect)