diff options
| author | Adam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864> | 2010-03-13 20:46:24 +0000 |
|---|---|---|
| committer | Adam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864> | 2010-03-13 20:46:24 +0000 |
| commit | 6cd3b56805ed03327f9abe5e5fcc616c9b12a2f9 (patch) | |
| tree | bc5a7a9d83da657b4e5a1d42453da7ad39b56abd | |
| parent | 27ad395a5631d8d050a9379c72d4f7d42e9d6e76 (diff) | |
Fixed bug #1139 - Delete the correct nicks from hs_request database when they are dropped
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2810 5417fbe8-f217-4b02-8779-1006273d7864
| -rw-r--r-- | src/modules/hs_request.c | 24 | ||||
| -rw-r--r-- | version.log | 3 |
2 files changed, 14 insertions, 13 deletions
diff --git a/src/modules/hs_request.c b/src/modules/hs_request.c index e8572b703..20dcaaf74 100644 --- a/src/modules/hs_request.c +++ b/src/modules/hs_request.c @@ -71,7 +71,7 @@ void my_memo_lang(User * u, char *name, int z, int number, ...); void req_send_memos(User * u, char *vHost); void show_list(User * u); int hs_do_waiting(User * u); -int ns_do_drop(User * u); +int hsreqevt_nick_dropped(int argc, char **argv); void hsreq_save_db(void); void hsreq_load_db(void); @@ -112,8 +112,8 @@ int AnopeInit(int argc, char **argv) -1, -1); moduleAddCommand(HOSTSERV, c, MOD_HEAD); - c = createCommand("drop", ns_do_drop, NULL, -1, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_HEAD); + hook = createEventHook(EVENT_NICK_DROPPED, hsreqevt_nick_dropped); + moduleAddEventHook(hook); hook = createEventHook(EVENT_DB_SAVING, hsreqevt_db_saving); moduleAddEventHook(hook); @@ -328,19 +328,19 @@ void req_send_memos(User * u, char *vHost) } } -int ns_do_drop(User * u) +int hsreqevt_nick_dropped(int argc, char **argv) { - HostCore *tmp; - boolean found = false; - NickAlias *na; + HostCore *tmp; + boolean found = false; - na = findnick(u->nick); - tmp = findHostCore(hs_request_head, u->nick, &found); + if (!argc) + return MOD_CONT; - if (found && na) - hs_request_head = deleteHostCore(hs_request_head, tmp); + tmp = findHostCore(hs_request_head, argv[0], &found); + if (found) + hs_request_head = deleteHostCore(hs_request_head, tmp); - return MOD_CONT; + return MOD_CONT; } int hs_do_reject(User * u) diff --git a/version.log b/version.log index bbff8aaa6..d5f135977 100644 --- a/version.log +++ b/version.log @@ -9,10 +9,11 @@ VERSION_MAJOR="1" VERSION_MINOR="8" VERSION_PATCH="3" VERSION_EXTRA="-svn" -VERSION_BUILD="2809" +VERSION_BUILD="2810" # $Log$ # Changes since 1.8.3 Release +#Revision 2810 - Fixed bug #1139 - Delete the correct nicks from hs_request database when they are dropped #Revision 2809 - Fixed bug #1138 - Fix maximum hostname length checking in hs_request #Revision 2808 - Fixed check_ban to apply bans even if TTB was changed after the user has been kicked #Revision 2807 - Added support for tracking permanent channels |