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

WebMods: Calculate the module's web path correctly

Browse Source 
Until now, the code checked for <moddir>/www/<mod name> and just used
./modules/www/<mod name> if the other dir didn't exist.

Now we calculate the correct path from the module's shared object's path, which
is the correct thing to do.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1967 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2010-05-03 13:49:45 +00:00
parent 99f1efc843
commit 3b6205979e
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
WebModules.cpp
View File

@@ -276,7 +276,7 @@ void CWebSock::SetPaths(CModule* pModule, bool bIsTemplate) {
// 3. ./modules/<mod_name>/
//
m_Template.AppendPath(GetModWebPath(sModName));
m_Template.AppendPath(GetModWebPath(pModule));
// 4. ~/.znc/webskins/<user_skin_setting>/mods/<mod_name>/
//
@@ -444,14 +444,17 @@ CWebSock::EPageReqResult CWebSock::PrintTemplate(const CString& sPageName, CStri
}
}
CString CWebSock::GetModWebPath(const CString& sModName) const {
CString sRet = CZNC::Get().GetCurPath() + "/modules/www/" + sModName;
CString CWebSock::GetModWebPath(const CModule* pModule) const {
// This is: /path/to/module.so
const CString& sModPath = pModule->GetModPath();
if (!CFile::IsDir(sRet)) {
sRet = CString(_MODDIR_) + "/www/" + sModName;
}
// Find the last '/' in sModPath...
CString::size_type pos = sModPath.find_last_of('/');
return sRet + "/";
// ...and set sModDir to the dir in which sModPath resides
CString sModDir = sModPath.substr(0, pos);
return sModDir + "/www/" + pModule->GetModName();
}
CString CWebSock::GetSkinPath(const CString& sSkinName) const {
@@ -640,7 +643,7 @@ CWebSock::EPageReqResult CWebSock::OnPageRequestInternal(const CString& sURI, CS
if (sURI.Left(10) == "/modfiles/") {
m_Template.AppendPath(GetSkinPath(GetSkinName()) + "/mods/" + m_sModName + "/files/");
m_Template.AppendPath(GetModWebPath(m_sModName) + "/files/");
m_Template.AppendPath(GetModWebPath(pModule) + "/files/");
std::cerr << "===================== fffffffffffffffffffff [" << m_sModName << "] [" << m_sPage << "]" << std::endl;
if (PrintFile(m_Template.ExpandFile(m_sPage.TrimLeft_n("/")))) {