From 7b1154de69c175ecf9e6042a5c5f4cf89fa222e7 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Sun, 8 Jan 2017 13:08:04 -0500
Subject: ns_register: notify users of unconfirmed accounts on register when
 there is no user too

---
 modules/commands/ns_register.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/commands/ns_register.cpp b/modules/commands/ns_register.cpp
index 1595d51a8..7c1d7e4f8 100644
--- a/modules/commands/ns_register.cpp
+++ b/modules/commands/ns_register.cpp
@@ -234,7 +234,6 @@ class CommandNSRegister : public Command
 			if (nsregister.equals_ci("admin"))
 			{
 				nc->Extend<bool>("UNCONFIRMED");
-				// User::Identify() called below will notify the user that their registration is pending
 			}
 			else if (nsregister.equals_ci("mail"))
 			{
@@ -249,9 +248,17 @@ class CommandNSRegister : public Command
 
 			if (u)
 			{
+				// This notifies the user that if their registration is unconfirmed
 				u->Identify(na);
 				u->lastnickreg = Anope::CurTime;
 			}
+			else if (nc->HasExt("UNCONFIRMED"))
+			{
+				if (nsregister.equals_ci("admin"))
+					source.Reply(_("All new accounts must be validated by an administrator. Please wait for your registration to be confirmed."));
+				else if (nsregister.equals_ci("mail"))
+					source.Reply(_("Your email address is not confirmed. To confirm it, follow the instructions that were emailed to you."));
+			}
 		}
 	}
 
-- 
cgit 


From 5beb33824719c4fbf2ba691e939d50d4b38196df Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Sun, 8 Jan 2017 15:48:54 -0500
Subject: Remove efnetrbl from example dnsbl configuration

---
 data/modules.example.conf | 39 +++++++++++++--------------------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/data/modules.example.conf b/data/modules.example.conf
index e921c1e0d..9a86266c7 100644
--- a/data/modules.example.conf
+++ b/data/modules.example.conf
@@ -113,7 +113,7 @@ module { name = "help" }
 	blacklist
 	{
 		/* Name of the blacklist. */
-		name = "rbl.efnetrbl.org"
+		name = "dnsbl.dronebl.org"
 
 		/* How long to set the ban for. */
 		time = 4h
@@ -127,28 +127,16 @@ module { name = "help" }
 		 * %r is the reply reason (configured below). Will be nothing if not configured.
 		 * %N is the network name set in networkinfo:networkname
 		 */
-		reason = "You are listed in the efnet RBL, visit http://rbl.efnetrbl.org/?i=%i for info"
-
-		/* Replies to ban and their reason. If no relies are configured, all replies get banned. */
-		reply
-		{
-			code = 1
-			reason = "Open Proxy"
-		}
-
-		#reply
-		{
-			code = 2
-			reason = "spamtrap666"
-		}
+		reason = "You have a host listed in the DroneBL. For more information, visit http://dronebl.org/lookup_branded?ip=%i&network=%N"
 
+		/* Replies to ban and their reason. If no replies are configured, all replies get banned. */
 		#reply
 		{
 			code = 3
-			reason = "spamtrap50"
+			reason = "IRC Drone"
 		}
 
-		reply
+		#reply
 		{
 			code = 4
 			reason = "TOR"
@@ -160,18 +148,17 @@ module { name = "help" }
 			#allow_account = yes
 		}
 
-		reply
+		#reply
 		{
-			code = 5
-			reason = "Drones / Flooding"
+			code = 8
+			reason = "SOCKS Proxy"
 		}
-	}
 
-	#blacklist
-	{
-		name = "dnsbl.dronebl.org"
-		time = 4h
-		reason = "You have a host listed in the DroneBL. For more information, visit http://dronebl.org/lookup_branded?ip=%i&network=%N"
+		#reply
+		{
+			code = 9
+			reason = "HTTP Proxy"
+		}
 	}
 
 	/* Exempt localhost from DNSBL checks */
-- 
cgit 


From a4f7d847abdde8f070a201417a456067d3beb4a1 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Wed, 11 Jan 2017 20:42:20 -0500
Subject: unreal4: use SENDUMODE instead of GLOBOPS

---
 modules/protocol/unreal4.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/protocol/unreal4.cpp b/modules/protocol/unreal4.cpp
index b98de5ff2..e17558680 100644
--- a/modules/protocol/unreal4.cpp
+++ b/modules/protocol/unreal4.cpp
@@ -300,6 +300,11 @@ class UnrealIRCdProto : public IRCDProto
 			UplinkSocket::Message() << "SVSPART " << user->GetUID() << " " << chan;
 	}
 
+	void SendGlobopsInternal(const MessageSource &source, const Anope::string &buf) anope_override
+	{
+		UplinkSocket::Message(Me) << "SENDUMODE o :from " << source.GetName() << ": " << buf;
+	}
+
 	void SendSWhois(const MessageSource &source, const Anope::string &who, const Anope::string &mask) anope_override
 	{
 		UplinkSocket::Message(source) << "SWHOIS " << who << " :" << mask;
-- 
cgit