pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-27 13:36:38 +02:00
Code Activity

Replaced notice_lang with notice_help in all OnHelp() functions in modules. Also fixed a few smaller issues regarding the help in the modules.

Browse Source 
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2053 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
cyberbotx
2009-02-15 01:59:21 +00:00
parent 6d835a6e49
commit 84d789c72b
100 changed files with 230 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/bs_assign.c
+8 -8
View File
@@ -36,43 +36,43 @@ class CommandBSAssign : public Command
notice_lang(s_BotServ, u, BOT_ASSIGN_READONLY);
return MOD_CONT;
}
if (!(bi = findbot(nick)))
{
notice_lang(s_BotServ, u, BOT_DOES_NOT_EXIST, nick);
return MOD_CONT;
}
if (bi->flags & BI_PRIVATE && !is_oper(u))
{
notice_lang(s_BotServ, u, PERMISSION_DENIED);
return MOD_CONT;
}
if (!(ci = cs_findchan(chan)))
{
notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
return MOD_CONT;
}
if (ci->flags & CI_FORBIDDEN)
{
notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
return MOD_CONT;
}
if ((ci->bi) && (stricmp(ci->bi->nick, nick) == 0))
{
notice_lang(s_BotServ, u, BOT_ASSIGN_ALREADY, ci->bi->nick, chan);
return MOD_CONT;
}
if ((ci->botflags & BS_NOBOT) || (!check_access(u, ci, CA_ASSIGN) && !is_services_admin(u)))
{
notice_lang(s_BotServ, u, PERMISSION_DENIED);
return MOD_CONT;
}
bi->Assign(u, ci);
notice_lang(s_BotServ, u, BOT_ASSIGN_ASSIGNED, bi->nick, ci->name);
return MOD_CONT;
@@ -80,7 +80,7 @@ class CommandBSAssign : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_BotServ, u, BOT_HELP_ASSIGN);
notice_help(s_BotServ, u, BOT_HELP_ASSIGN);
return true;
}
src/core/bs_badwords.c
+3 -3
View File
@@ -54,7 +54,7 @@ class CommandBSBadwords : public Command
return MOD_CONT;
}
CommandReturn DoAdd(User *u, ChannelInfo *ci, const char *word)
{
char *opt, *pos;
@@ -165,7 +165,7 @@ class CommandBSBadwords : public Command
if (!ci->badwords[i].in_use)
break;
}
if (i == ci->bwcount)
{
notice_lang(s_BotServ, u, BOT_BADWORDS_NOT_FOUND, word, ci->name);
@@ -298,7 +298,7 @@ class CommandBSBadwords : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_BotServ, u, BOT_HELP_BADWORDS);
notice_help(s_BotServ, u, BOT_HELP_BADWORDS);
return true;
}
src/core/bs_bot.c
+1 -1
View File
@@ -407,7 +407,7 @@ class CommandBSBot : public Command
if (!is_services_admin(u) && !is_services_root(u))
return false;
notice_lang(s_BotServ, u, BOT_SERVADMIN_HELP_BOT);
notice_help(s_BotServ, u, BOT_SERVADMIN_HELP_BOT);
return true;
}
src/core/bs_botlist.c
+1 -1
View File
@@ -69,7 +69,7 @@ class CommandBSBotList : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_BotServ, u, BOT_HELP_BOTLIST);
notice_help(s_BotServ, u, BOT_HELP_BOTLIST);
return true;
}
};
src/core/bs_info.c
+1 -1
View File
@@ -239,7 +239,7 @@ class CommandBSInfo : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_BotServ, u, BOT_HELP_INFO);
notice_help(s_BotServ, u, BOT_HELP_INFO);
return true;
}
src/core/bs_say.c
+7 -7
View File
@@ -23,7 +23,7 @@ class CommandBSSay : public Command
CommandBSSay() : Command("SAY", 2, 2)
{
}
CommandReturn Execute(User *u, std::vector<std::string> &params)
{
ChannelInfo *ci;
@@ -36,25 +36,25 @@ class CommandBSSay : public Command
notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
return MOD_CONT;
}
if (ci->flags & CI_FORBIDDEN)
{
notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
return MOD_CONT;
}
if (!ci->bi)
{
notice_help(s_BotServ, u, BOT_NOT_ASSIGNED);
return MOD_CONT;
}
if (!ci->c || ci->c->usercount < BSMinUsers)
{
notice_lang(s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name);
return MOD_CONT;
}
if (!check_access(u, ci, CA_SAY))
{
notice_lang(s_BotServ, u, ACCESS_DENIED);
@@ -66,7 +66,7 @@ class CommandBSSay : public Command
this->OnSyntaxError(u);
return MOD_CONT;
}
ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", text);
ci->bi->lastmsg = time(NULL);
if (LogBot && LogChannel && logchan && !debug && findchan(LogChannel))
@@ -76,7 +76,7 @@ class CommandBSSay : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_BotServ, u, BOT_HELP_SAY);
notice_help(s_BotServ, u, BOT_HELP_SAY);
return true;
}
src/core/bs_set.c
+9 -11
View File
@@ -22,7 +22,6 @@ class CommandBSSet : public Command
public:
CommandBSSet() : Command("SET", 3, 3)
{
this->help_param1 = s_ChanServ;
}
CommandReturn Execute(User *u, std::vector<std::string> &params)
@@ -153,25 +152,24 @@ class CommandBSSet : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
if (subcommand == "DONTKICKOPS")
notice_lang(s_BotServ, u, BOT_HELP_SET_DONTKICKOPS);
notice_help(s_BotServ, u, BOT_HELP_SET_DONTKICKOPS);
else if (subcommand == "DONTKICKVOICES")
notice_lang(s_BotServ, u, BOT_HELP_SET_DONTKICKVOICES);
notice_help(s_BotServ, u, BOT_HELP_SET_DONTKICKVOICES);
else if (subcommand == "FANTASY")
notice_lang(s_BotServ, u, BOT_HELP_SET_FANTASY);
notice_help(s_BotServ, u, BOT_HELP_SET_FANTASY);
else if (subcommand == "GREET")
notice_lang(s_BotServ, u, BOT_HELP_SET_GREET);
notice_help(s_BotServ, u, BOT_HELP_SET_GREET);
else if (subcommand == "SYMBIOSIS")
notice_lang(s_BotServ, u, BOT_HELP_SET_SYMBIOSIS);
notice_help(s_BotServ, u, BOT_HELP_SET_SYMBIOSIS, s_ChanServ);
else if (subcommand == "NOBOT" && (is_services_admin(u) || is_services_root(u)))
notice_lang(s_BotServ, u, BOT_SERVADMIN_HELP_SET_NOBOT);
notice_help(s_BotServ, u, BOT_SERVADMIN_HELP_SET_NOBOT);
else if (subcommand == "PRIVATE" && (is_services_admin(u) || is_services_root(u)))
notice_lang(s_BotServ, u, BOT_SERVADMIN_HELP_SET_PRIVATE);
notice_help(s_BotServ, u, BOT_SERVADMIN_HELP_SET_PRIVATE);
else if (subcommand.empty())
{
notice_help(s_BotServ, u, BOT_HELP_SET);
if (is_services_admin(u) || is_services_root(u))
notice_lang(s_BotServ, u, BOT_SERVADMIN_HELP_SET);
else
notice_lang(s_BotServ, u, BOT_HELP_SET);
notice_help(s_BotServ, u, BOT_SERVADMIN_HELP_SET);
}
return true;
src/core/bs_unassign.c
+1 -1
View File
@@ -49,7 +49,7 @@ class CommandBSUnassign : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_BotServ, u, BOT_HELP_UNASSIGN);
notice_help(s_BotServ, u, BOT_HELP_UNASSIGN);
return true;
}
src/core/cs_access.c
+3 -3
View File
@@ -376,8 +376,8 @@ class CommandCSAccess : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_ChanServ, u, CHAN_HELP_ACCESS);
notice_lang(s_ChanServ, u, CHAN_HELP_ACCESS_LEVELS);
notice_help(s_ChanServ, u, CHAN_HELP_ACCESS);
notice_help(s_ChanServ, u, CHAN_HELP_ACCESS_LEVELS);
return true;
}
};
@@ -509,7 +509,7 @@ class CommandCSLevels : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_ChanServ, u, CHAN_HELP_LEVELS);
notice_help(s_ChanServ, u, CHAN_HELP_LEVELS);
return true;
}
};
src/core/cs_akick.c
+1 -1
View File
@@ -636,7 +636,7 @@ class CommandCSAKick : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_ChanServ, u, CHAN_HELP_AKICK);
notice_help(s_ChanServ, u, CHAN_HELP_AKICK);
return true;
}
src/core/cs_ban.c
+3 -3
View File
@@ -41,7 +41,7 @@ class CommandCSBan : public Command
const char *chan = params[0].c_str();
const char *target = params[1].c_str();
const char *reason = NULL;
if (params.size() > 2)
{
params[2].resize(200);
@@ -116,7 +116,7 @@ class CommandCSBan : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_ChanServ, u, CHAN_HELP_BAN);
notice_help(s_ChanServ, u, CHAN_HELP_BAN);
return true;
}
@@ -174,7 +174,7 @@ class CommandCSUnban : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_ChanServ, u, CHAN_HELP_UNBAN);
notice_help(s_ChanServ, u, CHAN_HELP_UNBAN);
return true;
}
src/core/cs_clear.c
+1 -1
View File
@@ -340,7 +340,7 @@ class CommandCSClear : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_ChanServ, u, CHAN_HELP_CLEAR);
notice_help(s_ChanServ, u, CHAN_HELP_CLEAR);
return true;
}
src/core/cs_drop.c
+2 -2
View File
@@ -106,9 +106,9 @@ class CommandCSDrop : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
if (is_services_admin(u) || is_services_root(u))
notice_lang(s_ChanServ, u, CHAN_SERVADMIN_HELP_DROP);
notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_DROP);
else
notice_lang(s_ChanServ, u, CHAN_HELP_DROP);
notice_help(s_ChanServ, u, CHAN_HELP_DROP);
return true;
}
src/core/cs_forbid.c
+1 -1
View File
@@ -121,7 +121,7 @@ class CommandCSForbid : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_ChanServ, u, CHAN_SERVADMIN_HELP_FORBID);
notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_FORBID);
return true;
}
src/core/cs_getkey.c
+1 -1
View File
@@ -68,7 +68,7 @@ class CommandCSGetKey : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_ChanServ, u, CHAN_HELP_GETKEY);
notice_help(s_ChanServ, u, CHAN_HELP_GETKEY);
return true;
}
src/core/cs_getpass.c
+1 -1
View File
@@ -74,7 +74,7 @@ class CommandCSGetPass : public Command
{
if (is_services_admin(u))
{
notice_lang(s_ChanServ, u, CHAN_SERVADMIN_HELP_GETPASS);
notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_GETPASS);
return true;
}
src/core/cs_identify.c
+1 -1
View File
@@ -103,7 +103,7 @@ class CommandCSIdentify : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_ChanServ, u, CHAN_HELP_IDENTIFY);
notice_help(s_ChanServ, u, CHAN_HELP_IDENTIFY);
return true;
}
src/core/cs_invite.c
+1 -1
View File
@@ -71,7 +71,7 @@ class CommandCSInvite : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_ChanServ, u, CHAN_HELP_INVITE);
notice_help(s_ChanServ, u, CHAN_HELP_INVITE);
return true;
}
src/core/cs_kick.c
+1 -1
View File
@@ -94,7 +94,7 @@ class CommandCSKick : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_ChanServ, u, CHAN_HELP_KICK);
notice_help(s_ChanServ, u, CHAN_HELP_KICK);
return true;
}
src/core/cs_list.c
+1 -1
View File
@@ -180,7 +180,7 @@ public:
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_ChanServ, u, CHAN_HELP_LIST);
notice_help(s_ChanServ, u, CHAN_HELP_LIST);
return true;
}
src/core/cs_logout.c
+2 -2
View File
@@ -115,8 +115,8 @@ class CommandCSLogout : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
if (is_services_admin(u) || is_services_root(u))
notice_lang(s_NickServ, u, CHAN_SERVADMIN_HELP_LOGOUT);
notice_lang(s_NickServ, u, CHAN_HELP_LOGOUT);
notice_help(s_NickServ, u, CHAN_SERVADMIN_HELP_LOGOUT);
notice_help(s_NickServ, u, CHAN_HELP_LOGOUT);
return true;
}
src/core/cs_modes.c
+10 -10
View File
@@ -133,7 +133,7 @@ class CommandCSOp : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_ChanServ, u, CHAN_HELP_OP);
notice_help(s_ChanServ, u, CHAN_HELP_OP);
return true;
}
};
@@ -154,7 +154,7 @@ class CommandCSDeOp : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_ChanServ, u, CHAN_HELP_DEOP);
notice_help(s_ChanServ, u, CHAN_HELP_DEOP);
return true;
}
};
@@ -175,7 +175,7 @@ class CommandCSVoice : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_ChanServ, u, CHAN_HELP_VOICE);
notice_help(s_ChanServ, u, CHAN_HELP_VOICE);
return true;
}
};
@@ -196,7 +196,7 @@ class CommandCSDeVoice : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_ChanServ, u, CHAN_HELP_DEVOICE);
notice_help(s_ChanServ, u, CHAN_HELP_DEVOICE);
return true;
}
};
@@ -223,7 +223,7 @@ class CommandCSHalfOp : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_ChanServ, u, CHAN_HELP_HALFOP);
notice_help(s_ChanServ, u, CHAN_HELP_HALFOP);
return true;
}
};
@@ -249,7 +249,7 @@ class CommandCSDeHalfOp : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_ChanServ, u, CHAN_HELP_DEHALFOP);
notice_help(s_ChanServ, u, CHAN_HELP_DEHALFOP);
return true;
}
};
@@ -275,7 +275,7 @@ class CommandCSProtect : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_ChanServ, u, CHAN_HELP_PROTECT);
notice_help(s_ChanServ, u, CHAN_HELP_PROTECT);
return true;
}
};
@@ -302,7 +302,7 @@ class CommandCSDeProtect : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_ChanServ, u, CHAN_HELP_DEPROTECT);
notice_help(s_ChanServ, u, CHAN_HELP_DEPROTECT);
return true;
}
};
@@ -356,7 +356,7 @@ class CommandCSOwner : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_ChanServ, u, CHAN_HELP_OWNER);
notice_help(s_ChanServ, u, CHAN_HELP_OWNER);
return true;
}
};
@@ -409,7 +409,7 @@ class CommandCSDeOwner : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_ChanServ, u, CHAN_HELP_DEOWNER);
notice_help(s_ChanServ, u, CHAN_HELP_DEOWNER);
return true;
}
};
src/core/cs_register.c
+1 -1
View File
@@ -144,7 +144,7 @@ class CommandCSRegister : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_ChanServ, u, CHAN_HELP_REGISTER);
notice_help(s_ChanServ, u, CHAN_HELP_REGISTER);
return true;
}
src/core/cs_sendpass.c
+1 -1
View File
@@ -78,7 +78,7 @@ class CommandCSSendPass : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_ChanServ, u, CHAN_HELP_SENDPASS);
notice_help(s_ChanServ, u, CHAN_HELP_SENDPASS);
return true;
}
src/core/cs_set.c
+23 -23
View File
@@ -652,55 +652,55 @@ class CommandCSSet : public Command
{
if (is_services_admin(u) || is_services_root(u))
{
notice_lang(s_ChanServ, u, CHAN_SERVADMIN_HELP_SET);
notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_SET);
}
else
{
notice_lang(s_ChanServ, u, CHAN_HELP_SET);
notice_help(s_ChanServ, u, CHAN_HELP_SET);
}
}
else if (subcommand == "FOUNDER")
notice_lang(s_ChanServ, u, CHAN_HELP_SET_FOUNDER);
notice_help(s_ChanServ, u, CHAN_HELP_SET_FOUNDER);
else if (subcommand == "SUCCESSOR")
notice_lang(s_ChanServ, u, CHAN_HELP_SET_SUCCESSOR);
notice_help(s_ChanServ, u, CHAN_HELP_SET_SUCCESSOR);
else if (subcommand == "PASSWORD")
notice_lang(s_ChanServ, u, CHAN_HELP_SET_PASSWORD);
notice_help(s_ChanServ, u, CHAN_HELP_SET_PASSWORD);
else if (subcommand == "DESC")
notice_lang(s_ChanServ, u, CHAN_HELP_SET_DESC);
notice_help(s_ChanServ, u, CHAN_HELP_SET_DESC);
else if (subcommand == "URL")
notice_lang(s_ChanServ, u, CHAN_HELP_SET_URL);
notice_help(s_ChanServ, u, CHAN_HELP_SET_URL);
else if (subcommand == "EMAIL")
notice_lang(s_ChanServ, u, CHAN_HELP_SET_EMAIL);
notice_help(s_ChanServ, u, CHAN_HELP_SET_EMAIL);
else if (subcommand == "ENTRYMSG")
notice_lang(s_ChanServ, u, CHAN_HELP_SET_ENTRYMSG);
notice_help(s_ChanServ, u, CHAN_HELP_SET_ENTRYMSG);
else if (subcommand == "BANTYPE")
notice_lang(s_ChanServ, u, CHAN_HELP_SET_BANTYPE);
notice_help(s_ChanServ, u, CHAN_HELP_SET_BANTYPE);
else if (subcommand == "PRIVATE")
notice_lang(s_ChanServ, u, CHAN_HELP_SET_PRIVATE);
notice_help(s_ChanServ, u, CHAN_HELP_SET_PRIVATE);
else if (subcommand == "KEEPTOPIC")
notice_lang(s_ChanServ, u, CHAN_HELP_SET_KEEPTOPIC);
notice_help(s_ChanServ, u, CHAN_HELP_SET_KEEPTOPIC);
else if (subcommand == "TOPICLOCK")
notice_lang(s_ChanServ, u, CHAN_HELP_SET_TOPICLOCK);
notice_help(s_ChanServ, u, CHAN_HELP_SET_TOPICLOCK);
else if (subcommand == "MLOCK")
notice_lang(s_ChanServ, u, CHAN_HELP_SET_MLOCK);
notice_help(s_ChanServ, u, CHAN_HELP_SET_MLOCK);
else if (subcommand == "RESTRICTED")
notice_lang(s_ChanServ, u, CHAN_HELP_SET_RESTRICTED);
notice_help(s_ChanServ, u, CHAN_HELP_SET_RESTRICTED);
else if (subcommand == "SECURE")
notice_lang(s_ChanServ, u, CHAN_HELP_SET_SECURE);
notice_help(s_ChanServ, u, CHAN_HELP_SET_SECURE);
else if (subcommand == "SECUREOPS")
notice_lang(s_ChanServ, u, CHAN_HELP_SET_SECUREOPS);
notice_help(s_ChanServ, u, CHAN_HELP_SET_SECUREOPS);
else if (subcommand == "SECUREFOUNDER")
notice_lang(s_ChanServ, u, CHAN_HELP_SET_SECUREFOUNDER);
notice_help(s_ChanServ, u, CHAN_HELP_SET_SECUREFOUNDER);
else if (subcommand == "SIGNKICK")
notice_lang(s_ChanServ, u, CHAN_HELP_SET_SIGNKICK);
notice_help(s_ChanServ, u, CHAN_HELP_SET_SIGNKICK);
else if (subcommand == "OPNOTICE")
notice_lang(s_ChanServ, u, CHAN_HELP_SET_OPNOTICE);
notice_help(s_ChanServ, u, CHAN_HELP_SET_OPNOTICE);
else if (subcommand == "XOP")
notice_lang(s_ChanServ, u, CHAN_HELP_SET_XOP);
notice_help(s_ChanServ, u, CHAN_HELP_SET_XOP);
else if (subcommand == "PEACE")
notice_lang(s_ChanServ, u, CHAN_HELP_SET_PEACE);
notice_help(s_ChanServ, u, CHAN_HELP_SET_PEACE);
else if (subcommand == "NOEXPIRE")
notice_lang(s_ChanServ, u, CHAN_SERVADMIN_HELP_SET_NOEXPIRE);
notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_SET_NOEXPIRE);
return true;
}
src/core/cs_status.c
+1 -1
View File
@@ -55,7 +55,7 @@ class CommandCSStatus : public Command
if (!is_services_admin(u))
return false;
notice_lang(s_ChanServ, u, CHAN_SERVADMIN_HELP_STATUS);
notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_STATUS);
return true;
}
src/core/cs_suspend.c
+2 -2
View File
@@ -109,7 +109,7 @@ class CommandCSSuspend : public Command
if (!is_services_oper(u))
return false;
notice_lang(s_ChanServ, u, CHAN_SERVADMIN_HELP_SUSPEND);
notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_SUSPEND);
return true;
}
@@ -186,7 +186,7 @@ class CommandCSUnSuspend : public Command
if (!is_services_oper(u))
return false;
notice_lang(s_ChanServ, u, CHAN_SERVADMIN_HELP_UNSUSPEND);
notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_UNSUSPEND);
return true;
}
src/core/cs_topic.c
+1 -1
View File
@@ -73,7 +73,7 @@ class CommandCSTopic : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_ChanServ, u, CHAN_HELP_TOPIC);
notice_help(s_ChanServ, u, CHAN_HELP_TOPIC);
return true;
}
src/core/cs_xop.c
+4 -4
View File
@@ -456,7 +456,7 @@ class CommandCSAOP : public XOPBase
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_ChanServ, u, CHAN_HELP_AOP);
notice_help(s_ChanServ, u, CHAN_HELP_AOP);
return true;
}
@@ -480,7 +480,7 @@ class CommandCSHOP : public XOPBase
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_ChanServ, u, CHAN_HELP_HOP);
notice_help(s_ChanServ, u, CHAN_HELP_HOP);
return true;
}
@@ -504,7 +504,7 @@ class CommandCSSOP : public XOPBase
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_ChanServ, u, CHAN_HELP_SOP);
notice_help(s_ChanServ, u, CHAN_HELP_SOP);
return true;
}
@@ -528,7 +528,7 @@ class CommandCSVOP : public XOPBase
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_ChanServ, u, CHAN_HELP_VOP);
notice_help(s_ChanServ, u, CHAN_HELP_VOP);
return true;
}
src/core/hs_del.c
+1 -1
View File
@@ -49,7 +49,7 @@ class CommandHSDel : public Command
if (!is_host_remover(u))
return false;
notice_lang(s_HostServ, u, HOST_HELP_DEL);
notice_help(s_HostServ, u, HOST_HELP_DEL);
return true;
}
src/core/hs_delall.c
+1 -1
View File
@@ -56,7 +56,7 @@ class CommandHSDelAll : public Command
if (!is_host_remover(u))
return false;
notice_lang(s_HostServ, u, HOST_HELP_DELALL);
notice_help(s_HostServ, u, HOST_HELP_DELALL);
return true;
}
src/core/hs_group.c
+1 -1
View File
@@ -79,7 +79,7 @@ class CommandHSGroup : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_HostServ, u, HOST_HELP_GROUP);
notice_help(s_HostServ, u, HOST_HELP_GROUP);
return true;
}
};
src/core/hs_list.c
+1 -1
View File
@@ -142,7 +142,7 @@ class CommandHSList : public Command
if (!is_services_oper(u))
return false;
notice_lang(s_HostServ, u, HOST_HELP_LIST);
notice_help(s_HostServ, u, HOST_HELP_LIST);
return true;
}
};
src/core/hs_off.c
+1 -1
View File
@@ -50,7 +50,7 @@ class CommandHSOff : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_HostServ, u, HOST_HELP_OFF);
notice_help(s_HostServ, u, HOST_HELP_OFF);
return true;
}
};
src/core/hs_on.c
+1 -1
View File
@@ -64,7 +64,7 @@ class CommandHSOn : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_HostServ, u, HOST_HELP_ON);
notice_help(s_HostServ, u, HOST_HELP_ON);
return true;
}
};
src/core/hs_set.c
+1 -1
View File
@@ -146,7 +146,7 @@ class CommandHSSet : public Command
if (!is_host_setter(u))
return false;
notice_lang(s_HostServ, u, HOST_HELP_SET);
notice_help(s_HostServ, u, HOST_HELP_SET);
return true;
}
src/core/hs_setall.c
+1 -1
View File
@@ -146,7 +146,7 @@ class CommandHSSetAll : public Command
if (!is_host_setter(u))
return false;
notice_lang(s_HostServ, u, HOST_HELP_SETALL);
notice_help(s_HostServ, u, HOST_HELP_SETALL);
return true;
}
src/core/ms_cancel.c
+1 -1
View File
@@ -61,7 +61,7 @@ class CommandMSCancel : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_MemoServ, u, MEMO_HELP_CANCEL);
notice_help(s_MemoServ, u, MEMO_HELP_CANCEL);
return true;
}
src/core/ms_check.c
+1 -1
View File
@@ -80,7 +80,7 @@ class CommandMSCheck : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_MemoServ, u, MEMO_HELP_CHECK);
notice_help(s_MemoServ, u, MEMO_HELP_CHECK);
return true;
}
src/core/ms_del.c
+1 -1
View File
@@ -144,7 +144,7 @@ class CommandMSDel : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_MemoServ, u, MEMO_HELP_DEL);
notice_help(s_MemoServ, u, MEMO_HELP_DEL);
return true;
}
src/core/ms_info.c
+2 -2
View File
@@ -207,9 +207,9 @@ class CommandMSInfo : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
if (is_services_admin(u))
notice_lang(s_MemoServ, u, MEMO_SERVADMIN_HELP_INFO);
notice_help(s_MemoServ, u, MEMO_SERVADMIN_HELP_INFO);
else
notice_lang(s_MemoServ, u, MEMO_HELP_INFO);
notice_help(s_MemoServ, u, MEMO_HELP_INFO);
return true;
}
src/core/ms_list.c
+1 -1
View File
@@ -110,7 +110,7 @@ class CommandMSList : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_MemoServ, u, MEMO_HELP_LIST);
notice_help(s_MemoServ, u, MEMO_HELP_LIST);
return true;
}
src/core/ms_read.c
+1 -1
View File
@@ -117,7 +117,7 @@ class CommandMSRead : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_MemoServ, u, MEMO_HELP_READ);
notice_help(s_MemoServ, u, MEMO_HELP_READ);
return true;
}
src/core/ms_rsend.c
+1 -1
View File
@@ -73,7 +73,7 @@ class CommandMSRSend : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_MemoServ, u, MEMO_HELP_RSEND);
notice_help(s_MemoServ, u, MEMO_HELP_RSEND);
return true;
}
src/core/ms_send.c
+1 -1
View File
@@ -35,7 +35,7 @@ class CommandMSSend : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_MemoServ, u, MEMO_HELP_SEND);
notice_help(s_MemoServ, u, MEMO_HELP_SEND);
return true;
}
src/core/ms_sendall.c
+1 -1
View File
@@ -59,7 +59,7 @@ class CommandMSSendAll : public Command
if (!is_services_admin(u))
return false;
notice_lang(s_MemoServ, u, MEMO_HELP_SENDALL);
notice_help(s_MemoServ, u, MEMO_HELP_SENDALL);
return true;
}
src/core/ms_set.c
+4 -4
View File
@@ -237,15 +237,15 @@ class CommandMSSet : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
if (subcommand.empty())
notice_lang(s_MemoServ, u, MEMO_HELP_SET);
notice_help(s_MemoServ, u, MEMO_HELP_SET);
else if (subcommand == "NOTIFY")
notice_lang(s_MemoServ, u, MEMO_HELP_SET_NOTIFY);
notice_help(s_MemoServ, u, MEMO_HELP_SET_NOTIFY);
else if (subcommand == "LIMIT")
{
if (is_services_oper(u))
notice_lang(s_MemoServ, u, MEMO_SERVADMIN_HELP_SET_LIMIT, MSMaxMemos);
notice_help(s_MemoServ, u, MEMO_SERVADMIN_HELP_SET_LIMIT, MSMaxMemos);
else
notice_lang(s_MemoServ, u, MEMO_HELP_SET_LIMIT, MSMaxMemos);
notice_help(s_MemoServ, u, MEMO_HELP_SET_LIMIT, MSMaxMemos);
}
return true;
src/core/ms_staff.c
+1 -1
View File
@@ -57,7 +57,7 @@ class CommandMSStaff : public Command
if (!is_services_oper(u))
return false;
notice_lang(s_MemoServ, u, MEMO_HELP_STAFF);
notice_help(s_MemoServ, u, MEMO_HELP_STAFF);
return true;
}
src/core/ns_alist.c
+2 -2
View File
@@ -135,9 +135,9 @@ class CommandNSAList : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
if (is_services_admin(u))
notice_lang(s_NickServ, u, NICK_SERVADMIN_HELP_ALIST);
notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_ALIST);
else
notice_lang(s_NickServ, u, NICK_HELP_ALIST);
notice_help(s_NickServ, u, NICK_HELP_ALIST);
return true;
}
src/core/ns_drop.c
+2 -2
View File
@@ -105,9 +105,9 @@ class CommandNSDrop : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
if (is_services_admin(u))
notice_lang(s_NickServ, u, NICK_SERVADMIN_HELP_DROP);
notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_DROP);
else
notice_lang(s_NickServ, u, NICK_HELP_DROP);
notice_help(s_NickServ, u, NICK_HELP_DROP);
return true;
}
src/core/ns_forbid.c
+1 -1
View File
@@ -95,7 +95,7 @@ class CommandNSForbid : public Command
if (!is_services_admin(u))
return false;
notice_lang(s_NickServ, u, NICK_SERVADMIN_HELP_FORBID);
notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_FORBID);
return true;
}
src/core/ns_getemail.c
+1 -1
View File
@@ -63,7 +63,7 @@ class CommandNSGetEMail : public Command
if (!is_services_admin(u))
return false;
notice_lang(s_NickServ, u, NICK_SERVADMIN_HELP_GETEMAIL);
notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_GETEMAIL);
return true;
}
src/core/ns_getpass.c
+1 -1
View File
@@ -69,7 +69,7 @@ class CommandNSGetPass : public Command
if (!is_services_admin(u))
return false;
notice_lang(s_NickServ, u, NICK_SERVADMIN_HELP_GETPASS);
notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_GETPASS);
return true;
}
src/core/ns_ghost.c
+1 -1
View File
@@ -78,7 +78,7 @@ class CommandNSGhost : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_NickServ, u, NICK_HELP_GHOST);
notice_help(s_NickServ, u, NICK_HELP_GHOST);
return true;
}
src/core/ns_group.c
+3 -3
View File
@@ -201,7 +201,7 @@ class CommandNSGroup : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_NickServ, u, NICK_HELP_GROUP);
notice_help(s_NickServ, u, NICK_HELP_GROUP);
return true;
}
@@ -264,9 +264,9 @@ class CommandNSGList : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
if (is_services_admin(u))
notice_lang(s_NickServ, u, NICK_SERVADMIN_HELP_GLIST);
notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_GLIST);
else
notice_lang(s_NickServ, u, NICK_HELP_GLIST);
notice_help(s_NickServ, u, NICK_HELP_GLIST);
return true;
}
src/core/ns_identify.c
+1 -1
View File
@@ -120,7 +120,7 @@ class CommandNSIdentify : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_NickServ, u, NICK_HELP_IDENTIFY);
notice_help(s_NickServ, u, NICK_HELP_IDENTIFY);
return true;
}
src/core/ns_info.c
+2 -2
View File
@@ -207,9 +207,9 @@ class CommandNSInfo : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
if (is_services_admin(u))
notice_lang(s_NickServ, u, NICK_SERVADMIN_HELP_INFO);
notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_INFO);
else
notice_lang(s_NickServ, u, NICK_HELP_INFO);
notice_help(s_NickServ, u, NICK_HELP_INFO);
return true;
}
src/core/ns_list.c
+2 -2
View File
@@ -195,9 +195,9 @@ class CommandNSList : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
if (is_services_admin(u))
notice_lang(s_NickServ, u, NICK_SERVADMIN_HELP_LIST);
notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_LIST);
else
notice_lang(s_NickServ, u, NICK_HELP_LIST);
notice_help(s_NickServ, u, NICK_HELP_LIST);
return true;
}
src/core/ns_logout.c
+2 -2
View File
@@ -88,9 +88,9 @@ class CommandNSLogout : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
if (is_services_admin(u))
notice_lang(s_NickServ, u, NICK_SERVADMIN_HELP_LOGOUT);
notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_LOGOUT);
else
notice_lang(s_NickServ, u, NICK_HELP_LOGOUT);
notice_help(s_NickServ, u, NICK_HELP_LOGOUT);
return true;
}
src/core/ns_register.c
+3 -3
View File
@@ -211,7 +211,7 @@ class CommandNSConfirm : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_NickServ, u, NICK_HELP_CONFIRM);
notice_help(s_NickServ, u, NICK_HELP_CONFIRM);
return true;
}
};
@@ -369,7 +369,7 @@ class CommandNSRegister : public CommandNSConfirm
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_NickServ, u, NICK_HELP_REGISTER);
notice_help(s_NickServ, u, NICK_HELP_REGISTER);
return true;
}
@@ -419,7 +419,7 @@ class CommandNSResend : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_NickServ, u, NICK_HELP_RESEND);
notice_help(s_NickServ, u, NICK_HELP_RESEND);
return true;
}
};
src/core/ns_saset.c
+30 -16
View File
@@ -541,25 +541,39 @@ public:
bool OnHelp(User *u, const std::string &subcommand)
{
// This needs to change XXX
if (!is_services_oper(u))
return false;
notice_lang(s_NickServ, u, NICK_HELP_SASET);
notice_lang(s_NickServ, u, NICK_HELP_SASET_DISPLAY);
notice_lang(s_NickServ, u, NICK_HELP_SASET_PASSWORD);
notice_lang(s_NickServ, u, NICK_HELP_SASET_URL);
notice_lang(s_NickServ, u, NICK_HELP_SASET_EMAIL);
notice_lang(s_NickServ, u, NICK_HELP_SASET_ICQ);
notice_lang(s_NickServ, u, NICK_HELP_SASET_GREET);
notice_lang(s_NickServ, u, NICK_HELP_SASET_KILL);
notice_lang(s_NickServ, u, NICK_HELP_SASET_SECURE);
notice_lang(s_NickServ, u, NICK_HELP_SASET_PRIVATE);
notice_lang(s_NickServ, u, NICK_HELP_SASET_MSG);
notice_lang(s_NickServ, u, NICK_HELP_SASET_HIDE);
notice_lang(s_NickServ, u, NICK_HELP_SASET_NOEXPIRE);
notice_lang(s_NickServ, u, NICK_HELP_SASET_AUTOOP);
notice_lang(s_NickServ, u, NICK_HELP_SASET_LANGUAGE);
if (subcommand.empty())
notice_help(s_NickServ, u, NICK_HELP_SASET);
else if (subcommand == "DISPLAY")
notice_help(s_NickServ, u, NICK_HELP_SASET_DISPLAY);
else if (subcommand == "PASSWORD")
notice_help(s_NickServ, u, NICK_HELP_SASET_PASSWORD);
else if (subcommand == "URL")
notice_help(s_NickServ, u, NICK_HELP_SASET_URL);
else if (subcommand == "EMAIL")
notice_help(s_NickServ, u, NICK_HELP_SASET_EMAIL);
else if (subcommand == "ICQ")
notice_help(s_NickServ, u, NICK_HELP_SASET_ICQ);
else if (subcommand == "GREET")
notice_help(s_NickServ, u, NICK_HELP_SASET_GREET);
else if (subcommand == "KILL")
notice_help(s_NickServ, u, NICK_HELP_SASET_KILL);
else if (subcommand == "SECURE")
notice_help(s_NickServ, u, NICK_HELP_SASET_SECURE);
else if (subcommand == "PRIVATE")
notice_help(s_NickServ, u, NICK_HELP_SASET_PRIVATE);
else if (subcommand == "MSG")
notice_help(s_NickServ, u, NICK_HELP_SASET_MSG);
else if (subcommand == "HIDE")
notice_help(s_NickServ, u, NICK_HELP_SASET_HIDE);
else if (subcommand == "NOEXPIRE")
notice_help(s_NickServ, u, NICK_HELP_SASET_NOEXPIRE);
else if (subcommand == "AUTOOP")
notice_help(s_NickServ, u, NICK_HELP_SASET_AUTOOP);
else if (subcommand == "LANGUAGE")
notice_help(s_NickServ, u, NICK_HELP_SASET_LANGUAGE);
return true;
}
src/core/ns_sendpass.c
+1 -1
View File
@@ -75,7 +75,7 @@ class CommandNSSendPass : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_NickServ, u, NICK_HELP_SENDPASS);
notice_help(s_NickServ, u, NICK_HELP_SENDPASS);
return true;
}
src/core/ns_set.c
+13 -13
View File
@@ -505,31 +505,31 @@ class CommandNSSet : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
if (subcommand == "DISPLAY")
notice_lang(s_NickServ, u, NICK_HELP_SET_DISPLAY);
notice_help(s_NickServ, u, NICK_HELP_SET_DISPLAY);
else if (subcommand == "PASSWORD")
notice_lang(s_NickServ, u, NICK_HELP_SET_PASSWORD);
notice_help(s_NickServ, u, NICK_HELP_SET_PASSWORD);
else if (subcommand == "URL")
notice_lang(s_NickServ, u, NICK_HELP_SET_URL);
notice_help(s_NickServ, u, NICK_HELP_SET_URL);
else if (subcommand == "EMAIL")
notice_lang(s_NickServ, u, NICK_HELP_SET_EMAIL);
notice_help(s_NickServ, u, NICK_HELP_SET_EMAIL);
else if (subcommand == "ICQ")
notice_lang(s_NickServ, u, NICK_HELP_SET_ICQ);
notice_help(s_NickServ, u, NICK_HELP_SET_ICQ);
else if (subcommand == "GREET")
notice_lang(s_NickServ, u, NICK_HELP_SET_GREET);
notice_help(s_NickServ, u, NICK_HELP_SET_GREET);
else if (subcommand == "KILL")
notice_lang(s_NickServ, u, NICK_HELP_SET_KILL);
notice_help(s_NickServ, u, NICK_HELP_SET_KILL);
else if (subcommand == "SECURE")
notice_lang(s_NickServ, u, NICK_HELP_SET_SECURE);
notice_help(s_NickServ, u, NICK_HELP_SET_SECURE);
else if (subcommand == "PRIVATE")
notice_lang(s_NickServ, u, NICK_HELP_SET_PRIVATE);
notice_help(s_NickServ, u, NICK_HELP_SET_PRIVATE);
else if (subcommand == "MSG")
notice_lang(s_NickServ, u, NICK_HELP_SET_MSG);
notice_help(s_NickServ, u, NICK_HELP_SET_MSG);
else if (subcommand == "HIDE")
notice_lang(s_NickServ, u, NICK_HELP_SET_HIDE);
notice_help(s_NickServ, u, NICK_HELP_SET_HIDE);
else if (subcommand == "AUTOOP")
notice_lang(s_NickServ, u, NICK_HELP_SET_AUTOOP);
notice_help(s_NickServ, u, NICK_HELP_SET_AUTOOP);
else
notice_lang(s_NickServ, u, NICK_HELP_SET);
notice_help(s_NickServ, u, NICK_HELP_SET);
return true;
}
src/core/ns_status.c
+1 -1
View File
@@ -57,7 +57,7 @@ class CommandNSStatus : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_NickServ, u, NICK_HELP_STATUS);
notice_help(s_NickServ, u, NICK_HELP_STATUS);
return true;
}
};
src/core/ns_suspend.c
+2 -2
View File
@@ -91,7 +91,7 @@ class CommandNSSuspend : public Command
if (!is_services_oper(u))
return false;
notice_lang(s_NickServ, u, NICK_SERVADMIN_HELP_SUSPEND);
notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_SUSPEND);
return true;
}
@@ -161,7 +161,7 @@ class CommandNSUnSuspend : public Command
if (!is_services_oper(u))
return false;
notice_lang(s_NickServ, u, NICK_SERVADMIN_HELP_UNSUSPEND);
notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_UNSUSPEND);
return true;
}
src/core/ns_update.c
+1 -1
View File
@@ -48,7 +48,7 @@ class CommandNSUpdate : public Command
bool OnHelp(User *u, const std::string &)
{
notice_lang(s_NickServ, u, NICK_HELP_UPDATE);
notice_help(s_NickServ, u, NICK_HELP_UPDATE);
return true;
}
};
src/core/os_admin.c
+1 -2
View File
@@ -215,7 +215,6 @@ class CommandOSAdmin : public Command
public:
CommandOSAdmin() : Command("ADMIN", 1, 2)
{
this->help_param1 = s_NickServ;
}
CommandReturn Execute(User *u, std::vector<std::string> &params)
@@ -237,7 +236,7 @@ class CommandOSAdmin : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_OperServ, u, OPER_HELP_ADMIN);
notice_help(s_OperServ, u, OPER_HELP_ADMIN, s_NickServ);
return true;
}
src/core/os_akill.c
+1 -1
View File
@@ -315,7 +315,7 @@ class CommandOSAKill : public Command
if (!is_services_oper(u))
return false;
notice_lang(s_OperServ, u, OPER_HELP_AKILL);
notice_help(s_OperServ, u, OPER_HELP_AKILL);
return true;
}
src/core/os_chankill.c
+1 -1
View File
@@ -93,7 +93,7 @@ class CommandOSChanKill : public Command
if (!is_services_admin(u))
return false;
notice_lang(s_OperServ, u, OPER_HELP_CHANKILL);
notice_help(s_OperServ, u, OPER_HELP_CHANKILL);
return true;
}
src/core/os_chanlist.c
+1 -1
View File
@@ -77,7 +77,7 @@ class CommandOSChanList : public Command
if (!is_services_oper(u))
return false;
notice_lang(s_OperServ, u, OPER_HELP_CHANLIST);
notice_help(s_OperServ, u, OPER_HELP_CHANLIST);
return true;
}
};
src/core/os_clearmodes.c
+1 -1
View File
@@ -238,7 +238,7 @@ class CommandOSClearModes : public Command
if (!is_services_oper(u))
return false;
notice_lang(s_OperServ, u, OPER_HELP_CLEARMODES);
notice_help(s_OperServ, u, OPER_HELP_CLEARMODES);
return true;
}
src/core/os_defcon.c
+1 -1
View File
@@ -81,7 +81,7 @@ class CommandOSDEFCON : public Command
if (!is_services_admin(u))
return false;
notice_lang(s_OperServ, u, OPER_HELP_DEFCON);
notice_help(s_OperServ, u, OPER_HELP_DEFCON);
return true;
}
src/core/os_global.c
+1 -2
View File
@@ -22,7 +22,6 @@ class CommandOSGlobal : public Command
public:
CommandOSGlobal() : Command("GLOBAL", 1, 1)
{
this->help_param1 = s_GlobalNoticer;
}
CommandReturn Execute(User *u, std::vector<std::string> &params)
@@ -40,7 +39,7 @@ class CommandOSGlobal : public Command
if (!is_services_admin(u))
return false;
notice_lang(s_OperServ, u, OPER_HELP_GLOBAL);
notice_help(s_OperServ, u, OPER_HELP_GLOBAL, s_GlobalNoticer);
return true;
}
src/core/os_ignore.c
+1 -1
View File
@@ -125,7 +125,7 @@ class CommandOSIgnore : public Command
if (!is_services_admin(u))
return false;
notice_lang(s_OperServ, u, OPER_HELP_IGNORE);
notice_help(s_OperServ, u, OPER_HELP_IGNORE);
return true;
}
src/core/os_jupe.c
+1 -1
View File
@@ -50,7 +50,7 @@ class CommandOSJupe : public Command
if (!is_services_admin(u))
return false;
notice_lang(s_OperServ, u, OPER_HELP_JUPE);
notice_help(s_OperServ, u, OPER_HELP_JUPE);
return true;
}
src/core/os_kick.c
+1 -1
View File
@@ -58,7 +58,7 @@ class CommandOSKick : public Command
if (!is_services_oper(u))
return false;
notice_lang(s_OperServ, u, OPER_HELP_KICK);
notice_help(s_OperServ, u, OPER_HELP_KICK);
return true;
}
src/core/os_mode.c
+1 -1
View File
@@ -56,7 +56,7 @@ class CommandOSMode : public Command
if (!is_services_oper(u))
return false;
notice_lang(s_OperServ, u, OPER_HELP_MODE);
notice_help(s_OperServ, u, OPER_HELP_MODE);
return true;
}
src/core/os_modinfo.c
+1 -1
View File
@@ -57,7 +57,7 @@ class CommandOSModInfo : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_OperServ, u, OPER_HELP_MODINFO);
notice_help(s_OperServ, u, OPER_HELP_MODINFO);
return true;
}
src/core/os_modlist.c
+1 -1
View File
@@ -165,7 +165,7 @@ class CommandOSModList : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_OperServ, u, OPER_HELP_MODLIST);
notice_help(s_OperServ, u, OPER_HELP_MODLIST);
return true;
}
};
src/core/os_modload.c
+2 -1
View File
@@ -49,7 +49,7 @@ class CommandOSModLoad : public Command
if (!is_services_root(u))
return false;
notice_lang(s_OperServ, u, OPER_HELP_MODLOAD);
notice_help(s_OperServ, u, OPER_HELP_MODLOAD);
return true;
}
@@ -67,6 +67,7 @@ class OSModLoad : public Module
this->SetAuthor("Anope");
this->SetVersion("$Id$");
this->SetType(CORE);
this->SetPermanent(true);
this->AddCommand(OPERSERV, new CommandOSModLoad(), MOD_UNIQUE);
src/core/os_modunload.c
+1 -1
View File
@@ -51,7 +51,7 @@ class CommandOSModUnLoad : public Command
if (!is_services_root(u))
return false;
notice_lang(s_OperServ, u, OPER_HELP_MODUNLOAD);
notice_help(s_OperServ, u, OPER_HELP_MODUNLOAD);
return true;
}
src/core/os_news.c
+3 -3
View File
@@ -271,7 +271,7 @@ class CommandOSLogonNews : public NewsBase
if (!is_services_admin(u))
return false;
notice_lang(s_OperServ, u, NEWS_HELP_LOGON);
notice_help(s_OperServ, u, NEWS_HELP_LOGON, this->help_param1);
return true;
}
@@ -317,7 +317,7 @@ class CommandOSOperNews : public NewsBase
if (!is_services_admin(u))
return false;
notice_lang(s_OperServ, u, NEWS_HELP_OPER);
notice_help(s_OperServ, u, NEWS_HELP_OPER, this->help_param1);
return true;
}
@@ -355,7 +355,7 @@ class CommandOSRandomNews : public NewsBase
if (!is_services_admin(u))
return false;
notice_lang(s_OperServ, u, NEWS_HELP_RANDOM);
notice_help(s_OperServ, u, NEWS_HELP_RANDOM);
return true;
}
src/core/os_noop.c
+1 -1
View File
@@ -66,7 +66,7 @@ class CommandOSNOOP : public Command
if (!is_services_admin(u))
return false;
notice_lang(s_OperServ, u, OPER_HELP_NOOP);
notice_help(s_OperServ, u, OPER_HELP_NOOP);
return true;
}
src/core/os_oline.c
+1 -1
View File
@@ -65,7 +65,7 @@ class CommandOSOLine : public Command
if (!is_services_root(u))
return false;
notice_lang(s_OperServ, u, OPER_HELP_OLINE);
notice_help(s_OperServ, u, OPER_HELP_OLINE);
return true;
}
src/core/os_oper.c
+1 -2
View File
@@ -222,7 +222,6 @@ class CommandOSOper : public Command
public:
CommandOSOper() : Command("OPER", 1, 2)
{
this->help_param1 = s_NickServ;
}
CommandReturn Execute(User *u, std::vector<std::string> &params)
@@ -244,7 +243,7 @@ class CommandOSOper : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_OperServ, u, OPER_HELP_OPER);
notice_help(s_OperServ, u, OPER_HELP_OPER, s_NickServ);
return true;
}
src/core/os_quit.c
+1 -1
View File
@@ -43,7 +43,7 @@ class CommandOSQuit : public Command
if (!is_services_root(u))
return false;
notice_lang(s_OperServ, u, OPER_HELP_QUIT);
notice_help(s_OperServ, u, OPER_HELP_QUIT);
return true;
}
};
src/core/os_reload.c
+1 -1
View File
@@ -45,7 +45,7 @@ class CommandOSReload : public Command
if (!is_services_root(u))
return false;
notice_lang(s_OperServ, u, OPER_HELP_RELOAD);
notice_help(s_OperServ, u, OPER_HELP_RELOAD);
return true;
}
};
src/core/os_restart.c
+1 -1
View File
@@ -48,7 +48,7 @@ class CommandOSRestart : public Command
if (!is_services_root(u))
return false;
notice_lang(s_OperServ, u, OPER_HELP_RESTART);
notice_help(s_OperServ, u, OPER_HELP_RESTART);
return true;
}
};
src/core/os_session.c
+2 -2
View File
@@ -88,7 +88,7 @@ class CommandOSSession : public Command
if (!is_services_oper(u))
return false;
notice_lang(s_OperServ, u, OPER_HELP_SESSION);
notice_help(s_OperServ, u, OPER_HELP_SESSION);
return true;
}
@@ -449,7 +449,7 @@ class CommandOSException : public Command
if (!is_services_oper(u))
return false;
notice_lang(s_OperServ, u, OPER_HELP_EXCEPTION);
notice_help(s_OperServ, u, OPER_HELP_EXCEPTION);
return true;
}
src/core/os_set.c
+8 -8
View File
@@ -268,21 +268,21 @@ class CommandOSSet : public Command
return false;
if (subcommand.empty())
notice_lang(s_OperServ, u, OPER_HELP_SET);
notice_help(s_OperServ, u, OPER_HELP_SET);
else if (subcommand == "LIST")
notice_lang(s_OperServ, u, OPER_HELP_SET_LIST);
notice_help(s_OperServ, u, OPER_HELP_SET_LIST);
else if (subcommand == "READONLY")
notice_lang(s_OperServ, u, OPER_HELP_SET_READONLY);
notice_help(s_OperServ, u, OPER_HELP_SET_READONLY);
else if (subcommand == "LOGCHAN")
notice_lang(s_OperServ, u, OPER_HELP_SET_LOGCHAN);
notice_help(s_OperServ, u, OPER_HELP_SET_LOGCHAN);
else if (subcommand == "DEBUG")
notice_lang(s_OperServ, u, OPER_HELP_SET_DEBUG);
notice_help(s_OperServ, u, OPER_HELP_SET_DEBUG);
else if (subcommand == "NOEXPIRE")
notice_lang(s_OperServ, u, OPER_HELP_SET_NOEXPIRE);
notice_help(s_OperServ, u, OPER_HELP_SET_NOEXPIRE);
else if (subcommand == "IGNORE")
notice_lang(s_OperServ, u, OPER_HELP_SET_IGNORE);
notice_help(s_OperServ, u, OPER_HELP_SET_IGNORE);
else if (subcommand == "SUPERADMIN")
notice_lang(s_OperServ, u, OPER_HELP_SET_SUPERADMIN);
notice_help(s_OperServ, u, OPER_HELP_SET_SUPERADMIN);
return true;
}
src/core/os_sgline.c
+1 -1
View File
@@ -312,7 +312,7 @@ class CommandOSSGLine : public Command
if (!is_services_oper(u))
return false;
notice_lang(s_OperServ, u, OPER_HELP_SGLINE);
notice_help(s_OperServ, u, OPER_HELP_SGLINE);
return true;
}
src/core/os_shutdown.c
+1 -1
View File
@@ -44,7 +44,7 @@ class CommandOSShutdown : public Command
if (!is_services_root(u))
return false;
notice_lang(s_OperServ, u, OPER_HELP_SHUTDOWN);
notice_help(s_OperServ, u, OPER_HELP_SHUTDOWN);
return true;
}
};
src/core/os_sqline.c
+1 -1
View File
@@ -299,7 +299,7 @@ class CommandOSSQLine : public Command
if (!is_services_oper(u))
return false;
notice_lang(s_OperServ, u, OPER_HELP_SQLINE);
notice_help(s_OperServ, u, OPER_HELP_SQLINE);
return true;
}
src/core/os_staff.c
+1 -1
View File
@@ -70,7 +70,7 @@ class CommandOSStaff : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_OperServ, u, OPER_HELP_STAFF);
notice_help(s_OperServ, u, OPER_HELP_STAFF);
return true;
}
};
src/core/os_stats.c
+1 -1
View File
@@ -313,7 +313,7 @@ class CommandOSStats : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_OperServ, u, OPER_HELP_STATS);
notice_help(s_OperServ, u, OPER_HELP_STATS);
return true;
}
};
src/core/os_svsnick.c
+1 -1
View File
@@ -83,7 +83,7 @@ class CommandOSSVSNick : public Command
if (!is_services_root(u))
return false;
notice_lang(s_OperServ, u, OPER_HELP_SVSNICK);
notice_help(s_OperServ, u, OPER_HELP_SVSNICK);
return true;
}
src/core/os_szline.c
+1 -1
View File
@@ -298,7 +298,7 @@ class CommandOSSZLine : public Command
if (!is_services_oper(u))
return false;
notice_lang(s_OperServ, u, OPER_HELP_SZLINE);
notice_help(s_OperServ, u, OPER_HELP_SZLINE);
return true;
}
src/core/os_umode.c
+1 -1
View File
@@ -69,7 +69,7 @@ class CommandOSUMode : public Command
if (!is_services_root(u))
return false;
notice_lang(s_OperServ, u, OPER_HELP_UMODE);
notice_help(s_OperServ, u, OPER_HELP_UMODE);
return true;
}
src/core/os_update.c
+1 -1
View File
@@ -36,7 +36,7 @@ class CommandOSUpdate : public Command
if (!is_services_root(u))
return false;
notice_lang(s_OperServ, u, OPER_HELP_UPDATE);
notice_help(s_OperServ, u, OPER_HELP_UPDATE);
return true;
}
};
src/core/os_userlist.c
+1 -1
View File
@@ -79,7 +79,7 @@ class CommandOSUserList : public Command
bool OnHelp(User *u, const std::string &subcommand)
{
notice_lang(s_OperServ, u, OPER_HELP_USERLIST);
notice_help(s_OperServ, u, OPER_HELP_USERLIST);
return true;
}
};