X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_cycle.cpp;h=d4194c75ea6fea2eb2ab571658a79b4838eb42a3;hb=9ebd9cba72056c5b36696e166826afb981f25ebb;hp=57882b2912e5f08dadaad0e41cbfa58ebe0b76bb;hpb=c2957516bca0fe70622c7668a12ade68576ddab2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cycle.cpp b/src/modules/m_cycle.cpp
index 57882b291..d4194c75e 100644
--- a/src/modules/m_cycle.cpp
+++ b/src/modules/m_cycle.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -20,30 +20,29 @@
 class CommandCycle : public Command
 {
  public:
-	CommandCycle (InspIRCd* Instance) : Command(Instance,"CYCLE", 0, 1, false, 3)
+	CommandCycle(Module* Creator) : Command(Creator,"CYCLE", 1)
 	{
-		this->source = "m_cycle.so";
-		syntax = "<channel> :[reason]";
+		Penalty = 3; syntax = "<channel> :[reason]";
 		TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const char* const* parameters, int pcnt, User *user)
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
 		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)
 		{
-			user->WriteNumeric(403, "%s %s :No such channel", user->nick, parameters[0]);
+			user->WriteNumeric(403, "%s %s :No such channel", user->nick.c_str(), parameters[0].c_str());
 			return CMD_FAILURE;
 		}
-		
+
 		if (channel->HasUser(user))
 		{
 			/*
@@ -51,25 +50,23 @@ 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);
 					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());
+
+				channel->PartUser(user, reason);
+
+				Channel::JoinUser(user, parameters[0].c_str(), true, "", false, ServerInstance->Time());
 			}
 
-			return CMD_LOCALONLY;
+			return CMD_SUCCESS;
 		}
 		else
 		{
-			user->WriteNumeric(442, "%s %s :You're not on that channel", user->nick, channel->name);
+			user->WriteNumeric(442, "%s %s :You're not on that channel", user->nick.c_str(), channel->name.c_str());
 		}
 
 		return CMD_FAILURE;
@@ -79,26 +76,23 @@ class CommandCycle : public Command
 
 class ModuleCycle : public Module
 {
-	CommandCycle*	mycommand;
+	CommandCycle cmd;
  public:
-	ModuleCycle(InspIRCd* Me)
-		: Module(Me)
+	ModuleCycle()
+		: cmd(this)
 	{
-		
-		mycommand = new CommandCycle(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
-
+		ServerInstance->AddCommand(&cmd);
 	}
-	
+
 	virtual ~ModuleCycle()
 	{
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for unreal-style CYCLE command.", VF_VENDOR);
 	}
-	
+
 };
 
 MODULE_INIT(ModuleCycle)