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

Fix a couple of places where WebMods tried to send multiple pages

Browse Source 
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1838 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2010-03-16 10:04:31 +00:00
parent 082008ed98
commit 39c5a677a9
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
WebModules.cpp
View File

@@ -414,7 +414,7 @@ CWebSock::EPageReqResult CWebSock::PrintStaticFile(const CString& sPath, CString
SetPaths(pModule);
DEBUG("About to print [" + m_Template.ExpandFile(sPath) + "]");
if (PrintFile(m_Template.ExpandFile(sPath.TrimLeft_n("/")))) {
return PAGE_PRINT;
return PAGE_DEFERRED;
} else {
return PAGE_NOTFOUND;
}
@@ -534,7 +534,8 @@ CWebSock::EPageReqResult CWebSock::OnPageRequestInternal(const CString& sURI, CS
SetLoggedIn(false);
Redirect("/");
return PAGE_PRINT;
// We already sent a reply
return PAGE_DEFERRED;
} else if (sURI == "/login" || sURI.Left(7) == "/login/") {
if (GetParam("submitted").ToBool()) {
m_sUser = GetParam("user");
@@ -553,7 +554,7 @@ CWebSock::EPageReqResult CWebSock::OnPageRequestInternal(const CString& sURI, CS
// Make sure modules are treated as directories
if (sURI.Right(1) != "/" && sURI.find(".") == CString::npos && sURI.TrimLeft_n("/mods/").TrimLeft_n("/").find("/") == CString::npos) {
Redirect(sURI + "/");
return PAGE_PRINT;
return PAGE_DEFERRED;
}
if (m_sModName.empty()) {
@@ -565,7 +566,7 @@ CWebSock::EPageReqResult CWebSock::OnPageRequestInternal(const CString& sURI, CS
if (!pModule && m_sForceUser.empty()) {
if (!ForceLogin()) {
return PAGE_PRINT;
return PAGE_DEFERRED;
}
pModule = CZNC::Get().FindModule(m_sModName, m_spSession->GetUser());