Merge branch 'development'

[NeonServV5.git] / src / modules / NeonServ.mod / cmd_neonserv_kickban.c

diff --git a/src/modules/NeonServ.mod/cmd_neonserv_kickban.c b/src/modules/NeonServ.mod/cmd_neonserv_kickban.c
index 1123cd7b5a12dbb9d16f6f38c57f855184738202..a580764bbc1480da9536fded466bd8ee1d1e6898 100644 (file)
--- a/src/modules/NeonServ.mod/cmd_neonserv_kickban.c
+++ b/src/modules/NeonServ.mod/cmd_neonserv_kickban.c
@@ -1,4 +1,4 @@
-/* cmd_neonserv_kickban.c - NeonServ v5.3
+/* cmd_neonserv_kickban.c - NeonServ v5.6
  * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -35,11 +35,11 @@ struct neonserv_cmd_kickban_cache {
 CMD_BIND(neonserv_cmd_kickban) {
     struct neonserv_cmd_kickban_cache *cache = malloc(sizeof(*cache));
     if (!cache) {
-        perror("malloc() failed");
+        printf_log("neonserv", LOG_ERROR, "%s:%d malloc() failed", __FILE__, __LINE__);
         return;
     }
     cache->client = client;
-    cache->textclient = getTextBot();
+    cache->textclient = textclient;
     cache->user = user;
     cache->event = event;
     cache->nicks = strdup(argv[0]);
@@ -47,7 +47,7 @@ CMD_BIND(neonserv_cmd_kickban) {
         cache->reason = strdup(merge_argv(argv, 1, argc));
     } else
         cache->reason = NULL;
-    get_userlist_with_invisible(chan, neonserv_cmd_kickban_userlist_lookup, cache);
+    get_userlist_with_invisible(chan, module_id, neonserv_cmd_kickban_userlist_lookup, cache);
 }
 
 static USERLIST_CALLBACK(neonserv_cmd_kickban_userlist_lookup) {
@@ -161,9 +161,9 @@ static void neonserv_cmd_kickban_async1(struct ClientSocket *client, struct Clie
         }
     }
     if(kicked_users == provided_nicks)
-        reply(getTextBot(), user, "NS_KICKBAN_DONE", kicked_users, chan->name);
+        reply(textclient, user, "NS_KICKBAN_DONE", kicked_users, chan->name);
     else
-        reply(getTextBot(), user, "NS_KICKBAN_FAIL", client->user->nick);
+        reply(textclient, user, "NS_KICKBAN_FAIL", client->user->nick);
     if(kicked_users)
         logEvent(event);
 }