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/ms_cancel.c | 112 ++++++++++++++++++++++++++-------------------------
 1 file changed, 57 insertions(+), 55 deletions(-)

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

diff --git a/src/core/ms_cancel.c b/src/core/ms_cancel.c
index 17fa3d87b..63c81ea22 100644
--- a/src/core/ms_cancel.c
+++ b/src/core/ms_cancel.c
@@ -15,80 +15,82 @@
 
 #include "module.h"
 
-int do_cancel(User * u);
-void myMemoServHelp(User * u);
+void myMemoServHelp(User *u);
+
+class CommandMSCancel : public Command
+{
+ public:
+	CommandMSCancel() : Command("CANCEL", 1, 1)
+	{
+	}
+
+	CommandResult Execute(User *u, std::vector<std::string> &params)
+	{
+		int ischan;
+		int isforbid;
+		const char *name = params[0].c_str();
+		MemoInfo *mi;
+
+		if (!nick_recognized(u))
+			notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
+		else if (!(mi = getmemoinfo(name, &ischan, &isforbid)))
+		{
+			if (isforbid)
+				notice_lang(s_MemoServ, u, ischan ? CHAN_X_FORBIDDEN : NICK_X_FORBIDDEN, name);
+			else
+				notice_lang(s_MemoServ, u, ischan ? CHAN_X_NOT_REGISTERED : NICK_X_NOT_REGISTERED, name);
+		}
+		else
+		{
+			int i;
+
+			for (i = mi->memos.size() - 1; i >= 0; --i)
+			{
+				if ((mi->memos[i]->flags & MF_UNREAD) && !stricmp(mi->memos[i]->sender, u->na->nc->display) && (!(mi->memos[i]->flags & MF_NOTIFYS)))
+				{
+					delmemo(mi, mi->memos[i]->number);
+					notice_lang(s_MemoServ, u, MEMO_CANCELLED, name);
+					return MOD_CONT;
+				}
+			}
+
+			notice_lang(s_MemoServ, u, MEMO_CANCEL_NONE);
+		}
+		return MOD_CONT;
+	}
+
+	bool OnHelp(User *u, const std::string &subcommand)
+	{
+		notice_lang(s_MemoServ, u, MEMO_HELP_CANCEL);
+		return true;
+	}
+
+	void OnSyntaxError(User *u)
+	{
+		syntax_error(s_MemoServ, u, "CANCEL", MEMO_CANCEL_SYNTAX);
+	}
+};
 
 class MSCancel : public Module
 {
  public:
 	MSCancel(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
-		Command *c;
-
 		this->SetAuthor("Anope");
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
-		c = createCommand("CANCEL", do_cancel, NULL, MEMO_HELP_CANCEL, -1, -1, -1, -1);
-		this->AddCommand(MEMOSERV, c, MOD_UNIQUE);
+		this->AddCommand(MEMOSERV, new CommandMSCancel(), MOD_UNIQUE);
 		this->SetMemoHelp(myMemoServHelp);
 	}
 };
 
-
-
 /**
  * Add the help response to anopes /ms help output.
  * @param u The user who is requesting help
  **/
-void myMemoServHelp(User * u)
+void myMemoServHelp(User *u)
 {
 	notice_lang(s_MemoServ, u, MEMO_HELP_CMD_CANCEL);
 }
 
-/**
- * The /ms cancel command.
- * @param u The user who issued the command
- * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
- **/
-int do_cancel(User * u)
-{
-	int ischan;
-	int isforbid;
-	char *name = strtok(NULL, " ");
-	MemoInfo *mi;
-
-	if (!name) {
-		syntax_error(s_MemoServ, u, "CANCEL", MEMO_CANCEL_SYNTAX);
-
-	} else if (!nick_recognized(u)) {
-		notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
-
-	} else if (!(mi = getmemoinfo(name, &ischan, &isforbid))) {
-		if (isforbid) {
-			notice_lang(s_MemoServ, u,
-						ischan ? CHAN_X_FORBIDDEN :
-						NICK_X_FORBIDDEN, name);
-		} else {
-			notice_lang(s_MemoServ, u,
-						ischan ? CHAN_X_NOT_REGISTERED :
-						NICK_X_NOT_REGISTERED, name);
-		}
-	} else {
-		int i;
-
-		for (i = mi->memos.size() - 1; i >= 0; i--) {
-			if ((mi->memos[i]->flags & MF_UNREAD)
-				&& !stricmp(mi->memos[i]->sender, u->na->nc->display)
-				&& (!(mi->memos[i]->flags & MF_NOTIFYS))) {
-				delmemo(mi, mi->memos[i]->number);
-				notice_lang(s_MemoServ, u, MEMO_CANCELLED, name);
-				return MOD_CONT;
-			}
-		}
-
-		notice_lang(s_MemoServ, u, MEMO_CANCEL_NONE);
-	}
-	return MOD_CONT;
-}
-
 MODULE_INIT("ms_cancel", MSCancel)
-- 
cgit