Fix up a bunch of access checking to be a bit more modern and so on

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

16 files changed, 23 insertions, 59 deletions

diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.c
index 56f4cfba7..cf42374b6 100644
--- a/src/core/cs_forbid.c
+++ b/src/core/cs_forbid.c
@@ -23,9 +23,7 @@ void myChanServHelp(User * u);
  **/
 void myChanServHelp(User * u)
 {
-	if (is_services_admin(u)) {
-		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_FORBID);
-	}
+	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_FORBID);
 }
 
 class CommandCSForbid : public Command
diff --git a/src/core/cs_getpass.c b/src/core/cs_getpass.c
index 019b8f09f..687f7cf7d 100644
--- a/src/core/cs_getpass.c
+++ b/src/core/cs_getpass.c
@@ -21,9 +21,7 @@
  **/
 void myChanServHelp(User * u)
 {
-	if (is_services_admin(u)) {
-		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_GETPASS);
-	}
+	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_GETPASS);
 }
 
 class CommandCSGetPass : public Command
@@ -72,13 +70,8 @@ class CommandCSGetPass : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		if (is_services_admin(u))
-		{
-			notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_GETPASS);
-			return true;
-		}
-
-		return false;
+		notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_GETPASS);
+		return true;
 	}
 
 	void OnSyntaxError(User *u)
diff --git a/src/core/cs_help.c b/src/core/cs_help.c
index 173fe1a7f..3a6d9b5b7 100644
--- a/src/core/cs_help.c
+++ b/src/core/cs_help.c
@@ -57,7 +57,7 @@ class CommandCSHelp : public Command
 		moduleDisplayHelp(2, u);
 		if (CSExpire >= 86400)
 			notice_help(s_ChanServ, u, CHAN_HELP_EXPIRES, CSExpire / 86400);
-		if (is_services_oper(u))
+		if (u->nc && u->nc->IsServicesOper())
 			notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP);
 	}
 };
diff --git a/src/core/cs_info.c b/src/core/cs_info.c
index 3de3928cf..6492bc45b 100644
--- a/src/core/cs_info.c
+++ b/src/core/cs_info.c
@@ -158,7 +158,7 @@ class CommandCSInfo : public Command
 
 	bool OnUserHelp(User *u)
 	{
-		if (is_services_admin(u) || is_services_root(u))
+		if (u->nc && u->nc->IsServicesOper())
 			notice_lang(s_ChanServ, u, CHAN_SERVADMIN_HELP_INFO);
 		else
 			notice_lang(s_NickServ, u, CHAN_HELP_INFO);
diff --git a/src/core/cs_sendpass.c b/src/core/cs_sendpass.c
index ba9b8dd3f..47402b4e9 100644
--- a/src/core/cs_sendpass.c
+++ b/src/core/cs_sendpass.c
@@ -30,7 +30,7 @@ class CommandCSSendPass : public Command
 		ChannelInfo *ci;
 		NickCore *founder;
 
-		if (RestrictMail && !is_services_oper(u))
+		if (RestrictMail && !u->nc->HasCommand("chanserv/sendpass"))
 			notice_lang(s_ChanServ, u, PERMISSION_DENIED);
 		else if (!(ci = cs_findchan(chan)) || !(founder = ci->founder))
 			notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
diff --git a/src/core/cs_set.c b/src/core/cs_set.c
index dbe89f07a..1d17d5bdf 100644
--- a/src/core/cs_set.c
+++ b/src/core/cs_set.c
@@ -670,7 +670,7 @@ class CommandCSSet : public Command
 		if (subcommand.empty())
 		{
 			notice_help(s_ChanServ, u, CHAN_HELP_SET);
-			if (is_services_admin(u))
+			if (u->nc && u->nc->IsServicesOper())
 				notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_SET);
 		}
 		else if (subcommand == "FOUNDER")
diff --git a/src/core/cs_status.c b/src/core/cs_status.c
index 90a3728c8..bf985abd2 100644
--- a/src/core/cs_status.c
+++ b/src/core/cs_status.c
@@ -55,9 +55,6 @@ class CommandCSStatus : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		if (!is_services_admin(u))
-			return false;
-
 		notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_STATUS);
 		return true;
 	}
@@ -89,8 +86,7 @@ class CSStatus : public Module
  **/
 void myChanServHelp(User *u)
 {
-	if (is_services_admin(u))
-		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_STATUS);
+	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_STATUS);
 }
 
 MODULE_INIT("cs_status", CSStatus)
diff --git a/src/core/cs_suspend.c b/src/core/cs_suspend.c
index 4a89e2fee..4f9772ba1 100644
--- a/src/core/cs_suspend.c
+++ b/src/core/cs_suspend.c
@@ -112,9 +112,6 @@ class CommandCSSuspend : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		if (!is_services_oper(u))
-			return false;
-
 		notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_SUSPEND);
 		return true;
 	}
@@ -189,9 +186,6 @@ class CommandCSUnSuspend : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		if (!is_services_oper(u))
-			return false;
-
 		notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_UNSUSPEND);
 		return true;
 	}
@@ -224,11 +218,8 @@ class CSSuspend : public Module
  **/
 void myChanServHelp(User *u)
 {
-	if (is_services_oper(u))
-	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_SUSPEND);
-		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_UNSUSPEND);
-	}
+	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_SUSPEND);
+	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_UNSUSPEND);
 }
 
 MODULE_INIT("cs_suspend", CSSuspend)
diff --git a/src/core/hs_list.c b/src/core/hs_list.c
index d2dc104a3..ec678df7a 100644
--- a/src/core/hs_list.c
+++ b/src/core/hs_list.c
@@ -139,9 +139,6 @@ class CommandHSList : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		if (!is_services_oper(u))
-			return false;
-
 		notice_help(s_HostServ, u, HOST_HELP_LIST);
 		return true;
 	}
@@ -167,8 +164,7 @@ class HSList : public Module
  **/
 void myHostServHelp(User *u)
 {
-	if (is_services_oper(u))
-		notice_lang(s_HostServ, u, HOST_HELP_CMD_LIST);
+	notice_lang(s_HostServ, u, HOST_HELP_CMD_LIST);
 }
 
 MODULE_INIT("hs_list", HSList)
diff --git a/src/core/ms_info.c b/src/core/ms_info.c
index 1f531a0f9..8a88d1d34 100644
--- a/src/core/ms_info.c
+++ b/src/core/ms_info.c
@@ -30,7 +30,6 @@ class CommandMSInfo : public Command
 		NickAlias *na = NULL;
 		ChannelInfo *ci = NULL;
 		const char *name = params.size() ? params[0].c_str() : NULL;
-		int is_servadmin = is_services_admin(u);
 		int hardmax = 0;
 
 		if (name && *name != '#' && u->nc->HasPriv("memoserv/info"))
@@ -176,14 +175,14 @@ class CommandMSInfo : public Command
 
 			if (!mi->memomax)
 			{
-				if (!is_servadmin && hardmax)
+				if (!u->nc->IsServicesOper() && hardmax)
 					notice_lang(s_MemoServ, u, MEMO_INFO_HARD_LIMIT_ZERO);
 				else
 					notice_lang(s_MemoServ, u, MEMO_INFO_LIMIT_ZERO);
 			}
 			else if (mi->memomax > 0)
 			{
-				if (!is_servadmin && hardmax)
+				if (!u->nc->IsServicesOper() && hardmax)
 					notice_lang(s_MemoServ, u, MEMO_INFO_HARD_LIMIT, mi->memomax);
 				else
 					notice_lang(s_MemoServ, u, MEMO_INFO_LIMIT, mi->memomax);
@@ -206,7 +205,7 @@ class CommandMSInfo : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		if (is_services_admin(u))
+		if (u->nc && u->nc->IsServicesOper())
 			notice_help(s_MemoServ, u, MEMO_SERVADMIN_HELP_INFO);
 		else
 			notice_help(s_MemoServ, u, MEMO_HELP_INFO);
diff --git a/src/core/ms_rsend.c b/src/core/ms_rsend.c
index 8d3284ba6..80950c9eb 100644
--- a/src/core/ms_rsend.c
+++ b/src/core/ms_rsend.c
@@ -49,7 +49,7 @@ class CommandMSRSend : public Command
 		if (MSMemoReceipt == 1)
 		{
 			/* Services opers and above can use rsend */
-			if (is_services_oper(u))
+			if (u->nc->IsServicesOper())
 				memo_send(u, nick, text, z);
 			else
 				notice_lang(s_MemoServ, u, ACCESS_DENIED);
@@ -102,8 +102,7 @@ class MSRSend : public Module
  **/
 void myMemoServHelp(User *u)
 {
-	if ((MSMemoReceipt == 1 && is_services_oper(u)) || MSMemoReceipt == 2)
-		notice_lang(s_MemoServ, u, MEMO_HELP_CMD_RSEND);
+	notice_lang(s_MemoServ, u, MEMO_HELP_CMD_RSEND);
 }
 
 MODULE_INIT("ms_rsend", MSRSend)
diff --git a/src/core/ms_sendall.c b/src/core/ms_sendall.c
index c359eb491..bdfa89045 100644
--- a/src/core/ms_sendall.c
+++ b/src/core/ms_sendall.c
@@ -62,9 +62,6 @@ class CommandMSSendAll : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		if (!is_services_admin(u))
-			return false;
-
 		notice_help(s_MemoServ, u, MEMO_HELP_SENDALL);
 		return true;
 	}
@@ -94,8 +91,7 @@ class MSSendAll : public Module
  **/
 void myMemoServHelp(User *u)
 {
-	if (is_services_admin(u))
-		notice_lang(s_MemoServ, u, MEMO_HELP_CMD_SENDALL);
+	notice_lang(s_MemoServ, u, MEMO_HELP_CMD_SENDALL);
 }
 
 MODULE_INIT("ms_sendall", MSSendAll)
diff --git a/src/core/ms_set.c b/src/core/ms_set.c
index aa8d33453..209ad453d 100644
--- a/src/core/ms_set.c
+++ b/src/core/ms_set.c
@@ -244,7 +244,7 @@ class CommandMSSet : public Command
 			notice_help(s_MemoServ, u, MEMO_HELP_SET_NOTIFY);
 		else if (subcommand == "LIMIT")
 		{
-			if (is_services_oper(u))
+			if (u->nc && u->nc->IsServicesOper())
 				notice_help(s_MemoServ, u, MEMO_SERVADMIN_HELP_SET_LIMIT, MSMaxMemos);
 			else
 				notice_help(s_MemoServ, u, MEMO_HELP_SET_LIMIT, MSMaxMemos);
diff --git a/src/core/ms_staff.c b/src/core/ms_staff.c
index 4f3590e7b..45bcc6ca0 100644
--- a/src/core/ms_staff.c
+++ b/src/core/ms_staff.c
@@ -60,9 +60,6 @@ class CommandMSStaff : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		if (!is_services_oper(u))
-			return false;
-
 		notice_help(s_MemoServ, u, MEMO_HELP_STAFF);
 		return true;
 	}
@@ -92,8 +89,7 @@ class MSStaff : public Module
  **/
 void myMemoServHelp(User *u)
 {
-	if (is_services_oper(u))
-		notice_lang(s_MemoServ, u, MEMO_HELP_CMD_STAFF);
+	notice_lang(s_MemoServ, u, MEMO_HELP_CMD_STAFF);
 }
 
 MODULE_INIT("ms_staff", MSStaff)
diff --git a/src/core/ns_access.c b/src/core/ns_access.c
index 5766a4028..e66cce40e 100644
--- a/src/core/ns_access.c
+++ b/src/core/ns_access.c
@@ -135,7 +135,7 @@ class CommandNSAccess : public Command
 		const char *mask = params.size() > 1 ? params[1].c_str() : NULL;
 		NickAlias *na;
 
-		if (!stricmp(cmd, "LIST") && is_services_admin(u) && mask && (na = findnick(params[1].c_str())))
+		if (!stricmp(cmd, "LIST") && u->nc->IsServicesOper() && mask && (na = findnick(params[1].c_str())))
 			return this->DoServAdminList(u, params, na->nc);
 
 		if (mask && !strchr(mask, '@'))
diff --git a/src/core/ns_alist.c b/src/core/ns_alist.c
index e6218f1e1..99d72668a 100644
--- a/src/core/ns_alist.c
+++ b/src/core/ns_alist.c
@@ -41,7 +41,7 @@ class CommandNSAList : public Command
 		NickAlias *na;
 
 		int min_level = 0;
-		int is_servadmin = is_services_admin(u);
+		int is_servadmin = u->nc->IsServicesOper();
 		int lev_param = 0;
 
 		if (!is_servadmin)
@@ -134,7 +134,7 @@ class CommandNSAList : 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_ALIST);
 		else
 			notice_help(s_NickServ, u, NICK_HELP_ALIST);