Remove capability for commands to hook existing commands, add an OnPreCommand event instead. Tidies up a lot of stuff. Also remove a bunch of dead code.

NOTE: This will break some stuff.

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

4 files changed, 12 insertions, 14 deletions

diff --git a/src/core/ns_group.c b/src/core/ns_group.c
index e9be3fe0d..bac000611 100644
--- a/src/core/ns_group.c
+++ b/src/core/ns_group.c
@@ -208,11 +208,10 @@ class CommandNSGList : public Command
 		const char *nick = params.size() ? params[0].c_str() : NULL;
 
 		NickCore *nc = u->nc;
-		int is_servadmin = is_services_admin(u);
 		int nick_ided = nick_identified(u);
 		int i;
 
-		if (nick ? (stricmp(nick, u->nick) ? !is_servadmin : !nick_ided) : !nick_ided)
+		if (nick ? (stricmp(nick, u->nick) ? !u->nc->IsServicesOper() : !nick_ided) : !nick_ided)
 			notice_lang(s_NickServ, u, nick_ided ? ACCESS_DENIED : NICK_IDENTIFY_REQUIRED, s_NickServ);
 		else if (nick && (!findnick(nick) || !(nc = findnick(nick)->nc)))
 			notice_lang(s_NickServ, u, !nick ? NICK_NOT_REGISTERED : NICK_X_NOT_REGISTERED, nick);
@@ -237,7 +236,7 @@ class CommandNSGList : public Command
 						tm = localtime(&expt);
 						strftime_lang(buf, sizeof(buf), finduser(na2->nick), STRFTIME_DATE_TIME_FORMAT, tm);
 					}
-					notice_lang(s_NickServ, u, is_services_admin(u) && !wont_expire ? NICK_GLIST_REPLY_ADMIN : NICK_GLIST_REPLY, wont_expire ? '!' : ' ', na2->nick, buf);
+					notice_lang(s_NickServ, u, u->nc->IsServicesOper() && !wont_expire ? NICK_GLIST_REPLY_ADMIN : NICK_GLIST_REPLY, wont_expire ? '!' : ' ', na2->nick, buf);
 				}
 			}
 			notice_lang(s_NickServ, u, NICK_GLIST_FOOTER, nc->aliases.count);
@@ -248,7 +247,7 @@ class CommandNSGList : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		if (is_services_admin(u))
+		if (u->nc && u->nc->IsServicesOper())
 			notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_GLIST);
 		else
 			notice_help(s_NickServ, u, NICK_HELP_GLIST);
diff --git a/src/core/ns_help.c b/src/core/ns_help.c
index 061293824..5c2b164cd 100644
--- a/src/core/ns_help.c
+++ b/src/core/ns_help.c
@@ -44,7 +44,7 @@ class CommandNSHelp : public Command
 	{
 		notice_help(s_NickServ, u, NICK_HELP);
 		moduleDisplayHelp(1, u);
-		if (is_services_admin(u))
+		if (u->nc && u->nc->IsServicesOper())
 			notice_help(s_NickServ, u, NICK_SERVADMIN_HELP);
 		if (NSExpire >= 86400)
 			notice_help(s_NickServ, u, NICK_HELP_EXPIRES, NSExpire / 86400);
diff --git a/src/core/ns_info.c b/src/core/ns_info.c
index ed010c71e..d537ff272 100644
--- a/src/core/ns_info.c
+++ b/src/core/ns_info.c
@@ -52,18 +52,17 @@ class CommandNSInfo : public Command
 		NickAlias *na;
 		NickRequest *nr = NULL;
 		/* Being an oper is enough from now on -GD */
-		int is_servadmin = is_services_oper(u);
 
 		if (!(na = findnick(nick)))
 		{
 			if ((nr = findrequestnick(nick)))
 			{
 				notice_lang(s_NickServ, u, NICK_IS_PREREG);
-				if (param && !stricmp(param, "ALL") && is_servadmin)
+				if (param && !stricmp(param, "ALL") && u->nc->IsServicesOper())
 					notice_lang(s_NickServ, u, NICK_INFO_EMAIL, nr->email);
 				else
 				{
-					if (is_servadmin)
+					if (u->nc->IsServicesOper())
 						notice_lang(s_NickServ, u, NICK_INFO_FOR_MORE, s_NickServ, nr->nick);
 				}
 			}
@@ -93,7 +92,7 @@ class CommandNSInfo : public Command
 
 			/* Only show hidden fields to owner and sadmins and only when the ALL
 			 * parameter is used. -TheShadow */
-			if (param && !stricmp(param, "ALL") && u->nc && (na->nc == u->nc || is_servadmin))
+			if (param && !stricmp(param, "ALL") && u->nc && (na->nc == u->nc || u->nc->IsServicesOper()))
 				show_hidden = 1;
 
 			notice_lang(s_NickServ, u, NICK_INFO_REALNAME, na->nick, na->last_realname);
@@ -180,7 +179,7 @@ class CommandNSInfo : public Command
 					notice_lang(s_NickServ, u, NICK_INFO_NO_EXPIRE);
 				else
 				{
-					if (is_services_admin(u))
+					if (u->nc->IsServicesOper())
 					{
 						expt = na->last_seen + NSExpire;
 						tm = localtime(&expt);
@@ -198,7 +197,7 @@ class CommandNSInfo : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		if (is_services_admin(u))
+		if (u->nc->IsServicesOper())
 			notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_INFO);
 		else
 			notice_help(s_NickServ, u, NICK_HELP_INFO);
diff --git a/src/core/ns_list.c b/src/core/ns_list.c
index 0f06ba7a9..534f371e3 100644
--- a/src/core/ns_list.c
+++ b/src/core/ns_list.c
@@ -45,7 +45,7 @@ class CommandNSList : public Command
 		NickCore *mync;
 		unsigned nnicks, i;
 		char buf[BUFSIZE];
-		int is_servadmin = is_services_admin(u);
+		bool is_servadmin = u->nc->IsServicesOper();
 		int16 matchflags = 0;
 		NickRequest *nr = NULL;
 		int nronly = 0;
@@ -194,7 +194,7 @@ class CommandNSList : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		if (is_services_admin(u))
+		if (u->nc && u->nc->IsServicesOper())
 			notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_LIST);
 		else
 			notice_help(s_NickServ, u, NICK_HELP_LIST);
@@ -204,7 +204,7 @@ class CommandNSList : public Command
 
 	void OnSyntaxError(User *u)
 	{
-		if (is_services_admin(u))
+		if (u->nc->IsServicesOper())
 			syntax_error(s_NickServ, u, "LIST", NICK_LIST_SERVADMIN_SYNTAX);
 		else
 			syntax_error(s_NickServ, u, "LIST", NICK_LIST_SYNTAX);