From d7d01bdc5c667a1fafd95241282b58e03b4caa5b Mon Sep 17 00:00:00 2001
From: rburchell <rburchell@5417fbe8-f217-4b02-8779-1006273d7864>
Date: Mon, 9 Feb 2009 21:01:05 +0000
Subject: Squashed commit: merge next (1.9.1) back to trunk. SVN users, NOTE:
 THIS WILL NOT BUILD, NOR SHOULD YOU RUN IT YET.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1953 5417fbe8-f217-4b02-8779-1006273d7864
---
 src/core/bs_assign.c | 115 +++++++++++++++++++++++++++++++++------------------
 1 file changed, 74 insertions(+), 41 deletions(-)

(limited to 'src/core/bs_assign.c')

diff --git a/src/core/bs_assign.c b/src/core/bs_assign.c
index 396031662..f9927e25d 100644
--- a/src/core/bs_assign.c
+++ b/src/core/bs_assign.c
@@ -15,21 +15,90 @@
 
 #include "module.h"
 
-int do_assign(User * u);
 void myBotServHelp(User * u);
 
+class CommandBSAssign : public Command
+{
+ public:
+	CommandBSAssign() : Command("ASSIGN", 1, 1)
+	{
+	}
+
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
+	{
+		char *chan = strtok(NULL, " ");
+		char *nick = strtok(NULL, " ");
+		BotInfo *bi;
+		ChannelInfo *ci;
+
+		if (readonly)
+		{
+			notice_lang(s_BotServ, u, BOT_ASSIGN_READONLY);
+			return MOD_CONT;
+		}
+		
+		if (!(bi = findbot(nick)))
+		{
+			notice_lang(s_BotServ, u, BOT_DOES_NOT_EXIST, nick);
+			return MOD_CONT;
+		}
+		
+		if (bi->flags & BI_PRIVATE && !is_oper(u))
+		{
+			notice_lang(s_BotServ, u, PERMISSION_DENIED);
+			return MOD_CONT;
+		}
+		
+		if (!(ci = cs_findchan(chan)))
+		{
+			notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
+			return MOD_CONT;
+		}
+		
+		if (ci->flags & CI_VERBOTEN)
+		{
+			notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
+			return MOD_CONT;
+		}
+		
+		if ((ci->bi) && (stricmp(ci->bi->nick, nick) == 0))
+		{
+			notice_lang(s_BotServ, u, BOT_ASSIGN_ALREADY, ci->bi->nick, chan);
+			return MOD_CONT;
+		}
+		
+		if ((ci->botflags & BS_NOBOT) || (!check_access(u, ci, CA_ASSIGN) && !is_services_admin(u)))
+		{
+			notice_lang(s_BotServ, u, PERMISSION_DENIED);
+			return MOD_CONT;
+		}
+		
+		bi->Assign(u, ci);
+		notice_lang(s_BotServ, u, BOT_ASSIGN_ASSIGNED, bi->nick, ci->name);
+		return MOD_CONT;
+	}
+
+	bool OnHelp(User *u, const std::string &subcommand)
+	{
+		notice_lang(s_BotServ, u, BOT_HELP_ASSIGN);
+		return true;
+	}
+
+	void OnSyntaxError(User *u)
+	{
+		syntax_error(s_BotServ, u, "ASSIGN", BOT_ASSIGN_SYNTAX);
+	}
+};
+
 class BSAssign : public Module
 {
  public:
 	BSAssign(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
-		Command *c;
-
 		this->SetAuthor("Anope");
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
-		c = createCommand("ASSIGN", do_assign, NULL, BOT_HELP_ASSIGN, -1, -1, -1, -1);
-		this->AddCommand(BOTSERV, c, MOD_UNIQUE);
+		this->AddCommand(BOTSERV, new CommandBSAssign, MOD_UNIQUE);
 
 		this->SetBotHelp(myBotServHelp);
 	}
@@ -44,40 +113,4 @@ void myBotServHelp(User * u)
 	notice_lang(s_BotServ, u, BOT_HELP_CMD_ASSIGN);
 }
 
-/**
- * The /bs assign command.
- * @param u The user who issued the command
- * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
- **/
-int do_assign(User * u)
-{
-	char *chan = strtok(NULL, " ");
-	char *nick = strtok(NULL, " ");
-	BotInfo *bi;
-	ChannelInfo *ci;
-
-	if (readonly)
-		notice_lang(s_BotServ, u, BOT_ASSIGN_READONLY);
-	else if (!chan || !nick)
-		syntax_error(s_BotServ, u, "ASSIGN", BOT_ASSIGN_SYNTAX);
-	else if (!(bi = findbot(nick)))
-		notice_lang(s_BotServ, u, BOT_DOES_NOT_EXIST, nick);
-	else if (bi->flags & BI_PRIVATE && !is_oper(u))
-		notice_lang(s_BotServ, u, PERMISSION_DENIED);
-	else if (!(ci = cs_findchan(chan)))
-		notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
-	else if (ci->flags & CI_VERBOTEN)
-		notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
-	else if ((ci->bi) && (stricmp(ci->bi->nick, nick) == 0))
-		notice_lang(s_BotServ, u, BOT_ASSIGN_ALREADY, ci->bi->nick, chan);
-	else if ((ci->botflags & BS_NOBOT)
-			 || (!check_access(u, ci, CA_ASSIGN) && !is_services_admin(u)))
-		notice_lang(s_BotServ, u, PERMISSION_DENIED);
-	else {
-		bi->Assign(u, ci);
-		notice_lang(s_BotServ, u, BOT_ASSIGN_ASSIGNED, bi->nick, ci->name);
-	}
-	return MOD_CONT;
-}
-
 MODULE_INIT("bs_assign", BSAssign)
-- 
cgit