From 208219f8ec1ac99476c36d84401b8d6086ea68b8 Mon Sep 17 00:00:00 2001
From: "geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b"
 <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
Date: Sat, 21 Apr 2007 12:28:49 +0000
Subject: [PATCH] BUILD : 1.7.18 (1240) BUGS : 706 NOTES : Fixed
 EVENT_ACCESS_DEL nog being sent on each delete when mass-deleting in cs_xop

git-svn-id: svn://svn.anope.org/anope/trunk@1240 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@959 5417fbe8-f217-4b02-8779-1006273d7864
---
 Changes           | 1 +
 src/core/cs_xop.c | 5 +++--
 version.log       | 6 +++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Changes b/Changes
index edcb1ac57..f471f767f 100644
--- a/Changes
+++ b/Changes
@@ -19,6 +19,7 @@ Anope Version  S V N
 03/18 F DefCon's AKILL will now honor the server's sync flag.             [#643]
 03/18 F Password length checking in some cases was out.                   [ #00]
 04/21 F DefCon did not force DefCon modes while in DefCon mode.           [#661]
+04/21 F Event ACCESS_DEL not sent on mass-deleted in cs_xop.              [#706]
 
 Provided by Jan Milants <jan_renee@msn.com> - 2007
 04/21 F Array count decremention in the ChanServ access lists.            [#662]
diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c
index e86d8df23..53f264c38 100644
--- a/src/core/cs_xop.c
+++ b/src/core/cs_xop.c
@@ -172,7 +172,7 @@ int do_vop(User * u)
  * `perm' is incremented whenever a permission-denied error occurs
  */
 
-int xop_del(User * u, ChanAccess * access, int *perm, int uacc, int xlev)
+int xop_del(User * u, ChannelInfo * ci, ChanAccess * access, int *perm, int uacc, int xlev)
 {
     if (!access->in_use || access->level != xlev)
         return 0;
@@ -180,6 +180,7 @@ int xop_del(User * u, ChanAccess * access, int *perm, int uacc, int xlev)
         (*perm)++;
         return 0;
     }
+    send_event(EVENT_ACCESS_DEL, 3, ci->name, u->nick, access->nc->display);
     access->nc = NULL;
     access->in_use = 0;
     return 1;
@@ -197,7 +198,7 @@ int xop_del_callback(User * u, int num, va_list args)
         return 0;
     *last = num;
 
-    return xop_del(u, &ci->access[num - 1], perm, uacc, xlev);
+    return xop_del(u, ci, &ci->access[num - 1], perm, uacc, xlev);
 }
 
 
diff --git a/version.log b/version.log
index c58af423a..49a0f2746 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="18"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="1239"
+VERSION_BUILD="1240"
 
 # $Log$
 #
+# BUILD : 1.7.18 (1240)
+# BUGS  : 706
+# NOTES : Fixed EVENT_ACCESS_DEL nog being sent on each delete when mass-deleting in cs_xop
+#
 # BUILD : 1.7.18 (1239)
 # BUGS  : 705
 # NOTES : Applied patch by Jan Milants to fix the swapped ACCESS_ADD and ACCESS_CHANGED events in cs_xop