Merge branch '2.0' into 2.1

Conflicts:
	cmake/Anope.cmake
	cmake/FindGettext.cmake
	include/access.h
	include/messages.h
	include/modes.h
	include/modules.h
	include/users.h
	modules/CMakeLists.txt
	modules/commands/bs_bot.cpp
	modules/commands/cs_access.cpp
	modules/commands/cs_ban.cpp
	modules/commands/cs_clone.cpp
	modules/commands/cs_flags.cpp
	modules/commands/cs_info.cpp
	modules/commands/cs_list.cpp
	modules/commands/cs_log.cpp
	modules/commands/cs_mode.cpp
	modules/commands/cs_status.cpp
	modules/commands/cs_suspend.cpp
	modules/commands/cs_updown.cpp
	modules/commands/cs_xop.cpp
	modules/commands/ms_check.cpp
	modules/commands/ns_access.cpp
	modules/commands/ns_cert.cpp
	modules/commands/ns_group.cpp
	modules/commands/ns_register.cpp
	modules/commands/ns_set.cpp
	modules/commands/ns_suspend.cpp
	modules/commands/os_session.cpp
	modules/commands/os_svs.cpp
	modules/extra/m_ldap_authentication.cpp
	modules/extra/m_regex_pcre.cpp
	modules/extra/m_sql_authentication.cpp
	modules/extra/stats/m_chanstats.cpp
	modules/protocol/bahamut.cpp
	modules/protocol/hybrid.cpp
	modules/protocol/inspircd12.cpp
	modules/protocol/inspircd20.cpp
	modules/protocol/unreal.cpp
	modules/pseudoclients/chanserv.cpp
	modules/pseudoclients/chanserv/channel.cpp
	modules/pseudoclients/nickserv/nickserv.cpp
	modules/webcpanel/pages/chanserv/access.cpp
	src/access.cpp
	src/bots.cpp
	src/channels.cpp
	src/language.cpp
	src/modes.cpp
	src/modulemanager.cpp
	src/process.cpp
	src/users.cpp
	src/version.sh

1 files changed, 101 insertions, 30 deletions

diff --git a/modules/protocol/unreal.cpp b/modules/protocol/unreal.cpp
index 606f22270..721ba50c3 100644
--- a/modules/protocol/unreal.cpp
+++ b/modules/protocol/unreal.cpp
@@ -167,7 +167,7 @@ class UnrealIRCdProto : public IRCDProto
 			if (uc != NULL)
 				uc->status.Clear();
 
-			BotInfo *setter = BotInfo::Find(user->nick);
+			BotInfo *setter = BotInfo::Find(user->GetUID());
 			for (size_t i = 0; i < cs.Modes().length(); ++i)
 				c->SetMode(setter, ModeManager::FindChannelModeByChar(cs.Modes()[i]), user->GetUID(), false);
 
@@ -415,17 +415,44 @@ class UnrealIRCdProto : public IRCDProto
 	}
 };
 
-class UnrealExtBan : public ChannelModeList
+class UnrealExtBan : public ChannelModeVirtual<ChannelModeList>
 {
+	char ext;
+
  public:
-	UnrealExtBan(const Anope::string &mname, char modeChar) : ChannelModeList(mname, modeChar) { }
+	UnrealExtBan(const Anope::string &mname, const Anope::string &basename, char extban) : ChannelModeVirtual<ChannelModeList>(mname, basename)
+		, ext(extban)
+	{
+	}
+
+	ChannelMode *Wrap(Anope::string &param) override
+	{
+		param = "~" + Anope::string(ext) + ":" + param;
+		return ChannelModeVirtual<ChannelModeList>::Wrap(param);
+	}
 
-	bool Matches(User *u, const Entry *e) override
+	ChannelMode *Unwrap(ChannelMode *cm, Anope::string &param) override
 	{
-		const Anope::string &mask = e->GetMask();
+		if (cm->type != MODE_LIST || param.length() < 4 || param[0] != '~' || param[1] != ext || param[2] != ':')
+			return cm;
 
-		if (mask.find("~c:") == 0)
+		param = param.substr(3);
+		return this;
+	}
+};
+
+namespace UnrealExtban
+{
+	class ChannelMatcher : public UnrealExtBan
+	{
+	 public:
+		ChannelMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
 		{
+		}
+
+		bool Matches(User *u, const Entry *e) override
+		{
+			const Anope::string &mask = e->GetMask();
 			Anope::string channel = mask.substr(3);
 
 			ChannelMode *cm = NULL;
@@ -446,38 +473,73 @@ class UnrealExtBan : public ChannelModeList
 					if (cm == NULL || uc->status.HasMode(cm->mchar))
 						return true;
 			}
+
+			return false;
 		}
-		else if (mask.find("~j:") == 0 || mask.find("~n:") == 0 || mask.find("~q:") == 0)
+	};
+
+	class EntryMatcher : public UnrealExtBan
+	{
+	 public:
+	 	EntryMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
+	 	{
+	 	}
+
+	 	bool Matches(User *u, const Entry *e) override
 		{
+			const Anope::string &mask = e->GetMask();
 			Anope::string real_mask = mask.substr(3);
 
-			Entry en(this->name, real_mask);
-			if (en.Matches(u))
-				return true;
+			return Entry(this->name, real_mask).Matches(u);
 		}
-		else if (mask.find("~r:") == 0)
+	};
+
+	class RealnameMatcher : public UnrealExtBan
+	{
+	 public:
+	 	RealnameMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
+	 	{
+	 	}
+
+	 	bool Matches(User *u, const Entry *e) override
 		{
+			const Anope::string &mask = e->GetMask();
 			Anope::string real_mask = mask.substr(3);
 
-			if (Anope::Match(u->realname, real_mask))
-				return true;
+			return Anope::Match(u->realname, real_mask);
 		}
-		else if (mask.find("~R:") == 0)
+	};
+
+	class RegisteredMatcher : public UnrealExtBan
+	{
+	 public:
+	 	RegisteredMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
+	 	{
+	 	}
+
+	 	bool Matches(User *u, const Entry *e) override
 		{
-			if (u->HasMode("REGISTERED") && mask.equals_ci(u->nick))
-				return true;
+			const Anope::string &mask = e->GetMask();
+			return u->HasMode("REGISTERED") && mask.equals_ci(u->nick);
 		}
-		else if (mask.find("~a:") == 0)
-		{
-			Anope::string real_mask = mask.substr(3);
+	};
 
-			if (u->Account() && Anope::Match(u->Account()->display, real_mask))
-				return true;
-		}
+	class AccountMatcher : public UnrealExtBan
+	{
+	 public:
+	 	AccountMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
+	 	{
+	 	}
 
-		return false;
-	}
-};
+	 	bool Matches(User *u, const Entry *e) override
+	 	{
+	 		const Anope::string &mask = e->GetMask();
+			Anope::string real_mask = mask.substr(3);
+
+	 		return u->Account() && Anope::Match(u->Account()->display, real_mask);
+	 	}
+	};
+}
 
 class ChannelModeFlood : public ChannelModeParam
 {
@@ -485,7 +547,7 @@ class ChannelModeFlood : public ChannelModeParam
 	ChannelModeFlood(char modeChar, bool minusNoArg) : ChannelModeParam("FLOOD", modeChar, minusNoArg) { }
 
 	/* Borrowed part of this check from UnrealIRCd */
-	bool IsValid(const Anope::string &value) const override
+	bool IsValid(Anope::string &value) const override
 	{
 		if (value.empty())
 			return false;
@@ -565,13 +627,21 @@ struct IRCDMessageCapab : Message::Capab
 					switch (modebuf[t])
 					{
 						case 'b':
-							ModeManager::AddChannelMode(new UnrealExtBan("BAN", 'b'));
+							ModeManager::AddChannelMode(new ChannelModeList("BAN", 'b'));
+
+							ModeManager::AddChannelMode(new UnrealExtban::ChannelMatcher("CHANNELBAN", "BAN", 'c'));
+							ModeManager::AddChannelMode(new UnrealExtban::EntryMatcher("JOINBAN", "BAN", 'j'));
+							ModeManager::AddChannelMode(new UnrealExtban::EntryMatcher("NONICKBAN", "BAN", 'n'));
+							ModeManager::AddChannelMode(new UnrealExtban::EntryMatcher("QUIET", "BAN", 'q'));
+							ModeManager::AddChannelMode(new UnrealExtban::RealnameMatcher("REALNAMEBAN", "BAN", 'r'));
+							ModeManager::AddChannelMode(new UnrealExtban::RegisteredMatcher("REGISTEREDBAN", "BAN", 'R'));
+							ModeManager::AddChannelMode(new UnrealExtban::AccountMatcher("ACCOUNTBAN", "BAN", 'a'));
 							continue;
 						case 'e':
-							ModeManager::AddChannelMode(new UnrealExtBan("EXCEPT", 'e'));
+							ModeManager::AddChannelMode(new ChannelModeList("EXCEPT", 'e'));
 							continue;
 						case 'I':
-							ModeManager::AddChannelMode(new UnrealExtBan("INVITEOVERRIDE", 'I'));
+							ModeManager::AddChannelMode(new ChannelModeList("INVITEOVERRIDE", 'I'));
 							continue;
 						default:
 							ModeManager::AddChannelMode(new ChannelModeList("", modebuf[t]));
@@ -1105,7 +1175,7 @@ class ProtoUnreal : public Module
 	Message::Invite message_invite;
 	Message::Join message_join;
 	Message::Kick message_kick;
-	Message::Kill message_kill;
+	Message::Kill message_kill, message_svskill;
 	Message::MOTD message_motd;
 	Message::Notice message_notice;
 	Message::Part message_part;
@@ -1199,6 +1269,7 @@ class ProtoUnreal : public Module
 		, message_quit(this)
 		, message_squit(this)
 		, message_stats(this)
+		, message_svskill(this, "SVSKILL")
 		, message_time(this)
 		, message_version(this)
 		, message_whois(this)