summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2008-10-30 20:47:13 +0000
committerw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2008-10-30 20:47:13 +0000
commitf84cc5b5e5ad856001c53a89eef18e464260e8cc (patch)
treea8bcc01abfb8b5e7740d50b70ee11194b8c0327a
parentd9bdfda657f3a199bcd535257a1daca4a7a91efe (diff)
Revert "Add option to allow +q to +q users, +a to +a users."
This reverts commit 1c035722a6083f9d625aba8e34fb1cff3895808a. This is currently broken, and I don't want it screwing up beta3... Conflicts: src/modules/m_chanprotect.cpp git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10752 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--src/modules/m_chanprotect.cpp54
1 files changed, 18 insertions, 36 deletions
diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp
index f477755a4..87f5756a9 100644
--- a/src/modules/m_chanprotect.cpp
+++ b/src/modules/m_chanprotect.cpp
@@ -31,10 +31,9 @@ class FounderProtectBase
protected:
bool& remove_own_privs;
bool& remove_other_privs;
- bool& add_other_privs;
public:
- FounderProtectBase(InspIRCd* Instance, const std::string &ext, const std::string &mtype, int l, int e, bool &remove_own, bool &remove_others, bool &add_others) :
- MyInstance(Instance), extend(ext), type(mtype), list(l), end(e), remove_own_privs(remove_own), remove_other_privs(remove_others), add_other_privs(add_others)
+ FounderProtectBase(InspIRCd* Instance, const std::string &ext, const std::string &mtype, int l, int e, bool &remove_own, bool &remove_others) :
+ MyInstance(Instance), extend(ext), type(mtype), list(l), end(e), remove_own_privs(remove_own), remove_other_privs(remove_others)
{
}
@@ -127,12 +126,6 @@ class FounderProtectBase
return (remove_other_privs && u1->GetExt(item) && u2->GetExt(item));
}
- bool CanAddOthers(User* u1, User* u2, Channel* c)
- {
- std::string item = extend+std::string(c->name);
- return (add_other_privs && u1->GetExt(item));
- }
-
ModeAction HandleChange(User* source, User* theuser, bool adding, Channel* channel, std::string &parameter)
{
std::string item = extend+std::string(channel->name);
@@ -164,9 +157,9 @@ class FounderProtectBase
class ChanFounder : public ModeHandler, public FounderProtectBase
{
public:
- ChanFounder(InspIRCd* Instance, char my_prefix, bool &depriv_self, bool &depriv_others, bool &priv_others)
+ ChanFounder(InspIRCd* Instance, char my_prefix, bool &depriv_self, bool &depriv_others)
: ModeHandler(Instance, 'q', 1, 1, true, MODETYPE_CHANNEL, false, my_prefix, 0),
- FounderProtectBase(Instance, "cm_founder_", "founder", 386, 387, depriv_self, depriv_others, priv_others) { }
+ FounderProtectBase(Instance, "cm_founder_", "founder", 386, 387, depriv_self, depriv_others) { }
unsigned int GetPrefixRank()
{
@@ -210,17 +203,13 @@ class ChanFounder : public ModeHandler, public FounderProtectBase
{
return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter);
}
-
- // If they have it, allow them to give it.
- if (adding && FounderProtectBase::CanAddOthers(source, theuser, channel))
+ else
{
- return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter);
+ // whoops, someones being naughty!
+ source->WriteNumeric(468, "%s %s :Only servers may set channel mode +q", source->nick.c_str(), channel->name.c_str());
+ parameter.clear();
+ return MODEACTION_DENY;
}
-
- // whoops, someones being naughty!
- source->WriteNumeric(468, "%s %s :You are not permitted to set additional founders", source->nick.c_str(), channel->name.c_str());
- parameter.clear();
- return MODEACTION_DENY;
}
void DisplayList(User* user, Channel* channel)
@@ -234,9 +223,9 @@ class ChanFounder : public ModeHandler, public FounderProtectBase
class ChanProtect : public ModeHandler, public FounderProtectBase
{
public:
- ChanProtect(InspIRCd* Instance, char my_prefix, bool &depriv_self, bool &depriv_others, bool &priv_others)
+ ChanProtect(InspIRCd* Instance, char my_prefix, bool &depriv_self, bool &depriv_others)
: ModeHandler(Instance, 'a', 1, 1, true, MODETYPE_CHANNEL, false, my_prefix, 0),
- FounderProtectBase(Instance,"cm_protect_","protected user", 388, 389, depriv_self, depriv_others, priv_others) { }
+ FounderProtectBase(Instance,"cm_protect_","protected user", 388, 389, depriv_self, depriv_others) { }
unsigned int GetPrefixRank()
{
@@ -266,11 +255,10 @@ class ChanProtect : public ModeHandler, public FounderProtectBase
std::string founder = "cm_founder_"+std::string(channel->name);
- if (!adding && FounderProtectBase::CanRemoveOthers(source, theuser, channel))
+ if ((!adding) && FounderProtectBase::CanRemoveOthers(source, theuser, channel))
{
return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter);
}
-
// source has +q, is a server, or ulined, we'll let them +-a the user.
if (source == ServerInstance->FakeClient ||
((source == theuser) && (!adding) && (FounderProtectBase::remove_own_privs)) ||
@@ -282,16 +270,12 @@ class ChanProtect : public ModeHandler, public FounderProtectBase
{
return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter);
}
-
- // If they have it, allow them to give it.
- if (adding && FounderProtectBase::CanAddOthers(source, theuser, channel))
+ else
{
- return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter);
+ // bzzzt, wrong answer!
+ source->WriteNumeric(482, "%s %s :You are not a channel founder", source->nick.c_str(), channel->name.c_str());
+ return MODEACTION_DENY;
}
-
- // bzzzt, wrong answer!
- source->WriteNumeric(482, "%s %s :You are not a channel founder", source->nick.c_str(), channel->name.c_str());
- return MODEACTION_DENY;
}
virtual void DisplayList(User* user, Channel* channel)
@@ -309,7 +293,6 @@ class ModuleChanProtect : public Module
char APrefix;
bool DeprivSelf;
bool DeprivOthers;
- bool PrivOthers;
bool booting;
ChanProtect* cp;
ChanFounder* cf;
@@ -325,8 +308,8 @@ class ModuleChanProtect : public Module
/* Initialise module variables */
- cp = new ChanProtect(ServerInstance, APrefix, DeprivSelf, DeprivOthers, PrivOthers);
- cf = new ChanFounder(ServerInstance, QPrefix, DeprivSelf, DeprivOthers, PrivOthers);
+ cp = new ChanProtect(ServerInstance, APrefix, DeprivSelf, DeprivOthers);
+ cf = new ChanFounder(ServerInstance, QPrefix, DeprivSelf, DeprivOthers);
if (!ServerInstance->Modes->AddMode(cp) || !ServerInstance->Modes->AddMode(cf))
{
@@ -376,7 +359,6 @@ class ModuleChanProtect : public Module
DeprivSelf = Conf.ReadFlag("chanprotect","deprotectself", "yes", 0);
DeprivOthers = Conf.ReadFlag("chanprotect","deprotectothers", "yes", 0);
- DeprivOthers = Conf.ReadFlag("chanprotect","setprivsonothers", "yes", 0);
}
virtual int OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs, const std::string &keygiven)