From: Michael Poole <mdpoole@troilus.org>
Date: Mon, 19 Jul 2004 03:38:09 +0000 (+0000)
Subject: Bugfixes for !trim users, !unsuspend and /clearmodes
X-Git-Tag: v1.4.0-rc1~203
X-Git-Url: http://git.pk910.de/?p=srvx.git;a=commitdiff_plain;h=b4033aebd97ffea294f4e9037b3a84a0a770ef14

Bugfixes for !trim users, !unsuspend and /clearmodes

* Show actual upper bound used to trim users.

* Update whether an user being unsuspended is in the channel.

* Add a missing "break;" so that /clearmodes c doesn't clear NOCTCPS too.
git-archimport-id: srvx@srvx.net--2004-srvx/srvx--devo--1.3--patch-73
---

diff --git a/ChangeLog b/ChangeLog
index 802b87e..e1650de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,23 @@
 # arch-tag: automatic-ChangeLog--srvx@srvx.net--2004-srvx/srvx--devo--1.3
 #
 
+2004-07-19 03:38:09 GMT	Michael Poole <mdpoole@troilus.org>	patch-73
+
+    Summary:
+      Bugfixes for !trim users, !unsuspend and /clearmodes
+    Revision:
+      srvx--devo--1.3--patch-73
+
+    * Show actual upper bound used to trim users.
+    
+    * Update whether an user being unsuspended is in the channel.
+    
+    * Add a missing "break;" so that /clearmodes c doesn't clear NOCTCPS too.
+
+    modified files:
+     ChangeLog src/chanserv.c src/proto-p10.c
+
+
 2004-07-12 19:06:38 GMT	Michael Poole <mdpoole@troilus.org>	patch-72
 
     Summary:
diff --git a/src/chanserv.c b/src/chanserv.c
index 8299d0f..2979451 100644
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -2448,7 +2448,7 @@ cmd_trim_users(struct userNode *user, struct chanNode *channel, unsigned short m
     if(!max_access)
     {
         min_access = 1;
-        max_access = UL_OWNER;
+        max_access = (uData->access >= UL_OWNER) ? UL_OWNER : (uData->access - 1);
     }
     send_message(user, chanserv, "CSMSG_TRIMMED_USERS", count, min_access, max_access, channel->name, intervalString(interval, duration, user->handle_info));
     return 1;
@@ -5544,6 +5544,7 @@ static CHANSERV_FUNC(cmd_unsuspend)
         return 0;
     }
     target->flags &= ~USER_SUSPENDED;
+    scan_user_presence(target, NULL);
     reply("CSMSG_USER_UNSUSPENDED", hi->handle, channel->name);
     return 1;
 }
diff --git a/src/proto-p10.c b/src/proto-p10.c
index 2471cb4..9373985 100644
--- a/src/proto-p10.c
+++ b/src/proto-p10.c
@@ -2373,7 +2373,7 @@ clear_chanmode(struct chanNode *channel, const char *modes)
         case 'b': remove |= MODE_BAN; break;
         case 'D': remove |= MODE_DELAYJOINS; break;
         case 'r': remove |= MODE_REGONLY; break;
-        case 'c': remove |= MODE_NOCOLORS;
+        case 'c': remove |= MODE_NOCOLORS; break;
         case 'C': remove |= MODE_NOCTCPS; break;
         }
     }