Added os_forbid

6 files changed, 7 insertions, 22 deletions

diff --git a/include/account.h b/include/account.h
index 777efb5d0..15d2faa10 100644
--- a/include/account.h
+++ b/include/account.h
@@ -20,8 +20,6 @@ enum NickNameFlag
 {
 	NS_BEGIN,
 
-	/* Nick may not be registered or used */
-	NS_FORBIDDEN,
 	/* Nick never expires */
 	NS_NO_EXPIRE,
 	/* This nick is being held after a kill by an enforcer client
diff --git a/include/channels.h b/include/channels.h
index 5d18a381f..113b5c1f9 100644
--- a/include/channels.h
+++ b/include/channels.h
@@ -25,6 +25,8 @@ typedef std::list<UserContainer *> CUserList;
 
 enum ChannelFlag
 {
+	/* ChanServ is currently holding the channel */
+	CH_INHABIT,
 	/* Channel still exists when emptied */
 	CH_PERSIST,
 	/* If set the channel is syncing users (channel was just created) and it should not be deleted */
@@ -33,6 +35,8 @@ enum ChannelFlag
 	CH_LOGCHAN
 };
 
+const Anope::string ChannelFlagString[] = { "CH_INABIT", "CH_PERSIST", "CH_SYNCING", "CH_LOGCHAN", "" };
+
 class CoreExport Channel : public Extensible, public Flags<ChannelFlag, 3>
 {
  public:
diff --git a/include/commands.h b/include/commands.h
index e966e9e39..89fd1436c 100644
--- a/include/commands.h
+++ b/include/commands.h
@@ -36,7 +36,6 @@ extern CoreExport void mod_run_cmd(BotInfo *bi, User *u, ChannelInfo *ci, Comman
 enum CommandFlag
 {
 	CFLAG_ALLOW_UNREGISTERED,
-	CFLAG_ALLOW_FORBIDDEN,
 	CFLAG_ALLOW_SUSPENDED,
 	CFLAG_ALLOW_UNREGISTEREDCHANNEL,
 	CFLAG_STRIP_CHANNEL,
@@ -45,7 +44,6 @@ enum CommandFlag
 
 const Anope::string CommandFlagStrings[] = {
 	"CFLAG_ALLOW_UNREGISTERED",
-	"CFLAG_ALLOW_FORBIDDEN",
 	"CFLAG_ALLOW_SUSPENDED",
 	"CFLAG_ALLOW_UNREGISTEREDCHANNEL",
 	"CFLAG_STRIP_CHANNEL",
diff --git a/include/config.h b/include/config.h
index 8a564e8ec..b06aa60d8 100644
--- a/include/config.h
+++ b/include/config.h
@@ -502,8 +502,6 @@ class CoreExport ServerConfig
 	time_t NSExpire;
 	/* How long before suspended nicks expire */
 	time_t NSSuspendExpire;
-	/* How long before forbidden nicks expire */
-	time_t NSForbidExpire;
 	/* Time before unconfirmed nicks expire */
 	time_t NSUnconfirmedExpire;
 	/* Force email when registering */
diff --git a/include/language.h b/include/language.h
index f4329a72b..8afd360de 100644
--- a/include/language.h
+++ b/include/language.h
@@ -19,15 +19,10 @@
 #define NICK_X_NOT_REGISTERED		"Nick \002%s\002 isn't registered."
 #define NICK_X_NOT_IN_USE		"Nick \002%s\002 isn't currently in use."
 #define NICK_X_NOT_ON_CHAN		"\002%s\002 is not currently on channel %s."
-#define NICK_X_FORBIDDEN		"Nick \002%s\002 may not be registered or used."
-#define NICK_X_FORBIDDEN_OPER		"Nick \002%s\002 has been forbidden by %s:\n" \
-						"%s"
-#define NICK_X_SUSPENDED			"Nick %s is currently suspended."
+#define NICK_X_SUSPENDED		"Nick %s is currently suspended."
+#define CHAN_X_SUSPENDED		"Channel %s is currently suspended."
 #define CHAN_X_NOT_REGISTERED		"Channel \002%s\002 isn't registered."
 #define CHAN_X_NOT_IN_USE		"Channel \002%s\002 doesn't exist."
-#define CHAN_X_FORBIDDEN		"Channel \002%s\002 may not be registered or used."
-#define CHAN_X_FORBIDDEN_OPER		"Channel \002%s\002 has been forbidden by %s:\n" \
-						"%s"
 #define NICK_IDENTIFY_REQUIRED		"Password authentication required for that command.\n" \
 						"Retry after typing \002%s%s IDENTIFY \037password\037\002."
 #define MAIL_X_INVALID			"\002%s\002 is not a valid e-mail address."
diff --git a/include/regchannel.h b/include/regchannel.h
index 851c4a7d1..8245b256d 100644
--- a/include/regchannel.h
+++ b/include/regchannel.h
@@ -18,8 +18,6 @@ enum ChannelInfoFlag
 {
 	CI_BEGIN,
 
-	/* ChanServ is currently holding the channel */
-	CI_INHABIT,
 	/* Retain the topic even after the channel is emptied */
 	CI_KEEPTOPIC,
 	/* Don't allow non-authorized users to be opped */
@@ -34,8 +32,6 @@ enum ChannelInfoFlag
 	CI_PEACE,
 	/* Don't allow any privileges unless a user is IDENTIFIED with NickServ */
 	CI_SECURE,
-	/* Don't allow the channel to be registered or used */
-	CI_FORBIDDEN,
 	/* Channel does not expire */
 	CI_NO_EXPIRE,
 	/* Channel memo limit may not be changed */
@@ -63,7 +59,7 @@ enum ChannelInfoFlag
 };
 
 const Anope::string ChannelInfoFlagStrings[] = {
-	"BEGIN", "INHABIT", "KEEPTOPIC", "SECUREOPS", "PRIVATE", "TOPICLOCK", "RESTRICTED",
+	"BEGIN", "KEEPTOPIC", "SECUREOPS", "PRIVATE", "TOPICLOCK", "RESTRICTED",
 	"PEACE", "SECURE", "FORBIDDEN", "NO_EXPIRE", "MEMO_HARDMAX", "OPNOTICE", "SECUREFOUNDER",
 	"SIGNKICK", "SIGNKICK_LEVEL", "XOP", "SUSPENDED", "PERSIST", ""
 };
@@ -154,10 +150,6 @@ class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag,
 	Anope::string last_topic_setter;	/* Setter */
 	time_t last_topic_time;			/* Time */
 
-	// These two should be using extensible
-	Anope::string forbidby;
-	Anope::string forbidreason;
-
 	int16 bantype;
 	int16 *levels; /* Access levels for commands */