From: attilamolnar <attilamolnar@hush.com>
Date: Thu, 8 Aug 2013 13:10:48 +0000 (+0200)
Subject: Fix a couple of issues
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=9962840222b6886f7653fc64443f19ebd661cc63;p=user%2Fhenk%2Fcode%2Finspircd.git

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
---

diff --git a/include/modules.h b/include/modules.h
index 710a39193..d13ff58b0 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -1419,7 +1419,7 @@ struct AllModuleList {
 	{ \
 		return new y; \
 	} \
-	extern "C" const char inspircd_src_version[] = VERSION " r" REVISION;
+	extern "C" const char inspircd_src_version[] = VERSION " " REVISION;
 #endif
 
 #define COMMAND_INIT(c) MODULE_INIT(CommandModule<c>)
diff --git a/include/snomasks.h b/include/snomasks.h
index db3989225..df4faab47 100644
--- a/include/snomasks.h
+++ b/include/snomasks.h
@@ -59,8 +59,8 @@ class Snomask
 	void Flush();
 
 	/** Returns the description of this snomask
-	 * @param remote If true the description of the uppercase (remote) variant of this snomask
-	 * will be returned (i.e.: "REMOTE" will be prepended to the description).
+	 * @param letter The letter of this snomask. If uppercase, the description of the remote
+	 * variant of this snomask will be returned (i.e.: "REMOTE" will be prepended to the description).
 	 * @return The description of this snomask
 	 */
 	std::string GetDescription(char letter) const;
diff --git a/src/commands/cmd_mode.cpp b/src/commands/cmd_mode.cpp
index adb1d483b..1a42835e5 100644
--- a/src/commands/cmd_mode.cpp
+++ b/src/commands/cmd_mode.cpp
@@ -49,7 +49,7 @@ class CommandMode : public Command
  */
 CmdResult CommandMode::Handle (const std::vector<std::string>& parameters, User *user)
 {
-	ServerInstance->Modes->Process(parameters, user);
+	ServerInstance->Modes->Process(parameters, user, (IS_LOCAL(user) ? ModeParser::MODE_NONE : ModeParser::MODE_LOCALONLY));
 	return CMD_SUCCESS;
 }
 
diff --git a/src/commands/cmd_whois.cpp b/src/commands/cmd_whois.cpp
index f75bd13fe..0df6b65f0 100644
--- a/src/commands/cmd_whois.cpp
+++ b/src/commands/cmd_whois.cpp
@@ -196,7 +196,7 @@ CmdResult CommandWhois::HandleRemote(const std::vector<std::string>& parameters,
 	if (!user)
 		return CMD_FAILURE;
 
-	unsigned long idle = ConvToInt(parameters[1]);
+	unsigned long idle = ConvToInt(parameters.back());
 	DoWhois(user, target, target->signon, idle);
 
 	return CMD_SUCCESS;
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 78659089c..59c65b931 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -358,7 +358,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
 	if (do_version)
 	{
-		std::cout << std::endl << VERSION << " r" << REVISION << std::endl;
+		std::cout << std::endl << VERSION << " " << REVISION << std::endl;
 		Exit(EXIT_STATUS_NOERROR);
 	}
 
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);
diff --git a/win/config.h.cmake b/win/config.h.cmake
index dbe705ceb..081163fab 100644
--- a/win/config.h.cmake
+++ b/win/config.h.cmake
@@ -2,7 +2,7 @@
 
 #define BRANCH "@MAJOR_VERSION@.@MINOR_VERSION@"
 #define VERSION "@FULL_VERSION@"
-#define REVISION "0"
+#define REVISION "release"
 #define SYSTEM "@CMAKE_SYSTEM@"
 
 #define CONFIG_PATH "@CONF_PATH@"