Auto merge of #2203 - arcalinea:2142_security_log_message, r=daira
Add message directing users to security guide Addresses #2142, which was blocking on updates to zcash/support/security.html. That page has now been added, so this message directing users to the site can be included. It displays in the zcash-cli --help and --version message text, and on the zcashd metrics screen.
This commit is contained in:
commit
f7fcad709b
|
@ -69,7 +69,7 @@ static bool AppInitRPC(int argc, char* argv[])
|
|||
//
|
||||
ParseParameters(argc, argv);
|
||||
if (argc<2 || mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-help") || mapArgs.count("-version")) {
|
||||
std::string strUsage = _("Zcash RPC client version") + " " + FormatFullVersion() + "\n";
|
||||
std::string strUsage = _("Zcash RPC client version") + " " + FormatFullVersion() + "\n" + PrivacyInfo();
|
||||
if (!mapArgs.count("-version")) {
|
||||
strUsage += "\n" + _("Usage:") + "\n" +
|
||||
" zcash-cli [options] <command> [params] " + _("Send command to Zcash") + "\n" +
|
||||
|
|
|
@ -73,7 +73,7 @@ bool AppInit(int argc, char* argv[])
|
|||
// Process help and version before taking care about datadir
|
||||
if (mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-help") || mapArgs.count("-version"))
|
||||
{
|
||||
std::string strUsage = _("Zcash Daemon") + " " + _("version") + " " + FormatFullVersion() + "\n";
|
||||
std::string strUsage = _("Zcash Daemon") + " " + _("version") + " " + FormatFullVersion() + "\n" + PrivacyInfo();
|
||||
|
||||
if (mapArgs.count("-version"))
|
||||
{
|
||||
|
|
|
@ -393,6 +393,9 @@ void ThreadShowMetricsScreen()
|
|||
// Thank you text
|
||||
std::cout << _("Thank you for running a Zcash node!") << std::endl;
|
||||
std::cout << _("You're helping to strengthen the network and contributing to a social good :)") << std::endl;
|
||||
|
||||
// Privacy notice text
|
||||
std::cout << PrivacyInfo();
|
||||
std::cout << std::endl;
|
||||
}
|
||||
|
||||
|
|
10
src/util.cpp
10
src/util.cpp
|
@ -888,9 +888,17 @@ void SetThreadPriority(int nPriority)
|
|||
#endif // WIN32
|
||||
}
|
||||
|
||||
std::string PrivacyInfo()
|
||||
{
|
||||
return "\n" +
|
||||
FormatParagraph(strprintf(_("In order to ensure you are adequately protecting your privacy when using Zcash, please see <%s>."),
|
||||
"https://z.cash/support/security/index.html")) + "\n";
|
||||
}
|
||||
|
||||
std::string LicenseInfo()
|
||||
{
|
||||
return FormatParagraph(strprintf(_("Copyright (C) 2009-%i The Bitcoin Core Developers"), COPYRIGHT_YEAR)) + "\n" +
|
||||
return "\n" +
|
||||
FormatParagraph(strprintf(_("Copyright (C) 2009-%i The Bitcoin Core Developers"), COPYRIGHT_YEAR)) + "\n" +
|
||||
FormatParagraph(strprintf(_("Copyright (C) 2015-%i The Zcash Developers"), COPYRIGHT_YEAR)) + "\n" +
|
||||
"\n" +
|
||||
FormatParagraph(_("This is experimental software.")) + "\n" +
|
||||
|
|
|
@ -142,6 +142,9 @@ void ShrinkDebugFile();
|
|||
void runCommand(const std::string& strCommand);
|
||||
const boost::filesystem::path GetExportDir();
|
||||
|
||||
/** Returns privacy notice (for -version, -help and metrics screen) */
|
||||
std::string PrivacyInfo();
|
||||
|
||||
/** Returns licensing information (for -version) */
|
||||
std::string LicenseInfo();
|
||||
|
||||
|
|
Loading…
Reference in New Issue