Convert a bunch of time-related config options to getDuration.

[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 714114f04f66506bc444b391a8f691eeb1d583be..0b708641e9124219ce66a5f9855c7f763a3b6e38 100644 (file)
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -1,45 +1,43 @@
-/*       +------------------------------------+
- *       | 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 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006 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 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()
+       void Prioritize() CXX11_OVERRIDE
        {
+               // 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);
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Sets (and unsets) modes on users when they connect", VF_VENDOR);
        }
 
-       virtual void OnUserConnect(User* user)
+       void OnUserConnect(LocalUser* user) CXX11_OVERRIDE
        {
-               if (!IS_LOCAL(user))
-                       return;
-
                // Backup and zero out the disabled usermodes, so that we can override them here.
                char save[64];
                memcpy(save, ServerInstance->Config->DisabledUModes,
@@ -53,26 +51,14 @@ class ModuleModesOnConnect : public Module
                        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]);
 
-                       if (tokens.size() > 1)
-                       {
-                               // process mode params
-                               for (unsigned int k = 1; k < tokens.size(); k++)
-                               {
-                                       modes.push_back(tokens[k]);
-                               }
-                       }
+                       // split ThisUserModes into modes and mode params
+                       while (ss >> buf)
+                               modes.push_back(buf);
 
-                       ServerInstance->Parser->CallHandler("MODE", modes, user);
+                       ServerInstance->Parser.CallHandler("MODE", modes, user);
                }
 
                memcpy(ServerInstance->Config->DisabledUModes, save, 64);