From 32a26fa539242d009ffab01e09cafdaba9270dac Mon Sep 17 00:00:00 2001 From: brain Date: Mon, 18 Feb 2008 16:55:27 +0000 Subject: 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 git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8964 e03df62e-2008-0410-955e-edbf42e46eb7 --- include/channels.h | 2 +- include/mode.h | 6 +++--- include/modes/cmode_b.h | 4 ++-- include/modes/cmode_h.h | 2 +- include/modes/cmode_i.h | 2 +- include/modes/cmode_k.h | 2 +- include/modes/cmode_l.h | 2 +- include/modes/cmode_m.h | 2 +- include/modes/cmode_n.h | 2 +- include/modes/cmode_o.h | 2 +- include/modes/cmode_p.h | 2 +- include/modes/cmode_s.h | 2 +- include/modes/cmode_t.h | 2 +- include/modes/cmode_v.h | 2 +- include/modes/umode_i.h | 2 +- include/modes/umode_n.h | 2 +- include/modes/umode_o.h | 2 +- include/modes/umode_s.h | 2 +- include/modes/umode_w.h | 2 +- include/modules.h | 2 +- 20 files changed, 23 insertions(+), 23 deletions(-) (limited to 'include') diff --git a/include/channels.h b/include/channels.h index aa23d8816..50076fd86 100644 --- a/include/channels.h +++ b/include/channels.h @@ -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]; diff --git a/include/mode.h b/include/mode.h index 8faea3491..8669f50e5 100644 --- a/include/mode.h +++ b/include/mode.h @@ -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 ¶meter, bool adding); /* Can change the mode parameter as its a ref */ + virtual ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, 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 ¶meter, bool adding, ModeType type); + virtual bool BeforeMode(User* source, User* dest, Channel* channel, std::string ¶meter, 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 ¶meter, bool adding, ModeType type); + virtual void AfterMode(User* source, User* dest, Channel* channel, const std::string ¶meter, bool adding, ModeType type, bool servermode = false); }; typedef std::vector::iterator ModeWatchIter; diff --git a/include/modes/cmode_b.h b/include/modes/cmode_b.h index e8274aff8..fc5eb0892 100644 --- a/include/modes/cmode_b.h +++ b/include/modes/cmode_b.h @@ -24,8 +24,8 @@ class ModeChannelBan : public ModeHandler BanItem b; public: ModeChannelBan(InspIRCd* Instance); - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding); - std::string& AddBan(User *user,std::string& dest,Channel *chan,int status); + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, 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); diff --git a/include/modes/cmode_h.h b/include/modes/cmode_h.h index 68ac89c4b..c8ea793c0 100644 --- a/include/modes/cmode_h.h +++ b/include/modes/cmode_h.h @@ -23,7 +23,7 @@ class ModeChannelHalfOp : public ModeHandler private: public: ModeChannelHalfOp(InspIRCd* Instance); - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding); + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, 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 ¶meter); diff --git a/include/modes/cmode_i.h b/include/modes/cmode_i.h index a727ad2c1..5c83afb18 100644 --- a/include/modes/cmode_i.h +++ b/include/modes/cmode_i.h @@ -21,5 +21,5 @@ class ModeChannelInviteOnly : public ModeHandler { public: ModeChannelInviteOnly(InspIRCd* Instance); - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding); + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool servermode); }; diff --git a/include/modes/cmode_k.h b/include/modes/cmode_k.h index 19572ffcd..dce0550fe 100644 --- a/include/modes/cmode_k.h +++ b/include/modes/cmode_k.h @@ -21,7 +21,7 @@ class ModeChannelKey : public ModeHandler { public: ModeChannelKey(InspIRCd* Instance); - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding); + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool servermode); ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter); bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel); void RemoveMode(Channel* channel); diff --git a/include/modes/cmode_l.h b/include/modes/cmode_l.h index abdb339a6..e1435dc62 100644 --- a/include/modes/cmode_l.h +++ b/include/modes/cmode_l.h @@ -21,7 +21,7 @@ class ModeChannelLimit : public ModeHandler { public: ModeChannelLimit(InspIRCd* Instance); - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding); + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool servermode); ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter); bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel); }; diff --git a/include/modes/cmode_m.h b/include/modes/cmode_m.h index fcc949825..69ec34703 100644 --- a/include/modes/cmode_m.h +++ b/include/modes/cmode_m.h @@ -21,5 +21,5 @@ class ModeChannelModerated : public ModeHandler { public: ModeChannelModerated(InspIRCd* Instance); - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding); + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool servermode); }; diff --git a/include/modes/cmode_n.h b/include/modes/cmode_n.h index 82a38d766..ccc967ed2 100644 --- a/include/modes/cmode_n.h +++ b/include/modes/cmode_n.h @@ -21,5 +21,5 @@ class ModeChannelNoExternal : public ModeHandler { public: ModeChannelNoExternal(InspIRCd* Instance); - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding); + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool servermode); }; diff --git a/include/modes/cmode_o.h b/include/modes/cmode_o.h index ce107f6b8..f78ac8eb0 100644 --- a/include/modes/cmode_o.h +++ b/include/modes/cmode_o.h @@ -23,7 +23,7 @@ class ModeChannelOp : public ModeHandler private: public: ModeChannelOp(InspIRCd* Instance); - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding); + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, 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 ¶meter); diff --git a/include/modes/cmode_p.h b/include/modes/cmode_p.h index ebe612c01..ac564d734 100644 --- a/include/modes/cmode_p.h +++ b/include/modes/cmode_p.h @@ -21,5 +21,5 @@ class ModeChannelPrivate : public ModeHandler { public: ModeChannelPrivate(InspIRCd* Instance); - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding); + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool servermode); }; diff --git a/include/modes/cmode_s.h b/include/modes/cmode_s.h index e8ddc2614..a6b2054c5 100644 --- a/include/modes/cmode_s.h +++ b/include/modes/cmode_s.h @@ -21,5 +21,5 @@ class ModeChannelSecret : public ModeHandler { public: ModeChannelSecret(InspIRCd* Instance); - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding); + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool servermode); }; diff --git a/include/modes/cmode_t.h b/include/modes/cmode_t.h index ad41f42e4..3a6d2e512 100644 --- a/include/modes/cmode_t.h +++ b/include/modes/cmode_t.h @@ -21,5 +21,5 @@ class ModeChannelTopicOps : public ModeHandler { public: ModeChannelTopicOps(InspIRCd* Instance); - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding); + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool servermode); }; diff --git a/include/modes/cmode_v.h b/include/modes/cmode_v.h index 0d0932066..f66761809 100644 --- a/include/modes/cmode_v.h +++ b/include/modes/cmode_v.h @@ -23,7 +23,7 @@ class ModeChannelVoice : public ModeHandler private: public: ModeChannelVoice(InspIRCd* Instance); - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding); + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, 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 ¶meter); diff --git a/include/modes/umode_i.h b/include/modes/umode_i.h index eb8854420..83223b8fd 100644 --- a/include/modes/umode_i.h +++ b/include/modes/umode_i.h @@ -21,6 +21,6 @@ class ModeUserInvisible : public ModeHandler { public: ModeUserInvisible(InspIRCd* Instance); - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding); + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool servermode); unsigned int GetCount(); }; diff --git a/include/modes/umode_n.h b/include/modes/umode_n.h index b1d88d0cf..7c2648abc 100644 --- a/include/modes/umode_n.h +++ b/include/modes/umode_n.h @@ -21,5 +21,5 @@ class ModeUserServerNoticeMask : public ModeHandler { public: ModeUserServerNoticeMask(InspIRCd* Instance); - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding); + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool servermode); }; diff --git a/include/modes/umode_o.h b/include/modes/umode_o.h index ed40320b1..31f166131 100644 --- a/include/modes/umode_o.h +++ b/include/modes/umode_o.h @@ -21,6 +21,6 @@ class ModeUserOperator : public ModeHandler { public: ModeUserOperator(InspIRCd* Instance); - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding); + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool servermode); unsigned int GetCount(); }; diff --git a/include/modes/umode_s.h b/include/modes/umode_s.h index 57cbd193e..047defd87 100644 --- a/include/modes/umode_s.h +++ b/include/modes/umode_s.h @@ -21,6 +21,6 @@ class ModeUserServerNotice : public ModeHandler { public: ModeUserServerNotice(InspIRCd* Instance); - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding); + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool servermode); unsigned int GetCount(); }; diff --git a/include/modes/umode_w.h b/include/modes/umode_w.h index e9c7b71f6..ac9adbc35 100644 --- a/include/modes/umode_w.h +++ b/include/modes/umode_w.h @@ -21,6 +21,6 @@ class ModeUserWallops : public ModeHandler { public: ModeUserWallops(InspIRCd* Instance); - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding); + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool servermode); unsigned int GetCount(); }; diff --git a/include/modules.h b/include/modules.h index 29e4313dc..14a0186cb 100644 --- a/include/modules.h +++ b/include/modules.h @@ -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 ¶m, bool adding, int pcnt); + virtual int OnRawMode(User* user, Channel* chan, const char mode, const std::string ¶m, 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 -- cgit v1.2.3