iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-04-30 18:42:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Committing patches from crox/psychon

Browse Source 
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@790 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
prozacx
2007-03-12 06:26:54 +00:00
parent 9541fa2492
commit 0a62274975
27 changed files with 432 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
User.cpp
View File

@@ -88,8 +88,9 @@ void CUser::DelClients() {
bool CUser::OnBoot() {
#ifdef _MODULES
return GetModules().OnBoot();
#endif
#else
return true;
#endif
}
void CUser::IRCConnected(CIRCSock* pIRCSock) {
@@ -114,7 +115,8 @@ CString CUser::ExpandString(const CString& sStr) const {
CString& CUser::ExpandString(const CString& sStr, CString& sRet) const {
sRet = sStr;
sRet.Replace("%user%", GetUserName());
sRet.Replace("%nick%", GetUserName());
sRet.Replace("%defnick%", GetNick());
sRet.Replace("%nick%", GetCurNick());
sRet.Replace("%altnick%", GetAltNick());
sRet.Replace("%ident%", GetIdent());
sRet.Replace("%realname%", GetRealName());
@@ -414,11 +416,6 @@ bool CUser::IsValid(CString& sErrMsg, bool bSkipPass) const {
return false;
}
if (m_vServers.empty()) {
sErrMsg = "No servers defined";
return false;
}
return true;
}
@@ -723,6 +720,11 @@ CIRCSock* CUser::GetIRCSock() {
return (CIRCSock*) CZNC::Get().GetManager().FindSockByName("IRC::" + m_sUserName);
}
const CIRCSock* CUser::GetIRCSock() const {
// Todo: same as above
return (CIRCSock*) CZNC::Get().GetManager().FindSockByName("IRC::" + m_sUserName);
}
CString CUser::GetLocalIP() {
CIRCSock* pIRCSock = GetIRCSock();
@@ -872,8 +874,8 @@ bool CUser::GetFile(const CString& sRemoteNick, const CString& sRemoteIP, unsign
return true;
}
CString CUser::GetCurNick() {
CIRCSock* pIRCSock = GetIRCSock();
CString CUser::GetCurNick() const {
const CIRCSock* pIRCSock = GetIRCSock();
if (pIRCSock) {
return pIRCSock->GetNick();