BUILD : 1.7.5 (376) BUGS : N/A NOTES : CS INFO - DrStein, init.c typo - DrStein, Bahamut +j support - TSL, more protocol clean up

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


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

1 files changed, 13 insertions, 7 deletions

diff --git a/src/operserv.c b/src/operserv.c
index aa92125b2..7e3864539 100644
--- a/src/operserv.c
+++ b/src/operserv.c
@@ -1670,8 +1670,7 @@ static int do_clearmodes(User * u)
 
         if (c->mode) {
             /* Clear modes the bulk of the modes */
-            anope_cmd_mode(s_OperServ, c->name, "%s %s",
-                           ircd->modestoremove);
+            anope_cmd_mode(s_OperServ, c->name, "%s", ircd->modestoremove);
             argv[0] = sstrdup(ircd->modestoremove);
             chan_set_modes(s_OperServ, c, 1, argv, 0);
             free(argv[0]);
@@ -1693,11 +1692,18 @@ static int do_clearmodes(User * u)
                 free(argv[0]);
             }
             if (ircd->fmode && c->flood) {
-                anope_cmd_mode(s_OperServ, c->name, "-f %s", c->flood);
-                argv[0] = sstrdup("-f");
-                argv[1] = c->flood;
-                chan_set_modes(s_OperServ, c, 2, argv, 0);
-                free(argv[0]);
+                if (flood_mode_char_remove) {
+                    anope_cmd_mode(s_ChanServ, c->name, "%s %s",
+                                   flood_mode_char_remove, c->flood);
+                    argv[0] = sstrdup(flood_mode_char_remove);
+                    argv[1] = c->flood;
+                    chan_set_modes(s_ChanServ, c, 2, argv, 0);
+                    free(argv[0]);
+                } else {
+                    if (debug) {
+                        alog("debug: flood_mode_char_remove was not set unable to remove flood/throttle modes");
+                    }
+                }
             }
         }