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

Remove CZNC::GetConfPath() and rework GetModPath() and GetUserPath()

Browse Source 
This removes some unneeded variables.
Idea by kroimon.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1289 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2008-12-12 15:38:57 +00:00
parent c03bd91589
commit 4b1fbab6eb
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
znc.cpp
View File

@@ -438,11 +438,25 @@ void CZNC::InitDirs(const CString& sArgvPath, const CString& sDataDir) {
} else {
m_sZNCPath = sDataDir;
}
}
// Other dirs that we use
m_sConfPath = m_sZNCPath + "/configs";
m_sModPath = m_sZNCPath + "/modules";
m_sUserPath = m_sZNCPath + "/users";
CString CZNC::GetUserPath() const {
CString sUserPath = m_sZNCPath + "/users/";
if (!CFile::Exists(sUserPath)) {
CDir::MakeDir(sUserPath);
}
return sUserPath;
}
CString CZNC::GetModPath() const {
CString sModPath = m_sZNCPath + "/modules/";
if (!CFile::Exists(sModPath)) {
CDir::MakeDir(sModPath);
}
return sModPath;
}
@@ -450,12 +464,12 @@ CString CZNC::ExpandConfigPath(const CString& sConfigFile) {
CString sRetPath;
if (sConfigFile.empty()) {
sRetPath = GetConfPath() + "/znc.conf";
sRetPath = GetZNCPath() + "/configs/znc.conf";
} else {
if (sConfigFile.Left(2) == "./" || sConfigFile.Left(3) == "../") {
sRetPath = GetCurPath() + "/" + sConfigFile;
} else if (sConfigFile.Left(1) != "/") {
sRetPath = GetConfPath() + "/" + sConfigFile;
sRetPath = GetZNCPath() + "/configs/" + sConfigFile;
} else {
sRetPath = sConfigFile;
}