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

Merge pull request #1140 from Zarthus/simpleaway-expandstring

Browse Source 
Use ExpandString for simple_away, rename %s to %awaytime% to follow ExpandString standards
This commit is contained in:
Alexey Sokolov
2015-10-15 09:00:06 +01:00
parent 3623cf0d45 25f40b7d2c
commit eb6852f58b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/simple_away.cpp
View File

@@ -18,7 +18,7 @@
#include <znc/IRCNetwork.h>
#include <time.h>
#define SIMPLE_AWAY_DEFAULT_REASON "Auto away at %s"
#define SIMPLE_AWAY_DEFAULT_REASON "Auto away at %awaytime%"
#define SIMPLE_AWAY_DEFAULT_TIME 60
@@ -50,7 +50,7 @@ public:
m_bWeSetAway = false;
AddHelpCommand();
AddCommand("Reason", static_cast<CModCommand::ModCmdFunc>(&CSimpleAway::OnReasonCommand), "[<text>]", "Prints or sets the away reason (%s is replaced with the time you were set away)");
AddCommand("Reason", static_cast<CModCommand::ModCmdFunc>(&CSimpleAway::OnReasonCommand), "[<text>]", "Prints or sets the away reason (%awaytime% is replaced with the time you were set away, supports substitutions using ExpandString)");
AddCommand("Timer", static_cast<CModCommand::ModCmdFunc>(&CSimpleAway::OnTimerCommand), "", "Prints the current time to wait before setting you away");
AddCommand("SetTimer", static_cast<CModCommand::ModCmdFunc>(&CSimpleAway::OnSetTimerCommand), "<seconds>", "Sets the time to wait before setting you away");
AddCommand("DisableTimer", static_cast<CModCommand::ModCmdFunc>(&CSimpleAway::OnDisableTimerCommand), "", "Disables the wait time before setting you away");
@@ -186,7 +186,9 @@ private:
time_t iTime = time(nullptr);
CString sTime = CUtils::CTime(iTime, GetUser()->GetTimezone());
sReason.Replace("%s", sTime);
sReason.Replace("%awaytime%", sTime);
sReason = ExpandString(sReason);
sReason.Replace("%s", sTime); // Backwards compatibility with previous syntax, where %s was substituted with sTime. ZNC <= 1.6.x
return sReason;
}