[srvx-commits] arch commit: Bugfixes for !trim users, !unsuspend and /clearmodes

[Michael P. <md...@tr...>]

Revision: srvx--devo--1.3--patch-73
Archive: sr...@sr...--2004-srvx
Creator: Michael Poole <md...@tr...>
Date: Sun Jul 18 23:38:09 EDT 2004
Standard-date: 2004-07-19 03:38:09 GMT
Modified-files: ChangeLog src/chanserv.c src/proto-p10.c
New-patches: sr...@sr...--2004-srvx/srvx--devo--1.3--patch-73
Summary: Bugfixes for !trim users, !unsuspend and /clearmodes
Keywords: 

* 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.

* added files

    {arch}/srvx/srvx--devo/srvx--devo--1.3/sr...@sr...--2004-srvx/patch-log/patch-73

* modified files

--- orig/ChangeLog
+++ mod/ChangeLog
@@ -2,6 +2,23 @@
 # arch-tag: aut...@sr...--2004-srvx/srvx--devo--1.3
 #
 
+2004-07-19 03:38:09 GMT	Michael Poole <md...@tr...>	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 <md...@tr...>	patch-72
 
     Summary:


--- orig/src/chanserv.c
+++ mod/src/chanserv.c
@@ -2448,7 +2448,7 @@
     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 @@
         return 0;
     }
     target->flags &= ~USER_SUSPENDED;
+    scan_user_presence(target, NULL);
     reply("CSMSG_USER_UNSUSPENDED", hi->handle, channel->name);
     return 1;
 }


--- orig/src/proto-p10.c
+++ mod/src/proto-p10.c
@@ -2373,7 +2373,7 @@
         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;
         }
     }