X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cycle.cpp;h=e4cd0de60a0b1ef5f72bd195b54e25f1c3c98c72;hb=98ef89c392a63bb7a78df5e8d8283c848f9dd2af;hp=882d4232ef9ad28dfa7fa8e5417526d2259863b3;hpb=dd36852a52e8541306b76c5b88bce8ab9b36654c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cycle.cpp b/src/modules/m_cycle.cpp
index 882d4232e..e4cd0de60 100644
--- a/src/modules/m_cycle.cpp
+++ b/src/modules/m_cycle.cpp
@@ -1,49 +1,53 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 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 support for unreal-style CYCLE command. */
+#include "inspircd.h"
 
 /** Handle /CYCLE
  */
-class CommandCycle : public Command
+class CommandCycle : public SplitCommand
 {
  public:
-	CommandCycle (InspIRCd* Instance) : Command(Instance,"CYCLE", 0, 1, false, 3)
+	CommandCycle(Module* Creator)
+		: SplitCommand(Creator, "CYCLE", 1)
 	{
-		this->source = "m_cycle.so";
-		syntax = "<channel> :[reason]";
-		TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
+		Penalty = 3; syntax = "<channel> :[reason]";
 	}
 
-	CmdResult Handle (const char* const* parameters, int pcnt, User *user)
+	CmdResult HandleLocal(const std::vector<std::string> &parameters, LocalUser* user)
 	{
 		Channel* channel = ServerInstance->FindChan(parameters[0]);
-		std::string reason = ConvToStr("Cycling");
-			
-		if (pcnt > 1)
+		std::string reason = "Cycling";
+
+		if (parameters.size() > 1)
 		{
 			/* reason provided, use it */
 			reason = reason + ": " + parameters[1];
 		}
-		
+
 		if (!channel)
 		{
-			user->WriteServ("403 %s %s :No such channel", user->nick, parameters[0]);
+			user->WriteNumeric(ERR_NOSUCHCHANNEL, "%s :No such channel", parameters[0].c_str());
 			return CMD_FAILURE;
 		}
-		
+
 		if (channel->HasUser(user))
 		{
 			/*
@@ -51,25 +55,22 @@ class CommandCycle : public Command
 			 */
 			if (IS_LOCAL(user))
 			{
-				if (channel->GetStatus(user) < STATUS_VOICE && channel->IsBanned(user))
+				if (channel->GetPrefixValue(user) < VOICE_VALUE && channel->IsBanned(user))
 				{
 					/* banned, boned. drop the message. */
-					user->WriteServ("NOTICE "+std::string(user->nick)+" :*** You may not cycle, as you are banned on channel " + channel->name);
+					user->WriteNotice("*** You may not cycle, as you are banned on channel " + channel->name);
 					return CMD_FAILURE;
 				}
-				
-				/* XXX in the future, this may move to a static Channel method (the delete.) -- w00t */
-				if (!channel->PartUser(user, reason.c_str()))
-					delete channel;
-				
-				Channel::JoinUser(ServerInstance, user, parameters[0], true, "", false, ServerInstance->Time(true));
+
+				channel->PartUser(user, reason);
+				Channel::JoinUser(user, parameters[0], true);
 			}
 
-			return CMD_LOCALONLY;
+			return CMD_SUCCESS;
 		}
 		else
 		{
-			user->WriteServ("442 %s %s :You're not on that channel", user->nick, channel->name);
+			user->WriteNumeric(ERR_NOTONCHANNEL, "%s :You're not on that channel", channel->name.c_str());
 		}
 
 		return CMD_FAILURE;
@@ -79,26 +80,18 @@ class CommandCycle : public Command
 
 class ModuleCycle : public Module
 {
-	CommandCycle*	mycommand;
- public:
-	ModuleCycle(InspIRCd* Me)
-		: Module(Me)
-	{
-		
-		mycommand = new CommandCycle(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
+	CommandCycle cmd;
 
-	}
-	
-	virtual ~ModuleCycle()
+ public:
+	ModuleCycle()
+		: cmd(this)
 	{
 	}
-	
-	virtual Version GetVersion()
+
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides command CYCLE, acts as a server-side HOP command to part and rejoin a channel.", VF_VENDOR);
 	}
-	
 };
 
 MODULE_INIT(ModuleCycle)