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

Merge branch '1.6.x'

Browse Source 
Conflicts:
	modules/bouncedcc.cpp
This commit is contained in:
J-P Nurmi
2015-09-20 23:36:44 +02:00
parent c83a41ce89 c8ab811a29
commit e879203d54
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/cert.cpp
View File

@@ -46,7 +46,7 @@ public:
AddHelpCommand();
AddCommand("delete", static_cast<CModCommand::ModCmdFunc>(&CCertMod::Delete),
"", "Delete the current certificate");
AddCommand("info", static_cast<CModCommand::ModCmdFunc>(&CCertMod::Info));
AddCommand("info", static_cast<CModCommand::ModCmdFunc>(&CCertMod::Info), "", "Show the current certificate");
}
virtual ~CCertMod() {}

2
modules/certauth.cpp
View File

@@ -32,7 +32,7 @@ public:
"[pubkey]", "If pubkey is not provided will use the current key");
AddCommand("Del", static_cast<CModCommand::ModCmdFunc>(&CSSLClientCertMod::HandleDelCommand),
"id");
AddCommand("List", static_cast<CModCommand::ModCmdFunc>(&CSSLClientCertMod::HandleListCommand));
AddCommand("List", static_cast<CModCommand::ModCmdFunc>(&CSSLClientCertMod::HandleListCommand),"", "List your public keys");
AddCommand("Show", static_cast<CModCommand::ModCmdFunc>(&CSSLClientCertMod::HandleShowCommand),
"", "Print your current key");
}

2
modules/lastseen.cpp
View File

@@ -71,7 +71,7 @@ private:
public:
MODCONSTRUCTOR(CLastSeenMod) {
AddHelpCommand();
AddCommand("Show", static_cast<CModCommand::ModCmdFunc>(&CLastSeenMod::ShowCommand));
AddCommand("Show", static_cast<CModCommand::ModCmdFunc>(&CLastSeenMod::ShowCommand),"", "Shows list of users and when they last logged in");
}
virtual ~CLastSeenMod() {}

5
modules/route_replies.cpp
View File

@@ -218,7 +218,7 @@ public:
AddHelpCommand();
AddCommand("Silent", static_cast<CModCommand::ModCmdFunc>(&CRouteRepliesMod::SilentCommand),
"[yes|no]");
"[yes|no]", "Decides whether to show the timeout messages or not");
}
virtual ~CRouteRepliesMod() {
@@ -369,7 +369,8 @@ public:
// The timer will be deleted after this by the event loop
if (!GetNV("silent_timeouts").ToBool()) {
PutModule("This module hit a timeout which is possibly a bug.");
PutModule("This module hit a timeout which is probably a connectivity issue.");
PutModule("However, if you can provide steps to reproduce this issue, please do report a bug.");
PutModule("To disable this message, do \"/msg " + GetModNick()
+ " silent yes\"");
PutModule("Last request: " + m_sLastRequest);