Move IRCConnectEnabled to each network instead of a global user setting

This commit is contained in:
Kyle Fuller
2012-01-11 14:06:11 +00:00
parent 4abf3feae4
commit 3d7d1793aa
11 changed files with 60 additions and 44 deletions

View File

@@ -232,7 +232,6 @@ public:
pNewUser->SetTimezoneOffset(WebSock.GetParam("timezoneoffset").ToDouble());
pNewUser->SetJoinTries(WebSock.GetParam("jointries").ToUInt());
pNewUser->SetMaxJoins(WebSock.GetParam("maxjoins").ToUInt());
pNewUser->SetIRCConnectEnabled(WebSock.GetParam("doconnect").ToBool());
if (spSession->IsAdmin()) {
pNewUser->SetDenyLoadMod(WebSock.GetParam("denyloadmod").ToBool());
@@ -674,6 +673,8 @@ public:
Tmpl["Ident"] = pNetwork->GetIdent();
Tmpl["RealName"] = pNetwork->GetRealName();
Tmpl["IRCConnectEnabled"] = CString(pNetwork->GetIRCConnectEnabled());
const vector<CServer*>& vServers = pNetwork->GetServers();
for (unsigned int a = 0; a < vServers.size(); a++) {
CTemplate& l = Tmpl.AddRow("ServerLoop");
@@ -701,6 +702,7 @@ public:
} else {
Tmpl["Action"] = "addnetwork";
Tmpl["Title"] = "Add Network for User [" + pUser->GetUserName() + "]";
Tmpl["IRCConnectEnabled"] = "true";
}
return true;
@@ -742,6 +744,8 @@ public:
pNetwork->SetRealName(sArg);
}
pNetwork->SetIRCConnectEnabled(WebSock.GetParam("doconnect").ToBool());
VCString vsArgs;
pNetwork->DelServers();
@@ -882,7 +886,6 @@ public:
Tmpl["TimezoneOffset"] = CString(pUser->GetTimezoneOffset());
Tmpl["JoinTries"] = CString(pUser->JoinTries());
Tmpl["MaxJoins"] = CString(pUser->MaxJoins());
Tmpl["IRCConnectEnabled"] = CString(pUser->GetIRCConnectEnabled());
const set<CString>& ssAllowedHosts = pUser->GetAllowedHosts();
for (set<CString>::const_iterator it = ssAllowedHosts.begin(); it != ssAllowedHosts.end(); ++it) {
@@ -906,7 +909,6 @@ public:
Tmpl["Action"] = "adduser";
Tmpl["Title"] = "Add User";
Tmpl["StatusPrefix"] = "*";
Tmpl["IRCConnectEnabled"] = "true";
}
// To change BindHosts be admin or don't have DenySetBindHost