Insane commit of doom: s/ \t/g

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

12 files changed, 539 insertions, 539 deletions

diff --git a/include/account.h b/include/account.h
index d2decf94e..13d3ca517 100644
--- a/include/account.h
+++ b/include/account.h
@@ -48,14 +48,14 @@ class NickCore
 	char *url;				/* URL associated to the nick */
 	uint32 flags;				/* See NI_* below */
 	uint16 language;			/* Language selected by nickname owner (LANG_*) */
-    uint16 accesscount;			/* # of entries */
-    char **access;				/* Array of strings */
-    MemoInfo memos;
-    uint16 channelcount;			/* Number of channels currently registered */
-
-    /* Unsaved data */
-    ModuleData *moduleData;	  	/* Module saved data attached to the NickCore */
-    time_t lastmail;			/* Last time this nick record got a mail */
-    SList aliases;				/* List of aliases */
+	uint16 accesscount;			/* # of entries */
+	char **access;				/* Array of strings */
+	MemoInfo memos;
+	uint16 channelcount;			/* Number of channels currently registered */
+
+	/* Unsaved data */
+	ModuleData *moduleData;	  	/* Module saved data attached to the NickCore */
+	time_t lastmail;			/* Last time this nick record got a mail */
+	SList aliases;				/* List of aliases */
 };
 
diff --git a/include/bots.h b/include/bots.h
index e40875a18..73941fbc4 100644
--- a/include/bots.h
+++ b/include/bots.h
@@ -21,10 +21,10 @@ class BotInfo
 	BotInfo *next, *prev;
 
 	std::string uid;		/* required for UID supporting servers, as opposed to the shitty struct Uid. */
-	char *nick;    			/* Nickname of the bot */
-	char *user;    			/* Its user name */
-	char *host;    			/* Its hostname */
-	char *real;     		/* Its real name */
+	char *nick;				/* Nickname of the bot */
+	char *user;				/* Its user name */
+	char *host;				/* Its hostname */
+	char *real;	 		/* Its real name */
 	int16 flags;			/* Bot flags -- see BI_* below */
 	time_t created; 		/* Birth date ;) */
 	int16 chancount;		/* Number of channels that use the bot. */
diff --git a/include/datafiles.h b/include/datafiles.h
index 71f269252..94678ef45 100644
--- a/include/datafiles.h
+++ b/include/datafiles.h
@@ -23,12 +23,12 @@
 
 typedef struct dbFILE_ dbFILE;
 struct dbFILE_ {
-    int mode;			/* 'r' for reading, 'w' for writing */
-    FILE *fp;			/* The normal file descriptor */
-    FILE *backupfp;		/* Open file pointer to a backup copy of
-				 *    the database file (if non-NULL) */
-    char filename[MAXPATHLEN];	/* Name of the database file */
-    char backupname[MAXPATHLEN];	/* Name of the backup file */
+	int mode;			/* 'r' for reading, 'w' for writing */
+	FILE *fp;			/* The normal file descriptor */
+	FILE *backupfp;		/* Open file pointer to a backup copy of
+				 *	the database file (if non-NULL) */
+	char filename[MAXPATHLEN];	/* Name of the database file */
+	char backupname[MAXPATHLEN];	/* Name of the backup file */
 };
 
 /*************************************************************************/
diff --git a/include/encrypt.h b/include/encrypt.h
index 7ac3d884a..c9fc46b15 100644
--- a/include/encrypt.h
+++ b/include/encrypt.h
@@ -13,10 +13,10 @@
  */
 
 typedef struct encryption_ {
-    int (*encrypt)(const char *src, int len, char *dest, int size);
-    int (*encrypt_in_place)(char *buf, int size);
-    int (*encrypt_check_len)(int passlen, int bufsize);
-    int (*decrypt)(const char *src, char *dest, int size);
-    int (*check_password)(const char *plaintext, const char *password);
+	int (*encrypt)(const char *src, int len, char *dest, int size);
+	int (*encrypt_in_place)(char *buf, int size);
+	int (*encrypt_check_len)(int passlen, int bufsize);
+	int (*decrypt)(const char *src, char *dest, int size);
+	int (*check_password)(const char *plaintext, const char *password);
 } Encryption;
 
diff --git a/include/extern.h b/include/extern.h
index 2231eaecd..942900714 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -122,7 +122,7 @@ E User *nc_on_chan(Channel * c, NickCore * nc);
 
 E char *chan_get_modes(Channel * chan, int complete, int plus);
 E void chan_set_modes(const char *source, Channel * chan, int ac,
-                      const char **av, int check);
+					  const char **av, int check);
 
 E int chan_get_user_status(Channel * chan, User * user);
 E int chan_has_user_status(Channel * chan, User * user, int16 status);
@@ -561,9 +561,9 @@ E void lang_init(void);
 #define getstring2(nc,index) \
 	(langtexts[((nc)?((NickCore*)nc)->language:NSDefLanguage)][(index)])
 E int strftime_lang(char *buf, int size, User * u, int format,
-                    struct tm *tm);
+					struct tm *tm);
 E void syntax_error(char *service, User * u, const char *command,
-                    int msgnum);
+					int msgnum);
 
 
 /**** log.c ****/
@@ -673,17 +673,17 @@ E int doValidHost(const char *host, int type);
 
 typedef int (*range_callback_t) (User * u, int num, va_list args);
 E int process_numlist(const char *numstr, int *count_ret,
-                      range_callback_t callback, User * u, ...);
+					  range_callback_t callback, User * u, ...);
 
 E int isValidHost(const char *host, int type);
 E int isvalidchar(const char c);
 
 E char *myStrGetToken(const char *str, const char dilim, int token_number);
 E char *myStrGetOnlyToken(const char *str, const char dilim,
-        int token_number);
+		int token_number);
 E char *myStrSubString(const char *src, int start, int end);
 E char *myStrGetTokenRemainder(const char *str, const char dilim,
-        int token_number);
+		int token_number);
 E char *stripModePrefix(const char *str);
 E int myNumToken(const char *str, const char dilim);
 E void doCleanBuffer(char *str);
@@ -816,7 +816,7 @@ E void expire_sqlines(void);
 E int check_chan_sqline(const char *chan);
 
 E int add_szline(User * u, char *mask, const char *by,
-                 const time_t expires, const char *reason);
+				 const time_t expires, const char *reason);
 E void expire_szlines(void);
 E int check_szline(const char *nick, char *ip);
 
@@ -870,7 +870,7 @@ E int is_ulined(const char *server);
 E int is_sync(Server *server);
 
 E Server *new_server(Server * uplink, const char *name, const char *desc,
-                   uint16 flags, const char *suid);
+				   uint16 flags, const char *suid);
 
 E Server *findserver(Server *s, const char *name);
 
@@ -910,8 +910,8 @@ E Session *findsession(const char *host);
 E Exception *find_host_exception(const char *host);
 E Exception *find_hostip_exception(const char *host, const char *hostip);
 E int exception_add(User * u, const char *mask, const int limit,
-                         const char *reason, const char *who,
-                         const time_t expires);
+						 const char *reason, const char *who,
+						 const time_t expires);
 
 /**** slist.c ****/
 E int slist_add(SList *slist, void *item);
@@ -964,7 +964,7 @@ E char *TS6UPLINK;
 E void update_host(User * user);
 
 E User *do_nick(const char *source, const char *nick, const char *username, const char *host,
-              const char *server, const char *realname, time_t ts, uint32 svid, uint32 ip, const char *vhost, const char *uid);
+			  const char *server, const char *realname, time_t ts, uint32 svid, uint32 ip, const char *vhost, const char *uid);
 
 E void do_umode(const char *source, int ac, const char **av);
 E void do_umode2(const char *source, int ac, const char **av);
@@ -980,12 +980,12 @@ E int is_excepted_mask(ChannelInfo * ci, char *mask);
 E int match_usermask(const char *mask, User * user);
 E int match_userip(const char *mask, User * user, char *host);
 E void split_usermask(const char *mask, char **nick, char **user,
-                      char **host);
+					  char **host);
 E char *create_mask(User * u);
 
 #ifdef USE_MYSQL
 /**** mysql.c ****/
-E MYSQL       *mysql;
+E MYSQL	   *mysql;
 E MYSQL_RES   *mysql_res;
 E MYSQL_FIELD *mysql_fields;
 E MYSQL_ROW   mysql_row;
@@ -1002,8 +1002,8 @@ E int db_mysql_save_ns_alias(NickAlias * na);
 E int db_mysql_save_ns_req(NickRequest * nr);
 E int db_mysql_save_cs_info(ChannelInfo * ci);
 E int db_mysql_save_os_db(unsigned int maxucnt, unsigned int maxutime,
-                           SList * ak, SList * sgl, SList * sql,
-                           SList * szl);
+						   SList * ak, SList * sgl, SList * sql,
+						   SList * szl);
 E int db_mysql_save_news(NewsItem * ni);
 E int db_mysql_save_exceptions(Exception * e);
 E int db_mysql_save_hs_core(HostCore * hc);
@@ -1031,7 +1031,7 @@ E int b64_decode(const char *src, char *target, size_t targsize);
 E const char* encode_ip(unsigned char *ip);
 E int decode_ip(const char *buf);
 
-#define Anope_Free(x)       if ((x) != NULL) free(x)
+#define Anope_Free(x)	   if ((x) != NULL) free(x)
 
 E char *host_resolve(char *host);
 
diff --git a/include/modules.h b/include/modules.h
index 93e399819..fc60290b3 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -48,7 +48,7 @@ typedef void *	ano_module_t;
 
 
 /*************************************************************************/
-#define CMD_HASH(x)      (((x)[0]&31)<<5 | ((x)[1]&31))	/* Will gen a hash from a string :) */
+#define CMD_HASH(x)	  (((x)[0]&31)<<5 | ((x)[1]&31))	/* Will gen a hash from a string :) */
 #define MAX_CMD_HASH 1024
 
 #define MOD_STOP 1
@@ -69,18 +69,18 @@ typedef void *	ano_module_t;
 /**********************************************************************
  * Module Returns
  **********************************************************************/
- #define MOD_ERR_OK          0
- #define MOD_ERR_MEMORY      1
- #define MOD_ERR_PARAMS      2
- #define MOD_ERR_EXISTS      3
- #define MOD_ERR_NOEXIST     4
- #define MOD_ERR_NOUSER      5
- #define MOD_ERR_NOLOAD      6
- #define MOD_ERR_NOUNLOAD    7
- #define MOD_ERR_SYNTAX      8
- #define MOD_ERR_NODELETE    9
- #define MOD_ERR_UNKNOWN     10
- #define MOD_ERR_FILE_IO     11
+ #define MOD_ERR_OK		  0
+ #define MOD_ERR_MEMORY	  1
+ #define MOD_ERR_PARAMS	  2
+ #define MOD_ERR_EXISTS	  3
+ #define MOD_ERR_NOEXIST	 4
+ #define MOD_ERR_NOUSER	  5
+ #define MOD_ERR_NOLOAD	  6
+ #define MOD_ERR_NOUNLOAD	7
+ #define MOD_ERR_SYNTAX	  8
+ #define MOD_ERR_NODELETE	9
+ #define MOD_ERR_UNKNOWN	 10
+ #define MOD_ERR_FILE_IO	 11
  #define MOD_ERR_NOSERVICE   12
  #define MOD_ERR_NO_MOD_NAME 13
 
@@ -128,8 +128,8 @@ extern MDE EvtMessageHash *EVENT[MAX_CMD_HASH];
 extern MDE EvtHookHash *EVENTHOOKS[MAX_CMD_HASH];
 
 struct ModuleLang_ {
-    int argc;
-    char **argv;
+	int argc;
+	char **argv;
 };
 
 /** Every module in Anope is actually a class.
@@ -293,61 +293,61 @@ CoreExport class ModuleManager
 
 
 struct ModuleHash_ {
-        char *name;
-        Module *m;
-        ModuleHash *next;
+		char *name;
+		Module *m;
+		ModuleHash *next;
 };
 
 struct Command_ {
-    char *name;
-    int (*routine)(User *u);
-    int (*has_priv)(User *u);	/* Returns 1 if user may use command, else 0 */
-
-    /* Regrettably, these are hard-coded to correspond to current privilege
-     * levels (v4.0).  Suggestions for better ways to do this are
-     * appreciated.
-     */
-    int helpmsg_all;	/* Displayed to all users; -1 = no message */
-    int helpmsg_reg;	/* Displayed to regular users only */
-    int helpmsg_oper;	/* Displayed to Services operators only */
-    int helpmsg_admin;	/* Displayed to Services admins only */
-    int helpmsg_root;	/* Displayed to Services root only */
-    char *help_param1;
-    char *help_param2;
-    char *help_param3;
-    char *help_param4;
-
-    /* Module related stuff */
-    int core;           /* Can this command be deleted? */
-    char *mod_name;	/* Name of the module who owns us, NULL for core's  */
-    char *service;	/* Service we provide this command for */
-    int (*all_help)(User *u);
-    int (*regular_help)(User *u);
-    int (*oper_help)(User *u);
-    int (*admin_help)(User *u);
-    int (*root_help)(User *u);
-
-    Command *next;	/* Next command responsible for the same command */
+	char *name;
+	int (*routine)(User *u);
+	int (*has_priv)(User *u);	/* Returns 1 if user may use command, else 0 */
+
+	/* Regrettably, these are hard-coded to correspond to current privilege
+	 * levels (v4.0).  Suggestions for better ways to do this are
+	 * appreciated.
+	 */
+	int helpmsg_all;	/* Displayed to all users; -1 = no message */
+	int helpmsg_reg;	/* Displayed to regular users only */
+	int helpmsg_oper;	/* Displayed to Services operators only */
+	int helpmsg_admin;	/* Displayed to Services admins only */
+	int helpmsg_root;	/* Displayed to Services root only */
+	char *help_param1;
+	char *help_param2;
+	char *help_param3;
+	char *help_param4;
+
+	/* Module related stuff */
+	int core;		   /* Can this command be deleted? */
+	char *mod_name;	/* Name of the module who owns us, NULL for core's  */
+	char *service;	/* Service we provide this command for */
+	int (*all_help)(User *u);
+	int (*regular_help)(User *u);
+	int (*oper_help)(User *u);
+	int (*admin_help)(User *u);
+	int (*root_help)(User *u);
+
+	Command *next;	/* Next command responsible for the same command */
 };
 
 struct CommandHash_ {
-        char *name;	/* Name of the command */
-        Command *c;	/* Actual command */
-        CommandHash *next; /* Next command */
+		char *name;	/* Name of the command */
+		Command *c;	/* Actual command */
+		CommandHash *next; /* Next command */
 };
 
 struct Message_ {
-    char *name;
-    int (*func)(const char *source, int ac, const char **av);
-    int core;
-    char *mod_name;
-    Message *next;
+	char *name;
+	int (*func)(const char *source, int ac, const char **av);
+	int core;
+	char *mod_name;
+	Message *next;
 };
 
 struct MessageHash_ {
-        char *name;
-        Message *m;
-        MessageHash *next;
+		char *name;
+		Message *m;
+		MessageHash *next;
 };
 
 struct ModuleCallBack_ {
@@ -361,38 +361,38 @@ struct ModuleCallBack_ {
 };
 
 struct EvtMessage_ {
-    char *name;
-    int (*func)(const char *source, int ac, const char **av);
-    int core;
-    char *mod_name;
-    EvtMessage *next;
+	char *name;
+	int (*func)(const char *source, int ac, const char **av);
+	int core;
+	char *mod_name;
+	EvtMessage *next;
 };
 
 struct EvtMessageHash_ {
-        char *name;
-        EvtMessage *evm;
-        EvtMessageHash *next;
+		char *name;
+		EvtMessage *evm;
+		EvtMessageHash *next;
 };
 
 
 struct EvtHook_ {
-    int (*func)(int argc, char **argv);
-    int core;
+	int (*func)(int argc, char **argv);
+	int core;
 	char *name;
-    char *mod_name;
-    EvtHook *next;
+	char *mod_name;
+	EvtHook *next;
 };
 
 struct EvtHookHash_ {
-        char *name;
-        EvtHook *evh;
-        EvtHookHash *next;
+		char *name;
+		EvtHook *evh;
+		EvtHookHash *next;
 };
 
 
 /*************************************************************************/
 /* Module Managment Functions */
-MDE Module *findModule(const char *name);                /* Find a module */
+MDE Module *findModule(const char *name);				/* Find a module */
 
 int encryption_module_init(void); /* Load the encryption module */
 int protocol_module_init(void);	/* Load the IRCD Protocol Module up*/
diff --git a/include/resource.h b/include/resource.h
index 2f3b54bfc..cccb0b4f5 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -2,19 +2,19 @@
 // Microsoft Developer Studio generated include file.
 // Used by Win32GUI.rc
 //
-#define VER_ANOPE                       1
-#define MANIFEST_RESOURCE_ID            2
-#define ICON_APP                        129
+#define VER_ANOPE					   1
+#define MANIFEST_RESOURCE_ID			2
+#define ICON_APP						129
 
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NO_MFC                     1
-#define _APS_NEXT_RESOURCE_VALUE        152
-#define _APS_NEXT_COMMAND_VALUE         40061
-#define _APS_NEXT_CONTROL_VALUE         1167
-#define _APS_NEXT_SYMED_VALUE           104
+#define _APS_NO_MFC					 1
+#define _APS_NEXT_RESOURCE_VALUE		152
+#define _APS_NEXT_COMMAND_VALUE		 40061
+#define _APS_NEXT_CONTROL_VALUE		 1167
+#define _APS_NEXT_SYMED_VALUE		   104
 #endif
 #endif
diff --git a/include/services.h b/include/services.h
index 32c5bc3a8..029e6efa9 100644
--- a/include/services.h
+++ b/include/services.h
@@ -105,7 +105,7 @@
 
 #ifdef _WIN32
 /* VS2008 hates having this define before its own */
-#define vsnprintf               _vsnprintf
+#define vsnprintf			   _vsnprintf
 #endif
 
 #if HAVE_STRINGS_H
@@ -337,9 +337,9 @@ struct ircdvars_ {
 	const char *adminset;				/* Mode to set for admin	*/
 	const char *adminunset;			/* Mode to unset for admin	*/
 	const char *modeonreg;			/* Mode on Register		*/
-	const char *rootmodeonid;                     /* Mode on ID for ROOTS         */
-	const char *adminmodeonid;                    /* Mode on ID for ADMINS        */
-	const char *opermodeonid;                     /* Mode on ID for OPERS         */
+	const char *rootmodeonid;					 /* Mode on ID for ROOTS		 */
+	const char *adminmodeonid;					/* Mode on ID for ADMINS		*/
+	const char *opermodeonid;					 /* Mode on ID for OPERS		 */
 	const char *modeonunreg;			/* Mode on Unregister		*/
 	const char *modeonnick;			/* Mode on nick change		*/
 	int sgline;				/* Supports SGline		*/
@@ -382,10 +382,10 @@ struct ircdvars_ {
 	char *chanmodes;			/* If the ircd sends CHANMODE in CAPAB this is where we store it */
 	int token;					/* Does Anope support the tokens for the ircd */
 	int sjb64;					/* Base 64 encode TIMESTAMP */
-    int invitemode;				/* +I  */
-    int sjoinbanchar;			/* use single quotes to define it */
-    int sjoinexchar;			/* use single quotes to define it */
-    int sjoininvchar;			/* use single quotes to define it */
+	int invitemode;				/* +I  */
+	int sjoinbanchar;			/* use single quotes to define it */
+	int sjoinexchar;			/* use single quotes to define it */
+	int sjoininvchar;			/* use single quotes to define it */
 	int svsmode_ucmode;			/* Can remove User Channel Modes with SVSMODE */
 	int sglineenforce;
 	const char *vhostchar;			/* char used for vhosting */
@@ -443,30 +443,30 @@ struct ircdcapab_ {
 /* Configuration directives */
 
 typedef struct {
-    const char *name;
-    struct {
-        int type;               /* PARAM_* below */
-        int flags;              /* Same */
-        void *ptr;              /* Pointer to where to store the value */
-    } params[MAXPARAMS];
+	const char *name;
+	struct {
+		int type;			   /* PARAM_* below */
+		int flags;			  /* Same */
+		void *ptr;			  /* Pointer to where to store the value */
+	} params[MAXPARAMS];
 } Directive;
 
 #define PARAM_NONE	0
 #define PARAM_INT	1
-#define PARAM_POSINT	2       /* Positive integer only */
-#define PARAM_PORT	3       /* 1..65535 only */
+#define PARAM_POSINT	2	   /* Positive integer only */
+#define PARAM_PORT	3	   /* 1..65535 only */
 #define PARAM_STRING	4
 #define PARAM_TIME	5
-#define PARAM_STRING_ARRAY 6    /* Array of string */
-#define PARAM_SET	-1      /* Not a real parameter; just set the
-                                 *    given integer variable to 1 */
-#define PARAM_DEPRECATED -2     /* Set for deprecated directives; `ptr'
-                                 *    is a function pointer to call */
+#define PARAM_STRING_ARRAY 6	/* Array of string */
+#define PARAM_SET	-1	  /* Not a real parameter; just set the
+								 *	given integer variable to 1 */
+#define PARAM_DEPRECATED -2	 /* Set for deprecated directives; `ptr'
+								 *	is a function pointer to call */
 
 /* Flags: */
 #define PARAM_OPTIONAL	0x01
 /*#define PARAM_FULLONLY	0x02   unused */
-#define PARAM_RELOAD    0x04    /* Directive is reloadable */
+#define PARAM_RELOAD	0x04	/* Directive is reloadable */
 
 /*************************************************************************/
 
@@ -503,20 +503,20 @@ struct ModuleData_ {
  * we encapsulate memo data in a MemoList to make it easier to handle. */
 
 struct memo_ {
-    uint32 number;	/* Index number -- not necessarily array position! */
-    uint16 flags;
-    time_t time;	/* When it was sent */
-    char sender[NICKMAX];
-    char *text;
-    ModuleData *moduleData; 	/* Module saved data attached to the Memo */
+	uint32 number;	/* Index number -- not necessarily array position! */
+	uint16 flags;
+	time_t time;	/* When it was sent */
+	char sender[NICKMAX];
+	char *text;
+	ModuleData *moduleData; 	/* Module saved data attached to the Memo */
 #ifdef USE_MYSQL
 	uint32 id;		/* Database ID; see mysql.c */
 #endif
 };
 
 typedef struct {
-    int16 memocount, memomax;
-    Memo *memos;
+	int16 memocount, memomax;
+	Memo *memos;
 } MemoInfo;
 
 
@@ -535,10 +535,10 @@ typedef struct {
 
 /* Access levels for users. */
 typedef struct {
-    uint16 in_use;	/* 1 if this entry is in use, else 0 */
-    int16 level;
-    NickCore *nc;	/* Guaranteed to be non-NULL if in use, NULL if not */
-    time_t last_seen;
+	uint16 in_use;	/* 1 if this entry is in use, else 0 */
+	int16 level;
+	NickCore *nc;	/* Guaranteed to be non-NULL if in use, NULL if not */
+	time_t last_seen;
 } ChanAccess;
 
 /* Note that these two levels also serve as exclusive boundaries for valid
@@ -557,28 +557,28 @@ typedef struct {
 /* Levels for xOP */
 
 #define ACCESS_VOP		3
-#define ACCESS_HOP      	4
+#define ACCESS_HOP	  	4
 #define ACCESS_AOP		5
 #define ACCESS_SOP		10
 
 /* AutoKick data. */
 typedef struct {
-    int16 in_use;   /* Always 0 if not in use */
-    int16 is_nick;	/* 1 if a regged nickname, 0 if a nick!user@host mask */
-    uint16 flags;
-    union {
+	int16 in_use;   /* Always 0 if not in use */
+	int16 is_nick;	/* 1 if a regged nickname, 0 if a nick!user@host mask */
+	uint16 flags;
+	union {
 		char *mask;		/* Guaranteed to be non-NULL if in use, NULL if not */
 		NickCore *nc;	/* Same */
-    } u;
-    char *reason;
+	} u;
+	char *reason;
 
-    char *creator;
-    time_t addtime;
+	char *creator;
+	time_t addtime;
 } AutoKick;
 
 #define AK_USED		0x0001
 #define AK_ISNICK	0x0002
-#define AK_STUCK    	0x0004
+#define AK_STUCK		0x0004
 
 /* Structure used to contain bad words. */
 
@@ -595,60 +595,60 @@ struct badword_ {
 
 
 struct chaninfo_ {
-    ChannelInfo *next, *prev;
-    char name[CHANMAX];
-    NickCore *founder;
-    NickCore *successor;		/* Who gets the channel if the founder
+	ChannelInfo *next, *prev;
+	char name[CHANMAX];
+	NickCore *founder;
+	NickCore *successor;		/* Who gets the channel if the founder
 					 			 * nick is dropped or expires */
-    char founderpass[PASSMAX];
-    char *desc;
-    char *url;
-    char *email;
+	char founderpass[PASSMAX];
+	char *desc;
+	char *url;
+	char *email;
 
-    time_t time_registered;
-    time_t last_used;
-    char *last_topic;			/* Last topic on the channel */
-    char last_topic_setter[NICKMAX];	/* Who set the last topic */
-    time_t last_topic_time;		/* When the last topic was set */
+	time_t time_registered;
+	time_t last_used;
+	char *last_topic;			/* Last topic on the channel */
+	char last_topic_setter[NICKMAX];	/* Who set the last topic */
+	time_t last_topic_time;		/* When the last topic was set */
 
-    uint32 flags;				/* See below */
-    char *forbidby;
-    char *forbidreason;
+	uint32 flags;				/* See below */
+	char *forbidby;
+	char *forbidreason;
 
-    int16 bantype;
-    int16 *levels;				/* Access levels for commands */
+	int16 bantype;
+	int16 *levels;				/* Access levels for commands */
 
-    uint16 accesscount;
-    ChanAccess *access;			/* List of authorized users */
-    uint16 akickcount;
-    AutoKick *akick;			/* List of users to kickban */
+	uint16 accesscount;
+	ChanAccess *access;			/* List of authorized users */
+	uint16 akickcount;
+	AutoKick *akick;			/* List of users to kickban */
 
-    uint32 mlock_on, mlock_off;		/* See channel modes below */
-    uint32 mlock_limit;			/* 0 if no limit */
-    char *mlock_key;			/* NULL if no key */
-    char *mlock_flood;			/* NULL if no +f */
-    char *mlock_redirect;		/* NULL if no +L */
+	uint32 mlock_on, mlock_off;		/* See channel modes below */
+	uint32 mlock_limit;			/* 0 if no limit */
+	char *mlock_key;			/* NULL if no key */
+	char *mlock_flood;			/* NULL if no +f */
+	char *mlock_redirect;		/* NULL if no +L */
 
-    char *entry_message;		/* Notice sent on entering channel */
+	char *entry_message;		/* Notice sent on entering channel */
 
-    MemoInfo memos;
+	MemoInfo memos;
 
-    struct channel_ *c;			/* Pointer to channel record (if   *
-					 			 *    channel is currently in use) */
+	struct channel_ *c;			/* Pointer to channel record (if   *
+					 			 *	channel is currently in use) */
 
-    ModuleData *moduleData; 	/* Module saved data attached to the ChannelInfo */
+	ModuleData *moduleData; 	/* Module saved data attached to the ChannelInfo */
 
-    /* For BotServ */
+	/* For BotServ */
 
-    BotInfo *bi;					/* Bot used on this channel */
-    uint32 botflags;				/* BS_* below */
-    int16 *ttb;						/* Times to ban for each kicker */
+	BotInfo *bi;					/* Bot used on this channel */
+	uint32 botflags;				/* BS_* below */
+	int16 *ttb;						/* Times to ban for each kicker */
 
-    uint16 bwcount;
-    BadWord *badwords;				/* For BADWORDS kicker */
-    int16 capsmin, capspercent;		/* For CAPS kicker */
-    int16 floodlines, floodsecs;	/* For FLOOD kicker */
-    int16 repeattimes;				/* For REPEAT kicker */
+	uint16 bwcount;
+	BadWord *badwords;				/* For BADWORDS kicker */
+	int16 capsmin, capspercent;		/* For CAPS kicker */
+	int16 floodlines, floodsecs;	/* For FLOOD kicker */
+	int16 repeattimes;				/* For REPEAT kicker */
 };
 
 /* Retain topic even after last person leaves channel */
@@ -703,43 +703,43 @@ struct chaninfo_ {
 #define CA_NOJOIN			10	/* Maximum */
 #define CA_ACCESS_CHANGE 		11
 #define CA_MEMO				12
-#define CA_ASSIGN       		13  /* BotServ ASSIGN command */
-#define CA_BADWORDS     		14  /* BotServ BADWORDS command */
-#define CA_NOKICK       		15  /* Not kicked by the bot */
+#define CA_ASSIGN	   		13  /* BotServ ASSIGN command */
+#define CA_BADWORDS	 		14  /* BotServ BADWORDS command */
+#define CA_NOKICK	   		15  /* Not kicked by the bot */
 #define CA_FANTASIA   			16
 #define CA_SAY				17
-#define CA_GREET            		18
+#define CA_GREET					18
 #define CA_VOICEME			19
 #define CA_VOICE			20
-#define CA_GETKEY           		21
+#define CA_GETKEY		   		21
 #define CA_AUTOHALFOP			22
 #define CA_AUTOPROTECT			23
-#define CA_OPDEOPME         		24
-#define CA_HALFOPME         		25
-#define CA_HALFOP           		26
-#define CA_PROTECTME        		27
-#define CA_PROTECT          		28
-#define CA_KICKME           		29
-#define CA_KICK             		30
+#define CA_OPDEOPME		 		24
+#define CA_HALFOPME		 		25
+#define CA_HALFOP		   		26
+#define CA_PROTECTME				27
+#define CA_PROTECT		  		28
+#define CA_KICKME		   		29
+#define CA_KICK			 		30
 #define CA_SIGNKICK			31
-/* #define CA_AUTOADMIN        		32
-#define CA_ADMINME          		33
-#define CA_ADMIN            		34 */
+/* #define CA_AUTOADMIN				32
+#define CA_ADMINME		  		33
+#define CA_ADMIN					34 */
 	/* Why are these commented out and not removed? -GD */
-#define CA_BANME            		32
-#define CA_BAN              		33
-#define CA_TOPIC            		34
-#define CA_INFO             		35
+#define CA_BANME					32
+#define CA_BAN			  		33
+#define CA_TOPIC					34
+#define CA_INFO			 		35
 
 #define CA_SIZE		36
 
 /* BotServ SET flags */
-#define BS_DONTKICKOPS      	0x00000001
+#define BS_DONTKICKOPS	  	0x00000001
 #define BS_DONTKICKVOICES   	0x00000002
-#define BS_FANTASY          	0x00000004
-#define BS_SYMBIOSIS        	0x00000008
-#define BS_GREET            	0x00000010
-#define BS_NOBOT            	0x00000020
+#define BS_FANTASY		  	0x00000004
+#define BS_SYMBIOSIS			0x00000008
+#define BS_GREET				0x00000010
+#define BS_NOBOT				0x00000020
 
 /* BotServ Kickers flags */
 #define BS_KICK_BOLDS 		0x80000000
@@ -776,9 +776,9 @@ struct csmodeutil_ {
 };
 
 typedef struct {
-    int what;
-    const char *name;
-    int desc;
+	int what;
+	const char *name;
+	int desc;
 } LevelInfo;
 
 
@@ -787,23 +787,23 @@ typedef struct {
 /* Server data */
 
 typedef enum {
-	SSYNC_UNKNOWN       = 0,	/* We can't get the sync state   */
+	SSYNC_UNKNOWN	   = 0,	/* We can't get the sync state   */
 	SSYNC_IN_PROGRESS   = 1,	/* Sync is currently in progress */
-	SSYNC_DONE          = 2		/* We're in sync                 */
+	SSYNC_DONE		  = 2		/* We're in sync				 */
 } SyncState;
 
 struct server_ {
-    Server *next, *prev;
+	Server *next, *prev;
 
-    char *name;     /* Server name                        */
-    uint16 hops;    /* Hops between services and server   */
-    char *desc;     /* Server description                 */
-    uint16 flags;   /* Some info flags, as defined below  */
-    char *suid;     /* Server Univeral ID                 */
-    SyncState sync; /* Server sync state (see above)      */
+	char *name;	 /* Server name						*/
+	uint16 hops;	/* Hops between services and server   */
+	char *desc;	 /* Server description				 */
+	uint16 flags;   /* Some info flags, as defined below  */
+	char *suid;	 /* Server Univeral ID				 */
+	SyncState sync; /* Server sync state (see above)	  */
 
-    Server *links;	/* Linked list head for linked servers 	  */
-    Server *uplink;	/* Server which pretends to be the uplink */
+	Server *links;	/* Linked list head for linked servers 	  */
+	Server *uplink;	/* Server which pretends to be the uplink */
 };
 
 #define SERVER_ISME  0x0001
@@ -824,7 +824,7 @@ struct cbmode_ {
 
 #define CBM_MINUS_NO_ARG 	0x0001		/* No argument for unset */
 #define CBM_NO_MLOCK		0x0002		/* Can't be MLOCKed */
-#define CBM_NO_USER_MLOCK   	0x0004      	/* Can't be MLOCKed by non-opers */
+#define CBM_NO_USER_MLOCK   	0x0004	  	/* Can't be MLOCKed by non-opers */
 
 struct cbmodeinfo_ {
 	char mode;				/* The mode */
@@ -857,40 +857,40 @@ struct cumode_ {
  */
 
 struct bandata_ {
-    BanData *next, *prev;
+	BanData *next, *prev;
 
-    char *mask;				/* Since a nick is unsure and a User structure
-    					   	   is unsafe */
-    time_t last_use;		/* Since time is the only way to check
-    					   	   whether it's still useful */
-    int16 ttb[TTB_SIZE];
+	char *mask;				/* Since a nick is unsure and a User structure
+						   	   is unsafe */
+	time_t last_use;		/* Since time is the only way to check
+						   	   whether it's still useful */
+	int16 ttb[TTB_SIZE];
 };
 
 /* This structure stocks information on every user that will be used by
  * BotServ. */
 
 struct userdata_ {
-    /* Data validity */
-    time_t last_use;
+	/* Data validity */
+	time_t last_use;
 
-    /* for flood kicker */
-    int16 lines;
-    time_t last_start;
+	/* for flood kicker */
+	int16 lines;
+	time_t last_start;
 
-    /* for repeat kicker */
-    char *lastline;
-    int16 times;
+	/* for repeat kicker */
+	char *lastline;
+	int16 times;
 };
 
 /* Channelban type flags */
-#define ENTRYTYPE_NONE           0x00000000
-#define ENTRYTYPE_CIDR4          0x00000001
-#define ENTRYTYPE_NICK_WILD      0x00000004
-#define ENTRYTYPE_NICK           0x00000008
-#define ENTRYTYPE_USER_WILD      0x00000010
-#define ENTRYTYPE_USER           0x00000020
-#define ENTRYTYPE_HOST_WILD      0x00000040
-#define ENTRYTYPE_HOST           0x00000080
+#define ENTRYTYPE_NONE		   0x00000000
+#define ENTRYTYPE_CIDR4		  0x00000001
+#define ENTRYTYPE_NICK_WILD	  0x00000004
+#define ENTRYTYPE_NICK		   0x00000008
+#define ENTRYTYPE_USER_WILD	  0x00000010
+#define ENTRYTYPE_USER		   0x00000020
+#define ENTRYTYPE_HOST_WILD	  0x00000040
+#define ENTRYTYPE_HOST		   0x00000080
 
 struct c_userlist {
 	struct c_userlist *next, *prev;
@@ -899,33 +899,33 @@ struct c_userlist {
 };
 
 struct channel_ {
-    Channel *next, *prev;
-    char name[CHANMAX];
-    ChannelInfo *ci;			/* Corresponding ChannelInfo */
-    time_t creation_time;		/* When channel was created */
-    char *topic;
-    char topic_setter[NICKMAX];		/* Who set the topic */
-    time_t topic_time;			/* When topic was set */
-    uint32 mode;			/* Binary modes only */
-    uint32 limit;			/* 0 if none */
-    char *key;				/* NULL if none */
-    char *redirect;			/* +L; NULL if none */
-    char *flood;			/* +f; NULL if none */
-    EList *bans;
-    EList *excepts;
-    EList *invites;
+	Channel *next, *prev;
+	char name[CHANMAX];
+	ChannelInfo *ci;			/* Corresponding ChannelInfo */
+	time_t creation_time;		/* When channel was created */
+	char *topic;
+	char topic_setter[NICKMAX];		/* Who set the topic */
+	time_t topic_time;			/* When topic was set */
+	uint32 mode;			/* Binary modes only */
+	uint32 limit;			/* 0 if none */
+	char *key;				/* NULL if none */
+	char *redirect;			/* +L; NULL if none */
+	char *flood;			/* +f; NULL if none */
+	EList *bans;
+	EList *excepts;
+	EList *invites;
 
 	struct c_userlist *users;
-    int16 usercount;
+	int16 usercount;
 
-    BanData *bd;
+	BanData *bd;
 
-    time_t server_modetime;		/* Time of last server MODE */
-    time_t chanserv_modetime;	/* Time of last check_modes() */
-    int16 server_modecount;		/* Number of server MODEs this second */
-    int16 chanserv_modecount;	/* Number of check_mode()'s this sec */
-    int16 bouncy_modes;			/* Did we fail to set modes here? */
-	int16 topic_sync;           /* Is the topic in sync? */
+	time_t server_modetime;		/* Time of last server MODE */
+	time_t chanserv_modetime;	/* Time of last check_modes() */
+	int16 server_modecount;		/* Number of server MODEs this second */
+	int16 chanserv_modecount;	/* Number of check_mode()'s this sec */
+	int16 bouncy_modes;			/* Did we fail to set modes here? */
+	int16 topic_sync;		   /* Is the topic in sync? */
 };
 
 struct c_elist {
@@ -934,11 +934,11 @@ struct c_elist {
 };
 
 struct c_elist_entry {
-    Entry *next, *prev;
-    uint32 type;
-    uint32 cidr_ip;             /* IP mask for CIDR matching */
-    uint32 cidr_mask;           /* Netmask for CIDR matching */
-    char *nick, *user, *host, *mask;
+	Entry *next, *prev;
+	uint32 type;
+	uint32 cidr_ip;			 /* IP mask for CIDR matching */
+	uint32 cidr_mask;		   /* Netmask for CIDR matching */
+	char *nick, *user, *host, *mask;
 };
 
 /*************************************************************************/
@@ -954,9 +954,9 @@ struct c_elist_entry {
 /* Ignorance list data. */
 
 typedef struct ignore_data {
-    struct ignore_data *prev, *next;
-    char *mask;
-    time_t time;	/* When do we stop ignoring them? */
+	struct ignore_data *prev, *next;
+	char *mask;
+	time_t time;	/* When do we stop ignoring them? */
 } IgnoreData;
 
 /*************************************************************************/
@@ -1001,58 +1001,58 @@ struct sxline_ {
 /* Host serv structures */
 
 struct hostcore_ {
-    HostCore *next;
-    char *nick;				/* Owner of the vHost */
-    char *vIdent;			/* vIdent for the user */
-    char *vHost;			/* Vhost for this user */
-    char *creator;			/* Oper Nick of the oper who set the vhost */
-    time_t time;			/* Date/Time vHost was set */
+	HostCore *next;
+	char *nick;				/* Owner of the vHost */
+	char *vIdent;			/* vIdent for the user */
+	char *vHost;			/* Vhost for this user */
+	char *creator;			/* Oper Nick of the oper who set the vhost */
+	time_t time;			/* Date/Time vHost was set */
 };
 
 /*************************************************************************/
 
 struct newsitem_ {
-    uint16 type;
-    uint32 num;                  /* Numbering is separate for login and oper news */
-    char *text;
-    char who[NICKMAX];
-    time_t time;
+	uint16 type;
+	uint32 num;				  /* Numbering is separate for login and oper news */
+	char *text;
+	char who[NICKMAX];
+	time_t time;
 };
 
 /*************************************************************************/
 
 
 struct exception_ {
-    char *mask;                 /* Hosts to which this exception applies */
-    int limit;                  /* Session limit for exception */
-    char who[NICKMAX];          /* Nick of person who added the exception */
-    char *reason;               /* Reason for exception's addition */
-    time_t time;                /* When this exception was added */
-    time_t expires;             /* Time when it expires. 0 == no expiry */
-    int num;                    /* Position in exception list; used to track
-                                 * positions when deleting entries. It is
-                                 * symbolic and used internally. It is
-                                 * calculated at load time and never saved. */
+	char *mask;				 /* Hosts to which this exception applies */
+	int limit;				  /* Session limit for exception */
+	char who[NICKMAX];		  /* Nick of person who added the exception */
+	char *reason;			   /* Reason for exception's addition */
+	time_t time;				/* When this exception was added */
+	time_t expires;			 /* Time when it expires. 0 == no expiry */
+	int num;					/* Position in exception list; used to track
+								 * positions when deleting entries. It is
+								 * symbolic and used internally. It is
+								 * calculated at load time and never saved. */
 };
 
 /*************************************************************************/
 
 struct session_ {
-    Session *prev, *next;
-    char *host;
-    int count;                  /* Number of clients with this host */
-    int hits;                   /* Number of subsequent kills for a host */
+	Session *prev, *next;
+	char *host;
+	int count;				  /* Number of clients with this host */
+	int hits;				   /* Number of subsequent kills for a host */
 };
 
 /*************************************************************************/
 typedef struct ircd_modes_ {
-        int user_invis;
-        int user_oper;
-        int chan_invite;
-        int chan_secret;
-        int chan_private;
-        int chan_key;
-        int chan_limit;
+		int user_invis;
+		int user_oper;
+		int chan_invite;
+		int chan_secret;
+		int chan_private;
+		int chan_key;
+		int chan_limit;
 } IRCDModes;
 
 
@@ -1077,29 +1077,29 @@ typedef struct ircd_modes_ {
 /* Memo Flags */
 #define MF_UNREAD	0x0001	/* Memo has not yet been read */
 #define MF_RECEIPT	0x0002	/* Sender requested receipt */
-#define MF_NOTIFYS      0x0004  /* Memo is a notification of receitp */
+#define MF_NOTIFYS	  0x0004  /* Memo is a notification of receitp */
 
 /* Nickname status flags: */
-#define NS_VERBOTEN	0x0002      /* Nick may not be registered or used */
-#define NS_NO_EXPIRE	0x0004      /* Nick never expires */
-#define NS_IDENTIFIED	0x8000      /* User has IDENTIFY'd */
-#define NS_RECOGNIZED	0x4000      /* ON_ACCESS true && SECURE flag not set */
-#define NS_ON_ACCESS	0x2000      /* User comes from a known address */
-#define NS_KILL_HELD	0x1000      /* Nick is being held after a kill */
-#define NS_GUESTED	0x0100	    /* SVSNICK has been sent but nick has not
-				     				 * yet changed. An enforcer will be
-				     				 * introduced when it does change. */
+#define NS_VERBOTEN	0x0002	  /* Nick may not be registered or used */
+#define NS_NO_EXPIRE	0x0004	  /* Nick never expires */
+#define NS_IDENTIFIED	0x8000	  /* User has IDENTIFY'd */
+#define NS_RECOGNIZED	0x4000	  /* ON_ACCESS true && SECURE flag not set */
+#define NS_ON_ACCESS	0x2000	  /* User comes from a known address */
+#define NS_KILL_HELD	0x1000	  /* Nick is being held after a kill */
+#define NS_GUESTED	0x0100		/* SVSNICK has been sent but nick has not
+					 				 * yet changed. An enforcer will be
+					 				 * introduced when it does change. */
 #define NS_MASTER	0x0200		/* Was a master nick; used to import old databases */
 #define NS_TRANSGROUP	0xC000		/* Status flags that can be passed to a nick of the
 									   same group during nick change */
-#define NS_TEMPORARY	0xFF00      /* All temporary status flags */
+#define NS_TEMPORARY	0xFF00	  /* All temporary status flags */
 /* These two are not used anymore */
 #define NS_OLD_ENCRYPTEDPW	0x0001  /* Nickname password is encrypted */
 
 /* Nickname setting flags: */
 #define NI_KILLPROTECT		0x00000001  /* Kill others who take this nick */
 #define NI_SECURE		0x00000002  /* Don't recognize unless IDENTIFY'd */
-#define NI_MSG                  0x00000004  /* Use PRIVMSGs instead of NOTICEs */
+#define NI_MSG				  0x00000004  /* Use PRIVMSGs instead of NOTICEs */
 #define NI_MEMO_HARDMAX		0x00000008  /* Don't allow user to change memo limit */
 #define NI_MEMO_SIGNON		0x00000010  /* Notify of memos at signon and un-away */
 #define NI_MEMO_RECEIVE		0x00000020  /* Notify of new memos when sent */
@@ -1112,9 +1112,9 @@ typedef struct ircd_modes_ {
 #define NI_SERVICES_OPER 	0x00001000  /* User is a Services operator */
 #define NI_SERVICES_ADMIN	0x00002000  /* User is a Services admin */
 #define NI_ENCRYPTEDPW		0x00004000  /* Nickname password is encrypted */
-#define NI_SERVICES_ROOT        0x00008000  /* User is a Services root */
-#define NI_MEMO_MAIL            0x00010000  /* User gets email on memo */
-#define NI_HIDE_STATUS          0x00020000  /* Don't show services access status */
+#define NI_SERVICES_ROOT		0x00008000  /* User is a Services root */
+#define NI_MEMO_MAIL			0x00010000  /* User gets email on memo */
+#define NI_HIDE_STATUS		  0x00020000  /* Don't show services access status */
 #define NI_SUSPENDED		0x00040000  /* Nickname is suspended */
 #define NI_AUTOOP		0x00080000  /* Autoop nickname in channels */
 /* Languages.  Never insert anything in the middle of this list, or
@@ -1122,25 +1122,25 @@ typedef struct ircd_modes_ {
  * the order the languages are displayed in for NickServ HELP SET LANGUAGE,
  * do it in language.c.
  */
-#define LANG_EN_US              0	/* United States English */
-#define LANG_JA_JIS             1	/* Japanese (JIS encoding) */
-#define LANG_JA_EUC             2	/* Japanese (EUC encoding) */
-#define LANG_JA_SJIS            3	/* Japanese (SJIS encoding) */
-#define LANG_ES                 4	/* Spanish */
-#define LANG_PT                 5	/* Portugese */
-#define LANG_FR                 6	/* French */
-#define LANG_TR                 7	/* Turkish */
-#define LANG_IT                 8	/* Italian */
-#define LANG_DE                 9   	/* German */
-#define LANG_CAT               10   	/* Catalan */
-#define LANG_GR                11   	/* Greek */
-#define LANG_NL                12   	/* Dutch */
-#define LANG_RU                13   	/* Russian */
-#define LANG_HUN               14   	/* Hungarian */
-#define LANG_PL                15   	/* Polish */
-
-#define NUM_LANGS              16	/* Number of languages */
-#define USED_LANGS             13	/* Number of languages provided */
+#define LANG_EN_US			  0	/* United States English */
+#define LANG_JA_JIS			 1	/* Japanese (JIS encoding) */
+#define LANG_JA_EUC			 2	/* Japanese (EUC encoding) */
+#define LANG_JA_SJIS			3	/* Japanese (SJIS encoding) */
+#define LANG_ES				 4	/* Spanish */
+#define LANG_PT				 5	/* Portugese */
+#define LANG_FR				 6	/* French */
+#define LANG_TR				 7	/* Turkish */
+#define LANG_IT				 8	/* Italian */
+#define LANG_DE				 9   	/* German */
+#define LANG_CAT			   10   	/* Catalan */
+#define LANG_GR				11   	/* Greek */
+#define LANG_NL				12   	/* Dutch */
+#define LANG_RU				13   	/* Russian */
+#define LANG_HUN			   14   	/* Hungarian */
+#define LANG_PL				15   	/* Polish */
+
+#define NUM_LANGS			  16	/* Number of languages */
+#define USED_LANGS			 13	/* Number of languages provided */
 
 
 #define DEF_LANGUAGE	LANG_EN_US
@@ -1161,7 +1161,7 @@ typedef struct ircd_modes_ {
 #define MUT_DEHALFOP		4
 #define MUT_HALFOP		5
 #define MUT_DEPROTECT   	6
-#define MUT_PROTECT     	7
+#define MUT_PROTECT	 	7
 
 /*************************************************************************/
 /* CAPAB stuffs */
@@ -1172,36 +1172,36 @@ struct capabinfo_ {
 	uint32 flag;
 };
 
-#define CAPAB_NOQUIT    0x00000001
-#define CAPAB_TSMODE    0x00000002
+#define CAPAB_NOQUIT	0x00000001
+#define CAPAB_TSMODE	0x00000002
 #define CAPAB_UNCONNECT 0x00000004
-#define CAPAB_NICKIP    0x00000008
-#define CAPAB_NSJOIN    0x00000010
-#define CAPAB_ZIP       0x00000020
-#define CAPAB_BURST     0x00000040
-#define CAPAB_TS3       0x00000080
-#define CAPAB_TS5       0x00000100
-#define CAPAB_DKEY      0x00000200
-#define CAPAB_DOZIP     0x00000400
-#define CAPAB_DODKEY    0x00000800
-#define CAPAB_QS        0x00001000
-#define CAPAB_SCS       0x00002000
-#define CAPAB_PT4       0x00004000
-#define CAPAB_UID       0x00008000
-#define CAPAB_KNOCK     0x00010000
-#define CAPAB_CLIENT    0x00020000
-#define CAPAB_IPV6      0x00040000
-#define CAPAB_SSJ5      0x00080000
-#define CAPAB_SN2       0x00100000
-#define CAPAB_VHOST     0x00200000
-#define CAPAB_TOKEN     0x00400000
-#define CAPAB_SSJ3      0x00800000
-#define CAPAB_NICK2     0x01000000
-#define CAPAB_UMODE2    0x02000000
-#define CAPAB_VL        0x04000000
-#define CAPAB_TLKEXT    0x08000000
+#define CAPAB_NICKIP	0x00000008
+#define CAPAB_NSJOIN	0x00000010
+#define CAPAB_ZIP	   0x00000020
+#define CAPAB_BURST	 0x00000040
+#define CAPAB_TS3	   0x00000080
+#define CAPAB_TS5	   0x00000100
+#define CAPAB_DKEY	  0x00000200
+#define CAPAB_DOZIP	 0x00000400
+#define CAPAB_DODKEY	0x00000800
+#define CAPAB_QS		0x00001000
+#define CAPAB_SCS	   0x00002000
+#define CAPAB_PT4	   0x00004000
+#define CAPAB_UID	   0x00008000
+#define CAPAB_KNOCK	 0x00010000
+#define CAPAB_CLIENT	0x00020000
+#define CAPAB_IPV6	  0x00040000
+#define CAPAB_SSJ5	  0x00080000
+#define CAPAB_SN2	   0x00100000
+#define CAPAB_VHOST	 0x00200000
+#define CAPAB_TOKEN	 0x00400000
+#define CAPAB_SSJ3	  0x00800000
+#define CAPAB_NICK2	 0x01000000
+#define CAPAB_UMODE2	0x02000000
+#define CAPAB_VL		0x04000000
+#define CAPAB_TLKEXT	0x08000000
 #define CAPAB_CHANMODE  0x10000000
-#define CAPAB_SJB64     0x20000000
+#define CAPAB_SJB64	 0x20000000
 #define CAPAB_NICKCHARS 0x40000000
 
 /*************************************************************************/
@@ -1209,9 +1209,9 @@ struct capabinfo_ {
 /**
  * RFC: defination of a valid nick
  * nickname   =  ( letter / special ) *8( letter / digit / special / "-" )
- * letter     =  %x41-5A / %x61-7A       ; A-Z / a-z
- * digit      =  %x30-39                 ; 0-9
- * special    =  %x5B-60 / %x7B-7D       ; "[", "]", "\", "`", "_", "^", "{", "|", "}"
+ * letter	 =  %x41-5A / %x61-7A	   ; A-Z / a-z
+ * digit	  =  %x30-39				 ; 0-9
+ * special	=  %x5B-60 / %x7B-7D	   ; "[", "]", "\", "`", "_", "^", "{", "|", "}"
  **/
 #define isvalidnick(c) ( isalnum(c) || ((c) >='\x5B' && (c) <='\x60') || ((c) >='\x7B' && (c) <='\x7D') || (c)=='-' )
 
@@ -1281,7 +1281,7 @@ private:
 		}
 	public:
 
-	    virtual ~IRCDProto();
+		virtual ~IRCDProto();
 
 		virtual void SendSVSNOOP(const char *, int) { }
 		virtual void SendAkillDel(const char *, const char *) = 0;
diff --git a/include/slist.h b/include/slist.h
index 64ecbe996..aeceefc45 100644
--- a/include/slist.h
+++ b/include/slist.h
@@ -32,7 +32,7 @@ struct slistopts_ {
 	int32 flags;		/* Flags for the list. See below. */
 	
 	int  (*compareitem)	(SList *slist, void *item1, void *item2); 	/* Called to compare two items */
-	int  (*isequal)     (SList *slist, void *item1, void *item2); 	/* Called by slist_indexof. item1 can be an arbitrary pointer. */
+	int  (*isequal)	 (SList *slist, void *item1, void *item2); 	/* Called by slist_indexof. item1 can be an arbitrary pointer. */
 	void (*freeitem) 	(SList *slist, void *item);					/* Called when an item is removed */
 };
 
diff --git a/include/timeout.h b/include/timeout.h
index a6ac20ba5..0aec7aef9 100644
--- a/include/timeout.h
+++ b/include/timeout.h
@@ -21,11 +21,11 @@
 /* Definitions for timeouts: */
 typedef struct timeout_ Timeout;
 struct timeout_ {
-    Timeout *next, *prev;
-    time_t settime, timeout;
-    int repeat;			/* Does this timeout repeat indefinitely? */
-    void (*code)(Timeout *);	/* This structure is passed to the code */
-    void *data;			/* Can be anything */
+	Timeout *next, *prev;
+	time_t settime, timeout;
+	int repeat;			/* Does this timeout repeat indefinitely? */
+	void (*code)(Timeout *);	/* This structure is passed to the code */
+	void *data;			/* Can be anything */
 };
 
 
diff --git a/include/users.h b/include/users.h
index 5577bbd50..185100f4d 100644
--- a/include/users.h
+++ b/include/users.h
@@ -29,7 +29,7 @@ class User
 
 	char *username;		/* ident			*/
 	char *host;		/* User's real hostname 	*/
-	char *hostip;		/* User's IP number             */
+	char *hostip;		/* User's IP number			 */
 	char *vhost;		/* User's virtual hostname 	*/
 	std::string chost;	/* User's cloaked hostname */
 	char *vident;		/* User's virtual ident 	*/
diff --git a/include/version.sh.c b/include/version.sh.c
index a3d0ba7e4..f95ae7d63 100644
--- a/include/version.sh.c
+++ b/include/version.sh.c
@@ -37,35 +37,35 @@ void parse_line(FILE *, char *);
 
 int main()
 {
-    FILE *fd = fopen(CTRL, "r");
+	FILE *fd = fopen(CTRL, "r");
 
 
-    if (!fd) {
-        fprintf(stderr, "Error: Unable to find control file: " CTRL "\n");
-        exit(0);
-    }
+	if (!fd) {
+		fprintf(stderr, "Error: Unable to find control file: " CTRL "\n");
+		exit(0);
+	}
 
-    load_ctrl(fd);
-    fclose(fd);
+	load_ctrl(fd);
+	fclose(fd);
 
-    _snprintf(version, 1024, "%ld.%ld.%ld%s (%ld)", version_major, version_minor,
-              version_patch, (version_extra ? version_extra : ""), version_build);
+	_snprintf(version, 1024, "%ld.%ld.%ld%s (%ld)", version_major, version_minor,
+			  version_patch, (version_extra ? version_extra : ""), version_build);
 
-    _snprintf(version_dotted, 1024, "%ld.%ld.%ld%s.%ld", version_major, version_minor,
-              version_patch, (version_extra ? version_extra : ""), version_build);
+	_snprintf(version_dotted, 1024, "%ld.%ld.%ld%s.%ld", version_major, version_minor,
+			  version_patch, (version_extra ? version_extra : ""), version_build);
 
-    fd = fopen("version.h", "r");
+	fd = fopen("version.h", "r");
 
-    if (fd) {
-        parse_version(fd);
-        fclose(fd);
-    } else
-        build = 1;
+	if (fd) {
+		parse_version(fd);
+		fclose(fd);
+	} else
+		build = 1;
 
 
-    fd = fopen("version.h", "w");
-    write_version(fd);
-    fclose(fd);
+	fd = fopen("version.h", "w");
+	write_version(fd);
+	fclose(fd);
 	
 	if (version_extra)
 		free(version_extra);
@@ -73,160 +73,160 @@ int main()
 
 void load_ctrl(FILE * fd)
 {
-    char buf[512];
-    while (fgets(buf, 511, fd)) {
-        char *var;
-
-        strip(buf);
-
-        var = strtok(buf, "=");
-        if (!var)
-            continue;
-        if (!strcmp(var, "VERSION_MAJOR"))
-            version_major = get_value(strtok(NULL, ""));
-        else if (!strcmp(var, "VERSION_MINOR"))
-            version_minor = get_value(strtok(NULL, ""));
-        else if (!strcmp(var, "VERSION_PATCH"))
-            version_patch = get_value(strtok(NULL, ""));
-        else if (!strcmp(var, "VERSION_BUILD"))
-            version_build = get_value(strtok(NULL, ""));
-        else if (!strcmp(var, "VERSION_EXTRA"))
-            version_extra = get_value_str(strtok(NULL, ""));
-
-    }
+	char buf[512];
+	while (fgets(buf, 511, fd)) {
+		char *var;
+
+		strip(buf);
+
+		var = strtok(buf, "=");
+		if (!var)
+			continue;
+		if (!strcmp(var, "VERSION_MAJOR"))
+			version_major = get_value(strtok(NULL, ""));
+		else if (!strcmp(var, "VERSION_MINOR"))
+			version_minor = get_value(strtok(NULL, ""));
+		else if (!strcmp(var, "VERSION_PATCH"))
+			version_patch = get_value(strtok(NULL, ""));
+		else if (!strcmp(var, "VERSION_BUILD"))
+			version_build = get_value(strtok(NULL, ""));
+		else if (!strcmp(var, "VERSION_EXTRA"))
+			version_extra = get_value_str(strtok(NULL, ""));
+
+	}
 }
 
 char *strip(char *str)
 {
-    char *c;
-    if ((c = strchr(str, '\n')))
-        *c = 0;
-    if ((c = strchr(str, '\r')))
-        *c = 0;
-    return str;
+	char *c;
+	if ((c = strchr(str, '\n')))
+		*c = 0;
+	if ((c = strchr(str, '\r')))
+		*c = 0;
+	return str;
 }
 
 long get_value(char *string)
 {
 	// XXX : if the fields in version.log are empty strtok returns a double quote, dont try to atol it then
 	if (*string != '"')
-	    return atol(get_value_str(string));
+		return atol(get_value_str(string));
 	else
 		return 0;
 }
 
 char *get_value_str(char *string)
 {
-    int len;
+	int len;
 
-    if (*string == '"')
-        string++;
+	if (*string == '"')
+		string++;
 
-    len = strlen(string);
+	len = strlen(string);
 
-    if (string[len - 1] == '"')
-        string[len - 1] = 0;
-    if (!*string)
-        return NULL;
-    return strdup(string);
+	if (string[len - 1] == '"')
+		string[len - 1] = 0;
+	if (!*string)
+		return NULL;
+	return strdup(string);
 }
 
 void parse_version(FILE * fd)
 {
-    char buf[1024];
+	char buf[1024];
 
-    while (fgets(buf, 1023, fd)) {
-        char *para1;
+	while (fgets(buf, 1023, fd)) {
+		char *para1;
 
-        strip(buf);
-        para1 = strtok(buf, " \t");
+		strip(buf);
+		para1 = strtok(buf, " \t");
 
-        if (!para1)
-            continue;
+		if (!para1)
+			continue;
 
-        if (!strcmp(para1, "#define")) {
-            char *para2 = strtok(NULL, " \t");
+		if (!strcmp(para1, "#define")) {
+			char *para2 = strtok(NULL, " \t");
 
-            if (!para2)
-                continue;
+			if (!para2)
+				continue;
 
-            if (!strcmp(para2, "BUILD")) {
-                char *value = strtok(NULL, "");
-                build = get_value(value);
-                build++;
-                return;
-            }
-        }
-    }
-    build = 1;
+			if (!strcmp(para2, "BUILD")) {
+				char *value = strtok(NULL, "");
+				build = get_value(value);
+				build++;
+				return;
+			}
+		}
+	}
+	build = 1;
 }
 
 void write_version(FILE * fd)
 {
-    FILE *fdin = fopen("include\\version.sh", "r");
-    char buf[1024];
-    short until_eof = 0;
+	FILE *fdin = fopen("include\\version.sh", "r");
+	char buf[1024];
+	short until_eof = 0;
 
-    while (fgets(buf, 1023, fdin)) {
-        strip(buf);
+	while (fgets(buf, 1023, fdin)) {
+		strip(buf);
 
-        if (until_eof)
-        {
-            if (!strcmp(buf, "EOF"))
-                break;
-            else
-                parse_line(fd, buf);
-        }
+		if (until_eof)
+		{
+			if (!strcmp(buf, "EOF"))
+				break;
+			else
+				parse_line(fd, buf);
+		}
 
-        if (!strcmp(buf, "cat >version.h <<EOF"))
-            until_eof = 1;
-    }
+		if (!strcmp(buf, "cat >version.h <<EOF"))
+			until_eof = 1;
+	}
 
 }
 
 void parse_line(FILE * fd, char *line)
 {
-    char *c;
-    for (c = line; *c; c++) {
-        /* It's a variable, find out which */
-        if (*c == '$') {
-            char *var, *varbegin;
-
-            if (*(c + 1))
-                c++;
-            else
-                continue;
-            for (var = varbegin = c; var; var++) {
-                if (!isalnum(*var) && *var != '_')
-                    break;
-            }
-            if (var != varbegin) {
-                char tmp = *var;
-
-                *var = 0;
-                if (!strcmp(varbegin, "VERSION_MAJOR"))
-                    fprintf(fd, "%ld", version_major);
-                else if (!strcmp(varbegin, "VERSION_MINOR"))
-                    fprintf(fd, "%ld", version_minor);
-                else if (!strcmp(varbegin, "VERSION_PATCH"))
-                    fprintf(fd, "%ld", version_patch);
-                else if (!strcmp(varbegin, "VERSION_EXTRA")) {
-                    if (version_extra)
-                        fprintf(fd, "%s", version_extra);
-                } else if (!strcmp(varbegin, "VERSION_BUILD"))
-                    fprintf(fd, "%ld", version_build);
-                else if (!strcmp(varbegin, "BUILD"))
-                    fprintf(fd, "%ld", build);
-                else if (!strcmp(varbegin, "VERSION"))
-                    fprintf(fd, "%s", version);
-                else if (!strcmp(varbegin, "VERSIONDOTTED"))
-                    fprintf(fd, "%s", version_dotted);
-                fputc(tmp, fd);
-            }
-            c = var;
-        } else
-            fputc(*c, fd);
-    }
+	char *c;
+	for (c = line; *c; c++) {
+		/* It's a variable, find out which */
+		if (*c == '$') {
+			char *var, *varbegin;
+
+			if (*(c + 1))
+				c++;
+			else
+				continue;
+			for (var = varbegin = c; var; var++) {
+				if (!isalnum(*var) && *var != '_')
+					break;
+			}
+			if (var != varbegin) {
+				char tmp = *var;
+
+				*var = 0;
+				if (!strcmp(varbegin, "VERSION_MAJOR"))
+					fprintf(fd, "%ld", version_major);
+				else if (!strcmp(varbegin, "VERSION_MINOR"))
+					fprintf(fd, "%ld", version_minor);
+				else if (!strcmp(varbegin, "VERSION_PATCH"))
+					fprintf(fd, "%ld", version_patch);
+				else if (!strcmp(varbegin, "VERSION_EXTRA")) {
+					if (version_extra)
+						fprintf(fd, "%s", version_extra);
+				} else if (!strcmp(varbegin, "VERSION_BUILD"))
+					fprintf(fd, "%ld", version_build);
+				else if (!strcmp(varbegin, "BUILD"))
+					fprintf(fd, "%ld", build);
+				else if (!strcmp(varbegin, "VERSION"))
+					fprintf(fd, "%s", version);
+				else if (!strcmp(varbegin, "VERSIONDOTTED"))
+					fprintf(fd, "%s", version_dotted);
+				fputc(tmp, fd);
+			}
+			c = var;
+		} else
+			fputc(*c, fd);
+	}
 	/* We only need \n here - we didn't open the file as binary -GD */
-    fprintf(fd, "\n");
+	fprintf(fd, "\n");
 }