BUILD : 1.7.21 (1348) BUGS : 825 NOTES : listnicks/listchans now shows if a nickname/channel is SUSPENDED.

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


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1063 5417fbe8-f217-4b02-8779-1006273d7864

2 files changed, 27 insertions, 5 deletions

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++;
             }
         }