diff options
| author | Adam <Adam@anope.org> | 2011-08-14 18:50:22 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2011-08-14 18:50:22 -0400 |
| commit | 960c339a4ccb1be522ec800d9143d30db8ac7001 (patch) | |
| tree | 6cf9bde695f498f5c2db5b58f97c9733e085a3e7 /include | |
| parent | fddb2304c6a05559b4d2c550885646dc2e77e875 (diff) | |
Brought back the old 1.7 behavior of a level -1 matching all users and 0 matching all identified users
Diffstat (limited to 'include')
| -rw-r--r-- | include/access.h | 1 | ||||
| -rw-r--r-- | include/bots.h | 3 | ||||
| -rw-r--r-- | include/language.h | 1 | ||||
| -rw-r--r-- | include/modules.h | 9 |
4 files changed, 11 insertions, 3 deletions
diff --git a/include/access.h b/include/access.h index c1692960d..fd2b60356 100644 --- a/include/access.h +++ b/include/access.h @@ -79,6 +79,7 @@ class CoreExport AccessGroup : public std::vector<ChanAccess *> { public: ChannelInfo *ci; + NickCore *nc; bool SuperAdmin, Founder; AccessGroup(); bool HasPriv(ChannelAccess priv) const; diff --git a/include/bots.h b/include/bots.h index 399ba3ea1..f5b4c528a 100644 --- a/include/bots.h +++ b/include/bots.h @@ -48,8 +48,9 @@ class CoreExport BotInfo : public User, public Flags<BotFlag, BI_END> * @param user The ident to give the bot. * @param host The hostname to give the bot. * @param real The realname to give the bot. + * @param bmodes The modes to give the bot. */ - BotInfo(const Anope::string &nick, const Anope::string &user = "", const Anope::string &host = "", const Anope::string &real = "", const Anope::string &modes = ""); + BotInfo(const Anope::string &nick, const Anope::string &user = "", const Anope::string &host = "", const Anope::string &real = "", const Anope::string &bmodes = ""); /** Destroy a bot, clearing up appropriately. */ diff --git a/include/language.h b/include/language.h index 6c31daa4c..20bd36a77 100644 --- a/include/language.h +++ b/include/language.h @@ -46,7 +46,6 @@ #define NICK_SET_DISABLED _("Sorry, nickname option setting is temporarily disabled.") #define NICK_SET_UNKNOWN_OPTION _("Unknown SET option \002%s%s\002.") #define NICK_SET_DISPLAY_CHANGED _("The new display is now \002%s\002.") -#define NICK_INFO_OPTIONS _(" Options: %s") #define NICK_LIST_SYNTAX _("LIST \037pattern\037") #define LIST_HEADER _("List of entries matching \002%s\002:") #define NICK_RECOVERED _("User claiming your nick has been killed.\n" \ diff --git a/include/modules.h b/include/modules.h index 2592b5622..e16b8150b 100644 --- a/include/modules.h +++ b/include/modules.h @@ -753,6 +753,13 @@ class CoreExport Module : public Extensible */ virtual EventReturn OnCheckPriv(ChanAccess *access, ChannelAccess priv) { return EVENT_CONTINUE; } + /** Check whether an access group has a privilege + * @param group The group + * @param priv The privilege + * @return MOD_ALLOW to allow, MOD_STOP to stop + */ + virtual EventReturn OnGroupCheckPriv(const AccessGroup *group, ChannelAccess priv) { return EVENT_CONTINUE; } + /** Called when a nick is dropped * @param u The user dropping the nick * @param na The nick @@ -1037,7 +1044,7 @@ enum Implementation I_OnChanForbidden, I_OnChanSuspend, I_OnChanDrop, I_OnPreChanExpire, I_OnChanExpire, I_OnAccessAdd, I_OnAccessDel, I_OnAccessClear, I_OnLevelChange, I_OnChanRegistered, I_OnChanUnsuspend, I_OnCreateChan, I_OnDelChan, I_OnChannelCreate, I_OnChannelDelete, I_OnAkickAdd, I_OnAkickDel, I_OnCheckKick, - I_OnChanInfo, I_OnFindChan, I_OnCheckPriv, + I_OnChanInfo, I_OnFindChan, I_OnCheckPriv, I_OnGroupCheckPriv, /* BotServ */ I_OnBotJoin, I_OnBotKick, I_OnBotCreate, I_OnBotChange, I_OnBotDelete, I_OnBotAssign, I_OnBotUnAssign, |