summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2011-08-18 22:04:59 -0400
committerAdam <Adam@anope.org>2011-08-18 22:04:59 -0400
commitdb340f96d6e9741a23470840a77901c5c45b580f (patch)
treea6ae8787da9cd45ae3514ea0933b9f99d994f39c
parent0cdca534a87e70c0044480aa3a16807d881295d7 (diff)
Fixed some permission checking fail in modules that got messed up from the big commands sed
-rw-r--r--modules/commands/bs_assign.cpp2
-rw-r--r--modules/commands/bs_botlist.cpp2
-rw-r--r--modules/commands/bs_set.cpp2
-rw-r--r--modules/commands/cs_drop.cpp4
-rw-r--r--modules/commands/cs_getkey.cpp2
-rw-r--r--modules/commands/cs_list.cpp2
-rw-r--r--modules/commands/cs_mode.cpp2
-rw-r--r--modules/commands/cs_topic.cpp2
-rw-r--r--modules/commands/ns_resetpass.cpp2
9 files changed, 10 insertions, 10 deletions
diff --git a/modules/commands/bs_assign.cpp b/modules/commands/bs_assign.cpp
index 5f0cdc21f..82eee7914 100644
--- a/modules/commands/bs_assign.cpp
+++ b/modules/commands/bs_assign.cpp
@@ -55,7 +55,7 @@ class CommandBSAssign : public Command
return;
}
- if (bi->HasFlag(BI_PRIVATE) && !u->HasCommand("botserv/botserv/assign/private"))
+ if (bi->HasFlag(BI_PRIVATE) && !u->HasCommand("botserv/assign/private"))
{
source.Reply(ACCESS_DENIED);
return;
diff --git a/modules/commands/bs_botlist.cpp b/modules/commands/bs_botlist.cpp
index ee7e4d2d8..b614c0689 100644
--- a/modules/commands/bs_botlist.cpp
+++ b/modules/commands/bs_botlist.cpp
@@ -40,7 +40,7 @@ class CommandBSBotList : public Command
}
}
- if (u->HasCommand("botserv/botserv/botlist") && count < BotListByNick.size())
+ if (u->HasCommand("botserv/botlist") && count < BotListByNick.size())
{
source.Reply(_("Bots reserved to IRC operators:"));
diff --git a/modules/commands/bs_set.cpp b/modules/commands/bs_set.cpp
index 969763099..46e4236b1 100644
--- a/modules/commands/bs_set.cpp
+++ b/modules/commands/bs_set.cpp
@@ -126,7 +126,7 @@ class CommandBSSet : public Command
else
this->OnSyntaxError(source, "GREET");
}
- else if (u->HasCommand("botserv/botserv/set/nobot") && option.equals_ci("NOBOT"))
+ else if (u->HasCommand("botserv/set/nobot") && option.equals_ci("NOBOT"))
{
if (value.equals_ci("ON"))
{
diff --git a/modules/commands/cs_drop.cpp b/modules/commands/cs_drop.cpp
index aa41046a9..306717c69 100644
--- a/modules/commands/cs_drop.cpp
+++ b/modules/commands/cs_drop.cpp
@@ -43,13 +43,13 @@ class CommandCSDrop : public Command
ci = cs_findchan(chan);
- if (ci->HasFlag(CI_SUSPENDED) && !u->HasCommand("chanserv/chanserv/drop"))
+ if (ci->HasFlag(CI_SUSPENDED) && !u->HasCommand("chanserv/drop"))
{
source.Reply(CHAN_X_SUSPENDED, chan.c_str());
return;
}
- if ((ci->HasFlag(CI_SECUREFOUNDER) ? !IsFounder(u, ci) : !ci->AccessFor(u).HasPriv(CA_FOUNDER)) && !u->HasCommand("chanserv/chanserv/drop"))
+ if ((ci->HasFlag(CI_SECUREFOUNDER) ? !IsFounder(u, ci) : !ci->AccessFor(u).HasPriv(CA_FOUNDER)) && !u->HasCommand("chanserv/drop"))
{
source.Reply(ACCESS_DENIED);
return;
diff --git a/modules/commands/cs_getkey.cpp b/modules/commands/cs_getkey.cpp
index 48d5cd2eb..e2f3c7531 100644
--- a/modules/commands/cs_getkey.cpp
+++ b/modules/commands/cs_getkey.cpp
@@ -35,7 +35,7 @@ class CommandCSGetKey : public Command
}
- if (!ci->AccessFor(u).HasPriv(CA_GETKEY) && !u->HasCommand("chanserv/chanserv/getkey"))
+ if (!ci->AccessFor(u).HasPriv(CA_GETKEY) && !u->HasCommand("chanserv/getkey"))
{
source.Reply(ACCESS_DENIED);
return;
diff --git a/modules/commands/cs_list.cpp b/modules/commands/cs_list.cpp
index a79c047c4..92b5c702f 100644
--- a/modules/commands/cs_list.cpp
+++ b/modules/commands/cs_list.cpp
@@ -29,7 +29,7 @@ class CommandCSList : public Command
Anope::string pattern = params[0];
unsigned nchans;
- bool is_servadmin = u->HasCommand("chanserv/chanserv/list");
+ bool is_servadmin = u->HasCommand("chanserv/list");
int count = 0, from = 0, to = 0;
bool suspended = false, channoexpire = false;
diff --git a/modules/commands/cs_mode.cpp b/modules/commands/cs_mode.cpp
index ce0976384..f420e34e1 100644
--- a/modules/commands/cs_mode.cpp
+++ b/modules/commands/cs_mode.cpp
@@ -311,7 +311,7 @@ class CommandCSMode : public Command
if (!ci || !ci->c)
source.Reply(CHAN_X_NOT_IN_USE, ci->name.c_str());
- else if (!ci->AccessFor(u).HasPriv(CA_MODE) && !u->HasCommand("chanserv/chanserv/mode"))
+ else if (!ci->AccessFor(u).HasPriv(CA_MODE) && !u->HasCommand("chanserv/mode"))
source.Reply(ACCESS_DENIED);
else if (subcommand.equals_ci("LOCK"))
this->DoLock(source, ci, params);
diff --git a/modules/commands/cs_topic.cpp b/modules/commands/cs_topic.cpp
index 8ea19afcf..49f6e8a13 100644
--- a/modules/commands/cs_topic.cpp
+++ b/modules/commands/cs_topic.cpp
@@ -37,7 +37,7 @@ class CommandCSTopic : public Command
if (!ci->c)
source.Reply(CHAN_X_NOT_IN_USE, ci->name.c_str());
- else if (!ci->AccessFor(u).HasPriv(CA_TOPIC) && !u->HasCommand("chanserv/chanserv/topic"))
+ else if (!ci->AccessFor(u).HasPriv(CA_TOPIC) && !u->HasCommand("chanserv/topic"))
source.Reply(ACCESS_DENIED);
else
{
diff --git a/modules/commands/ns_resetpass.cpp b/modules/commands/ns_resetpass.cpp
index b0d40226f..ba766921b 100644
--- a/modules/commands/ns_resetpass.cpp
+++ b/modules/commands/ns_resetpass.cpp
@@ -30,7 +30,7 @@ class CommandNSResetPass : public Command
User *u = source.u;
NickAlias *na;
- if (Config->RestrictMail && (!u->Account() || !u->HasCommand("nickserv/nickserv/resetpass")))
+ if (Config->RestrictMail && (!u->Account() || !u->HasCommand("nickserv/resetpass")))
source.Reply(ACCESS_DENIED);
else if (!(na = findnick(params[0])))
source.Reply(NICK_X_NOT_REGISTERED, params[0].c_str());