Merge pull request #1 from meeb/meeb

[irc/quakenet/newserv.git] / helpmod2 / hhooks.c

diff --git a/helpmod2/hhooks.c b/helpmod2/hhooks.c
index 7971c7eed3e0592c9091aaf077e259f8f468b39e..546e1ceafa3e88ab0685effc5050b3dab8c3e7bf 100644 (file)
--- 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"
@@ -55,7 +52,7 @@ static void helpmod_hook_join(int unused, void *args)
        else
            hchan->jf_control++;
 
-       if (hchan->jf_control - time(NULL) > 20 && !IsRegOnly(hchan))
+       if (hchan->jf_control - time(NULL) > 12 && !IsRegOnly(hchan))
        {
            if (hchan->flags & H_REPORT && hchannel_is_valid(hchan->report_to))
                helpmod_message_channel(hchan->report_to, "Warning: Possible join flood on %s, setting +r", hchannel_get_name(hchan));
@@ -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 */