iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some minor issues

Browse Source 
E.g. a gcc warning about an uninitialized variable.

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter
2011-08-21 15:58:01 +02:00
parent f44f307b24
commit 5f53c3509f
4 changed files with 59 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
ClientCommand.cpp
View File

@@ -575,10 +575,12 @@ void CClient::UserCommand(CString& sLine) {
sMod = sType;
sArgs = sLine.Token(2, true);
sType = "default";
// Will be set correctly later
eType = ModuleTypeUser;
}
if (m_pUser->DenyLoadMod()) {
PutStatus("Unable to load [" + sMod + "] Access Denied.");
PutStatus("Unable to load [" + sMod + "]: Access Denied.");
return;
}
@@ -599,7 +601,7 @@ void CClient::UserCommand(CString& sLine) {
}
if (eType == ModuleTypeGlobal && !m_pUser->IsAdmin()) {
PutStatus("Unable to load global module [" + sMod + "] Access Denied.");
PutStatus("Unable to load global module [" + sMod + "]: Access Denied.");
return;
}
@@ -607,15 +609,14 @@ void CClient::UserCommand(CString& sLine) {
bool b = false;
switch (eType) {
case ModuleTypeGlobal:
b = CZNC::Get().GetModules().LoadModule(sMod, sArgs, eType, NULL, sModRet);
break;
case ModuleTypeUser:
b = m_pUser->GetModules().LoadModule(sMod, sArgs, eType, m_pUser, sModRet);
break;
default:
sModRet = "Unable to load module [" + sMod + "] Unknown module type";
case ModuleTypeGlobal:
b = CZNC::Get().GetModules().LoadModule(sMod, sArgs, eType, NULL, sModRet);
break;
case ModuleTypeUser:
b = m_pUser->GetModules().LoadModule(sMod, sArgs, eType, m_pUser, sModRet);
break;
default:
sModRet = "Unable to load module [" + sMod + "]: Unknown module type";
}
if (b)
@@ -659,22 +660,21 @@ void CClient::UserCommand(CString& sLine) {
}
if (eType == ModuleTypeGlobal && !m_pUser->IsAdmin()) {
PutStatus("Unable to unload global module [" + sMod + "] Access Denied.");
PutStatus("Unable to unload global module [" + sMod + "]: Access Denied.");
return;
}
CString sModRet;
switch (eType) {
case ModuleTypeGlobal:
CZNC::Get().GetModules().UnloadModule(sMod, sModRet);
break;
case ModuleTypeUser:
m_pUser->GetModules().UnloadModule(sMod, sModRet);
break;
default:
sModRet = "Unable to unload module [" + sMod + "] Unknown module type";
case ModuleTypeGlobal:
CZNC::Get().GetModules().UnloadModule(sMod, sModRet);
break;
case ModuleTypeUser:
m_pUser->GetModules().UnloadModule(sMod, sModRet);
break;
default:
sModRet = "Unable to unload module [" + sMod + "]: Unknown module type";
}
PutStatus(sModRet);
@@ -698,6 +698,8 @@ void CClient::UserCommand(CString& sLine) {
sMod = sType;
sArgs = sLine.Token(2, true);
sType = "default";
// Will be set correctly later
eType = ModuleTypeUser;
}
if (sMod.empty()) {
@@ -717,22 +719,21 @@ void CClient::UserCommand(CString& sLine) {
}
if (eType == ModuleTypeGlobal && !m_pUser->IsAdmin()) {
PutStatus("Unable to reload global module [" + sMod + "] Access Denied.");
PutStatus("Unable to reload global module [" + sMod + "]: Access Denied.");
return;
}
CString sModRet;
switch (eType) {
case ModuleTypeGlobal:
CZNC::Get().GetModules().ReloadModule(sMod, sArgs, NULL, sModRet);
break;
case ModuleTypeUser:
m_pUser->GetModules().ReloadModule(sMod, sArgs, m_pUser, sModRet);
break;
default:
sModRet = "Unable to reload module [" + sMod + "] Unknown module type";
case ModuleTypeGlobal:
CZNC::Get().GetModules().ReloadModule(sMod, sArgs, NULL, sModRet);
break;
case ModuleTypeUser:
m_pUser->GetModules().ReloadModule(sMod, sArgs, m_pUser, sModRet);
break;
default:
sModRet = "Unable to reload module [" + sMod + "]: Unknown module type";
}
PutStatus(sModRet);