Merge pull request #1 from meeb/meeb

[irc/quakenet/newserv.git] / chanserv / chanservschedule.c

diff --git a/chanserv/chanservschedule.c b/chanserv/chanservschedule.c
index fc44308e2387f6c1948b561aa666c2835ca9799e..26d24c8de010a8426ce0b7f33917822df62fe8c2 100644 (file)
--- a/chanserv/chanservschedule.c
+++ b/chanserv/chanservschedule.c
@@ -1,6 +1,7 @@
 #include "chanserv.h"
 #include "../lib/irc_string.h"
 #include "../core/schedule.h"
+#include "../glines/glines.h"
 
 void chanservdgline(void* arg) {
   reguser *rup=(reguser*)arg;
@@ -23,16 +24,15 @@ void chanservdgline(void* arg) {
     
     if (ucount >= MAXGLINEUSERS) {
       chanservwallmessage("Delayed GLINE \"*!%s@%s\" (account %s) would hit %d users, aborting.", 
-        nl->ident, IPtostr(nl->p_ipaddr), rup->username, ucount);
+        nl->ident, IPtostr(nl->ipaddress), rup->username, ucount);
     } else {
       char *reason = "Network abuse";
       if(rup->suspendreason)
         reason = rup->suspendreason->content;
 
-      irc_send("%s GL * +*!%s@%s 3600 :%s\r\n", mynumeric->content, nl->ident, 
-        IPtostr(nl->p_ipaddr), reason);
+      glinebynick(nl, 3600, reason, 0, "chanserv");
       chanservwallmessage("Delayed GLINE \"*!%s@%s\" (authed as %s) expires in 60 minute/s (hit %d user%s) (reason: %s)", 
-        nl->ident, IPtostr(nl->p_ipaddr), rup->username, ucount, ucount==1?"":"s", reason);
+        nl->ident, IPtostr(nl->ipaddress), rup->username, ucount, ucount==1?"":"s", reason);
     }
   }
 }