-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/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
{
- private:
-
- ConfigReader *Conf;
-
public:
- ModuleModesOnConnect(InspIRCd* Me)
- : Module(Me)
- {
-
- Conf = new ConfigReader(ServerInstance);
- Implementation eventlist[] = { I_OnPostConnect, I_OnRehash };
- ServerInstance->Modules->Attach(eventlist, this, 2);
- }
-
-
- virtual void OnRehash(User* user, const std::string ¶meter)
- {
- delete Conf;
- Conf = new ConfigReader(ServerInstance);
- }
-
- virtual ~ModuleModesOnConnect()
+ void Prioritize()
{
- delete Conf;
+ // 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("$Id", VF_VENDOR,API_VERSION);
+ return Version("Sets (and unsets) modes on users when they connect", VF_VENDOR);
}
- virtual void OnPostConnect(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,
sizeof(ServerInstance->Config->DisabledUModes));
memset(ServerInstance->Config->DisabledUModes, 0, 64);
- for (int j = 0; j < Conf->Enumerate("connect"); j++)
+ ConfigTag* tag = user->MyClass->config;
+ std::string ThisModes = tag->getString("modes");
+ if (!ThisModes.empty())
{
- std::string hostn = Conf->ReadValue("connect","allow",j);
- /* XXX: Fixme: does not respect port, limit, etc */
- if ((InspIRCd::MatchCIDR(user->GetIPString(),hostn)) || (InspIRCd::Match(user->host,hostn)))
- {
- std::string ThisModes = Conf->ReadValue("connect","modes",j);
- 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::string buf;
+ std::stringstream ss(ThisModes);
- std::vector<std::string> modes;
- modes.push_back(user->nick);
- modes.push_back(tokens[0]);
+ std::vector<std::string> modes;
+ modes.push_back(user->nick);
- 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);
- }
- break;
- }
+ ServerInstance->Modes->Process(modes, user);
}
memcpy(ServerInstance->Config->DisabledUModes, save, 64);