X-Git-Url: https://jfr.im/git/irc/quakenet/newserv.git/blobdiff_plain/bdf81368653500abb8a7672c7a0cc34b94e0bee6..78546f2b0f59b5c8fede1ce5535972716eb17041:/helpmod2/hhooks.c?ds=sidebyside

diff --git a/helpmod2/hhooks.c b/helpmod2/hhooks.c
index 2aa3fdc4..546e1cea 100644
--- a/helpmod2/hhooks.c
+++ b/helpmod2/hhooks.c
@@ -1,9 +1,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include "../core/hooks.h"
-#include "../localuser/localuser.h"
-
 #include "helpmod.h"
 #include "hchannel.h"
 #include "haccount.h"
@@ -130,7 +127,7 @@ static void helpmod_hook_channel_newnick(int unused, void *args)
 	helpmod_setban(hchan, banmask, time(NULL) + 1 * HDEF_d, MCB_ADD, HNOW);
 
 	if (hb)
-	    helpmod_kick(hchan, husr,hban_get_reason(hb));
+	    helpmod_kick(hchan, husr, "%s", hban_get_reason(hb));
 	else
 	    helpmod_kick(hchan, husr, "Your presence on channel %s is not wanted", hchannel_get_name(hchan));
 
@@ -340,20 +337,24 @@ static void helpmod_hook_nick_account(int unused, void *args)
 {
     nick *nck = (nick*)args;
     huser *husr = huser_get(nck);
+    huser_channel *huserchan, *huserchannext;
     if (husr == NULL)
         return;
     else
 	husr->account = haccount_get_by_name(nck->authname);
 
-    if (huser_get_level(husr) == H_LAMER)
-	while (husr->hchannels)
-	    helpmod_kick(husr->hchannels->hchan, husr, "Your presence on channel %s is not wanted", hchannel_get_name(husr->hchannels->hchan));
+    if (huser_get_level(husr) == H_LAMER) {
+        for (huserchan = husr->hchannels; huserchan; huserchan = huserchannext) {
+            huserchannext = huserchan->next;
+            helpmod_kick(huserchan->hchan, husr, "Your presence on channel %s is not wanted", hchannel_get_name(huserchan->hchan));
+        }
+    }
 }
 
 static void helpmod_hook_server_newserver(int unused, void *args)
 {
     hchannel *hchan;
-    int numeric = (int)args;
+    long numeric = (long)args;
     server srv = serverlist[numeric];
 
     /* check linkstate to prevent spam */