iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-05-03 20:12:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #656 from jpnurmi/makeconf

Browse Source 
makeconf
This commit is contained in:
Alexey Sokolov
2014-09-07 22:21:40 +01:00
parent 8ec2a0940c 40aa1bb34d
commit 1ace8b4f44
2 changed files with 13 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Utils.cpp
View File

@@ -156,13 +156,15 @@ CString CUtils::GetSaltedHashPass(CString& sSalt) {
sSalt = GetSalt();
while (true) {
CString pass1 = CUtils::GetPass("Enter Password");
CString pass2 = CUtils::GetPass("Confirm Password");
CString pass1;
do {
pass1 = CUtils::GetPass("Enter password");
} while (pass1.empty());
CString pass2 = CUtils::GetPass("Confirm password");
if (!pass1.Equals(pass2, true)) {
CUtils::PrintError("The supplied passwords did not match");
} else if (pass1.empty()) {
CUtils::PrintError("You can not use an empty password");
} else {
// Construct the salted pass
return SaltedSHA256Hash(pass1, sSalt);
@@ -302,7 +304,7 @@ void CUtils::PrintPrompt(const CString& sMessage) {
void CUtils::PrintMessage(const CString& sMessage, bool bStrong) {
if (CDebug::StdoutIsTTY()) {
if (bStrong)
fprintf(stdout, BOLD BLU "[" YEL " ** " BLU "]" DFL BOLD "%s" NORM "\n",
fprintf(stdout, BOLD BLU "[" YEL " ** " BLU "]" DFL BOLD " %s" NORM "\n",
sMessage.c_str());
else
fprintf(stdout, BOLD BLU "[" YEL " ** " BLU "]" DFL NORM " %s\n",

38
src/znc.cpp
View File

@@ -568,11 +568,7 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
m_sConfigFile = ExpandConfigPath(sConfigFile);
if (CFile::Exists(m_sConfigFile)) {
CUtils::PrintStatus(false, "The config file [" + m_sConfigFile + "] already exists.");
if (!CUtils::GetBoolInput("Would you like to overwrite it?", false))
return false;
} else {
CUtils::PrintMessage("Building new config");
CUtils::PrintStatus(false, "WARNING: config [" + m_sConfigFile + "] already exists.");
}
CUtils::PrintMessage("");
@@ -684,7 +680,7 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
if (!sAnswer.empty()) {
vsLines.push_back("\tAltNick = " + sAnswer);
}
CUtils::GetInput("Ident", sAnswer, sNick);
CUtils::GetInput("Ident", sAnswer, sUser);
vsLines.push_back("\tIdent = " + sAnswer);
CUtils::GetInput("Real Name", sAnswer, "Got ZNC?");
vsLines.push_back("\tRealName = " + sAnswer);
@@ -692,29 +688,6 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
if (!sAnswer.empty()) {
vsLines.push_back("\tBindHost = " + sAnswer);
}
// todo: Possibly add motd
unsigned int uBufferCount = 0;
CUtils::GetNumInput("Number of lines to buffer per channel or query", uBufferCount, 0, ~0, 50);
if (uBufferCount) {
vsLines.push_back("\tBuffer = " + CString(uBufferCount));
}
if (CUtils::GetBoolInput("Would you like to clear channel buffers after replay?", true)) {
vsLines.push_back("\tAutoClearChanBuffer = true");
} else {
vsLines.push_back("\tAutoClearChanBuffer = false");
}
if (CUtils::GetBoolInput("Would you like to clear query buffers after replay?", true)) {
vsLines.push_back("\tAutoClearQueryBuffer = true");
} else {
vsLines.push_back("\tAutoClearQueryBuffer = false");
}
CUtils::GetInput("Default channel modes", sAnswer, "+stn");
if (!sAnswer.empty()) {
vsLines.push_back("\tChanModes = " + sAnswer);
}
set<CModInfo> ssUserMods;
GetModules().GetDefaultMods(ssUserMods, CModInfo::UserModule);
@@ -763,7 +736,7 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
CUtils::GetInput("[" + sHost + "] Password (probably empty)", sPass);
#ifdef HAVE_LIBSSL
bSSL = CUtils::GetBoolInput("Does this server use SSL?", false);
bSSL = CUtils::GetBoolInput("Does this server use SSL?", uServerPort == 6697);
#endif
vsLines.push_back("\t\tServer = " + sHost + ((bSSL) ? " +" : " ") + CString(uServerPort) + " " + sPass);
@@ -829,7 +802,7 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
}
}
if (!bFileOK) {
CUtils::GetInput("Please specify an alternate location (or \"stdout\" for displaying the config)", m_sConfigFile, m_sConfigFile);
while (!CUtils::GetInput("Please specify an alternate location", m_sConfigFile, "", "or \"stdout\" for displaying the config"));
if (m_sConfigFile.Equals("stdout"))
bFileOK = true;
else
@@ -881,7 +854,8 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
CUtils::PrintMessage("");
CUtils::PrintMessage("Try something like this in your IRC client...", true);
CUtils::PrintMessage("/server <znc_server_ip> " + sSSL + CString(uListenPort) + " " + sUser + ":<pass>", true);
CUtils::PrintMessage("And this in your browser...", true);
CUtils::PrintMessage("");
CUtils::PrintMessage("To manage settings, users and networks, point your web browser to", true);
CUtils::PrintMessage(sProtocol + "://<znc_server_ip>:" + CString(uListenPort) + "/", true);
CUtils::PrintMessage("");