-/* +------------------------------------+
- * | 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) 2008 John Brooks <john.brooks@dereferenced.net>
+ * Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ * Copyright (C) 2006-2008 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2006 Jamie ??? <???@???>
*
- * 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: Povides support for the /DCCALLOW command */
+#include "inspircd.h"
-static ConfigReader *Conf;
+/* $ModDesc: Provides support for the /DCCALLOW command */
-class BannedFileList : public classbase
+class BannedFileList
{
public:
std::string filemask;
std::string action;
};
-class DCCAllow : public classbase
+class DCCAllow
{
public:
std::string nickname;
}
std::string nick = parameters[0].substr(1);
- User *target = ServerInstance->FindNick(nick);
+ User *target = ServerInstance->FindNickOnly(nick);
- if (target)
+ if ((target) && (!IS_SERVER(target)) && (!target->quitting) && (target->registered == REG_ALL))
{
if (action == '-')
}
std::string mask = std::string(target->nick)+"!"+std::string(target->ident)+"@"+std::string(target->dhost);
- std::string default_length = Conf->ReadValue("dccallow", "length", 0);
+ ConfigReader Conf;
+ std::string default_length = Conf.ReadValue("dccallow", "length", 0);
long length;
if (parameters.size() < 2)
CommandDccallow cmd;
public:
- ModuleDCCAllow(InspIRCd* Me)
- : Module(Me), cmd(this)
+ ModuleDCCAllow()
+ : cmd(this)
{
- Conf = new ConfigReader(ServerInstance);
ext = new SimpleExtItem<dccallowlist>("dccallow", this);
- Extensible::Register(ext);
+ ServerInstance->Extensions.Register(ext);
ServerInstance->AddCommand(&cmd);
ReadFileConf();
- Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserQuit, I_OnUserPreNick, I_OnRehash };
+ Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserQuit, I_OnUserPostNick, I_OnRehash };
ServerInstance->Modules->Attach(eventlist, this, 5);
}
virtual void OnRehash(User* user)
{
- delete Conf;
- Conf = new ConfigReader(ServerInstance);
ReadFileConf();
}
// remove their DCCALLOW list if they have one
if (udl)
{
- RemoveFromUserlist(user);
+ userlist::iterator it = std::find(ul.begin(), ul.end(), user);
+ if (it != ul.end())
+ ul.erase(it);
}
// remove them from any DCCALLOW lists
RemoveNick(user);
}
- virtual ModResult OnUserPreNick(User* user, const std::string &newnick)
+ virtual void OnUserPostNick(User* user, const std::string &oldnick)
{
RemoveNick(user);
- return MOD_RES_PASSTHRU;
}
virtual ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
irc::string type = tokens[1].c_str();
- bool blockchat = Conf->ReadFlag("dccallow", "blockchat", 0);
+ ConfigReader Conf;
+ bool blockchat = Conf.ReadFlag("dccallow", "blockchat", 0);
if (type == "SEND")
{
- std::string defaultaction = Conf->ReadValue("dccallow", "action", 0);
+ std::string defaultaction = Conf.ReadValue("dccallow", "action", 0);
std::string filename = tokens[2];
bool found = false;
void Expire()
{
- for (userlist::iterator iter = ul.begin(); iter != ul.end(); ++iter)
+ for (userlist::iterator iter = ul.begin(); iter != ul.end();)
{
User* u = (User*)(*iter);
dl = ext->get(u);
}
}
}
+ ++iter;
}
else
{
- RemoveFromUserlist(u);
+ iter = ul.erase(iter);
}
}
}
void RemoveNick(User* user)
{
/* Iterate through all DCCALLOW lists and remove user */
- for (userlist::iterator iter = ul.begin(); iter != ul.end(); ++iter)
+ for (userlist::iterator iter = ul.begin(); iter != ul.end();)
{
User *u = (User*)(*iter);
dl = ext->get(u);
}
}
}
+ ++iter;
}
else
{
- RemoveFromUserlist(u);
+ iter = ul.erase(iter);
}
}
}
void ReadFileConf()
{
+ ConfigReader Conf;
bfl.clear();
- for (int i = 0; i < Conf->Enumerate("banfile"); i++)
+ for (int i = 0; i < Conf.Enumerate("banfile"); i++)
{
BannedFileList bf;
- std::string fileglob = Conf->ReadValue("banfile", "pattern", i);
- std::string action = Conf->ReadValue("banfile", "action", i);
+ std::string fileglob = Conf.ReadValue("banfile", "pattern", i);
+ std::string action = Conf.ReadValue("banfile", "action", i);
bf.filemask = fileglob;
bf.action = action;
bfl.push_back(bf);
virtual ~ModuleDCCAllow()
{
- delete Conf;
delete ext;
- Conf = NULL;
}
virtual Version GetVersion()
{
- return Version("Povides support for the /DCCALLOW command", VF_COMMON | VF_VENDOR, API_VERSION);
+ return Version("Provides support for the /DCCALLOW command", VF_COMMON | VF_VENDOR);
}
};
projects / user / henk / code / inspircd.git / blobdiff