Merge branch '2.0' into 2.1

Conflicts:
	CMakeLists.txt
	include/modules.h
	include/serialize.h
	modules/commands/bs_assign.cpp
	modules/commands/bs_badwords.cpp
	modules/commands/bs_bot.cpp
	modules/commands/bs_control.cpp
	modules/commands/bs_kick.cpp
	modules/commands/cs_access.cpp
	modules/commands/cs_akick.cpp
	modules/commands/cs_drop.cpp
	modules/commands/cs_entrymsg.cpp
	modules/commands/cs_flags.cpp
	modules/commands/cs_info.cpp
	modules/commands/cs_invite.cpp
	modules/commands/cs_kick.cpp
	modules/commands/cs_mode.cpp
	modules/commands/cs_register.cpp
	modules/commands/cs_seen.cpp
	modules/commands/cs_set.cpp
	modules/commands/cs_suspend.cpp
	modules/commands/cs_topic.cpp
	modules/commands/cs_unban.cpp
	modules/commands/cs_xop.cpp
	modules/commands/hs_del.cpp
	modules/commands/hs_list.cpp
	modules/commands/hs_request.cpp
	modules/commands/ms_ignore.cpp
	modules/commands/ms_send.cpp
	modules/commands/ns_recover.cpp
	modules/commands/ns_register.cpp
	modules/commands/ns_suspend.cpp
	modules/commands/os_dns.cpp
	modules/commands/os_noop.cpp
	modules/commands/os_oper.cpp
	modules/commands/os_session.cpp
	modules/database/db_sql_live.cpp
	modules/encryption/enc_bcrypt.cpp
	modules/extra/m_ldap_authentication.cpp
	modules/extra/m_ldap_oper.cpp
	modules/fantasy.cpp
	modules/m_dnsbl.cpp
	modules/m_sasl.cpp
	modules/protocol/hybrid.cpp
	modules/protocol/inspircd20.cpp
	modules/protocol/unreal.cpp
	modules/pseudoclients/chanserv.cpp
	modules/pseudoclients/nickserv.cpp
	modules/webcpanel/pages/chanserv/access.cpp
	modules/webcpanel/webcpanel.cpp
	modules/webcpanel/webcpanel.h
	src/command.cpp
	src/messages.cpp
	src/modulemanager.cpp
	src/regchannel.cpp
	src/serialize.cpp

4 files changed, 11 insertions, 6 deletions

diff --git a/include/channels.h b/include/channels.h
index f27edcee6..f2dc9e182 100644
--- a/include/channels.h
+++ b/include/channels.h
@@ -242,9 +242,9 @@ class CoreExport Channel : public Base, public Extensible
 
 	/** Get a list of modes on a channel
 	 * @param name A mode name to get the list of
-	 * @return a pair of iterators for the beginning and end of the list
+	 * @return a vector of the list mode entries
 	 */
-	std::pair<ModeList::iterator, ModeList::iterator> GetModeList(const Anope::string &name);
+	std::vector<Anope::string> GetModeList(const Anope::string &name);
 
 	/** Get a string of the modes set on this channel
 	 * @param complete Include mode parameters
diff --git a/include/commands.h b/include/commands.h
index bc78dda78..e94cffae1 100644
--- a/include/commands.h
+++ b/include/commands.h
@@ -179,6 +179,8 @@ class CoreExport Command : public Service
 	 */
 	static void Run(CommandSource &source, const Anope::string &message);
 
+	void Run(CommandSource &source, const Anope::string &, const CommandInfo &, std::vector<Anope::string> &params);
+
 	/** Looks up a command name from the service name.
 	 * Note that if the same command exists multiple places this will return the first one encountered
 	 * @param command_service The command service to lookup, eg, nickserv/register
diff --git a/include/modules.h b/include/modules.h
index 03fca99dc..5daaed613 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -198,10 +198,6 @@ class CoreExport Module : public Extensible
 	 */
 	ModuleVersion GetVersion() const;
 
-	/** Called when Services' configuration is being (re)loaded.
-	 * @param conf The config that is being built now and will replace the global Config object
-	 * @throws A ConfigException to abort the config (re)loading process.
-	 */
 	virtual void OnReload(Configuration::Conf *conf) { }
 };
 
diff --git a/include/modules/nickserv.h b/include/modules/nickserv.h
index a6921cf2e..5c9cfb341 100644
--- a/include/modules/nickserv.h
+++ b/include/modules/nickserv.h
@@ -89,6 +89,12 @@ namespace NickServ
 		};
 		static EventHandlersReference<NickRegister> OnNickRegister;
 
+		struct CoreExport NickConfirm : Events
+		{
+			virtual void OnNickConfirm(User *, Account *) anope_abstract;
+		};
+		static EventHandlersReference<NickConfirm> OnNickConfirm;
+
 		struct CoreExport NickValidate : Events
 		{
 			/** Called when a nick is validated. That is, to determine if a user is permissted
@@ -297,4 +303,5 @@ namespace NickServ
 template<> struct EventName<NickServ::Event::PreNickExpire> { static constexpr const char *const name = "OnPreNickExpire"; };
 template<> struct EventName<NickServ::Event::NickExpire> { static constexpr const char *const name = "OnNickExpire"; };
 template<> struct EventName<NickServ::Event::NickRegister> { static constexpr const char *const name = "OnNickRegister"; };
+template<> struct EventName<NickServ::Event::NickConfirm> { static constexpr const char *const name = "OnNickConfirm"; };
 template<> struct EventName<NickServ::Event::NickValidate> { static constexpr const char *const name = "OnNickValidate"; };