pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-09 22:43:13 +02:00
Code Activity

Really fix bug #1088

Browse Source 
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2355 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
adam-
2009-07-02 19:02:35 +00:00
parent bd6a593b6c
commit 4d19a783bd
4 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/commands.c
+22 -13
View File
@@ -125,28 +125,37 @@ void mod_run_cmd(char *service, User * u, CommandHash * cmdTable[], const char *
if (MOD_RESULT == EVENT_STOP)
return;
if (params.size() > 0 && ircdproto->IsChannelValid(params[0].c_str()))
if (params.size() > 0)
{
if ((ci = cs_findchan(params[0].c_str())))
if (ircdproto->IsChannelValid(params[0].c_str()))
{
if ((ci->flags & CI_FORBIDDEN) && (!c->HasFlag(CFLAG_ALLOW_FORBIDDEN)))
if ((ci = cs_findchan(params[0].c_str())))
{
notice_lang(service, u, CHAN_X_FORBIDDEN, ci->name);
alog("Access denied for user %s with service %s and command %s because of FORBIDDEN channel %s",
u->nick, service, cmd, ci->name);
return;
if ((ci->flags & CI_FORBIDDEN) && (!c->HasFlag(CFLAG_ALLOW_FORBIDDEN)))
{
notice_lang(service, u, CHAN_X_FORBIDDEN, ci->name);
alog("Access denied for user %s with service %s and command %s because of FORBIDDEN channel %s",
u->nick, service, cmd, ci->name);
return;
}
else if ((ci->flags & CI_SUSPENDED) && (!c->HasFlag(CFLAG_ALLOW_SUSPENDED)))
{
notice_lang(service, u, CHAN_X_FORBIDDEN, ci->name);
alog("Access denied for user %s with service %s and command %s because of SUSPENDED channel %s",
u->nick, service, cmd, ci->name);
return;
}
}
else if ((ci->flags & CI_SUSPENDED) && (!c->HasFlag(CFLAG_ALLOW_SUSPENDED)))
else if (!c->HasFlag(CFLAG_ALLOW_UNREGISTEREDCHANNEL))
{
notice_lang(service, u, CHAN_X_FORBIDDEN, ci->name);
alog("Access denied for user %s with service %s and command %s because of SUSPENDED channel %s",
u->nick, service, cmd, ci->name);
notice_lang(service, u, CHAN_X_NOT_REGISTERED, params[0].c_str());
return;
}
}
else if (!c->HasFlag(CFLAG_ALLOW_UNREGISTEREDCHANNEL))
/* A user not giving a channel name for a param that should be a channel */
else if ((cmdTable == CHANSERV || cmdTable == BOTSERV) && !c->HasFlag(CFLAG_STRIP_CHANNEL))
{
notice_lang(service, u, CHAN_X_NOT_REGISTERED, params[0].c_str());
notice_lang(service, u, CHAN_X_INVALID, params[0].c_str());
return;
}
}
src/core/bs_bot.c
+1
View File
@@ -350,6 +350,7 @@ class CommandBSBot : public Command
public:
CommandBSBot() : Command("BOT", 1, 6)
{
this->SetFlag(CFLAG_STRIP_CHANNEL);
}
CommandReturn Execute(User *u, std::vector<std::string> &params)
src/core/bs_help.c
+1
View File
@@ -21,6 +21,7 @@ class CommandBSHelp : public Command
CommandBSHelp() : Command("HELP", 1, 1)
{
this->SetFlag(CFLAG_ALLOW_UNREGISTERED);
this->SetFlag(CFLAG_STRIP_CHANNEL);
}
CommandReturn Execute(User *u, std::vector<std::string> &params)
src/core/bs_info.c
+1
View File
@@ -49,6 +49,7 @@ class CommandBSInfo : public Command
public:
CommandBSInfo() : Command("INFO", 1, 1)
{
this->SetFlag(CFLAG_STRIP_CHANNEL);
}
CommandReturn Execute(User *u, std::vector<std::string> &params)