Fixes to JOIN

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

diff --git a/src/InspIRCd.layout b/src/InspIRCd.layout
index 47508ccca6b2e493dfdb45aac49fe9310f06668c..3a6014d425f3eaf0eeeedb4d89ae018c2dfcd233 100644 (file)
--- a/src/InspIRCd.layout
+++ b/src/InspIRCd.layout
@@ -13,9 +13,9 @@ LeftChar=1
 [Editor_1]
 Open=1
 Top=1
-CursorCol=2
-CursorRow=5531
-TopLine=5477
+CursorCol=1
+CursorRow=1558
+TopLine=1504
 LeftChar=1
 
 [Editor_2]
@@ -53,8 +53,8 @@ LeftChar=1
 [Editor_6]
 Open=1
 Top=0
-CursorCol=10
-CursorRow=26
+CursorCol=11
+CursorRow=28
 TopLine=37
 LeftChar=1
 
@@ -107,11 +107,11 @@ TopLine=1
 LeftChar=1
 
 [Editor_13]
-Open=0
+Open=1
 Top=0
-CursorCol=12
-CursorRow=32
-TopLine=9
+CursorCol=20
+CursorRow=59
+TopLine=18
 LeftChar=1
 
 [Editor_14]
@@ -173,8 +173,8 @@ LeftChar=1
 [Editor_21]
 Open=1
 Top=0
-CursorCol=1
-CursorRow=25
+CursorCol=3
+CursorRow=59
 TopLine=7
 LeftChar=1
 

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 813091798e5101acb67b3c61304ac41bf55ad678..9bfc4ea6f496c9bd7298c7bfffc26bee9afe42a6 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -1438,17 +1438,16 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
                Ptr = FindChan(cname);
                if (Ptr)
                {
-                       FOREACH_RESULT(OnUserPreJoin(user,Ptr,cname));
-                       if (MOD_RESULT) {
-                               return NULL;
-                       }
-                       
                        log(DEBUG,"add_channel: joining to: %s",Ptr->name);
                        
                        // the override flag allows us to bypass channel modes
                        // and bans (used by servers)
                        if (!override)
                        {
+                               FOREACH_RESULT(OnUserPreJoin(user,Ptr,cname));
+                               if (MOD_RESULT) {
+                                       return NULL;
+                               }
                                
                                if (strcmp(Ptr->key,""))
                                {
@@ -1515,16 +1514,22 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
                                        }
                                }
                                
-                       }
+                               log(DEBUG,"add_channel: bans checked");
+                               
 
-                       log(DEBUG,"add_channel: bans checked");
+                               if ((Ptr) && (user))
+                               {
+                                       user->RemoveInvite(Ptr->name);
+                               }
+       
+                               log(DEBUG,"add_channel: invites removed");
 
-                       if ((Ptr) && (user))
+                       }
+                       else
                        {
-                               user->RemoveInvite(Ptr->name);
+                               log(DEBUG,"Overridden checks");
                        }
 
-                       log(DEBUG,"add_channel: invites removed");
                        
                }
                created = 1;