adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-06-23 19:42:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Modules: use public API

Browse Source 
Avoid accessing protected member variables directly, so
there's a chance of cleaning up the module API later.
This commit is contained in:
J-P Nurmi
2014-10-06 19:18:31 +02:00
parent d9ae3fa7c8
commit 1bacec1dd3
40 changed files with 291 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/modtcl.cpp
+18 -18
View File
@@ -72,7 +72,7 @@ public:
virtual bool OnLoad(const CString& sArgs, CString& sErrorMsg) {
#ifndef MOD_MODTCL_ALLOW_EVERYONE
if (!m_pUser->IsAdmin()) {
if (!GetUser()->IsAdmin()) {
sErrorMsg = "You must be admin to use the modtcl module";
return false;
}
@@ -262,25 +262,25 @@ private:
static int tcl_GetCurNick STDVAR {
CModTcl *mod = static_cast<CModTcl *>(cd);
Tcl_SetResult(irp, (char *)mod->m_pNetwork->GetCurNick().c_str(), TCL_VOLATILE);
Tcl_SetResult(irp, (char *)mod->GetNetwork()->GetCurNick().c_str(), TCL_VOLATILE);
return TCL_OK;
}
static int tcl_GetUsername STDVAR {
CModTcl *mod = static_cast<CModTcl *>(cd);
Tcl_SetResult(irp, (char *)mod->m_pUser->GetUserName().c_str(), TCL_VOLATILE);
Tcl_SetResult(irp, (char *)mod->GetUser()->GetUserName().c_str(), TCL_VOLATILE);
return TCL_OK;
}
static int tcl_GetRealName STDVAR {
CModTcl *mod = static_cast<CModTcl *>(cd);
Tcl_SetResult(irp, (char *)mod->m_pUser->GetRealName().c_str(), TCL_VOLATILE);
Tcl_SetResult(irp, (char *)mod->GetUser()->GetRealName().c_str(), TCL_VOLATILE);
return TCL_OK;
}
static int tcl_GetBindHost STDVAR {
CModTcl *mod = static_cast<CModTcl *>(cd);
Tcl_SetResult(irp, (char *)mod->m_pUser->GetBindHost().c_str(), TCL_VOLATILE);
Tcl_SetResult(irp, (char *)mod->GetUser()->GetBindHost().c_str(), TCL_VOLATILE);
return TCL_OK;
}
@@ -291,7 +291,7 @@ private:
BADARGS(1, 1, "");
const vector<CChan*>& Channels = mod->m_pNetwork->GetChans();
const vector<CChan*>& Channels = mod->GetNetwork()->GetChans();
for (unsigned int c = 0; c < Channels.size(); c++) {
CChan* pChan = Channels[c];
l[0] = pChan->GetName().c_str();
@@ -311,7 +311,7 @@ private:
BADARGS(2, 999, " channel");
CString sChannel = argvit(argv, argc, 1, " ");
CChan *pChannel = mod->m_pNetwork->FindChan(sChannel);
CChan *pChannel = mod->GetNetwork()->FindChan(sChannel);
if (!pChannel) {
CString sMsg = "invalid channel: " + sChannel;
@@ -340,7 +340,7 @@ private:
BADARGS(2, 999, " channel");
CString sChannel = argvit(argv, argc, 1, " ");
CChan *pChannel = mod->m_pNetwork->FindChan(sChannel);
CChan *pChannel = mod->GetNetwork()->FindChan(sChannel);
CString sMsg;
if (!pChannel) {
@@ -356,7 +356,7 @@ private:
static int tcl_GetServer STDVAR {
CModTcl *mod = static_cast<CModTcl *>(cd);
CServer* pServer = mod->m_pNetwork->GetCurrentServer();
CServer* pServer = mod->GetNetwork()->GetCurrentServer();
CString sMsg;
if (pServer)
sMsg = pServer->GetName() + ":" + CString(pServer->GetPort());
@@ -366,7 +366,7 @@ private:
static int tcl_GetServerOnline STDVAR {
CModTcl *mod = static_cast<CModTcl *>(cd);
CIRCSock* pIRCSock = mod->m_pNetwork->GetIRCSock();
CIRCSock* pIRCSock = mod->GetNetwork()->GetIRCSock();
CString sMsg = "0";
if (pIRCSock)
sMsg = CString(pIRCSock->GetStartTime());
@@ -382,7 +382,7 @@ private:
BADARGS(1, 1, "");
CModules& GModules = CZNC::Get().GetModules();
CModules& Modules = mod->m_pUser->GetModules();
CModules& Modules = mod->GetUser()->GetModules();
for (unsigned int b = 0; b < GModules.size(); b++) {
l[0] = GModules[b]->GetModName().c_str();
@@ -406,7 +406,7 @@ private:
static int tcl_GetClientCount STDVAR {
CModTcl *mod = static_cast<CModTcl *>(cd);
Tcl_SetResult(irp, (char *)CString(mod->m_pNetwork->GetClients().size()).c_str(), TCL_VOLATILE);
Tcl_SetResult(irp, (char *)CString(mod->GetNetwork()->GetClients().size()).c_str(), TCL_VOLATILE);
return TCL_OK;
}
@@ -416,7 +416,7 @@ private:
BADARGS(2, 999, " string");
sMsg = argvit(argv, argc, 1, " ");
mod->m_pNetwork->PutIRC(sMsg);
mod->GetNetwork()->PutIRC(sMsg);
return TCL_OK;
}
@@ -451,7 +451,7 @@ private:
BADARGS(2, 999, " string");
sMsg = argvit(argv, argc, 1, " ");
mod->m_pUser->PutStatusNotice(sMsg);
mod->GetUser()->PutStatusNotice(sMsg);
return TCL_OK;
}
@@ -461,7 +461,7 @@ private:
BADARGS(2, 999, " string");
sMsg = argvit(argv, argc, 1, " ");
mod->m_pUser->PutUser(sMsg);
mod->GetUser()->PutUser(sMsg);
return TCL_OK;
}
@@ -471,7 +471,7 @@ private:
BADARGS(1, 2, " ?reason?");
if (! mod->m_pUser->IsAdmin()) {
if (! mod->GetUser()->IsAdmin()) {
sMsg = "You need to be administrator to shutdown the bnc.";
Tcl_SetResult(irp, (char*)sMsg.c_str(), TCL_VOLATILE);
return TCL_ERROR;
@@ -489,13 +489,13 @@ private:
};
void CModTclTimer::RunJob() {
CModTcl *p = (CModTcl *)m_pModule;
CModTcl *p = (CModTcl *)GetModule();
if (p)
p->TclUpdate();
}
void CModTclStartTimer::RunJob() {
CModTcl *p = (CModTcl *)m_pModule;
CModTcl *p = (CModTcl *)GetModule();
if (p)
p->Start();
}