adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-07-06 01:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:znc/znc

Browse Source
This commit is contained in:
Alexey Sokolov
2011-02-14 21:37:11 +06:00
parent 2ffcd25fac b37e239328
commit 9cbd494588
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ClientCommand.cpp
+2 -5
View File
@@ -297,9 +297,6 @@ void CClient::UserCommand(CString& sLine) {
m_pUser->CheckIRCConnect();
return;
} else if (sCommand.Equals("DISCONNECT")) {
// GetIRCSock() is only set after the low level connection
// to the IRC server was established. Before this we can
// only find the IRC socket by its name.
if (GetIRCSock()) {
CString sQuitMsg = sLine.Token(1, true);
GetIRCSock()->Quit(sQuitMsg);
@@ -1332,12 +1329,12 @@ void CClient::HelpUser() {
Table.AddRow();
Table.SetCell("Command", "AddPort");
Table.SetCell("Arguments", "<[+]port> <ipv4|ipv6|all> <web|irc|all> [bindhost]");
Table.SetCell("Arguments", "<arguments>");
Table.SetCell("Description", "Add another port for ZNC to listen on");
Table.AddRow();
Table.SetCell("Command", "DelPort");
Table.SetCell("Arguments", "<port> <ipv4|ipv6|all> [bindhost]");
Table.SetCell("Arguments", "<arguments>");
Table.SetCell("Description", "Remove a port from ZNC");
Table.AddRow();
modules/webadmin.cpp
+3 -2
View File
@@ -248,7 +248,7 @@ public:
// First apply the old limit in case the new one is too high
if (pUser)
pNewUser->SetBufferCount(pUser->GetBufferCount(), true);
pNewUser->SetBufferCount(WebSock.GetParam("bufsize").ToUInt());
pNewUser->SetBufferCount(WebSock.GetParam("bufsize").ToUInt(), spSession->IsAdmin());
pNewUser->SetSkinName(WebSock.GetParam("skin"));
pNewUser->SetKeepBuffer(WebSock.GetParam("keepbuffer").ToBool());
pNewUser->SetMultiClients(WebSock.GetParam("multiclients").ToBool());
@@ -489,6 +489,7 @@ public:
}
bool ChanPage(CWebSock& WebSock, CTemplate& Tmpl, CUser* pUser, CChan* pChan = NULL) {
CSmartPtr<CWebSession> spSession = WebSock.GetSession();
Tmpl.SetFile("add_edit_chan.tmpl");
if (!pUser) {
@@ -561,7 +562,7 @@ public:
pUser->AddChan(pChan);
}
pChan->SetBufferCount(WebSock.GetParam("buffercount").ToUInt());
pChan->SetBufferCount(WebSock.GetParam("buffercount").ToUInt(), spSession->IsAdmin());
pChan->SetDefaultModes(WebSock.GetParam("defmodes"));
pChan->SetInConfig(WebSock.GetParam("save").ToBool());
pChan->SetKeepBuffer(WebSock.GetParam("keepbuffer").ToBool());