From 37641e73cae628121f166cf00fb0a500eb7e5dc2 Mon Sep 17 00:00:00 2001 From: prozacx Date: Sun, 3 Apr 2005 07:48:31 +0000 Subject: [PATCH] Renamed BinPath to CurPath git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@79 726aef4b-f618-498e-8847-2d620e286838 --- Modules.cpp | 2 +- User.cpp | 2 +- User.h | 2 +- modules/schat.cpp | 5 ++++- znc.h | 4 ++-- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Modules.cpp b/Modules.cpp index f78214af..7e096dec 100644 --- a/Modules.cpp +++ b/Modules.cpp @@ -497,7 +497,7 @@ bool CModules::LoadModule(const string& sModule, const string& sArgs, CUser* pUs return false; } - string sModPath = pUser->GetBinPath() + "/modules/" + sModule + ".so"; + string sModPath = pUser->GetCurPath() + "/modules/" + sModule + ".so"; if (!CFile::Exists(sModPath)) { DEBUG_ONLY(cout << "[" << sModPath << "] Not found..." << endl); diff --git a/User.cpp b/User.cpp index 68cbb5eb..10149198 100644 --- a/User.cpp +++ b/User.cpp @@ -383,7 +383,7 @@ const string& CUser::GetRealName() const { return m_sRealName; } const string& CUser::GetVHost() const { return m_sVHost; } const string& CUser::GetPass() const { return m_sPass; } -const string& CUser::GetBinPath() const { return m_pZNC->GetBinPath(); } +const string& CUser::GetCurPath() const { return m_pZNC->GetCurPath(); } const string& CUser::GetDLPath() const { return m_pZNC->GetDLPath(); } const string& CUser::GetModPath() const { return m_pZNC->GetModPath(); } const string& CUser::GetHomePath() const { return m_pZNC->GetHomePath(); } diff --git a/User.h b/User.h index b62a402c..b9c099da 100644 --- a/User.h +++ b/User.h @@ -81,7 +81,7 @@ public: const string& GetVHost() const; const string& GetPass() const; - const string& GetBinPath() const; + const string& GetCurPath() const; const string& GetDLPath() const; const string& GetModPath() const; const string& GetHomePath() const; diff --git a/modules/schat.cpp b/modules/schat.cpp index f41f8572..6f2ca37f 100644 --- a/modules/schat.cpp +++ b/modules/schat.cpp @@ -14,6 +14,9 @@ * Author: imaginos * * $Log$ + * Revision 1.4 2005/04/03 07:48:31 prozacx + * Renamed BinPath to CurPath + * * Revision 1.3 2005/03/31 20:59:43 imaginos * typo on column * @@ -140,7 +143,7 @@ public: if ( m_sPemFile.empty() ) { - m_sPemFile = m_pUser->GetBinPath() + "/znc.pem"; + m_sPemFile = m_pUser->GetCurPath() + "/znc.pem"; } if (!CFile::Exists(m_sPemFile)) { diff --git a/znc.h b/znc.h index ef756c0a..f0312b27 100644 --- a/znc.h +++ b/znc.h @@ -28,7 +28,7 @@ public: // Getters TSocketManager& GetManager() { return m_Manager; } unsigned int GetListenPort() const { return m_uListenPort; } - const string& GetBinPath() const { if (!CFile::Exists(m_sBinPath)) { CUtils::MakeDir(m_sBinPath); } return m_sBinPath; } + const string& GetCurPath() const { if (!CFile::Exists(m_sCurPath)) { CUtils::MakeDir(m_sCurPath); } return m_sCurPath; } const string& GetDLPath() const { if (!CFile::Exists(m_sDLPath)) { CUtils::MakeDir(m_sDLPath); } return m_sDLPath; } const string& GetModPath() const { if (!CFile::Exists(m_sModPath)) { CUtils::MakeDir(m_sModPath); } return m_sModPath; } const string& GetHomePath() const { if (!CFile::Exists(m_sHomePath)) { CUtils::MakeDir(m_sHomePath); } return m_sHomePath; } @@ -55,7 +55,7 @@ protected: map m_msUsers; TSocketManager m_Manager; - string m_sBinPath; + string m_sCurPath; string m_sDLPath; string m_sModPath; string m_sHomePath;