X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_vhost.cpp;h=01df33cae02eeabafccf2a726253a3f80ded3151;hb=a0f7d012791d79b67b56b62415f7901d5e48870f;hp=704e769b3311f66fe06145c5bbc1a100959eb4e1;hpb=cd712c40e1b352c05e7ae0f72e0a5e84cdf64323;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp
index 704e769b3..01df33cae 100644
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -1,19 +1,26 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2007 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2006 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
 
-/* $ModDesc: Provides masking of user hostnames via traditional /VHOST command */
+#include "inspircd.h"
 
 /** Handle /VHOST
  */
@@ -25,7 +32,7 @@ class CommandVhost : public Command
 		syntax = "<username> <password>";
 	}
 
-	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
 		ConfigTagList tags = ServerInstance->Config->ConfTags("vhost");
 		for(ConfigIter i = tags.first; i != tags.second; ++i)
@@ -36,44 +43,35 @@ class CommandVhost : public Command
 			std::string pass = tag->getString("pass");
 			std::string hash = tag->getString("hash");
 
-			if (parameters[0] == username && !ServerInstance->PassCompare(user, pass, parameters[1], hash))
+			if (parameters[0] == username && ServerInstance->PassCompare(user, pass, parameters[1], hash))
 			{
 				if (!mask.empty())
 				{
-					user->WriteServ("NOTICE "+user->nick+" :Setting your VHost: " + mask);
-					user->ChangeDisplayedHost(mask.c_str());
+					user->WriteNotice("Setting your VHost: " + mask);
+					user->ChangeDisplayedHost(mask);
 					return CMD_SUCCESS;
 				}
 			}
 		}
 
-		user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid username or password.");
+		user->WriteNotice("Invalid username or password.");
 		return CMD_FAILURE;
 	}
 };
 
 class ModuleVHost : public Module
 {
- private:
 	CommandVhost cmd;
 
  public:
 	ModuleVHost() : cmd(this)
 	{
-		ServerInstance->AddCommand(&cmd);
 	}
 
-	virtual ~ModuleVHost()
-	{
-	}
-
-
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides masking of user hostnames via traditional /VHOST command",VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleVHost)
-