*** VERSION 5.2.0 ***

[NeonServV5.git] / src / cmd_neonserv_kickban.c

diff --git a/src/cmd_neonserv_kickban.c b/src/cmd_neonserv_kickban.c
index 9d750c07037b793abc8f546ba94977a406d6462c..9010e7c7a191dc6f4bd3b313e14fda2c2e6e5db4 100644 (file)
--- a/src/cmd_neonserv_kickban.c
+++ b/src/cmd_neonserv_kickban.c
@@ -1,4 +1,4 @@
-/* cmd_neonserv_kickban.c - NeonServ v5.1
+/* cmd_neonserv_kickban.c - NeonServ v5.2
  * Copyright (C) 2011  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -86,6 +86,10 @@ static void neonserv_cmd_kickban_async1(struct ClientSocket *client, struct Clie
                         reply(textclient, user, "NS_SERVICE_IMMUNE", chanuser->user->nick);
                         continue;
                     }
+                    if(cuser == user || ((cuser->flags & USERFLAG_ISAUTHED) && !stricmp(user->auth, cuser->auth))) {
+                        reply(textclient, user, "NS_YOU_PROTECTED");
+                        continue;
+                    }
                     if(isUserProtected(chan, cuser, user)) {
                         reply(textclient, user, "NS_USER_PROTECTED", cuser->nick);
                         continue;
@@ -109,6 +113,10 @@ static void neonserv_cmd_kickban_async1(struct ClientSocket *client, struct Clie
             //KICK AUTH
             nick++;
             cuser = NULL;
+            if(!stricmp(user->auth, nick)) {
+                reply(textclient, user, "NS_YOU_PROTECTED");
+                continue;
+            }
             for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = getChannelUsers(chan, chanuser)) {
                 if((chanuser->user->flags & USERFLAG_ISAUTHED) && !stricmp(chanuser->user->auth, nick)) {
                     provided_nicks++;
@@ -139,6 +147,10 @@ static void neonserv_cmd_kickban_async1(struct ClientSocket *client, struct Clie
                 reply(textclient, user, "NS_SERVICE_IMMUNE", cuser->nick);
                 continue;
             }
+            if(cuser == user || ((cuser->flags & USERFLAG_ISAUTHED) && !stricmp(user->auth, cuser->auth))) {
+                reply(textclient, user, "NS_YOU_PROTECTED");
+                continue;
+            }
             if(isUserProtected(chan, cuser, user)) {
                 reply(textclient, user, "NS_USER_PROTECTED", cuser->nick);
                 continue;