From: dms <dms@c11ca15a-4712-0410-83d8-924469b57eb5>
Date: Sat, 3 Feb 2001 14:06:29 +0000 (+0000)
Subject: move identify code before outsider checking
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a03136f461a98e1df87b30ac429273f59bad2ce7;p=infobot.git

move identify code before outsider checking


git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@317 c11ca15a-4712-0410-83d8-924469b57eb5
---

diff --git a/src/Process.pl b/src/Process.pl
index a71841a..74909ce 100644
--- a/src/Process.pl
+++ b/src/Process.pl
@@ -80,33 +80,6 @@ sub process {
 	return;
     }
 
-    # allowOutsiders.
-    if (&IsParam("disallowOutsiders") and $msgType =~ /private/i) {
-	my $found = 0;
-
-	foreach (keys %channels) {
-	    next unless (&IsNickInChan($who,$_));
-
-	    $found++;
-	    last;
-	}
-
-	if (!$found and scalar(keys %channels)) {
-	    &status("OUTSIDER <$who> $message");
-	    return 'OUTSIDER';
-	}
-    }
-
-    # User Processing, for all users.
-    if ($addressed) {
-	my $retval;
-	return 'returned from pCH'   if &parseCmdHook("main",$message);
-
-	$retval	= &userCommands();
-	return unless (defined $retval);
-	return if ($retval eq $noreply);
-    }
-
     # 'identify'
     if ($msgType =~ /private/ and $message =~ s/^identify//) {
 	$message =~ s/^\s+|\s+$//g;
@@ -149,6 +122,33 @@ sub process {
 	return;
     }
 
+    # allowOutsiders.
+    if (&IsParam("disallowOutsiders") and $msgType =~ /private/i) {
+	my $found = 0;
+
+	foreach (keys %channels) {
+	    next unless (&IsNickInChan($who,$_));
+
+	    $found++;
+	    last;
+	}
+
+	if (!$found and scalar(keys %channels)) {
+	    &status("OUTSIDER <$who> $message");
+	    return 'OUTSIDER';
+	}
+    }
+
+    # User Processing, for all users.
+    if ($addressed) {
+	my $retval;
+	return 'returned from pCH'   if &parseCmdHook("main",$message);
+
+	$retval	= &userCommands();
+	return unless (defined $retval);
+	return if ($retval eq $noreply);
+    }
+
     ###
     # once useless messages have been parsed out, we match them.
     ###