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

Use loadmod --type=type syntax for modules.

Browse Source 
See github issue #171
This commit is contained in:
Alexey Sokolov
2012-07-18 22:15:51 +07:00
parent fca5eebe53
commit 7951a50200
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/ClientCommand.cpp
View File

@@ -742,11 +742,12 @@ void CClient::UserCommand(CString& sLine) {
CString sMod = sLine.Token(2);
CString sArgs = sLine.Token(3, true);
if (sType.Equals("global")) {
// TODO use proper library for parsing arguments
if (sType.Equals("--type=global")) {
eType = CModInfo::GlobalModule;
} else if (sType.Equals("user")) {
} else if (sType.Equals("--type=user")) {
eType = CModInfo::UserModule;
} else if (sType.Equals("network")) {
} else if (sType.Equals("--type=network")) {
eType = CModInfo::NetworkModule;
} else {
sMod = sType;
@@ -762,7 +763,7 @@ void CClient::UserCommand(CString& sLine) {
}
if (sMod.empty()) {
PutStatus("Usage: LoadMod [type] <module> [args]");
PutStatus("Usage: LoadMod [--type=global|user|network] <module> [args]");
return;
}
@@ -814,11 +815,12 @@ void CClient::UserCommand(CString& sLine) {
CString sType = sLine.Token(1);
CString sMod = sLine.Token(2);
if (sType.Equals("global")) {
// TODO use proper library for parsing arguments
if (sType.Equals("--type=global")) {
eType = CModInfo::GlobalModule;
} else if (sType.Equals("user")) {
} else if (sType.Equals("--type=user")) {
eType = CModInfo::UserModule;
} else if (sType.Equals("network")) {
} else if (sType.Equals("--type=network")) {
eType = CModInfo::NetworkModule;
} else {
sMod = sType;
@@ -831,7 +833,7 @@ void CClient::UserCommand(CString& sLine) {
}
if (sMod.empty()) {
PutStatus("Usage: UnloadMod [type] <module>");
PutStatus("Usage: UnloadMod [--type=global|user|network] <module>");
return;
}
@@ -885,11 +887,12 @@ void CClient::UserCommand(CString& sLine) {
return;
}
if (sType.Equals("global")) {
// TODO use proper library for parsing arguments
if (sType.Equals("--type=global")) {
eType = CModInfo::GlobalModule;
} else if (sType.Equals("user")) {
} else if (sType.Equals("--type=user")) {
eType = CModInfo::UserModule;
} else if (sType.Equals("network")) {
} else if (sType.Equals("--type=network")) {
eType = CModInfo::NetworkModule;
} else {
sMod = sType;
@@ -900,7 +903,7 @@ void CClient::UserCommand(CString& sLine) {
}
if (sMod.empty()) {
PutStatus("Usage: ReloadMod [type] <module> [args]");
PutStatus("Usage: ReloadMod [--type=global|user|network] <module> [args]");
return;
}
@@ -1441,17 +1444,17 @@ void CClient::HelpUser() {
if (!m_pUser->DenyLoadMod()) {
Table.AddRow();
Table.SetCell("Command", "LoadMod");
Table.SetCell("Arguments", "[type] <module>");
Table.SetCell("Arguments", "[--type=global|user|network] <module>");
Table.SetCell("Description", "Load a module");
Table.AddRow();
Table.SetCell("Command", "UnloadMod");
Table.SetCell("Arguments", "[type] <module>");
Table.SetCell("Arguments", "[--type=global|user|network] <module>");
Table.SetCell("Description", "Unload a module");
Table.AddRow();
Table.SetCell("Command", "ReloadMod");
Table.SetCell("Arguments", "[type] <module>");
Table.SetCell("Arguments", "[--type=global|user|network] <module>");
Table.SetCell("Description", "Reload a module");
if (m_pUser->IsAdmin()) {