ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-09 18:49:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Someone please help me fix the warnings in modules caused by this change. All mode handler OnMode events, ModeWatcher::BeforeMode/AfterMode, plus OnRawMode now have a bool servermode parameter

Browse Source 
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8964 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
brain 2008-02-18 16:55:27 +00:00
parent 3ca314bffc
commit 32a26fa539
39 changed files with 54 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/channels.h
View File

@ -41,7 +41,7 @@ class HostItem : public classbase
time_t set_time;
/** Who added the item
*/
char set_by[NICKMAX];
char set_by[64];
/** The actual item data
*/
char data[MAXBUF];

6
include/mode.h
View File

@ -218,7 +218,7 @@ class CoreExport ModeHandler : public Extensible
* @param adding This value is true when the mode is being set, or false when it is being unset.
* @return MODEACTION_ALLOW to allow the mode, or MODEACTION_DENY to prevent the mode, also see the description of 'parameter'.
*/
virtual ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding); /* Can change the mode parameter as its a ref */
virtual ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode = false); /* Can change the mode parameter as its a ref */
/**
* If your mode is a listmode, then this method will be called for displaying an item list, e.g. on MODE #channel +modechar
* without any parameter or other modes in the command.
@ -344,7 +344,7 @@ class CoreExport ModeWatcher : public Extensible
* @return True to allow the mode change to go ahead, false to abort it. If you abort the
* change, the mode handler (and ModeWatcher::AfterMode()) will never see the mode change.
*/
virtual bool BeforeMode(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, ModeType type);
virtual bool BeforeMode(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, ModeType type, bool servermode = false);
/**
* After the mode character has been processed by the ModeHandler, this method will be called.
* @param source The sender of the mode
@ -355,7 +355,7 @@ class CoreExport ModeWatcher : public Extensible
* @param adding True if the mode is being added and false if it is being removed
* @type The mode type, either MODETYPE_USER or MODETYPE_CHANNEL
*/
virtual void AfterMode(User* source, User* dest, Channel* channel, const std::string &parameter, bool adding, ModeType type);
virtual void AfterMode(User* source, User* dest, Channel* channel, const std::string &parameter, bool adding, ModeType type, bool servermode = false);
};
typedef std::vector<ModeWatcher*>::iterator ModeWatchIter;

4
include/modes/cmode_b.h
View File

@ -24,8 +24,8 @@ class ModeChannelBan : public ModeHandler
BanItem b;
public:
ModeChannelBan(InspIRCd* Instance);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
std::string& AddBan(User *user,std::string& dest,Channel *chan,int status);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
std::string& AddBan(User *user,std::string& dest,Channel *chan,int status, bool servermode);
std::string& DelBan(User *user,std::string& dest,Channel *chan,int status);
void DisplayList(User* user, Channel* channel);
void DisplayEmptyList(User* user, Channel* channel);

2
include/modes/cmode_h.h
View File

@ -23,7 +23,7 @@ class ModeChannelHalfOp : public ModeHandler
private:
public:
ModeChannelHalfOp(InspIRCd* Instance);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
std::string AddHalfOp(User *user,const char *dest,Channel *chan,int status);
std::string DelHalfOp(User *user,const char *dest,Channel *chan,int status);
ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter);

2
include/modes/cmode_i.h
View File

@ -21,5 +21,5 @@ class ModeChannelInviteOnly : public ModeHandler
{
public:
ModeChannelInviteOnly(InspIRCd* Instance);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
};

2
include/modes/cmode_k.h
View File

@ -21,7 +21,7 @@ class ModeChannelKey : public ModeHandler
{
public:
ModeChannelKey(InspIRCd* Instance);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter);
bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel);
void RemoveMode(Channel* channel);

2
include/modes/cmode_l.h
View File

@ -21,7 +21,7 @@ class ModeChannelLimit : public ModeHandler
{
public:
ModeChannelLimit(InspIRCd* Instance);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter);
bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel);
};

2
include/modes/cmode_m.h
View File

@ -21,5 +21,5 @@ class ModeChannelModerated : public ModeHandler
{
public:
ModeChannelModerated(InspIRCd* Instance);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
};

2
include/modes/cmode_n.h
View File

@ -21,5 +21,5 @@ class ModeChannelNoExternal : public ModeHandler
{
public:
ModeChannelNoExternal(InspIRCd* Instance);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
};

2
include/modes/cmode_o.h
View File

@ -23,7 +23,7 @@ class ModeChannelOp : public ModeHandler
private:
public:
ModeChannelOp(InspIRCd* Instance);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
std::string AddOp(User *user,const char *dest,Channel *chan,int status);
std::string DelOp(User *user,const char *dest,Channel *chan,int status);
ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter);

2
include/modes/cmode_p.h
View File

@ -21,5 +21,5 @@ class ModeChannelPrivate : public ModeHandler
{
public:
ModeChannelPrivate(InspIRCd* Instance);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
};

2
include/modes/cmode_s.h
View File

@ -21,5 +21,5 @@ class ModeChannelSecret : public ModeHandler
{
public:
ModeChannelSecret(InspIRCd* Instance);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
};

2
include/modes/cmode_t.h
View File

@ -21,5 +21,5 @@ class ModeChannelTopicOps : public ModeHandler
{
public:
ModeChannelTopicOps(InspIRCd* Instance);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
};

2
include/modes/cmode_v.h
View File

@ -23,7 +23,7 @@ class ModeChannelVoice : public ModeHandler
private:
public:
ModeChannelVoice(InspIRCd* Instance);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
std::string AddVoice(User *user,const char *dest,Channel *chan,int status);
std::string DelVoice(User *user,const char *dest,Channel *chan,int status);
ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter);

2
include/modes/umode_i.h
View File

@ -21,6 +21,6 @@ class ModeUserInvisible : public ModeHandler
{
public:
ModeUserInvisible(InspIRCd* Instance);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
unsigned int GetCount();
};

2
include/modes/umode_n.h
View File

@ -21,5 +21,5 @@ class ModeUserServerNoticeMask : public ModeHandler
{
public:
ModeUserServerNoticeMask(InspIRCd* Instance);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
};

2
include/modes/umode_o.h
View File

@ -21,6 +21,6 @@ class ModeUserOperator : public ModeHandler
{
public:
ModeUserOperator(InspIRCd* Instance);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
unsigned int GetCount();
};

2
include/modes/umode_s.h
View File

@ -21,6 +21,6 @@ class ModeUserServerNotice : public ModeHandler
{
public:
ModeUserServerNotice(InspIRCd* Instance);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
unsigned int GetCount();
};

2
include/modes/umode_w.h
View File

@ -21,6 +21,6 @@ class ModeUserWallops : public ModeHandler
{
public:
ModeUserWallops(InspIRCd* Instance);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
unsigned int GetCount();
};

2
include/modules.h
View File

@ -1105,7 +1105,7 @@ class CoreExport Module : public Extensible
* to skip all permission checking. Please note that for remote mode changes, your return value
* will be ignored!
*/
virtual int OnRawMode(User* user, Channel* chan, const char mode, const std::string &param, bool adding, int pcnt);
virtual int OnRawMode(User* user, Channel* chan, const char mode, const std::string &param, bool adding, int pcnt, bool servermode = true);
/** Called whenever a user joins a channel, to determine if key checks should go ahead or not.
* This method will always be called for each join, wether or not the channel is actually +k, and

16
src/mode.cpp
View File

@ -119,7 +119,7 @@ char ModeHandler::GetModeChar()
return mode;
}
ModeAction ModeHandler::OnModeChange(User*, User*, Channel*, std::string&, bool)
ModeAction ModeHandler::OnModeChange(User*, User*, Channel*, std::string&, bool, bool)
{
return MODEACTION_DENY;
}
@ -167,12 +167,12 @@ ModeType ModeWatcher::GetModeType()
return m_type;
}
bool ModeWatcher::BeforeMode(User*, User*, Channel*, std::string&, bool, ModeType)
bool ModeWatcher::BeforeMode(User*, User*, Channel*, std::string&, bool, ModeType, bool)
{
return true;
}
void ModeWatcher::AfterMode(User*, User*, Channel*, const std::string&, bool, ModeType)
void ModeWatcher::AfterMode(User*, User*, Channel*, const std::string&, bool, ModeType, bool)
{
}
@ -509,11 +509,11 @@ void ModeParser::Process(const char** parameters, int pcnt, User *user, bool ser
continue;
}
FOREACH_RESULT(I_OnRawMode, OnRawMode(user, targetchannel, modechar, parameter, adding, 1));
FOREACH_RESULT(I_OnRawMode, OnRawMode(user, targetchannel, modechar, parameter, adding, 1, servermode));
}
else
{
FOREACH_RESULT(I_OnRawMode, OnRawMode(user, targetchannel, modechar, "", adding, 0));
FOREACH_RESULT(I_OnRawMode, OnRawMode(user, targetchannel, modechar, "", adding, 0, servermode));
}
if (IS_LOCAL(user) && (MOD_RESULT == ACR_DENY))
@ -560,7 +560,7 @@ void ModeParser::Process(const char** parameters, int pcnt, User *user, bool ser
for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
{
if ((*watchers)->BeforeMode(user, targetuser, targetchannel, parameter, adding, type) == false)
if ((*watchers)->BeforeMode(user, targetuser, targetchannel, parameter, adding, type, servermode) == false)
{
abort = true;
break;
@ -588,7 +588,7 @@ void ModeParser::Process(const char** parameters, int pcnt, User *user, bool ser
}
/* Call the handler for the mode */
ModeAction ma = modehandlers[handler_id]->OnModeChange(user, targetuser, targetchannel, parameter, adding);
ModeAction ma = modehandlers[handler_id]->OnModeChange(user, targetuser, targetchannel, parameter, adding, servermode);
if ((modehandlers[handler_id]->GetNumParams(adding)) && (parameter.empty()))
{
@ -631,7 +631,7 @@ void ModeParser::Process(const char** parameters, int pcnt, User *user, bool ser
/* Call all the AfterMode events in the mode watchers for this mode */
for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
(*watchers)->AfterMode(user, targetuser, targetchannel, parameter, adding, type);
(*watchers)->AfterMode(user, targetuser, targetchannel, parameter, adding, type, servermode);
/* Reset the state change flag */
state_change = false;

19
src/modes/cmode_b.cpp
View File

@ -29,13 +29,13 @@ ModeChannelBan::ModeChannelBan(InspIRCd* Instance) : ModeHandler(Instance, 'b',
{
}
ModeAction ModeChannelBan::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding)
ModeAction ModeChannelBan::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding, bool servermode)
{
int status = channel->GetStatus(source);
/* Call the correct method depending on wether we're adding or removing the mode */
if (adding)
{
parameter = this->AddBan(source, parameter, channel, status);
parameter = this->AddBan(source, parameter, channel, status, servermode);
}
else
{
@ -87,7 +87,7 @@ void ModeChannelBan::DisplayEmptyList(User* user, Channel* channel)
user->WriteServ("368 %s %s :End of channel ban list",user->nick, channel->name);
}
std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan, int)
std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan, int, bool servermode)
{
if ((!user) || (!chan))
{
@ -120,7 +120,7 @@ std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan
for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++)
{
if (!strcasecmp(i->data,dest.c_str()))
if (!strcasecmp(i->data, dest.c_str()))
{
/* dont allow a user to set the same ban twice */
dest = "";
@ -129,15 +129,8 @@ std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan
}
b.set_time = ServerInstance->Time();
strlcpy(b.data,dest.c_str(),MAXBUF);
if (*user->nick)
{
strlcpy(b.set_by,user->nick,NICKMAX-1);
}
else
{
strlcpy(b.set_by,ServerInstance->Config->ServerName,NICKMAX-1);
}
strlcpy(b.data, dest.c_str(), MAXBUF);
strlcpy(b.set_by, servermode ? ServerInstance->Config->ServerName : user->nick, 63);
chan->bans.push_back(b);
return dest;
}

2
src/modes/cmode_h.cpp
View File

@ -70,7 +70,7 @@ void ModeChannelHalfOp::RemoveMode(User*)
{
}
ModeAction ModeChannelHalfOp::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding)
ModeAction ModeChannelHalfOp::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding, bool servermode)
{
/* If halfops are not enabled in the conf, we don't execute
* anything in this class at all.

2
src/modes/cmode_i.cpp
View File

@ -21,7 +21,7 @@ ModeChannelInviteOnly::ModeChannelInviteOnly(InspIRCd* Instance) : ModeHandler(I
{
}
ModeAction ModeChannelInviteOnly::OnModeChange(User*, User*, Channel* channel, std::string&, bool adding)
ModeAction ModeChannelInviteOnly::OnModeChange(User*, User*, Channel* channel, std::string&, bool adding, bool servermode)
{
if (channel->modes[CM_INVITEONLY] != adding)
{

2
src/modes/cmode_k.cpp
View File

@ -58,7 +58,7 @@ bool ModeChannelKey::CheckTimeStamp(time_t, time_t, const std::string &their_par
return (their_param < our_param);
}
ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding)
ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding, bool servermode)
{
if ((channel->modes[CM_KEY] != adding) || (!IS_LOCAL(source)))
{

2
src/modes/cmode_l.cpp
View File

@ -39,7 +39,7 @@ bool ModeChannelLimit::CheckTimeStamp(time_t, time_t, const std::string &their_p
return (atoi(their_param.c_str()) < atoi(our_param.c_str()));
}
ModeAction ModeChannelLimit::OnModeChange(User*, User*, Channel* channel, std::string &parameter, bool adding)
ModeAction ModeChannelLimit::OnModeChange(User*, User*, Channel* channel, std::string &parameter, bool adding, bool servermode)
{
if (adding)
{

2
src/modes/cmode_m.cpp
View File

@ -21,7 +21,7 @@ ModeChannelModerated::ModeChannelModerated(InspIRCd* Instance) : ModeHandler(Ins
{
}
ModeAction ModeChannelModerated::OnModeChange(User*, User*, Channel* channel, std::string&, bool adding)
ModeAction ModeChannelModerated::OnModeChange(User*, User*, Channel* channel, std::string&, bool adding, bool servermode)
{
if (channel->modes[CM_MODERATED] != adding)
{

2
src/modes/cmode_n.cpp
View File

@ -21,7 +21,7 @@ ModeChannelNoExternal::ModeChannelNoExternal(InspIRCd* Instance) : ModeHandler(I
{
}
ModeAction ModeChannelNoExternal::OnModeChange(User*, User*, Channel* channel, std::string&, bool adding)
ModeAction ModeChannelNoExternal::OnModeChange(User*, User*, Channel* channel, std::string&, bool adding, bool servermode)
{
if (channel->modes[CM_NOEXTERNAL] != adding)
{

2
src/modes/cmode_o.cpp
View File

@ -70,7 +70,7 @@ void ModeChannelOp::RemoveMode(User*)
{
}
ModeAction ModeChannelOp::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding)
ModeAction ModeChannelOp::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding, bool servermode)
{
int status = channel->GetStatus(source);

2
src/modes/cmode_p.cpp
View File

@ -21,7 +21,7 @@ ModeChannelPrivate::ModeChannelPrivate(InspIRCd* Instance) : ModeHandler(Instanc
{
}
ModeAction ModeChannelPrivate::OnModeChange(User*, User*, Channel* channel, std::string&, bool adding)
ModeAction ModeChannelPrivate::OnModeChange(User*, User*, Channel* channel, std::string&, bool adding, bool servermode)
{
if (channel->modes[CM_PRIVATE] != adding)
{

2
src/modes/cmode_s.cpp
View File

@ -21,7 +21,7 @@ ModeChannelSecret::ModeChannelSecret(InspIRCd* Instance) : ModeHandler(Instance,
{
}
ModeAction ModeChannelSecret::OnModeChange(User*, User*, Channel* channel, std::string&, bool adding)
ModeAction ModeChannelSecret::OnModeChange(User*, User*, Channel* channel, std::string&, bool adding, bool servermode)
{
if (channel->modes[CM_SECRET] != adding)
{

2
src/modes/cmode_t.cpp
View File

@ -21,7 +21,7 @@ ModeChannelTopicOps::ModeChannelTopicOps(InspIRCd* Instance) : ModeHandler(Insta
{
}
ModeAction ModeChannelTopicOps::OnModeChange(User*, User*, Channel* channel, std::string&, bool adding)
ModeAction ModeChannelTopicOps::OnModeChange(User*, User*, Channel* channel, std::string&, bool adding, bool servermode)
{
if (channel->modes[CM_TOPICLOCK] != adding)
{

2
src/modes/cmode_v.cpp
View File

@ -70,7 +70,7 @@ void ModeChannelVoice::RemoveMode(User*)
{
}
ModeAction ModeChannelVoice::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding)
ModeAction ModeChannelVoice::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding, bool servermode)
{
int status = channel->GetStatus(source);

2
src/modes/umode_i.cpp
View File

@ -21,7 +21,7 @@ ModeUserInvisible::ModeUserInvisible(InspIRCd* Instance) : ModeHandler(Instance,
{
}
ModeAction ModeUserInvisible::OnModeChange(User* source, User* dest, Channel*, std::string&, bool adding)
ModeAction ModeUserInvisible::OnModeChange(User* source, User* dest, Channel*, std::string&, bool adding, bool servermode)
{
/* Only opers can change other users modes */
if ((source != dest) && (!*source->oper))

2
src/modes/umode_n.cpp
View File

@ -21,7 +21,7 @@ ModeUserServerNoticeMask::ModeUserServerNoticeMask(InspIRCd* Instance) : ModeHan
{
}
ModeAction ModeUserServerNoticeMask::OnModeChange(User* source, User* dest, Channel*, std::string &parameter, bool adding)
ModeAction ModeUserServerNoticeMask::OnModeChange(User* source, User* dest, Channel*, std::string &parameter, bool adding, bool servermode)
{
/* Only opers can change other users modes */
if ((source != dest) && (!*source->oper))

2
src/modes/umode_o.cpp
View File

@ -21,7 +21,7 @@ ModeUserOperator::ModeUserOperator(InspIRCd* Instance) : ModeHandler(Instance, '
{
}
ModeAction ModeUserOperator::OnModeChange(User* source, User* dest, Channel*, std::string&, bool adding)
ModeAction ModeUserOperator::OnModeChange(User* source, User* dest, Channel*, std::string&, bool adding, bool servermode)
{
/* Only opers can execute this class at all */
if (!*source->oper)

2
src/modes/umode_s.cpp
View File

@ -21,7 +21,7 @@ ModeUserServerNotice::ModeUserServerNotice(InspIRCd* Instance) : ModeHandler(Ins
{
}
ModeAction ModeUserServerNotice::OnModeChange(User* source, User* dest, Channel*, std::string&, bool adding)
ModeAction ModeUserServerNotice::OnModeChange(User* source, User* dest, Channel*, std::string&, bool adding, bool servermode)
{
/* Only opers can change other users modes */
if ((source != dest) && (!*source->oper))

2
src/modes/umode_w.cpp
View File

@ -21,7 +21,7 @@ ModeUserWallops::ModeUserWallops(InspIRCd* Instance) : ModeHandler(Instance, 'w'
{
}
ModeAction ModeUserWallops::OnModeChange(User* source, User* dest, Channel*, std::string&, bool adding)
ModeAction ModeUserWallops::OnModeChange(User* source, User* dest, Channel*, std::string&, bool adding, bool servermode)
{
/* Only opers can change other users modes */
if ((source != dest) && (!*source->oper))

2
src/modules.cpp
View File

@ -140,7 +140,7 @@ bool Module::OnCheckReady(User*) { return true; }
int Module::OnUserRegister(User*) { return 0; }
int Module::OnUserPreKick(User*, User*, Channel*, const std::string&) { return 0; }
void Module::OnUserKick(User*, User*, Channel*, const std::string&, bool&) { }
int Module::OnRawMode(User*, Channel*, const char, const std::string &, bool, int) { return 0; }
int Module::OnRawMode(User*, Channel*, const char, const std::string &, bool, int, bool) { return 0; }
int Module::OnCheckInvite(User*, Channel*) { return 0; }
int Module::OnCheckKey(User*, Channel*, const std::string&) { return 0; }
int Module::OnCheckLimit(User*, Channel*) { return 0; }