Fixed module loading bugs...again

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

2 files changed, 16 insertions, 11 deletions

diff --git a/src/InspIRCd.layout b/src/InspIRCd.layout
index 112845329..640e52f43 100644
--- a/src/InspIRCd.layout
+++ b/src/InspIRCd.layout
@@ -1,5 +1,5 @@
 [Editors]
-Focused=-1
+Focused=1
 Order=7,3,2,6,25,24,4,5,-1,1,0
 
 [Editor_0]
@@ -12,10 +12,10 @@ LeftChar=1
 
 [Editor_1]
 Open=1
-Top=0
-CursorCol=4
-CursorRow=886
-TopLine=878
+Top=1
+CursorCol=18
+CursorRow=5287
+TopLine=5278
 LeftChar=1
 
 [Editor_2]
@@ -218,8 +218,8 @@ LeftChar=1
 [Editor_27]
 Open=1
 Top=0
-CursorCol=1
-CursorRow=19
+CursorCol=6
+CursorRow=34
 TopLine=1
 LeftChar=1
 [Editor_28]
@@ -286,8 +286,8 @@ TopLine=1
 LeftChar=1
 [Editor_38]
 Open=1
-Top=1
-CursorCol=3
-CursorRow=33
+Top=0
+CursorCol=49
+CursorRow=31
 TopLine=1
 LeftChar=1
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index dc783a281..5ea8f91da 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -3319,6 +3319,11 @@ void handle_invite(char **parameters, int pcnt, userrec *user)
  		WriteServ(user->fd,"443 %s %s %s :Is already on channel %s",user->nick,u->nick,c->name,c->name);
  		return;
 	}
+	if (!has_channel(user,c))
+ 	{
+		WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, c->name);
+  		return;
+	}
 	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);
@@ -5279,7 +5284,7 @@ int InspIRCd(void)
 	for (count2 = 0; count2 < ConfValueEnum("module",&config_f); count2++)
 	{
 		char modfile[MAXBUF];
-		ConfValue("module","name",count,configToken,&config_f);
+		ConfValue("module","name",count2,configToken,&config_f);
 		sprintf(modfile,"%s/%s",MOD_PATH,configToken,&config_f);
 		printf("Loading module... \033[1;37m%s\033[0;37m\n",modfile);
 		log(DEBUG,"InspIRCd: startup: Loading module: %s",modfile);