BUILD : 1.7.8 (626) BUGS : N/A NOTES : Moved the protect defines out of the ircd protocol header files.

git-svn-id: svn://svn.anope.org/anope/trunk@626 31f1291d-b8d6-0310-a050-a5561fc1590b


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

17 files changed, 16 insertions, 134 deletions

diff --git a/include/bahamut.h b/include/bahamut.h
index b49b064df..2d386e73d 100644
--- a/include/bahamut.h
+++ b/include/bahamut.h
@@ -15,15 +15,6 @@
 
 #ifdef IRC_BAHAMUT
 
-#define PROTECT_SET_MODE "+"
-#define PROTECT_UNSET_MODE "-"
-#define CS_CMD_PROTECT "PROTECT"
-#define CS_CMD_DEPROTECT "DEPROTECT"
-#define FANT_PROTECT_ADD "!protect"
-#define FANT_PROTECT_DEL "!deprotect"
-#define LEVEL_PROTECT_WORD "AUTOPROTECT"
-#define LEVELINFO_PROTECT_WORD "PROTECT"
-#define LEVELINFO_PROTECTME_WORD "PROTECTME"
 
 #define UMODE_a 0x00000001  /* umode +a - Services Admin */
 #define UMODE_h 0x00000002  /* umode +h - Helper */
diff --git a/include/dreamforge.h b/include/dreamforge.h
index f3ed0858c..f5ee12b00 100644
--- a/include/dreamforge.h
+++ b/include/dreamforge.h
@@ -13,16 +13,6 @@
 
 #ifdef IRC_DREAMFORGE
 
-#define PROTECT_SET_MODE "+"
-#define PROTECT_UNSET_MODE "-"
-#define CS_CMD_PROTECT "PROTECT"
-#define CS_CMD_DEPROTECT "DEPROTECT"
-#define FANT_PROTECT_ADD "!protect"
-#define FANT_PROTECT_DEL "!deprotect"
-#define LEVEL_PROTECT_WORD "AUTOPROTECT"
-#define LEVELINFO_PROTECT_WORD "PROTECT"
-#define LEVELINFO_PROTECTME_WORD "PROTECTME"
-
 #define UMODE_a 0x00000001  /* Services Admin */ 
 #define UMODE_h 0x00000002  /* Help system operator */
 #define UMODE_i 0x00000004  /* makes user invisible */
diff --git a/include/extern.h b/include/extern.h
index 1f2928c88..569c429c7 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -134,6 +134,7 @@ E void do_mass_mode(char *modes);
 
 E ChannelInfo *chanlists[256];
 E CSModeUtil csmodeutils[];
+E LevelInfo levelinfo[];
 
 E void listchans(int count_only, const char *chan);
 E void get_chanserv_stats(long *nrec, long *memuse);
diff --git a/include/hybrid.h b/include/hybrid.h
index e74807dfc..05dfbe4ca 100644
--- a/include/hybrid.h
+++ b/include/hybrid.h
@@ -13,15 +13,6 @@
 
 #ifdef IRC_HYBRID
 
-#define PROTECT_SET_MODE "+"
-#define PROTECT_UNSET_MODE "-"
-#define CS_CMD_PROTECT "PROTECT"
-#define CS_CMD_DEPROTECT "DEPROTECT"
-#define FANT_PROTECT_ADD "!protect"
-#define FANT_PROTECT_DEL "!deprotect"
-#define LEVEL_PROTECT_WORD "AUTOPROTECT"
-#define LEVELINFO_PROTECT_WORD "PROTECT"
-#define LEVELINFO_PROTECTME_WORD "PROTECTME"
 
 #define UMODE_a 0x00000001  /* Admin status */
 #define UMODE_b 0x00000080  /* See bot and drone flooding notices */
diff --git a/include/modules.h b/include/modules.h
index 15e1cc1e1..0a00b4e2f 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -330,6 +330,12 @@ int moduleDataDebug(ModuleData **md);					/* Allow for debug output of a moduleD
 MDE boolean moduleMinVersion(int major,int minor,int patch,int build);	/* Checks if the current version of anope is before or after a given verison */
 
 /*************************************************************************/
+/* Some IRCD protocol module support functions */
+
+/** Update the protect deatials, could be either protect or admin etc.. */
+MDE void updateProtectDetails(char *level_info_protect_word, char *level_info_protectme_word, char *fant_protect_add, char *fant_protect_del, char *level_protect_word, char *protect_set_mode, char *protect_unset_mode);
+
+/************************************************************************/
 
 #endif
 /* EOF */
diff --git a/include/plexus.h b/include/plexus.h
index d1c3eac5e..5c90bcbfd 100644
--- a/include/plexus.h
+++ b/include/plexus.h
@@ -13,15 +13,6 @@
 
 #ifdef IRC_PLEXUS
 
-#define PROTECT_SET_MODE "+"
-#define PROTECT_UNSET_MODE "+"
-#define CS_CMD_PROTECT "PROTECT"
-#define CS_CMD_DEPROTECT "DEPROTECT"
-#define FANT_PROTECT_ADD "!protect"
-#define FANT_PROTECT_DEL "!deprotect"
-#define LEVEL_PROTECT_WORD "AUTOPROTECT"
-#define LEVELINFO_PROTECT_WORD "PROTECT"
-#define LEVELINFO_PROTECTME_WORD "PROTECTME"
 
 #define UMODE_a 0x00000001
 #define UMODE_h 0x00000002
diff --git a/include/ptlink.h b/include/ptlink.h
index 66b34e988..877d48423 100644
--- a/include/ptlink.h
+++ b/include/ptlink.h
@@ -13,15 +13,6 @@
 
 #ifdef IRC_PTLINK
 
-#define PROTECT_SET_MODE "+a"
-#define PROTECT_UNSET_MODE "-a"
-#define CS_CMD_PROTECT "PROTECT"
-#define CS_CMD_DEPROTECT "DEPROTECT"
-#define FANT_PROTECT_ADD "!protect"
-#define FANT_PROTECT_DEL "!deprotect"
-#define LEVEL_PROTECT_WORD "AUTOPROTECT"
-#define LEVELINFO_PROTECT_WORD "PROTECT"
-#define LEVELINFO_PROTECTME_WORD "PROTECTME"
 
 #define UMODE_a 0x00000001
 #define UMODE_h 0x00000002
diff --git a/include/rageircd.h b/include/rageircd.h
index 74ae926d8..ea78f69ba 100644
--- a/include/rageircd.h
+++ b/include/rageircd.h
@@ -13,15 +13,6 @@
 
 #ifdef IRC_RAGE2
 
-#define PROTECT_SET_MODE "+a"
-#define PROTECT_UNSET_MODE "-a"
-#define FANT_PROTECT_ADD "!admin"
-#define FANT_PROTECT_DEL "!deadmin"
-#define LEVEL_PROTECT_WORD "AUTOADMIN"
-#define LEVELINFO_PROTECT_WORD "ADMIN"
-#define LEVELINFO_PROTECTME_WORD "ADMINME"
-#define CS_CMD_PROTECT "ADMIN"
-#define CS_CMD_DEPROTECT "DEADMIN"
 
 #define UMODE_a 0x00000001
 #define UMODE_h 0x00000002
diff --git a/include/ratbox.h b/include/ratbox.h
index 12236e6dc..c3b44a737 100644
--- a/include/ratbox.h
+++ b/include/ratbox.h
@@ -13,15 +13,6 @@
 
 #ifdef IRC_RATBOX
 
-#define PROTECT_SET_MODE "+"
-#define PROTECT_UNSET_MODE "-"
-#define CS_CMD_PROTECT "PROTECT"
-#define CS_CMD_DEPROTECT "DEPROTECT"
-#define FANT_PROTECT_ADD "!protect"
-#define FANT_PROTECT_DEL "!deprotect"
-#define LEVEL_PROTECT_WORD "AUTOPROTECT"
-#define LEVELINFO_PROTECT_WORD "PROTECT"
-#define LEVELINFO_PROTECTME_WORD "PROTECTME"
 
 #define UMODE_a 0x00000001
 #define UMODE_C 0x00000002
diff --git a/include/services.h b/include/services.h
index 09a2682ca..02fc7f4ba 100644
--- a/include/services.h
+++ b/include/services.h
@@ -245,6 +245,8 @@ typedef enum { false, true } boolean;
 #include "ratbox.h"
 #include "shadowircd.h"
 
+
+
 typedef struct ircdvars_ IRCDVar;
 typedef struct ircdcapab_ IRCDCAPAB;
 
@@ -747,6 +749,13 @@ struct csmodeutil_ {
 	int levelself;			/* Level required to use the command for himself */
 };
 
+typedef struct {
+    int what;
+    char *name;
+    int desc;
+} LevelInfo;
+
+
 /*************************************************************************/
 
 /* Server data */
diff --git a/include/shadowircd.h b/include/shadowircd.h
index 96cdb1b0f..1dc2e5e52 100644
--- a/include/shadowircd.h
+++ b/include/shadowircd.h
@@ -16,15 +16,6 @@
 /* The protocol revision. */
 #define PROTOCOL_REVISION 3402
 
-#define PROTECT_SET_MODE "+a"
-#define PROTECT_UNSET_MODE "-a"
-#define CS_CMD_PROTECT "PROTECT"
-#define CS_CMD_DEPROTECT "DEPROTECT"
-#define FANT_PROTECT_ADD "!protect"
-#define FANT_PROTECT_DEL "!deprotect"
-#define LEVEL_PROTECT_WORD "AUTOPROTECT"
-#define LEVELINFO_PROTECT_WORD "PROTECT"
-#define LEVELINFO_PROTECTME_WORD "PROTECTME"
 
 #define UMODE_a 0x00000001
 #define UMODE_C 0x00000002
diff --git a/include/solidircd.h b/include/solidircd.h
index a5875440a..94386798a 100644
--- a/include/solidircd.h
+++ b/include/solidircd.h
@@ -15,16 +15,6 @@
 
 #ifdef IRC_SOLID
 
-#define PROTECT_SET_MODE "+"
-#define PROTECT_UNSET_MODE "-"
-#define CS_CMD_PROTECT "PROTECT"
-#define CS_CMD_DEPROTECT "DEPROTECT"
-#define FANT_PROTECT_ADD "!protect"
-#define FANT_PROTECT_DEL "!deprotect"
-#define LEVEL_PROTECT_WORD "AUTOPROTECT"
-#define LEVELINFO_PROTECT_WORD "PROTECT"
-#define LEVELINFO_PROTECTME_WORD "PROTECTME"
-
 #define UMODE_a 0x00000001  /* umode +a - Services Admin */
 #define UMODE_h 0x00000002  /* umode +h - Helper */
 #define UMODE_i 0x00000004  /* umode +i - Invisible */
diff --git a/include/ultimate2.h b/include/ultimate2.h
index e64b5ec35..34cbcdc54 100644
--- a/include/ultimate2.h
+++ b/include/ultimate2.h
@@ -13,15 +13,6 @@
 
 #ifdef IRC_ULTIMATE2
 
-#define PROTECT_SET_MODE "+a"
-#define PROTECT_UNSET_MODE "-a"
-#define CS_CMD_PROTECT "PROTECT"
-#define CS_CMD_DEPROTECT "DEPROTECT"
-#define FANT_PROTECT_ADD "!protect"
-#define FANT_PROTECT_DEL "!deprotect"
-#define LEVEL_PROTECT_WORD "AUTOPROTECT"
-#define LEVELINFO_PROTECT_WORD "PROTECT"
-#define LEVELINFO_PROTECTME_WORD "PROTECTME"
 
 #define UMODE_a 0x00000001
 #define UMODE_h 0x00000002
diff --git a/include/ultimate3.h b/include/ultimate3.h
index bf52a844d..75252cbf3 100644
--- a/include/ultimate3.h
+++ b/include/ultimate3.h
@@ -13,15 +13,6 @@
 
 #ifdef IRC_ULTIMATE3
 
-#define PROTECT_SET_MODE "+a"
-#define PROTECT_UNSET_MODE "-a"
-#define FANT_PROTECT_ADD "!admin"
-#define FANT_PROTECT_DEL "!deadmin"
-#define LEVEL_PROTECT_WORD "AUTOADMIN"
-#define LEVELINFO_PROTECT_WORD "ADMIN"
-#define LEVELINFO_PROTECTME_WORD "ADMINME"
-#define CS_CMD_PROTECT "ADMIN"
-#define CS_CMD_DEPROTECT "DEADMIN"
 
 #define UMODE_a 0x00000001
 #define UMODE_h 0x00000002
diff --git a/include/unreal31.h b/include/unreal31.h
index 53dceb35b..bbf049a6d 100644
--- a/include/unreal31.h
+++ b/include/unreal31.h
@@ -15,15 +15,6 @@
 
 #ifdef IRC_UNREAL31
 
-#define PROTECT_SET_MODE "+a"
-#define PROTECT_UNSET_MODE "-a"
-#define CS_CMD_PROTECT "PROTECT"
-#define CS_CMD_DEPROTECT "DEPROTECT"
-#define FANT_PROTECT_ADD "!protect"
-#define FANT_PROTECT_DEL "!deprotect"
-#define LEVEL_PROTECT_WORD "AUTOPROTECT"
-#define LEVELINFO_PROTECT_WORD "PROTECT"
-#define LEVELINFO_PROTECTME_WORD "PROTECTME"
 
 #define UMODE_a 0x00000001
 #define UMODE_h 0x00000002
diff --git a/include/unreal32.h b/include/unreal32.h
index fc628c30f..9f7b10ebc 100644
--- a/include/unreal32.h
+++ b/include/unreal32.h
@@ -77,21 +77,6 @@
 #define CMODE_T 0x02000000
 #define CMODE_M 0x04000000
 
-/*************************************************************************/
-
-/* Since we differ !protect from !admin we need to know what to use */
-
-#define FANT_PROTECT_ADD "!protect"
-#define FANT_PROTECT_DEL "!deprotect"
-#define LEVEL_PROTECT_WORD "AUTOPROTECT"
-#define LEVELINFO_PROTECT_WORD "PROTECT"
-#define LEVELINFO_PROTECTME_WORD "PROTECTME"
-#define PROTECT_SET_MODE "+a"
-#define PROTECT_UNSET_MODE "-a"
-#define CS_CMD_PROTECT "PROTECT"
-#define CS_CMD_DEPROTECT "DEPROTECT"
-
-/*************************************************************************/
 
 /* Default Modes with MLOCK */
 
diff --git a/include/viagra.h b/include/viagra.h
index bb8c1212c..d725f41d9 100644
--- a/include/viagra.h
+++ b/include/viagra.h
@@ -13,15 +13,6 @@
 
 #ifdef IRC_VIAGRA
 
-#define PROTECT_SET_MODE "+a"
-#define PROTECT_UNSET_MODE "-a"
-#define CS_CMD_PROTECT "PROTECT"
-#define CS_CMD_DEPROTECT "DEPROTECT"
-#define FANT_PROTECT_ADD "!protect"
-#define FANT_PROTECT_DEL "!deprotect"
-#define LEVEL_PROTECT_WORD "AUTOPROTECT"
-#define LEVELINFO_PROTECT_WORD "PROTECT"
-#define LEVELINFO_PROTECTME_WORD "PROTECTME"
 
 /* User Modes */
 #define UMODE_A 0x00000040  /* Is a Server Administrator. */