Convert cs_logout to new commands API.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1958 5417fbe8-f217-4b02-8779-1006273d7864

1 files changed, 101 insertions, 76 deletions

diff --git a/src/core/cs_logout.c b/src/core/cs_logout.c
index 96257e72a..ce38cabd2 100644
--- a/src/core/cs_logout.c
+++ b/src/core/cs_logout.c
@@ -15,23 +15,116 @@
 
 #include "module.h"
 
-int do_logout(User * u);
-void myChanServHelp(User * u);
-void make_unidentified(User * u, ChannelInfo * ci);
+class CommandCSLogout : public Command
+{
+ private:
+	void make_unidentified(User * u, ChannelInfo * ci)
+	{
+		struct u_chaninfolist *uci;
+
+		if (!u || !ci)
+			return;
+
+		for (uci = u->founder_chans; uci; uci = uci->next)
+		{
+			if (uci->chan == ci)
+			{
+				if (uci->next)
+					uci->next->prev = uci->prev;
+				if (uci->prev)
+					uci->prev->next = uci->next;
+				else
+					u->founder_chans = uci->next;
+				delete uci;
+				break;
+			}
+		}
+	}
+
+ public:
+	CommandCSLogout() : Command("LOGOUT", 1, 2)
+	{
+
+	}
+
+	CommandReturn Execute(User *u, std::vector<std::string> &params)
+	{
+		const char *chan = params[0].c_str();
+		const char *nick = params[1].c_str();
+		ChannelInfo *ci;
+		User *u2 = NULL;
+		int is_servadmin = is_services_admin(u);
+
+		if (!nick && !is_servadmin)
+		{
+			// XXX: this should be permission denied.
+			syntax_error(s_ChanServ, u, "LOGOUT",
+						 (!is_servadmin ? CHAN_LOGOUT_SYNTAX :
+						  CHAN_LOGOUT_SERVADMIN_SYNTAX));
+		}
+		else if (!(ci = cs_findchan(chan)))
+		{
+			notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
+		}
+		else if (!is_servadmin && (ci->flags & CI_VERBOTEN))
+		{
+			notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
+		}
+		else if (nick && !(u2 = finduser(nick)))
+		{
+			notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, nick);
+		}
+		else if (!is_servadmin && u2 != u && !is_real_founder(u, ci))
+		{
+			notice_lang(s_ChanServ, u, ACCESS_DENIED);
+		}
+		else if (u2 == u && is_real_founder(u, ci))
+		{
+			/* Since founders can not logout we should tell them -katsklaw */
+			notice_lang(s_ChanServ, u, CHAN_LOGOUT_FOUNDER_FAILED, chan);
+		}
+		else {
+			if (u2) {
+				make_unidentified(u2, ci);
+				notice_lang(s_ChanServ, u, CHAN_LOGOUT_SUCCEEDED, nick, chan);
+				alog("%s: User %s!%s@%s has been logged out of channel %s.",
+					 s_ChanServ, u2->nick, u2->GetIdent().c_str(), u2->host, chan);
+			} else {
+				int i;
+				for (i = 0; i < 1024; i++)
+					for (u2 = userlist[i]; u2; u2 = u2->next)
+						make_unidentified(u2, ci);
+				notice_lang(s_ChanServ, u, CHAN_LOGOUT_ALL_SUCCEEDED, chan);
+				alog("%s: All users identified have been logged out of channel %s.", s_ChanServ, chan);
+			}
+
+		}
+		return MOD_CONT;
+	}
+
+	bool OnHelp(User *u, const std::string &subcommand)
+	{
+		if (is_services_admin(u) || is_services_root(u))
+			notice_lang(s_NickServ, u, CHAN_SERVADMIN_HELP_LOGOUT);
+		notice_lang(s_NickServ, u, CHAN_HELP_LOGOUT);
+		return true;
+	}
+
+	void OnSyntaxError(User *u)
+	{
+		syntax_error(s_NickServ, u, "LOGOUT", CHAN_LOGOUT_SYNTAX);
+	}
+};
 
 class CSLogout : public Module
 {
  public:
 	CSLogout(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
-		Command *c;
-
 		this->SetAuthor("Anope");
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
-
-		c = createCommand("LOGOUT", do_logout, NULL, -1, CHAN_HELP_LOGOUT, -1, CHAN_SERVADMIN_HELP_LOGOUT, CHAN_SERVADMIN_HELP_LOGOUT);
-		this->AddCommand(CHANSERV, c, MOD_UNIQUE);
+		this->AddCommand(CHANSERV, new CommandCSLogout(), MOD_UNIQUE);
 
 		this->SetChanHelp(myChanServHelp);
 	}
@@ -47,72 +140,4 @@ void myChanServHelp(User * u)
 	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_LOGOUT);
 }
 
-/**
- * The /cs command.
- * @param u The user who issued the command
- * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
- **/
-int do_logout(User * u)
-{
-	char *chan = strtok(NULL, " ");
-	char *nick = strtok(NULL, " ");
-	ChannelInfo *ci;
-	User *u2 = NULL;
-	int is_servadmin = is_services_admin(u);
-
-	if (!chan || (!nick && !is_servadmin)) {
-		syntax_error(s_ChanServ, u, "LOGOUT",
-					 (!is_servadmin ? CHAN_LOGOUT_SYNTAX :
-					  CHAN_LOGOUT_SERVADMIN_SYNTAX));
-	} else if (!(ci = cs_findchan(chan))) {
-		notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
-	} else if (!is_servadmin && (ci->flags & CI_VERBOTEN)) {
-		notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
-	} else if (nick && !(u2 = finduser(nick))) {
-		notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, nick);
-	} else if (!is_servadmin && u2 != u && !is_real_founder(u, ci)) {
-		notice_lang(s_ChanServ, u, ACCESS_DENIED);
-	/* Since founders can not logout we should tell them -katsklaw */
-	} else if (u2 == u && is_real_founder(u, ci)) {
-	notice_lang(s_ChanServ, u, CHAN_LOGOUT_FOUNDER_FAILED, chan);
-	} else {
-		if (u2) {
-			make_unidentified(u2, ci);
-			notice_lang(s_ChanServ, u, CHAN_LOGOUT_SUCCEEDED, nick, chan);
-			alog("%s: User %s!%s@%s has been logged out of channel %s.",
-				 s_ChanServ, u2->nick, u2->GetIdent().c_str(), u2->host, chan);
-		} else {
-			int i;
-			for (i = 0; i < 1024; i++)
-				for (u2 = userlist[i]; u2; u2 = u2->next)
-					make_unidentified(u2, ci);
-			notice_lang(s_ChanServ, u, CHAN_LOGOUT_ALL_SUCCEEDED, chan);
-			alog("%s: All users identified have been logged out of channel %s.", s_ChanServ, chan);
-		}
-
-	}
-	return MOD_CONT;
-}
-
-void make_unidentified(User * u, ChannelInfo * ci)
-{
-	struct u_chaninfolist *uci;
-
-	if (!u || !ci)
-		return;
-
-	for (uci = u->founder_chans; uci; uci = uci->next) {
-		if (uci->chan == ci) {
-			if (uci->next)
-				uci->next->prev = uci->prev;
-			if (uci->prev)
-				uci->prev->next = uci->next;
-			else
-				u->founder_chans = uci->next;
-			delete uci;
-			break;
-		}
-	}
-}
-
 MODULE_INIT("cs_logout", CSLogout)