iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-05-04 04:22:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Clarify the meaning of returning false from OnWebRequest.

Browse Source 
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1886 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
cflakes
2010-04-05 15:17:23 +00:00
parent 9735d5dcaa
commit 49df8dc27d
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Modules.h
View File

@@ -299,6 +299,7 @@ public:
* @param sPageName The name of the page that has been requested.
* @param Tmpl The active template. You can add variables, loops and stuff to it.
* @return You MUST return true if you want the template to be evaluated and sent to the browser.
* Return false if you called Redirect() or PrintErrorPage(). If you didn't, a 404 page will be sent.
*/
virtual bool OnWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl);
/** Registers a sub page for the sidebar.

11
WebModules.cpp
View File

@@ -639,12 +639,19 @@ CWebSock::EPageReqResult CWebSock::OnPageRequestInternal(const CString& sURI, CS
} else {
SetPaths(pModule, true);
/* if a module returns false from OnWebRequest, it does not
want the template to be printed, usually because it did a redirect. */
if (pModule->OnWebRequest(*this, m_sPage, m_Template)) {
return PrintTemplate(m_sPage, sPageRet, pModule);
}
sPageRet = GetErrorPage(404, "Not Implemented", "The requested module does not acknowledge web requests");
return PAGE_PRINT;
if (!SentHeader()) {
sPageRet = GetErrorPage(404, "Not Implemented", "The requested module does not acknowledge web requests");
return PAGE_PRINT;
} else {
Close(CLT_AFTERWRITE); // make sure the connection is going to be closed
return PAGE_DONE;
}
}
} else {
CString sPage(sURI.Trim_n("/"));