From b9b7844a82a88534084d16cd2ecf8b0b1a8a4db7 Mon Sep 17 00:00:00 2001 From: prozacx Date: Tue, 20 Sep 2005 04:31:19 +0000 Subject: [PATCH] Changed from CUser::GetPemLocation() to CZNC::GetPemLocation() git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@517 726aef4b-f618-498e-8847-2d620e286838 --- modules/modperl.cpp | 6 +++--- modules/schat.cpp | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/modperl.cpp b/modules/modperl.cpp index a7f31c4c..45e63733 100644 --- a/modules/modperl.cpp +++ b/modules/modperl.cpp @@ -847,11 +847,11 @@ XS(XS_ZNC_COREListen) #ifdef HAVE_LIBSSL if ( iUseSSL != 0 ) { - if ( CFile::Exists( g_ModPerl->GetUser()->GetPemLocation() ) ) - pSock->SetPemLocation( g_ModPerl->GetUser()->GetPemLocation() ); + if ( CFile::Exists( CZNC::Get().GetPemLocation() ) ) + pSock->SetPemLocation( CZNC::Get().GetPemLocation() ); else { - g_ModPerl->PutModule( "PEM File does not exist! (looking for " + g_ModPerl->GetUser()->GetPemLocation() + ")" ); + g_ModPerl->PutModule( "PEM File does not exist! (looking for " + CZNC::Get().GetPemLocation() + ")" ); bContinue = false; } } diff --git a/modules/schat.cpp b/modules/schat.cpp index edacee1b..70d1e21f 100644 --- a/modules/schat.cpp +++ b/modules/schat.cpp @@ -20,6 +20,9 @@ using std::pair; * Author: imaginos * * $Log$ + * Revision 1.18 2005/09/20 04:31:19 prozacx + * Changed from CUser::GetPemLocation() to CZNC::GetPemLocation() + * * Revision 1.17 2005/09/07 05:14:28 prozacx * Renamed md5.cpp/h to MD5.cpp/h * @@ -188,7 +191,7 @@ public: if ( m_sPemFile.empty() ) { - m_sPemFile = m_pUser->GetPemLocation(); + m_sPemFile = CZNC::Get().GetPemLocation(); } if (!CFile::Exists(m_sPemFile)) {