X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_cycle.cpp;h=5b562631d9a3ff06aa8a1e7fe9e1218b5acac950;hb=0b070b52bc8e8ceb52388e45cea90f4add119c4f;hp=eb20f4f9938e4f4e779e6a28075ed2bbc16291f8;hpb=f2acdbc3820f0f4f5ef76a0a64e73d2a320df91f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cycle.cpp b/src/modules/m_cycle.cpp
index eb20f4f99..5b562631d 100644
--- a/src/modules/m_cycle.cpp
+++ b/src/modules/m_cycle.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,35 +12,39 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Provides support for unreal-style CYCLE command. */
 
 /** Handle /CYCLE
  */
-class cmd_cycle : public command_t
+class CommandCycle : public Command
 {
  public:
-	cmd_cycle (InspIRCd* Instance) : command_t(Instance,"CYCLE", 0, 1)
+	CommandCycle (InspIRCd* Instance) : Command(Instance,"CYCLE", 0, 1, false, 3)
 	{
 		this->source = "m_cycle.so";
 		syntax = "<channel> :[reason]";
+		TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
-		chanrec* channel = ServerInstance->FindChan(parameters[0]);
+		Channel* channel = ServerInstance->FindChan(parameters[0]);
 		std::string reason = ConvToStr("Cycling");
-			
-		if (pcnt > 1)
+
+		if (parameters.size() > 1)
 		{
 			/* reason provided, use it */
 			reason = reason + ": " + parameters[1];
 		}
-		
-		if (channel)
+
+		if (!channel)
+		{
+			user->WriteNumeric(403, "%s %s :No such channel", user->nick.c_str(), parameters[0].c_str());
+			return CMD_FAILURE;
+		}
+
+		if (channel->HasUser(user))
 		{
 			/*
 			 * technically, this is only ever sent locally, but pays to be safe ;p
@@ -53,19 +57,19 @@ class cmd_cycle : public command_t
 					user->WriteServ("NOTICE "+std::string(user->nick)+" :*** 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 chanrec method (the delete.) -- w00t */
-				if (!channel->PartUser(user, reason.c_str()))
+
+				/* XXX in the future, this may move to a static Channel method (the delete.) -- w00t */
+				if (!channel->PartUser(user, reason))
 					delete channel;
-				
-				chanrec::JoinUser(ServerInstance, user, parameters[0], true, "", ServerInstance->Time(true));
+
+				Channel::JoinUser(ServerInstance, user, parameters[0].c_str(), true, "", false, ServerInstance->Time());
 			}
 
 			return CMD_LOCALONLY;
 		}
 		else
 		{
-			user->WriteServ("NOTICE %s :*** You are not on this channel", user->nick);
+			user->WriteNumeric(442, "%s %s :You're not on that channel", user->nick.c_str(), channel->name.c_str());
 		}
 
 		return CMD_FAILURE;
@@ -75,25 +79,26 @@ class cmd_cycle : public command_t
 
 class ModuleCycle : public Module
 {
-	cmd_cycle*	mycommand;
+	CommandCycle*	mycommand;
  public:
 	ModuleCycle(InspIRCd* Me)
 		: Module(Me)
 	{
-		
-		mycommand = new cmd_cycle(ServerInstance);
+
+		mycommand = new CommandCycle(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
+
 	}
-	
+
 	virtual ~ModuleCycle()
 	{
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-	
+
 };
 
 MODULE_INIT(ModuleCycle)