pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-10 13:03:12 +02:00
Code Activity

Moved the language strings which are only used once

Browse Source 
out of the core and into the modules that use them.
This commit is contained in:
Adam
2011-02-04 15:30:31 -05:00
parent c362a1e077
commit 08583dc107
226 changed files with 42289 additions and 45412 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/ns_register.cpp
+89 -35
View File
@@ -52,23 +52,23 @@ class CommandNSConfirm : public Command
u->Login(na->nc);
Log(LOG_COMMAND, u, this) << "to register " << nr->nick << " (email: " << (!nr->email.empty() ? nr->email : "none") << ")";
if (Config->NSAddAccessOnReg)
source.Reply(NICK_REGISTERED, u->nick.c_str(), na->nc->GetAccess(0).c_str());
source.Reply(_("Nickname \002%s\002 registered under your account: %s"), u->nick.c_str(), na->nc->GetAccess(0).c_str());
else
source.Reply(NICK_REGISTERED_NO_MASK, u->nick.c_str());
source.Reply(_("Nickname \002%s\002 registered."), u->nick.c_str());
delete nr;
ircdproto->SendAccountLogin(u, u->Account());
ircdproto->SetAutoIdentificationToken(u);
if (enc_decrypt(na->nc->pass, tmp_pass) == 1)
source.Reply(NICK_PASSWORD_IS, tmp_pass.c_str());
source.Reply(_("Your password is \002%s\002 - remember this for later use."), tmp_pass.c_str());
u->lastnickreg = Anope::CurTime;
}
else
{
Log(LOG_COMMAND, u, this) << "to confirm " << nr->nick << " (email: " << (!nr->email.empty() ? nr->email : "none") << ")";
source.Reply(NICK_FORCE_REG, nr->nick.c_str());
source.Reply(_("Nickname \002%s\002 confirmed"), nr->nick.c_str());
User *user = finduser(nr->nick);
/* Delrequest must be called before validate_user */
delete nr;
@@ -109,21 +109,21 @@ class CommandNSConfirm : public Command
return MOD_CONT;
}
}
source.Reply(NICK_CONFIRM_NOT_FOUND, Config->s_NickServ.c_str());
source.Reply(_("Registration step 1 may have expired, please use \"%R%s register <password> <email>\" first."), Config->s_NickServ.c_str());
return MOD_CONT;
}
if (!nr->passcode.equals_cs(passcode))
{
source.Reply(NICK_CONFIRM_INVALID);
source.Reply(LanguageString::NICK_CONFIRM_INVALID);
return MOD_CONT;
}
}
if (!nr)
{
source.Reply(NICK_REGISTRATION_FAILED);
source.Reply(_("Sorry, registration failed."));
return MOD_CONT;
}
@@ -145,20 +145,31 @@ class CommandNSConfirm : public Command
bool OnHelp(CommandSource &source, const Anope::string &subcommand)
{
User *u = source.u;
source.Reply(NICK_HELP_CONFIRM);
source.Reply(_("Syntax: \002CONFIRM \037passcode\037\002\n"
" \n"
"This is the second step of nickname registration process.\n"
"You must perform this command in order to get your nickname\n"
"registered with %S. The passcode (or called auth code also)\n"
"is sent to your e-mail address in the first step of the\n"
"registration process. For more information about the first\n"
"stage of the registration process, type: \002%R%S HELP REGISTER\002\n"
" \n"
"This is also used after the RESETPASS command has been used to\n"
"force identify you to your nick so you may change your password."));
if (u->Account() && u->Account()->HasPriv("nickserv/confirm"))
source.Reply(NICK_HELP_CONFIRM_OPER);
source.Reply(_("Additionally, Services Operators with the \037nickserv/confirm\037 permission can\n"
"replace \037passcode\037 with a users nick to force validate them."));
return true;
}
void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
{
source.Reply(NICK_CONFIRM_INVALID);
source.Reply(LanguageString::NICK_CONFIRM_INVALID);
}
void OnServHelp(CommandSource &source)
{
source.Reply(NICK_HELP_CMD_CONFIRM);
source.Reply(_(" CONFIRM Confirm a nickserv auth code"));
}
};
@@ -192,19 +203,19 @@ class CommandNSRegister : public CommandNSConfirm
if (readonly)
{
source.Reply(NICK_REGISTRATION_DISABLED);
source.Reply(_("Sorry, nickname registration is temporarily disabled."));
return MOD_CONT;
}
if (!u->HasMode(UMODE_OPER) && Config->NickRegDelay && Anope::CurTime - u->my_signon < Config->NickRegDelay)
{
source.Reply(NICK_REG_DELAY, Config->NickRegDelay);
source.Reply(_("You must have been using this nick for at least %d seconds to register."), Config->NickRegDelay);
return MOD_CONT;
}
if ((anr = findrequestnick(u->nick)))
{
source.Reply(NICK_REQUESTED);
source.Reply(LanguageString::NICK_REQUESTED);
return MOD_CONT;
}
@@ -215,13 +226,13 @@ class CommandNSRegister : public CommandNSConfirm
*/
if (nicklen <= prefixlen + 7 && nicklen >= prefixlen + 1 && !u->nick.find_ci(Config->NSGuestNickPrefix) && u->nick.substr(prefixlen).find_first_not_of("1234567890") == Anope::string::npos)
{
source.Reply(NICK_CANNOT_BE_REGISTERED, u->nick.c_str());
source.Reply(LanguageString::NICK_CANNOT_BE_REGISTERED, u->nick.c_str());
return MOD_CONT;
}
if (!ircdproto->IsNickValid(u->nick))
{
source.Reply(NICK_X_FORBIDDEN, u->nick.c_str());
source.Reply(LanguageString::NICK_X_FORBIDDEN, u->nick.c_str());
return MOD_CONT;
}
@@ -232,7 +243,7 @@ class CommandNSRegister : public CommandNSConfirm
if (u->nick.find_ci(nick) != Anope::string::npos && !u->HasMode(UMODE_OPER))
{
source.Reply(NICK_CANNOT_BE_REGISTERED, u->nick.c_str());
source.Reply(LanguageString::NICK_CANNOT_BE_REGISTERED, u->nick.c_str());
return MOD_CONT;
}
}
@@ -240,24 +251,24 @@ class CommandNSRegister : public CommandNSConfirm
if (Config->NSForceEmail && email.empty())
this->OnSyntaxError(source, "");
else if (Anope::CurTime < u->lastnickreg + Config->NSRegDelay)
source.Reply(NICK_REG_PLEASE_WAIT, (u->lastnickreg + Config->NSRegDelay) - Anope::CurTime);
source.Reply(_("Please wait %d seconds before using the REGISTER command again."), (u->lastnickreg + Config->NSRegDelay) - Anope::CurTime);
else if ((na = findnick(u->nick)))
{
/* i.e. there's already such a nick regged */
if (na->HasFlag(NS_FORBIDDEN))
{
Log(NickServ) << u->GetMask() << " tried to register FORBIDden nick " << u->nick;
source.Reply(NICK_CANNOT_BE_REGISTERED, u->nick.c_str());
source.Reply(LanguageString::NICK_CANNOT_BE_REGISTERED, u->nick.c_str());
}
else
source.Reply(NICK_ALREADY_REGISTERED, u->nick.c_str());
source.Reply(LanguageString::NICK_ALREADY_REGISTERED, u->nick.c_str());
}
else if (pass.equals_ci(u->nick) || (Config->StrictPasswords && pass.length() < 5))
source.Reply(MORE_OBSCURE_PASSWORD);
source.Reply(LanguageString::MORE_OBSCURE_PASSWORD);
else if (pass.length() > Config->PassLen)
source.Reply(PASSWORD_TOO_LONG);
source.Reply(LanguageString::PASSWORD_TOO_LONG);
else if (!email.empty() && !MailValidate(email))
source.Reply(MAIL_X_INVALID, email.c_str());
source.Reply(LanguageString::MAIL_X_INVALID, email.c_str());
else
{
for (idx = 0; idx < 9; ++idx)
@@ -273,13 +284,16 @@ class CommandNSRegister : public CommandNSConfirm
{
if (SendRegmail(u, nr))
{
source.Reply(NICK_ENTER_REG_CODE, email.c_str(), Config->s_NickServ.c_str(), Config->s_NickServ.c_str());
source.Reply(_("A passcode has been sent to %s, please type %R%s confirm <passcode> to complete registration.\n"
"If you need to cancel your registration, use \"%R%s drop <password>\"."),
email.c_str(), Config->s_NickServ.c_str(), Config->s_NickServ.c_str());
Log(LOG_COMMAND, u, this) << "send registration verification code to " << nr->email;
}
else
{
Log(LOG_COMMAND, u, this) << "unable to send registration verification mail";
source.Reply(NICK_REG_UNABLE);
source.Reply(_("Nick NOT registered, please try again later."));
delete nr;
return MOD_CONT;
}
@@ -296,21 +310,51 @@ class CommandNSRegister : public CommandNSConfirm
bool OnHelp(CommandSource &source, const Anope::string &subcommand)
{
source.Reply(NICK_HELP_REGISTER);
source.Reply(_("Syntax: \002REGISTER \037password\037 \037[email]\037\002\n"
" \n"
"Registers your nickname in the %S database. Once\n"
"your nick is registered, you can use the \002SET\002 and \002ACCESS\002\n"
"commands to configure your nick's settings as you like\n"
"them. Make sure you remember the password you use when\n"
"registering - you'll need it to make changes to your nick\n"
"later. (Note that \002case matters!\002 \037ANOPE\037, \037Anope\037, and \n"
"\037anope\037 are all different passwords!)\n"
" \n"
"Guidelines on choosing passwords:\n"
" \n"
"Passwords should not be easily guessable. For example,\n"
"using your real name as a password is a bad idea. Using\n"
"your nickname as a password is a much worse idea ;) and,\n"
"in fact, %S will not allow it. Also, short\n"
"passwords are vulnerable to trial-and-error searches, so\n"
"you should choose a password at least 5 characters long.\n"
"Finally, the space character cannot be used in passwords.\n"
" \n"
"The parameter \037email\037 is optional and will set the email\n"
"for your nick immediately. However, it may be required\n"
"on certain networks.\n"
"Your privacy is respected; this e-mail won't be given to\n"
"any third-party person.\n"
" \n"
"This command also creates a new group for your nickname,\n"
"that will allow you to register other nicks later sharing\n"
"the same configuration, the same set of memos and the\n"
"same channel privileges. For more information on this\n"
"feature, type \002%R%S HELP GROUP\002."));
return true;
}
void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
{
if (Config->NSForceEmail)
SyntaxError(source, "REGISTER", NICK_REGISTER_SYNTAX_EMAIL);
SyntaxError(source, "REGISTER", _("\037password\037 \037email\037"));
else
SyntaxError(source, "REGISTER", NICK_REGISTER_SYNTAX);
SyntaxError(source, "REGISTER", _("\037password\037 [\037email\037]"));
}
void OnServHelp(CommandSource &source)
{
source.Reply(NICK_HELP_CMD_REGISTER);
source.Reply(_(" REGISTER Register a nickname"));
}
};
@@ -332,13 +376,13 @@ class CommandNSResend : public Command
{
if (Anope::CurTime < nr->lastmail + Config->NSResendDelay)
{
source.Reply(MAIL_LATER);
source.Reply(_("Cannot send mail now; please retry a little later."));
return MOD_CONT;
}
if (!SendRegmail(u, nr))
{
nr->lastmail = Anope::CurTime;
source.Reply(NICK_REG_RESENT, nr->email.c_str());
source.Reply(_("Your passcode has been re-sent to %s."), nr->email.c_str());
Log(LOG_COMMAND, u, this) << "resend registration verification code for " << nr->nick;
}
else
@@ -353,13 +397,16 @@ class CommandNSResend : public Command
bool OnHelp(CommandSource &source, const Anope::string &subcommand)
{
source.Reply(NICK_HELP_RESEND);
source.Reply(_("Syntax: \002RESEND\002\n"
" \n"
"This command will re-send the auth code (also called passcode)\n"
"to the e-mail address of the user whom is performing it."));
return true;
}
void OnServHelp(CommandSource &source)
{
source.Reply(NICK_HELP_CMD_RESEND);
source.Reply(_(" RESEND Resend a nickserv auth code"));
}
};
@@ -385,8 +432,15 @@ static bool SendRegmail(User *u, NickRequest *nr)
{
char subject[BUFSIZE], message[BUFSIZE];
snprintf(subject, sizeof(subject), GetString(NICK_REG_MAIL_SUBJECT).c_str(), nr->nick.c_str());
snprintf(message, sizeof(message), GetString(NICK_REG_MAIL).c_str(), nr->nick.c_str(), Config->NetworkName.c_str(), Config->s_NickServ.c_str(), nr->passcode.c_str(), Config->NetworkName.c_str());
snprintf(subject, sizeof(subject), GetString(NULL, "Nickname Registration (%s)").c_str(), nr->nick.c_str());
snprintf(message, sizeof(message), GetString(NULL, "Hi,\n"
" \n"
"You have requested to register the nickname %s on %s.\n"
"Please type \" %R%s confirm %s \" to complete registration.\n"
" \n"
"If you don't know why this mail was sent to you, please ignore it silently.\n"
" \n"
"%s administrators.").c_str(), nr->nick.c_str(), Config->NetworkName.c_str(), Config->s_NickServ.c_str(), nr->passcode.c_str(), Config->NetworkName.c_str());
return Mail(u, nr, NickServ, subject, message);
}