From 66091438204f795487d64c65c5b9daec2b77fc47 Mon Sep 17 00:00:00 2001 From: psychon Date: Sun, 2 Dec 2007 09:19:24 +0000 Subject: [PATCH] Let webadmin use the user's defaults Now webadmin uses what you have in your section for DefModes, BufferCount, AutoCycle and KeepBuffer when you create a new user. Thanks to SilverLeo for noticing and writing this patch. git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@886 726aef4b-f618-498e-8847-2d620e286838 --- modules/webadmin.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp index cbbb955f..e53d701c 100644 --- a/modules/webadmin.cpp +++ b/modules/webadmin.cpp @@ -705,20 +705,20 @@ bool CWebAdminSock::ChanPage(CString& sPageRet, CChan* pChan) { } else { m_Template["Action"] = "addchan"; m_Template["Title"] = "Add Channel" + CString(" for User [" + m_pUser->GetUserName() + "]"); - m_Template["BufferCount"] = "50"; - m_Template["DefModes"] = "+stn"; + m_Template["BufferCount"] = CString(m_pUser->GetBufferCount()); + m_Template["DefModes"] = CString(m_pUser->GetDefaultChanModes()); m_Template["InConfig"] = "true"; } CTemplate& o1 = m_Template.AddRow("OptionLoop"); o1["Name"] = "autocycle"; o1["DisplayName"] = "Auto Cycle"; - if (!pChan || pChan->AutoCycle()) { o1["Checked"] = "true"; } + if ((pChan && pChan->AutoCycle()) || (!pChan && m_pUser->AutoCycle())) { o1["Checked"] = "true"; } CTemplate& o2 = m_Template.AddRow("OptionLoop"); o2["Name"] = "keepbuffer"; o2["DisplayName"] = "Keep Buffer"; - if (!pChan || pChan->KeepBuffer()) { o2["Checked"] = "true"; } + if ((pChan && pChan->KeepBuffer()) || (!pChan && m_pUser->KeepBuffer())) { o2["Checked"] = "true"; } CTemplate& o3 = m_Template.AddRow("OptionLoop"); o3["Name"] = "detached";