diff options
| -rw-r--r-- | Changes | 2 | ||||
| -rw-r--r-- | src/chanserv.c | 16 | ||||
| -rw-r--r-- | src/nickserv.c | 16 | ||||
| -rw-r--r-- | version.log | 6 |
4 files changed, 34 insertions, 6 deletions
@@ -1,5 +1,7 @@ Anope Version S V N -------------------- +01/15 F listchans now shows if a channel is suspended [#825] +01/15 F listnicks now shows if a nickname is suspended [#825] 01/15 F Re-assigned access to OS CHANLIST to Services Opers [#827] Anope Version 1.7.21 diff --git a/src/chanserv.c b/src/chanserv.c index e56bf6d0f..2797feadb 100644 --- a/src/chanserv.c +++ b/src/chanserv.c @@ -272,8 +272,15 @@ void listchans(int count_only, const char *chan) } printf("\n"); } - if (ci->mlock_on || ci->mlock_off) + if (ci->mlock_on || ci->mlock_off) { printf(" Mode lock: %s\n", get_mlock_modes(ci, 1)); + } + if (ci->flags & CI_SUSPENDED) { + printf + ("This nickname is currently suspended by %s, reason: %s\n", + ci->forbidby, + (ci->forbidreason ? ci->forbidreason : "No reason")); + } } } else { @@ -282,9 +289,10 @@ void listchans(int count_only, const char *chan) for (ci = chanlists[i]; ci; ci = ci->next) { printf(" %s %-20s %s\n", ci->flags & CI_NO_EXPIRE ? "!" : " ", ci->name, - ci-> - flags & CI_VERBOTEN ? "Disallowed (FORBID)" : ci-> - desc); + ci->flags & CI_VERBOTEN ? + "Disallowed (FORBID)" : (ci->flags & CI_SUSPENDED ? + "Disallowed (SUSPENDED)" : + ci->desc)); count++; } } diff --git a/src/nickserv.c b/src/nickserv.c index c9acfdf8d..1ea70c7e9 100644 --- a/src/nickserv.c +++ b/src/nickserv.c @@ -119,6 +119,17 @@ void listnicks(int count_only, const char *nick) } printf(" Options: %s\n", *buf ? buf : "None"); + if (na->nc->flags & NI_SUSPENDED) { + if (na->last_quit) { + printf + ("This nickname is currently suspended, reason: %s\n", + na->last_quit); + } else { + printf("This nickname is currently suspended.\n"); + } + } + + } else { for (i = 0; i < 1024; i++) { @@ -126,7 +137,10 @@ void listnicks(int count_only, const char *nick) printf(" %s %-20s %s\n", na->status & NS_NO_EXPIRE ? "!" : " ", na->nick, na->status & NS_VERBOTEN ? - "Disallowed (FORBID)" : na->last_usermask); + "Disallowed (FORBID)" : (na->nc-> + flags & NI_SUSPENDED ? + "Disallowed (SUSPENDED)" : + na->last_usermask)); count++; } } diff --git a/version.log b/version.log index d0280275a..c24ebd500 100644 --- a/version.log +++ b/version.log @@ -9,10 +9,14 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="21" VERSION_EXTRA="-svn" -VERSION_BUILD="1347" +VERSION_BUILD="1348" # $Log$ # +# BUILD : 1.7.21 (1348) +# BUGS : 825 +# NOTES : listnicks/listchans now shows if a nickname/channel is SUSPENDED. +# # BUILD : 1.7.21 (1347) # BUGS : 827 # NOTES : Re-assigned OS CHANLIST perms to Services Opers |