X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/212380e3f42f585dc1ea927402252eb943f91f7b..82f8e812f5f3df9a23b58dff2024f83237280b9d:/modules/core/m_kick.c

diff --git a/modules/core/m_kick.c b/modules/core/m_kick.c
index d475aaf..368c715 100644
--- a/modules/core/m_kick.c
+++ b/modules/core/m_kick.c
@@ -21,14 +21,13 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_kick.c 258 2005-09-21 23:57:17Z nenolod $
+ *  $Id: m_kick.c 3317 2007-03-28 23:17:06Z jilles $
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
@@ -38,6 +37,7 @@
 #include "hash.h"
 #include "packet.h"
 #include "s_serv.h"
+#include "hook.h"
 
 static int m_kick(struct Client *, struct Client *, int, const char **);
 #define mg_kick { m_kick, 3 }
@@ -49,11 +49,10 @@ struct Message kick_msgtab = {
 
 mapi_clist_av1 kick_clist[] = { &kick_msgtab, NULL };
 
-DECLARE_MODULE_AV1(kick, NULL, NULL, kick_clist, NULL, NULL, "$Revision: 258 $");
+DECLARE_MODULE_AV1(kick, NULL, NULL, kick_clist, NULL, NULL, "$Revision: 3317 $");
 
 /*
 ** m_kick
-**      parv[0] = sender prefix
 **      parv[1] = channel
 **      parv[2] = client to kick
 **      parv[3] = kick comment
@@ -74,10 +73,6 @@ m_kick(struct Client *client_p, struct Client *source_p, int parc, const char *p
 	if(MyClient(source_p) && !IsFloodDone(source_p))
 		flood_endgrace(source_p);
 
-	comment = LOCAL_COPY((EmptyString(parv[3])) ? parv[2] : parv[3]);
-	if(strlen(comment) > (size_t) REASONLEN)
-		comment[REASONLEN] = '\0';
-
 	*buf = '\0';
 	if((p = strchr(parv[1], ',')))
 		*p = '\0';
@@ -102,7 +97,7 @@ m_kick(struct Client *client_p, struct Client *source_p, int parc, const char *p
 			return 0;
 		}
 
-		if(!is_chanop(msptr))
+		if(!can_kick_deop(msptr, find_channel_membership(chptr, client_p)) && !IsOverride(source_p))
 		{
 			if(MyConnect(source_p))
 			{
@@ -163,6 +158,33 @@ m_kick(struct Client *client_p, struct Client *source_p, int parc, const char *p
 			return 0;
 		}
 
+		if(MyClient(source_p) && chptr->mode.mode & MODE_NOKICK)
+		{
+			sendto_one_numeric(source_p, ERR_NOKICK,
+					form_str(ERR_NOKICK),
+					chptr->chname);
+			return 0;
+		}
+
+		if(MyClient(source_p))
+		{
+			hook_data_channel_approval hookdata;
+
+			hookdata.client = source_p;
+			hookdata.chptr = chptr;
+			hookdata.target = who;
+			hookdata.approved = 1;
+
+			call_hook(h_can_kick, &hookdata);
+
+			if (!hookdata.approved)
+				return 0;
+		}
+
+		comment = LOCAL_COPY((EmptyString(parv[3])) ? who->name : parv[3]);
+		if(strlen(comment) > (size_t) REASONLEN)
+			comment[REASONLEN] = '\0';
+
 		/* jdc
 		 * - In the case of a server kicking a user (i.e. CLEARCHAN),
 		 *   the kick should show up as coming from the server which did
@@ -182,9 +204,6 @@ m_kick(struct Client *client_p, struct Client *source_p, int parc, const char *p
 		sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
 			      ":%s KICK %s %s :%s",
 			      use_id(source_p), chptr->chname, use_id(who), comment);
-		sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
-			      ":%s KICK %s %s :%s",
-			      source_p->name, chptr->chname, who->name, comment);
 		remove_user_from_channel(msptr);
 	}
 	else if (MyClient(source_p))