]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/channels.cpp
Decide that it wasn't quite appropriate :(
[user/henk/code/inspircd.git] / src / channels.cpp
index 4ff1e6aa1469b5049e93050be03f06379ae02541..fc6c90b5d7eeb89e1729a6d6a0b61dedbda504a2 100644 (file)
@@ -1,15 +1,15 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*   +------------------------------------+
+ *   | Inspire Internet Relay Chat Daemon |
+ *   +------------------------------------+
  *
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
+ *   E-mail:
+ *       <brain@chatspike.net>
+ *       <Craig@chatspike.net>
+ * 
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *     the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -66,7 +66,7 @@ extern chan_hash chanlist;
 
 using namespace std;
 
-std::vector<ModeParameter> custom_mode_params;
+//std::vector<ModeParameter> custom_mode_params;
 
 chanrec* ForceChan(chanrec* Ptr,ucrec &a,userrec* user, int created);
 
@@ -79,7 +79,8 @@ chanrec::chanrec()
 
 void chanrec::SetCustomMode(char mode,bool mode_on)
 {
-       if (mode_on) {
+       if (mode_on)
+       {
                static char m[3];
                m[0] = mode;
                m[1] = '\0';
@@ -181,53 +182,53 @@ void chanrec::DelUser(char* castuser)
 
 void chanrec::AddOppedUser(char* castuser)
 {
-        internal_op_userlist[castuser] = castuser;
-        log(DEBUG,"Added casted user to channel's internal list");
+       internal_op_userlist[castuser] = castuser;
+       log(DEBUG,"Added casted user to channel's internal list");
 }
 
 void chanrec::DelOppedUser(char* castuser)
 {
-        std::map<char*,char*>::iterator a = internal_op_userlist.find(castuser);
-        if (a != internal_op_userlist.end())
-        {
-                log(DEBUG,"Removed casted user from channel's internal list");
-                internal_op_userlist.erase(a);
-                return;
-        }
+       std::map<char*,char*>::iterator a = internal_op_userlist.find(castuser);
+       if (a != internal_op_userlist.end())
+       {
+               log(DEBUG,"Removed casted user from channel's internal list");
+               internal_op_userlist.erase(a);
+               return;
+       }
 }
 
 void chanrec::AddHalfoppedUser(char* castuser)
 {
-        internal_halfop_userlist[castuser] = castuser;
-        log(DEBUG,"Added casted user to channel's internal list");
+       internal_halfop_userlist[castuser] = castuser;
+       log(DEBUG,"Added casted user to channel's internal list");
 }
 
 void chanrec::DelHalfoppedUser(char* castuser)
 {
-        std::map<char*,char*>::iterator a = internal_halfop_userlist.find(castuser);
-        if (a != internal_halfop_userlist.end())
-        {       
-                log(DEBUG,"Removed casted user from channel's internal list");
-                internal_halfop_userlist.erase(a);
-                return; 
-        }       
+       std::map<char*,char*>::iterator a = internal_halfop_userlist.find(castuser);
+       if (a != internal_halfop_userlist.end())
+       {   
+               log(DEBUG,"Removed casted user from channel's internal list");
+               internal_halfop_userlist.erase(a);
+               return; 
+       }
 }
 
 void chanrec::AddVoicedUser(char* castuser)
 {
-        internal_voice_userlist[castuser] = castuser;
-        log(DEBUG,"Added casted user to channel's internal list");
+       internal_voice_userlist[castuser] = castuser;
+       log(DEBUG,"Added casted user to channel's internal list");
 }
 
 void chanrec::DelVoicedUser(char* castuser)
 {
-        std::map<char*,char*>::iterator a = internal_voice_userlist.find(castuser);
-        if (a != internal_voice_userlist.end())
-        {       
-                log(DEBUG,"Removed casted user from channel's internal list");
-                internal_voice_userlist.erase(a);
-                return; 
-        }       
+       std::map<char*,char*>::iterator a = internal_voice_userlist.find(castuser);
+       if (a != internal_voice_userlist.end())
+       {
+               log(DEBUG,"Removed casted user from channel's internal list");
+               internal_voice_userlist.erase(a);
+               return; 
+       }
 }
 
 std::map<char*,char*> *chanrec::GetUsers()
@@ -237,288 +238,324 @@ std::map<char*,char*> *chanrec::GetUsers()
 
 std::map<char*,char*> *chanrec::GetOppedUsers()
 {
-               return &internal_op_userlist;
+       return &internal_op_userlist;
 }
 
 std::map<char*,char*> *chanrec::GetHalfoppedUsers()
 {
-               return &internal_halfop_userlist;
+       return &internal_halfop_userlist;
 }
 
 std::map<char*,char*> *chanrec::GetVoicedUsers()
 {
-               return &internal_voice_userlist;
+       return &internal_voice_userlist;
 }
 
-/* add a channel to a user, creating the record for it if needed and linking
- * it to the user record */
+/* 
+ * add a channel to a user, creating the record for it if needed and linking
+ * it to the user record 
+ */
 
 chanrec* add_channel(userrec *user, const char* cn, const char* key, bool override)
 {
-        if ((!user) || (!cn))
-        {
-                log(DEFAULT,"*** BUG *** add_channel was given an invalid parameter");
-                return 0;
-        }
-
-        int created = 0;
-        char cname[MAXBUF];
-        int MOD_RESULT = 0;
-        strlcpy(cname,cn,CHANMAX);
+       if ((!user) || (!cn))
+       {
+               log(DEFAULT,"*** BUG *** add_channel was given an invalid parameter");
+               return 0;
+       }
+
+       int created = 0;
+       char cname[MAXBUF];
+       int MOD_RESULT = 0;
+       strlcpy(cname,cn,CHANMAX);
        log(DEBUG,"cname='%s' cn='%s'",cname,cn);
 
-        log(DEBUG,"add_channel: %s %s",user->nick,cname);
-
-        chanrec* Ptr = FindChan(cname);
-
-        if (!Ptr)
-        {
-                if (user->fd > -1)
-                {
-                        MOD_RESULT = 0;
-                        FOREACH_RESULT(I_OnUserPreJoin,OnUserPreJoin(user,NULL,cname));
-                        if (MOD_RESULT == 1)
-                                return NULL;
-                }
-                /* create a new one */
-                chanlist[cname] = new chanrec();
-                strlcpy(chanlist[cname]->name, cname,CHANMAX);
-                chanlist[cname]->binarymodes = CM_TOPICLOCK | CM_NOEXTERNAL;
-                chanlist[cname]->created = TIME;
-                *chanlist[cname]->topic = 0;
-                strlcpy(chanlist[cname]->setby, user->nick,NICKMAX);
-                chanlist[cname]->topicset = 0;
-                Ptr = chanlist[cname];
-                log(DEBUG,"add_channel: created: %s",cname);
-                /* set created to 2 to indicate user
-                 * is the first in the channel
-                 * and should be given ops */
-                created = 2;
-        }
-        else
-        {
-                /* Already on the channel */
-                if (has_channel(user,Ptr))
-                        return NULL;
-
-                // remote users are allowed us to bypass channel modes
-                // and bans (used by servers)
-                if (user->fd > -1)
-                {
-                        MOD_RESULT = 0;
-                        FOREACH_RESULT(I_OnUserPreJoin,OnUserPreJoin(user,Ptr,cname));
-                        if (MOD_RESULT == 1)
-                        {
-                                return NULL;
-                        }
-                        else if (MOD_RESULT == 0)
-                        {
-                                if (*Ptr->key)
-                                {
-                                        MOD_RESULT = 0;
-                                        FOREACH_RESULT(I_OnCheckKey,OnCheckKey(user, Ptr, key ? key : ""));
-                                        if (!MOD_RESULT)
-                                        {
-                                                if (!key)
-                                                {
-                                                        log(DEBUG,"add_channel: no key given in JOIN");
-                                                        WriteServ(user->fd,"475 %s %s :Cannot join channel (Requires key)",user->nick, Ptr->name);
-                                                        return NULL;
-                                                }
-                                                else
-                                                {
-                                                        if (strcasecmp(key,Ptr->key))
-                                                        {
-                                                                log(DEBUG,"add_channel: bad key given in JOIN");
-                                                                WriteServ(user->fd,"475 %s %s :Cannot join channel (Incorrect key)",user->nick, Ptr->name);
-                                                                return NULL;
-                                                        }
-                                                }
-                                        }
-                                }
-                                if (Ptr->binarymodes & CM_INVITEONLY)
-                                {
+       log(DEBUG,"add_channel: %s %s",user->nick,cname);
+
+       chanrec* Ptr = FindChan(cname);
+
+       if (!Ptr)
+       {
+               if (user->fd > -1)
+               {
+                       MOD_RESULT = 0;
+                       FOREACH_RESULT(I_OnUserPreJoin,OnUserPreJoin(user,NULL,cname));
+                       if (MOD_RESULT == 1)
+                               return NULL;
+               }
+
+               /* create a new one */
+               chanlist[cname] = new chanrec();
+               strlcpy(chanlist[cname]->name, cname,CHANMAX);
+               chanlist[cname]->binarymodes = CM_TOPICLOCK | CM_NOEXTERNAL;
+               chanlist[cname]->created = TIME;
+               *chanlist[cname]->topic = 0;
+               strlcpy(chanlist[cname]->setby, user->nick,NICKMAX-1);
+               chanlist[cname]->topicset = 0;
+               Ptr = chanlist[cname];
+               log(DEBUG,"add_channel: created: %s",cname);
+               /*
+                * set created to 2 to indicate user
+                * is the first in the channel
+                * and should be given ops
+                */
+               created = 2;
+       }
+       else
+       {
+               /* Already on the channel */
+               if (has_channel(user,Ptr))
+                       return NULL;
+
+               /*
+                * remote users are allowed us to bypass channel modes
+                * and bans (used by servers)
+                */
+               if (IS_LOCAL(user)) /* was a check on fd > -1 */
+               {
+                       MOD_RESULT = 0;
+                       FOREACH_RESULT(I_OnUserPreJoin,OnUserPreJoin(user,Ptr,cname));
+                       if (MOD_RESULT == 1)
+                       {
+                               return NULL;
+                       }
+                       else if (MOD_RESULT == 0)
+                       {
+                               if (*Ptr->key)
+                               {
+                                       MOD_RESULT = 0;
+                                       FOREACH_RESULT(I_OnCheckKey,OnCheckKey(user, Ptr, key ? key : ""));
+                                       if (!MOD_RESULT)
+                                       {
+                                               if (!key)
+                                               {
+                                                       log(DEBUG,"add_channel: no key given in JOIN");
+                                                       WriteServ(user->fd,"475 %s %s :Cannot join channel (Requires key)",user->nick, Ptr->name);
+                                                       return NULL;
+                                               }
+                                               else
+                                               {
+                                                       if (strcmp(key,Ptr->key))
+                                                       {
+                                                               log(DEBUG,"add_channel: bad key given in JOIN");
+                                                               WriteServ(user->fd,"475 %s %s :Cannot join channel (Incorrect key)",user->nick, Ptr->name);
+                                                               return NULL;
+                                                       }
+                                               }
+                                       }
+                               }
+                               if (Ptr->binarymodes & CM_INVITEONLY)
+                               {
                                        MOD_RESULT = 0;
                                        irc::string xname(Ptr->name);
-                                        FOREACH_RESULT(I_OnCheckInvite,OnCheckInvite(user, Ptr));
-                                        if (!MOD_RESULT)
-                                        {
-                                                log(DEBUG,"add_channel: channel is +i");
-                                                if (user->IsInvited(xname))
-                                                {
-                                                        /* user was invited to channel */
-                                                        /* there may be an optional channel NOTICE here */
-                                                }
-                                                else
-                                                {
-                                                        WriteServ(user->fd,"473 %s %s :Cannot join channel (Invite only)",user->nick, Ptr->name);
-                                                        return NULL;
-                                                }
-                                        }
-                                        user->RemoveInvite(xname);
-                                }
-                                if (Ptr->limit)
-                                {
-                                        MOD_RESULT = 0;
-                                        FOREACH_RESULT(I_OnCheckLimit,OnCheckLimit(user, Ptr));
-                                        if (!MOD_RESULT)
-                                        {
-                                                if (usercount(Ptr) >= Ptr->limit)
-                                                {
-                                                        WriteServ(user->fd,"471 %s %s :Cannot join channel (Channel is full)",user->nick, Ptr->name);
-                                                        return NULL;
-                                                }
-                                        }
-                                }
-                                if (Ptr->bans.size())
-                                {
-                                        log(DEBUG,"add_channel: about to walk banlist");
-                                        MOD_RESULT = 0;
-                                        FOREACH_RESULT(I_OnCheckBan,OnCheckBan(user, Ptr));
-                                        if (!MOD_RESULT)
-                                        {
-                                                for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->bans.end(); i++)
-                                                {
-                                                        if ((match(user->GetFullHost(),i->data)) || (match(user->GetFullRealHost(),i->data)) || (match((char*)inet_ntoa(user->ip4),i->data)))
-                                                        {
-                                                                WriteServ(user->fd,"474 %s %s :Cannot join channel (You're banned)",user->nick, Ptr->name);
-                                                                return NULL;
-                                                        }
-                                                }
-                                        }
-                                }
-                        }
-                }
-                else
-                {
-                        log(DEBUG,"Overridden checks");
-                }
-                created = 1;
-        }
-
-        log(DEBUG,"Passed channel checks");
-
-        for (unsigned int index =0; index < user->chans.size(); index++)
-        {
-                if (user->chans[index].channel == NULL)
-                {
-                        return ForceChan(Ptr,user->chans[index],user,created);
-                }
-        }
-        /* XXX: If the user is an oper here, we can just extend their user->chans vector by one
-         * and put the channel in here. Same for remote users which are not bound by
-         * the channel limits. Otherwise, nope, youre boned.
-         */
-        if (user->fd < 0)
-        {
-                ucrec a;
-                chanrec* c = ForceChan(Ptr,a,user,created);
-                user->chans.push_back(a);
-                return c;
-        }
-        else if (strchr(user->modes,'o'))
-        {
-                /* Oper allows extension up to the OPERMAXCHANS value */
-                if (user->chans.size() < OPERMAXCHANS)
-                {
-                        ucrec a;
-                        chanrec* c = ForceChan(Ptr,a,user,created);
-                        user->chans.push_back(a);
-                        return c;
-                }
-        }
-        log(DEBUG,"add_channel: user channel max exceeded: %s %s",user->nick,cname);
-        WriteServ(user->fd,"405 %s %s :You are on too many channels",user->nick, cname);
-        return NULL;
+                                       FOREACH_RESULT(I_OnCheckInvite,OnCheckInvite(user, Ptr));
+                                       if (!MOD_RESULT)
+                                       {
+                                               log(DEBUG,"add_channel: channel is +i");
+                                               if (user->IsInvited(xname))
+                                               {
+                                                       /* user was invited to channel */
+                                                       /* there may be an optional channel NOTICE here */
+                                               }
+                                               else
+                                               {
+                                                       WriteServ(user->fd,"473 %s %s :Cannot join channel (Invite only)",user->nick, Ptr->name);
+                                                       return NULL;
+                                               }
+                                       }
+                                       user->RemoveInvite(xname);
+                               }
+                               if (Ptr->limit)
+                               {
+                                       MOD_RESULT = 0;
+                                       FOREACH_RESULT(I_OnCheckLimit,OnCheckLimit(user, Ptr));
+                                       if (!MOD_RESULT)
+                                       {
+                                               if (usercount(Ptr) >= Ptr->limit)
+                                               {
+                                                       WriteServ(user->fd,"471 %s %s :Cannot join channel (Channel is full)",user->nick, Ptr->name);
+                                                       return NULL;
+                                               }
+                                       }
+                               }
+                               if (Ptr->bans.size())
+                               {
+                                       log(DEBUG,"add_channel: about to walk banlist");
+                                       MOD_RESULT = 0;
+                                       FOREACH_RESULT(I_OnCheckBan,OnCheckBan(user, Ptr));
+                                       if (!MOD_RESULT)
+                                       {
+                                               for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->bans.end(); i++)
+                                               {
+                                                       if ((match(user->GetFullHost(),i->data)) || (match(user->GetFullRealHost(),i->data)) || (match((char*)inet_ntoa(user->ip4),i->data)))
+                                                       {
+                                                               WriteServ(user->fd,"474 %s %s :Cannot join channel (You're banned)",user->nick, Ptr->name);
+                                                               return NULL;
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+               }
+               else
+               {
+                       log(DEBUG,"Overridden checks");
+               }
+               created = 1;
+       }
+
+       log(DEBUG,"Passed channel checks");
+
+       for (unsigned int index =0; index < user->chans.size(); index++)
+       {
+               if (user->chans[index].channel == NULL)
+               {
+                       return ForceChan(Ptr,user->chans[index],user,created);
+               }
+       }
+
+       /*
+        * XXX: If the user is an oper here, we can just extend their user->chans vector by one
+        * and put the channel in here. Same for remote users which are not bound by
+        * the channel limits. Otherwise, nope, youre boned.
+        */
+       if (!IS_LOCAL(user)) /* was a check on fd < 0 */
+       {
+               ucrec a;
+               chanrec* c = ForceChan(Ptr,a,user,created);
+               user->chans.push_back(a);
+               return c;
+       }
+       else if (*user->oper)
+       {
+               /* Oper allows extension up to the OPERMAXCHANS value */
+               if (user->chans.size() < OPERMAXCHANS)
+               {
+                       ucrec a;
+                       chanrec* c = ForceChan(Ptr,a,user,created);
+                       user->chans.push_back(a);
+                       return c;
+               }
+       }
+
+       log(DEBUG,"add_channel: user channel max exceeded: %s %s",user->nick,cname);
+       WriteServ(user->fd,"405 %s %s :You are on too many channels",user->nick, cname);
+
+       if (created == 2)
+       {
+               log(DEBUG,"BLAMMO, Whacking channel.");
+               /* Things went seriously pear shaped, so take this away. bwahaha. */
+               chan_hash::iterator n = chanlist.find(cname);
+               if (n != chanlist.end())
+               {
+                       Ptr->DelUser((char*)user);
+                       delete Ptr;
+                       chanlist.erase(n);
+                       for (unsigned int index =0; index < user->chans.size(); index++)
+                       {
+                               if (user->chans[index].channel == Ptr)
+                               {
+                                       user->chans[index].channel == NULL;
+                                       user->chans[index].uc_modes = 0;        
+                               }
+                       }
+               }
+       }
+       return NULL;
 }
 
 chanrec* ForceChan(chanrec* Ptr,ucrec &a,userrec* user, int created)
 {
-        if (created == 2)
-        {
-                /* first user in is given ops */
-                a.uc_modes = UCMODE_OP;
+       if (created == 2)
+       {
+               /* first user in is given ops */
+               a.uc_modes = UCMODE_OP;
                Ptr->AddOppedUser((char*)user);
-        }
-        else
-        {
-                a.uc_modes = 0;
-        }
-        a.channel = Ptr;
-        Ptr->AddUser((char*)user);
-        WriteChannel(Ptr,user,"JOIN :%s",Ptr->name);
-        log(DEBUG,"Sent JOIN to client");
-        if (Ptr->topicset)
-        {
-                WriteServ(user->fd,"332 %s %s :%s", user->nick, Ptr->name, Ptr->topic);
-                WriteServ(user->fd,"333 %s %s %s %lu", user->nick, Ptr->name, Ptr->setby, (unsigned long)Ptr->topicset);
-        }
-        userlist(user,Ptr);
-        WriteServ(user->fd,"366 %s %s :End of /NAMES list.", user->nick, Ptr->name);
-        FOREACH_MOD(I_OnUserJoin,OnUserJoin(user,Ptr));
-        return Ptr;
+       }
+       else
+       {
+               a.uc_modes = 0;
+       }
+
+       a.channel = Ptr;
+       Ptr->AddUser((char*)user);
+       WriteChannel(Ptr,user,"JOIN :%s",Ptr->name);
+       log(DEBUG,"Sent JOIN to client");
+
+       if (Ptr->topicset)
+       {
+               WriteServ(user->fd,"332 %s %s :%s", user->nick, Ptr->name, Ptr->topic);
+               WriteServ(user->fd,"333 %s %s %s %lu", user->nick, Ptr->name, Ptr->setby, (unsigned long)Ptr->topicset);
+       }
+
+       userlist(user,Ptr);
+       WriteServ(user->fd,"366 %s %s :End of /NAMES list.", user->nick, Ptr->name);
+       FOREACH_MOD(I_OnUserJoin,OnUserJoin(user,Ptr));
+       return Ptr;
 }
 
-/* remove a channel from a users record, and remove the record from memory
- * if the channel has become empty */
+/*
+ *remove a channel from a users record, and remove the record from memory
+ * if the channel has become empty
+ */
 
 chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool local)
 {
-        if ((!user) || (!cname))
-        {
-                log(DEFAULT,"*** BUG *** del_channel was given an invalid parameter");
-                return NULL;
-        }
-
-        chanrec* Ptr = FindChan(cname);
-
-        if (!Ptr)
-                return NULL;
-
-        log(DEBUG,"del_channel: removing: %s %s",user->nick,Ptr->name);
-
-        for (unsigned int i =0; i < user->chans.size(); i++)
-        {
-                /* zap it from the channel list of the user */
-                if (user->chans[i].channel == Ptr)
-                {
-                        if (reason)
-                        {
+       if ((!user) || (!cname))
+       {
+               log(DEFAULT,"*** BUG *** del_channel was given an invalid parameter");
+               return NULL;
+       }
+
+       chanrec* Ptr = FindChan(cname);
+
+       if (!Ptr)
+               return NULL;
+
+       log(DEBUG,"del_channel: removing: %s %s",user->nick,Ptr->name);
+
+       for (unsigned int i =0; i < user->chans.size(); i++)
+       {
+               /* zap it from the channel list of the user */
+               if (user->chans[i].channel == Ptr)
+               {
+                       if (reason)
+                       {
                                FOREACH_MOD(I_OnUserPart,OnUserPart(user,Ptr,reason));
-                                WriteChannel(Ptr,user,"PART %s :%s",Ptr->name, reason);
-                        }
-                        else
-                        {
+                               WriteChannel(Ptr,user,"PART %s :%s",Ptr->name, reason);
+                       }
+                       else
+                       {
                                FOREACH_MOD(I_OnUserPart,OnUserPart(user,Ptr,""));
-                                WriteChannel(Ptr,user,"PART :%s",Ptr->name);
-                        }
-                        user->chans[i].uc_modes = 0;
-                        user->chans[i].channel = NULL;
-                        log(DEBUG,"del_channel: unlinked: %s %s",user->nick,Ptr->name);
-                        break;
-                }
-        }
-
-        Ptr->DelUser((char*)user);
-
-        /* if there are no users left on the channel */
-        if (!usercount(Ptr))
-        {
-                chan_hash::iterator iter = chanlist.find(Ptr->name);
-
-                log(DEBUG,"del_channel: destroying channel: %s",Ptr->name);
-
-                /* kill the record */
-                if (iter != chanlist.end())
-                {
-                        log(DEBUG,"del_channel: destroyed: %s",Ptr->name);
+                               WriteChannel(Ptr,user,"PART :%s",Ptr->name);
+                       }
+                       user->chans[i].uc_modes = 0;
+                       user->chans[i].channel = NULL;
+                       log(DEBUG,"del_channel: unlinked: %s %s",user->nick,Ptr->name);
+                       break;
+               }
+       }
+
+       Ptr->DelUser((char*)user);
+
+       /* if there are no users left on the channel */
+       if (!usercount(Ptr))
+       {
+               chan_hash::iterator iter = chanlist.find(Ptr->name);
+
+               log(DEBUG,"del_channel: destroying channel: %s",Ptr->name);
+
+               /* kill the record */
+               if (iter != chanlist.end())
+               {
+                       log(DEBUG,"del_channel: destroyed: %s",Ptr->name);
                        FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(Ptr));
-                        delete Ptr;
-                        chanlist.erase(iter);
-                }
-        }
+                       delete Ptr;
+                       chanlist.erase(iter);
+               }
+       }
 
-        return NULL;
+       return NULL;
 }
 
 void server_kick_channel(userrec* user, chanrec* Ptr, char* reason, bool triggerevents)
@@ -556,39 +593,39 @@ void server_kick_channel(userrec* user, chanrec* Ptr, char* reason, bool trigger
 
        Ptr->DelUser((char*)user);
 
-        if (!usercount(Ptr))
-        {
-                chan_hash::iterator iter = chanlist.find(Ptr->name);
-                log(DEBUG,"del_channel: destroying channel: %s",Ptr->name);
-                /* kill the record */
-                if (iter != chanlist.end())
-                {
-                        log(DEBUG,"del_channel: destroyed: %s",Ptr->name);
-                               FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(Ptr));
-                        delete Ptr;
-                        chanlist.erase(iter);
-                }
-        }
+       if (!usercount(Ptr))
+       {
+               chan_hash::iterator iter = chanlist.find(Ptr->name);
+               log(DEBUG,"del_channel: destroying channel: %s",Ptr->name);
+               /* kill the record */
+               if (iter != chanlist.end())
+               {
+                       log(DEBUG,"del_channel: destroyed: %s",Ptr->name);
+                       FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(Ptr));
+                       delete Ptr;
+                       chanlist.erase(iter);
+               }
+       }
 }
 
 void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason)
 {
-        if ((!src) || (!user) || (!Ptr) || (!reason))
-        {
-                log(DEFAULT,"*** BUG *** kick_channel was given an invalid parameter");
-                return;
-        }
+       if ((!src) || (!user) || (!Ptr) || (!reason))
+       {
+               log(DEFAULT,"*** BUG *** kick_channel was given an invalid parameter");
+               return;
+       }
 
-        log(DEBUG,"kick_channel: removing: %s %s %s",user->nick,Ptr->name,src->nick);
+       log(DEBUG,"kick_channel: removing: %s %s %s",user->nick,Ptr->name,src->nick);
 
        if (IS_LOCAL(src))
        {
-               if (!has_channel(user,Ptr))
-               {
-                       WriteServ(src->fd,"441 %s %s %s :They are not on that channel",src->nick, user->nick, Ptr->name);
-                       return;
-               }
-               int MOD_RESULT = 0;
+               if (!has_channel(user,Ptr))
+               {
+                       WriteServ(src->fd,"441 %s %s %s :They are not on that channel",src->nick, user->nick, Ptr->name);
+                       return;
+               }
+               int MOD_RESULT = 0;
 
                if (!is_uline(src->server))
                {
@@ -600,63 +637,65 @@ void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason)
                /* Set to -1 by OnUserPreKick if explicit allow was set */
                if (MOD_RESULT != -1)
                {
-                       FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(src,user,Ptr,AC_KICK));
-                       if ((MOD_RESULT == ACR_DENY) && (!is_uline(src->server)))
-                               return;
+                       FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(src,user,Ptr,AC_KICK));
+                       if ((MOD_RESULT == ACR_DENY) && (!is_uline(src->server)))
+                               return;
        
-                       if ((MOD_RESULT == ACR_DEFAULT) || (!is_uline(src->server)))
-                       {
-                                       if ((cstatus(src,Ptr) < STATUS_HOP) || (cstatus(src,Ptr) < cstatus(user,Ptr)))
-                               {
-                                       if (cstatus(src,Ptr) == STATUS_HOP)
-                                       {
-                                               WriteServ(src->fd,"482 %s %s :You must be a channel operator",src->nick, Ptr->name);
-                                       }
-                                       else
-                                       {
-                                               WriteServ(src->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",src->nick, Ptr->name);
-                                       }
+                       if ((MOD_RESULT == ACR_DEFAULT) || (!is_uline(src->server)))
+                       {
+                               if ((cstatus(src,Ptr) < STATUS_HOP) || (cstatus(src,Ptr) < cstatus(user,Ptr)))
+                               {
+                                       if (cstatus(src,Ptr) == STATUS_HOP)
+                                       {
+                                               WriteServ(src->fd,"482 %s %s :You must be a channel operator",src->nick, Ptr->name);
+                                       }
+                                       else
+                                       {
+                                               WriteServ(src->fd,"482 %s %s :You must be at least a half-operator",src->nick, Ptr->name);
+                                       }
                
-                                       return;
-                               }
-                       }
+                                       return;
+                               }
+                       }
                }
        }
 
-        FOREACH_MOD(I_OnUserKick,OnUserKick(src,user,Ptr,reason));
-
-        for (unsigned int i =0; i < user->chans.size(); i++)
-        {
-                /* zap it from the channel list of the user */
-                if (user->chans[i].channel)
-                if (!strcasecmp(user->chans[i].channel->name,Ptr->name))
-                {
-                        WriteChannel(Ptr,src,"KICK %s %s :%s",Ptr->name, user->nick, reason);
-                        user->chans[i].uc_modes = 0;
-                        user->chans[i].channel = NULL;
-                        log(DEBUG,"del_channel: unlinked: %s %s",user->nick,Ptr->name);
-                        break;
-                }
-        }
-
-        Ptr->DelUser((char*)user);
-
-        /* if there are no users left on the channel */
-        if (!usercount(Ptr))
-        {
-                chan_hash::iterator iter = chanlist.find(Ptr->name);
-
-                log(DEBUG,"del_channel: destroying channel: %s",Ptr->name);
-
-                /* kill the record */
-                if (iter != chanlist.end())
-                {
-                        log(DEBUG,"del_channel: destroyed: %s",Ptr->name);
+       FOREACH_MOD(I_OnUserKick,OnUserKick(src,user,Ptr,reason));
+
+       for (unsigned int i =0; i < user->chans.size(); i++)
+       {
+               /* zap it from the channel list of the user */
+               if (user->chans[i].channel)
+               {
+                       if (!strcasecmp(user->chans[i].channel->name,Ptr->name))
+                       {
+                               WriteChannel(Ptr,src,"KICK %s %s :%s",Ptr->name, user->nick, reason);
+                               user->chans[i].uc_modes = 0;
+                               user->chans[i].channel = NULL;
+                               log(DEBUG,"del_channel: unlinked: %s %s",user->nick,Ptr->name);
+                               break;
+                       }
+               }
+       }
+
+       Ptr->DelUser((char*)user);
+
+       /* if there are no users left on the channel */
+       if (!usercount(Ptr))
+       {
+               chan_hash::iterator iter = chanlist.find(Ptr->name);
+
+               log(DEBUG,"del_channel: destroying channel: %s",Ptr->name);
+
+               /* kill the record */
+               if (iter != chanlist.end())
+               {
+                       log(DEBUG,"del_channel: destroyed: %s",Ptr->name);
                        FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(Ptr));
-                        delete Ptr;
-                        chanlist.erase(iter);
-                }
-        }
+                       delete Ptr;
+                       chanlist.erase(iter);
+               }
+       }
 }