Only send 320 numeric if the SSL user is on our port

[user/henk/code/inspircd.git] / src / channels.cpp

diff --git a/src/channels.cpp b/src/channels.cpp
index a55fbcb88f3636fc80df90351d6df88ce8bfc9df..e8e7efcf8f74046c84811e82114085d7362c4b73 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -171,9 +171,12 @@ void chanrec::DelUser(char* castuser)
        {
                log(DEBUG,"Removed casted user from channel's internal list");
                internal_userlist.erase(a);
+               /* And tidy any others... */
+               DelOppedUser(castuser);
+               DelHalfoppedUser(castuser);
+               DelVoicedUser(castuser);
                return;
        }
-       log(DEBUG,"BUG BUG BUG! Attempt to remove an uncasted user from the internal list of %s!",name);
 }
 
 void chanrec::AddOppedUser(char* castuser)
@@ -191,7 +194,6 @@ void chanrec::DelOppedUser(char* castuser)
                 internal_op_userlist.erase(a);
                 return;
         }
-        log(DEBUG,"BUG BUG BUG! Attempt to remove an uncasted user from the internal list of %s!",name);
 }
 
 void chanrec::AddHalfoppedUser(char* castuser)
@@ -209,7 +211,6 @@ void chanrec::DelHalfoppedUser(char* castuser)
                 internal_halfop_userlist.erase(a);
                 return; 
         }       
-        log(DEBUG,"BUG BUG BUG! Attempt to remove an uncasted user from the internal list of %s!",name);
 }
 
 void chanrec::AddVoicedUser(char* castuser)
@@ -218,7 +219,7 @@ void chanrec::AddVoicedUser(char* castuser)
         log(DEBUG,"Added casted user to channel's internal list");
 }
 
-void chanrec::DelOppedUser(char* castuser)
+void chanrec::DelVoicedUser(char* castuser)
 {
         std::map<char*,char*>::iterator a = internal_voice_userlist.find(castuser);
         if (a != internal_voice_userlist.end())
@@ -227,7 +228,6 @@ void chanrec::DelOppedUser(char* castuser)
                 internal_voice_userlist.erase(a);
                 return; 
         }       
-        log(DEBUG,"BUG BUG BUG! Attempt to remove an uncasted user from the internal list of %s!",name);
 }
 
 std::map<char*,char*> *chanrec::GetUsers()