Convert various to new name scheme.

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

30 files changed, 42 insertions, 42 deletions

diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c
index cce84d789..eba82f5f9 100644
--- a/src/core/bs_bot.c
+++ b/src/core/bs_bot.c
@@ -267,7 +267,7 @@ int do_bot(User * u)
                 /* The new nick is really different, so we remove the Q line for
                    the old nick. */
                 if (ircd->sqline) {
-                    anope_cmd_unsqline(bi->nick);
+                    anope_SendSQLineDel(bi->nick);
                 }
 
                 /* We check whether user with this nick is online, and kill it if so */
@@ -324,7 +324,7 @@ int do_bot(User * u)
                            "Quit: Help! I'm being deleted by %s!",
                            u->nick);
             if (ircd->sqline) {
-                anope_cmd_unsqline(bi->nick);
+                anope_SendSQLineDel(bi->nick);
             }
             delete bi;
 
diff --git a/src/core/cs_drop.c b/src/core/cs_drop.c
index 43305c158..61aad543a 100644
--- a/src/core/cs_drop.c
+++ b/src/core/cs_drop.c
@@ -104,7 +104,7 @@ int do_drop(User * u)
         }
 
         if (ircd->chansqline && (ci->flags & CI_VERBOTEN)) {
-            anope_cmd_unsqline(ci->name);
+            anope_SendSQLineDel(ci->name);
         }
 
         alog("%s: Channel %s dropped by %s!%s@%s (founder: %s)",
@@ -117,7 +117,7 @@ int do_drop(User * u)
          * drop the channel before issuing the wallops.
          */
         if (WallDrop && is_servadmin && level < ACCESS_FOUNDER)
-            anope_cmd_global(s_ChanServ,
+            anope_SendGlobops(s_ChanServ,
                              "\2%s\2 used DROP on channel \2%s\2", u->nick,
                              chan);
 
diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.c
index ac9073185..599f51605 100644
--- a/src/core/cs_forbid.c
+++ b/src/core/cs_forbid.c
@@ -118,7 +118,7 @@ int do_forbid(User * u)
         }
 
         if (WallForbid)
-            anope_cmd_global(s_ChanServ,
+            anope_SendGlobops(s_ChanServ,
                              "\2%s\2 used FORBID on channel \2%s\2",
                              u->nick, ci->name);
 
diff --git a/src/core/cs_getpass.c b/src/core/cs_getpass.c
index df2ce9b2d..de699e135 100644
--- a/src/core/cs_getpass.c
+++ b/src/core/cs_getpass.c
@@ -88,7 +88,7 @@ int do_getpass(User * u)
             alog("%s: %s!%s@%s used GETPASS on %s",
                  s_ChanServ, u->nick, u->username, u->host, ci->name);
             if (WallGetpass) {
-                anope_cmd_global(s_ChanServ,
+                anope_SendGlobops(s_ChanServ,
                                  "\2%s\2 used GETPASS on channel \2%s\2",
                                  u->nick, chan);
             }
diff --git a/src/core/cs_invite.c b/src/core/cs_invite.c
index 60e92fb80..5e538d791 100644
--- a/src/core/cs_invite.c
+++ b/src/core/cs_invite.c
@@ -84,7 +84,7 @@ int do_invite(User * u)
     } else if (!u || !check_access(u, ci, CA_INVITE)) {
         notice_lang(s_ChanServ, u, PERMISSION_DENIED);
     } else {
-        anope_cmd_invite(whosends(ci), chan, u->nick);
+        anope_SendInvite(whosends(ci), chan, u->nick);
     }
     return MOD_CONT;
 }
diff --git a/src/core/cs_set.c b/src/core/cs_set.c
index 0616e933b..67c1b5f99 100644
--- a/src/core/cs_set.c
+++ b/src/core/cs_set.c
@@ -393,7 +393,7 @@ int do_set_password(User * u, ChannelInfo * ci, char *param)
         alog("%s: %s!%s@%s set password as Services admin for %s",
              s_ChanServ, u->nick, u->username, u->host, ci->name);
         if (WallSetpass)
-            anope_cmd_global(s_ChanServ,
+            anope_SendGlobops(s_ChanServ,
                              "\2%s\2 set password as Services admin for channel \2%s\2",
                              u->nick, ci->name);
     } else {
diff --git a/src/core/cs_suspend.c b/src/core/cs_suspend.c
index b379d8e24..855e6b531 100644
--- a/src/core/cs_suspend.c
+++ b/src/core/cs_suspend.c
@@ -133,7 +133,7 @@ int do_suspend(User * u)
         }
 
         if (WallForbid)
-            anope_cmd_global(s_ChanServ,
+            anope_SendGlobops(s_ChanServ,
                              "\2%s\2 used SUSPEND on channel \2%s\2",
                              u->nick, ci->name);
 
@@ -194,7 +194,7 @@ int do_unsuspend(User * u)
         }
 
         if (WallForbid)
-            anope_cmd_global(s_ChanServ,
+            anope_SendGlobops(s_ChanServ,
                              "\2%s\2 used UNSUSPEND on channel \2%s\2",
                              u->nick, ci->name);
 
diff --git a/src/core/cs_topic.c b/src/core/cs_topic.c
index 0a7854f69..a8c9533a7 100644
--- a/src/core/cs_topic.c
+++ b/src/core/cs_topic.c
@@ -103,7 +103,7 @@ int do_cs_topic(User * u)
                  s_ChanServ, u->nick, u->username, u->host, c->name);
         if (ircd->join2set) {
             if (whosends(ci) == s_ChanServ) {
-                anope_cmd_join(s_ChanServ, c->name, c->creation_time);
+                anope_SendJoin(s_ChanServ, c->name, c->creation_time);
                 anope_SendMode(NULL, c->name, "+o %s", s_ChanServ);
             }
         }
@@ -111,7 +111,7 @@ int do_cs_topic(User * u)
                         c->topic_time);
         if (ircd->join2set) {
             if (whosends(ci) == s_ChanServ) {
-                anope_cmd_part(s_ChanServ, c->name, NULL);
+                anope_SendPart(s_ChanServ, c->name, NULL);
             }
         }
     }
diff --git a/src/core/ns_drop.c b/src/core/ns_drop.c
index e191a8395..416ecd58d 100644
--- a/src/core/ns_drop.c
+++ b/src/core/ns_drop.c
@@ -88,7 +88,7 @@ int do_drop(User * u)
                 if (readonly)
                     notice_lang(s_NickServ, u, READ_ONLY_MODE);
                 if (WallDrop)
-                    anope_cmd_global(s_NickServ,
+                    anope_SendGlobops(s_NickServ,
                                      "\2%s\2 used DROP on \2%s\2", u->nick,
                                      nick);
                 alog("%s: %s!%s@%s dropped nickname %s (e-mail: %s)",
@@ -120,7 +120,7 @@ int do_drop(User * u)
             notice_lang(s_NickServ, u, READ_ONLY_MODE);
 
         if (ircd->sqline && (na->status & NS_VERBOTEN)) {
-            anope_cmd_unsqline(na->nick);
+            anope_SendSQLineDel(na->nick);
         }
 
         alog("%s: %s!%s@%s dropped nickname %s (group %s) (e-mail: %s)",
@@ -132,7 +132,7 @@ int do_drop(User * u)
 
         if (!is_mine) {
             if (WallDrop)
-                anope_cmd_global(s_NickServ, "\2%s\2 used DROP on \2%s\2",
+                anope_SendGlobops(s_NickServ, "\2%s\2 used DROP on \2%s\2",
                                  u->nick, nick);
             notice_lang(s_NickServ, u, NICK_X_DROPPED, nick);
         } else {
diff --git a/src/core/ns_forbid.c b/src/core/ns_forbid.c
index 6612be06e..ce26af71e 100644
--- a/src/core/ns_forbid.c
+++ b/src/core/ns_forbid.c
@@ -119,7 +119,7 @@ int do_forbid(User * u)
         }
 
         if (WallForbid)
-            anope_cmd_global(s_NickServ, "\2%s\2 used FORBID on \2%s\2",
+            anope_SendGlobops(s_NickServ, "\2%s\2 used FORBID on \2%s\2",
                              u->nick, nick);
 
         alog("%s: %s set FORBID for nick %s", s_NickServ, u->nick, nick);
diff --git a/src/core/ns_getpass.c b/src/core/ns_getpass.c
index 938b75f8d..6079ca2ba 100644
--- a/src/core/ns_getpass.c
+++ b/src/core/ns_getpass.c
@@ -80,7 +80,7 @@ int do_getpass(User * u)
             alog("%s: %s!%s@%s used GETPASS on %s", s_NickServ, u->nick,
                  u->username, u->host, nick);
             if (WallGetpass)
-                anope_cmd_global(s_NickServ,
+                anope_SendGlobops(s_NickServ,
                                  "\2%s\2 used GETPASS on \2%s\2", u->nick,
                                  nick);
             notice_lang(s_NickServ, u, NICK_GETPASS_PASSCODE_IS, nick,
@@ -100,7 +100,7 @@ int do_getpass(User * u)
             alog("%s: %s!%s@%s used GETPASS on %s", s_NickServ, u->nick,
                  u->username, u->host, nick);
             if (WallGetpass)
-                anope_cmd_global(s_NickServ, "\2%s\2 used GETPASS on \2%s\2",
+                anope_SendGlobops(s_NickServ, "\2%s\2 used GETPASS on \2%s\2",
                                  u->nick, nick);
             notice_lang(s_NickServ, u, NICK_GETPASS_PASSWORD_IS, nick,
                         tmp_pass);
diff --git a/src/core/ns_saset.c b/src/core/ns_saset.c
index 88db0526b..7261a55ce 100644
--- a/src/core/ns_saset.c
+++ b/src/core/ns_saset.c
@@ -265,7 +265,7 @@ int do_saset_password(User * u, NickCore * nc, char *param)
          u->nick, u->username, u->host, nc->display,
          (nc->email ? nc->email : "none"));
     if (WallSetpass)
-        anope_cmd_global(s_NickServ,
+        anope_SendGlobops(s_NickServ,
                          "\2%s\2 used SASET PASSWORD on \2%s\2",
                          u->nick, nc->display);
     return MOD_CONT;
diff --git a/src/core/ns_suspend.c b/src/core/ns_suspend.c
index 1cf9f7030..53823f75f 100644
--- a/src/core/ns_suspend.c
+++ b/src/core/ns_suspend.c
@@ -119,7 +119,7 @@ int do_suspend(User * u)
         }
 
         if (WallForbid)
-            anope_cmd_global(s_NickServ, "\2%s\2 used SUSPEND on \2%s\2",
+            anope_SendGlobops(s_NickServ, "\2%s\2 used SUSPEND on \2%s\2",
                              u->nick, nick);
 
         alog("%s: %s set SUSPEND for nick %s", s_NickServ, u->nick, nick);
@@ -172,7 +172,7 @@ int do_unsuspend(User * u)
         na->nc->flags &= ~NI_SUSPENDED;
 
         if (WallForbid)
-            anope_cmd_global(s_NickServ, "\2%s\2 used UNSUSPEND on \2%s\2",
+            anope_SendGlobops(s_NickServ, "\2%s\2 used UNSUSPEND on \2%s\2",
                              u->nick, nick);
 
         alog("%s: %s set UNSUSPEND for nick %s", s_NickServ, u->nick,
diff --git a/src/core/os_akill.c b/src/core/os_akill.c
index 689e00b43..d2250fef2 100644
--- a/src/core/os_akill.c
+++ b/src/core/os_akill.c
@@ -178,7 +178,7 @@ int do_akill(User * u)
                              (wall_expiry == 1) ? "" : "s");
                 }
 
-                anope_cmd_global(s_OperServ,
+                anope_SendGlobops(s_OperServ,
                                  "%s added an AKILL for %s (%s) (%s)",
                                  u->nick, mask, reason, buf);
             }
diff --git a/src/core/os_chankill.c b/src/core/os_chankill.c
index 40609440c..c92a6e481 100644
--- a/src/core/os_chankill.c
+++ b/src/core/os_chankill.c
@@ -118,7 +118,7 @@ int do_chankill(User * u)
                             cu->user->host, NULL, NULL);
             }
             if (WallOSAkill) {
-                anope_cmd_global(s_OperServ, "%s used CHANKILL on %s (%s)",
+                anope_SendGlobops(s_OperServ, "%s used CHANKILL on %s (%s)",
                                  u->nick, channel, reason);
             }
         } else {
diff --git a/src/core/os_clearmodes.c b/src/core/os_clearmodes.c
index 51434212d..46adf090a 100644
--- a/src/core/os_clearmodes.c
+++ b/src/core/os_clearmodes.c
@@ -99,7 +99,7 @@ int do_clearmodes(User * u)
         }
 
         if (WallOSClearmodes) {
-            anope_cmd_global(s_OperServ, "%s used CLEARMODES%s on %s",
+            anope_SendGlobops(s_OperServ, "%s used CLEARMODES%s on %s",
                              u->nick, all ? " ALL" : "", chan);
         }
         if (all) {
diff --git a/src/core/os_defcon.c b/src/core/os_defcon.c
index 4ba64c285..e2ab6da80 100644
--- a/src/core/os_defcon.c
+++ b/src/core/os_defcon.c
@@ -105,7 +105,7 @@ int do_defcon(User * u)
     notice_lang(s_OperServ, u, OPER_DEFCON_CHANGED, DefConLevel);
     defcon_sendlvls(u);
     alog("Defcon level changed to %d by Oper %s", newLevel, u->nick);
-    anope_cmd_global(s_OperServ, getstring2(NULL, OPER_DEFCON_WALL),
+    anope_SendGlobops(s_OperServ, getstring2(NULL, OPER_DEFCON_WALL),
                      u->nick, newLevel);
     /* Global notice the user what is happening. Also any Message that
        the Admin would like to add. Set in config file. */
diff --git a/src/core/os_global.c b/src/core/os_global.c
index 300b83867..befaf881c 100644
--- a/src/core/os_global.c
+++ b/src/core/os_global.c
@@ -75,7 +75,7 @@ int do_global(User * u)
         return MOD_CONT;
     }
     if (WallOSGlobal)
-        anope_cmd_global(s_OperServ, "\2%s\2 just used GLOBAL command.",
+        anope_SendGlobops(s_OperServ, "\2%s\2 just used GLOBAL command.",
                          u->nick);
     oper_global(u->nick, "%s", msg);
     return MOD_CONT;
diff --git a/src/core/os_jupe.c b/src/core/os_jupe.c
index a666a02cf..be0d0bb50 100644
--- a/src/core/os_jupe.c
+++ b/src/core/os_jupe.c
@@ -80,7 +80,7 @@ int do_jupe(User * u)
             anope_cmd_jupe(jserver, u->nick, reason);
 
             if (WallOSJupe)
-                anope_cmd_global(s_OperServ, "\2%s\2 used JUPE on \2%s\2",
+                anope_SendGlobops(s_OperServ, "\2%s\2 used JUPE on \2%s\2",
                                  u->nick, jserver);
         }
     }
diff --git a/src/core/os_kick.c b/src/core/os_kick.c
index 98c02f62a..ee256a463 100644
--- a/src/core/os_kick.c
+++ b/src/core/os_kick.c
@@ -87,7 +87,7 @@ int do_os_kick(User * u)
     }
     anope_SendKick(s_OperServ, chan, nick, "%s (%s)", u->nick, s);
     if (WallOSKick)
-        anope_cmd_global(s_OperServ, "%s used KICK on %s/%s", u->nick,
+        anope_SendGlobops(s_OperServ, "%s used KICK on %s/%s", u->nick,
                          nick, chan);
     argv[0] = sstrdup(chan);
     argv[1] = sstrdup(nick);
diff --git a/src/core/os_mode.c b/src/core/os_mode.c
index 09e82f59f..7925679d7 100644
--- a/src/core/os_mode.c
+++ b/src/core/os_mode.c
@@ -95,7 +95,7 @@ int do_os_mode(User * u)
         free(av);
 
         if (WallOSMode)
-            anope_cmd_global(s_OperServ, "%s used MODE %s on %s", u->nick,
+            anope_SendGlobops(s_OperServ, "%s used MODE %s on %s", u->nick,
                              modes, chan);
     }
     return MOD_CONT;
diff --git a/src/core/os_noop.c b/src/core/os_noop.c
index 92b37cc20..ec2f71e71 100644
--- a/src/core/os_noop.c
+++ b/src/core/os_noop.c
@@ -84,7 +84,7 @@ int do_noop(User * u)
         snprintf(reason, sizeof(reason), "NOOP command used by %s",
                  u->nick);
         if (WallOSNoOp)
-            anope_cmd_global(s_OperServ, "\2%s\2 used NOOP on \2%s\2",
+            anope_SendGlobops(s_OperServ, "\2%s\2 used NOOP on \2%s\2",
                              u->nick, server);
         notice_lang(s_OperServ, u, OPER_NOOP_SET, server);
 
diff --git a/src/core/os_oline.c b/src/core/os_oline.c
index bf85b38ca..8a9adb9c9 100644
--- a/src/core/os_oline.c
+++ b/src/core/os_oline.c
@@ -94,12 +94,12 @@ int do_operoline(User * u)
             common_svsmode(u2, "+o", NULL);
             notice_lang(s_OperServ, u2, OPER_OLINE_IRCOP);
             notice_lang(s_OperServ, u, OPER_OLINE_SUCCESS, flags, nick);
-            anope_cmd_global(s_OperServ, "\2%s\2 used OLINE for %s",
+            anope_SendGlobops(s_OperServ, "\2%s\2 used OLINE for %s",
                              u->nick, nick);
         } else if (u2 && flags[0] == '-') {
             anope_cmd_svso(s_OperServ, nick, flags);
             notice_lang(s_OperServ, u, OPER_OLINE_SUCCESS, flags, nick);
-            anope_cmd_global(s_OperServ, "\2%s\2 used OLINE for %s",
+            anope_SendGlobops(s_OperServ, "\2%s\2 used OLINE for %s",
                              u->nick, nick);
         } else
             syntax_error(s_OperServ, u, "OLINE", OPER_OLINE_SYNTAX);
diff --git a/src/core/os_raw.c b/src/core/os_raw.c
index 5ef92e082..6628adb9d 100644
--- a/src/core/os_raw.c
+++ b/src/core/os_raw.c
@@ -67,7 +67,7 @@ int do_raw(User * u)
             char *kw = strtok(text, " ");
             while (kw && *kw == ':')
                 kw = strtok(NULL, " ");
-            anope_cmd_global(s_OperServ,
+            anope_SendGlobops(s_OperServ,
                              "\2%s\2 used RAW command for \2%s\2",
                              u->nick,
                              (kw ? kw : "\2non RFC compliant message\2"));
diff --git a/src/core/os_set.c b/src/core/os_set.c
index ba26c9eac..5e3b8793c 100644
--- a/src/core/os_set.c
+++ b/src/core/os_set.c
@@ -187,7 +187,7 @@ int do_set(User * u)
         if (LogChannel && (stricmp(setting, "on") == 0)) {
             if (ircd->join2msg) {
                 c = findchan(LogChannel);
-                anope_cmd_join(s_GlobalNoticer, LogChannel, c ? c->creation_time : time(NULL));
+                anope_SendJoin(s_GlobalNoticer, LogChannel, c ? c->creation_time : time(NULL));
             }
             logchan = 1;
             alog("Now sending log messages to %s", LogChannel);
@@ -195,7 +195,7 @@ int do_set(User * u)
         } else if (LogChannel && (stricmp(setting, "off") == 0)) {
             alog("No longer sending log messages to a channel");
             if (ircd->join2msg) {
-                anope_cmd_part(s_GlobalNoticer, LogChannel, NULL);
+                anope_SendPart(s_GlobalNoticer, LogChannel, NULL);
             }
             logchan = 0;
             notice_lang(s_OperServ, u, OPER_SET_LOGCHAN_OFF);
@@ -214,14 +214,14 @@ int do_set(User * u)
             u->isSuperAdmin = 1;
             notice_lang(s_OperServ, u, OPER_SUPER_ADMIN_ON);
             alog("%s: %s is a SuperAdmin ", s_OperServ, u->nick);
-            anope_cmd_global(s_OperServ,
+            anope_SendGlobops(s_OperServ,
                              getstring2(NULL, OPER_SUPER_ADMIN_WALL_ON),
                              u->nick);
         } else if (stricmp(setting, "off") == 0) {
             u->isSuperAdmin = 0;
             notice_lang(s_OperServ, u, OPER_SUPER_ADMIN_OFF);
             alog("%s: %s is no longer a SuperAdmin", s_OperServ, u->nick);
-            anope_cmd_global(s_OperServ,
+            anope_SendGlobops(s_OperServ,
                              getstring2(NULL, OPER_SUPER_ADMIN_WALL_OFF),
                              u->nick);
         } else {
diff --git a/src/core/os_sgline.c b/src/core/os_sgline.c
index 34db555b8..5babb79e8 100644
--- a/src/core/os_sgline.c
+++ b/src/core/os_sgline.c
@@ -162,7 +162,7 @@ int do_sgline(User * u)
                              (wall_expiry == 1) ? "" : "s");
                 }
 
-                anope_cmd_global(s_OperServ,
+                anope_SendGlobops(s_OperServ,
                                  "%s added an SGLINE for %s (%s)", u->nick,
                                  mask, buf);
             }
diff --git a/src/core/os_sqline.c b/src/core/os_sqline.c
index d35982b0a..c79e6aff2 100644
--- a/src/core/os_sqline.c
+++ b/src/core/os_sqline.c
@@ -157,7 +157,7 @@ int do_sqline(User * u)
                              (wall_expiry == 1) ? "" : "s");
                 }
 
-                anope_cmd_global(s_OperServ,
+                anope_SendGlobops(s_OperServ,
                                  "%s added an SQLINE for %s (%s)", u->nick,
                                  mask, buf);
             }
diff --git a/src/core/os_svsnick.c b/src/core/os_svsnick.c
index fa0bb0903..b6c269fa6 100644
--- a/src/core/os_svsnick.c
+++ b/src/core/os_svsnick.c
@@ -117,7 +117,7 @@ int do_svsnick(User * u)
         notice_lang(s_OperServ, u, NICK_X_FORBIDDEN, newnick);
     } else {
         notice_lang(s_OperServ, u, OPER_SVSNICK_NEWNICK, nick, newnick);
-        anope_cmd_global(s_OperServ, "%s used SVSNICK to change %s to %s",
+        anope_SendGlobops(s_OperServ, "%s used SVSNICK to change %s to %s",
                          u->nick, nick, newnick);
         anope_cmd_svsnick(nick, newnick, time(NULL));
     }
diff --git a/src/core/os_szline.c b/src/core/os_szline.c
index f4ad787f9..20882a7c9 100644
--- a/src/core/os_szline.c
+++ b/src/core/os_szline.c
@@ -154,7 +154,7 @@ int do_szline(User * u)
                              (wall_expiry == 1) ? "" : "s");
                 }
 
-                anope_cmd_global(s_OperServ,
+                anope_SendGlobops(s_OperServ,
                                  "%s added an SZLINE for %s (%s)", u->nick,
                                  mask, buf);
             }
diff --git a/src/core/os_umode.c b/src/core/os_umode.c
index 076d82096..d09627fc2 100644
--- a/src/core/os_umode.c
+++ b/src/core/os_umode.c
@@ -109,7 +109,7 @@ int do_operumodes(User * u)
         notice_lang(s_OperServ, u2, OPER_UMODE_CHANGED, u->nick);
 
         if (WallOSMode)
-            anope_cmd_global(s_OperServ, "\2%s\2 used UMODE on %s",
+            anope_SendGlobops(s_OperServ, "\2%s\2 used UMODE on %s",
                              u->nick, nick);
     }
     return MOD_CONT;