From 80e8578cb9b3cb08cca10e431466b94b6bccb410 Mon Sep 17 00:00:00 2001
From: Elijah Perrault <elijah@starcoder.info>
Date: Wed, 2 Feb 2011 13:43:42 -0700
Subject: [PATCH] Added user:net for network-specific user blocks.

---
 doc/CHANGELOG  |  1 +
 src/API/Std.pm | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index d78058a..74df06c 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -3,6 +3,7 @@ Auto IRC Bot 3.0: Change Log
 
 3.0 Indev
 ==================================================================
+    * Added user:net for network-specific user blocks.
     * Bug fix: Fixed broken no-parameter config blocks.
     * Added core command SHUTDOWN.
     * Added core command MODRELOAD.
diff --git a/src/API/Std.pm b/src/API/Std.pm
index aa8d45a..e67df61 100644
--- a/src/API/Std.pm
+++ b/src/API/Std.pm
@@ -354,8 +354,17 @@ sub match_user
 		# For each user block.
 		my %ulhp = %{ $uhp{$userkey} };
 		foreach my $uhk (keys %ulhp) {
-			# For each user.
-			if ($uhk eq "mask") {
+            # For each user.
+
+			if ($uhk eq "net") {
+                if (defined $user{svr}) {
+                    if (lc($user{svr}) ne lc(($ulhp{$uhk})[0][0])) {
+                        # config.user:net conflicts with irc.user:svr.
+                        last;
+                    }
+                }
+            }
+            elsif ($uhk eq "mask") {
 				# Put together the user information.
 				my $mask = $user{nick}."!".$user{user}."@".$user{host};
 				if (API::IRC::match_mask($mask, ($ulhp{$uhk})[0][0])) {