Guest nicks, MODE.

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

43 files changed, 158 insertions, 158 deletions

diff --git a/src/actions.c b/src/actions.c
index 067647970..cbf657c75 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -182,7 +182,7 @@ void common_unban(ChannelInfo * ci, char *nick)
             next = ban->next;
             if (entry_match(ban, u->nick, u->username, u->host, ip) ||
                 entry_match(ban, u->nick, u->username, u->vhost, ip)) {
-                anope_cmd_mode(whosends(ci), ci->name, "-b %s", ban->mask);
+                anope_SendMode(whosends(ci), ci->name, "-b %s", ban->mask);
                 if (ircdcap->tsmode)
                     av[3] = ban->mask;
                 else
diff --git a/src/botserv.c b/src/botserv.c
index ea31d70f7..f4d554f5d 100644
--- a/src/botserv.c
+++ b/src/botserv.c
@@ -731,7 +731,7 @@ void bot_join(ChannelInfo * ci)
                 next = ban->next;
                 if (entry_match
                     (ban, ci->bi->nick, ci->bi->user, ci->bi->host, 0)) {
-                    anope_cmd_mode(whosends(ci), ci->name, "-b %s",
+                    anope_SendMode(whosends(ci), ci->name, "-b %s",
                                    ban->mask);
                     if (ircdcap->tsmode)
                         av[3] = ban->mask;
@@ -792,7 +792,7 @@ static void check_ban(ChannelInfo * ci, User * u, int ttbtype)
             ac = 3;
         }
 
-        anope_cmd_mode(ci->bi->nick, ci->name, "+b %s", mask);
+        anope_SendMode(ci->bi->nick, ci->name, "+b %s", mask);
         do_cmode(ci->bi->nick, ac, av);
         send_event(EVENT_BOT_BAN, 3, u->nick, ci->name, mask);
     }
@@ -880,7 +880,7 @@ void bot_raw_ban(User * requester, ChannelInfo * ci, char *nick,
         ac = 3;
     }
 
-    anope_cmd_mode(ci->bi->nick, ci->name, "+b %s", mask);
+    anope_SendMode(ci->bi->nick, ci->name, "+b %s", mask);
     do_cmode(ci->bi->nick, ac, av);
 
     kav[0] = ci->name;
@@ -993,13 +993,13 @@ void bot_raw_mode(User * requester, ChannelInfo * ci, char *mode,
         av[2] = mode;
         av[3] = nick;
         ac = 4;
-        anope_cmd_mode(ci->bi->nick, av[0], "%s %s", av[2], av[3]);
+        anope_SendMode(ci->bi->nick, av[0], "%s %s", av[2], av[3]);
     } else {
         av[0] = ci->name;
         av[1] = mode;
         av[2] = nick;
         ac = 3;
-        anope_cmd_mode(ci->bi->nick, av[0], "%s %s", av[1], av[2]);
+        anope_SendMode(ci->bi->nick, av[0], "%s %s", av[1], av[2]);
     }
 
     do_cmode(ci->bi->nick, ac, av);
diff --git a/src/channels.c b/src/channels.c
index e7ac7940d..d787d1498 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -190,7 +190,7 @@ void chan_set_modes(const char *source, Channel * chan, int ac, const char **av,
         }
 
         /* Set the resulting mode buffer */
-        anope_cmd_mode(whosends(chan->ci), chan->name, merge_args(ac, av));
+        anope_SendMode(whosends(chan->ci), chan->name, merge_args(ac, av));
 
         return;
     }
@@ -225,7 +225,7 @@ void chan_set_modes(const char *source, Channel * chan, int ac, const char **av,
             if ((cum->flags & CUF_PROTECT_BOTSERV) && !add) {
                 if ((bi = findbot(*av))) {
                     if (!botmode || botmode != mode) {
-                        anope_cmd_mode(bi->nick, chan->name, "+%c %s",
+                        anope_SendMode(bi->nick, chan->name, "+%c %s",
                                        mode, bi->nick);
                         botmode = mode;
                         continue;
@@ -1285,7 +1285,7 @@ void add_ban(Channel * chan, const char *mask)
         BotInfo *bi = chan->ci->bi;
 
         if (entry_match(ban, bi->nick, bi->user, bi->host, 0)) {
-            anope_cmd_mode(bi->nick, chan->name, "-b %s", mask);
+            anope_SendMode(bi->nick, chan->name, "-b %s", mask);
             entry_delete(chan->bans, ban);
             return;
         }
@@ -1508,7 +1508,7 @@ void chan_set_correct_modes(User * user, Channel * c, int give_modes)
     if (!add_modes && !rem_modes)
         return;
 
-    anope_cmd_mode(whosends(ci), c->name, "%s%s", modebuf, userbuf);
+    anope_SendMode(whosends(ci), c->name, "%s%s", modebuf, userbuf);
     if (add_modes > 0)
         chan_set_user_status(c, user, add_modes);
     if (rem_modes > 0)
@@ -1883,7 +1883,7 @@ void do_mass_mode(char *modes)
             free(myModes);
             return;
         } else {
-            anope_cmd_mode(s_OperServ, c->name, "%s", modes);
+            anope_SendMode(s_OperServ, c->name, "%s", modes);
             chan_set_modes(s_OperServ, c, ac, av, 1);
         }
     }
diff --git a/src/chanserv.c b/src/chanserv.c
index 369e55dd0..cb0f982c0 100644
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -896,7 +896,7 @@ void check_modes(Channel * c)
         if (ircd->regmode) {
             if (c->mode & ircd->regmode) {
                 c->mode &= ~ircd->regmode;
-                anope_cmd_mode(whosends(ci), c->name, "-r");
+                anope_SendMode(whosends(ci), c->name, "-r");
             }
         }
         return;
@@ -1005,7 +1005,7 @@ void check_modes(Channel * c)
     *end = 0;
     *end2 = 0;
 
-    anope_cmd_mode(whosends(ci), c->name, "%s%s", modebuf,
+    anope_SendMode(whosends(ci), c->name, "%s%s", modebuf,
                    (end2 == argbuf ? "" : argbuf));
 }
 
@@ -1026,13 +1026,13 @@ int check_valid_admin(User * user, Channel * chan, int servermode)
 
     if (servermode && !check_access(user, chan->ci, CA_AUTOPROTECT)) {
         notice_lang(s_ChanServ, user, CHAN_IS_REGISTERED, s_ChanServ);
-        anope_cmd_mode(whosends(chan->ci), chan->name, "%s %s",
+        anope_SendMode(whosends(chan->ci), chan->name, "%s %s",
                        ircd->adminunset, user->nick);
         return 0;
     }
 
     if (check_access(user, chan->ci, CA_AUTODEOP)) {
-        anope_cmd_mode(whosends(chan->ci), chan->name, "%s %s",
+        anope_SendMode(whosends(chan->ci), chan->name, "%s %s",
                        ircd->adminunset, user->nick);
         return 0;
     }
@@ -1062,14 +1062,14 @@ int check_valid_op(User * user, Channel * chan, int servermode)
             if (ircd->owner && ircd->protect) {
                 if (check_access(user, chan->ci, CA_AUTOHALFOP)) {
                     tmp = stripModePrefix(ircd->ownerunset);
-                    anope_cmd_mode(whosends(chan->ci), chan->name,
+                    anope_SendMode(whosends(chan->ci), chan->name,
                                    "%so%s %s %s %s", ircd->adminunset,
                                    tmp, user->nick,
                                    user->nick, user->nick);
                     free(tmp);
                 } else {
                     tmp = stripModePrefix(ircd->ownerunset);
-                    anope_cmd_mode(whosends(chan->ci), chan->name,
+                    anope_SendMode(whosends(chan->ci), chan->name,
                                    "%sho%s %s %s %s %s",
                                    ircd->adminunset, tmp,
                                    user->nick, user->nick, user->nick,
@@ -1078,25 +1078,25 @@ int check_valid_op(User * user, Channel * chan, int servermode)
                 }
             } else if (!ircd->owner && ircd->protect) {
                 if (check_access(user, chan->ci, CA_AUTOHALFOP)) {
-                    anope_cmd_mode(whosends(chan->ci), chan->name,
+                    anope_SendMode(whosends(chan->ci), chan->name,
                                    "%so %s %s", ircd->adminunset,
                                    user->nick, user->nick);
                 } else {
-                    anope_cmd_mode(whosends(chan->ci), chan->name,
+                    anope_SendMode(whosends(chan->ci), chan->name,
                                    "%soh %s %s %s", ircd->adminunset,
                                    user->nick, user->nick, user->nick);
                 }
             } else {
                 if (check_access(user, chan->ci, CA_AUTOHALFOP)) {
-                    anope_cmd_mode(whosends(chan->ci), chan->name, "-o %s",
+                    anope_SendMode(whosends(chan->ci), chan->name, "-o %s",
                                    user->nick);
                 } else {
-                    anope_cmd_mode(whosends(chan->ci), chan->name,
+                    anope_SendMode(whosends(chan->ci), chan->name,
                                    "-ho %s %s", user->nick, user->nick);
                 }
             }
         } else {
-            anope_cmd_mode(whosends(chan->ci), chan->name, "-o %s",
+            anope_SendMode(whosends(chan->ci), chan->name, "-o %s",
                            user->nick);
         }
         return 0;
@@ -1106,17 +1106,17 @@ int check_valid_op(User * user, Channel * chan, int servermode)
         if (ircd->halfop) {
             if (ircd->owner && ircd->protect) {
                 tmp = stripModePrefix(ircd->ownerunset);
-                anope_cmd_mode(whosends(chan->ci), chan->name,
+                anope_SendMode(whosends(chan->ci), chan->name,
                                "%sho%s %s %s %s %s", ircd->adminunset,
                                tmp, user->nick, user->nick,
                                user->nick, user->nick);
                 free(tmp);
             } else {
-                anope_cmd_mode(whosends(chan->ci), chan->name, "-ho %s %s",
+                anope_SendMode(whosends(chan->ci), chan->name, "-ho %s %s",
                                user->nick, user->nick);
             }
         } else {
-            anope_cmd_mode(whosends(chan->ci), chan->name, "-o %s",
+            anope_SendMode(whosends(chan->ci), chan->name, "-o %s",
                            user->nick);
         }
         return 0;
@@ -1142,7 +1142,7 @@ int check_should_op(User * user, char *chan)
         return 0;
 
     if (check_access(user, ci, CA_AUTOOP)) {
-        anope_cmd_mode(whosends(ci), chan, "+o %s", user->nick);
+        anope_SendMode(whosends(ci), chan, "+o %s", user->nick);
         return 1;
     }
 
@@ -1165,7 +1165,7 @@ int check_should_voice(User * user, char *chan)
         return 0;
 
     if (check_access(user, ci, CA_AUTOVOICE)) {
-        anope_cmd_mode(whosends(ci), chan, "+v %s", user->nick);
+        anope_SendMode(whosends(ci), chan, "+v %s", user->nick);
         return 1;
     }
 
@@ -1182,7 +1182,7 @@ int check_should_halfop(User * user, char *chan)
         return 0;
 
     if (check_access(user, ci, CA_AUTOHALFOP)) {
-        anope_cmd_mode(whosends(ci), chan, "+h %s", user->nick);
+        anope_SendMode(whosends(ci), chan, "+h %s", user->nick);
         return 1;
     }
 
@@ -1202,7 +1202,7 @@ int check_should_owner(User * user, char *chan)
     if (((ci->flags & CI_SECUREFOUNDER) && is_real_founder(user, ci))
         || (!(ci->flags & CI_SECUREFOUNDER) && is_founder(user, ci))) {
         tmp = stripModePrefix(ircd->ownerset);
-        anope_cmd_mode(whosends(ci), chan, "+o%s %s %s", tmp, user->nick,
+        anope_SendMode(whosends(ci), chan, "+o%s %s %s", tmp, user->nick,
                        user->nick);
         free(tmp);
         return 1;
@@ -1223,7 +1223,7 @@ int check_should_protect(User * user, char *chan)
 
     if (check_access(user, ci, CA_AUTOPROTECT)) {
         tmp = stripModePrefix(ircd->adminset);
-        anope_cmd_mode(whosends(ci), chan, "+o%s %s %s", tmp, user->nick,
+        anope_SendMode(whosends(ci), chan, "+o%s %s %s", tmp, user->nick,
                        user->nick);
         free(tmp);
         return 1;
@@ -1356,7 +1356,7 @@ int check_kick(User * user, const char *chan, time_t chants)
         /* Lets hide the channel from /list just incase someone does /list
          * while we are here. - katsklaw
          */
-        anope_cmd_mode(s_ChanServ, chan, "+ntsi");
+        anope_SendMode(s_ChanServ, chan, "+ntsi");
         t = add_timeout(CSInhabit, timeout_leave, 0);
         t->data = sstrdup(chan);
         ci->flags |= CI_INHABIT;
@@ -1380,7 +1380,7 @@ int check_kick(User * user, const char *chan, time_t chants)
         do_cmode(whosends(ci), ac, av);
     }
 
-    anope_cmd_mode(whosends(ci), chan, "+b %s", mask);
+    anope_SendMode(whosends(ci), chan, "+b %s", mask);
     anope_cmd_kick(whosends(ci), chan, user->nick, "%s", reason);
 
     return 1;
@@ -1449,7 +1449,7 @@ void restore_topic(const char *chan)
     if (ircd->join2set) {
         if (whosends(ci) == s_ChanServ) {
             anope_cmd_join(s_ChanServ, chan, c->creation_time);
-            anope_cmd_mode(NULL, chan, "+o %s", s_ChanServ);
+            anope_SendMode(NULL, chan, "+o %s", s_ChanServ);
         }
     }
     anope_cmd_topic(whosends(ci), c->name, c->topic_setter,
@@ -1511,7 +1511,7 @@ int check_topiclock(Channel * c, time_t topic_time)
     if (ircd->join2set) {
         if (whosends(ci) == s_ChanServ) {
             anope_cmd_join(s_ChanServ, c->name, c->creation_time);
-            anope_cmd_mode(NULL, c->name, "+o %s", s_ChanServ);
+            anope_SendMode(NULL, c->name, "+o %s", s_ChanServ);
         }
     }
 
@@ -1589,7 +1589,7 @@ void cs_remove_nick(const NickCore * nc)
                         /* Maybe move this to delchan() ? */
                         if ((ci->c) && (ci->c->mode & ircd->regmode)) {
                             ci->c->mode &= ~ircd->regmode;
-                            anope_cmd_mode(whosends(ci), ci->name, "-r");
+                            anope_SendMode(whosends(ci), ci->name, "-r");
                         }
                     }
 
@@ -2343,7 +2343,7 @@ void stick_mask(ChannelInfo * ci, AutoKick * akick)
     /* Falling there means set the ban */
     av[0] = "+b";
     av[1] = akick->u.mask;
-    anope_cmd_mode(whosends(ci), ci->c->name, "+b %s", akick->u.mask);
+    anope_SendMode(whosends(ci), ci->c->name, "+b %s", akick->u.mask);
     chan_set_modes(s_ChanServ, ci->c, 2, av, 1);
 }
 
@@ -2366,7 +2366,7 @@ void stick_all(ChannelInfo * ci)
 
         av[0] = "+b";
         av[1] = akick->u.mask;
-        anope_cmd_mode(whosends(ci), ci->c->name, "+b %s", akick->u.mask);
+        anope_SendMode(whosends(ci), ci->c->name, "+b %s", akick->u.mask);
         chan_set_modes(s_ChanServ, ci->c, 2, av, 1);
     }
 }
diff --git a/src/core/cs_ban.c b/src/core/cs_ban.c
index fa8b9ee97..3ddc70995 100644
--- a/src/core/cs_ban.c
+++ b/src/core/cs_ban.c
@@ -118,7 +118,7 @@ int do_ban(User * u)
                 av[0] = "+b";
                 get_idealban(ci, u, mask, sizeof(mask));
                 av[1] = mask;
-                anope_cmd_mode(whosends(ci), uc->chan->name, "+b %s",
+                anope_SendMode(whosends(ci), uc->chan->name, "+b %s",
                                av[1]);
                 chan_set_modes(s_ChanServ, uc->chan, 2, av, 1);
 
@@ -175,7 +175,7 @@ int do_ban(User * u)
         av[0] = "+b";
         get_idealban(ci, u2, mask, sizeof(mask));
         av[1] = mask;
-        anope_cmd_mode(whosends(ci), c->name, "+b %s", av[1]);
+        anope_SendMode(whosends(ci), c->name, "+b %s", av[1]);
         chan_set_modes(s_ChanServ, c, 2, av, 1);
 
         /* We still allow host banning while not allowing to kick */
diff --git a/src/core/cs_clear.c b/src/core/cs_clear.c
index dee19bcf4..700c057a2 100644
--- a/src/core/cs_clear.c
+++ b/src/core/cs_clear.c
@@ -91,7 +91,7 @@ int do_clear(User * u)
                 next = ban->next;
                 av[0] = "-b";
                 av[1] = ban->mask;
-                anope_cmd_mode(whosends(ci), chan, "-b %s", ban->mask);
+                anope_SendMode(whosends(ci), chan, "-b %s", ban->mask);
                 chan_set_modes(whosends(ci), c, 2, av, 0);
             }
         }
@@ -106,7 +106,7 @@ int do_clear(User * u)
                 next = except->next;
                 av[0] = "-e";
                 av[1] = except->mask;
-                anope_cmd_mode(whosends(ci), chan, "-e %s", except->mask);
+                anope_SendMode(whosends(ci), chan, "-e %s", except->mask);
                 chan_set_modes(whosends(ci), c, 2, av, 0);
             }
         }
@@ -121,7 +121,7 @@ int do_clear(User * u)
                 next = invite->next;
                 av[0] = "-I";
                 av[1] = invite->mask;
-                anope_cmd_mode(whosends(ci), chan, "-I %s", invite->mask);
+                anope_SendMode(whosends(ci), chan, "-I %s", invite->mask);
                 chan_set_modes(whosends(ci), c, 2, av, 0);
             }
         }
@@ -132,7 +132,7 @@ int do_clear(User * u)
 
         if (c->mode) {
             /* Clear modes the bulk of the modes */
-            anope_cmd_mode(whosends(ci), c->name, "%s",
+            anope_SendMode(whosends(ci), c->name, "%s",
                            ircd->modestoremove);
             argv[0] = ircd->modestoremove;
             chan_set_modes(whosends(ci), c, 1, argv, 0);
@@ -140,13 +140,13 @@ int do_clear(User * u)
             /* to prevent the internals from complaining send -k, -L, -f by themselves if we need
                to send them - TSL */
             if (c->key) {
-                anope_cmd_mode(whosends(ci), c->name, "-k %s", c->key);
+                anope_SendMode(whosends(ci), c->name, "-k %s", c->key);
                 argv[0] = "-k";
                 argv[1] = c->key;
                 chan_set_modes(whosends(ci), c, 2, argv, 0);
             }
             if (ircd->Lmode && c->redirect) {
-                anope_cmd_mode(whosends(ci), c->name, "-L %s",
+                anope_SendMode(whosends(ci), c->name, "-L %s",
                                c->redirect);
                 argv[0] = "-L";
                 argv[1] = c->redirect;
@@ -154,7 +154,7 @@ int do_clear(User * u)
             }
             if (ircd->fmode && c->flood) {
                 if (flood_mode_char_remove) {
-                    anope_cmd_mode(whosends(ci), c->name, "%s %s",
+                    anope_SendMode(whosends(ci), c->name, "%s %s",
                                    flood_mode_char_remove, c->flood);
                     argv[0] = flood_mode_char_remove;
                     argv[1] = c->flood;
@@ -242,7 +242,7 @@ int do_clear(User * u)
                         av[i+3] = cu->user->nick;
                     ac = 3 + i;
 
-                    anope_cmd_mode(whosends(ci), av[0], "%s %s", av[2], tmp2);
+                    anope_SendMode(whosends(ci), av[0], "%s %s", av[2], tmp2);
                 } else {
                     av[1] = tmp;
                     /* We have to give as much nicks as modes.. - Viper */
@@ -250,7 +250,7 @@ int do_clear(User * u)
                         av[i+2] = cu->user->nick;
                     ac = 2 + i;
 
-                    anope_cmd_mode(whosends(ci), av[0], "%s %s", av[1], tmp2);
+                    anope_SendMode(whosends(ci), av[0], "%s %s", av[1], tmp2);
                 }
 
                 do_cmode(s_ChanServ, ac, av);
@@ -292,10 +292,10 @@ int do_clear(User * u)
                 break;
             } else {
                 if (ircdcap->tsmode)
-                    anope_cmd_mode(whosends(ci), av[0], "%s %s", av[2],
+                    anope_SendMode(whosends(ci), av[0], "%s %s", av[2],
                                    av[3]);
                 else
-                    anope_cmd_mode(whosends(ci), av[0], "%s %s", av[1],
+                    anope_SendMode(whosends(ci), av[0], "%s %s", av[1],
                                    av[2]);
             }
             do_cmode(s_ChanServ, ac, av);
@@ -336,10 +336,10 @@ int do_clear(User * u)
                 break;
             } else {
                 if (ircdcap->tsmode) {
-                    anope_cmd_mode(whosends(ci), av[0], "%s %s", av[2],
+                    anope_SendMode(whosends(ci), av[0], "%s %s", av[2],
                                    av[3]);
                 } else {
-                    anope_cmd_mode(whosends(ci), av[0], "%s %s", av[1],
+                    anope_SendMode(whosends(ci), av[0], "%s %s", av[1],
                                    av[2]);
                 }
             }
diff --git a/src/core/cs_drop.c b/src/core/cs_drop.c
index 045594209..43305c158 100644
--- a/src/core/cs_drop.c
+++ b/src/core/cs_drop.c
@@ -99,7 +99,7 @@ int do_drop(User * u)
         if (ci->c) {
             if (ircd->regmode) {
                 ci->c->mode &= ~ircd->regmode;
-                anope_cmd_mode(whosends(ci), ci->name, "-r");
+                anope_SendMode(whosends(ci), ci->name, "-r");
             }
         }
 
diff --git a/src/core/cs_modes.c b/src/core/cs_modes.c
index ab8e82d4a..d41b4bcda 100644
--- a/src/core/cs_modes.c
+++ b/src/core/cs_modes.c
@@ -227,7 +227,7 @@ int do_owner(User * u)
         for (uc = u->chans; uc; uc = uc->next) {
             if ((ci = uc->chan->ci) && !(ci->flags & CI_VERBOTEN)
                 && is_founder(u, ci)) {
-                anope_cmd_mode(whosends(ci), uc->chan->name, "%s %s",
+                anope_SendMode(whosends(ci), uc->chan->name, "%s %s",
                                av[0], u->nick);
                 chan_set_modes(s_ChanServ, uc->chan, 2, av, 1);
             }
@@ -247,7 +247,7 @@ int do_owner(User * u)
     } else if (!is_founder(u, ci)) {
         notice_lang(s_ChanServ, u, ACCESS_DENIED);
     } else {
-        anope_cmd_mode(whosends(ci), c->name, "%s %s", ircd->ownerset,
+        anope_SendMode(whosends(ci), c->name, "%s %s", ircd->ownerset,
                        u->nick);
 
         av[0] = ircd->ownerset;
@@ -281,7 +281,7 @@ int do_deowner(User * u)
         for (uc = u->chans; uc; uc = uc->next) {
             if ((ci = uc->chan->ci) && !(ci->flags & CI_VERBOTEN)
                 && is_founder(u, ci)) {
-                anope_cmd_mode(whosends(ci), uc->chan->name, "%s %s",
+                anope_SendMode(whosends(ci), uc->chan->name, "%s %s",
                                av[0], u->nick);
                 chan_set_modes(s_ChanServ, uc->chan, 2, av, 1);
             }
@@ -301,7 +301,7 @@ int do_deowner(User * u)
     } else if (!is_founder(u, ci)) {
         notice_lang(s_ChanServ, u, ACCESS_DENIED);
     } else {
-        anope_cmd_mode(whosends(ci), c->name, "%s %s", ircd->ownerunset,
+        anope_SendMode(whosends(ci), c->name, "%s %s", ircd->ownerunset,
                        u->nick);
 
         av[0] = ircd->ownerunset;
@@ -336,7 +336,7 @@ int do_util(User * u, CSModeUtil * util)
         for (uc = u->chans; uc; uc = uc->next) {
             if ((ci = uc->chan->ci) && !(ci->flags & CI_VERBOTEN)
                 && check_access(u, ci, util->levelself)) {
-                anope_cmd_mode(whosends(ci), uc->chan->name, "%s %s",
+                anope_SendMode(whosends(ci), uc->chan->name, "%s %s",
                                util->mode, u->nick);
                 chan_set_modes(s_ChanServ, uc->chan, 2, av, 2);
 
@@ -373,7 +373,7 @@ int do_util(User * u, CSModeUtil * util)
     } else if (*util->mode == '-' && is_protected(u2) && !is_same) {
         notice_lang(s_ChanServ, u, PERMISSION_DENIED);
     } else {
-        anope_cmd_mode(whosends(ci), c->name, "%s %s", util->mode,
+        anope_SendMode(whosends(ci), c->name, "%s %s", util->mode,
                        u2->nick);
 
         av[0] = util->mode;
diff --git a/src/core/cs_register.c b/src/core/cs_register.c
index 3b11bef3b..1b5d3ff68 100644
--- a/src/core/cs_register.c
+++ b/src/core/cs_register.c
@@ -179,11 +179,11 @@ int do_register(User * u)
         check_modes(c);
         /* On most ircds you do not receive the admin/owner mode till its registered */
         if (ircd->admin) {
-            anope_cmd_mode(s_ChanServ, chan, "%s %s", ircd->adminset,
+            anope_SendMode(s_ChanServ, chan, "%s %s", ircd->adminset,
                            u->nick);
         }
         if (ircd->owner && ircd->ownerset) {
-            anope_cmd_mode(s_ChanServ, chan, "%s %s", ircd->ownerset,
+            anope_SendMode(s_ChanServ, chan, "%s %s", ircd->ownerset,
                            u->nick);
         }
         send_event(EVENT_CHAN_REGISTERED, 1, chan);
diff --git a/src/core/cs_topic.c b/src/core/cs_topic.c
index b117d3d35..0a7854f69 100644
--- a/src/core/cs_topic.c
+++ b/src/core/cs_topic.c
@@ -104,7 +104,7 @@ int do_cs_topic(User * u)
         if (ircd->join2set) {
             if (whosends(ci) == s_ChanServ) {
                 anope_cmd_join(s_ChanServ, c->name, c->creation_time);
-                anope_cmd_mode(NULL, c->name, "+o %s", s_ChanServ);
+                anope_SendMode(NULL, c->name, "+o %s", s_ChanServ);
             }
         }
         anope_cmd_topic(whosends(ci), c->name, u->nick, topic ? topic : "",
diff --git a/src/core/os_clearmodes.c b/src/core/os_clearmodes.c
index 0b16571a6..51434212d 100644
--- a/src/core/os_clearmodes.c
+++ b/src/core/os_clearmodes.c
@@ -122,7 +122,7 @@ int do_clearmodes(User * u)
                         continue;
                     argv[0] = "-o";
                     argv[1] = cu->user->nick;
-                    anope_cmd_mode(s