-/* +------------------------------------+
- * | 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) 2006-2009 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ * Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ * Copyright (C) 2004-2008 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2007 John Brooks <john.brooks@dereferenced.net>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
*
- * 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"
-#include "m_override.h"
/* $ModDesc: Provides channel modes +a and +q */
#define PROTECT_VALUE 40000
#define FOUNDER_VALUE 50000
+struct ChanProtectSettings
+{
+ bool DeprivSelf;
+ bool DeprivOthers;
+ bool FirstInGetsFounder;
+ bool booting;
+ ChanProtectSettings() : booting(true) {}
+};
+
+static ChanProtectSettings settings;
+
/** Handles basic operation of +qa channel modes
*/
class FounderProtectBase
const char mode;
const int list;
const int end;
- protected:
- bool& remove_own_privs;
- bool& remove_other_privs;
public:
- FounderProtectBase(char Mode, const std::string &mtype, int l, int e, bool &remove_own, bool &remove_others) :
- type(mtype), mode(Mode), list(l), end(e), remove_own_privs(remove_own), remove_other_privs(remove_others)
- {
- }
-
- ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter)
+ FounderProtectBase(char Mode, const std::string &mtype, int l, int e) :
+ type(mtype), mode(Mode), list(l), end(e)
{
- User* x = ServerInstance->FindNick(parameter);
- if (x)
- {
- Membership* memb = channel->GetUser(x);
- if (!memb)
- {
- return std::make_pair(false, parameter);
- }
- else
- {
- if (memb->hasMode(mode))
- {
- return std::make_pair(true, x->nick);
- }
- else
- {
- return std::make_pair(false, parameter);
- }
- }
- }
- return std::make_pair(false, parameter);
}
void RemoveMode(Channel* channel, irc::modestacker* stack)
const UserMembList* cl = channel->GetUsers();
std::vector<std::string> mode_junk;
mode_junk.push_back(channel->name);
- irc::modestacker modestack(ServerInstance, false);
+ irc::modestacker modestack(false);
std::deque<std::string> stackresult;
for (UserMembCIter i = cl->begin(); i != cl->end(); i++)
bool CanRemoveOthers(User* u1, Channel* c)
{
Membership* m1 = c->GetUser(u1);
- return (remove_other_privs && m1 && m1->hasMode(mode));
+ return (settings.DeprivOthers && m1 && m1->hasMode(mode));
}
};
class ChanFounder : public ModeHandler, public FounderProtectBase
{
public:
- ChanFounder(Module* Creator, char my_prefix, bool &depriv_self, bool &depriv_others)
- : ModeHandler(Creator, 'q', PARAM_ALWAYS, MODETYPE_CHANNEL),
- FounderProtectBase('q', "founder", 386, 387, depriv_self, depriv_others)
+ ChanFounder(Module* Creator)
+ : ModeHandler(Creator, "founder", 'q', PARAM_ALWAYS, MODETYPE_CHANNEL),
+ FounderProtectBase('q', "founder", 386, 387)
{
ModeHandler::list = true;
- prefix = my_prefix;
levelrequired = FOUNDER_VALUE;
m_paramtype = TR_NICK;
}
- unsigned int GetPrefixRank()
+ void setPrefix(int pfx)
{
- return FOUNDER_VALUE;
+ prefix = pfx;
}
- ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter)
+ unsigned int GetPrefixRank()
{
- return FounderProtectBase::ModeSet(source, dest, channel, parameter);
+ return FOUNDER_VALUE;
}
void RemoveMode(Channel* channel, irc::modestacker* stack)
{
User* theuser = ServerInstance->FindNick(parameter);
// remove own privs?
- if (source == theuser && !adding && FounderProtectBase::remove_own_privs)
+ if (source == theuser && !adding && settings.DeprivSelf)
return MOD_RES_ALLOW;
if (!adding && FounderProtectBase::CanRemoveOthers(source, channel))
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
{
- User* theuser = ServerInstance->FindNick(parameter);
-
- if (!theuser)
- return MODEACTION_DENY;
return MODEACTION_ALLOW;
}
class ChanProtect : public ModeHandler, public FounderProtectBase
{
public:
- ChanProtect(Module* Creator, char my_prefix, bool &depriv_self, bool &depriv_others)
- : ModeHandler(Creator, 'a', PARAM_ALWAYS, MODETYPE_CHANNEL),
- FounderProtectBase('a',"protected user", 388, 389, depriv_self, depriv_others)
+ ChanProtect(Module* Creator)
+ : ModeHandler(Creator, "admin", 'a', PARAM_ALWAYS, MODETYPE_CHANNEL),
+ FounderProtectBase('a',"protected user", 388, 389)
{
ModeHandler::list = true;
- prefix = my_prefix;
levelrequired = PROTECT_VALUE;
m_paramtype = TR_NICK;
}
- unsigned int GetPrefixRank()
+ void setPrefix(int pfx)
{
- return PROTECT_VALUE;
+ prefix = pfx;
}
- ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter)
+
+ unsigned int GetPrefixRank()
{
- return FounderProtectBase::ModeSet(source, dest, channel, parameter);
+ return PROTECT_VALUE;
}
void RemoveMode(Channel* channel, irc::modestacker* stack)
return MOD_RES_ALLOW;
// removing own privs?
- if (source == theuser && !adding && FounderProtectBase::remove_own_privs)
+ if (source == theuser && !adding && settings.DeprivSelf)
return MOD_RES_ALLOW;
if (!adding && FounderProtectBase::CanRemoveOthers(source, channel))
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
{
- User* theuser = ServerInstance->FindNick(parameter);
-
- if (!theuser)
- return MODEACTION_DENY;
-
return MODEACTION_ALLOW;
}
class ModuleChanProtect : public Module
{
-
- bool FirstInGetsFounder;
- char QPrefix;
- char APrefix;
- bool DeprivSelf;
- bool DeprivOthers;
- bool booting;
- ChanProtect* cp;
- ChanFounder* cf;
-
+ ChanProtect cp;
+ ChanFounder cf;
public:
+ ModuleChanProtect() : cp(this), cf(this)
+ {
+ }
- ModuleChanProtect(InspIRCd* Me)
- : Module(Me), FirstInGetsFounder(false), QPrefix(0), APrefix(0), DeprivSelf(false), DeprivOthers(false), booting(true), cp(NULL), cf(NULL)
+ void init()
{
/* Load config stuff */
LoadSettings();
- booting = false;
+ settings.booting = false;
- /* Initialise module variables */
-
- cp = new ChanProtect(this, APrefix, DeprivSelf, DeprivOthers);
- cf = new ChanFounder(this, QPrefix, DeprivSelf, DeprivOthers);
-
- if (!ServerInstance->Modes->AddMode(cp) || !ServerInstance->Modes->AddMode(cf))
- {
- delete cp;
- delete cf;
- throw ModuleException("Could not add new modes!");
- }
+ ServerInstance->Modules->AddService(cf);
+ ServerInstance->Modules->AddService(cp);
- Implementation eventlist[] = { I_OnUserKick, I_OnUserPart, I_OnUserPreJoin };
- ServerInstance->Modules->Attach(eventlist, this, 3);
+ Implementation eventlist[] = { I_OnUserPreJoin };
+ ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
}
void LoadSettings()
{
- ConfigReader Conf(ServerInstance);
+ ConfigTag* tag = ServerInstance->Config->ConfValue("chanprotect");
- FirstInGetsFounder = Conf.ReadFlag("chanprotect", "noservices", 0);
+ settings.FirstInGetsFounder = tag->getBool("noservices");
- std::string qpre = Conf.ReadValue("chanprotect", "qprefix", 0);
- QPrefix = qpre.empty() ? 0 : qpre[0];
+ std::string qpre = tag->getString("qprefix");
+ char QPrefix = qpre.empty() ? 0 : qpre[0];
- std::string apre = Conf.ReadValue("chanprotect", "aprefix", 0);
- APrefix = apre.empty() ? 0 : apre[0];
+ std::string apre = tag->getString("aprefix");
+ char APrefix = apre.empty() ? 0 : apre[0];
if ((APrefix && QPrefix) && APrefix == QPrefix)
throw ModuleException("What the smeg, why are both your +q and +a prefixes the same character?");
- if (cp && ServerInstance->Modes->FindPrefix(APrefix) == cp)
- throw ModuleException("Looks like the +a prefix you picked for m_chanprotect is already in use. Pick another.");
+ if (settings.booting)
+ {
+ if (APrefix && ServerInstance->Modes->FindPrefix(APrefix) && ServerInstance->Modes->FindPrefix(APrefix) != &cp)
+ throw ModuleException("Looks like the +a prefix you picked for m_chanprotect is already in use. Pick another.");
- if (cf && ServerInstance->Modes->FindPrefix(QPrefix) == cf)
- throw ModuleException("Looks like the +q prefix you picked for m_chanprotect is already in use. Pick another.");
+ if (QPrefix && ServerInstance->Modes->FindPrefix(QPrefix) && ServerInstance->Modes->FindPrefix(QPrefix) != &cf)
+ throw ModuleException("Looks like the +q prefix you picked for m_chanprotect is already in use. Pick another.");
- DeprivSelf = Conf.ReadFlag("chanprotect","deprotectself", "yes", 0);
- DeprivOthers = Conf.ReadFlag("chanprotect","deprotectothers", "yes", 0);
+ cp.setPrefix(APrefix);
+ cf.setPrefix(QPrefix);
+ }
+ settings.DeprivSelf = tag->getBool("deprotectself", true);
+ settings.DeprivOthers = tag->getBool("deprotectothers", true);
}
ModResult OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs, const std::string &keygiven)
// if the user is the first user into the channel, mark them as the founder, but only if
// the config option for it is set
- if (FirstInGetsFounder && !chan)
+ if (settings.FirstInGetsFounder && !chan)
privs += 'q';
return MOD_RES_PASSTHRU;
}
- ~ModuleChanProtect()
- {
- ServerInstance->Modes->DelMode(cp);
- ServerInstance->Modes->DelMode(cf);
- delete cp;
- delete cf;
- }
-
Version GetVersion()
{
- return Version("Founder and Protect modes (+qa)", VF_COMMON | VF_VENDOR);
+ return Version("Founder and Protect modes (+qa)", VF_VENDOR);
}
};
projects / user / henk / code / inspircd.git / blobdiff