Fixes?

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

diff --git a/src/channels.cpp b/src/channels.cpp
index dc42ea651e71035f8fd63cd56bd38a8f734b7df1..03bb3cc796ccc0ae4b459a4344c3dd154f668cc9 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -57,17 +57,17 @@ chanrec::chanrec()
        memset(&modes,0,64);
 }
 
-void chanrec::SetCustomMode(char mode,bool mode_on)
+void chanrec::SetMode(char mode,bool mode_on)
 {
        modes[mode-65] = mode_on;
        if (!mode_on)
-               this->SetCustomModeParam(mode,"",false);
+               this->SetModeParam(mode,"",false);
 }
 
 
-void chanrec::SetCustomModeParam(char mode,char* parameter,bool mode_on)
+void chanrec::SetModeParam(char mode,const char* parameter,bool mode_on)
 {
-       log(DEBUG,"SetCustomModeParam called");
+       log(DEBUG,"SetModeParam called");
        
        CustomModeList::iterator n = custom_mode_params.find(mode);     
 
@@ -352,7 +352,7 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
                                        {
                                                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)))
+                                                       if ((match(user->GetFullHost(),i->data)) || (match(user->GetFullRealHost(),i->data)) || (match(user->GetIPString(),i->data)))
                                                        {
                                                                WriteServ(user->fd,"474 %s %s :Cannot join channel (You're banned)",user->nick, Ptr->name);
                                                                return NULL;
@@ -414,7 +414,7 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
                if (n != chanlist.end())
                {
                        Ptr->DelUser(user);
-                       delete Ptr;
+                       DELETE(Ptr);
                        chanlist.erase(n);
                        for (unsigned int index =0; index < user->chans.size(); index++)
                        {
@@ -426,6 +426,17 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
                        }
                }
        }
+       else
+       {
+               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;
 }
 
@@ -518,7 +529,7 @@ chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool
                {
                        log(DEBUG,"del_channel: destroyed: %s",Ptr->name);
                        FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(Ptr));
-                       delete Ptr;
+                       DELETE(Ptr);
                        chanlist.erase(iter);
                }
        }
@@ -568,8 +579,8 @@ void server_kick_channel(userrec* user, chanrec* Ptr, char* reason, bool trigger
                if (iter != chanlist.end())
                {
                        log(DEBUG,"del_channel: destroyed: %s",Ptr->name);
-                       FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(Ptr));
-                       delete Ptr;
+                       FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(Ptr));
+                       DELETE(Ptr);
                        chanlist.erase(iter);
                }
        }
@@ -592,6 +603,11 @@ void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason)
                        WriteServ(src->fd,"441 %s %s %s :They are not on that channel",src->nick, user->nick, Ptr->name);
                        return;
                }
+                if ((is_uline(user->server)) && (!is_uline(src->server)))
+               {
+                       WriteServ(src->fd,"482 %s %s :Only a u-line may kick a u-line from a channel.",src->nick, Ptr->name);
+                       return;
+               }
                int MOD_RESULT = 0;
 
                if (!is_uline(src->server))
@@ -654,7 +670,7 @@ void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason)
                {
                        log(DEBUG,"del_channel: destroyed: %s",Ptr->name);
                        FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(Ptr));
-                       delete Ptr;
+                       DELETE(Ptr);
                        chanlist.erase(iter);
                }
        }