Added OnUserPreJoin trigger

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@818 e03df62e-2008-0410-955e-edbf42e46eb7

3 files changed, 74 insertions, 50 deletions

diff --git a/src/InspIRCd.dev b/src/InspIRCd.dev
index 779b9174e..f06735e42 100644
--- a/src/InspIRCd.dev
+++ b/src/InspIRCd.dev
@@ -1,7 +1,7 @@
 [Project]
 FileName=InspIRCd.dev
 Name=InspIRCd - The Inspire Internet Relay Chat Daemon
-UnitCount=60
+UnitCount=61
 Type=1
 Ver=1
 ObjFiles=
@@ -645,3 +645,13 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit61]
+FileName=modules\m_noinvite.cpp
+CompileCpp=1
+Folder=Modules/Server
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
diff --git a/src/InspIRCd.layout b/src/InspIRCd.layout
index d09239a01..ed04817c7 100644
--- a/src/InspIRCd.layout
+++ b/src/InspIRCd.layout
@@ -67,7 +67,7 @@ TopLine=1
 LeftChar=1
 
 [Editor_8]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
@@ -75,7 +75,7 @@ TopLine=1
 LeftChar=1
 
 [Editor_9]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
@@ -83,7 +83,7 @@ TopLine=1
 LeftChar=1
 
 [Editor_10]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
@@ -91,7 +91,7 @@ TopLine=1
 LeftChar=1
 
 [Editor_11]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
@@ -99,7 +99,7 @@ TopLine=1
 LeftChar=1
 
 [Editor_12]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
@@ -107,7 +107,7 @@ TopLine=1
 LeftChar=1
 
 [Editor_13]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
@@ -115,7 +115,7 @@ TopLine=1
 LeftChar=1
 
 [Editor_14]
-Open=1
+Open=0
 Top=0
 CursorCol=39
 CursorRow=5
@@ -123,7 +123,7 @@ TopLine=1
 LeftChar=1
 
 [Editor_15]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=50
@@ -131,7 +131,7 @@ TopLine=1
 LeftChar=1
 
 [Editor_16]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
@@ -139,7 +139,7 @@ TopLine=1
 LeftChar=1
 
 [Editor_17]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
@@ -147,7 +147,7 @@ TopLine=1
 LeftChar=1
 
 [Editor_18]
-Open=1
+Open=0
 Top=0
 CursorCol=39
 CursorRow=5
@@ -155,7 +155,7 @@ TopLine=1
 LeftChar=1
 
 [Editor_19]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
@@ -163,7 +163,7 @@ TopLine=1
 LeftChar=1
 
 [Editor_20]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
@@ -171,7 +171,7 @@ TopLine=1
 LeftChar=1
 
 [Editor_21]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=18
@@ -179,7 +179,7 @@ TopLine=1
 LeftChar=1
 
 [Editor_22]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
@@ -187,8 +187,8 @@ TopLine=1
 LeftChar=1
 
 [Editor_23]
-Open=1
-Top=1
+Open=0
+Top=0
 CursorCol=1
 CursorRow=16
 TopLine=1
@@ -209,91 +209,91 @@ CursorRow=16
 TopLine=1
 LeftChar=1
 [Editor_26]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
 TopLine=1
 LeftChar=1
 [Editor_27]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
 TopLine=1
 LeftChar=1
 [Editor_28]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=17
 TopLine=1
 LeftChar=1
 [Editor_29]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
 TopLine=1
 LeftChar=1
 [Editor_30]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
 TopLine=1
 LeftChar=1
 [Editor_31]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
 TopLine=1
 LeftChar=1
 [Editor_32]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
 TopLine=1
 LeftChar=1
 [Editor_33]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
 TopLine=1
 LeftChar=1
 [Editor_34]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=17
 TopLine=1
 LeftChar=1
 [Editor_35]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
 TopLine=1
 LeftChar=1
 [Editor_36]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
 TopLine=1
 LeftChar=1
 [Editor_37]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
 TopLine=1
 LeftChar=1
 [Editor_38]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
@@ -307,14 +307,14 @@ CursorRow=16
 TopLine=1
 LeftChar=1
 [Editor_40]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
 TopLine=1
 LeftChar=1
 [Editor_41]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
@@ -330,19 +330,19 @@ LeftChar=1
 [Editor_43]
 Open=1
 Top=0
-CursorCol=1
-CursorRow=16
-TopLine=1
+CursorCol=4
+CursorRow=435
+TopLine=387
 LeftChar=1
 [Editor_44]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
 TopLine=1
 LeftChar=1
 [Editor_45]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
@@ -356,14 +356,14 @@ CursorRow=16
 TopLine=1
 LeftChar=1
 [Editor_47]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
 TopLine=1
 LeftChar=1
 [Editor_48]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
@@ -377,72 +377,79 @@ CursorRow=16
 TopLine=1
 LeftChar=1
 [Editor_50]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
 TopLine=1
 LeftChar=1
 [Editor_51]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
 TopLine=1
 LeftChar=1
 [Editor_52]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
 TopLine=1
 LeftChar=1
 [Editor_53]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
 TopLine=1
 LeftChar=1
 [Editor_54]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
 TopLine=1
 LeftChar=1
 [Editor_55]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
 TopLine=1
 LeftChar=1
 [Editor_56]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
 TopLine=1
 LeftChar=1
 [Editor_57]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
 TopLine=1
 LeftChar=1
 [Editor_58]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
 TopLine=1
 LeftChar=1
 [Editor_59]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=16
 TopLine=1
 LeftChar=1
+[Editor_60]
+Open=1
+Top=1
+CursorCol=1
+CursorRow=1
+TopLine=33
+LeftChar=1
diff --git a/src/commands.cpp b/src/commands.cpp
index 94603d8e9..ffa09156b 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -431,6 +431,13 @@ void handle_invite(char **parameters, int pcnt, userrec *user)
 		WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, c->name);
   		return;
 	}
+
+	int MOD_RESULT = 0;
+	FOREACH_RESULT(OnUserPreInvite(user,u,c));
+	if (MOD_RESULT == 1) {
+		return NULL;
+	}
+
 	u->InviteTo(c->name);
 	WriteFrom(u->fd,user,"INVITE %s :%s",u->nick,c->name);
 	WriteServ(user->fd,"341 %s %s %s",user->nick,u->nick,c->name);