Did some renaming so that the methods for modes in chanrec and userrec are identical.

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

diff --git a/src/channels.cpp b/src/channels.cpp
index 61d82a451fa948a2ba67e6632ac62c3fb8ec6f6c..a25b2927c7ea0a3b7f196496adf00cde04ecba2d 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,char* parameter,bool mode_on)
 {
-       log(DEBUG,"SetCustomModeParam called");
+       log(DEBUG,"SetModeParam called");
        
        CustomModeList::iterator n = custom_mode_params.find(mode);     
 
@@ -603,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))