From 96b267cbb711de33be6944c07c2de6d2a18cbe37 Mon Sep 17 00:00:00 2001 From: prozacx Date: Thu, 22 Sep 2005 07:27:49 +0000 Subject: [PATCH] Don't try to add existing chans git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@522 726aef4b-f618-498e-8847-2d620e286838 --- modules/webadmin.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp index 45f960a4..c481caf6 100644 --- a/modules/webadmin.cpp +++ b/modules/webadmin.cpp @@ -304,7 +304,6 @@ bool CWebAdminSock::OnPageRequest(const CString& sURI, CString& sPageRet) { CChan* pChan = m_pUser->FindChan(GetParam("chan")); if (!pChan) { GetErrorPage(sPageRet, "No such channel"); - cerr << "==== [" << GetParam("chan") << "] == [" << (int) pChan << "]" << endl; return true; } @@ -553,7 +552,7 @@ bool CWebAdminSock::ChanPage(CString& sPageRet, CChan* pChan) { return true; } - CString sChanName = GetParam("name"); + CString sChanName = GetParam("name").Trim_n(); if (!pChan) { if (sChanName.empty()) { @@ -561,6 +560,11 @@ bool CWebAdminSock::ChanPage(CString& sPageRet, CChan* pChan) { return true; } + if (m_pUser->FindChan(sChanName.Token(0))) { + GetErrorPage(sPageRet, "Channel [" + sChanName.Token(0) + "] already exists"); + return true; + } + pChan = new CChan(sChanName, m_pUser, true); m_pUser->AddChan(pChan); }