From 9962840222b6886f7653fc64443f19ebd661cc63 Mon Sep 17 00:00:00 2001
From: attilamolnar
Date: Thu, 8 Aug 2013 15:10:48 +0200
Subject: Fix a couple of issues

- Wrong doc for Snomask::GetDescription()
- Incorrect idle time when WHOISing remote users
- String + int = garbage
- Remote MODE commands (user mode changes) being broadcast in addition to being forwarded
- Incorrect revision being shown
---
 src/modules/m_channames.cpp         | 2 +-
 src/modules/m_ojoin.cpp             | 2 +-
 src/modules/m_spanningtree/idle.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/m_channames.cpp b/src/modules/m_channames.cpp
index 4228d5050..fcb2ef6d7 100644
--- a/src/modules/m_channames.cpp
+++ b/src/modules/m_channames.cpp
@@ -82,7 +82,7 @@ class ModuleChannelNames : public Module
 			{
 				std::vector<std::string> modes;
 				modes.push_back(c->name);
-				modes.push_back("-" + permchannelmode->GetModeChar());
+				modes.push_back(std::string("-") + permchannelmode->GetModeChar());
 
 				ServerInstance->Modes->Process(modes, ServerInstance->FakeClient);
 			}
diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp
index 8f7fe4460..b0c206ab3 100644
--- a/src/modules/m_ojoin.cpp
+++ b/src/modules/m_ojoin.cpp
@@ -69,7 +69,7 @@ class CommandOjoin : public SplitCommand
 			// they're already in the channel
 			std::vector<std::string> modes;
 			modes.push_back(parameters[0]);
-			modes.push_back("+" + npmh->GetModeChar());
+			modes.push_back(std::string("+") + npmh->GetModeChar());
 			if (op)
 			{
 				modes[1].push_back('o');
diff --git a/src/modules/m_spanningtree/idle.cpp b/src/modules/m_spanningtree/idle.cpp
index bf074bf7f..2c95eaad1 100644
--- a/src/modules/m_spanningtree/idle.cpp
+++ b/src/modules/m_spanningtree/idle.cpp
@@ -60,7 +60,7 @@ bool TreeSocket::Whois(const std::string &prefix, parameterlist &params)
 			// Possible case when our clock ticked backwards
 			idle = 0;
 		else
-			idle = ((unsigned int) (localtarget->idle_lastmsg - ServerInstance->Time()));
+			idle = ((unsigned int) (ServerInstance->Time() - localtarget->idle_lastmsg));
 
 		parameterlist reply;
 		reply.push_back(prefix);
-- 
cgit v1.3.1-10-gc9f91