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

Make networks a bit less confusing.

Browse Source 
If user is connected without network, try "default" network first, if it
exists. If not, try "user" network. If it doesn't exist too, just use
the first one.

Also configs converted from old configs have "default" network instead
of "user" one.
This commit is contained in:
Alexey Sokolov
2012-01-27 22:51:09 +07:00
parent e0f4fad2ff
commit fa287ef791
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Client.cpp
View File

@@ -628,9 +628,13 @@ void CClient::AcceptLogin(CUser& User) {
if (!m_pNetwork) {
PutStatus("Network (" + m_sNetwork + ") doesn't exist.");
}
} else {
// If a user didn't supply a network, and they have a network called "user" then automatically use this network.
m_pNetwork = m_pUser->FindNetwork("user");
} else if (!m_pUser->GetNetworks().empty()) {
// If a user didn't supply a network, and they have a network called "default" then automatically use this network.
m_pNetwork = m_pUser->FindNetwork("default");
// If no "default" network, try "user" network. It's for compatibility with early network stuff in ZNC, which converted old configs to "user" network.
if (!m_pNetwork) m_pNetwork = m_pUser->FindNetwork("user");
// Otherwise, just try any network of the user.
if (!m_pNetwork) m_pNetwork = *m_pUser->GetNetworks().begin();
}
SetNetwork(m_pNetwork, false);