iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename "vhost" to "bindhost"

Browse Source 
"virtual host" seems to be confusing to users since they wonder why
i.am.superman doesn't work. Let's rename this to "bindhost" and perhaps it
becomes clearer what this setting does.

Thanks to SilverLeo!


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2113 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2010-08-30 08:58:29 +00:00
parent b2c3c0707a
commit 341263f9ec
16 changed files with 184 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
ClientCommand.cpp
View File

@@ -801,85 +801,85 @@ void CClient::UserCommand(CString& sLine) {
PutStatus("Done, but there were errors, some users no longer have ["
+ sMod + "] loaded");
}
} else if (sCommand.Equals("ADDVHOST") && m_pUser->IsAdmin()) {
CString sVHost = sLine.Token(1);
} else if ((sCommand.Equals("ADDBINDHOST") || sCommand.Equals("ADDVHOST")) && m_pUser->IsAdmin()) {
CString sHost = sLine.Token(1);
if (sVHost.empty()) {
PutStatus("Usage: AddVHost <VHost>");
if (sHost.empty()) {
PutStatus("Usage: AddBindHost <host>");
return;
}
if (CZNC::Get().AddVHost(sVHost)) {
if (CZNC::Get().AddBindHost(sHost)) {
PutStatus("Done");
} else {
PutStatus("The VHost [" + sVHost + "] is already in the list");
PutStatus("The host [" + sHost + "] is already in the list");
}
} else if ((sCommand.Equals("REMVHOST") || sCommand.Equals("DELVHOST")) && m_pUser->IsAdmin()) {
CString sVHost = sLine.Token(1);
} else if ((sCommand.Equals("REMBINDHOST") || sCommand.Equals("REMVHOST") || sCommand.Equals("DELVHOST")) && m_pUser->IsAdmin()) {
CString sHost = sLine.Token(1);
if (sVHost.empty()) {
PutStatus("Usage: RemVHost <VHost>");
if (sHost.empty()) {
PutStatus("Usage: RemBindHost <host>");
return;
}
if (CZNC::Get().RemVHost(sVHost)) {
if (CZNC::Get().RemBindHost(sHost)) {
PutStatus("Done");
} else {
PutStatus("The VHost [" + sVHost + "] is not in the list");
PutStatus("The host [" + sHost + "] is not in the list");
}
} else if (sCommand.Equals("LISTVHOSTS") && (m_pUser->IsAdmin() || !m_pUser->DenySetVHost())) {
const VCString& vsVHosts = CZNC::Get().GetVHosts();
} else if ((sCommand.Equals("LISTBINDHOSTS") || sCommand.Equals("LISTVHOSTS")) && (m_pUser->IsAdmin() || !m_pUser->DenySetBindHost())) {
const VCString& vsHosts = CZNC::Get().GetBindHosts();
if (vsVHosts.empty()) {
PutStatus("No VHosts configured");
if (vsHosts.empty()) {
PutStatus("No bind hosts configured");
return;
}
CTable Table;
Table.AddColumn("VHost");
Table.AddColumn("Host");
VCString::const_iterator it;
for (it = vsVHosts.begin(); it != vsVHosts.end(); ++it) {
for (it = vsHosts.begin(); it != vsHosts.end(); ++it) {
Table.AddRow();
Table.SetCell("VHost", *it);
Table.SetCell("Host", *it);
}
PutStatus(Table);
} else if (sCommand.Equals("SETVHOST") && (m_pUser->IsAdmin() || !m_pUser->DenySetVHost())) {
CString sVHost = sLine.Token(1);
} else if ((sCommand.Equals("SETBINDHOST") || sCommand.Equals("SETVHOST")) && (m_pUser->IsAdmin() || !m_pUser->DenySetBindHost())) {
CString sHost = sLine.Token(1);
if (sVHost.empty()) {
PutStatus("Usage: SetVHost <VHost>");
if (sHost.empty()) {
PutStatus("Usage: SetBindHost <host>");
return;
}
if (sVHost.Equals(m_pUser->GetVHost())) {
PutStatus("You already have this VHost!");
if (sHost.Equals(m_pUser->GetBindHost())) {
PutStatus("You already have this bind host!");
return;
}
const VCString& vsVHosts = CZNC::Get().GetVHosts();
if (!m_pUser->IsAdmin() && !vsVHosts.empty()) {
const VCString& vsHosts = CZNC::Get().GetBindHosts();
if (!m_pUser->IsAdmin() && !vsHosts.empty()) {
VCString::const_iterator it;
bool bFound = false;
for (it = vsVHosts.begin(); it != vsVHosts.end(); ++it) {
if (sVHost.Equals(*it)) {
for (it = vsHosts.begin(); it != vsHosts.end(); ++it) {
if (sHost.Equals(*it)) {
bFound = true;
break;
}
}
if (!bFound) {
PutStatus("You may not use this VHost. See [ListVHosts] for a list");
PutStatus("You may not use this bind host. See [ListBindHosts] for a list");
return;
}
}
m_pUser->SetVHost(sVHost);
PutStatus("Set VHost to [" + m_pUser->GetVHost() + "]");
} else if (sCommand.Equals("CLEARVHOST") && (m_pUser->IsAdmin() || !m_pUser->DenySetVHost())) {
m_pUser->SetVHost("");
PutStatus("VHost Cleared");
m_pUser->SetBindHost(sHost);
PutStatus("Set bind host to [" + m_pUser->GetBindHost() + "]");
} else if ((sCommand.Equals("CLEARBINDHOST") || sCommand.Equals("CLEARVHOST")) && (m_pUser->IsAdmin() || !m_pUser->DenySetBindHost())) {
m_pUser->SetBindHost("");
PutStatus("Bind Host Cleared");
} else if (sCommand.Equals("PLAYBUFFER")) {
CString sChan = sLine.Token(1);
@@ -1194,29 +1194,29 @@ void CClient::HelpUser() {
if (m_pUser->IsAdmin()) {
Table.AddRow();
Table.SetCell("Command", "AddVHost");
Table.SetCell("Arguments", "<vhost (IP preferred)>");
Table.SetCell("Description", "Adds a VHost for normal users to use");
Table.SetCell("Command", "AddBindHost");
Table.SetCell("Arguments", "<host (IP preferred)>");
Table.SetCell("Description", "Adds a bind host for normal users to use");
Table.AddRow();
Table.SetCell("Command", "RemVHost");
Table.SetCell("Arguments", "<vhost>");
Table.SetCell("Description", "Removes a VHost from the list");
Table.SetCell("Command", "RemBindHost");
Table.SetCell("Arguments", "<host>");
Table.SetCell("Description", "Removes a bind host from the list");
}
if (m_pUser->IsAdmin() || !m_pUser->DenySetVHost()) {
if (m_pUser->IsAdmin() || !m_pUser->DenySetBindHost()) {
Table.AddRow();
Table.SetCell("Command", "ListVHosts");
Table.SetCell("Description", "Shows the configured list of vhosts");
Table.SetCell("Command", "ListBindHosts");
Table.SetCell("Description", "Shows the configured list of bind hosts");
Table.AddRow();
Table.SetCell("Command", "SetVHost");
Table.SetCell("Arguments", "<vhost (IP preferred)>");
Table.SetCell("Description", "Set the VHost for this connection");
Table.SetCell("Command", "SetBindHost");
Table.SetCell("Arguments", "<host (IP preferred)>");
Table.SetCell("Description", "Set the bind host for this connection");
Table.AddRow();
Table.SetCell("Command", "ClearVHost");
Table.SetCell("Description", "Clear the VHost for this connection");
Table.SetCell("Command", "ClearBindHost");
Table.SetCell("Description", "Clear the bind host for this connection");
}
Table.AddRow();