diff options
| -rw-r--r-- | data/example.conf | 17 | ||||
| -rw-r--r-- | include/config.h | 1 | ||||
| -rw-r--r-- | src/config.cpp | 4 |
3 files changed, 3 insertions, 19 deletions
diff --git a/data/example.conf b/data/example.conf index 66a75f9f2..872d5a897 100644 --- a/data/example.conf +++ b/data/example.conf @@ -766,7 +766,7 @@ log * * memoserv/sendall memoserv/staff * - * nickserv/getpass nickserv/sendpass nickserv/getemail nickserv/suspend + * nickserv/getpass nickserv/getemail nickserv/suspend * nickserv/resetpass nickserv/release nickserv/list * * nickserv/saset/autoop nickserv/saset/email nickserv/saset/greet @@ -812,7 +812,7 @@ opertype inherits = "Helper, Another Helper" /* What commands (see above) this opertype may use */ - commands = "chanserv/list chanserv/suspend chanserv/topic memoserv/staff nickserv/list nickserv/sendpass nickserv/resetpass nickserv/suspend operserv/mode operserv/chankill operserv/szline operserv/akill operserv/session operserv/modlist operserv/sqline operserv/oper operserv/kick operserv/ignore operserv/snline" + commands = "chanserv/list chanserv/suspend chanserv/topic memoserv/staff nickserv/list nickserv/resetpass nickserv/suspend operserv/mode operserv/chankill operserv/szline operserv/akill operserv/session operserv/modlist operserv/sqline operserv/oper operserv/kick operserv/ignore operserv/snline" /* What privs (see above) this opertype has */ privs = "chanserv/auspex chanserv/no-register-limit memoserv/* nickserv/auspex nickserv/confirm" @@ -998,19 +998,6 @@ mail %N administrators." /* - * The subject and message of emails sent to users when they request SENDPASS. - */ - sendpass_subject = "Nickname password for %n" - sendpass_message = "Hi, - - You have requested to receive the password of nickname %n by e-mail. - The password is %p. For security purposes, you should change it as soon as you receive this mail. - - If you don't know why this mail was sent to you, please ignore it silently. - - %N administrators." - - /* * The subject and message of emails sent to users when they request a new email address. */ emailchange_subject = "Email confirmation" diff --git a/include/config.h b/include/config.h index b69c1ce30..4ea182c0d 100644 --- a/include/config.h +++ b/include/config.h @@ -474,7 +474,6 @@ class CoreExport ServerConfig /* Mail messages to send */ Anope::string MailRegistrationSubject, MailRegistrationMessage; Anope::string MailResetSubject, MailResetMessage; - Anope::string MailSendpassSubject, MailSendpassMessage; Anope::string MailEmailchangeSubject, MailEmailchangeMessage; Anope::string MailMemoSubject, MailMemoMessage; diff --git a/src/config.cpp b/src/config.cpp index 2f12fbc6a..f84f4844f 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -423,7 +423,7 @@ static bool ValidateMail(ServerConfig *config, const Anope::string &tag, const A { if (config->UseMail) { - Anope::string check[] = { "sendmailpath", "sendfrom", "registration_subject", "registration_message", "sendpass_subject", "sendpass_message", "emailchange_subject", "emailchange_message", "memo_subject", "memo_message", "" }; + Anope::string check[] = { "sendmailpath", "sendfrom", "registration_subject", "registration_message", "emailchange_subject", "emailchange_message", "memo_subject", "memo_message", "" }; for (int i = 0; !check[i].empty(); ++i) if (value.equals_ci(check[i])) if (data.GetValue().empty()) @@ -1203,8 +1203,6 @@ ConfigItems::ConfigItems(ServerConfig *conf) {"mail", "registration_message", "", new ValueContainerString(&conf->MailRegistrationMessage), DT_STRING | DT_ALLOW_NEWLINE, ValidateMail}, {"mail", "reset_subject", "", new ValueContainerString(&conf->MailResetSubject), DT_STRING, ValidateMail}, {"mail", "reset_message", "", new ValueContainerString(&conf->MailResetMessage), DT_STRING | DT_ALLOW_NEWLINE, ValidateMail}, - {"mail", "sendpass_subject", "", new ValueContainerString(&conf->MailSendpassSubject), DT_STRING, ValidateMail}, - {"mail", "sendpass_message", "", new ValueContainerString(&conf->MailSendpassMessage), DT_STRING | DT_ALLOW_NEWLINE, ValidateMail}, {"mail", "emailchange_subject", "", new ValueContainerString(&conf->MailEmailchangeSubject), DT_STRING, ValidateMail}, {"mail", "emailchange_message", "", new ValueContainerString(&conf->MailEmailchangeMessage), DT_STRING | DT_ALLOW_NEWLINE, ValidateMail}, {"mail", "memo_subject", "", new ValueContainerString(&conf->MailMemoSubject), DT_STRING, ValidateMail}, |