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

Move CZNC::FindModPath() to CModules

Browse Source 
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1611 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2009-08-23 11:05:22 +00:00
parent 495c196a82
commit 6a36100447
5 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Modules.cpp
View File

@@ -961,6 +961,36 @@ void CModules::GetAvailableMods(set<CModInfo>& ssMods, bool bGlobal) {
}
}
bool CModules::FindModPath(const CString& sModule, CString& sModPath,
CString& sDataPath) {
CString sMod = sModule;
CString sDir = sMod;
if (sModule.find(".") == CString::npos)
sMod += ".so";
sDataPath = CZNC::Get().GetCurPath() + "/modules/";
sModPath = sDataPath + sMod;
if (!CFile::Exists(sModPath)) {
sDataPath = CZNC::Get().GetModPath() + "/";
sModPath = sDataPath + sMod;
if (!CFile::Exists(sModPath)) {
sDataPath = _DATADIR_ + CString("/");
sModPath = _MODDIR_ + CString("/") + sMod;
if (!CFile::Exists(sModPath)) {
return false;
}
}
}
sDataPath += sDir;
return true;
}
ModHandle CModules::OpenModule(const CString& sModule, CString& sModPath, CString& sDataPath,
bool &bVersionMismatch, bool &bIsGlobal, CString& sDesc, CString& sRetMsg)
{
@@ -971,7 +1001,7 @@ ModHandle CModules::OpenModule(const CString& sModule, CString& sModPath, CStrin
}
}
if (!CZNC::Get().FindModPath(sModule, sModPath, sDataPath)) {
if (!FindModPath(sModule, sModPath, sDataPath)) {
sRetMsg = "Unable to find module [" + sModule + "]";
return NULL;
}