Insane commit of doom: s/ \t/g

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

125 files changed, 12151 insertions, 12151 deletions

diff --git a/src/core/bs_act.c b/src/core/bs_act.c
index a5c8864da..87cd3d21d 100644
--- a/src/core/bs_act.c
+++ b/src/core/bs_act.c
@@ -23,15 +23,15 @@ class BSAct : public Module
  public:
 	BSAct(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
-	    Command *c;
+		Command *c;
 
-	    this->SetAuthor("Anope");
-	    this->SetVersion("$Id$");
-	    this->SetType(CORE);
-	    c = createCommand("ACT", do_act, NULL, BOT_HELP_ACT, -1, -1, -1, -1);
-	    this->AddCommand(BOTSERV, c, MOD_UNIQUE);
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
+		this->SetType(CORE);
+		c = createCommand("ACT", do_act, NULL, BOT_HELP_ACT, -1, -1, -1, -1);
+		this->AddCommand(BOTSERV, c, MOD_UNIQUE);
 
-	    moduleSetBotHelp(myBotServHelp);
+		moduleSetBotHelp(myBotServHelp);
 	}
 };
 
@@ -42,7 +42,7 @@ class BSAct : public Module
  **/
 void myBotServHelp(User * u)
 {
-    notice_lang(s_BotServ, u, BOT_HELP_CMD_ACT);
+	notice_lang(s_BotServ, u, BOT_HELP_CMD_ACT);
 }
 
 /**
@@ -52,32 +52,32 @@ void myBotServHelp(User * u)
  **/
 int do_act(User * u)
 {
-    ChannelInfo *ci;
+	ChannelInfo *ci;
 
-    char *chan = strtok(NULL, " ");
-    char *text = strtok(NULL, "");
+	char *chan = strtok(NULL, " ");
+	char *text = strtok(NULL, "");
 
-    if (!chan || !text)
-        syntax_error(s_BotServ, u, "ACT", BOT_ACT_SYNTAX);
-    else if (!(ci = cs_findchan(chan)))
-        notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
-    else if (ci->flags & CI_VERBOTEN)
-        notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
-    else if (!ci->bi)
-        notice_help(s_BotServ, u, BOT_NOT_ASSIGNED);
-    else if (!ci->c || ci->c->usercount < BSMinUsers)
-        notice_lang(s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name);
-    else if (!check_access(u, ci, CA_SAY))
-        notice_lang(s_BotServ, u, ACCESS_DENIED);
-    else {
-        strnrepl(text, BUFSIZE, "\001", "");
-        ircdproto->SendAction(ci->bi, ci->name, "%s", text);
-        ci->bi->lastmsg = time(NULL);
-        if (LogBot && LogChannel && logchan && !debug && findchan(LogChannel))
-            ircdproto->SendPrivmsg(ci->bi, LogChannel, "ACT %s %s %s",
-                              u->nick, ci->name, text);
-    }
-    return MOD_CONT;
+	if (!chan || !text)
+		syntax_error(s_BotServ, u, "ACT", BOT_ACT_SYNTAX);
+	else if (!(ci = cs_findchan(chan)))
+		notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
+	else if (ci->flags & CI_VERBOTEN)
+		notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
+	else if (!ci->bi)
+		notice_help(s_BotServ, u, BOT_NOT_ASSIGNED);
+	else if (!ci->c || ci->c->usercount < BSMinUsers)
+		notice_lang(s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name);
+	else if (!check_access(u, ci, CA_SAY))
+		notice_lang(s_BotServ, u, ACCESS_DENIED);
+	else {
+		strnrepl(text, BUFSIZE, "\001", "");
+		ircdproto->SendAction(ci->bi, ci->name, "%s", text);
+		ci->bi->lastmsg = time(NULL);
+		if (LogBot && LogChannel && logchan && !debug && findchan(LogChannel))
+			ircdproto->SendPrivmsg(ci->bi, LogChannel, "ACT %s %s %s",
+							  u->nick, ci->name, text);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("bs_act", BSAct)
diff --git a/src/core/bs_assign.c b/src/core/bs_assign.c
index 7cb6e3887..030a3c215 100644
--- a/src/core/bs_assign.c
+++ b/src/core/bs_assign.c
@@ -41,7 +41,7 @@ class BSAssign : public Module
  **/
 void myBotServHelp(User * u)
 {
-    notice_lang(s_BotServ, u, BOT_HELP_CMD_ASSIGN);
+	notice_lang(s_BotServ, u, BOT_HELP_CMD_ASSIGN);
 }
 
 /**
@@ -51,33 +51,33 @@ void myBotServHelp(User * u)
  **/
 int do_assign(User * u)
 {
-    char *chan = strtok(NULL, " ");
-    char *nick = strtok(NULL, " ");
-    BotInfo *bi;
-    ChannelInfo *ci;
+	char *chan = strtok(NULL, " ");
+	char *nick = strtok(NULL, " ");
+	BotInfo *bi;
+	ChannelInfo *ci;
 
-    if (readonly)
-        notice_lang(s_BotServ, u, BOT_ASSIGN_READONLY);
-    else if (!chan || !nick)
-        syntax_error(s_BotServ, u, "ASSIGN", BOT_ASSIGN_SYNTAX);
-    else if (!(bi = findbot(nick)))
-        notice_lang(s_BotServ, u, BOT_DOES_NOT_EXIST, nick);
-    else if (bi->flags & BI_PRIVATE && !is_oper(u))
-        notice_lang(s_BotServ, u, PERMISSION_DENIED);
-    else if (!(ci = cs_findchan(chan)))
-        notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
-    else if (ci->flags & CI_VERBOTEN)
-        notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
-    else if ((ci->bi) && (stricmp(ci->bi->nick, nick) == 0))
-        notice_lang(s_BotServ, u, BOT_ASSIGN_ALREADY, ci->bi->nick, chan);
-    else if ((ci->botflags & BS_NOBOT)
-             || (!check_access(u, ci, CA_ASSIGN) && !is_services_admin(u)))
-        notice_lang(s_BotServ, u, PERMISSION_DENIED);
-    else {
+	if (readonly)
+		notice_lang(s_BotServ, u, BOT_ASSIGN_READONLY);
+	else if (!chan || !nick)
+		syntax_error(s_BotServ, u, "ASSIGN", BOT_ASSIGN_SYNTAX);
+	else if (!(bi = findbot(nick)))
+		notice_lang(s_BotServ, u, BOT_DOES_NOT_EXIST, nick);
+	else if (bi->flags & BI_PRIVATE && !is_oper(u))
+		notice_lang(s_BotServ, u, PERMISSION_DENIED);
+	else if (!(ci = cs_findchan(chan)))
+		notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
+	else if (ci->flags & CI_VERBOTEN)
+		notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
+	else if ((ci->bi) && (stricmp(ci->bi->nick, nick) == 0))
+		notice_lang(s_BotServ, u, BOT_ASSIGN_ALREADY, ci->bi->nick, chan);
+	else if ((ci->botflags & BS_NOBOT)
+			 || (!check_access(u, ci, CA_ASSIGN) && !is_services_admin(u)))
+		notice_lang(s_BotServ, u, PERMISSION_DENIED);
+	else {
 		bi->Assign(u, ci);
-        notice_lang(s_BotServ, u, BOT_ASSIGN_ASSIGNED, bi->nick, ci->name);
-    }
-    return MOD_CONT;
+		notice_lang(s_BotServ, u, BOT_ASSIGN_ASSIGNED, bi->nick, ci->name);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("bs_assign", BSAssign)
diff --git a/src/core/bs_badwords.c b/src/core/bs_badwords.c
index 65190c286..e1518c51c 100644
--- a/src/core/bs_badwords.c
+++ b/src/core/bs_badwords.c
@@ -46,7 +46,7 @@ class BSBadwords : public Module
  **/
 void myBotServHelp(User * u)
 {
-    notice_lang(s_BotServ, u, BOT_HELP_CMD_BADWORDS);
+	notice_lang(s_BotServ, u, BOT_HELP_CMD_BADWORDS);
 }
 
 /**
@@ -56,259 +56,259 @@ void myBotServHelp(User * u)
  **/
 int do_badwords(User * u)
 {
-    char *chan = strtok(NULL, " ");
-    char *cmd = strtok(NULL, " ");
-    char *word = strtok(NULL, "");
-    ChannelInfo *ci;
-    BadWord *bw;
-
-    int i;
-    int need_args = (cmd
-                     && (!stricmp(cmd, "LIST") || !stricmp(cmd, "CLEAR")));
-
-    if (!cmd || (need_args ? 0 : !word)) {
-        syntax_error(s_BotServ, u, "BADWORDS", BOT_BADWORDS_SYNTAX);
-    } else if (!(ci = cs_findchan(chan))) {
-        notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
-    } else if (ci->flags & CI_VERBOTEN) {
-        notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
-    } else if (!check_access(u, ci, CA_BADWORDS)
-               && (!need_args || !is_services_admin(u))) {
-        notice_lang(s_BotServ, u, ACCESS_DENIED);
-    } else if (stricmp(cmd, "ADD") == 0) {
-
-        char *opt, *pos;
-        int type = BW_ANY;
-
-        if (readonly) {
-            notice_lang(s_BotServ, u, BOT_BADWORDS_DISABLED);
-            return MOD_CONT;
-        }
-
-        pos = strrchr(word, ' ');
-        if (pos) {
-            opt = pos + 1;
-            if (*opt) {
-                if (!stricmp(opt, "SINGLE"))
-                    type = BW_SINGLE;
-                else if (!stricmp(opt, "START"))
-                    type = BW_START;
-                else if (!stricmp(opt, "END"))
-                    type = BW_END;
-                if (type != BW_ANY)
-                    *pos = 0;
-            }
-        }
-
-        for (bw = ci->badwords, i = 0; i < ci->bwcount; bw++, i++) {
-            if (bw->word && ((BSCaseSensitive && (!strcmp(bw->word, word)))
-                             || (!BSCaseSensitive
-                                 && (!stricmp(bw->word, word))))) {
-                notice_lang(s_BotServ, u, BOT_BADWORDS_ALREADY_EXISTS,
-                            bw->word, ci->name);
-                return MOD_CONT;
-            }
-        }
-
-        for (i = 0; i < ci->bwcount; i++) {
-            if (!ci->badwords[i].in_use)
-                break;
-        }
-        if (i == ci->bwcount) {
-            if (i < BSBadWordsMax) {
-                ci->bwcount++;
-                ci->badwords =
-                    (BadWord *)srealloc(ci->badwords, sizeof(BadWord) * ci->bwcount);
-            } else {
-                notice_lang(s_BotServ, u, BOT_BADWORDS_REACHED_LIMIT,
-                            BSBadWordsMax);
-                return MOD_CONT;
-            }
-        }
-        bw = &ci->badwords[i];
-        bw->in_use = 1;
-        bw->word = sstrdup(word);
-        bw->type = type;
-
-        notice_lang(s_BotServ, u, BOT_BADWORDS_ADDED, bw->word, ci->name);
-
-    } else if (stricmp(cmd, "DEL") == 0) {
-        int deleted = 0, a, b;
-
-        if (readonly) {
-            notice_lang(s_BotServ, u, BOT_BADWORDS_DISABLED);
-            return MOD_CONT;
-        }
-
-        /* Special case: is it a number/list?  Only do search if it isn't. */
-        if (isdigit(*word) && strspn(word, "1234567890,-") == strlen(word)) {
-            int count, last = -1;
-            deleted =
-                process_numlist(word, &count, badwords_del_callback, u, ci,
-                                &last);
-            if (!deleted) {
-                if (count == 1) {
-                    notice_lang(s_BotServ, u, BOT_BADWORDS_NO_SUCH_ENTRY,
-                                last, ci->name);
-                } else {
-                    notice_lang(s_BotServ, u, BOT_BADWORDS_NO_MATCH,
-                                ci->name);
-                }
-            } else if (deleted == 1) {
-                notice_lang(s_BotServ, u, BOT_BADWORDS_DELETED_ONE,
-                            ci->name);
-            } else {
-                notice_lang(s_BotServ, u, BOT_BADWORDS_DELETED_SEVERAL,
-                            deleted, ci->name);
-            }
-        } else {
-            for (i = 0; i < ci->bwcount; i++) {
-                if (ci->badwords[i].in_use
-                    && !stricmp(ci->badwords[i].word, word))
-                    break;
-            }
-            if (i == ci->bwcount) {
-                notice_lang(s_BotServ, u, BOT_BADWORDS_NOT_FOUND, word,
-                            chan);
-                return MOD_CONT;
-            }
-            bw = &ci->badwords[i];
-            notice_lang(s_BotServ, u, BOT_BADWORDS_DELETED, bw->word,
-                        ci->name);
-            if (bw->word)
-                free(bw->word);
-            bw->word = NULL;
-            bw->in_use = 0;
-            deleted = 1;
-        }
-
-        if (deleted) {
-            /* Reordering - DrStein */
-            for (b = 0; b < ci->bwcount; b++) {
-                if (ci->badwords[b].in_use) {
-                    for (a = 0; a < ci->bwcount; a++) {
-                        if (a > b)
-                            break;
-                        if (!(ci->badwords[a].in_use)) {
-                            ci->badwords[a].in_use = ci->badwords[b].in_use;
-                            ci->badwords[a].type = ci->badwords[b].type;
-                            if (ci->badwords[b].word) {
-                                ci->badwords[a].word = sstrdup(ci->badwords[b].word);
-                                free(ci->badwords[b].word);
-                            }
-                            ci->badwords[b].word = NULL;
-                            ci->badwords[b].in_use = 0;
-                            break;
-                        }
-                    }
-                }
-            }
-            /* After reordering only the entries at the end could still be empty.
-             * We ll free the places no longer in use... - Viper */
-            for (i = ci->bwcount - 1; i >= 0; i--) {
-                if (ci->badwords[i].in_use)
-                    break;
-                ci->bwcount--;
-            }
-            ci->badwords =
-                (BadWord *)srealloc(ci->badwords,sizeof(BadWord) * ci->bwcount);
-        }
-
-    } else if (stricmp(cmd, "LIST") == 0) {
-        int sent_header = 0;
-
-        if (ci->bwcount == 0) {
-            notice_lang(s_BotServ, u, BOT_BADWORDS_LIST_EMPTY, chan);
-            return MOD_CONT;
-        }
-        if (word && strspn(word, "1234567890,-") == strlen(word)) {
-            process_numlist(word, NULL, badwords_list_callback, u, ci,
-                            &sent_header);
-        } else {
-            for (i = 0; i < ci->bwcount; i++) {
-                if (!(ci->badwords[i].in_use))
-                    continue;
-                if (word && ci->badwords[i].word
-                    && !match_wild_nocase(word, ci->badwords[i].word))
-                    continue;
-                badwords_list(u, i, ci, &sent_header);
-            }
-        }
-        if (!sent_header)
-            notice_lang(s_BotServ, u, BOT_BADWORDS_NO_MATCH, chan);
-
-    } else if (stricmp(cmd, "CLEAR") == 0) {
-
-        if (readonly) {
-            notice_lang(s_BotServ, u, BOT_BADWORDS_DISABLED);
-            return MOD_CONT;
-        }
-
-        for (i = 0; i < ci->bwcount; i++)
-            if (ci->badwords[i].word)
-                free(ci->badwords[i].word);
-
-        free(ci->badwords);
-        ci->badwords = NULL;
-        ci->bwcount = 0;
-
-        notice_lang(s_BotServ, u, BOT_BADWORDS_CLEAR);
-
-    } else {
-        syntax_error(s_BotServ, u, "BADWORDS", BOT_BADWORDS_SYNTAX);
-    }
-    return MOD_CONT;
+	char *chan = strtok(NULL, " ");
+	char *cmd = strtok(NULL, " ");
+	char *word = strtok(NULL, "");
+	ChannelInfo *ci;
+	BadWord *bw;
+
+	int i;
+	int need_args = (cmd
+					 && (!stricmp(cmd, "LIST") || !stricmp(cmd, "CLEAR")));
+
+	if (!cmd || (need_args ? 0 : !word)) {
+		syntax_error(s_BotServ, u, "BADWORDS", BOT_BADWORDS_SYNTAX);
+	} else if (!(ci = cs_findchan(chan))) {
+		notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
+	} else if (ci->flags & CI_VERBOTEN) {
+		notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
+	} else if (!check_access(u, ci, CA_BADWORDS)
+			   && (!need_args || !is_services_admin(u))) {
+		notice_lang(s_BotServ, u, ACCESS_DENIED);
+	} else if (stricmp(cmd, "ADD") == 0) {
+
+		char *opt, *pos;
+		int type = BW_ANY;
+
+		if (readonly) {
+			notice_lang(s_BotServ, u, BOT_BADWORDS_DISABLED);
+			return MOD_CONT;
+		}
+
+		pos = strrchr(word, ' ');
+		if (pos) {
+			opt = pos + 1;
+			if (*opt) {
+				if (!stricmp(opt, "SINGLE"))
+					type = BW_SINGLE;
+				else if (!stricmp(opt, "START"))
+					type = BW_START;
+				else if (!stricmp(opt, "END"))
+					type = BW_END;
+				if (type != BW_ANY)
+					*pos = 0;
+			}
+		}
+
+		for (bw = ci->badwords, i = 0; i < ci->bwcount; bw++, i++) {
+			if (bw->word && ((BSCaseSensitive && (!strcmp(bw->word, word)))
+							 || (!BSCaseSensitive
+								 && (!stricmp(bw->word, word))))) {
+				notice_lang(s_BotServ, u, BOT_BADWORDS_ALREADY_EXISTS,
+							bw->word, ci->name);
+				return MOD_CONT;
+			}
+		}
+
+		for (i = 0; i < ci->bwcount; i++) {
+			if (!ci->badwords[i].in_use)
+				break;
+		}
+		if (i == ci->bwcount) {
+			if (i < BSBadWordsMax) {
+				ci->bwcount++;
+				ci->badwords =
+					(BadWord *)srealloc(ci->badwords, sizeof(BadWord) * ci->bwcount);
+			} else {
+				notice_lang(s_BotServ, u, BOT_BADWORDS_REACHED_LIMIT,
+							BSBadWordsMax);
+				return MOD_CONT;
+			}
+		}
+		bw = &ci->badwords[i];
+		bw->in_use = 1;
+		bw->word = sstrdup(word);
+		bw->type = type;
+
+		notice_lang(s_BotServ, u, BOT_BADWORDS_ADDED, bw->word, ci->name);
+
+	} else if (stricmp(cmd, "DEL") == 0) {
+		int deleted = 0, a, b;
+
+		if (readonly) {
+			notice_lang(s_BotServ, u, BOT_BADWORDS_DISABLED);
+			return MOD_CONT;
+		}
+
+		/* Special case: is it a number/list?  Only do search if it isn't. */
+		if (isdigit(*word) && strspn(word, "1234567890,-") == strlen(word)) {
+			int count, last = -1;
+			deleted =
+				process_numlist(word, &count, badwords_del_callback, u, ci,
+								&last);
+			if (!deleted) {
+				if (count == 1) {
+					notice_lang(s_BotServ, u, BOT_BADWORDS_NO_SUCH_ENTRY,
+								last, ci->name);
+				} else {
+					notice_lang(s_BotServ, u, BOT_BADWORDS_NO_MATCH,
+								ci->name);
+				}
+			} else if (deleted == 1) {
+				notice_lang(s_BotServ, u, BOT_BADWORDS_DELETED_ONE,
+							ci->name);
+			} else {
+				notice_lang(s_BotServ, u, BOT_BADWORDS_DELETED_SEVERAL,
+							deleted, ci->name);
+			}
+		} else {
+			for (i = 0; i < ci->bwcount; i++) {
+				if (ci->badwords[i].in_use
+					&& !stricmp(ci->badwords[i].word, word))
+					break;
+			}
+			if (i == ci->bwcount) {
+				notice_lang(s_BotServ, u, BOT_BADWORDS_NOT_FOUND, word,
+							chan);
+				return MOD_CONT;
+			}
+			bw = &ci->badwords[i];
+			notice_lang(s_BotServ, u, BOT_BADWORDS_DELETED, bw->word,
+						ci->name);
+			if (bw->word)
+				free(bw->word);
+			bw->word = NULL;
+			bw->in_use = 0;
+			deleted = 1;
+		}
+
+		if (deleted) {
+			/* Reordering - DrStein */
+			for (b = 0; b < ci->bwcount; b++) {
+				if (ci->badwords[b].in_use) {
+					for (a = 0; a < ci->bwcount; a++) {
+						if (a > b)
+							break;
+						if (!(ci->badwords[a].in_use)) {
+							ci->badwords[a].in_use = ci->badwords[b].in_use;
+							ci->badwords[a].type = ci->badwords[b].type;
+							if (ci->badwords[b].word) {
+								ci->badwords[a].word = sstrdup(ci->badwords[b].word);
+								free(ci->badwords[b].word);
+							}
+							ci->badwords[b].word = NULL;
+							ci->badwords[b].in_use = 0;
+							break;
+						}
+					}
+				}
+			}
+			/* After reordering only the entries at the end could still be empty.
+			 * We ll free the places no longer in use... - Viper */
+			for (i = ci->bwcount - 1; i >= 0; i--) {
+				if (ci->badwords[i].in_use)
+					break;
+				ci->bwcount--;
+			}
+			ci->badwords =
+				(BadWord *)srealloc(ci->badwords,sizeof(BadWord) * ci->bwcount);
+		}
+
+	} else if (stricmp(cmd, "LIST") == 0) {
+		int sent_header = 0;
+
+		if (ci->bwcount == 0) {
+			notice_lang(s_BotServ, u, BOT_BADWORDS_LIST_EMPTY, chan);
+			return MOD_CONT;
+		}
+		if (word && strspn(word, "1234567890,-") == strlen(word)) {
+			process_numlist(word, NULL, badwords_list_callback, u, ci,
+							&sent_header);
+		} else {
+			for (i = 0; i < ci->bwcount; i++) {
+				if (!(ci->badwords[i].in_use))
+					continue;
+				if (word && ci->badwords[i].word
+					&& !match_wild_nocase(word, ci->badwords[i].word))
+					continue;
+				badwords_list(u, i, ci, &sent_header);
+			}
+		}
+		if (!sent_header)
+			notice_lang(s_BotServ, u, BOT_BADWORDS_NO_MATCH, chan);
+
+	} else if (stricmp(cmd, "CLEAR") == 0) {
+
+		if (readonly) {
+			notice_lang(s_BotServ, u, BOT_BADWORDS_DISABLED);
+			return MOD_CONT;
+		}
+
+		for (i = 0; i < ci->bwcount; i++)
+			if (ci->badwords[i].word)
+				free(ci->badwords[i].word);
+
+		free(ci->badwords);
+		ci->badwords = NULL;
+		ci->bwcount = 0;
+
+		notice_lang(s_BotServ, u, BOT_BADWORDS_CLEAR);
+
+	} else {
+		syntax_error(s_BotServ, u, "BADWORDS", BOT_BADWORDS_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 int badwords_del_callback(User * u, int num, va_list args)
 {
-    BadWord *bw;
-    ChannelInfo *ci = va_arg(args, ChannelInfo *);
-    int *last = va_arg(args, int *);
+	BadWord *bw;
+	ChannelInfo *ci = va_arg(args, ChannelInfo *);
+	int *last = va_arg(args, int *);
 
-    *last = num;
+	*last = num;
 
-    if (num < 1 || num > ci->bwcount)
-        return 0;
+	if (num < 1 || num > ci->bwcount)
+		return 0;
 
-    bw = &ci->badwords[num - 1];
-    if (bw->word)
-        free(bw->word);
-    bw->word = NULL;
-    bw->in_use = 0;
+	bw = &ci->badwords[num - 1];
+	if (bw->word)
+		free(bw->word);
+	bw->word = NULL;
+	bw->in_use = 0;
 
-    return 1;
+	return 1;
 }
 
 int badwords_list(User * u, int index, ChannelInfo * ci, int *sent_header)
 {
-    BadWord *bw = &ci->badwords[index];
-
-    if (!bw->in_use)
-        return 0;
-    if (!*sent_header) {
-        notice_lang(s_BotServ, u, BOT_BADWORDS_LIST_HEADER, ci->name);
-        *sent_header = 1;
-    }
-
-    notice_lang(s_BotServ, u, BOT_BADWORDS_LIST_FORMAT, index + 1,
-                bw->word,
-                ((bw->type ==
-                  BW_SINGLE) ? "(SINGLE)" : ((bw->type ==
-                                              BW_START) ? "(START)"
-                                             : ((bw->type ==
-                                                 BW_END) ? "(END)" : "")))
-        );
-    return 1;
+	BadWord *bw = &ci->badwords[index];
+
+	if (!bw->in_use)
+		return 0;
+	if (!*sent_header) {
+		notice_lang(s_BotServ, u, BOT_BADWORDS_LIST_HEADER, ci->name);
+		*sent_header = 1;
+	}
+
+	notice_lang(s_BotServ, u, BOT_BADWORDS_LIST_FORMAT, index + 1,
+				bw->word,
+				((bw->type ==
+				  BW_SINGLE) ? "(SINGLE)" : ((bw->type ==
+											  BW_START) ? "(START)"
+											 : ((bw->type ==
+												 BW_END) ? "(END)" : "")))
+		);
+	return 1;
 }
 
 int badwords_list_callback(User * u, int num, va_list args)
 {
-    ChannelInfo *ci = va_arg(args, ChannelInfo *);
-    int *sent_header = va_arg(args, int *);
-    if (num < 1 || num > ci->bwcount)
-        return 0;
-    return badwords_list(u, num - 1, ci, sent_header);
+	ChannelInfo *ci = va_arg(args, ChannelInfo *);
+	int *sent_header = va_arg(args, int *);
+	if (num < 1 || num > ci->bwcount)
+		return 0;
+	return badwords_list(u, num - 1, ci, sent_header);
 }
 
 MODULE_INIT("bs_badwords", BSBadwords)
diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c
index 69f7e23a7..946dd2d96 100644
--- a/src/core/bs_bot.c
+++ b/src/core/bs_bot.c
@@ -43,9 +43,9 @@ class BSBot : public Module
  **/
 void myBotServHelp(User * u)
 {
-    if (is_services_admin(u)) {
-        notice_lang(s_BotServ, u, BOT_HELP_CMD_BOT);
-    }
+	if (is_services_admin(u)) {
+		notice_lang(s_BotServ, u, BOT_HELP_CMD_BOT);
+	}
 }
 
 /**
@@ -61,7 +61,7 @@ int do_bot(User * u)
 	
 	if (!cmd)
 	{
-        	syntax_error(s_BotServ, u, "BOT", BOT_BOT_SYNTAX);
+			syntax_error(s_BotServ, u, "BOT", BOT_BOT_SYNTAX);
 		return MOD_CONT;
 	}
 
diff --git a/src/core/bs_botlist.c b/src/core/bs_botlist.c
index 7173a7807..75cbe1a90 100644
--- a/src/core/bs_botlist.c
+++ b/src/core/bs_botlist.c
@@ -42,7 +42,7 @@ class BSBotList : public Module
  **/
 void myBotServHelp(User * u)
 {
-    notice_lang(s_BotServ, u, BOT_HELP_CMD_BOTLIST);
+	notice_lang(s_BotServ, u, BOT_HELP_CMD_BOTLIST);
 }
 
 /**
@@ -52,45 +52,45 @@ void myBotServHelp(User * u)
  **/
 int do_botlist(User * u)
 {
-    int i, count = 0;
-    BotInfo *bi;
+	int i, count = 0;
+	BotInfo *bi;
 
-    if (!nbots) {
-        notice_lang(s_BotServ, u, BOT_BOTLIST_EMPTY);
-        return MOD_CONT;
-    }
+	if (!nbots) {
+		notice_lang(s_BotServ, u, BOT_BOTLIST_EMPTY);
+		return MOD_CONT;
+	}
 
-    for (i = 0; i < 256; i++) {
-        for (bi = botlists[i]; bi; bi = bi->next) {
-            if (!(bi->flags & BI_PRIVATE)) {
-                if (!count)
-                    notice_lang(s_BotServ, u, BOT_BOTLIST_HEADER);
-                count++;
-                notice_user(s_BotServ, u, "   %-15s  (%s@%s)", bi->nick,
-                            bi->user, bi->host);
-            }
-        }
-    }
+	for (i = 0; i < 256; i++) {
+		for (bi = botlists[i]; bi; bi = bi->next) {
+			if (!(bi->flags & BI_PRIVATE)) {
+				if (!count)
+					notice_lang(s_BotServ, u, BOT_BOTLIST_HEADER);
+				count++;
+				notice_user(s_BotServ, u, "   %-15s  (%s@%s)", bi->nick,
+							bi->user, bi->host);
+			}
+		}
+	}
 
-    if (is_oper(u) && count < nbots) {
-        notice_lang(s_BotServ, u, BOT_BOTLIST_PRIVATE_HEADER);
+	if (is_oper(u) && count < nbots) {
+		notice_lang(s_BotServ, u, BOT_BOTLIST_PRIVATE_HEADER);
 
-        for (i = 0; i < 256; i++) {
-            for (bi = botlists[i]; bi; bi = bi->next) {
-                if (bi->flags & BI_PRIVATE) {
-                    notice_user(s_BotServ, u, "   %-15s  (%s@%s)",
-                                bi->nick, bi->user, bi->host);
-                    count++;
-                }
-            }
-        }
-    }
+		for (i = 0; i < 256; i++) {
+			for (bi = botlists[i]; bi; bi = bi->next) {
+				if (bi->flags & BI_PRIVATE) {
+					notice_user(s_BotServ, u, "   %-15s  (%s@%s)",
+								bi->nick, bi->user, bi->host);
+					count++;
+				}
+			}
+		}
+	}
 
-    if (!count)
-        notice_lang(s_BotServ, u, BOT_BOTLIST_EMPTY);
-    else
-        notice_lang(s_BotServ, u, BOT_BOTLIST_FOOTER, count);
-    return MOD_CONT;
+	if (!count)
+		notice_lang(s_BotServ, u, BOT_BOTLIST_EMPTY);
+	else
+		notice_lang(s_BotServ, u, BOT_BOTLIST_FOOTER, count);
+	return MOD_CONT;
 }
 
 MODULE_INIT("bs_botlist", BSBotList)
diff --git a/src/core/bs_fantasy.c b/src/core/bs_fantasy.c
index 20e7aaeb7..2885db065 100644
--- a/src/core/bs_fantasy.c
+++ b/src/core/bs_fantasy.c
@@ -48,40 +48,40 @@ void AnopeFini(void)
  **/
 int do_fantasy(int argc, char **argv)
 {
-    User *u;
-    ChannelInfo *ci;
-    CSModeUtil *util = csmodeutils;
-    char *target;
+	User *u;
+	ChannelInfo *ci;
+	CSModeUtil *util = csmodeutils;
+	char *target;
 
-    if (argc < 3)
-        return MOD_CONT;
+	if (argc < 3)
+		return MOD_CONT;
 
-    do {
-        if (stricmp(argv[0], util->bsname) == 0) {
-            /* This could have been moved to its own module

-               however it would require more coding to handle the pass holders

-               similar to how PROTECT is done 

-            */

-            if (!ircd->halfop) {

-                if (!stricmp(argv[0], "halfop") || !stricmp(argv[0], "dehalfop")) {

-                    return MOD_CONT;

-                }

-            }
-            u = finduser(argv[1]);
-            ci = cs_findchan(argv[2]);
-            if (!u || !ci)
-                return MOD_CONT;
+	do {
+		if (stricmp(argv[0], util->bsname) == 0) {
+			/* This could have been moved to its own module

+			   however it would require more coding to handle the pass holders

+			   similar to how PROTECT is done 

+			*/

+			if (!ircd->halfop) {

+				if (!stricmp(argv[0], "halfop") || !stricmp(argv[0], "dehalfop")) {

+					return MOD_CONT;

+				}

+			}
+			u = finduser(argv[1]);
+			ci = cs_findchan(argv[2]);
+			if (!u || !ci)
+				return MOD_CONT;
 
-            target = ((argc == 4) ? argv[3] : NULL);
+			target = ((argc == 4) ? argv[3] : NULL);
 
-            if (!target && check_access(u, ci, util->levelself))
-                bot_raw_mode(u, ci, util->mode, u->nick);
-            else if (target && check_access(u, ci, util->level))
-                bot_raw_mode(u, ci, util->mode, target);
-        }
-    } while ((++util)->name != NULL);
+			if (!target && check_access(u, ci, util->levelself))
+				bot_raw_mode(u, ci, util->mode, u->nick);
+			else if (target && check_access(u, ci, util->level))
+				bot_raw_mode(u, ci, util->mode, target);
+		}
+	} while ((++util)->name != NULL);
 
-    return MOD_CONT;
+	return MOD_CONT;
 }
 
 MODULE_INIT("bs_fantasy", BSFantasy)
diff --git a/src/core/bs_fantasy_kick.c b/src/core/bs_fantasy_kick.c
index e1e92e161..f5c3018b6 100644
--- a/src/core/bs_fantasy_kick.c
+++ b/src/core/bs_fantasy_kick.c
@@ -41,47 +41,47 @@ class BSFantasyKick : public Module
  **/
 int do_fantasy(int argc, char **argv)
 {
-    User *u, *u2;
-    ChannelInfo *ci;
-    char *target = NULL;
-    char *reason = NULL;
+	User *u, *u2;
+	ChannelInfo *ci;
+	char *target = NULL;
+	char *reason = NULL;
 
-    if (argc < 3)
-        return MOD_CONT;
+	if (argc < 3)
+		return MOD_CONT;
 
-    if ((stricmp(argv[0], "kick") == 0) || (stricmp(argv[0], "k") == 0)) {
-        u = finduser(argv[1]);
-        ci = cs_findchan(argv[2]);
-        if (!u || !ci)
-            return MOD_CONT;
+	if ((stricmp(argv[0], "kick") == 0) || (stricmp(argv[0], "k") == 0)) {
+		u = finduser(argv[1]);
+		ci = cs_findchan(argv[2]);
+		if (!u || !ci)
+			return MOD_CONT;
 
-        if (argc >= 4) {
-            target = myStrGetToken(argv[3], ' ', 0);
-            reason = myStrGetTokenRemainder(argv[3], ' ', 1);
-        }
-        if (!target && check_access(u, ci, CA_KICKME)) {
-            bot_raw_kick(u, ci, u->nick, "Requested");
-        } else if (target && check_access(u, ci, CA_KICK)) {
-            if (!stricmp(target, ci->bi->nick))
-                bot_raw_kick(u, ci, u->nick, "Oops!");
-            else {
-                u2 = finduser(target);
-                if (u2 && ci->c && is_on_chan(ci->c, u2)) {
-                    if (!reason && !is_protected(u2))
-                        bot_raw_kick(u, ci, target, "Requested");
-                    else if (!is_protected(u2))
-                        bot_raw_kick(u, ci, target, reason);
-                }
-            }
-        }
-    }
+		if (argc >= 4) {
+			target = myStrGetToken(argv[3], ' ', 0);
+			reason = myStrGetTokenRemainder(argv[3], ' ', 1);
+		}
+		if (!target && check_access(u, ci, CA_KICKME)) {
+			bot_raw_kick(u, ci, u->nick, "Requested");
+		} else if (target && check_access(u, ci, CA_KICK)) {
+			if (!stricmp(target, ci->bi->nick))
+				bot_raw_kick(u, ci, u->nick, "Oops!");
+			else {
+				u2 = finduser(target);
+				if (u2 && ci->c && is_on_chan(ci->c, u2)) {
+					if (!reason && !is_protected(u2))
+						bot_raw_kick(u, ci, target, "Requested");
+					else if (!is_protected(u2))
+						bot_raw_kick(u, ci, target, reason);
+				}
+			}
+		}
+	}
 
-    if (target)
-       free(target);
-    if (reason)
-       free(reason);
+	if (target)
+	   free(target);
+	if (reason)
+	   free(reason);
 
-    return MOD_CONT;
+	return MOD_CONT;
 }
 
 MODULE_INIT("bs_fantasy_kick", BSFantasyKick)
diff --git a/src/core/bs_fantasy_kickban.c b/src/core/bs_fantasy_kickban.c
index b0514ff84..1281d938b 100644
--- a/src/core/bs_fantasy_kickban.c
+++ b/src/core/bs_fantasy_kickban.c
@@ -42,48 +42,48 @@ class BSFantasyKickBan : public Module
  **/
 int do_fantasy(int argc, char **argv)
 {
-    User *u, *u2;
-    ChannelInfo *ci;
-    char *target = NULL;
-    char *reason = NULL;
+	User *u, *u2;
+	ChannelInfo *ci;
+	char *target = NULL;
+	char *reason = NULL;
 
-    if (argc < 3)
-        return MOD_CONT;
+	if (argc < 3)
+		return MOD_CONT;
 
-    if ((stricmp(argv[0], "kickban") == 0)
-        || (stricmp(argv[0], "kb") == 0)) {
-        u = finduser(argv[1]);
-        ci = cs_findchan(argv[2]);
-        if (!u || !ci)
-            return MOD_CONT;
+	if ((stricmp(argv[0], "kickban") == 0)
+		|| (stricmp(argv[0], "kb") == 0)) {
+		u = finduser(argv[1]);
+		ci = cs_findchan(argv[2]);
+		if (!u || !ci)
+			return MOD_CONT;
 
-        if (argc >= 4) {
-            target = myStrGetToken(argv[3], ' ', 0);
-            reason = myStrGetTokenRemainder(argv[3], ' ', 1);
-        }
-        if (!target && check_access(u, ci, CA_BANME)) {
-            bot_raw_ban(u, ci, u->nick, "Requested");
-        } else if (target && check_access(u, ci, CA_BAN)) {
-            if (stricmp(target, ci->bi->nick) == 0) {
-                bot_raw_ban(u, ci, u->nick, "Oops!");
-            } else {
-                u2 = finduser(target);
-                if (u2 && ci->c && is_on_chan(ci->c, u2)) {
-                    if (!reason && !is_protected(u2))
-                        bot_raw_ban(u, ci, target, "Requested");
-                    else if (!is_protected(u2))
-                        bot_raw_ban(u, ci, target, reason);
-                }
-            }
-        }
-    }
+		if (argc >= 4) {
+			target = myStrGetToken(argv[3], ' ', 0);
+			reason = myStrGetTokenRemainder(argv[3], ' ', 1);
+		}
+		if (!target && check_access(u, ci, CA_BANME)) {
+			bot_raw_ban(u, ci, u->nick, "Requested");
+		} else if (target && check_access(u, ci, CA_BAN)) {
+			if (stricmp(target, ci->bi->nick) == 0) {
+				bot_raw_ban(u, ci, u->nick, "Oops!");
+			} else {
+				u2 = finduser(target);
+				if (u2 && ci->c && is_on_chan(ci->c, u2)) {
+					if (!reason && !is_protected(u2))
+						bot_raw_ban(u, ci, target, "Requested");
+					else if (!is_protected(u2))
+						bot_raw_ban(u, ci, target, reason);
+				}
+			}
+		}
+	}
 
-    if (target)
-       free(target);
-    if (reason)
-       free(reason);
+	if (target)
+	   free(target);
+	if (reason)
+	   free(reason);
 
-    return MOD_CONT;
+	return MOD_CONT;
 }
 
 MODULE_INIT("bs_fantasy_kickban", BSFantasyKickBan)
diff --git a/src/core/bs_fantasy_owner.c b/src/core/bs_fantasy_owner.c
index 3501f6c08..b521baaa9 100644
--- a/src/core/bs_fantasy_owner.c
+++ b/src/core/bs_fantasy_owner.c
@@ -48,31 +48,31 @@ class BSFantasyOwner : public Module
  **/
 int do_fantasy(int argc, char **argv)
 {
-    User *u;
-    ChannelInfo *ci;
+	User *u;
+	ChannelInfo *ci;
 
-    if (argc < 3)
-        return MOD_CONT;
+	if (argc < 3)
+		return MOD_CONT;
 
-    if (stricmp(argv[0], "deowner") == 0) {
-        u = finduser(argv[1]);
-        ci = cs_findchan(argv[2]);
-        if (!u || !ci)
-            return MOD_CONT;
+	if (stricmp(argv[0], "deowner") == 0) {
+		u = finduser(argv[1]);
+		ci = cs_findchan(argv[2]);
+		if (!u || !ci)
+			return MOD_CONT;
 
-        if (is_founder(u, ci))
-            bot_raw_mode(u, ci, ircd->ownerunset, u->nick);
-    } else if (stricmp(argv[0], "owner") == 0) {
-        u = finduser(argv[1]);
-        ci = cs_findchan(argv[2]);
-        if (!u || !ci)
-            return MOD_CONT;
+		if (is_founder(u, ci))
+			bot_raw_mode(u, ci, ircd->ownerunset, u->nick);
+	} else if (stricmp(argv[0], "owner") == 0) {
+		u = finduser(argv[1]);
+		ci = cs_findchan(argv[2]);
+		if (!u || !ci)
+			return MOD_CONT;
 
-        if (is_founder(u, ci))
-            bot_raw_mode(u, ci, ircd->ownerset, u->nick);
-    }
+		if (is_founder(u, ci))
+			bot_raw_mode(u, ci, ircd->ownerset, u->nick);
+	}
 
-    return MOD_CONT;
+	return MOD_CONT;
 }
 
 MODULE_INIT("bs_fantasy_owner", BSFantasyOwner)
diff --git a/src/core/bs_fantasy_seen.c b/src/core/bs_fantasy_seen.c
index 5173a7695..76e9a0273 100644
--- a/src/core/bs_fantasy_seen.c
+++ b/src/core/bs_fantasy_seen.c
@@ -49,88 +49,88 @@ void AnopeFini(void)
  **/
 int do_fantasy(int argc, char **argv)
 {
-    User *u;
-    ChannelInfo *ci;
-    User *u2;
-    NickAlias *na;
-    ChanAccess *access;
-    char buf[BUFSIZE];
-    char *target = NULL;
+	User *u;
+	ChannelInfo *ci;
+	User *u2;
+	NickAlias *na;
+	ChanAccess *access;
+	char buf[BUFSIZE];
+	char *target = NULL;
 
-    if (argc < 4)
-        return MOD_CONT;
+	if (argc < 4)
+		return MOD_CONT;
 
-    if (stricmp(argv[0], "seen") == 0) {
-        u = finduser(argv[1]);
-        ci = cs_findchan(argv[2]);
-        if (!u || !ci)
-            return MOD_CONT;
+	if (stricmp(argv[0], "seen") == 0) {
+		u = finduser(argv[1]);
+		ci = cs_findchan(argv[2]);
+		if (!u || !ci)
+			return MOD_CONT;
 
-        target = myStrGetToken(argv[3], ' ', 0);
+		target = myStrGetToken(argv[3], ' ', 0);
 
-        if (stricmp(ci->bi->nick, target) == 0) {
-            /* If we look for the bot */
-            snprintf(buf, sizeof(buf), getstring(u->na, BOT_SEEN_BOT),
-                     u->nick);
-            ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", buf);
-        } else if (!(na = findnick(target)) || (na->status & NS_VERBOTEN)) {
-            /* If the nick is not registered or forbidden */
-            snprintf(buf, sizeof(buf), getstring(u->na, BOT_SEEN_UNKNOWN),
-                     target);
-            ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", buf);
-        } else if ((u2 = nc_on_chan(ci->c, na->nc))) {
-            /* If the nick we're looking for is on the channel,
-             * there are three possibilities: it's yourself,
-             * it's the nick we look for, it's an alias of the
-             * nick we look for.
-             */
-            if (u == u2 || (u->na && u->na->nc == na->nc))
-                snprintf(buf, sizeof(buf), getstring(u->na, BOT_SEEN_YOU),
-                         u->nick);
-            else if (!stricmp(u2->nick, target))
-                snprintf(buf, sizeof(buf),
-                         getstring(u->na, BOT_SEEN_ON_CHANNEL), u2->nick);
-            else
-                snprintf(buf, sizeof(buf),
-                         getstring(u->na, BOT_SEEN_ON_CHANNEL_AS), target,
-                         u2->nick);
+		if (stricmp(ci->bi->nick, target) == 0) {
+			/* If we look for the bot */
+			snprintf(buf, sizeof(buf), getstring(u->na, BOT_SEEN_BOT),
+					 u->nick);
+			ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", buf);
+		} else if (!(na = findnick(target)) || (na->status & NS_VERBOTEN)) {
+			/* If the nick is not registered or forbidden */
+			snprintf(buf, sizeof(buf), getstring(u->na, BOT_SEEN_UNKNOWN),
+					 target);
+			ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", buf);
+		} else if ((u2 = nc_on_chan(ci->c, na->nc))) {
+			/* If the nick we're looking for is on the channel,
+			 * there are three possibilities: it's yourself,
+			 * it's the nick we look for, it's an alias of the
+			 * nick we look for.
+			 */
+			if (u == u2 || (u->na && u->na->nc == na->nc))
+				snprintf(buf, sizeof(buf), getstring(u->na, BOT_SEEN_YOU),
+						 u->nick);
+			else if (!stricmp(u2->nick, target))
+				snprintf(buf, sizeof(buf),
+						 getstring(u->na, BOT_SEEN_ON_CHANNEL), u2->nick);
+			else
+				snprintf(buf, sizeof(buf),
+						 getstring(u->na, BOT_SEEN_ON_CHANNEL_AS), target,
+						 u2->nick);
 
-            ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", buf);
-        } else if ((access = get_access_entry(na->nc, ci))) {
-            /* User is on the access list but not present actually.
-               Special case: if access->last_seen is 0 it's that we
-               never seen the user.
-             */
-            if (access->last_seen) {
-                char durastr[192];
-                duration(u->na, durastr, sizeof(durastr),
-                         time(NULL) - access->last_seen);
-                snprintf(buf, sizeof(buf), getstring(u->na, BOT_SEEN_ON),
-                         target, durastr);
-            } else {
-                snprintf(buf, sizeof(buf),
-                         getstring(u->na, BOT_SEEN_NEVER), target);
-            }
-            ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", buf);
-        } else if (na->nc == ci->founder) {
-            /* User is the founder of the channel */
-            char durastr[192];
-            duration(u->na, durastr, sizeof(durastr),
-                     time(NULL) - na->last_seen);
-            snprintf(buf, sizeof(buf), getstring(u->na, BOT_SEEN_ON),
-                     target, durastr);
-            ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", buf);
-        } else {
-            /* All other cases */
-            snprintf(buf, sizeof(buf), getstring(u->na, BOT_SEEN_UNKNOWN),
-                     target);
-            ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", buf);
-        }
-        /* free myStrGetToken(ed) variable target (#851) */
-        Anope_Free(target);
-    }
+			ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", buf);
+		} else if ((access = get_access_entry(na->nc, ci))) {
+			/* User is on the access list but not present actually.
+			   Special case: if access->last_seen is 0 it's that we
+			   never seen the user.
+			 */
+			if (access->last_seen) {
+				char durastr[192];
+				duration(u->na, durastr, sizeof(durastr),
+						 time(NULL) - access->last_seen);
+				snprintf(buf, sizeof(buf), getstring(u->na, BOT_SEEN_ON),
+						 target, durastr);
+			} else {
+				snprintf(buf, sizeof(buf),
+						 getstring(u->na, BOT_SEEN_NEVER), target);
+			}
+			ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", buf);
+		} else if (na->nc == ci->founder) {
+			/* User is the founder of the channel */
+			char durastr[192];
+			duration(u->na, durastr, sizeof(durastr),
+					 time(NULL) - na->last_seen);
+			snprintf(buf, sizeof(buf), getstring(u->na, BOT_SEEN_ON),
+					 target, durastr);
+			ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", buf);
+		} else {
+			/* All other cases */
+			snprintf(buf, sizeof(buf), getstring(u->na, BOT_SEEN_UNKNOWN),
+					 target);
+			ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", buf);
+		}
+		/* free myStrGetToken(ed) variable target (#851) */
+		Anope_Free(target);
+	}
 
-    return MOD_CONT;
+	return MOD_CONT;
 }
 
 MODULE_INIT("bs_fantasy_seen", BSFantasySeen)
diff --git a/src/core/bs_help.c b/src/core/bs_help.c
index 3c807275c..d838f9d85 100644
--- a/src/core/bs_help.c
+++ b/src/core/bs_help.c
@@ -40,16 +40,16 @@ class BSHelp : public Module
  **/
 int do_help(User * u)
 {
-    char *cmd = strtok(NULL, "");
-
-    if (!cmd) {
-        notice_help(s_BotServ, u, BOT_HELP);
-        moduleDisplayHelp(4, u);
-        notice_help(s_BotServ, u, BOT_HELP_FOOTER, BSMinUsers);
-    } else {
-        mod_help_cmd(s_BotServ, u, BOTSERV, cmd);
-    }
-    return MOD_CONT;
+	char *cmd = strtok(NULL, "");
+
+	if (!cmd) {
+		notice_help(s_BotServ, u, BOT_HELP);
+		moduleDisplayHelp(4, u);
+		notice_help(s_BotServ, u, BOT_HELP_FOOTER, BSMinUsers);
+	} else {
+		mod_help_cmd(s_BotServ, u, BOTSERV, cmd);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("bs_help", BSHelp)
diff --git a/src/core/bs_info.c b/src/core/bs_info.c
index ce802db3c..d3590f624 100644
--- a/src/core/bs_info.c
+++ b/src/core/bs_info.c
@@ -43,7 +43,7 @@ class BSInfo : public Module
  **/
 void myBotServHelp(User * u)
 {
-    notice_lang(s_BotServ, u, BOT_HELP_CMD_INFO);
+	notice_lang(s_BotServ, u, BOT_HELP_CMD_INFO);
 }
 
 /**
@@ -53,217 +53,217 @@ void myBotServHelp(User * u)
  **/
 int do_info(User * u)
 {
-    BotInfo *bi;
-    ChannelInfo *ci;
-    char *query = strtok(NULL, " ");
+	BotInfo *bi;
+	ChannelInfo *ci;
+	char *query = strtok(NULL, " ");
 
-    int need_comma = 0, is_servadmin = is_services_admin(u);
-    char buf[BUFSIZE], *end;
-    const char *commastr = getstring(u->na, COMMA_SPACE);
+	int need_comma = 0, is_servadmin = is_services_admin(u);
+	char buf[BUFSIZE], *end;
+	const char *commastr = getstring(u->na, COMMA_SPACE);
 
-    if (!query)
-        syntax_error(s_BotServ, u, "INFO", BOT_INFO_SYNTAX);
-    else if ((bi = findbot(query))) {
-        struct tm *tm;
+	if (!query)
+		syntax_error(s_BotServ, u, "INFO", BOT_INFO_SYNTAX);
+	else if ((bi = findbot(query))) {
+		struct tm *tm;
 
-        notice_lang(s_BotServ, u, BOT_INFO_BOT_HEADER, bi->nick);
-        notice_lang(s_BotServ, u, BOT_INFO_BOT_MASK, bi->user, bi->host);
-        notice_lang(s_BotServ, u, BOT_INFO_BOT_REALNAME, bi->real);
-        tm = localtime(&bi->created);
-        strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm);
-        notice_lang(s_BotServ, u, BOT_INFO_BOT_CREATED, buf);
-        notice_lang(s_BotServ, u, BOT_INFO_BOT_OPTIONS,
-                    getstring(u->na,
-                              (bi->
-                               flags & BI_PRIVATE) ? BOT_INFO_OPT_PRIVATE :
-                              BOT_INFO_OPT_NONE));
-        notice_lang(s_BotServ, u, BOT_INFO_BOT_USAGE, bi->chancount);
+		notice_lang(s_BotServ, u, BOT_INFO_BOT_HEADER, bi->nick);
+		notice_lang(s_BotServ, u, BOT_INFO_BOT_MASK, bi->user, bi->host);
+		notice_lang(s_BotServ, u, BOT_INFO_BOT_REALNAME, bi->real);
+		tm = localtime(&bi->created);
+		strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm);
+		notice_lang(s_BotServ, u, BOT_INFO_BOT_CREATED, buf);
+		notice_lang(s_BotServ, u, BOT_INFO_BOT_OPTIONS,
+					getstring(u->na,
+							  (bi->
+							   flags & BI_PRIVATE) ? BOT_INFO_OPT_PRIVATE :
+							  BOT_INFO_OPT_NONE));
+		notice_lang(s_BotServ, u, BOT_INFO_BOT_USAGE, bi->chancount);
 
-        if (is_services_admin(u))
-            send_bot_channels(u, bi);
-    } else if ((ci = cs_findchan(query))) {
-        if (!is_servadmin && !is_founder(u, ci)) {
-            notice_lang(s_BotServ, u, PERMISSION_DENIED);
-            return MOD_CONT;
-        }
-        if (ci->flags & CI_VERBOTEN) {
-            notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, query);
-            return MOD_CONT;
-        }
+		if (is_services_admin(u))
+			send_bot_channels(u, bi);
+	} else if ((ci = cs_findchan(query))) {
+		if (!is_servadmin && !is_founder(u, ci)) {
+			notice_lang(s_BotServ, u, PERMISSION_DENIED);
+			return MOD_CONT;
+		}
+		if (ci->flags & CI_VERBOTEN) {
+			notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, query);
+			return MOD_CONT;
+		}
 
-        notice_lang(s_BotServ, u, BOT_INFO_CHAN_HEADER, ci->name);
-        if (ci->bi)
-            notice_lang(s_BotServ, u, BOT_INFO_CHAN_BOT, ci->bi->nick);
-        else
-            notice_lang(s_BotServ, u, BOT_INFO_CHAN_BOT_NONE);
+		notice_lang(s_BotServ, u, BOT_INFO_CHAN_HEADER, ci->name);
+		if (ci->bi)
+			notice_lang(s_BotServ, u, BOT_INFO_CHAN_BOT, ci->bi->nick);
+		else
+			notice_lang(s_BotServ, u, BOT_INFO_CHAN_BOT_NONE);
 
-        if (ci->botflags & BS_KICK_BADWORDS) {
-            if (ci->ttb[TTB_BADWORDS])
-                notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_BADWORDS_BAN,
-                            getstring(u->na, BOT_INFO_ACTIVE),
-                            ci->ttb[TTB_BADWORDS]);
-            else
-                notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_BADWORDS,
-                            getstring(u->na, BOT_INFO_ACTIVE));
-        } else
-            notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_BADWORDS,
-                        getstring(u->na, BOT_INFO_INACTIVE));
-        if (ci->botflags & BS_KICK_BOLDS) {
-            if (ci->ttb[TTB_BOLDS])
-                notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_BOLDS_BAN,
-                            getstring(u->na, BOT_INFO_ACTIVE),
-                            ci->ttb[TTB_BOLDS]);
-            else
-                notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_BOLDS,
-                            getstring(u->na, BOT_INFO_ACTIVE));
-        } else
-            notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_BOLDS,
-                        getstring(u->na, BOT_INFO_INACTIVE));
-        if (ci->botflags & BS_KICK_CAPS) {
-            if (ci->ttb[TTB_CAPS])
-                notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_CAPS_BAN,
-                            getstring(u->na, BOT_INFO_ACTIVE),
-                            ci->ttb[TTB_CAPS], ci->capsmin,
-                            ci->capspercent);
-            else
-                notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_CAPS_ON,
-                            getstring(u->na, BOT_INFO_ACTIVE), ci->capsmin,
-                            ci->capspercent);
-        } else
-            notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_CAPS_OFF,
-                        getstring(u->na, BOT_INFO_INACTIVE));
-        if (ci->botflags & BS_KICK_COLORS) {
-            if (ci->ttb[TTB_COLORS])
-                notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_COLORS_BAN,
-                            getstring(u->na, BOT_INFO_ACTIVE),
-                            ci->ttb[TTB_COLORS]);
-            else
-                notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_COLORS,
-                            getstring(u->na, BOT_INFO_ACTIVE));
-        } else
-            notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_COLORS,
-                        getstring(u->na, BOT_INFO_INACTIVE));
-        if (ci->botflags & BS_KICK_FLOOD) {
-            if (ci->ttb[TTB_FLOOD])
-                notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_FLOOD_BAN,
-                            getstring(u->na, BOT_INFO_ACTIVE),
-                            ci->ttb[TTB_FLOOD], ci->floodlines,
-                            ci->floodsecs);
-            else
-                notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_FLOOD_ON,
-                            getstring(u->na, BOT_INFO_ACTIVE),
-                            ci->floodlines, ci->floodsecs);
-        } else
-            notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_FLOOD_OFF,
-                        getstring(u->na, BOT_INFO_INACTIVE));
-        if (ci->botflags & BS_KICK_REPEAT) {
-            if (ci->ttb[TTB_REPEAT])
-                notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_REPEAT_BAN,
-                            getstring(u->na, BOT_INFO_ACTIVE),
-                            ci->ttb[TTB_REPEAT], ci->repeattimes);
-            else
-                notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_REPEAT_ON,
-                            getstring(u->na, BOT_INFO_ACTIVE),
-                            ci->repeattimes);
-        } else
-            notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_REPEAT_OFF,
-                        getstring(u->na, BOT_INFO_INACTIVE));
-        if (ci->botflags & BS_KICK_REVERSES) {
-            if (ci->ttb[TTB_REVERSES])
-                notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_REVERSES_BAN,
-                            getstring(u->na, BOT_INFO_ACTIVE),
-                            ci->ttb[TTB_REVERSES]);
-            else
-                notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_REVERSES,
-                            getstring(u->na, BOT_INFO_ACTIVE));
-        } else
-            notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_REVERSES,
-                        getstring(u->na, BOT_INFO_INACTIVE));
-        if (ci->botflags & BS_KICK_UNDERLINES) {
-            if (ci->ttb[TTB_UNDERLINES])
-                notice_lang(s_BotServ, u,
-                            BOT_INFO_CHAN_KICK_UNDERLINES_BAN,
-                            getstring(u->na, BOT_INFO_ACTIVE),
-                            ci->ttb[TTB_UNDERLINES]);
-            else
-                notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_UNDERLINES,
-                            getstring(u->na, BOT_INFO_ACTIVE));
-        } else
-            notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_UNDERLINES,
-                        getstring(u->na, BOT_INFO_INACTIVE));
+		if (ci->botflags & BS_KICK_BADWORDS) {
+			if (ci->ttb[TTB_BADWORDS])
+				notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_BADWORDS_BAN,
+							getstring(u->na, BOT_INFO_ACTIVE),
+							ci->ttb[TTB_BADWORDS]);
+			else
+				notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_BADWORDS,
+							getstring(u->na, BOT_INFO_ACTIVE));
+		} else
+			notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_BADWORDS,
+						getstring(u->na, BOT_INFO_INACTIVE));
+		if (ci->botflags & BS_KICK_BOLDS) {
+			if (ci->ttb[TTB_BOLDS])
+				notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_BOLDS_BAN,
+							getstring(u->na, BOT_INFO_ACTIVE),
+							ci->ttb[TTB_BOLDS]);
+			else
+				notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_BOLDS,
+							getstring(u->na, BOT_INFO_ACTIVE));
+		} else
+			notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_BOLDS,
+						getstring(u->na, BOT_INFO_INACTIVE));
+		if (ci->botflags & BS_KICK_CAPS) {
+			if (ci->ttb[TTB_CAPS])
+				notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_CAPS_BAN,
+							getstring(u->na, BOT_INFO_ACTIVE),
+							ci->ttb[TTB_CAPS], ci->capsmin,
+							ci->capspercent);
+			else
+				notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_CAPS_ON,
+							getstring(u->na, BOT_INFO_ACTIVE), ci->capsmin,
+							ci->capspercent);
+		} else
+			notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_CAPS_OFF,
+						getstring(u->na, BOT_INFO_INACTIVE));
+		if (ci->botflags & BS_KICK_COLORS) {
+			if (ci->ttb[TTB_COLORS])
+				notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_COLORS_BAN,
+							getstring(u->na, BOT_INFO_ACTIVE),
+							ci->ttb[TTB_COLORS]);
+			else
+				notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_COLORS,
+							getstring(u->na, BOT_INFO_ACTIVE));
+		} else
+			notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_COLORS,
+						getstring(u->na, BOT_INFO_INACTIVE));
+		if (ci->botflags & BS_KICK_FLOOD) {
+			if (ci->ttb[TTB_FLOOD])
+				notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_FLOOD_BAN,
+							getstring(u->na, BOT_INFO_ACTIVE),
+							ci->ttb[TTB_FLOOD], ci->floodlines,
+							ci->floodsecs);
+			else
+				notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_FLOOD_ON,
+							getstring(u->na, BOT_INFO_ACTIVE),
+							ci->floodlines, ci->floodsecs);
+		} else
+			notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_FLOOD_OFF,
+						getstring(u->na, BOT_INFO_INACTIVE));
+		if (ci->botflags & BS_KICK_REPEAT) {
+			if (ci->ttb[TTB_REPEAT])
+				notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_REPEAT_BAN,
+							getstring(u->na, BOT_INFO_ACTIVE),
+							ci->ttb[TTB_REPEAT], ci->repeattimes);
+			else
+				notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_REPEAT_ON,
+							getstring(u->na, BOT_INFO_ACTIVE),
+							ci->repeattimes);
+		} else
+			notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_REPEAT_OFF,
+						getstring(u->na, BOT_INFO_INACTIVE));
+		if (ci->botflags & BS_KICK_REVERSES) {
+			if (ci->ttb[TTB_REVERSES])
+				notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_REVERSES_BAN,
+							getstring(u->na, BOT_INFO_ACTIVE),
+							ci->ttb[TTB_REVERSES]);
+			else
+				notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_REVERSES,
+							getstring(u->na, BOT_INFO_ACTIVE));
+		} else
+			notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_REVERSES,
+						getstring(u->na, BOT_INFO_INACTIVE));
+		if (ci->botflags & BS_KICK_UNDERLINES) {
+			if (ci->ttb[TTB_UNDERLINES])
+				notice_lang(s_BotServ, u,
+							BOT_INFO_CHAN_KICK_UNDERLINES_BAN,
+							getstring(u->na, BOT_INFO_ACTIVE),
+							ci->ttb[TTB_UNDERLINES]);
+			else
+				notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_UNDERLINES,
+							getstring(u->na, BOT_INFO_ACTIVE));
+		} else
+			notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_UNDERLINES,
+						getstring(u->na, BOT_INFO_INACTIVE));
 
-        end = buf;
-        *end = 0;
-        if (ci->botflags & BS_DONTKICKOPS) {
-            end += snprintf(end, sizeof(buf) - (end - buf), "%s",
-                            getstring(u->na, BOT_INFO_OPT_DONTKICKOPS));
-            need_comma = 1;
-        }
-        if (ci->botflags & BS_DONTKICKVOICES) {
-            end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
-                            need_comma ? commastr : "",
-                            getstring(u->na, BOT_INFO_OPT_DONTKICKVOICES));
-            need_comma = 1;
-        }
-        if (ci->botflags & BS_FANTASY) {
-            end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
-                            need_comma ? commastr : "",
-                            getstring(u->na, BOT_INFO_OPT_FANTASY));
-            need_comma = 1;
-        }
-        if (ci->botflags & BS_GREET) {
-            end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
-                            need_comma ? commastr : "",
-                            getstring(u->na, BOT_INFO_OPT_GREET));
-            need_comma = 1;
-        }
-        if (ci->botflags & BS_NOBOT) {
-            end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
-                            need_comma ? commastr : "",
-                            getstring(u->na, BOT_INFO_OPT_NOBOT));
-            need_comma = 1;
-        }
-        if (ci->botflags & BS_SYMBIOSIS) {
-            end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
-                            need_comma ? commastr : "",
-                            getstring(u->na, BOT_INFO_OPT_SYMBIOSIS));
-            need_comma = 1;
-        }
-        notice_lang(s_BotServ, u, BOT_INFO_CHAN_OPTIONS,
-                    *buf ? buf : getstring(u->na, BOT_INFO_OPT_NONE));
+		end = buf;
+		*end = 0;
+		if (ci->botflags & BS_DONTKICKOPS) {
+			end += snprintf(end, sizeof(buf) - (end - buf), "%s",
+							getstring(u->na, BOT_INFO_OPT_DONTKICKOPS));
+			need_comma = 1;
+		}
+		if (ci->botflags & BS_DONTKICKVOICES) {
+			end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
+							need_comma ? commastr : "",
+							getstring(u->na, BOT_INFO_OPT_DONTKICKVOICES));
+			need_comma = 1;
+		}
+		if (ci->botflags & BS_FANTASY) {
+			end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
+							need_comma ? commastr : "",
+							getstring(u->na, BOT_INFO_OPT_FANTASY));
+			need_comma = 1;
+		}
+		if (ci->botflags & BS_GREET) {
+			end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
+							need_comma ? commastr : "",
+							getstring(u->na, BOT_INFO_OPT_GREET));
+			need_comma = 1;
+		}
+		if (ci->botflags & BS_NOBOT) {
+			end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
+							need_comma ? commastr : "",
+							getstring(u->na, BOT_INFO_OPT_NOBOT));
+			need_comma = 1;
+		}
+		if (ci->botflags & BS_SYMBIOSIS) {
+			end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
+							need_comma ? commastr : "",
+							getstring(u->na, BOT_INFO_OPT_SYMBIOSIS));
+			need_comma = 1;
+		}
+		notice_lang(s_BotServ, u, BOT_INFO_CHAN_OPTIONS,
+					*buf ? buf : getstring(u->na, BOT_INFO_OPT_NONE));
 
-    } else
-        notice_lang(s_BotServ, u, BOT_INFO_NOT_FOUND, query);
-    return MOD_CONT;
+	} else
+		notice_lang(s_BotServ, u, BOT_INFO_NOT_FOUND, query);
+	return MOD_CONT;
 }
 
 void send_bot_channels(User * u, BotInfo * bi)
 {
-    int i;
-    ChannelInfo *ci;
-    char buf[307], *end;
+	int i;
+	ChannelInfo *ci;
+	char buf[307], *end;
 
-    *buf = 0;
-    end = buf;
+	*buf = 0;
+	end = buf;
 
-    for (i = 0; i < 256; i++) {
-        for (ci = chanlists[i]; ci; ci = ci->next) {
-            if (ci->bi == bi) {
-                if (strlen(buf) + strlen(ci->name) > 300) {
-                    notice_user(s_BotServ, u, "%s", buf);
-                    *buf = 0;
-                    end = buf;
-                }
-                end +=
-                    snprintf(end, sizeof(buf) - (end - buf), " %s ",
-                             ci->name);
-            }
-        }
-    }
+	for (i = 0; i < 256; i++) {
+		for (ci = chanlists[i]; ci; ci = ci->next) {
+			if (ci->bi == bi) {
+				if (strlen(buf) + strlen(ci->name) > 300) {
+					notice_user(s_BotServ, u, "%s", buf);
+					*buf = 0;
+					end = buf;
+				}
+				end +=
+					snprintf(end, sizeof(buf) - (end - buf), " %s ",
+							 ci->name);
+			}
+		}
+	}
 
-    if (*buf)
-        notice_user(s_BotServ, u, "%s", buf);
-    return;
+	if (*buf)
+		notice_user(s_BotServ, u, "%s", buf);
+	return;
 }
 
 MODULE_INIT("bs_info", BSInfo)
diff --git a/src/core/bs_kick.c b/src/core/bs_kick.c
index fb48c9413..229b4dba2 100644
--- a/src/core/bs_kick.c
+++ b/src/core/bs_kick.c
@@ -59,7 +59,7 @@ class BSKick : public Module
  **/
 void myBotServHelp(User * u)
 {
-    notice_lang(s_BotServ, u, BOT_HELP_CMD_KICK);
+	notice_lang(s_BotServ, u, BOT_HELP_CMD_KICK);
 }
 
 /**
@@ -69,290 +69,290 @@ void myBotServHelp(User * u)
  **/
 int do_kickcmd(User * u)
 {
-    char *chan = strtok(NULL, " ");
-    char *option = strtok(NULL, " ");
-    char *value = strtok(NULL, " ");
-    char *ttb = strtok(NULL, " ");
+	char *chan = strtok(NULL, " ");
+	char *option = strtok(NULL, " ");
+	char *value = strtok(NULL, " ");
+	char *ttb = strtok(NULL, " ");
 
-    ChannelInfo *ci;
+	ChannelInfo *ci;
 
-    if (readonly)
-        notice_lang(s_BotServ, u, BOT_KICK_DISABLED);
-    else if (!chan || !option || !value)
-        syntax_error(s_BotServ, u, "KICK", BOT_KICK_SYNTAX);
-    else if (stricmp(value, "ON") && stricmp(value, "OFF"))
-        syntax_error(s_BotServ, u, "KICK", BOT_KICK_SYNTAX);
-    else if (!(ci = cs_findchan(chan)))
-        notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
-    else if (ci->flags & CI_VERBOTEN)
-        notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
-    else if (!is_services_admin(u) && !check_access(u, ci, CA_SET))
-        notice_lang(s_BotServ, u, ACCESS_DENIED);
-    else if (!ci->bi)
-        notice_help(s_BotServ, u, BOT_NOT_ASSIGNED);
-    else {
-        if (!stricmp(option, "BADWORDS")) {
-            if (!stricmp(value, "ON")) {
-                if (ttb) {
-                    ci->ttb[TTB_BADWORDS] =
-                        strtol(ttb, (char **) NULL, 10);
-                    /* Only error if errno returns ERANGE or EINVAL or we are less then 0 - TSL */
-                    if (errno == ERANGE || errno == EINVAL
-                        || ci->ttb[TTB_BADWORDS] < 0) {
-                        /* leaving the debug behind since we might want to know what these are */
-                        if (debug) {
-                            alog("debug: errno is %d ERANGE %d EINVAL %d ttb %d", errno, ERANGE, EINVAL, ci->ttb[TTB_BADWORDS]);
-                        }
-                        /* reset the value back to 0 - TSL */
-                        ci->ttb[TTB_BADWORDS] = 0;
-                        notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb);
-                        return MOD_CONT;
-                    }
-                } else {
-                    ci->ttb[TTB_BADWORDS] = 0;
-                }
-                ci->botflags |= BS_KICK_BADWORDS;
-                if (ci->ttb[TTB_BADWORDS])
-                    notice_lang(s_BotServ, u, BOT_KICK_BADWORDS_ON_BAN,
-                                ci->ttb[TTB_BADWORDS]);
-                else
-                    notice_lang(s_BotServ, u, BOT_KICK_BADWORDS_ON);
-            } else {
-                ci->botflags &= ~BS_KICK_BADWORDS;
-                notice_lang(s_BotServ, u, BOT_KICK_BADWORDS_OFF);
-            }
-        } else if (!stricmp(option, "BOLDS")) {
-            if (!stricmp(value, "ON")) {
-                if (ttb) {
-                    ci->ttb[TTB_BOLDS] = strtol(ttb, (char **) NULL, 10);
-                    if (errno == ERANGE || errno == EINVAL
-                        || ci->ttb[TTB_BOLDS] < 0) {
-                        if (debug) {
-                            alog("debug: errno is %d ERANGE %d EINVAL %d ttb %d", errno, ERANGE, EINVAL, ci->ttb[TTB_BOLDS]);
-                        }
-                        ci->ttb[TTB_BOLDS] = 0;
-                        notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb);
-                        return MOD_CONT;
-                    }
-                } else
-                    ci->ttb[TTB_BOLDS] = 0;
-                ci->botflags |= BS_KICK_BOLDS;
-                if (ci->ttb[TTB_BOLDS])
-                    notice_lang(s_BotServ, u, BOT_KICK_BOLDS_ON_BAN,
-                                ci->ttb[TTB_BOLDS]);
-                else
-                    notice_lang(s_BotServ, u, BOT_KICK_BOLDS_ON);
-            } else {
-                ci->botflags &= ~BS_KICK_BOLDS;
-                notice_lang(s_BotServ, u, BOT_KICK_BOLDS_OFF);
-            }
-        } else if (!stricmp(option, "CAPS")) {
-            if (!stricmp(value, "ON")) {
-                char *min = strtok(NULL, " ");
-                char *percent = strtok(NULL, " ");
+	if (readonly)
+		notice_lang(s_BotServ, u, BOT_KICK_DISABLED);
+	else if (!chan || !option || !value)
+		syntax_error(s_BotServ, u, "KICK", BOT_KICK_SYNTAX);
+	else if (stricmp(value, "ON") && stricmp(value, "OFF"))
+		syntax_error(s_BotServ, u, "KICK", BOT_KICK_SYNTAX);
+	else if (!(ci = cs_findchan(chan)))
+		notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
+	else if (ci->flags & CI_VERBOTEN)
+		notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
+	else if (!is_services_admin(u) && !check_access(u, ci, CA_SET))
+		notice_lang(s_BotServ, u, ACCESS_DENIED);
+	else if (!ci->bi)
+		notice_help(s_BotServ, u, BOT_NOT_ASSIGNED);
+	else {
+		if (!stricmp(option, "BADWORDS")) {
+			if (!stricmp(value, "ON")) {
+				if (ttb) {
+					ci->ttb[TTB_BADWORDS] =
+						strtol(ttb, (char **) NULL, 10);
+					/* Only error if errno returns ERANGE or EINVAL or we are less then 0 - TSL */
+					if (errno == ERANGE || errno == EINVAL
+						|| ci->ttb[TTB_BADWORDS] < 0) {
+						/* leaving the debug behind since we might want to know what these are */
+						if (debug) {
+							alog("debug: errno is %d ERANGE %d EINVAL %d ttb %d", errno, ERANGE, EINVAL, ci->ttb[TTB_BADWORDS]);
+						}
+						/* reset the value back to 0 - TSL */
+						ci->ttb[TTB_BADWORDS] = 0;
+						notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb);
+						return MOD_CONT;
+					}
+				} else {
+					ci->ttb[TTB_BADWORDS] = 0;
+				}
+				ci->botflags |= BS_KICK_BADWORDS;
+				if (ci->ttb[TTB_BADWORDS])
+					notice_lang(s_BotServ, u, BOT_KICK_BADWORDS_ON_BAN,
+								ci->ttb[TTB_BADWORDS]);
+				else
+					notice_lang(s_BotServ, u, BOT_KICK_BADWORDS_ON);
+			} else {
+				ci->botflags &= ~BS_KICK_BADWORDS;
+				notice_lang(s_BotServ, u, BOT_KICK_BADWORDS_OFF);
+			}
+		} else if (!stricmp(option, "BOLDS")) {
+			if (!stricmp(value, "ON")) {
+				if (ttb) {
+					ci->ttb[TTB_BOLDS] = strtol(ttb, (char **) NULL, 10);
+					if (errno == ERANGE || errno == EINVAL
+						|| ci->ttb[TTB_BOLDS] < 0) {
+						if (debug) {
+							alog("debug: errno is %d ERANGE %d EINVAL %d ttb %d", errno, ERANGE, EINVAL, ci->ttb[TTB_BOLDS]);
+						}
+						ci->ttb[TTB_BOLDS] = 0;
+						notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb);
+						return MOD_CONT;
+					}
+				} else
+					ci->ttb[TTB_BOLDS] = 0;
+				ci->botflags |= BS_KICK_BOLDS;
+				if (ci->ttb[TTB_BOLDS])
+					notice_lang(s_BotServ, u, BOT_KICK_BOLDS_ON_BAN,
+								ci->ttb[TTB_BOLDS]);
+				else
+					notice_lang(s_BotServ, u, BOT_KICK_BOLDS_ON);
+			} else {
+				ci->botflags &= ~BS_KICK_BOLDS;
+				notice_lang(s_BotServ, u, BOT_KICK_BOLDS_OFF);
+			}
+		} else if (!stricmp(option, "CAPS")) {
+			if (!stricmp(value, "ON")) {
+				char *min = strtok(NULL, " ");
+				char *percent = strtok(NULL, " ");
 
-                if (ttb) {
-                    ci->ttb[TTB_CAPS] = strtol(ttb, (char **) NULL, 10);
-                    if (errno == ERANGE || errno == EINVAL
-                        || ci->ttb[TTB_CAPS] < 0) {
-                        if (debug) {
-                            alog("debug: errno is %d ERANGE %d EINVAL %d ttb %d", errno, ERANGE, EINVAL, ci->ttb[TTB_CAPS]);
-                        }
-                        ci->ttb[TTB_CAPS] = 0;
-                        notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb);
-                        return MOD_CONT;
-                    }
-                } else
-                    ci->ttb[TTB_CAPS] = 0;
+				if (ttb) {
+					ci->ttb[TTB_CAPS] = strtol(ttb, (char **) NULL, 10);
+					if (errno == ERANGE || errno == EINVAL
+						|| ci->ttb[TTB_CAPS] < 0) {
+						if (debug) {
+							alog("debug: errno is %d ERANGE %d EINVAL %d ttb %d", errno, ERANGE, EINVAL, ci->ttb[TTB_CAPS]);
+						}
+						ci->ttb[TTB_CAPS] = 0;
+						notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb);
+						return MOD_CONT;
+					}
+				} else
+					ci->ttb[TTB_CAPS] = 0;
 
-                if (!min)
-                    ci->capsmin = 10;
-                else
-                    ci->capsmin = atol(min);
-                if (ci->capsmin < 1)
-                    ci->capsmin = 10;
+				if (!min)
+					ci->capsmin = 10;
+				else
+					ci->capsmin = atol(min);
+				if (ci->capsmin < 1)
+					ci->capsmin = 10;
 
-                if (!percent)
-                    ci->capspercent = 25;
-                else
-                    ci->capspercent = atol(percent);
-                if (ci->capspercent < 1 || ci->capspercent > 100)
-                    ci->capspercent = 25;
+				if (!percent)
+					ci->capspercent = 25;
+				else
+					ci->capspercent = atol(percent);
+				if (ci->capspercent < 1 || ci->capspercent > 100)
+					ci->capspercent = 25;
 
-                ci->botflags |= BS_KICK_CAPS;
-                if (ci->ttb[TTB_CAPS])
-                    notice_lang(s_BotServ, u, BOT_KICK_CAPS_ON_BAN,
-                                ci->capsmin, ci->capspercent,
-                                ci->ttb[TTB_CAPS]);
-                else
-                    notice_lang(s_BotServ, u, BOT_KICK_CAPS_ON,
-                                ci->capsmin, ci->capspercent);
-            } else {
-                ci->botflags &= ~BS_KICK_CAPS;
-                notice_lang(s_BotServ, u, BOT_KICK_CAPS_OFF);
-            }
-        } else if (!stricmp(option, "COLORS")) {
-            if (!stricmp(value, "ON")) {
-                if (ttb) {
-                    ci->ttb[TTB_COLORS] = strtol(ttb, (char **) NULL, 10);
-                    if (errno == ERANGE || errno == EINVAL
-                        || ci->ttb[TTB_COLORS] < 0) {
-                        if (debug) {
-                            alog("debug: errno is %d ERANGE %d EINVAL %d ttb %d", errno, ERANGE, EINVAL, ci->ttb[TTB_COLORS]);
-                        }
-                        ci->ttb[TTB_COLORS] = 0;
-                        notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb);
-                        return MOD_CONT;
-                    }
-                } else
-                    ci->ttb[TTB_COLORS] = 0;
-                ci->botflags |= BS_KICK_COLORS;
-                if (ci->ttb[TTB_COLORS])
-                    notice_lang(s_BotServ, u, BOT_KICK_COLORS_ON_BAN,
-                                ci->ttb[TTB_COLORS]);
-                else
-                    notice_lang(s_BotServ, u, BOT_KICK_COLORS_ON);
-            } else {
-                ci->botflags &= ~BS_KICK_COLORS;
-                notice_lang(s_BotServ, u, BOT_KICK_COLORS_OFF);
-            }
-        } else if (!stricmp(option, "FLOOD")) {
-            if (!stricmp(value, "ON")) {
-                char *lines = strtok(NULL, " ");
-                char *secs = strtok(NULL, " ");
+				ci->botflags |= BS_KICK_CAPS;
+				if (ci->ttb[TTB_CAPS])
+					notice_lang(s_BotServ, u, BOT_KICK_CAPS_ON_BAN,
+								ci->capsmin, ci->capspercent,
+								ci->ttb[TTB_CAPS]);
+				else
+					notice_lang(s_BotServ, u, BOT_KICK_CAPS_ON,
+								ci->capsmin, ci->capspercent);
+			} else {
+				ci->botflags &= ~BS_KICK_CAPS;
+				notice_lang(s_BotServ, u, BOT_KICK_CAPS_OFF);
+			}
+		} else if (!stricmp(option, "COLORS")) {
+			if (!stricmp(value, "ON")) {
+				if (ttb) {
+					ci->ttb[TTB_COLORS] = strtol(ttb, (char **) NULL, 10);
+					if (errno == ERANGE || errno == EINVAL
+						|| ci->ttb[TTB_COLORS] < 0) {
+						if (debug) {
+							alog("debug: errno is %d ERANGE %d EINVAL %d ttb %d", errno, ERANGE, EINVAL, ci->ttb[TTB_COLORS]);
+						}
+						ci->ttb[TTB_COLORS] = 0;
+						notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb);
+						return MOD_CONT;
+					}
+				} else
+					ci->ttb[TTB_COLORS] = 0;
+				ci->botflags |= BS_KICK_COLORS;
+				if (ci->ttb[TTB_COLORS])
+					notice_lang(s_BotServ, u, BOT_KICK_COLORS_ON_BAN,
+								ci->ttb[TTB_COLORS]);
+				else
+					notice_lang(s_BotServ, u, BOT_KICK_COLORS_ON);
+			} else {
+				ci->botflags &= ~BS_KICK_COLORS;
+				notice_lang(s_BotServ, u, BOT_KICK_COLORS_OFF);
+			}
+		} else if (!stricmp(option, "FLOOD")) {
+			if (!stricmp(value, "ON")) {
+				char *lines = strtok(NULL, " ");
+				char *secs = strtok(NULL, " ");
 
-                if (ttb) {
-                    ci->ttb[TTB_FLOOD] = strtol(ttb, (char **) NULL, 10);
-                    if (errno == ERANGE || errno == EINVAL
-                        || ci->ttb[TTB_FLOOD] < 0) {
-                        if (debug) {
-                            alog("debug: errno is %d ERANGE %d EINVAL %d ttb %d", errno, ERANGE, EINVAL, ci->ttb[TTB_FLOOD]);
-                        }
-                        ci->ttb[TTB_FLOOD] = 0;
-                        notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb);
-                        return MOD_CONT;
-                    }
-                } else
-                    ci->ttb[TTB_FLOOD] = 0;
+				if (ttb) {
+					ci->ttb[TTB_FLOOD] = strtol(ttb, (char **) NULL, 10);
+					if (errno == ERANGE || errno == EINVAL
+						|| ci->ttb[TTB_FLOOD] < 0) {
+						if (debug) {
+							alog("debug: errno is %d ERANGE %d EINVAL %d ttb %d", errno, ERANGE, EINVAL, ci->ttb[TTB_FLOOD]);
+						}
+						ci->ttb[TTB_FLOOD] = 0;
+						notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb);
+						return MOD_CONT;
+					}
+				} else
+					ci->ttb[TTB_FLOOD] = 0;
 
-                if (!lines)
-                    ci->floodlines = 6;
-                else
-                    ci->floodlines = atol(lines);
-                if (ci->floodlines < 2)
-                    ci->floodlines = 6;
+				if (!lines)
+					ci->floodlines = 6;
+				else
+					ci->floodlines = atol(lines);
+				if (ci->floodlines < 2)
+					ci->floodlines = 6;
 
-                if (!secs)
-                    ci->floodsecs = 10;
-                else
-                    ci->floodsecs = atol(secs);
-                if (ci->floodsecs < 1 || ci->floodsecs > BSKeepData)
-                    ci->floodsecs = 10;
+				if (!secs)
+					ci->floodsecs = 10;
+				else
+					ci->floodsecs = atol(secs);
+				if (ci->floodsecs < 1 || ci->floodsecs > BSKeepData)
+					ci->floodsecs = 10;
 
-                ci->botflags |= BS_KICK_FLOOD;
-                if (ci->ttb[TTB_FLOOD])
-                    notice_lang(s_BotServ, u, BOT_KICK_FLOOD_ON_BAN,
-                                ci->floodlines, ci->floodsecs,
-                                ci->ttb[TTB_FLOOD]);
-                else
-                    notice_lang(s_BotServ, u, BOT_KICK_FLOOD_ON,
-                                ci->floodlines, ci->floodsecs);
-            } else {
-                ci->botflags &= ~BS_KICK_FLOOD;
-                notice_lang(s_BotServ, u, BOT_KICK_FLOOD_OFF);
-            }
-        } else if (!stricmp(option, "REPEAT")) {
-            if (!stricmp(value, "ON")) {
-                char *times = strtok(NULL, " ");
+				ci->botflags |= BS_KICK_FLOOD;
+				if (ci->ttb[TTB_FLOOD])
+					notice_lang(s_BotServ, u, BOT_KICK_FLOOD_ON_BAN,
+								ci->floodlines, ci->floodsecs,
+								ci->ttb[TTB_FLOOD]);
+				else
+					notice_lang(s_BotServ, u, BOT_KICK_FLOOD_ON,
+								ci->floodlines, ci->floodsecs);
+			} else {
+				ci->botflags &= ~BS_KICK_FLOOD;
+				notice_lang(s_BotServ, u, BOT_KICK_FLOOD_OFF);
+			}
+		} else if (!stricmp(option, "REPEAT")) {
+			if (!stricmp(value, "ON")) {
+				char *times = strtok(NULL, " ");
 
-                if (ttb) {
-                    ci->ttb[TTB_REPEAT] = strtol(ttb, (char **) NULL, 10);
-                    if (errno == ERANGE || errno == EINVAL
-                        || ci->ttb[TTB_REPEAT] < 0) {
-                        if (debug) {
-                            alog("debug: errno is %d ERANGE %d EINVAL %d ttb %d", errno, ERANGE, EINVAL, ci->ttb[TTB_REPEAT]);
-                        }
-                        ci->ttb[TTB_REPEAT] = 0;
-                        notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb);
-                        return MOD_CONT;
-                    }
-                } else
-                    ci->ttb[TTB_REPEAT] = 0;
+				if (ttb) {
+					ci->ttb[TTB_REPEAT] = strtol(ttb, (char **) NULL, 10);
+					if (errno == ERANGE || errno == EINVAL
+						|| ci->ttb[TTB_REPEAT] < 0) {
+						if (debug) {
+							alog("debug: errno is %d ERANGE %d EINVAL %d ttb %d", errno, ERANGE, EINVAL, ci->ttb[TTB_REPEAT]);
+						}
+						ci->ttb[TTB_REPEAT] = 0;
+						notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb);
+						return MOD_CONT;
+					}
+				} else
+					ci->ttb[TTB_REPEAT] = 0;
 
-                if (!times)
-                    ci->repeattimes = 3;
-                else
-                    ci->repeattimes = atol(times);
-                if (ci->repeattimes < 2)
-                    ci->repeattimes = 3;
+				if (!times)
+					ci->repeattimes = 3;
+				else
+					ci->repeattimes = atol(times);
+				if (ci->repeattimes < 2)
+					ci->repeattimes = 3;
 
-                ci->botflags |= BS_KICK_REPEAT;
-                if (ci->ttb[TTB_REPEAT])
-                    notice_lang(s_BotServ, u, BOT_KICK_REPEAT_ON_BAN,
-                                ci->repeattimes, ci->ttb[TTB_REPEAT]);
-                else
-                    notice_lang(s_BotServ, u, BOT_KICK_REPEAT_ON,
-                                ci->repeattimes);
-            } else {
-                ci->botflags &= ~BS_KICK_REPEAT;
-                notice_lang(s_BotServ, u, BOT_KICK_REPEAT_OFF);
-            }
-        } else if (!stricmp(option, "REVERSES")) {
-            if (!stricmp(value, "ON")) {
-                if (ttb) {
-                    ci->ttb[TTB_REVERSES] =
-                        strtol(ttb, (char **) NULL, 10);
-                    if (errno == ERANGE || errno == EINVAL
-                        || ci->ttb[TTB_REVERSES] < 0) {
-                        if (debug) {
-                            alog("debug: errno is %d ERANGE %d EINVAL %d ttb %d", errno, ERANGE, EINVAL, ci->ttb[TTB_REVERSES]);
-                        }
-                        ci->ttb[TTB_REVERSES] = 0;
-                        notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb);
-                        return MOD_CONT;
-                    }
-                } else
-                    ci->ttb[TTB_REVERSES] = 0;
-                ci->botflags |= BS_KICK_REVERSES;
-                if (ci->ttb[TTB_REVERSES])
-                    notice_lang(s_BotServ, u, BOT_KICK_REVERSES_ON_BAN,
-                                ci->ttb[TTB_REVERSES]);
-                else
-                    notice_lang(s_BotServ, u, BOT_KICK_REVERSES_ON);
-            } else {
-                ci->botflags &= ~BS_KICK_REVERSES;
-                notice_lang(s_BotServ, u, BOT_KICK_REVERSES_OFF);
-            }
-        } else if (!stricmp(option, "UNDERLINES")) {
-            if (!stricmp(value, "ON")) {
-                if (ttb) {
-                    ci->ttb[TTB_UNDERLINES] =
-                        strtol(ttb, (char **) NULL, 10);
-                    if (errno == ERANGE || errno == EINVAL
-                        || ci->ttb[TTB_UNDERLINES] < 0) {
-                        if (debug) {
-                            alog("debug: errno is %d ERANGE %d EINVAL %d ttb %d", errno, ERANGE, EINVAL, ci->ttb[TTB_UNDERLINES]);
-                        }
-                        ci->ttb[TTB_UNDERLINES] = 0;
-                        notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb);
-                        return MOD_CONT;
-                    }
-                } else
-                    ci->ttb[TTB_UNDERLINES] = 0;
-                ci->botflags |= BS_KICK_UNDERLINES;
-                if (ci->ttb[TTB_UNDERLINES])
-                    notice_lang(s_BotServ, u, BOT_KICK_UNDERLINES_ON_BAN,
-                                ci->ttb[TTB_UNDERLINES]);
-                else
-                    notice_lang(s_BotServ, u, BOT_KICK_UNDERLINES_ON);
-            } else {
-                ci->botflags &= ~BS_KICK_UNDERLINES;
-                notice_lang(s_BotServ, u, BOT_KICK_UNDERLINES_OFF);
-            }
-        } else
-            notice_help(s_BotServ, u, BOT_KICK_UNKNOWN, option);
-    }
-    return MOD_CONT;
+				ci->botflags |= BS_KICK_REPEAT;
+				if (ci->ttb[TTB_REPEAT])
+					notice_lang(s_BotServ, u, BOT_KICK_REPEAT_ON_BAN,
+								ci->repeattimes, ci->ttb[TTB_REPEAT]);
+				else
+					notice_lang(s_BotServ, u, BOT_KICK_REPEAT_ON,
+								ci->repeattimes);
+			} else {
+				ci->botflags &= ~BS_KICK_REPEAT;
+				notice_lang(s_BotServ, u, BOT_KICK_REPEAT_OFF);
+			}
+		} else if (!stricmp(option, "REVERSES")) {
+			if (!stricmp(value, "ON")) {
+				if (ttb) {
+					ci->ttb[TTB_REVERSES] =
+						strtol(ttb, (char **) NULL, 10);
+					if (errno == ERANGE || errno == EINVAL
+						|| ci->ttb[TTB_REVERSES] < 0) {
+						if (debug) {
+							alog("debug: errno is %d ERANGE %d EINVAL %d ttb %d", errno, ERANGE, EINVAL, ci->ttb[TTB_REVERSES]);
+						}
+						ci->ttb[TTB_REVERSES] = 0;
+						notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb);
+						return MOD_CONT;
+					}
+				} else
+					ci->ttb[TTB_REVERSES] = 0;
+				ci->botflags |= BS_KICK_REVERSES;
+				if (ci->ttb[TTB_REVERSES])
+					notice_lang(s_BotServ, u, BOT_KICK_REVERSES_ON_BAN,
+								ci->ttb[TTB_REVERSES]);
+				else
+					notice_lang(s_BotServ, u, BOT_KICK_REVERSES_ON);
+			} else {
+				ci->botflags &= ~BS_KICK_REVERSES;
+				notice_lang(s_BotServ, u, BOT_KICK_REVERSES_OFF);
+			}
+		} else if (!stricmp(option, "UNDERLINES")) {
+			if (!stricmp(value, "ON")) {
+				if (ttb) {
+					ci->ttb[TTB_UNDERLINES] =
+						strtol(ttb, (char **) NULL, 10);
+					if (errno == ERANGE || errno == EINVAL
+						|| ci->ttb[TTB_UNDERLINES] < 0) {
+						if (debug) {
+							alog("debug: errno is %d ERANGE %d EINVAL %d ttb %d", errno, ERANGE, EINVAL, ci->ttb[TTB_UNDERLINES]);
+						}
+						ci->ttb[TTB_UNDERLINES] = 0;
+						notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb);
+						return MOD_CONT;
+					}
+				} else
+					ci->ttb[TTB_UNDERLINES] = 0;
+				ci->botflags |= BS_KICK_UNDERLINES;
+				if (ci->ttb[TTB_UNDERLINES])
+					notice_lang(s_BotServ, u, BOT_KICK_UNDERLINES_ON_BAN,
+								ci->ttb[TTB_UNDERLINES]);
+				else
+					notice_lang(s_BotServ, u, BOT_KICK_UNDERLINES_ON);
+			} else {
+				ci->botflags &= ~BS_KICK_UNDERLINES;
+				notice_lang(s_BotServ, u, BOT_KICK_UNDERLINES_OFF);
+			}
+		} else
+			notice_help(s_BotServ, u, BOT_KICK_UNKNOWN, option);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("bs_kick", BSKick)
diff --git a/src/core/bs_say.c b/src/core/bs_say.c
index 85ec7d40d..a4f778257 100644
--- a/src/core/bs_say.c
+++ b/src/core/bs_say.c
@@ -42,7 +42,7 @@ class BSSay : public Module
  **/
 void myBotServHelp(User * u)
 {
-    notice_lang(s_BotServ, u, BOT_HELP_CMD_SAY);
+	notice_lang(s_BotServ, u, BOT_HELP_CMD_SAY);
 }
 
 /**
@@ -52,35 +52,35 @@ void myBotServHelp(User * u)
  **/
 int do_say(User * u)
 {
-    ChannelInfo *ci;
+	ChannelInfo *ci;
 
-    char *chan = strtok(NULL, " ");
-    char *text = strtok(NULL, "");
+	char *chan = strtok(NULL, " ");
+	char *text = strtok(NULL, "");
 
-    if (!chan || !text)
-        syntax_error(s_BotServ, u, "SAY", BOT_SAY_SYNTAX);
-    else if (!(ci = cs_findchan(chan)))
-        notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
-    else if (ci->flags & CI_VERBOTEN)
-        notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
-    else if (!ci->bi)
-        notice_help(s_BotServ, u, BOT_NOT_ASSIGNED);
-    else if (!ci->c || ci->c->usercount < BSMinUsers)
-        notice_lang(s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name);
-    else if (!check_access(u, ci, CA_SAY))
-        notice_lang(s_BotServ, u, ACCESS_DENIED);
-    else {
-        if (text[0] != '\001') {
-            ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", text);
-            ci->bi->lastmsg = time(NULL);
-	        if (LogBot && LogChannel && logchan && !debug && findchan(LogChannel))
-                ircdproto->SendPrivmsg(ci->bi, LogChannel,
-                                  "SAY %s %s %s", u->nick, ci->name, text);
-        } else {
-            syntax_error(s_BotServ, u, "SAY", BOT_SAY_SYNTAX);
-        }
-    }
-    return MOD_CONT;
+	if (!chan || !text)
+		syntax_error(s_BotServ, u, "SAY", BOT_SAY_SYNTAX);
+	else if (!(ci = cs_findchan(chan)))
+		notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
+	else if (ci->flags & CI_VERBOTEN)
+		notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
+	else if (!ci->bi)
+		notice_help(s_BotServ, u, BOT_NOT_ASSIGNED);
+	else if (!ci->c || ci->c->usercount < BSMinUsers)
+		notice_lang(s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name);
+	else if (!check_access(u, ci, CA_SAY))
+		notice_lang(s_BotServ, u, ACCESS_DENIED);
+	else {
+		if (text[0] != '\001') {
+			ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", text);
+			ci->bi->lastmsg = time(NULL);
+			if (LogBot && LogChannel && logchan && !debug && findchan(LogChannel))
+				ircdproto->SendPrivmsg(ci->bi, LogChannel,
+								  "SAY %s %s %s", u->nick, ci->name, text);
+		} else {
+			syntax_error(s_BotServ, u, "SAY", BOT_SAY_SYNTAX);
+		}
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("bs_say", BSSay)
diff --git a/src/core/bs_set.c b/src/core/bs_set.c
index 17a141360..4efa9740c 100644
--- a/src/core/bs_set.c
+++ b/src/core/bs_set.c
@@ -60,7 +60,7 @@ class BSSet : public Module
  **/
 void myBotServHelp(User * u)
 {
-    notice_lang(s_BotServ, u, BOT_HELP_CMD_SET);
+	notice_lang(s_BotServ, u, BOT_HELP_CMD_SET);
 }
 
 /**
@@ -70,119 +70,119 @@ void myBotServHelp(User * u)
  **/
 int do_set(User * u)
 {
-    char *chan = strtok(NULL, " ");
-    char *option = strtok(NULL, " ");
-    char *value = strtok(NULL, " ");
-    int is_servadmin = is_services_admin(u);
+	char *chan = strtok(NULL, " ");
+	char *option = strtok(NULL, " ");
+	char *value = strtok(NULL, " ");
+	int is_servadmin = is_services_admin(u);
 
-    ChannelInfo *ci;
+	ChannelInfo *ci;
 
-    if (readonly)
-        notice_lang(s_BotServ, u, BOT_SET_DISABLED);
-    else if (!chan || !option || !value)
-        syntax_error(s_BotServ, u, "SET", BOT_SET_SYNTAX);
-    else if (is_servadmin && !stricmp(option, "PRIVATE")) {
-        BotInfo *bi;
+	if (readonly)
+		notice_lang(s_BotServ, u, BOT_SET_DISABLED);
+	else if (!chan || !option || !value)
+		syntax_error(s_BotServ, u, "SET", BOT_SET_SYNTAX);
+	else if (is_servadmin && !stricmp(option, "PRIVATE")) {
+		BotInfo *bi;
 
-        if ((bi = findbot(chan))) {
-            if (!stricmp(value, "ON")) {
-                bi->flags |= BI_PRIVATE;
-                notice_lang(s_BotServ, u, BOT_SET_PRIVATE_ON, bi->nick);
-            } else if (!stricmp(value, "OFF")) {
-                bi->flags &= ~BI_PRIVATE;
-                notice_lang(s_BotServ, u, BOT_SET_PRIVATE_OFF, bi->nick);
-            } else {
-                syntax_error(s_BotServ, u, "SET PRIVATE",
-                             BOT_SET_PRIVATE_SYNTAX);
-            }
-        } else {
-            notice_lang(s_BotServ, u, BOT_DOES_NOT_EXIST, chan);
-        }
-        return MOD_CONT;
-    } else if (!(ci = cs_findchan(chan)))
-        notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
-    else if (ci->flags & CI_VERBOTEN)
-        notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
-    else if (!is_servadmin && !check_access(u, ci, CA_SET))
-        notice_lang(s_BotServ, u, ACCESS_DENIED);
-    else {
-        if (!stricmp(option, "DONTKICKOPS")) {
-            if (!stricmp(value, "ON")) {
-                ci->botflags |= BS_DONTKICKOPS;
-                notice_lang(s_BotServ, u, BOT_SET_DONTKICKOPS_ON,
-                            ci->name);
-            } else if (!stricmp(value, "OFF")) {
-                ci->botflags &= ~BS_DONTKICKOPS;
-                notice_lang(s_BotServ, u, BOT_SET_DONTKICKOPS_OFF,
-                            ci->name);
-            } else {
-                syntax_error(s_BotServ, u, "SET DONTKICKOPS",
-                             BOT_SET_DONTKICKOPS_SYNTAX);
-            }
-        } else if (!stricmp(option, "DONTKICKVOICES")) {
-            if (!stricmp(value, "ON")) {
-                ci->botflags |= BS_DONTKICKVOICES;
-                notice_lang(s_BotServ, u, BOT_SET_DONTKICKVOICES_ON,
-                            ci->name);
-            } else if (!stricmp(value, "OFF")) {
-                ci->botflags &= ~BS_DONTKICKVOICES;
-                notice_lang(s_BotServ, u, BOT_SET_DONTKICKVOICES_OFF,
-                            ci->name);
-            } else {
-                syntax_error(s_BotServ, u, "SET DONTKICKVOICES",
-                             BOT_SET_DONTKICKVOICES_SYNTAX);
-            }
-        } else if (!stricmp(option, "FANTASY")) {
-            if (!stricmp(value, "ON")) {
-                ci->botflags |= BS_FANTASY;
-                notice_lang(s_BotServ, u, BOT_SET_FANTASY_ON, ci->name);
-            } else if (!stricmp(value, "OFF")) {
-                ci->botflags &= ~BS_FANTASY;
-                notice_lang(s_BotServ, u, BOT_SET_FANTASY_OFF, ci->name);
-            } else {
-                syntax_error(s_BotServ, u, "SET FANTASY",
-                             BOT_SET_FANTASY_SYNTAX);
-            }
-        } else if (!stricmp(option, "GREET")) {
-            if (!stricmp(value, "ON")) {
-                ci->botflags |= BS_GREET;
-                notice_lang(s_BotServ, u, BOT_SET_GREET_ON, ci->name);
-            } else if (!stricmp(value, "OFF")) {
-                ci->botflags &= ~BS_GREET;
-                notice_lang(s_BotServ, u, BOT_SET_GREET_OFF, ci->name);
-            } else {
-                syntax_error(s_BotServ, u, "SET GREET",
-                             BOT_SET_GREET_SYNTAX);
-            }
-        } else if (is_servadmin && !stricmp(option, "NOBOT")) {
-            if (!stricmp(value, "ON")) {
-                ci->botflags |= BS_NOBOT;
-                if (ci->bi)
-                    ci->bi->UnAssign(u, ci);
-                notice_lang(s_BotServ, u, BOT_SET_NOBOT_ON, ci->name);
-            } else if (!stricmp(value, "OFF")) {
-                ci->botflags &= ~BS_NOBOT;
-                notice_lang(s_BotServ, u, BOT_SET_NOBOT_OFF, ci->name);
-            } else {
-                syntax_error(s_BotServ, u, "SET NOBOT",
-                             BOT_SET_NOBOT_SYNTAX);
-            }
-        } else if (!stricmp(option, "SYMBIOSIS")) {
-            if (!stricmp(value, "ON")) {
-                ci->botflags |= BS_SYMBIOSIS;
-                notice_lang(s_BotServ, u, BOT_SET_SYMBIOSIS_ON, ci->name);
-            } else if (!stricmp(value, "OFF")) {
-                ci->botflags &= ~BS_SYMBIOSIS;
-                notice_lang(s_BotServ, u, BOT_SET_SYMBIOSIS_OFF, ci->name);
-            } else {
-                syntax_error(s_BotServ, u, "SET SYMBIOSIS",
-                             BOT_SET_SYMBIOSIS_SYNTAX);
-            }
-        } else {
-            notice_help(s_BotServ, u, BOT_SET_UNKNOWN, option);
-        }
-    }
-    return MOD_CONT;
+		if ((bi = findbot(chan))) {
+			if (!stricmp(value, "ON")) {
+				bi->flags |= BI_PRIVATE;
+				notice_lang(s_BotServ, u, BOT_SET_PRIVATE_ON, bi->nick);
+			} else if (!stricmp(value, "OFF")) {
+				bi->flags &= ~BI_PRIVATE;
+				notice_lang(s_BotServ, u, BOT_SET_PRIVATE_OFF, bi->nick);
+			} else {
+				syntax_error(s_BotServ, u, "SET PRIVATE",
+							 BOT_SET_PRIVATE_SYNTAX);
+			}
+		} else {
+			notice_lang(s_BotServ, u, BOT_DOES_NOT_EXIST, chan);
+		}
+		return MOD_CONT;
+	} else if (!(ci = cs_findchan(chan)))
+		notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
+	else if (ci->flags & CI_VERBOTEN)
+		notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
+	else if (!is_servadmin && !check_access(u, ci, CA_SET))
+		notice_lang(s_BotServ, u, ACCESS_DENIED);
+	else {
+		if (!stricmp(option, "DONTKICKOPS")) {
+			if (!stricmp(value, "ON")) {
+				ci->botflags |= BS_DONTKICKOPS;
+				notice_lang(s_BotServ, u, BOT_SET_DONTKICKOPS_ON,
+							ci->name);
+			} else if (!stricmp(value, "OFF")) {
+				ci->botflags &= ~BS_DONTKICKOPS;
+				notice_lang(s_BotServ, u, BOT_SET_DONTKICKOPS_OFF,
+							ci->name);
+			} else {
+				syntax_error(s_BotServ, u, "SET DONTKICKOPS",
+							 BOT_SET_DONTKICKOPS_SYNTAX);
+			}
+		} else if (!stricmp(option, "DONTKICKVOICES")) {
+			if (!stricmp(value, "ON")) {
+				ci->botflags |= BS_DONTKICKVOICES;
+				notice_lang(s_BotServ, u, BOT_SET_DONTKICKVOICES_ON,
+							ci->name);
+			} else if (!stricmp(value, "OFF")) {
+				ci->botflags &= ~BS_DONTKICKVOICES;
+				notice_lang(s_BotServ, u, BOT_SET_DONTKICKVOICES_OFF,
+							ci->name);
+			} else {
+				syntax_error(s_BotServ, u, "SET DONTKICKVOICES",
+							 BOT_SET_DONTKICKVOICES_SYNTAX);
+			}
+		} else if (!stricmp(option, "FANTASY")) {
+			if (!stricmp(value, "ON")) {
+				ci->botflags |= BS_FANTASY;
+				notice_lang(s_BotServ, u, BOT_SET_FANTASY_ON, ci->name);
+			} else if (!stricmp(value, "OFF")) {
+				ci->botflags &= ~BS_FANTASY;
+				notice_lang(s_BotServ, u, BOT_SET_FANTASY_OFF, ci->name);
+			} else {
+				syntax_error(s_BotServ, u, "SET FANTASY",
+							 BOT_SET_FANTASY_SYNTAX);
+			}
+		} else if (!stricmp(option, "GREET")) {
+			if (!stricmp(value, "ON")) {
+				ci->botflags |= BS_GREET;
+				notice_lang(s_BotServ, u, BOT_SET_GREET_ON, ci->name);
+			} else if (!stricmp(value, "OFF")) {
+				ci->botflags &= ~BS_GREET;
+				notice_lang(s_BotServ, u, BOT_SET_GREET_OFF, ci->name);
+			} else {
+				syntax_error(s_BotServ, u, "SET GREET",
+							 BOT_SET_GREET_SYNTAX);
+			}
+		} else if (is_servadmin && !stricmp(option, "NOBOT")) {
+			if (!stricmp(value, "ON")) {
+				ci->botflags |= BS_NOBOT;
+				if (ci->bi)
+					ci->bi->UnAssign(u, ci);
+				notice_lang(s_BotServ, u, BOT_SET_NOBOT_ON, ci->name);
+			} else if (!stricmp(value, "OFF")) {
+				ci->botflags &= ~BS_NOBOT;
+				notice_lang(s_BotServ, u, BOT_SET_NOBOT_OFF, ci->name);
+			} else {
+				syntax_error(s_BotServ, u, "SET NOBOT",
+							 BOT_SET_NOBOT_SYNTAX);
+			}
+		} else if (!stricmp(option, "SYMBIOSIS")) {
+			if (!stricmp(value, "ON")) {
+				ci->botflags |= BS_SYMBIOSIS;
+				notice_lang(s_BotServ, u, BOT_SET_SYMBIOSIS_ON, ci->name);
+			} else if (!stricmp(value, "OFF")) {
+				ci->botflags &= ~BS_SYMBIOSIS;
+				notice_lang(s_BotServ, u, BOT_SET_SYMBIOSIS_OFF, ci->name);
+			} else {
+				syntax_error(s_BotServ, u, "SET SYMBIOSIS",
+							 BOT_SET_SYMBIOSIS_SYNTAX);
+			}
+		} else {
+			notice_help(s_BotServ, u, BOT_SET_UNKNOWN, option);
+		}
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("bs_set", BSSet)
diff --git a/src/core/bs_unassign.c b/src/core/bs_unassign.c
index d7a6fb348..984026c7b 100644
--- a/src/core/bs_unassign.c
+++ b/src/core/bs_unassign.c
@@ -43,7 +43,7 @@ class BSUnassign : public Module
  **/
 void myBotServHelp(User * u)
 {
-    notice_lang(s_BotServ, u, BOT_HELP_CMD_UNASSIGN);
+	notice_lang(s_BotServ, u, BOT_HELP_CMD_UNASSIGN);
 }
 
 /**
@@ -53,26 +53,26 @@ void myBotServHelp(User * u)
  **/
 int do_unassign(User * u)
 {
-    char *chan = strtok(NULL, " ");
-    ChannelInfo *ci;
+	char *chan = strtok(NULL, " ");
+	ChannelInfo *ci;
 
-    if (readonly)
-        notice_lang(s_BotServ, u, BOT_ASSIGN_READONLY);
-    else if (!chan)
-        syntax_error(s_BotServ, u, "UNASSIGN", BOT_UNASSIGN_SYNTAX);
-    else if (!(ci = cs_findchan(chan)))
-        notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
-    else if (ci->flags & CI_VERBOTEN)
-        notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
-    else if (!is_services_admin(u) && !check_access(u, ci, CA_ASSIGN))
-        notice_lang(s_BotServ, u, ACCESS_DENIED);
-    else if (!ci->bi)
-        notice_help(s_BotServ, u, BOT_NOT_ASSIGNED);
-    else {
-        ci->bi->UnAssign(u, ci);
-        notice_lang(s_BotServ, u, BOT_UNASSIGN_UNASSIGNED, ci->name);
-    }
-    return MOD_CONT;
+	if (readonly)
+		notice_lang(s_BotServ, u, BOT_ASSIGN_READONLY);
+	else if (!chan)
+		syntax_error(s_BotServ, u, "UNASSIGN", BOT_UNASSIGN_SYNTAX);
+	else if (!(ci = cs_findchan(chan)))
+		notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
+	else if (ci->flags & CI_VERBOTEN)
+		notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
+	else if (!is_services_admin(u) && !check_access(u, ci, CA_ASSIGN))
+		notice_lang(s_BotServ, u, ACCESS_DENIED);
+	else if (!ci->bi)
+		notice_help(s_BotServ, u, BOT_NOT_ASSIGNED);
+	else {
+		ci->bi->UnAssign(u, ci);
+		notice_lang(s_BotServ, u, BOT_UNASSIGN_UNASSIGNED, ci->name);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("bs_unassign", BSUnassign)
diff --git a/src/core/cs_access.c b/src/core/cs_access.c
index 31e8df133..b70192c02 100644
--- a/src/core/cs_access.c
+++ b/src/core/cs_access.c
@@ -51,72 +51,72 @@ class CSAccess : public Module
  **/
 void myChanServHelp(User * u)
 {
-    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_ACCESS);
-    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_LEVELS);
+	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_ACCESS);
+	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_LEVELS);
 }
 
 
 static int access_del(User * u, ChannelInfo *ci, ChanAccess * access, int *perm, int uacc)
 {
 	char *nick;
-    if (!access->in_use)
-        return 0;
-    if (!is_services_admin(u) && uacc <= access->level) {
-        (*perm)++;
-        return 0;
-    }
-    nick = access->nc->display;
-    access->nc = NULL;
-    access->in_use = 0;
-    send_event(EVENT_ACCESS_DEL, 3, ci->name, u->nick, nick);
-    return 1;
+	if (!access->in_use)
+		return 0;
+	if (!is_services_admin(u) && uacc <= access->level) {
+		(*perm)++;
+		return 0;
+	}
+	nick = access->nc->display;
+	access->nc = NULL;
+	access->in_use = 0;
+	send_event(EVENT_ACCESS_DEL, 3, ci->name, u->nick, nick);
+	return 1;
 }
 
 static int access_del_callback(User * u, int num, va_list args)
 {
-    ChannelInfo *ci = va_arg(args, ChannelInfo *);
-    int *last = va_arg(args, int *);
-    int *perm = va_arg(args, int *);
-    int uacc = va_arg(args, int);
-    if (num < 1 || num > ci->accesscount)
-        return 0;
-    *last = num;
-    return access_del(u, ci, &ci->access[num - 1], perm, uacc);
+	ChannelInfo *ci = va_arg(args, ChannelInfo *);
+	int *last = va_arg(args, int *);
+	int *perm = va_arg(args, int *);
+	int uacc = va_arg(args, int);
+	if (num < 1 || num > ci->accesscount)
+		return 0;
+	*last = num;
+	return access_del(u, ci, &ci->access[num - 1], perm, uacc);
 }
 
 
 static int access_list(User * u, int index, ChannelInfo * ci,
-                       int *sent_header)
+					   int *sent_header)
 {
-    ChanAccess *access = &ci->access[index];
-    const char *xop;
-
-    if (!access->in_use)
-        return 0;
-
-    if (!*sent_header) {
-        notice_lang(s_ChanServ, u, CHAN_ACCESS_LIST_HEADER, ci->name);
-        *sent_header = 1;
-    }
-
-    if (ci->flags & CI_XOP) {
-        xop = get_xop_level(access->level);
-        notice_lang(s_ChanServ, u, CHAN_ACCESS_LIST_XOP_FORMAT, index + 1,
-                    xop, access->nc->display);
-    } else {
-        notice_lang(s_ChanServ, u, CHAN_ACCESS_LIST_AXS_FORMAT, index + 1,
-                    access->level, access->nc->display);
-    }
-    return 1;
+	ChanAccess *access = &ci->access[index];
+	const char *xop;
+
+	if (!access->in_use)
+		return 0;
+
+	if (!*sent_header) {
+		notice_lang(s_ChanServ, u, CHAN_ACCESS_LIST_HEADER, ci->name);
+		*sent_header = 1;
+	}
+
+	if (ci->flags & CI_XOP) {
+		xop = get_xop_level(access->level);
+		notice_lang(s_ChanServ, u, CHAN_ACCESS_LIST_XOP_FORMAT, index + 1,
+					xop, access->nc->display);
+	} else {
+		notice_lang(s_ChanServ, u, CHAN_ACCESS_LIST_AXS_FORMAT, index + 1,
+					access->level, access->nc->display);
+	}
+	return 1;
 }
 
 static int access_list_callback(User * u, int num, va_list args)
 {
-    ChannelInfo *ci = va_arg(args, ChannelInfo *);
-    int *sent_header = va_arg(args, int *);
-    if (num < 1 || num > ci->accesscount)
-        return 0;
-    return access_list(u, num - 1, ci, sent_header);
+	ChannelInfo *ci = va_arg(args, ChannelInfo *);
+	int *sent_header = va_arg(args, int *);
+	if (num < 1 || num > ci->accesscount)
+		return 0;
+	return access_list(u, num - 1, ci, sent_header);
 }
 
 
@@ -127,402 +127,402 @@ static int access_list_callback(User * u, int num, va_list args)
  **/
 int do_access(User * u)
 {
-    char *chan = strtok(NULL, " ");
-    char *cmd = strtok(NULL, " ");
-    char *nick = strtok(NULL, " ");
-    char *s = strtok(NULL, " ");
-    char event_access[BUFSIZE];
-
-    ChannelInfo *ci;
-    NickAlias *na = NULL;
-    NickCore *nc;
-    ChanAccess *access;
-
-    int i;
-    int level = 0, ulev;
-    int is_list = (cmd && stricmp(cmd, "LIST") == 0);
-    int is_servadmin = is_services_admin(u);
-
-    /* If LIST, we don't *require* any parameters, but we can take any.
-     * If DEL, we require a nick and no level.
-     * Else (ADD), we require a level (which implies a nick). */
-    if (!cmd || ((is_list || !stricmp(cmd, "CLEAR")) ? 0 :
-                 (stricmp(cmd, "DEL") == 0) ? (!nick || s) : !s)) {
-        syntax_error(s_ChanServ, u, "ACCESS", CHAN_ACCESS_SYNTAX);
-    } else if (!(ci = cs_findchan(chan))) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
-    } else if (ci->flags & CI_VERBOTEN) {
-        notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
-        /* We still allow LIST in xOP mode, but not others */
-    } else if ((ci->flags & CI_XOP) && !is_list) {
+	char *chan = strtok(NULL, " ");
+	char *cmd = strtok(NULL, " ");
+	char *nick = strtok(NULL, " ");
+	char *s = strtok(NULL, " ");
+	char event_access[BUFSIZE];
+
+	ChannelInfo *ci;
+	NickAlias *na = NULL;
+	NickCore *nc;
+	ChanAccess *access;
+
+	int i;
+	int level = 0, ulev;
+	int is_list = (cmd && stricmp(cmd, "LIST") == 0);
+	int is_servadmin = is_services_admin(u);
+
+	/* If LIST, we don't *require* any parameters, but we can take any.
+	 * If DEL, we require a nick and no level.
+	 * Else (ADD), we require a level (which implies a nick). */
+	if (!cmd || ((is_list || !stricmp(cmd, "CLEAR")) ? 0 :
+				 (stricmp(cmd, "DEL") == 0) ? (!nick || s) : !s)) {
+		syntax_error(s_ChanServ, u, "ACCESS", CHAN_ACCESS_SYNTAX);
+	} else if (!(ci = cs_findchan(chan))) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
+	} else if (ci->flags & CI_VERBOTEN) {
+		notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
+		/* We still allow LIST in xOP mode, but not others */
+	} else if ((ci->flags & CI_XOP) && !is_list) {
 		if (ircd->halfop)
-	        notice_lang(s_ChanServ, u, CHAN_ACCESS_XOP_HOP, s_ChanServ);
+			notice_lang(s_ChanServ, u, CHAN_ACCESS_XOP_HOP, s_ChanServ);
 		else
-	        notice_lang(s_ChanServ, u, CHAN_ACCESS_XOP, s_ChanServ);
-    } else if (((is_list && !check_access(u, ci, CA_ACCESS_LIST))
-                || (!is_list && !check_access(u, ci, CA_ACCESS_CHANGE)))
-               && !is_servadmin) {
-        notice_lang(s_ChanServ, u, ACCESS_DENIED);
-    } else if (stricmp(cmd, "ADD") == 0) {
-        if (readonly) {
-            notice_lang(s_ChanServ, u, CHAN_ACCESS_DISABLED);
-            return MOD_CONT;
-        }
-
-        level = atoi(s);
-        ulev = get_access(u, ci);
-
-        if (!is_servadmin && level >= ulev) {
-            notice_lang(s_ChanServ, u, PERMISSION_DENIED);
-            return MOD_CONT;
-        }
-
-        if (level == 0) {
-            notice_lang(s_ChanServ, u, CHAN_ACCESS_LEVEL_NONZERO);
-            return MOD_CONT;
-        } else if (level <= ACCESS_INVALID || level >= ACCESS_FOUNDER) {
-            notice_lang(s_ChanServ, u, CHAN_ACCESS_LEVEL_RANGE,
-                        ACCESS_INVALID + 1, ACCESS_FOUNDER - 1);
-            return MOD_CONT;
-        }
-
-        na = findnick(nick);
-        if (!na) {
-            notice_lang(s_ChanServ, u, CHAN_ACCESS_NICKS_ONLY);
-            return MOD_CONT;
-        }
-        if (na->status & NS_VERBOTEN) {
-            notice_lang(s_ChanServ, u, NICK_X_FORBIDDEN, nick);
-            return MOD_CONT;
-        }
-
-        nc = na->nc;
-        for (access = ci->access, i = 0; i < ci->accesscount;
-             access++, i++) {
-            if (access->nc == nc) {
-                /* Don't allow lowering from a level >= ulev */
-                if (!is_servadmin && access->level >= ulev) {
-                    notice_lang(s_ChanServ, u, PERMISSION_DENIED);
-                    return MOD_CONT;
-                }
-                if (access->level == level) {
-                    notice_lang(s_ChanServ, u, CHAN_ACCESS_LEVEL_UNCHANGED,
-                                access->nc->display, chan, level);
-                    return MOD_CONT;
-                }
-                access->level = level;
-                snprintf(event_access, BUFSIZE, "%d", access->level);
-                send_event(EVENT_ACCESS_CHANGE, 4, ci->name, u->nick,
-                           na->nick, event_access);
-                alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", s_ChanServ, u->nick, u->username, u->host, ulev, access->level, na->nick, nc->display, ci->name);
-                notice_lang(s_ChanServ, u, CHAN_ACCESS_LEVEL_CHANGED,
-                            access->nc->display, chan, level);
-                return MOD_CONT;
-            }
-        }
-
-        /* All entries should be in use so we no longer need
-         * to go over the entire list..
-        for (i = 0; i < ci->accesscount; i++) {
-            if (!ci->access[i].in_use)
-                break;
-        }
-         */
-
-        if (i < CSAccessMax) {
-            ci->accesscount++;
-            ci->access =
-                (ChanAccess *)srealloc(ci->access,
-                        sizeof(ChanAccess) * ci->accesscount);
-        } else {
-            notice_lang(s_ChanServ, u, CHAN_ACCESS_REACHED_LIMIT,
-                        CSAccessMax);
-            return MOD_CONT;
-        }
-
-        access = &ci->access[i];
-        access->nc = nc;
-        access->in_use = 1;
-        access->level = level;
-        access->last_seen = 0;
-
-        snprintf(event_access, BUFSIZE, "%d", access->level);
-        send_event(EVENT_ACCESS_ADD, 4, ci->name, u->nick, na->nick,
-                   event_access);
-        alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", s_ChanServ, u->nick, u->username, u->host, ulev, access->level, na->nick, nc->display, ci->name);
-        notice_lang(s_ChanServ, u, CHAN_ACCESS_ADDED, nc->display,
-                    ci->name, access->level);
-    } else if (stricmp(cmd, "DEL") == 0) {
-        int deleted, a, b;
-        if (readonly) {
-            notice_lang(s_ChanServ, u, CHAN_ACCESS_DISABLED);
-            return MOD_CONT;
-        }
-
-        if (ci->accesscount == 0) {
-            notice_lang(s_ChanServ, u, CHAN_ACCESS_LIST_EMPTY, chan);
-            return MOD_CONT;
-        }
-
-        /* Special case: is it a number/list?  Only do search if it isn't. */
-        if (isdigit(*nick) && strspn(nick, "1234567890,-") == strlen(nick)) {
-            int count, last = -1, perm = 0;
-            deleted = process_numlist(nick, &count, access_del_callback, u,
-                                      ci, &last, &perm, get_access(u, ci));
-            if (!deleted) {
-                if (perm) {
-                    notice_lang(s_ChanServ, u, PERMISSION_DENIED);
-                } else if (count == 1) {
-                    notice_lang(s_ChanServ, u, CHAN_ACCESS_NO_SUCH_ENTRY,
-                                last, ci->name);
-                } else {
-                    notice_lang(s_ChanServ, u, CHAN_ACCESS_NO_MATCH,
-                                ci->name);
-                }
-            } else if (deleted == 1) {
-                notice_lang(s_ChanServ, u, CHAN_ACCESS_DELETED_ONE,
-                            ci->name);
-            } else {
-                notice_lang(s_ChanServ, u, CHAN_ACCESS_DELETED_SEVERAL,
-                            deleted, ci->name);
-            }
-        } else {
-            na = findnick(nick);
-            if (!na) {
-                notice_lang(s_ChanServ, u, NICK_X_NOT_REGISTERED, nick);
-                return MOD_CONT;
-            }
-            nc = na->nc;
-            for (i = 0; i < ci->accesscount; i++) {
-                if (ci->access[i].nc == nc)
-                    break;
-            }
-            if (i == ci->accesscount) {
-                notice_lang(s_ChanServ, u, CHAN_ACCESS_NOT_FOUND, nick,
-                            chan);
-                return MOD_CONT;
-            }
-            access = &ci->access[i];
-            if (!is_servadmin && get_access(u, ci) <= access->level) {
-                deleted = 0;
-                notice_lang(s_ChanServ, u, PERMISSION_DENIED);
-            } else {
-                notice_lang(s_ChanServ, u, CHAN_ACCESS_DELETED,
-                            access->nc->display, ci->name);
-                alog("%s: %s!%s@%s (level %d) deleted access of %s (group %s) on %s", s_ChanServ, u->nick, u->username, u->host, get_access(u, ci), na->nick, access->nc->display, chan);
-                access->nc = NULL;
-                access->in_use = 0;
-                deleted = 1;
-            }
-        }
-
-        if (deleted) {
-            /* Reordering - DrStein */
-            for (b = 0; b < ci->accesscount; b++) {
-                if (ci->access[b].in_use) {
-                    for (a = 0; a < ci->accesscount; a++) {
-                        if (a > b)
-                            break;
-                        if (!ci->access[a].in_use) {
-                            ci->access[a].in_use = 1;
-                            ci->access[a].level = ci->access[b].level;
-                            ci->access[a].nc = ci->access[b].nc;
-                            ci->access[a].last_seen =
-                                ci->access[b].last_seen;
-                            ci->access[b].nc = NULL;
-                            ci->access[b].in_use = 0;
-                            break;
-                        }
-                    }
-                }
-            }
-
-            /* After reordering only the entries at the end could still be empty.
-             * We ll free the places no longer in use... */
-            for (i = ci->accesscount - 1; i >= 0; i--) {
-                if (ci->access[i].in_use == 1)
-                    break;
-
-                ci->accesscount--;
-            }
-            ci->access =
-                (ChanAccess *)srealloc(ci->access,sizeof(ChanAccess) * ci->accesscount);
-
-            /* We don't know the nick if someone used numbers, so we trigger the event without
-             * nick param. We just do this once, even if someone enters a range. -Certus */
-            if (na)
-                send_event(EVENT_ACCESS_DEL, 3, ci->name, u->nick, na->nick);
-            else
-                send_event(EVENT_ACCESS_DEL, 2, ci->name, u->nick);
-        }
-    } else if (stricmp(cmd, "LIST") == 0) {
-        int sent_header = 0;
-
-        if (ci->accesscount == 0) {
-            notice_lang(s_ChanServ, u, CHAN_ACCESS_LIST_EMPTY, chan);
-            return MOD_CONT;
-        }
-        if (nick && strspn(nick, "1234567890,-") == strlen(nick)) {
-            process_numlist(nick, NULL, access_list_callback, u, ci,
-                            &sent_header);
-        } else {
-            for (i = 0; i < ci->accesscount; i++) {
-                if (nick && ci->access[i].nc
-                    && !match_wild_nocase(nick, ci->access[i].nc->display))
-                    continue;
-                access_list(u, i, ci, &sent_header);
-            }
-        }
-        if (!sent_header) {
-            notice_lang(s_ChanServ, u, CHAN_ACCESS_NO_MATCH, chan);
-        } else {
-            notice_lang(s_ChanServ, u, CHAN_ACCESS_LIST_FOOTER, ci->name);
-        }
-    } else if (stricmp(cmd, "CLEAR") == 0) {
-
-        if (readonly) {
-            notice_lang(s_ChanServ, u, CHAN_ACCESS_DISABLED);
-            return MOD_CONT;
-        }
-
-        if (!is_servadmin && !is_founder(u, ci)) {
-            notice_lang(s_ChanServ, u, PERMISSION_DENIED);
-            return MOD_CONT;
-        }
-
-        free(ci->access);
-        ci->access = NULL;
-        ci->accesscount = 0;
-        
-        send_event(EVENT_ACCESS_CLEAR, 2, ci->name, u->nick);
-
-        notice_lang(s_ChanServ, u, CHAN_ACCESS_CLEAR, ci->name);
-        alog("%s: %s!%s@%s (level %d) cleared access list on %s",
-             s_ChanServ, u->nick, u->username, u->host,
-             get_access(u, ci), chan);
-
-    } else {
-        syntax_error(s_ChanServ, u, "ACCESS", CHAN_ACCESS_SYNTAX);
-    }
-    return MOD_CONT;
+			notice_lang(s_ChanServ, u, CHAN_ACCESS_XOP, s_ChanServ);
+	} else if (((is_list && !check_access(u, ci, CA_ACCESS_LIST))
+				|| (!is_list && !check_access(u, ci, CA_ACCESS_CHANGE)))
+			   && !is_servadmin) {
+		notice_lang(s_ChanServ, u, ACCESS_DENIED);
+	} else if (stricmp(cmd, "ADD") == 0) {
+		if (readonly) {
+			notice_lang(s_ChanServ, u, CHAN_ACCESS_DISABLED);
+			return MOD_CONT;
+		}
+
+		level = atoi(s);
+		ulev = get_access(u, ci);
+
+		if (!is_servadmin && level >= ulev) {
+			notice_lang(s_ChanServ, u, PERMISSION_DENIED);
+			return MOD_CONT;
+		}
+
+		if (level == 0) {
+			notice_lang(s_ChanServ, u, CHAN_ACCESS_LEVEL_NONZERO);
+			return MOD_CONT;
+		} else if (level <= ACCESS_INVALID || level >= ACCESS_FOUNDER) {
+			notice_lang(s_ChanServ, u, CHAN_ACCESS_LEVEL_RANGE,
+						ACCESS_INVALID + 1, ACCESS_FOUNDER - 1);
+			return MOD_CONT;
+		}
+
+		na = findnick(nick);
+		if (!na) {
+			notice_lang(s_ChanServ, u, CHAN_ACCESS_NICKS_ONLY);
+			return MOD_CONT;
+		}
+		if (na->status & NS_VERBOTEN) {
+			notice_lang(s_ChanServ, u, NICK_X_FORBIDDEN, nick);
+			return MOD_CONT;
+		}
+
+		nc = na->nc;
+		for (access = ci->access, i = 0; i < ci->accesscount;
+			 access++, i++) {
+			if (access->nc == nc) {
+				/* Don't allow lowering from a level >= ulev */
+				if (!is_servadmin && access->level >= ulev) {
+					notice_lang(s_ChanServ, u, PERMISSION_DENIED);
+					return MOD_CONT;
+				}
+				if (access->level == level) {
+					notice_lang(s_ChanServ, u, CHAN_ACCESS_LEVEL_UNCHANGED,
+								access->nc->display, chan, level);
+					return MOD_CONT;
+				}
+				access->level = level;
+				snprintf(event_access, BUFSIZE, "%d", access->level);
+				send_event(EVENT_ACCESS_CHANGE, 4, ci->name, u->nick,
+						   na->nick, event_access);
+				alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", s_ChanServ, u->nick, u->username, u->host, ulev, access->level, na->nick, nc->display, ci->name);
+				notice_lang(s_ChanServ, u, CHAN_ACCESS_LEVEL_CHANGED,
+							access->nc->display, chan, level);
+				return MOD_CONT;
+			}
+		}
+
+		/* All entries should be in use so we no longer need
+		 * to go over the entire list..
+		for (i = 0; i < ci->accesscount; i++) {
+			if (!ci->access[i].in_use)
+				break;
+		}
+		 */
+
+		if (i < CSAccessMax) {
+			ci->accesscount++;
+			ci->access =
+				(ChanAccess *)srealloc(ci->access,
+						sizeof(ChanAccess) * ci->accesscount);
+		} else {
+			notice_lang(s_ChanServ, u, CHAN_ACCESS_REACHED_LIMIT,
+						CSAccessMax);
+			return MOD_CONT;
+		}
+
+		access = &ci->access[i];
+		access->nc = nc;
+		access->in_use = 1;
+		access->level = level;
+		access->last_seen = 0;
+
+		snprintf(event_access, BUFSIZE, "%d", access->level);
+		send_event(EVENT_ACCESS_ADD, 4, ci->name, u->nick, na->nick,
+				   event_access);
+		alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", s_ChanServ, u->nick, u->username, u->host, ulev, access->level, na->nick, nc->display, ci->name);
+		notice_lang(s_ChanServ, u, CHAN_ACCESS_ADDED, nc->display,
+					ci->name, access->level);
+	} else if (stricmp(cmd, "DEL") == 0) {
+		int deleted, a, b;
+		if (readonly) {
+			notice_lang(s_ChanServ, u, CHAN_ACCESS_DISABLED);
+			return MOD_CONT;
+		}
+
+		if (ci->accesscount == 0) {
+			notice_lang(s_ChanServ, u, CHAN_ACCESS_LIST_EMPTY, chan);
+			return MOD_CONT;
+		}
+
+		/* Special case: is it a number/list?  Only do search if it isn't. */
+		if (isdigit(*nick) && strspn(nick, "1234567890,-") == strlen(nick)) {
+			int count, last = -1, perm = 0;
+			deleted = process_numlist(nick, &count, access_del_callback, u,
+									  ci, &last, &perm, get_access(u, ci));
+			if (!deleted) {
+				if (perm) {
+					notice_lang(s_ChanServ, u, PERMISSION_DENIED);
+				} else if (count == 1) {
+					notice_lang(s_ChanServ, u, CHAN_ACCESS_NO_SUCH_ENTRY,
+								last, ci->name);
+				} else {
+					notice_lang(s_ChanServ, u, CHAN_ACCESS_NO_MATCH,
+								ci->name);
+				}
+			} else if (deleted == 1) {
+				notice_lang(s_ChanServ, u, CHAN_ACCESS_DELETED_ONE,
+							ci->name);
+			} else {
+				notice_lang(s_ChanServ, u, CHAN_ACCESS_DELETED_SEVERAL,
+							deleted, ci->name);
+			}
+		} else {
+			na = findnick(nick);
+			if (!na) {
+				notice_lang(s_ChanServ, u, NICK_X_NOT_REGISTERED, nick);
+				return MOD_CONT;
+			}
+			nc = na->nc;
+			for (i = 0; i < ci->accesscount; i++) {
+				if (ci->access[i].nc == nc)
+					break;
+			}
+			if (i == ci->accesscount) {
+				notice_lang(s_ChanServ, u, CHAN_ACCESS_NOT_FOUND, nick,
+							chan);
+				return MOD_CONT;
+			}
+			access = &ci->access[i];
+			if (!is_servadmin && get_access(u, ci) <= access->level) {
+				deleted = 0;
+				notice_lang(s_ChanServ, u, PERMISSION_DENIED);
+			} else {
+				notice_lang(s_ChanServ, u, CHAN_ACCESS_DELETED,
+							access->nc->display, ci->name);
+				alog("%s: %s!%s@%s (level %d) deleted access of %s (group %s) on %s", s_ChanServ, u->nick, u->username, u->host, get_access(u, ci), na->nick, access->nc->display, chan);
+				access->nc = NULL;
+				access->in_use = 0;
+				deleted = 1;
+			}
+		}
+
+		if (deleted) {
+			/* Reordering - DrStein */
+			for (b = 0; b < ci->accesscount; b++) {
+				if (ci->access[b].in_use) {
+					for (a = 0; a < ci->accesscount; a++) {
+						if (a > b)
+							break;
+						if (!ci->access[a].in_use) {
+							ci->access[a].in_use = 1;
+							ci->access[a].level = ci->access[b].level;
+							ci->access[a].nc = ci->access[b].nc;
+							ci->access[a].last_seen =
+								ci->access[b].last_seen;
+							ci->access[b].nc = NULL;
+							ci->access[b].in_use = 0;
+							break;
+						}
+					}
+				}
+			}
+
+			/* After reordering only the entries at the end could still be empty.
+			 * We ll free the places no longer in use... */
+			for (i = ci->accesscount - 1; i >= 0; i--) {
+				if (ci->access[i].in_use == 1)
+					break;
+
+				ci->accesscount--;
+			}
+			ci->access =
+				(ChanAccess *)srealloc(ci->access,sizeof(ChanAccess) * ci->accesscount);
+
+			/* We don't know the nick if someone used numbers, so we trigger the event without
+			 * nick param. We just do this once, even if someone enters a range. -Certus */
+			if (na)
+				send_event(EVENT_ACCESS_DEL, 3, ci->name, u->nick, na->nick);
+			else
+				send_event(EVENT_ACCESS_DEL, 2, ci->name, u->nick);
+		}
+	} else if (stricmp(cmd, "LIST") == 0) {
+		int sent_header = 0;
+
+		if (ci->accesscount == 0) {
+			notice_lang(s_ChanServ, u, CHAN_ACCESS_LIST_EMPTY, chan);
+			return MOD_CONT;
+		}
+		if (nick && strspn(nick, "1234567890,-") == strlen(nick)) {
+			process_numlist(nick, NULL, access_list_callback, u, ci,
+							&sent_header);
+		} else {
+			for (i = 0; i < ci->accesscount; i++) {
+				if (nick && ci->access[i].nc
+					&& !match_wild_nocase(nick, ci->access[i].nc->display))
+					continue;
+				access_list(u, i, ci, &sent_header);
+			}
+		}
+		if (!sent_header) {
+			notice_lang(s_ChanServ, u, CHAN_ACCESS_NO_MATCH, chan);
+		} else {
+			notice_lang(s_ChanServ, u, CHAN_ACCESS_LIST_FOOTER, ci->name);
+		}
+	} else if (stricmp(cmd, "CLEAR") == 0) {
+
+		if (readonly) {
+			notice_lang(s_ChanServ, u, CHAN_ACCESS_DISABLED);
+			return MOD_CONT;
+		}
+
+		if (!is_servadmin && !is_founder(u, ci)) {
+			notice_lang(s_ChanServ, u, PERMISSION_DENIED);
+			return MOD_CONT;
+		}
+
+		free(ci->access);
+		ci->access = NULL;
+		ci->accesscount = 0;
+		
+		send_event(EVENT_ACCESS_CLEAR, 2, ci->name, u->nick);
+
+		notice_lang(s_ChanServ, u, CHAN_ACCESS_CLEAR, ci->name);
+		alog("%s: %s!%s@%s (level %d) cleared access list on %s",
+			 s_ChanServ, u->nick, u->username, u->host,
+			 get_access(u, ci), chan);
+
+	} else {
+		syntax_error(s_ChanServ, u, "ACCESS", CHAN_ACCESS_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 
 int do_levels(User * u)
 {
-    char *chan = strtok(NULL, " ");
-    char *cmd = strtok(NULL, " ");
-    char *what = strtok(NULL, " ");
-    char *s = strtok(NULL, " ");
-    char *error;
-
-    ChannelInfo *ci;
-    int level;
-    int i;
-
-    /* If SET, we want two extra parameters; if DIS[ABLE] or FOUNDER, we want only
-     * one; else, we want none.
-     */
-    if (!cmd
-        || ((stricmp(cmd, "SET") == 0) ? !s
-            : ((strnicmp(cmd, "DIS", 3) == 0)) ? (!what || s) : !!what)) {
-        syntax_error(s_ChanServ, u, "LEVELS", CHAN_LEVELS_SYNTAX);
-    } else if (!(ci = cs_findchan(chan))) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
-    } else if (ci->flags & CI_VERBOTEN) {
-        notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
-    } else if (ci->flags & CI_XOP) {
-        notice_lang(s_ChanServ, u, CHAN_LEVELS_XOP);
-    } else if (!is_founder(u, ci) && !is_services_admin(u)) {
-        notice_lang(s_ChanServ, u, ACCESS_DENIED);
-    } else if (stricmp(cmd, "SET") == 0) {
-        level = strtol(s, &error, 10);
-
-        if (*error != '\0') {
-            syntax_error(s_ChanServ, u, "LEVELS", CHAN_LEVELS_SYNTAX);
-            return MOD_CONT;
-        }
-
-        if (level <= ACCESS_INVALID || level >= ACCESS_FOUNDER) {
-            notice_lang(s_ChanServ, u, CHAN_LEVELS_RANGE,
-                        ACCESS_INVALID + 1, ACCESS_FOUNDER - 1);
-            return MOD_CONT;
-        }
-
-        for (i = 0; levelinfo[i].what >= 0; i++) {
-            if (stricmp(levelinfo[i].name, what) == 0) {
-                ci->levels[levelinfo[i].what] = level;
-
-                alog("%s: %s!%s@%s set level %s on channel %s to %d",
-                     s_ChanServ, u->nick, u->username, u->host,
-                     levelinfo[i].name, ci->name, level);
-                notice_lang(s_ChanServ, u, CHAN_LEVELS_CHANGED,
-                            levelinfo[i].name, chan, level);
-                return MOD_CONT;
-            }
-        }
-
-        notice_lang(s_ChanServ, u, CHAN_LEVELS_UNKNOWN, what, s_ChanServ);
-
-    } else if (stricmp(cmd, "DIS") == 0 || stricmp(cmd, "DISABLE") == 0) {
-        for (i = 0; levelinfo[i].what >= 0; i++) {
-            if (stricmp(levelinfo[i].name, what) == 0) {
-                ci->levels[levelinfo[i].what] = ACCESS_INVALID;
-
-                alog("%s: %s!%s@%s disabled level %s on channel %s",
-                     s_ChanServ, u->nick, u->username, u->host,
-                     levelinfo[i].name, ci->name);
-                notice_lang(s_ChanServ, u, CHAN_LEVELS_DISABLED,
-                            levelinfo[i].name, chan);
-                return MOD_CONT;
-            }
-        }
-
-        notice_lang(s_ChanServ, u, CHAN_LEVELS_UNKNOWN, what, s_ChanServ);
-    } else if (stricmp(cmd, "LIST") == 0) {
-        notice_lang(s_ChanServ, u, CHAN_LEVELS_LIST_HEADER, chan);
-
-        if (!levelinfo_maxwidth) {
-            for (i = 0; levelinfo[i].what >= 0; i++) {
-                int len = strlen(levelinfo[i].name);
-                if (len > levelinfo_maxwidth)
-                    levelinfo_maxwidth = len;
-            }
-        }
-
-        for (i = 0; levelinfo[i].what >= 0; i++) {
-            int j = ci->levels[levelinfo[i].what];
-
-            if (j == ACCESS_INVALID) {
-                j = levelinfo[i].what;
-
-                if (j == CA_AUTOOP || j == CA_AUTODEOP || j == CA_AUTOVOICE
-                    || j == CA_NOJOIN) {
-                    notice_lang(s_ChanServ, u, CHAN_LEVELS_LIST_DISABLED,
-                                levelinfo_maxwidth, levelinfo[i].name);
-                } else {
-                    notice_lang(s_ChanServ, u, CHAN_LEVELS_LIST_DISABLED,
-                                levelinfo_maxwidth, levelinfo[i].name);
-                }
-            } else if (j == ACCESS_FOUNDER) {
-                notice_lang(s_ChanServ, u, CHAN_LEVELS_LIST_FOUNDER,
-                            levelinfo_maxwidth, levelinfo[i].name);
-            } else {
-                notice_lang(s_ChanServ, u, CHAN_LEVELS_LIST_NORMAL,
-                            levelinfo_maxwidth, levelinfo[i].name, j);
-            }
-        }
-
-    } else if (stricmp(cmd, "RESET") == 0) {
-        reset_levels(ci);
-
-        alog("%s: %s!%s@%s reset levels definitions on channel %s",
-             s_ChanServ, u->nick, u->username, u->host, ci->name);
-        notice_lang(s_ChanServ, u, CHAN_LEVELS_RESET, chan);
-    } else {
-        syntax_error(s_ChanServ, u, "LEVELS", CHAN_LEVELS_SYNTAX);
-    }
-    return MOD_CONT;
+	char *chan = strtok(NULL, " ");
+	char *cmd = strtok(NULL, " ");
+	char *what = strtok(NULL, " ");
+	char *s = strtok(NULL, " ");
+	char *error;
+
+	ChannelInfo *ci;
+	int level;
+	int i;
+
+	/* If SET, we want two extra parameters; if DIS[ABLE] or FOUNDER, we want only
+	 * one; else, we want none.
+	 */
+	if (!cmd
+		|| ((stricmp(cmd, "SET") == 0) ? !s
+			: ((strnicmp(cmd, "DIS", 3) == 0)) ? (!what || s) : !!what)) {
+		syntax_error(s_ChanServ, u, "LEVELS", CHAN_LEVELS_SYNTAX);
+	} else if (!(ci = cs_findchan(chan))) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
+	} else if (ci->flags & CI_VERBOTEN) {
+		notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
+	} else if (ci->flags & CI_XOP) {
+		notice_lang(s_ChanServ, u, CHAN_LEVELS_XOP);
+	} else if (!is_founder(u, ci) && !is_services_admin(u)) {
+		notice_lang(s_ChanServ, u, ACCESS_DENIED);
+	} else if (stricmp(cmd, "SET") == 0) {
+		level = strtol(s, &error, 10);
+
+		if (*error != '\0') {
+			syntax_error(s_ChanServ, u, "LEVELS", CHAN_LEVELS_SYNTAX);
+			return MOD_CONT;
+		}
+
+		if (level <= ACCESS_INVALID || level >= ACCESS_FOUNDER) {
+			notice_lang(s_ChanServ, u, CHAN_LEVELS_RANGE,
+						ACCESS_INVALID + 1, ACCESS_FOUNDER - 1);
+			return MOD_CONT;
+		}
+
+		for (i = 0; levelinfo[i].what >= 0; i++) {
+			if (stricmp(levelinfo[i].name, what) == 0) {
+				ci->levels[levelinfo[i].what] = level;
+
+				alog("%s: %s!%s@%s set level %s on channel %s to %d",
+					 s_ChanServ, u->nick, u->username, u->host,
+					 levelinfo[i].name, ci->name, level);
+				notice_lang(s_ChanServ, u, CHAN_LEVELS_CHANGED,
+							levelinfo[i].name, chan, level);
+				return MOD_CONT;
+			}
+		}
+
+		notice_lang(s_ChanServ, u, CHAN_LEVELS_UNKNOWN, what, s_ChanServ);
+
+	} else if (stricmp(cmd, "DIS") == 0 || stricmp(cmd, "DISABLE") == 0) {
+		for (i = 0; levelinfo[i].what >= 0; i++) {
+			if (stricmp(levelinfo[i].name, what) == 0) {
+				ci->levels[levelinfo[i].what] = ACCESS_INVALID;
+
+				alog("%s: %s!%s@%s disabled level %s on channel %s",
+					 s_ChanServ, u->nick, u->username, u->host,
+					 levelinfo[i].name, ci->name);
+				notice_lang(s_ChanServ, u, CHAN_LEVELS_DISABLED,
+							levelinfo[i].name, chan);
+				return MOD_CONT;
+			}
+		}
+
+		notice_lang(s_ChanServ, u, CHAN_LEVELS_UNKNOWN, what, s_ChanServ);
+	} else if (stricmp(cmd, "LIST") == 0) {
+		notice_lang(s_ChanServ, u, CHAN_LEVELS_LIST_HEADER, chan);
+
+		if (!levelinfo_maxwidth) {
+			for (i = 0; levelinfo[i].what >= 0; i++) {
+				int len = strlen(levelinfo[i].name);
+				if (len > levelinfo_maxwidth)
+					levelinfo_maxwidth = len;
+			}
+		}
+
+		for (i = 0; levelinfo[i].what >= 0; i++) {
+			int j = ci->levels[levelinfo[i].what];
+
+			if (j == ACCESS_INVALID) {
+				j = levelinfo[i].what;
+
+				if (j == CA_AUTOOP || j == CA_AUTODEOP || j == CA_AUTOVOICE
+					|| j == CA_NOJOIN) {
+					notice_lang(s_ChanServ, u, CHAN_LEVELS_LIST_DISABLED,
+								levelinfo_maxwidth, levelinfo[i].name);
+				} else {
+					notice_lang(s_ChanServ, u, CHAN_LEVELS_LIST_DISABLED,
+								levelinfo_maxwidth, levelinfo[i].name);
+				}
+			} else if (j == ACCESS_FOUNDER) {
+				notice_lang(s_ChanServ, u, CHAN_LEVELS_LIST_FOUNDER,
+							levelinfo_maxwidth, levelinfo[i].name);
+			} else {
+				notice_lang(s_ChanServ, u, CHAN_LEVELS_LIST_NORMAL,
+							levelinfo_maxwidth, levelinfo[i].name, j);
+			}
+		}
+
+	} else if (stricmp(cmd, "RESET") == 0) {
+		reset_levels(ci);
+
+		alog("%s: %s!%s@%s reset levels definitions on channel %s",
+			 s_ChanServ, u->nick, u->username, u->host, ci->name);
+		notice_lang(s_ChanServ, u, CHAN_LEVELS_RESET, chan);
+	} else {
+		syntax_error(s_ChanServ, u, "LEVELS", CHAN_LEVELS_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("cs_access", CSAccess)
diff --git a/src/core/cs_akick.c b/src/core/cs_akick.c
index 09584ef5b..94fa7c826 100644
--- a/src/core/cs_akick.c
+++ b/src/core/cs_akick.c
@@ -46,7 +46,7 @@ class CSAKick : public Module
  **/
 void myChanServHelp(User * u)
 {
-    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_AKICK);
+	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_AKICK);
 }
 
 /**
@@ -57,598 +57,598 @@ void myChanServHelp(User * u)
  /* `last' is set to the last index this routine was called with */
 int akick_del(User * u, AutoKick * akick)
 {
-    if (!(akick->flags & AK_USED))
-        return 0;
-    if (akick->flags & AK_ISNICK) {
-        akick->u.nc = NULL;
-    } else {
-        free(akick->u.mask);
-        akick->u.mask = NULL;
-    }
-    if (akick->reason) {
-        free(akick->reason);
-        akick->reason = NULL;
-    }
-    if (akick->creator) {
-        free(akick->creator);
-        akick->creator = NULL;
-    }
-    akick->addtime = 0;
-    akick->flags = 0;
-    return 1;
+	if (!(akick->flags & AK_USED))
+		return 0;
+	if (akick->flags & AK_ISNICK) {
+		akick->u.nc = NULL;
+	} else {
+		free(akick->u.mask);
+		akick->u.mask = NULL;
+	}
+	if (akick->reason) {
+		free(akick->reason);
+		akick->reason = NULL;
+	}
+	if (akick->creator) {
+		free(akick->creator);
+		akick->creator = NULL;
+	}
+	akick->addtime = 0;
+	akick->flags = 0;
+	return 1;
 }
 
 int akick_del_callback(User * u, int num, va_list args)
 {
-    ChannelInfo *ci = va_arg(args, ChannelInfo *);
-    int *last = va_arg(args, int *);
+	ChannelInfo *ci = va_arg(args, ChannelInfo *);
+	int *last = va_arg(args, int *);
 
-    *last = num;
+	*last = num;
 
-    if (num < 1 || num > ci->akickcount)
-        return 0;
+	if (num < 1 || num > ci->akickcount)
+		return 0;
 
-    return akick_del(u, &ci->akick[num - 1]);
+	return akick_del(u, &ci->akick[num - 1]);
 }
 
 
 int akick_list(User * u, int index, ChannelInfo * ci, int *sent_header)
 {
-    AutoKick *akick = &ci->akick[index];
-
-    if (!(akick->flags & AK_USED))
-        return 0;
-    if (!*sent_header) {
-        notice_lang(s_ChanServ, u, CHAN_AKICK_LIST_HEADER, ci->name);
-        *sent_header = 1;
-    }
-
-    notice_lang(s_ChanServ, u, CHAN_AKICK_LIST_FORMAT, index + 1,
-                ((akick->flags & AK_ISNICK) ? akick->u.nc->
-                 display : akick->u.mask),
-                (akick->reason ? akick->
-                 reason : getstring(u->na, NO_REASON)));
-    return 1;
+	AutoKick *akick = &ci->akick[index];
+
+	if (!(akick->flags & AK_USED))
+		return 0;
+	if (!*sent_header) {
+		notice_lang(s_ChanServ, u, CHAN_AKICK_LIST_HEADER, ci->name);
+		*sent_header = 1;
+	}
+
+	notice_lang(s_ChanServ, u, CHAN_AKICK_LIST_FORMAT, index + 1,
+				((akick->flags & AK_ISNICK) ? akick->u.nc->
+				 display : akick->u.mask),
+				(akick->reason ? akick->
+				 reason : getstring(u->na, NO_REASON)));
+	return 1;
 }
 
 int akick_list_callback(User * u, int num, va_list args)
 {
-    ChannelInfo *ci = va_arg(args, ChannelInfo *);
-    int *sent_header = va_arg(args, int *);
-    if (num < 1 || num > ci->akickcount)
-        return 0;
-    return akick_list(u, num - 1, ci, sent_header);
+	ChannelInfo *ci = va_arg(args, ChannelInfo *);
+	int *sent_header = va_arg(args, int *);
+	if (num < 1 || num > ci->akickcount)
+		return 0;
+	return akick_list(u, num - 1, ci, sent_header);
 }
 
 int akick_view(User * u, int index, ChannelInfo * ci, int *sent_header)
 {
-    AutoKick *akick = &ci->akick[index];
-    char timebuf[64];
-    struct tm tm;
-
-    if (!(akick->flags & AK_USED))
-        return 0;
-    if (!*sent_header) {
-        notice_lang(s_ChanServ, u, CHAN_AKICK_LIST_HEADER, ci->name);
-        *sent_header = 1;
-    }
-
-    if (akick->addtime) {
-        tm = *localtime(&akick->addtime);
-        strftime_lang(timebuf, sizeof(timebuf), u,
-                      STRFTIME_SHORT_DATE_FORMAT, &tm);
-    } else {
-        snprintf(timebuf, sizeof(timebuf), "%s", getstring(u->na, UNKNOWN));
-    }
-
-    notice_lang(s_ChanServ, u,
-                ((akick->
-                  flags & AK_STUCK) ? CHAN_AKICK_VIEW_FORMAT_STUCK :
-                 CHAN_AKICK_VIEW_FORMAT), index + 1,
-                ((akick->flags & AK_ISNICK) ? akick->u.nc->
-                 display : akick->u.mask),
-                akick->creator ? akick->creator : getstring(u->na,
-                                                            UNKNOWN),
-                timebuf,
-                (akick->reason ? akick->
-                 reason : getstring(u->na, NO_REASON)));
-    return 1;
+	AutoKick *akick = &ci->akick[index];
+	char timebuf[64];
+	struct tm tm;
+
+	if (!(akick->flags & AK_USED))
+		return 0;
+	if (!*sent_header) {
+		notice_lang(s_ChanServ, u, CHAN_AKICK_LIST_HEADER, ci->name);
+		*sent_header = 1;
+	}
+
+	if (akick->addtime) {
+		tm = *localtime(&akick->addtime);
+		strftime_lang(timebuf, sizeof(timebuf), u,
+					  STRFTIME_SHORT_DATE_FORMAT, &tm);
+	} else {
+		snprintf(timebuf, sizeof(timebuf), "%s", getstring(u->na, UNKNOWN));
+	}
+
+	notice_lang(s_ChanServ, u,
+				((akick->
+				  flags & AK_STUCK) ? CHAN_AKICK_VIEW_FORMAT_STUCK :
+				 CHAN_AKICK_VIEW_FORMAT), index + 1,
+				((akick->flags & AK_ISNICK) ? akick->u.nc->
+				 display : akick->u.mask),
+				akick->creator ? akick->creator : getstring(u->na,
+															UNKNOWN),
+				timebuf,
+				(akick->reason ? akick->
+				 reason : getstring(u->na, NO_REASON)));
+	return 1;
 }
 
 int akick_view_callback(User * u, int num, va_list args)
 {
-    ChannelInfo *ci = va_arg(args, ChannelInfo *);
-    int *sent_header = va_arg(args, int *);
-    if (num < 1 || num > ci->akickcount)
-        return 0;
-    return akick_view(u, num - 1, ci, sent_header);
+	ChannelInfo *ci = va_arg(args, ChannelInfo *);
+	int *sent_header = va_arg(args, int *);
+	if (num < 1 || num > ci->akickcount)
+		return 0;
+	return akick_view(u, num - 1, ci, sent_header);
 }
 
 
 
 int do_akick(User * u)
 {
-    char *chan = strtok(NULL, " ");
-    char *cmd = strtok(NULL, " ");
-    char *mask = strtok(NULL, " ");
-    char *reason = strtok(NULL, "");
-    ChannelInfo *ci;
-    AutoKick *akick;
-    int i;
-    Channel *c;
-    struct c_userlist *cu = NULL;
-    struct c_userlist *next;
-    User *u2;
-    const char *argv[3];
-    int count = 0;
-
-    if (!cmd || (!mask && (!stricmp(cmd, "ADD") || !stricmp(cmd, "STICK")
-                           || !stricmp(cmd, "UNSTICK")
-                           || !stricmp(cmd, "DEL")))) {
-
-        syntax_error(s_ChanServ, u, "AKICK", CHAN_AKICK_SYNTAX);
-    } else if (!(ci = cs_findchan(chan))) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
-    } else if (ci->flags & CI_VERBOTEN) {
-        notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
-    } else if (!check_access(u, ci, CA_AKICK) && !is_services_admin(u)) {
-        notice_lang(s_ChanServ, u, ACCESS_DENIED);
-    } else if (stricmp(cmd, "ADD") == 0) {
-        NickAlias *na = findnick(mask), *na2;
-        NickCore *nc = NULL;
-        char *nick, *user, *host;
-        int freemask = 0;
-
-        if (readonly) {
-            notice_lang(s_ChanServ, u, CHAN_AKICK_DISABLED);
-            return MOD_CONT;
-        }
-
-        if (!na) {
-            split_usermask(mask, &nick, &user, &host);
-            mask =
-                (char *)scalloc(strlen(nick) + strlen(user) + strlen(host) + 3, 1);
-            freemask = 1;
-            sprintf(mask, "%s!%s@%s", nick, user, host);
-            free(nick);
-            free(user);
-            free(host);
-        } else {
-            if (na->status & NS_VERBOTEN) {
-                notice_lang(s_ChanServ, u, NICK_X_FORBIDDEN, mask);
-                return MOD_CONT;
-            }
-            nc = na->nc;
-        }
-
-        /* Check excepts BEFORE we get this far */
-        if (ircd->except) {
-            if (is_excepted_mask(ci, mask) == 1) {
-                notice_lang(s_ChanServ, u, CHAN_EXCEPTED, mask, chan);
-                if (freemask)
-                    free(mask);
-                return MOD_CONT;
-            }
-        }
-
-        /* Check whether target nick has equal/higher access 
-         * or whether the mask matches a user with higher/equal access - Viper */
-        if ((ci->flags & CI_PEACE) && nc) {
-            if ((nc == ci->founder) || (get_access_nc(nc, ci) >= get_access(u, ci))) {
-                notice_lang(s_ChanServ, u, PERMISSION_DENIED);
-                if (freemask)
-                    free(mask);
-                return MOD_CONT;
-            }
-        } else if ((ci->flags & CI_PEACE)) {
-            char buf[BUFSIZE];
-            /* Match against all currently online users with equal or
-             * higher access. - Viper */
-            for (i = 0; i < 1024; i++) {
-                for (u2 = userlist[i]; u2; u2 = u2->next) {
-                    if (is_founder(u2, ci) || (get_access(u2, ci) >= get_access(u, ci))) {
-                        if (match_usermask(mask, u2)) {
-                            notice_lang(s_ChanServ, u, PERMISSION_DENIED);
-                            free(mask);
-                            return MOD_CONT;
-                        }
-                    }
-                }
-            }
-
-            /* Match against the lastusermask of all nickalias's with equal
-             * or higher access. - Viper */
-            for (i = 0; i < 1024; i++) {
-                for (na2 = nalists[i]; na2; na2 = na2->next) {
-                    if (na2->status & NS_VERBOTEN)
-                        continue;
-
-                    if (na2->nc && ((na2->nc == ci->founder) || (get_access_nc(na2->nc, ci) 
-                            >= get_access(u, ci)))) {
-                        snprintf(buf, BUFSIZE, "%s!%s", na2->nick, na2->last_usermask);
-                        if (match_wild_nocase(mask, buf)) {
-                            notice_lang(s_ChanServ, u, PERMISSION_DENIED);
-                            free(mask);
-                            return MOD_CONT;
-                        }
-                    }
-                }
-            }
-        }
-
-        for (akick = ci->akick, i = 0; i < ci->akickcount; akick++, i++) {
-            if (!(akick->flags & AK_USED))
-                continue;
-            if ((akick->flags & AK_ISNICK) ? akick->u.nc == nc
-                : stricmp(akick->u.mask, mask) == 0) {
-                notice_lang(s_ChanServ, u, CHAN_AKICK_ALREADY_EXISTS,
-                            (akick->flags & AK_ISNICK) ? akick->u.nc->
-                            display : akick->u.mask, chan);
-                if (freemask)
-                    free(mask);
-                return MOD_CONT;
-            }
-        }
-
-        /* All entries should be in use so we don't have to go over
-         * the entire list. We simply add new entries at the end. */
-        if (ci->akickcount >= CSAutokickMax) {
-            notice_lang(s_ChanServ, u, CHAN_AKICK_REACHED_LIMIT, CSAutokickMax);
-            if (freemask)
-                free(mask);
-            return MOD_CONT;
-        }
-        ci->akickcount++;
-        ci->akick =
-            (AutoKick *)srealloc(ci->akick, sizeof(AutoKick) * ci->akickcount);
-        akick = &ci->akick[i];
-        akick->flags = AK_USED;
-        if (nc) {
-            akick->flags |= AK_ISNICK;
-            akick->u.nc = nc;
-        } else {
-            akick->u.mask = sstrdup(mask);
-        }
-        akick->creator = sstrdup(u->nick);
-        akick->addtime = time(NULL);
-        if (reason) {
-            if (strlen(reason) > 200)
-                reason[200] = '\0';
-            akick->reason = sstrdup(reason);
-        } else {
-            akick->reason = NULL;
-        }
-
-        /* Auto ENFORCE #63 */
-        c = findchan(ci->name);
-        if (c) {
-            cu = c->users;
-            while (cu) {
-                next = cu->next;
-                if (check_kick(cu->user, c->name, c->creation_time)) {
-                    argv[0] = sstrdup(c->name);
-                    argv[1] = sstrdup(cu->user->nick);
-                    if (akick->reason)
-                        argv[2] = sstrdup(akick->reason);
-                    else
-                        argv[2] = sstrdup("none");
-
-                    do_kick(s_ChanServ, 3, argv);
+	char *chan = strtok(NULL, " ");
+	char *cmd = strtok(NULL, " ");
+	char *mask = strtok(NULL, " ");
+	char *reason = strtok(NULL, "");
+	ChannelInfo *ci;
+	AutoKick *akick;
+	int i;
+	Channel *c;
+	struct c_userlist *cu = NULL;
+	struct c_userlist *next;
+	User *u2;
+	const char *argv[3];
+	int count = 0;
+
+	if (!cmd || (!mask && (!stricmp(cmd, "ADD") || !stricmp(cmd, "STICK")
+						   || !stricmp(cmd, "UNSTICK")
+						   || !stricmp(cmd, "DEL")))) {
+
+		syntax_error(s_ChanServ, u, "AKICK", CHAN_AKICK_SYNTAX);
+	} else if (!(ci = cs_findchan(chan))) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
+	} else if (ci->flags & CI_VERBOTEN) {
+		notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
+	} else if (!check_access(u, ci, CA_AKICK) && !is_services_admin(u)) {
+		notice_lang(s_ChanServ, u, ACCESS_DENIED);
+	} else if (stricmp(cmd, "ADD") == 0) {
+		NickAlias *na = findnick(mask), *na2;
+		NickCore *nc = NULL;
+		char *nick, *user, *host;
+		int freemask = 0;
+
+		if (readonly) {
+			notice_lang(s_ChanServ, u, CHAN_AKICK_DISABLED);
+			return MOD_CONT;
+		}
+
+		if (!na) {
+			split_usermask(mask, &nick, &user, &host);
+			mask =
+				(char *)scalloc(strlen(nick) + strlen(user) + strlen(host) + 3, 1);
+			freemask = 1;
+			sprintf(mask, "%s!%s@%s", nick, user, host);
+			free(nick);
+			free(user);
+			free(host);
+		} else {
+			if (na->status & NS_VERBOTEN) {
+				notice_lang(s_ChanServ, u, NICK_X_FORBIDDEN, mask);
+				return MOD_CONT;
+			}
+			nc = na->nc;
+		}
+
+		/* Check excepts BEFORE we get this far */
+		if (ircd->except) {
+			if (is_excepted_mask(ci, mask) == 1) {
+				notice_lang(s_ChanServ, u, CHAN_EXCEPTED, mask, chan);
+				if (freemask)
+					free(mask);
+				return MOD_CONT;
+			}
+		}
+
+		/* Check whether target nick has equal/higher access 
+		 * or whether the mask matches a user with higher/equal access - Viper */
+		if ((ci->flags & CI_PEACE) && nc) {
+			if ((nc == ci->founder) || (get_access_nc(nc, ci) >= get_access(u, ci))) {
+				notice_lang(s_ChanServ, u, PERMISSION_DENIED);
+				if (freemask)
+					free(mask);
+				return MOD_CONT;
+			}
+		} else if ((ci->flags & CI_PEACE)) {
+			char buf[BUFSIZE];
+			/* Match against all currently online users with equal or
+			 * higher access. - Viper */
+			for (i = 0; i < 1024; i++) {
+				for (u2 = userlist[i]; u2; u2 = u2->next) {
+					if (is_founder(u2, ci) || (get_access(u2, ci) >= get_access(u, ci))) {
+						if (match_usermask(mask, u2)) {
+							notice_lang(s_ChanServ, u, PERMISSION_DENIED);
+							free(mask);
+							return MOD_CONT;
+						}
+					}
+				}
+			}
+
+			/* Match against the lastusermask of all nickalias's with equal
+			 * or higher access. - Viper */
+			for (i = 0; i < 1024; i++) {
+				for (na2 = nalists[i]; na2; na2 = na2->next) {
+					if (na2->status & NS_VERBOTEN)
+						continue;
+
+					if (na2->nc && ((na2->nc == ci->founder) || (get_access_nc(na2->nc, ci) 
+							>= get_access(u, ci)))) {
+						snprintf(buf, BUFSIZE, "%s!%s", na2->nick, na2->last_usermask);
+						if (match_wild_nocase(mask, buf)) {
+							notice_lang(s_ChanServ, u, PERMISSION_DENIED);
+							free(mask);
+							return MOD_CONT;
+						}
+					}
+				}
+			}
+		}
+
+		for (akick = ci->akick, i = 0; i < ci->akickcount; akick++, i++) {
+			if (!(akick->flags & AK_USED))
+				continue;
+			if ((akick->flags & AK_ISNICK) ? akick->u.nc == nc
+				: stricmp(akick->u.mask, mask) == 0) {
+				notice_lang(s_ChanServ, u, CHAN_AKICK_ALREADY_EXISTS,
+							(akick->flags & AK_ISNICK) ? akick->u.nc->
+							display : akick->u.mask, chan);
+				if (freemask)
+					free(mask);
+				return MOD_CONT;
+			}
+		}
+
+		/* All entries should be in use so we don't have to go over
+		 * the entire list. We simply add new entries at the end. */
+		if (ci->akickcount >= CSAutokickMax) {
+			notice_lang(s_ChanServ, u, CHAN_AKICK_REACHED_LIMIT, CSAutokickMax);
+			if (freemask)
+				free(mask);
+			return MOD_CONT;
+		}
+		ci->akickcount++;
+		ci->akick =
+			(AutoKick *)srealloc(ci->akick, sizeof(AutoKick) * ci->akickcount);
+		akick = &ci->akick[i];
+		akick->flags = AK_USED;
+		if (nc) {
+			akick->flags |= AK_ISNICK;
+			akick->u.nc = nc;
+		} else {
+			akick->u.mask = sstrdup(mask);
+		}
+		akick->creator = sstrdup(u->nick);
+		akick->addtime = time(NULL);
+		if (reason) {
+			if (strlen(reason) > 200)
+				reason[200] = '\0';
+			akick->reason = sstrdup(reason);
+		} else {
+			akick->reason = NULL;
+		}
+
+		/* Auto ENFORCE #63 */
+		c = findchan(ci->name);
+		if (c) {
+			cu = c->users;
+			while (cu) {
+				next = cu->next;
+				if (check_kick(cu->user, c->name, c->creation_time)) {
+					argv[0] = sstrdup(c->name);
+					argv[1] = sstrdup(cu->user->nick);
+					if (akick->reason)
+						argv[2] = sstrdup(akick->reason);
+					else
+						argv[2] = sstrdup("none");
+
+					do_kick(s_ChanServ, 3, argv);
 
 			// XXX: casting is necessary thanks to strict g++ stuff, really, we should be using std::string here though.
-                    free((void *)argv[2]);
-                    free((void *)argv[1]);
-                    free((void *)argv[0]);
-                    count++;
-
-                }
-                cu = next;
-            }
-        }
-        notice_lang(s_ChanServ, u, CHAN_AKICK_ADDED, mask, chan);
-
-        if (count)
-            notice_lang(s_ChanServ, u, CHAN_AKICK_ENFORCE_DONE, chan,
-                        count);
-
-        if (freemask)
-            free(mask);
-
-    } else if (stricmp(cmd, "STICK") == 0) {
-        NickAlias *na;
-        NickCore *nc;
-
-        if (readonly) {
-            notice_lang(s_ChanServ, u, CHAN_AKICK_DISABLED);
-            return MOD_CONT;
-        }
-
-        if (ci->akickcount == 0) {
-            notice_lang(s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name);
-            return MOD_CONT;
-        }
-
-        na = findnick(mask);
-        nc = (na ? na->nc : NULL);
-
-        for (akick = ci->akick, i = 0; i < ci->akickcount; akick++, i++) {
-            if (!(akick->flags & AK_USED) || (akick->flags & AK_ISNICK))
-                continue;
-            if (!stricmp(akick->u.mask, mask))
-                break;
-        }
-
-        if (i == ci->akickcount) {
-            notice_lang(s_ChanServ, u, CHAN_AKICK_NOT_FOUND, mask,
-                        ci->name);
-            return MOD_CONT;
-        }
-
-        akick->flags |= AK_STUCK;
-        notice_lang(s_ChanServ, u, CHAN_AKICK_STUCK, akick->u.mask,
-                    ci->name);
-
-        if (ci->c)
-            stick_mask(ci, akick);
-    } else if (stricmp(cmd, "UNSTICK") == 0) {
-        NickAlias *na;
-        NickCore *nc;
-
-        if (readonly) {
-            notice_lang(s_ChanServ, u, CHAN_AKICK_DISABLED);
-            return MOD_CONT;
-        }
-
-        if (ci->akickcount == 0) {
-            notice_lang(s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name);
-            return MOD_CONT;
-        }
-
-        na = findnick(mask);
-        nc = (na ? na->nc : NULL);
-
-        for (akick = ci->akick, i = 0; i < ci->akickcount; akick++, i++) {
-            if (!(akick->flags & AK_USED) || (akick->flags & AK_ISNICK))
-                continue;
-            if (!stricmp(akick->u.mask, mask))
-                break;
-        }
-
-        if (i == ci->akickcount) {
-            notice_lang(s_ChanServ, u, CHAN_AKICK_NOT_FOUND, mask,
-                        ci->name);
-            return MOD_CONT;
-        }
-
-        akick->flags &= ~AK_STUCK;
-        notice_lang(s_ChanServ, u, CHAN_AKICK_UNSTUCK, akick->u.mask,
-                    ci->name);
-
-    } else if (stricmp(cmd, "DEL") == 0) {
-        int deleted, a, b;
-
-        if (readonly) {
-            notice_lang(s_ChanServ, u, CHAN_AKICK_DISABLED);
-            return MOD_CONT;
-        }
-
-        if (ci->akickcount == 0) {
-            notice_lang(s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, chan);
-            return MOD_CONT;
-        }
-
-        /* Special case: is it a number/list?  Only do search if it isn't. */
-        if (isdigit(*mask) && strspn(mask, "1234567890,-") == strlen(mask)) {
-            int last = -1;
-            deleted = process_numlist(mask, &count, akick_del_callback, u,
-                                      ci, &last);
-            if (!deleted) {
-                if (count == 1) {
-                    notice_lang(s_ChanServ, u, CHAN_AKICK_NO_SUCH_ENTRY,
-                                last, ci->name);
-                } else {
-                    notice_lang(s_ChanServ, u, CHAN_AKICK_NO_MATCH,
-                                ci->name);
-                }
-            } else if (deleted == 1) {
-                notice_lang(s_ChanServ, u, CHAN_AKICK_DELETED_ONE,
-                            ci->name);
-            } else {
-                notice_lang(s_ChanServ, u, CHAN_AKICK_DELETED_SEVERAL,
-                            deleted, ci->name);
-            }
-        } else {
-            NickAlias *na = findnick(mask);
-            NickCore *nc = (na ? na->nc : NULL);
-
-            for (akick = ci->akick, i = 0; i < ci->akickcount;
-                 akick++, i++) {
-                if (!(akick->flags & AK_USED))
-                    continue;
-                if (((akick->flags & AK_ISNICK) && akick->u.nc == nc)
-                    || (!(akick->flags & AK_ISNICK)
-                        && stricmp(akick->u.mask, mask) == 0))
-                    break;
-            }
-            if (i == ci->akickcount) {
-                notice_lang(s_ChanServ, u, CHAN_AKICK_NOT_FOUND, mask,
-                            chan);
-                return MOD_CONT;
-            }
-            notice_lang(s_ChanServ, u, CHAN_AKICK_DELETED, mask, chan);
-            akick_del(u, akick);
-            deleted = 1;
-        }
-        if (deleted) {
-            /* Reordering - DrStein */
-            for (b = 0; b < ci->akickcount; b++) {
-                if (ci->akick[b].flags & AK_USED) {
-                    for (a = 0; a < ci->akickcount; a++) {
-                        if (a > b)
-                            break;
-                        if (!(ci->akick[a].flags & AK_USED)) {
-                            ci->akick[a].flags = ci->akick[b].flags;
-                            if (ci->akick[b].flags & AK_ISNICK) {
-                                ci->akick[a].u.nc = ci->akick[b].u.nc;
-                            } else {
-                                ci->akick[a].u.mask =
-                                    sstrdup(ci->akick[b].u.mask);
-                            }
-                            /* maybe we should first check whether there
-                               is a reason before we sstdrup it -Certus */
-                            if (ci->akick[b].reason)
-                                ci->akick[a].reason =
-                                    sstrdup(ci->akick[b].reason);
-                            else
-                                ci->akick[a].reason = NULL;
-                            ci->akick[a].creator =
-                                sstrdup(ci->akick[b].creator);
-                            ci->akick[a].addtime = ci->akick[b].addtime;
-
-                            akick_del(u, &ci->akick[b]);
-                            break;
-                        }
-                    }
-                }
-            }
-            /* After reordering only the entries at the end could still be empty.
-             * We ll free the places no longer in use... - Viper */
-            for (i = ci->akickcount - 1; i >= 0; i--) {
-                if (ci->akick[i].flags & AK_USED)
-                    break;
-
-                ci->akickcount--;
-            }
-            ci->akick =
-                (AutoKick *)srealloc(ci->akick,sizeof(AutoKick) * ci->akickcount);
-        }
-    } else if (stricmp(cmd, "LIST") == 0) {
-        int sent_header = 0;
-
-        if (ci->akickcount == 0) {
-            notice_lang(s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, chan);
-            return MOD_CONT;
-        }
-        if (mask && isdigit(*mask) &&
-            strspn(mask, "1234567890,-") == strlen(mask)) {
-            process_numlist(mask, NULL, akick_list_callback, u, ci,
-                            &sent_header);
-        } else {
-            for (akick = ci->akick, i = 0; i < ci->akickcount;
-                 akick++, i++) {
-                if (!(akick->flags & AK_USED))
-                    continue;
-                if (mask) {
-                    if (!(akick->flags & AK_ISNICK)
-                        && !match_wild_nocase(mask, akick->u.mask))
-                        continue;
-                    if ((akick->flags & AK_ISNICK)
-                        && !match_wild_nocase(mask, akick->u.nc->display))
-                        continue;
-                }
-                akick_list(u, i, ci, &sent_header);
-            }
-        }
-        if (!sent_header)
-            notice_lang(s_ChanServ, u, CHAN_AKICK_NO_MATCH, chan);
-
-    } else if (stricmp(cmd, "VIEW") == 0) {
-        int sent_header = 0;
-
-        if (ci->akickcount == 0) {
-            notice_lang(s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, chan);
-            return MOD_CONT;
-        }
-        if (mask && isdigit(*mask) &&
-            strspn(mask, "1234567890,-") == strlen(mask)) {
-            process_numlist(mask, NULL, akick_view_callback, u, ci,
-                            &sent_header);
-        } else {
-            for (akick = ci->akick, i = 0; i < ci->akickcount;
-                 akick++, i++) {
-                if (!(akick->flags & AK_USED))
-                    continue;
-                if (mask) {
-                    if (!(akick->flags & AK_ISNICK)
-                        && !match_wild_nocase(mask, akick->u.mask))
-                        continue;
-                    if ((akick->flags & AK_ISNICK)
-                        && !match_wild_nocase(mask, akick->u.nc->display))
-                        continue;
-                }
-                akick_view(u, i, ci, &sent_header);
-            }
-        }
-        if (!sent_header)
-            notice_lang(s_ChanServ, u, CHAN_AKICK_NO_MATCH, chan);
-
-    } else if (stricmp(cmd, "ENFORCE") == 0) {
-        c = findchan(ci->name);
-        cu = NULL;
-        count = 0;
-
-        if (!c) {
-            notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, ci->name);
-            return MOD_CONT;
-        }
-
-        cu = c->users;
-
-        while (cu) {
-            next = cu->next;
-            if (check_kick(cu->user, c->name, c->creation_time)) {
-                argv[0] = sstrdup(c->name);
-                argv[1] = sstrdup(cu->user->nick);
-                argv[2] = sstrdup(CSAutokickReason);
-
-                do_kick(s_ChanServ, 3, argv);
-
-                free((void *)argv[2]);
-                free((void *)argv[1]);
-                free((void *)argv[0]);
-
-                count++;
-            }
-            cu = next;
-        }
-
-        notice_lang(s_ChanServ, u, CHAN_AKICK_ENFORCE_DONE, chan, count);
-
-    } else if (stricmp(cmd, "CLEAR") == 0) {
-
-        if (readonly) {
-            notice_lang(s_ChanServ, u, CHAN_AKICK_DISABLED);
-            return MOD_CONT;
-        }
-
-        for (akick = ci->akick, i = 0; i < ci->akickcount; akick++, i++) {
-            if (!(akick->flags & AK_USED))
-                continue;
-            akick_del(u, akick);
-        }
-
-        free(ci->akick);
-        ci->akick = NULL;
-        ci->akickcount = 0;
-
-        notice_lang(s_ChanServ, u, CHAN_AKICK_CLEAR, ci->name);
-
-    } else {
-        syntax_error(s_ChanServ, u, "AKICK", CHAN_AKICK_SYNTAX);
-    }
-    return MOD_CONT;
+					free((void *)argv[2]);
+					free((void *)argv[1]);
+					free((void *)argv[0]);
+					count++;
+
+				}
+				cu = next;
+			}
+		}
+		notice_lang(s_ChanServ, u, CHAN_AKICK_ADDED, mask, chan);
+
+		if (count)
+			notice_lang(s_ChanServ, u, CHAN_AKICK_ENFORCE_DONE, chan,
+						count);
+
+		if (freemask)
+			free(mask);
+
+	} else if (stricmp(cmd, "STICK") == 0) {
+		NickAlias *na;
+		NickCore *nc;
+
+		if (readonly) {
+			notice_lang(s_ChanServ, u, CHAN_AKICK_DISABLED);
+			return MOD_CONT;
+		}
+
+		if (ci->akickcount == 0) {
+			notice_lang(s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name);
+			return MOD_CONT;
+		}
+
+		na = findnick(mask);
+		nc = (na ? na->nc : NULL);
+
+		for (akick = ci->akick, i = 0; i < ci->akickcount; akick++, i++) {
+			if (!(akick->flags & AK_USED) || (akick->flags & AK_ISNICK))
+				continue;
+			if (!stricmp(akick->u.mask, mask))
+				break;
+		}
+
+		if (i == ci->akickcount) {
+			notice_lang(s_ChanServ, u, CHAN_AKICK_NOT_FOUND, mask,
+						ci->name);
+			return MOD_CONT;
+		}
+
+		akick->flags |= AK_STUCK;
+		notice_lang(s_ChanServ, u, CHAN_AKICK_STUCK, akick->u.mask,
+					ci->name);
+
+		if (ci->c)
+			stick_mask(ci, akick);
+	} else if (stricmp(cmd, "UNSTICK") == 0) {
+		NickAlias *na;
+		NickCore *nc;
+
+		if (readonly) {
+			notice_lang(s_ChanServ, u, CHAN_AKICK_DISABLED);
+			return MOD_CONT;
+		}
+
+		if (ci->akickcount == 0) {
+			notice_lang(s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name);
+			return MOD_CONT;
+		}
+
+		na = findnick(mask);
+		nc = (na ? na->nc : NULL);
+
+		for (akick = ci->akick, i = 0; i < ci->akickcount; akick++, i++) {
+			if (!(akick->flags & AK_USED) || (akick->flags & AK_ISNICK))
+				continue;
+			if (!stricmp(akick->u.mask, mask))
+				break;
+		}
+
+		if (i == ci->akickcount) {
+			notice_lang(s_ChanServ, u, CHAN_AKICK_NOT_FOUND, mask,
+						ci->name);
+			return MOD_CONT;
+		}
+
+		akick->flags &= ~AK_STUCK;
+		notice_lang(s_ChanServ, u, CHAN_AKICK_UNSTUCK, akick->u.mask,
+					ci->name);
+
+	} else if (stricmp(cmd, "DEL") == 0) {
+		int deleted, a, b;
+
+		if (readonly) {
+			notice_lang(s_ChanServ, u, CHAN_AKICK_DISABLED);
+			return MOD_CONT;
+		}
+
+		if (ci->akickcount == 0) {
+			notice_lang(s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, chan);
+			return MOD_CONT;
+		}
+
+		/* Special case: is it a number/list?  Only do search if it isn't. */
+		if (isdigit(*mask) && strspn(mask, "1234567890,-") == strlen(mask)) {
+			int last = -1;
+			deleted = process_numlist(mask, &count, akick_del_callback, u,
+									  ci, &last);
+			if (!deleted) {
+				if (count == 1) {
+					notice_lang(s_ChanServ, u, CHAN_AKICK_NO_SUCH_ENTRY,
+								last, ci->name);
+				} else {
+					notice_lang(s_ChanServ, u, CHAN_AKICK_NO_MATCH,
+								ci->name);
+				}
+			} else if (deleted == 1) {
+				notice_lang(s_ChanServ, u, CHAN_AKICK_DELETED_ONE,
+							ci->name);
+			} else {
+				notice_lang(s_ChanServ, u, CHAN_AKICK_DELETED_SEVERAL,
+							deleted, ci->name);
+			}
+		} else {
+			NickAlias *na = findnick(mask);
+			NickCore *nc = (na ? na->nc : NULL);
+
+			for (akick = ci->akick, i = 0; i < ci->akickcount;
+				 akick++, i++) {
+				if (!(akick->flags & AK_USED))
+					continue;
+				if (((akick->flags & AK_ISNICK) && akick->u.nc == nc)
+					|| (!(akick->flags & AK_ISNICK)
+						&& stricmp(akick->u.mask, mask) == 0))
+					break;
+			}
+			if (i == ci->akickcount) {
+				notice_lang(s_ChanServ, u, CHAN_AKICK_NOT_FOUND, mask,
+							chan);
+				return MOD_CONT;
+			}
+			notice_lang(s_ChanServ, u, CHAN_AKICK_DELETED, mask, chan);
+			akick_del(u, akick);
+			deleted = 1;
+		}
+		if (deleted) {
+			/* Reordering - DrStein */
+			for (b = 0; b < ci->akickcount; b++) {
+				if (ci->akick[b].flags & AK_USED) {
+					for (a = 0; a < ci->akickcount; a++) {
+						if (a > b)
+							break;
+						if (!(ci->akick[a].flags & AK_USED)) {
+							ci->akick[a].flags = ci->akick[b].flags;
+							if (ci->akick[b].flags & AK_ISNICK) {
+								ci->akick[a].u.nc = ci->akick[b].u.nc;
+							} else {
+								ci->akick[a].u.mask =
+									sstrdup(ci->akick[b].u.mask);
+							}
+							/* maybe we should first check whether there
+							   is a reason before we sstdrup it -Certus */
+							if (ci->akick[b].reason)
+								ci->akick[a].reason =
+									sstrdup(ci->akick[b].reason);
+							else
+								ci->akick[a].reason = NULL;
+							ci->akick[a].creator =
+								sstrdup(ci->akick[b].creator);
+							ci->akick[a].addtime = ci->akick[b].addtime;
+
+							akick_del(u, &ci->akick[b]);
+							break;
+						}
+					}
+				}
+			}
+			/* After reordering only the entries at the end could still be empty.
+			 * We ll free the places no longer in use... - Viper */
+			for (i = ci->akickcount - 1; i >= 0; i--) {
+				if (ci->akick[i].flags & AK_USED)
+					break;
+
+				ci->akickcount--;
+			}
+			ci->akick =
+				(AutoKick *)srealloc(ci->akick,sizeof(AutoKick) * ci->akickcount);
+		}
+	} else if (stricmp(cmd, "LIST") == 0) {
+		int sent_header = 0;
+
+		if (ci->akickcount == 0) {
+			notice_lang(s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, chan);
+			return MOD_CONT;
+		}
+		if (mask && isdigit(*mask) &&
+			strspn(mask, "1234567890,-") == strlen(mask)) {
+			process_numlist(mask, NULL, akick_list_callback, u, ci,
+							&sent_header);
+		} else {
+			for (akick = ci->akick, i = 0; i < ci->akickcount;
+				 akick++, i++) {
+				if (!(akick->flags & AK_USED))
+					continue;
+				if (mask) {
+					if (!(akick->flags & AK_ISNICK)
+						&& !match_wild_nocase(mask, akick->u.mask))
+						continue;
+					if ((akick->flags & AK_ISNICK)
+						&& !match_wild_nocase(mask, akick->u.nc->display))
+						continue;
+				}
+				akick_list(u, i, ci, &sent_header);
+			}
+		}
+		if (!sent_header)
+			notice_lang(s_ChanServ, u, CHAN_AKICK_NO_MATCH, chan);
+
+	} else if (stricmp(cmd, "VIEW") == 0) {
+		int sent_header = 0;
+
+		if (ci->akickcount == 0) {
+			notice_lang(s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, chan);
+			return MOD_CONT;
+		}
+		if (mask && isdigit(*mask) &&
+			strspn(mask, "1234567890,-") == strlen(mask)) {
+			process_numlist(mask, NULL, akick_view_callback, u, ci,
+							&sent_header);
+		} else {
+			for (akick = ci->akick, i = 0; i < ci->akickcount;
+				 akick++, i++) {
+				if (!(akick->flags & AK_USED))
+					continue;
+				if (mask) {
+					if (!(akick->flags & AK_ISNICK)
+						&& !match_wild_nocase(mask, akick->u.mask))
+						continue;
+					if ((akick->flags & AK_ISNICK)
+						&& !match_wild_nocase(mask, akick->u.nc->display))
+						continue;
+				}
+				akick_view(u, i, ci, &sent_header);
+			}
+		}
+		if (!sent_header)
+			notice_lang(s_ChanServ, u, CHAN_AKICK_NO_MATCH, chan);
+
+	} else if (stricmp(cmd, "ENFORCE") == 0) {
+		c = findchan(ci->name);
+		cu = NULL;
+		count = 0;
+
+		if (!c) {
+			notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, ci->name);
+			return MOD_CONT;
+		}
+
+		cu = c->users;
+
+		while (cu) {
+			next = cu->next;
+			if (check_kick(cu->user, c->name, c->creation_time)) {
+				argv[0] = sstrdup(c->name);
+				argv[1] = sstrdup(cu->user->nick);
+				argv[2] = sstrdup(CSAutokickReason);
+
+				do_kick(s_ChanServ, 3, argv);
+
+				free((void *)argv[2]);
+				free((void *)argv[1]);
+				free((void *)argv[0]);
+
+				count++;
+			}
+			cu = next;
+		}
+
+		notice_lang(s_ChanServ, u, CHAN_AKICK_ENFORCE_DONE, chan, count);
+
+	} else if (stricmp(cmd, "CLEAR") == 0) {
+
+		if (readonly) {
+			notice_lang(s_ChanServ, u, CHAN_AKICK_DISABLED);
+			return MOD_CONT;
+		}
+
+		for (akick = ci->akick, i = 0; i < ci->akickcount; akick++, i++) {
+			if (!(akick->flags & AK_USED))
+				continue;
+			akick_del(u, akick);
+		}
+
+		free(ci->akick);
+		ci->akick = NULL;
+		ci->akickcount = 0;
+
+		notice_lang(s_ChanServ, u, CHAN_AKICK_CLEAR, ci->name);
+
+	} else {
+		syntax_error(s_ChanServ, u, "AKICK", CHAN_AKICK_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 
 int get_access_nc(NickCore *nc, ChannelInfo *ci)
 {
-    ChanAccess *access;
-    if (!ci || !nc)
-        return 0;
+	ChanAccess *access;
+	if (!ci || !nc)
+		return 0;
 
-    if ((access = get_access_entry(nc, ci)))
-        return access->level;
-    return 0;
+	if ((access = get_access_entry(nc, ci)))
+		return access->level;
+	return 0;
 }
 
 
diff --git a/src/core/cs_ban.c b/src/core/cs_ban.c
index b5b921900..4f8db1fd0 100644
--- a/src/core/cs_ban.c
+++ b/src/core/cs_ban.c
@@ -46,8 +46,8 @@ class CSBan : public Module
  **/
 void myChanServHelp(User * u)
 {
-    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_BAN);
-    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_UNBAN);
+	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_BAN);
+	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_UNBAN);
 }
 
 /**
@@ -57,132 +57,132 @@ void myChanServHelp(User * u)
  **/
 int do_ban(User * u)
 {
-    char *chan = strtok(NULL, " ");
-    char *params = strtok(NULL, " ");
-    char *reason = strtok(NULL, "");
-
-    Channel *c;
-    ChannelInfo *ci;
-    User *u2;
-
-    int is_same;
-
-    if (!reason) {
-        reason = (char *)"Requested"; // XXX unsafe cast -- w00t
-    } else {
-        if (strlen(reason) > 200)
-            reason[200] = '\0';
-    }
-
-    if (!chan) {
-        struct u_chanlist *uc, *next;
-
-        /* Bans the user on every channels he is on. */
-
-        for (uc = u->chans; uc; uc = next) {
-            next = uc->next;
-            if ((ci = uc->chan->ci) && !(ci->flags & CI_VERBOTEN)
-                && check_access(u, ci, CA_BANME)) {
-                const char *av[3];
-                char mask[BUFSIZE];
-
-                /*
-                 * Dont ban/kick the user on channels where he is excepted
-                 * to prevent services <-> server wars.
-                 */
-                if (ircd->except) {
-                    if (is_excepted(ci, u))
-                        notice_lang(s_ChanServ, u, CHAN_EXCEPTED,
-                                    u->nick, ci->name);
-                    continue;
-                }
-                if (is_protected(u)) {
-                    notice_lang(s_ChanServ, u, PERMISSION_DENIED);
-                    continue;
-                }
-
-                av[0] = "+b";
-                get_idealban(ci, u, mask, sizeof(mask));
-                av[1] = mask;
-                ircdproto->SendMode(whosends(ci), uc->chan->name, "+b %s",
-                               av[1]);
-                chan_set_modes(s_ChanServ, uc->chan, 2, av, 1);
-
-                if ((ci->flags & CI_SIGNKICK)
-                    || ((ci->flags & CI_SIGNKICK_LEVEL)
-                        && !check_access(u, ci, CA_SIGNKICK)))
-                    ircdproto->SendKick(whosends(ci), ci->name, u->nick,
-                                   "%s (%s)", reason, u->nick);
-                else
-                    ircdproto->SendKick(whosends(ci), ci->name, u->nick, "%s",
-                                   reason);
+	char *chan = strtok(NULL, " ");
+	char *params = strtok(NULL, " ");
+	char *reason = strtok(NULL, "");
+
+	Channel *c;
+	ChannelInfo *ci;
+	User *u2;
+
+	int is_same;
+
+	if (!reason) {
+		reason = (char *)"Requested"; // XXX unsafe cast -- w00t
+	} else {
+		if (strlen(reason) > 200)
+			reason[200] = '\0';
+	}
+
+	if (!chan) {
+		struct u_chanlist *uc, *next;
+
+		/* Bans the user on every channels he is on. */
+
+		for (uc = u->chans; uc; uc = next) {
+			next = uc->next;
+			if ((ci = uc->chan->ci) && !(ci->flags & CI_VERBOTEN)
+				&& check_access(u, ci, CA_BANME)) {
+				const char *av[3];
+				char mask[BUFSIZE];
+
+				/*
+				 * Dont ban/kick the user on channels where he is excepted
+				 * to prevent services <-> server wars.
+				 */
+				if (ircd->except) {
+					if (is_excepted(ci, u))
+						notice_lang(s_ChanServ, u, CHAN_EXCEPTED,
+									u->nick, ci->name);
+					continue;
+				}
+				if (is_protected(u)) {
+					notice_lang(s_ChanServ, u, PERMISSION_DENIED);
+					continue;
+				}
+
+				av[0] = "+b";
+				get_idealban(ci, u, mask, sizeof(mask));
+				av[1] = mask;
+				ircdproto->SendMode(whosends(ci), uc->chan->name, "+b %s",
+							   av[1]);
+				chan_set_modes(s_ChanServ, uc->chan, 2, av, 1);
+
+				if ((ci->flags & CI_SIGNKICK)
+					|| ((ci->flags & CI_SIGNKICK_LEVEL)
+						&& !check_access(u, ci, CA_SIGNKICK)))
+					ircdproto->SendKick(whosends(ci), ci->name, u->nick,
+								   "%s (%s)", reason, u->nick);
+				else
+					ircdproto->SendKick(whosends(ci), ci->name, u->nick, "%s",
+								   reason);
 
 		const char *kav[4];
-                kav[0] = ci->name;
-                kav[1] = u->nick;
-                kav[2] = reason;
-                do_kick(s_ChanServ, 3, kav);
-            }
-        }
-
-        return MOD_CONT;
-    } else if (!params) {
-        params = u->nick;
-    }
-
-    is_same = (params == u->nick) ? 1 : (stricmp(params, u->nick) == 0);
-
-    if (!(c = findchan(chan))) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
-    } else if (!(ci = c->ci)) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
-    } else if (ci->flags & CI_VERBOTEN) {
-        notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
-    } else if (is_same ? !(u2 = u) : !(u2 = finduser(params))) {
-        notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, params);
-    } else if (!is_same ? !check_access(u, ci, CA_BAN) :
-               !check_access(u, ci, CA_BANME)) {
-        notice_lang(s_ChanServ, u, ACCESS_DENIED);
-    } else if (!is_same && (ci->flags & CI_PEACE)
-               && (get_access(u2, ci) >= get_access(u, ci))) {
-        notice_lang(s_ChanServ, u, PERMISSION_DENIED);
-        /*
-         * Dont ban/kick the user on channels where he is excepted
-         * to prevent services <-> server wars.
-         */
-    } else if (ircd->except && is_excepted(ci, u2)) {
-        notice_lang(s_ChanServ, u, CHAN_EXCEPTED, u2->nick, ci->name);
-    } else if (ircd->protectedumode && is_protected(u2)) {
-        notice_lang(s_ChanServ, u, PERMISSION_DENIED);
-    } else {
-        const char *av[3];
-        char mask[BUFSIZE];
-
-        av[0] = "+b";
-        get_idealban(ci, u2, mask, sizeof(mask));
-        av[1] = mask;
-        ircdproto->SendMode(whosends(ci), c->name, "+b %s", av[1]);
-        chan_set_modes(s_ChanServ, c, 2, av, 1);
-
-        /* We still allow host banning while not allowing to kick */
-        if (!is_on_chan(c, u2))
-            return MOD_CONT;
-
-        if ((ci->flags & CI_SIGNKICK)
-            || ((ci->flags & CI_SIGNKICK_LEVEL)
-                && !check_access(u, ci, CA_SIGNKICK)))
-            ircdproto->SendKick(whosends(ci), ci->name, params, "%s (%s)",
-                           reason, u->nick);
-        else
-            ircdproto->SendKick(whosends(ci), ci->name, params, "%s", reason);
+				kav[0] = ci->name;
+				kav[1] = u->nick;
+				kav[2] = reason;
+				do_kick(s_ChanServ, 3, kav);
+			}
+		}
+
+		return MOD_CONT;
+	} else if (!params) {
+		params = u->nick;
+	}
+
+	is_same = (params == u->nick) ? 1 : (stricmp(params, u->nick) == 0);
+
+	if (!(c = findchan(chan))) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
+	} else if (!(ci = c->ci)) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
+	} else if (ci->flags & CI_VERBOTEN) {
+		notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
+	} else if (is_same ? !(u2 = u) : !(u2 = finduser(params))) {
+		notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, params);
+	} else if (!is_same ? !check_access(u, ci, CA_BAN) :
+			   !check_access(u, ci, CA_BANME)) {
+		notice_lang(s_ChanServ, u, ACCESS_DENIED);
+	} else if (!is_same && (ci->flags & CI_PEACE)
+			   && (get_access(u2, ci) >= get_access(u, ci))) {
+		notice_lang(s_ChanServ, u, PERMISSION_DENIED);
+		/*
+		 * Dont ban/kick the user on channels where he is excepted
+		 * to prevent services <-> server wars.
+		 */
+	} else if (ircd->except && is_excepted(ci, u2)) {
+		notice_lang(s_ChanServ, u, CHAN_EXCEPTED, u2->nick, ci->name);
+	} else if (ircd->protectedumode && is_protected(u2)) {
+		notice_lang(s_ChanServ, u, PERMISSION_DENIED);
+	} else {
+		const char *av[3];
+		char mask[BUFSIZE];
+
+		av[0] = "+b";
+		get_idealban(ci, u2, mask, sizeof(mask));
+		av[1] = mask;
+		ircdproto->SendMode(whosends(ci), c->name, "+b %s", av[1]);
+		chan_set_modes(s_ChanServ, c, 2, av, 1);
+
+		/* We still allow host banning while not allowing to kick */
+		if (!is_on_chan(c, u2))
+			return MOD_CONT;
+
+		if ((ci->flags & CI_SIGNKICK)
+			|| ((ci->flags & CI_SIGNKICK_LEVEL)
+				&& !check_access(u, ci, CA_SIGNKICK)))
+			ircdproto->SendKick(whosends(ci), ci->name, params, "%s (%s)",
+						   reason, u->nick);
+		else
+			ircdproto->SendKick(whosends(ci), ci->name, params, "%s", reason);
 
 	const char *kav[4];
-        kav[0] = ci->name;
-        kav[1] = params;
-        kav[2] = reason;
-        do_kick(s_ChanServ, 3, kav);
-    }
-    return MOD_CONT;
+		kav[0] = ci->name;
+		kav[1] = params;
+		kav[2] = reason;
+		do_kick(s_ChanServ, 3, kav);
+	}
+	return MOD_CONT;
 }
 
 /**
@@ -192,25 +192,25 @@ int do_ban(User * u)
  **/
 int do_unban(User * u)
 {
-    char *chan = strtok(NULL, " ");
-    Channel *c;
-    ChannelInfo *ci;
-
-    if (!chan) {
-        syntax_error(s_ChanServ, u, "UNBAN", CHAN_UNBAN_SYNTAX);
-    } else if (!(c = findchan(chan))) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
-    } else if (!(ci = c->ci)) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
-    } else if (ci->flags & CI_VERBOTEN) {
-        notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
-    } else if (!check_access(u, ci, CA_UNBAN)) {
-        notice_lang(s_ChanServ, u, PERMISSION_DENIED);
-    } else {
-        common_unban(ci, u->nick);
-        notice_lang(s_ChanServ, u, CHAN_UNBANNED, chan);
-    }
-    return MOD_CONT;
+	char *chan = strtok(NULL, " ");
+	Channel *c;
+	ChannelInfo *ci;
+
+	if (!chan) {
+		syntax_error(s_ChanServ, u, "UNBAN", CHAN_UNBAN_SYNTAX);
+	} else if (!(c = findchan(chan))) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
+	} else if (!(ci = c->ci)) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
+	} else if (ci->flags & CI_VERBOTEN) {
+		notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
+	} else if (!check_access(u, ci, CA_UNBAN)) {
+		notice_lang(s_ChanServ, u, PERMISSION_DENIED);
+	} else {
+		common_unban(ci, u->nick);
+		notice_lang(s_ChanServ, u, CHAN_UNBANNED, chan);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("cs_ban", CSBan)
diff --git a/src/core/cs_clear.c b/src/core/cs_clear.c
index a1b4bc8e7..9fca88548 100644
--- a/src/core/cs_clear.c
+++ b/src/core/cs_clear.c
@@ -44,7 +44,7 @@ class CSClear : public Module
  **/
 void myChanServHelp(User * u)
 {
-    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_CLEAR);
+	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_CLEAR);
 }
 
 /**
@@ -54,308 +54,308 @@ void myChanServHelp(User * u)
  **/
 int do_clear(User * u)
 {
-    char *chan = strtok(NULL, " ");
-    char *what = strtok(NULL, " ");
-    Channel *c;
-    ChannelInfo *ci;
-
-    if (!what) {
-        syntax_error(s_ChanServ, u, "CLEAR", CHAN_CLEAR_SYNTAX);
-    } else if (!(c = findchan(chan))) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
-    } else if (!(ci = c->ci)) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
-    } else if (ci->flags & CI_VERBOTEN) {
-        notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
-    } else if (!u || !check_access(u, ci, CA_CLEAR)) {
-        notice_lang(s_ChanServ, u, PERMISSION_DENIED);
-    } else if (stricmp(what, "bans") == 0) {
-        const char *av[2];
-        Entry *ban, *next;
-
-        if (c->bans && c->bans->count) {
-            for (ban = c->bans->entries; ban; ban = next) {
-                next = ban->next;
-                av[0] = "-b";
-                av[1] = ban->mask;
-                ircdproto->SendMode(whosends(ci), chan, "-b %s", ban->mask);
-                chan_set_modes(whosends(ci)->nick, c, 2, av, 0);
-            }
-        }
-
-        notice_lang(s_ChanServ, u, CHAN_CLEARED_BANS, chan);
-    } else if (ircd->except && stricmp(what, "excepts") == 0) {
-        const char *av[2];
-        Entry *except, *next;
-
-        if (c->excepts && c->excepts->count) {
-            for (except = c->excepts->entries; except; except = next) {
-                next = except->next;
-                av[0] = "-e";
-                av[1] = except->mask;
-                ircdproto->SendMode(whosends(ci), chan, "-e %s", except->mask);
-                chan_set_modes(whosends(ci)->nick, c, 2, av, 0);
-            }
-        }
-        notice_lang(s_ChanServ, u, CHAN_CLEARED_EXCEPTS, chan);
-
-    } else if (ircd->invitemode && stricmp(what, "invites") == 0) {
-        const char *av[2];
-        Entry *invite, *next;
-
-        if (c->invites && c->invites->count) {
-            for (invite = c->invites->entries; invite; invite = next) {
-                next = invite->next;
-                av[0] = "-I";
-                av[1] = invite->mask;
-                ircdproto->SendMode(whosends(ci), chan, "-I %s", invite->mask);
-                chan_set_modes(whosends(ci)->nick, c, 2, av, 0);
-            }
-        }
-        notice_lang(s_ChanServ, u, CHAN_CLEARED_INVITES, chan);
-
-    } else if (stricmp(what, "modes") == 0) {
-        const char *argv[2];
-
-        if (c->mode) {
-            /* Clear modes the bulk of the modes */
-            ircdproto->SendMode(whosends(ci), c->name, "%s",
-                           ircd->modestoremove);
-            argv[0] = ircd->modestoremove;
-            chan_set_modes(whosends(ci)->nick, c, 1, argv, 0);
-
-            /* to prevent the internals from complaining send -k, -L, -f by themselves if we need
-               to send them - TSL */
-            if (c->key) {
-                ircdproto->SendMode(whosends(ci), c->name, "-k %s", c->key);
-                argv[0] = "-k";
-                argv[1] = c->key;
-                chan_set_modes(whosends(ci)->nick, c, 2, argv, 0);
-            }
-            if (ircd->Lmode && c->redirect) {
-                ircdproto->SendMode(whosends(ci), c->name, "-L %s",
-                               c->redirect);
-                argv[0] = "-L";
-                argv[1] = c->redirect;
-                chan_set_modes(whosends(ci)->nick, c, 2, argv, 0);
-            }
-            if (ircd->fmode && c->flood) {
-                if (flood_mode_char_remove) {
-                    ircdproto->SendMode(whosends(ci), c->name, "%s %s",
-                                   flood_mode_char_remove, c->flood);
-                    argv[0] = flood_mode_char_remove;
-                    argv[1] = c->flood;
-                    chan_set_modes(whosends(ci)->nick, c, 2, argv, 0);
-                } else {
-                    if (debug) {
-                        alog("debug: flood_mode_char_remove was not set unable to remove flood/throttle modes");
-                    }
-                }
-            }
-            check_modes(c);
-        }
-
-        notice_lang(s_ChanServ, u, CHAN_CLEARED_MODES, chan);
-    } else if (stricmp(what, "ops") == 0) {
-        const char *av[6];  /* The max we have to hold: chan, ts, modes(max3), nick, nick, nick */
-        int ac, isop, isadmin, isown, count, i;
-        char buf[BUFSIZE], tmp[BUFSIZE], tmp2[BUFSIZE];
-        struct c_userlist *cu, *next;
-
-        if (ircd->svsmode_ucmode) {
-            av[0] = chan;
-            ircdproto->SendSVSModeChan(av[0], "-o", NULL);
-            if (ircd->owner) {
-                ircdproto->SendSVSModeChan(av[0], ircd->ownerunset, NULL);
-            }
-            if (ircd->protect || ircd->admin) {
-                ircdproto->SendSVSModeChan(av[0], ircd->adminunset, NULL);
-            }
-            for (cu = c->users; cu; cu = next) {
-                next = cu->next;
-                isop = chan_has_user_status(c, cu->user, CUS_OP);
-                isadmin = chan_has_user_status(c, cu->user, CUS_PROTECT);
-                isown = chan_has_user_status(c, cu->user, CUS_OWNER);
-                count = (isop ? 1 : 0) + (isadmin ? 1 : 0) + (isown ? 1 : 0);
-
-                if (!isop && !isadmin && !isown)
-                    continue;
-
-                snprintf(tmp, BUFSIZE, "-%s%s%s", (isop ? "o" : ""), (isadmin ?
-                        ircd->adminunset+1 : ""), (isown ? ircd->ownerunset+1 : ""));
-
-                if (ircdcap->tsmode) {
-                    snprintf(buf, BUFSIZE - 1, "%ld", (long int) time(NULL));
-                    av[1] = buf;
-                    av[2] = tmp;
-                    /* We have to give as much nicks as modes.. - Viper */
-                    for (i = 0; i < count; i++)
-                        av[i+3] = cu->user->nick;
-                    ac = 3 + i;
-                } else {
-                    av[1] = tmp;
-                    /* We have to give as much nicks as modes.. - Viper */
-                    for (i = 0; i < count; i++)
-                        av[i+2] = cu->user->nick;
-                    ac = 2 + i;
-                }
-
-                do_cmode(s_ChanServ, ac, av);
-            }
-        } else {
-            av[0] = chan;
-            for (cu = c->users; cu; cu = next) {
-                next = cu->next;
-                isop = chan_has_user_status(c, cu->user, CUS_OP);
-                isadmin = chan_has_user_status(c, cu->user, CUS_PROTECT);
-                isown = chan_has_user_status(c, cu->user, CUS_OWNER);
-                count = (isop ? 1 : 0) + (isadmin ? 1 : 0) + (isown ? 1 : 0);
-
-                if (!isop && !isadmin && !isown)
-                    continue;
-
-                snprintf(tmp, BUFSIZE, "-%s%s%s", (isop ? "o" : ""), (isadmin ?
-                        ircd->adminunset+1 : ""), (isown ? ircd->ownerunset+1 : ""));
-                /* We need to send the IRCd a nick for every mode.. - Viper */
-                snprintf(tmp2, BUFSIZE, "%s %s %s", (isop ? cu->user->nick : ""),
-                        (isadmin ? cu->user->nick : ""), (isown ? cu->user->nick : ""));
-
-                if (ircdcap->tsmode) {
-                    snprintf(buf, BUFSIZE - 1, "%ld", (long int) time(NULL));
-                    av[1] = buf;
-                    av[2] = tmp;
-                    /* We have to give as much nicks as modes.. - Viper */
-                    for (i = 0; i < count; i++)
-                        av[i+3] = cu->user->nick;
-                    ac = 3 + i;
-
-                    ircdproto->SendMode(whosends(ci), av[0], "%s %s", av[2], tmp2);
-                } else {
-                    av[1] = tmp;
-                    /* We have to give as much nicks as modes.. - Viper */
-                    for (i = 0; i < count; i++)
-                        av[i+2] = cu->user->nick;
-                    ac = 2 + i;
-
-                    ircdproto->SendMode(whosends(ci), av[0], "%s %s", av[1], tmp2);
-                }
-
-                do_cmode(s_ChanServ, ac, av);
-            }
-        }
-        notice_lang(s_ChanServ, u, CHAN_CLEARED_OPS, chan);
-    } else if (ircd->halfop && stricmp(what, "hops") == 0) {
-        const char *av[4];
-        int ac;
-        char buf[BUFSIZE];
-        struct c_userlist *cu, *next;
-
-        for (cu = c->users; cu; cu = next) {
-            next = cu->next;
-            if (!chan_has_user_status(c, cu->user, CUS_HALFOP))
-                continue;
-
-            if (ircdcap->tsmode) {
-                snprintf(buf, BUFSIZE - 1, "%ld", (long int) time(NULL));
-                av[0] = chan;
-                av[1] = buf;
-                av[2] = "-h";
-                av[3] = cu->user->nick;
-                ac = 4;
-            } else {
-                av[0] = chan;
-                av[1] = "-h";
-                av[2] = cu->user->nick;
-                ac = 3;
-            }
-
-            if (ircd->svsmode_ucmode) {
-                if (ircdcap->tsmode)
-                    ircdproto->SendSVSModeChan(av[0], av[2], NULL);
-                else
-                    ircdproto->SendSVSModeChan(av[0], av[1], NULL);
-
-                do_cmode(s_ChanServ, ac, av);
-                break;
-            } else {
-                if (ircdcap->tsmode)
-                    ircdproto->SendMode(whosends(ci), av[0], "%s %s", av[2],
-                                   av[3]);
-                else
-                    ircdproto->SendMode(whosends(ci), av[0], "%s %s", av[1],
-                                   av[2]);
-            }
-            do_cmode(s_ChanServ, ac, av);
-        }
-        notice_lang(s_ChanServ, u, CHAN_CLEARED_HOPS, chan);
-    } else if (stricmp(what, "voices") == 0) {
-        const char *av[4];
-        int ac;
-        char buf[BUFSIZE];
-        struct c_userlist *cu, *next;
-
-        for (cu = c->users; cu; cu = next) {
-            next = cu->next;
-            if (!chan_has_user_status(c, cu->user, CUS_VOICE))
-                continue;
-
-            if (ircdcap->tsmode) {
-                snprintf(buf, BUFSIZE - 1, "%ld", (long int) time(NULL));
-                av[0] = chan;
-                av[1] = buf;
-                av[2] = "-v";
-                av[3] = cu->user->nick;
-                ac = 4;
-            } else {
-                av[0] = chan;
-                av[1] = "-v";
-                av[2] = cu->user->nick;
-                ac = 3;
-            }
-
-            if (ircd->svsmode_ucmode) {
-                if (ircdcap->tsmode)
-                    ircdproto->SendSVSModeChan(av[0], av[2], NULL);
-                else
-                    ircdproto->SendSVSModeChan(av[0], av[1], NULL);
-
-                do_cmode(s_ChanServ, ac, av);
-                break;
-            } else {
-                if (ircdcap->tsmode) {
-                    ircdproto->SendMode(whosends(ci), av[0], "%s %s", av[2],
-                                   av[3]);
-                } else {
-                    ircdproto->SendMode(whosends(ci), av[0], "%s %s", av[1],
-                                   av[2]);
-                }
-            }
-            do_cmode(s_ChanServ, ac, av);
-        }
-        notice_lang(s_ChanServ, u, CHAN_CLEARED_VOICES, chan);
-    } else if (stricmp(what, "users") == 0) {
-        const char *av[3];
-        struct c_userlist *cu, *next;
-        char buf[256];
-
-        snprintf(buf, sizeof(buf), "CLEAR USERS command from %s", u->nick);
-
-        for (cu = c->users; cu; cu = next) {
-            next = cu->next;
-            av[0] = sstrdup(chan);
-            av[1] = sstrdup(cu->user->nick);
-            av[2] = sstrdup(buf);
-            ircdproto->SendKick(whosends(ci), av[0], av[1], av[2]);
-            do_kick(s_ChanServ, 3, av);
-            free((void *)av[2]);
-            free((void *)av[1]);
-            free((void *)av[0]);
-        }
-        notice_lang(s_ChanServ, u, CHAN_CLEARED_USERS, chan);
-    } else {
-        syntax_error(s_ChanServ, u, "CLEAR", CHAN_CLEAR_SYNTAX);
-    }
-    return MOD_CONT;
+	char *chan = strtok(NULL, " ");
+	char *what = strtok(NULL, " ");
+	Channel *c;
+	ChannelInfo *ci;
+
+	if (!what) {
+		syntax_error(s_ChanServ, u, "CLEAR", CHAN_CLEAR_SYNTAX);
+	} else if (!(c = findchan(chan))) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
+	} else if (!(ci = c->ci)) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
+	} else if (ci->flags & CI_VERBOTEN) {
+		notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
+	} else if (!u || !check_access(u, ci, CA_CLEAR)) {
+		notice_lang(s_ChanServ, u, PERMISSION_DENIED);
+	} else if (stricmp(what, "bans") == 0) {
+		const char *av[2];
+		Entry *ban, *next;
+
+		if (c->bans && c->bans->count) {
+			for (ban = c->bans->entries; ban; ban = next) {
+				next = ban->next;
+				av[0] = "-b";
+				av[1] = ban->mask;
+				ircdproto->SendMode(whosends(ci), chan, "-b %s", ban->mask);
+				chan_set_modes(whosends(ci)->nick, c, 2, av, 0);
+			}
+		}
+
+		notice_lang(s_ChanServ, u, CHAN_CLEARED_BANS, chan);
+	} else if (ircd->except && stricmp(what, "excepts") == 0) {
+		const char *av[2];
+		Entry *except, *next;
+
+		if (c->excepts && c->excepts->count) {
+			for (except = c->excepts->entries; except; except = next) {
+				next = except->next;
+				av[0] = "-e";
+				av[1] = except->mask;
+				ircdproto->SendMode(whosends(ci), chan, "-e %s", except->mask);
+				chan_set_modes(whosends(ci)->nick, c, 2, av, 0);
+			}
+		}
+		notice_lang(s_ChanServ, u, CHAN_CLEARED_EXCEPTS, chan);
+
+	} else if (ircd->invitemode && stricmp(what, "invites") == 0) {
+		const char *av[2];
+		Entry *invite, *next;
+
+		if (c->invites && c->invites->count) {
+			for (invite = c->invites->entries; invite; invite = next) {
+				next = invite->next;
+				av[0] = "-I";
+				av[1] = invite->mask;
+				ircdproto->SendMode(whosends(ci), chan, "-I %s", invite->mask);
+				chan_set_modes(whosends(ci)->nick, c, 2, av, 0);
+			}
+		}
+		notice_lang(s_ChanServ, u, CHAN_CLEARED_INVITES, chan);
+
+	} else if (stricmp(what, "modes") == 0) {
+		const char *argv[2];
+
+		if (c->mode) {
+			/* Clear modes the bulk of the modes */
+			ircdproto->SendMode(whosends(ci), c->name, "%s",
+						   ircd->modestoremove);
+			argv[0] = ircd->modestoremove;
+			chan_set_modes(whosends(ci)->nick, c, 1, argv, 0);
+
+			/* to prevent the internals from complaining send -k, -L, -f by themselves if we need
+			   to send them - TSL */
+			if (c->key) {
+				ircdproto->SendMode(whosends(ci), c->name, "-k %s", c->key);
+				argv[0] = "-k";
+				argv[1] = c->key;
+				chan_set_modes(whosends(ci)->nick, c, 2, argv, 0);
+			}
+			if (ircd->Lmode && c->redirect) {
+				ircdproto->SendMode(whosends(ci), c->name, "-L %s",
+							   c->redirect);
+				argv[0] = "-L";
+				argv[1] = c->redirect;
+				chan_set_modes(whosends(ci)->nick, c, 2, argv, 0);
+			}
+			if (ircd->fmode && c->flood) {
+				if (flood_mode_char_remove) {
+					ircdproto->SendMode(whosends(ci), c->name, "%s %s",
+								   flood_mode_char_remove, c->flood);
+					argv[0] = flood_mode_char_remove;
+					argv[1] = c->flood;
+					chan_set_modes(whosends(ci)->nick, c, 2, argv, 0);
+				} else {
+					if (debug) {
+						alog("debug: flood_mode_char_remove was not set unable to remove flood/throttle modes");
+					}
+				}
+			}
+			check_modes(c);
+		}
+
+		notice_lang(s_ChanServ, u, CHAN_CLEARED_MODES, chan);
+	} else if (stricmp(what, "ops") == 0) {
+		const char *av[6];  /* The max we have to hold: chan, ts, modes(max3), nick, nick, nick */
+		int ac, isop, isadmin, isown, count, i;
+		char buf[BUFSIZE], tmp[BUFSIZE], tmp2[BUFSIZE];
+		struct c_userlist *cu, *next;
+
+		if (ircd->svsmode_ucmode) {
+			av[0] = chan;
+			ircdproto->SendSVSModeChan(av[0], "-o", NULL);
+			if (ircd->owner) {
+				ircdproto->SendSVSModeChan(av[0], ircd->ownerunset, NULL);
+			}
+			if (ircd->protect || ircd->admin) {
+				ircdproto->SendSVSModeChan(av[0], ircd->adminunset, NULL);
+			}
+			for (cu = c->users; cu; cu = next) {
+				next = cu->next;
+				isop = chan_has_user_status(c, cu->user, CUS_OP);
+				isadmin = chan_has_user_status(c, cu->user, CUS_PROTECT);
+				isown = chan_has_user_status(c, cu->user, CUS_OWNER);
+				count = (isop ? 1 : 0) + (isadmin ? 1 : 0) + (isown ? 1 : 0);
+
+				if (!isop && !isadmin && !isown)
+					continue;
+
+				snprintf(tmp, BUFSIZE, "-%s%s%s", (isop ? "o" : ""), (isadmin ?
+						ircd->adminunset+1 : ""), (isown ? ircd->ownerunset+1 : ""));
+
+				if (ircdcap->tsmode) {
+					snprintf(buf, BUFSIZE - 1, "%ld", (long int) time(NULL));
+					av[1] = buf;
+					av[2] = tmp;
+					/* We have to give as much nicks as modes.. - Viper */
+					for (i = 0; i < count; i++)
+						av[i+3] = cu->user->nick;
+					ac = 3 + i;
+				} else {
+					av[1] = tmp;
+					/* We have to give as much nicks as modes.. - Viper */
+					for (i = 0; i < count; i++)
+						av[i+2] = cu->user->nick;
+					ac = 2 + i;
+				}
+
+				do_cmode(s_ChanServ, ac, av);
+			}
+		} else {
+			av[0] = chan;
+			for (cu = c->users; cu; cu = next) {
+				next = cu->next;
+				isop = chan_has_user_status(c, cu->user, CUS_OP);
+				isadmin = chan_has_user_status(c, cu->user, CUS_PROTECT);
+				isown = chan_has_user_status(c, cu->user, CUS_OWNER);
+				count = (isop ? 1 : 0) + (isadmin ? 1 : 0) + (isown ? 1 : 0);
+
+				if (!isop && !isadmin && !isown)
+					continue;
+
+				snprintf(tmp, BUFSIZE, "-%s%s%s", (isop ? "o" : ""), (isadmin ?
+						ircd->adminunset+1 : ""), (isown ? ircd->ownerunset+1 : ""));
+				/* We need to send the IRCd a nick for every mode.. - Viper */
+				snprintf(tmp2, BUFSIZE, "%s %s %s", (isop ? cu->user->nick : ""),
+						(isadmin ? cu->user->nick : ""), (isown ? cu->user->nick : ""));
+
+				if (ircdcap->tsmode) {
+					snprintf(buf, BUFSIZE - 1, "%ld", (long int) time(NULL));
+					av[1] = buf;
+					av[2] = tmp;
+					/* We have to give as much nicks as modes.. - Viper */
+					for (i = 0; i < count; i++)
+						av[i+3] = cu->user->nick;
+					ac = 3 + i;
+
+					ircdproto->SendMode(whosends(ci), av[0], "%s %s", av[2], tmp2);
+				} else {
+					av[1] = tmp;
+					/* We have to give as much nicks as modes.. - Viper */
+					for (i = 0; i < count; i++)
+						av[i+2] = cu->user->nick;
+					ac = 2 + i;
+
+					ircdproto->SendMode(whosends(ci), av[0], "%s %s", av[1], tmp2);
+				}
+
+				do_cmode(s_ChanServ, ac, av);
+			}
+		}
+		notice_lang(s_ChanServ, u, CHAN_CLEARED_OPS, chan);
+	} else if (ircd->halfop && stricmp(what, "hops") == 0) {
+		const char *av[4];
+		int ac;
+		char buf[BUFSIZE];
+		struct c_userlist *cu, *next;
+
+		for (cu = c->users; cu; cu = next) {
+			next = cu->next;
+			if (!chan_has_user_status(c, cu->user, CUS_HALFOP))
+				continue;
+
+			if (ircdcap->tsmode) {
+				snprintf(buf, BUFSIZE - 1, "%ld", (long int) time(NULL));
+				av[0] = chan;
+				av[1] = buf;
+				av[2] = "-h";
+				av[3] = cu->user->nick;
+				ac = 4;
+			} else {
+				av[0] = chan;
+				av[1] = "-h";
+				av[2] = cu->user->nick;
+				ac = 3;
+			}
+
+			if (ircd->svsmode_ucmode) {
+				if (ircdcap->tsmode)
+					ircdproto->SendSVSModeChan(av[0], av[2], NULL);
+				else
+					ircdproto->SendSVSModeChan(av[0], av[1], NULL);
+
+				do_cmode(s_ChanServ, ac, av);
+				break;
+			} else {
+				if (ircdcap->tsmode)
+					ircdproto->SendMode(whosends(ci), av[0], "%s %s", av[2],
+								   av[3]);
+				else
+					ircdproto->SendMode(whosends(ci), av[0], "%s %s", av[1],
+								   av[2]);
+			}
+			do_cmode(s_ChanServ, ac, av);
+		}
+		notice_lang(s_ChanServ, u, CHAN_CLEARED_HOPS, chan);
+	} else if (stricmp(what, "voices") == 0) {
+		const char *av[4];
+		int ac;
+		char buf[BUFSIZE];
+		struct c_userlist *cu, *next;
+
+		for (cu = c->users; cu; cu = next) {
+			next = cu->next;
+			if (!chan_has_user_status(c, cu->user, CUS_VOICE))
+				continue;
+
+			if (ircdcap->tsmode) {
+				snprintf(buf, BUFSIZE - 1, "%ld", (long int) time(NULL));
+				av[0] = chan;
+				av[1] = buf;
+				av[2] = "-v";
+				av[3] = cu->user->nick;
+				ac = 4;
+			} else {
+				av[0] = chan;
+				av[1] = "-v";
+				av[2] = cu->user->nick;
+				ac = 3;
+			}
+
+			if (ircd->svsmode_ucmode) {
+				if (ircdcap->tsmode)
+					ircdproto->SendSVSModeChan(av[0], av[2], NULL);
+				else
+					ircdproto->SendSVSModeChan(av[0], av[1], NULL);
+
+				do_cmode(s_ChanServ, ac, av);
+				break;
+			} else {
+				if (ircdcap->tsmode) {
+					ircdproto->SendMode(whosends(ci), av[0], "%s %s", av[2],
+								   av[3]);
+				} else {
+					ircdproto->SendMode(whosends(ci), av[0], "%s %s", av[1],
+								   av[2]);
+				}
+			}
+			do_cmode(s_ChanServ, ac, av);
+		}
+		notice_lang(s_ChanServ, u, CHAN_CLEARED_VOICES, chan);
+	} else if (stricmp(what, "users") == 0) {
+		const char *av[3];
+		struct c_userlist *cu, *next;
+		char buf[256];
+
+		snprintf(buf, sizeof(buf), "CLEAR USERS command from %s", u->nick);
+
+		for (cu = c->users; cu; cu = next) {
+			next = cu->next;
+			av[0] = sstrdup(chan);
+			av[1] = sstrdup(cu->user->nick);
+			av[2] = sstrdup(buf);
+			ircdproto->SendKick(whosends(ci), av[0], av[1], av[2]);
+			do_kick(s_ChanServ, 3, av);
+			free((void *)av[2]);
+			free((void *)av[1]);
+			free((void *)av[0]);
+		}
+		notice_lang(s_ChanServ, u, CHAN_CLEARED_USERS, chan);
+	} else {
+		syntax_error(s_ChanServ, u, "CLEAR", CHAN_CLEAR_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("cs_clear", CSClear)
diff --git a/src/core/cs_drop.c b/src/core/cs_drop.c
index fdfda2b3d..03de6f2dd 100644
--- a/src/core/cs_drop.c
+++ b/src/core/cs_drop.c
@@ -45,7 +45,7 @@ class CSDrop : public Module
  **/
 void myChanServHelp(User * u)
 {
-    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DROP);
+	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DROP);
 }
 
 /**
@@ -55,64 +55,64 @@ void myChanServHelp(User * u)
  **/
 int do_drop(User * u)
 {
-    char *chan = strtok(NULL, " ");
-    ChannelInfo *ci;
-    int is_servadmin = is_services_admin(u);
-
-    if (readonly && !is_servadmin) {
-        notice_lang(s_ChanServ, u, CHAN_DROP_DISABLED);
-        return MOD_CONT;
-    }
-
-    if (!chan) {
-        syntax_error(s_ChanServ, u, "DROP", CHAN_DROP_SYNTAX);
-    } else if (!(ci = cs_findchan(chan))) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
-    } else if (!is_servadmin && (ci->flags & CI_VERBOTEN)) {
-        notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
-    } else if (!is_servadmin && (ci->flags & CI_SUSPENDED)) {
-        notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
-    } else if (!is_servadmin
-               && (ci->
-                   flags & CI_SECUREFOUNDER ? !is_real_founder(u,
-                                                               ci) :
-                   !is_founder(u, ci))) {
-        notice_lang(s_ChanServ, u, ACCESS_DENIED);
-    } else {
-        int level = get_access(u, ci);
-
-        if (readonly)           /* in this case we know they're a Services admin */
-            notice_lang(s_ChanServ, u, READ_ONLY_MODE);
-
-        if (ci->c) {
-            if (ircd->regmode) {
-                ci->c->mode &= ~ircd->regmode;
-                ircdproto->SendMode(whosends(ci), ci->name, "-r");
-            }
-        }
-
-        if (ircd->chansqline && (ci->flags & CI_VERBOTEN)) {
-            ircdproto->SendSQLineDel(ci->name);
-        }
-
-        alog("%s: Channel %s dropped by %s!%s@%s (founder: %s)",
-             s_ChanServ, ci->name, u->nick, u->username,
-             u->host, (ci->founder ? ci->founder->display : "(none)"));
-
-        delchan(ci);
-
-        /* We must make sure that the Services admin has not normally the right to
-         * drop the channel before issuing the wallops.
-         */
-        if (WallDrop && is_servadmin && level < ACCESS_FOUNDER)
-            ircdproto->SendGlobops(s_ChanServ,
-                             "\2%s\2 used DROP on channel \2%s\2", u->nick,
-                             chan);
-
-        notice_lang(s_ChanServ, u, CHAN_DROPPED, chan);
-        send_event(EVENT_CHAN_DROP, 1, chan);
-    }
-    return MOD_CONT;
+	char *chan = strtok(NULL, " ");
+	ChannelInfo *ci;
+	int is_servadmin = is_services_admin(u);
+
+	if (readonly && !is_servadmin) {
+		notice_lang(s_ChanServ, u, CHAN_DROP_DISABLED);
+		return MOD_CONT;
+	}
+
+	if (!chan) {
+		syntax_error(s_ChanServ, u, "DROP", CHAN_DROP_SYNTAX);
+	} else if (!(ci = cs_findchan(chan))) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
+	} else if (!is_servadmin && (ci->flags & CI_VERBOTEN)) {
+		notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
+	} else if (!is_servadmin && (ci->flags & CI_SUSPENDED)) {
+		notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
+	} else if (!is_servadmin
+			   && (ci->
+				   flags & CI_SECUREFOUNDER ? !is_real_founder(u,
+															   ci) :
+				   !is_founder(u, ci))) {
+		notice_lang(s_ChanServ, u, ACCESS_DENIED);
+	} else {
+		int level = get_access(u, ci);
+
+		if (readonly)		   /* in this case we know they're a Services admin */
+			notice_lang(s_ChanServ, u, READ_ONLY_MODE);
+
+		if (ci->c) {
+			if (ircd->regmode) {
+				ci->c->mode &= ~ircd->regmode;
+				ircdproto->SendMode(whosends(ci), ci->name, "-r");
+			}
+		}
+
+		if (ircd->chansqline && (ci->flags & CI_VERBOTEN)) {
+			ircdproto->SendSQLineDel(ci->name);
+		}
+
+		alog("%s: Channel %s dropped by %s!%s@%s (founder: %s)",
+			 s_ChanServ, ci->name, u->nick, u->username,
+			 u->host, (ci->founder ? ci->founder->display : "(none)"));
+
+		delchan(ci);
+
+		/* We must make sure that the Services admin has not normally the right to
+		 * drop the channel before issuing the wallops.
+		 */
+		if (WallDrop && is_servadmin && level < ACCESS_FOUNDER)
+			ircdproto->SendGlobops(s_ChanServ,
+							 "\2%s\2 used DROP on channel \2%s\2", u->nick,
+							 chan);
+
+		notice_lang(s_ChanServ, u, CHAN_DROPPED, chan);
+		send_event(EVENT_CHAN_DROP, 1, chan);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("cs_drop", CSDrop)
diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.c
index 293c25e40..dea445073 100644
--- a/src/core/cs_forbid.c
+++ b/src/core/cs_forbid.c
@@ -43,9 +43,9 @@ class CSForbid : public Module
  **/
 void myChanServHelp(User * u)
 {
-    if (is_services_admin(u)) {
-        notice_lang(s_ChanServ, u, CHAN_HELP_CMD_FORBID);
-    }
+	if (is_services_admin(u)) {
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_FORBID);
+	}
 }
 
 /**
@@ -55,74 +55,74 @@ void myChanServHelp(User * u)
  **/
 int do_forbid(User * u)
 {
-    ChannelInfo *ci;
-    char *chan = strtok(NULL, " ");
-    char *reason = strtok(NULL, "");
-
-    Channel *c;
-
-    /* Assumes that permission checking has already been done. */
-    if (!chan || (ForceForbidReason && !reason)) {
-        syntax_error(s_ChanServ, u, "FORBID",
-                     (ForceForbidReason ? CHAN_FORBID_SYNTAX_REASON :
-                      CHAN_FORBID_SYNTAX));
-        return MOD_CONT;
-    }
-    if (*chan != '#') {
-        notice_lang(s_ChanServ, u, CHAN_SYMBOL_REQUIRED);
-        return MOD_CONT;
-    } else if (!ircdproto->IsChannelValid(chan)) {
-        notice_lang(s_ChanServ, u, CHAN_X_INVALID, chan);
-        return MOD_CONT;
-    }
-    if (readonly)
-        notice_lang(s_ChanServ, u, READ_ONLY_MODE);
-    if ((ci = cs_findchan(chan)) != NULL)
-        delchan(ci);
-    ci = makechan(chan);
-    if (ci) {
-        ci->flags |= CI_VERBOTEN;
-        ci->forbidby = sstrdup(u->nick);
-        if (reason)
-            ci->forbidreason = sstrdup(reason);
-
-        if ((c = findchan(ci->name))) {
-            struct c_userlist *cu, *next;
-            const char *av[3];
-
-            for (cu = c->users; cu; cu = next) {
-                next = cu->next;
-
-                if (is_oper(cu->user))
-                    continue;
-
-                av[0] = c->name;
-                av[1] = cu->user->nick;
-                av[2] = reason ? reason : "CHAN_FORBID_REASON";
-                ircdproto->SendKick(findbot(s_ChanServ), av[0], av[1], av[2]);
-                do_kick(s_ChanServ, 3, av);
-            }
-        }
-
-        if (WallForbid)
-            ircdproto->SendGlobops(s_ChanServ,
-                             "\2%s\2 used FORBID on channel \2%s\2",
-                             u->nick, ci->name);
-
-        if (ircd->chansqline) {
-            ircdproto->SendSQLine(ci->name, ((reason) ? reason : "Forbidden"));
-        }
-
-        alog("%s: %s set FORBID for channel %s", s_ChanServ, u->nick,
-             ci->name);
-        notice_lang(s_ChanServ, u, CHAN_FORBID_SUCCEEDED, chan);
-        send_event(EVENT_CHAN_FORBIDDEN, 1, chan);
-    } else {
-        alog("%s: Valid FORBID for %s by %s failed", s_ChanServ, ci->name,
-             u->nick);
-        notice_lang(s_ChanServ, u, CHAN_FORBID_FAILED, chan);
-    }
-    return MOD_CONT;
+	ChannelInfo *ci;
+	char *chan = strtok(NULL, " ");
+	char *reason = strtok(NULL, "");
+
+	Channel *c;
+
+	/* Assumes that permission checking has already been done. */
+	if (!chan || (ForceForbidReason && !reason)) {
+		syntax_error(s_ChanServ, u, "FORBID",
+					 (ForceForbidReason ? CHAN_FORBID_SYNTAX_REASON :
+					  CHAN_FORBID_SYNTAX));
+		return MOD_CONT;
+	}
+	if (*chan != '#') {
+		notice_lang(s_ChanServ, u, CHAN_SYMBOL_REQUIRED);
+		return MOD_CONT;
+	} else if (!ircdproto->IsChannelValid(chan)) {
+		notice_lang(s_ChanServ, u, CHAN_X_INVALID, chan);
+		return MOD_CONT;
+	}
+	if (readonly)
+		notice_lang(s_ChanServ, u, READ_ONLY_MODE);
+	if ((ci = cs_findchan(chan)) != NULL)
+		delchan(ci);
+	ci = makechan(chan);
+	if (ci) {
+		ci->flags |= CI_VERBOTEN;
+		ci->forbidby = sstrdup(u->nick);
+		if (reason)
+			ci->forbidreason = sstrdup(reason);
+
+		if ((c = findchan(ci->name))) {
+			struct c_userlist *cu, *next;
+			const char *av[3];
+
+			for (cu = c->users; cu; cu = next) {
+				next = cu->next;
+
+				if (is_oper(cu->user))
+					continue;
+
+				av[0] = c->name;
+				av[1] = cu->user->nick;
+				av[2] = reason ? reason : "CHAN_FORBID_REASON";
+				ircdproto->SendKick(findbot(s_ChanServ), av[0], av[1], av[2]);
+				do_kick(s_ChanServ, 3, av);
+			}
+		}
+
+		if (WallForbid)
+			ircdproto->SendGlobops(s_ChanServ,
+							 "\2%s\2 used FORBID on channel \2%s\2",
+							 u->nick, ci->name);
+
+		if (ircd->chansqline) {
+			ircdproto->SendSQLine(ci->name, ((reason) ? reason : "Forbidden"));
+		}
+
+		alog("%s: %s set FORBID for channel %s", s_ChanServ, u->nick,
+			 ci->name);
+		notice_lang(s_ChanServ, u, CHAN_FORBID_SUCCEEDED, chan);
+		send_event(EVENT_CHAN_FORBIDDEN, 1, chan);
+	} else {
+		alog("%s: Valid FORBID for %s by %s failed", s_ChanServ, ci->name,
+			 u->nick);
+		notice_lang(s_ChanServ, u, CHAN_FORBID_FAILED, chan);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("cs_forbid", CSForbid)
diff --git a/src/core/cs_getkey.c b/src/core/cs_getkey.c
index 4fa616e2f..7bf86d6d4 100644
--- a/src/core/cs_getkey.c
+++ b/src/core/cs_getkey.c
@@ -44,7 +44,7 @@ class CSGetKey : public Module
  **/
 void myChanServHelp(User * u)
 {
-    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_GETKEY);
+	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_GETKEY);
 }
 
 /**
@@ -54,24 +54,24 @@ void myChanServHelp(User * u)
  **/
 int do_getkey(User * u)
 {
-    char *chan = strtok(NULL, " ");
-    ChannelInfo *ci;
+	char *chan = strtok(NULL, " ");
+	ChannelInfo *ci;
 
-    if (!chan) {
-        syntax_error(s_ChanServ, u, "GETKEY", CHAN_GETKEY_SYNTAX);
-    } else if (!(ci = cs_findchan(chan))) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
-    } else if (ci->flags & CI_VERBOTEN) {
-        notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
-    } else if (!check_access(u, ci, CA_GETKEY)) {
-        notice_lang(s_ChanServ, u, ACCESS_DENIED);
-    } else if (!ci->c || !ci->c->key) {
-        notice_lang(s_ChanServ, u, CHAN_GETKEY_NOKEY, chan);
-    } else {
-        notice_lang(s_ChanServ, u, CHAN_GETKEY_KEY, chan, ci->c->key);
-    }
+	if (!chan) {
+		syntax_error(s_ChanServ, u, "GETKEY", CHAN_GETKEY_SYNTAX);
+	} else if (!(ci = cs_findchan(chan))) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
+	} else if (ci->flags & CI_VERBOTEN) {
+		notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
+	} else if (!check_access(u, ci, CA_GETKEY)) {
+		notice_lang(s_ChanServ, u, ACCESS_DENIED);
+	} else if (!ci->c || !ci->c->key) {
+		notice_lang(s_ChanServ, u, CHAN_GETKEY_NOKEY, chan);
+	} else {
+		notice_lang(s_ChanServ, u, CHAN_GETKEY_KEY, chan, ci->c->key);
+	}
 
-    return MOD_CONT;
+	return MOD_CONT;
 }
 
 MODULE_INIT("cs_getkey", CSGetKey)
diff --git a/src/core/cs_getpass.c b/src/core/cs_getpass.c
index f8ebfa0db..a4ed46485 100644
--- a/src/core/cs_getpass.c
+++ b/src/core/cs_getpass.c
@@ -44,9 +44,9 @@ class CSGetPass : public Module
  **/
 void myChanServHelp(User * u)
 {
-    if (is_services_admin(u)) {
-        notice_lang(s_ChanServ, u, CHAN_HELP_CMD_GETPASS);
-    }
+	if (is_services_admin(u)) {
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_GETPASS);
+	}
 }
 
 /**
@@ -57,34 +57,34 @@ void myChanServHelp(User * u)
 
 int do_getpass(User * u)
 {
-    char *chan = strtok(NULL, " ");
-    char tmp_pass[PASSMAX];
-    ChannelInfo *ci;
+	char *chan = strtok(NULL, " ");
+	char tmp_pass[PASSMAX];
+	ChannelInfo *ci;
 
-    if (!chan) {
-        syntax_error(s_ChanServ, u, "GETPASS", CHAN_GETPASS_SYNTAX);
-    } else if (!(ci = cs_findchan(chan))) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
-    } else if (ci->flags & CI_VERBOTEN) {
-        notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
-    } else if (CSRestrictGetPass && !is_services_root(u)) {
-        notice_lang(s_ChanServ, u, PERMISSION_DENIED);
-    } else {
-        if(enc_decrypt(ci->founderpass, tmp_pass, PASSMAX - 1)==1) {
-            alog("%s: %s!%s@%s used GETPASS on %s",
-                 s_ChanServ, u->nick, u->username, u->host, ci->name);
-            if (WallGetpass) {
-                ircdproto->SendGlobops(s_ChanServ,
-                                 "\2%s\2 used GETPASS on channel \2%s\2",
-                                 u->nick, chan);
-            }
-            notice_lang(s_ChanServ, u, CHAN_GETPASS_PASSWORD_IS,
-                        chan, tmp_pass);
-        } else {
-            notice_lang(s_ChanServ, u, CHAN_GETPASS_UNAVAILABLE);
-        }
-    }
-    return MOD_CONT;
+	if (!chan) {
+		syntax_error(s_ChanServ, u, "GETPASS", CHAN_GETPASS_SYNTAX);
+	} else if (!(ci = cs_findchan(chan))) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
+	} else if (ci->flags & CI_VERBOTEN) {
+		notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
+	} else if (CSRestrictGetPass && !is_services_root(u)) {
+		notice_lang(s_ChanServ, u, PERMISSION_DENIED);
+	} else {
+		if(enc_decrypt(ci->founderpass, tmp_pass, PASSMAX - 1)==1) {
+			alog("%s: %s!%s@%s used GETPASS on %s",
+				 s_ChanServ, u->nick, u->username, u->host, ci->name);
+			if (WallGetpass) {
+				ircdproto->SendGlobops(s_ChanServ,
+								 "\2%s\2 used GETPASS on channel \2%s\2",
+								 u->nick, chan);
+			}
+			notice_lang(s_ChanServ, u, CHAN_GETPASS_PASSWORD_IS,
+						chan, tmp_pass);
+		} else {
+			notice_lang(s_ChanServ, u, CHAN_GETPASS_UNAVAILABLE);
+		}
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("cs_getpass", CSGetPass)
diff --git a/src/core/cs_help.c b/src/core/cs_help.c
index 75271b35a..c8c34341f 100644
--- a/src/core/cs_help.c
+++ b/src/core/cs_help.c
@@ -40,35 +40,35 @@ class CSHelp : public Module
  **/
 int do_help(User * u)
 {
-    char *cmd = strtok(NULL, "");
+	char *cmd = strtok(NULL, "");
 
-    if (!cmd) {
-        notice_help(s_ChanServ, u, CHAN_HELP);
-        moduleDisplayHelp(2, u);
-        if (CSExpire >= 86400)
-            notice_help(s_ChanServ, u, CHAN_HELP_EXPIRES,
-                        CSExpire / 86400);
-        if (is_services_oper(u))
-            notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP);
-    } else if (stricmp(cmd, "LEVELS DESC") == 0) {
-        int i;
-        notice_help(s_ChanServ, u, CHAN_HELP_LEVELS_DESC);
-        if (!levelinfo_maxwidth) {
-            for (i = 0; levelinfo[i].what >= 0; i++) {
-                int len = strlen(levelinfo[i].name);
-                if (len > levelinfo_maxwidth)
-                    levelinfo_maxwidth = len;
-            }
-        }
-        for (i = 0; levelinfo[i].what >= 0; i++) {
-            notice_help(s_ChanServ, u, CHAN_HELP_LEVELS_DESC_FORMAT,
-                        levelinfo_maxwidth, levelinfo[i].name,
-                        getstring(u->na, levelinfo[i].desc));
-        }
-    } else {
-        mod_help_cmd(s_ChanServ, u, CHANSERV, cmd);
-    }
-    return MOD_CONT;
+	if (!cmd) {
+		notice_help(s_ChanServ, u, CHAN_HELP);
+		moduleDisplayHelp(2, u);
+		if (CSExpire >= 86400)
+			notice_help(s_ChanServ, u, CHAN_HELP_EXPIRES,
+						CSExpire / 86400);
+		if (is_services_oper(u))
+			notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP);
+	} else if (stricmp(cmd, "LEVELS DESC") == 0) {
+		int i;
+		notice_help(s_ChanServ, u, CHAN_HELP_LEVELS_DESC);
+		if (!levelinfo_maxwidth) {
+			for (i = 0; levelinfo[i].what >= 0; i++) {
+				int len = strlen(levelinfo[i].name);
+				if (len > levelinfo_maxwidth)
+					levelinfo_maxwidth = len;
+			}
+		}
+		for (i = 0; levelinfo[i].what >= 0; i++) {
+			notice_help(s_ChanServ, u, CHAN_HELP_LEVELS_DESC_FORMAT,
+						levelinfo_maxwidth, levelinfo[i].name,
+						getstring(u->na, levelinfo[i].desc));
+		}
+	} else {
+		mod_help_cmd(s_ChanServ, u, CHANSERV, cmd);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("cs_help", CSHelp)
diff --git a/src/core/cs_identify.c b/src/core/cs_identify.c
index 8af3d4bd7..baad140e8 100644
--- a/src/core/cs_identify.c
+++ b/src/core/cs_identify.c
@@ -47,7 +47,7 @@ class CSIdentify : public Module
  **/
 void myChanServHelp(User * u)
 {
-    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_IDENTIFY);
+	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_IDENTIFY);
 }
 
 /**
@@ -57,49 +57,49 @@ void myChanServHelp(User * u)
  **/
 int do_identify(User * u)
 {
-    char *chan = strtok(NULL, " ");
-    char *pass = strtok(NULL, " ");
-    ChannelInfo *ci;
-    struct u_chaninfolist *uc;
-
-    if (!pass) {
-        syntax_error(s_ChanServ, u, "IDENTIFY", CHAN_IDENTIFY_SYNTAX);
-    } else if (!(ci = cs_findchan(chan))) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
-    } else if (ci->flags & CI_VERBOTEN) {
-        notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
-    } else if (!nick_identified(u)) {
-        notice_lang(s_ChanServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
-    } else if (is_founder(u, ci)) {
-        notice_lang(s_ChanServ, u, NICK_ALREADY_IDENTIFIED);
-    } else {
-        int res;
-
-        if ((res = enc_check_password(pass, ci->founderpass)) == 1) {
-            if (!is_identified(u, ci)) {
-                uc = (struct u_chaninfolist *)scalloc(sizeof(*uc), 1);
-                uc->next = u->founder_chans;
-                if (u->founder_chans)
-                    u->founder_chans->prev = uc;
-                u->founder_chans = uc;
-                uc->chan = ci;
-                alog("%s: %s!%s@%s identified for %s", s_ChanServ, u->nick,
-                     u->username, u->host, ci->name);
-            }
-
-            notice_lang(s_ChanServ, u, CHAN_IDENTIFY_SUCCEEDED, chan);
-        } else if (res < 0) {
-            alog("%s: check_password failed for %s", s_ChanServ, ci->name);
-            notice_lang(s_ChanServ, u, CHAN_IDENTIFY_FAILED);
-        } else {
-            alog("%s: Failed IDENTIFY for %s by %s!%s@%s",
-                 s_ChanServ, ci->name, u->nick, u->username, u->host);
-            notice_lang(s_ChanServ, u, PASSWORD_INCORRECT);
-            bad_password(u);
-        }
-
-    }
-    return MOD_CONT;
+	char *chan = strtok(NULL, " ");
+	char *pass = strtok(NULL, " ");
+	ChannelInfo *ci;
+	struct u_chaninfolist *uc;
+
+	if (!pass) {
+		syntax_error(s_ChanServ, u, "IDENTIFY", CHAN_IDENTIFY_SYNTAX);
+	} else if (!(ci = cs_findchan(chan))) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
+	} else if (ci->flags & CI_VERBOTEN) {
+		notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
+	} else if (!nick_identified(u)) {
+		notice_lang(s_ChanServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
+	} else if (is_founder(u, ci)) {
+		notice_lang(s_ChanServ, u, NICK_ALREADY_IDENTIFIED);
+	} else {
+		int res;
+
+		if ((res = enc_check_password(pass, ci->founderpass)) == 1) {
+			if (!is_identified(u, ci)) {
+				uc = (struct u_chaninfolist *)scalloc(sizeof(*uc), 1);
+				uc->next = u->founder_chans;
+				if (u->founder_chans)
+					u->founder_chans->prev = uc;
+				u->founder_chans = uc;
+				uc->chan = ci;
+				alog("%s: %s!%s@%s identified for %s", s_ChanServ, u->nick,
+					 u->username, u->host, ci->name);
+			}
+
+			notice_lang(s_ChanServ, u, CHAN_IDENTIFY_SUCCEEDED, chan);
+		} else if (res < 0) {
+			alog("%s: check_password failed for %s", s_ChanServ, ci->name);
+			notice_lang(s_ChanServ, u, CHAN_IDENTIFY_FAILED);
+		} else {
+			alog("%s: Failed IDENTIFY for %s by %s!%s@%s",
+				 s_ChanServ, ci->name, u->nick, u->username, u->host);
+			notice_lang(s_ChanServ, u, PASSWORD_INCORRECT);
+			bad_password(u);
+		}
+
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("cs_identify", CSIdentify)
diff --git a/src/core/cs_info.c b/src/core/cs_info.c
index 549859044..c07d6ebc0 100644
--- a/src/core/cs_info.c
+++ b/src/core/cs_info.c
@@ -44,7 +44,7 @@ class CSInfo : public Module
  **/
 void myChanServHelp(User * u)
 {
-    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_INFO);
+	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_INFO);
 }
 
 /**
@@ -59,179 +59,179 @@ int do_info(User * u)
  * Syntax: INFO channel [ALL]
  * -TheShadow (29 Mar 1999)
  */
-    char *chan = strtok(NULL, " ");
-    char *param = strtok(NULL, " ");
-    ChannelInfo *ci;
-    char buf[BUFSIZE], *end;
-    struct tm *tm;
-    int need_comma = 0;
-    const char *commastr = getstring(u->na, COMMA_SPACE);
-    int is_servadmin = is_services_admin(u);
-    int show_all = 0;
-    time_t expt;
-
-    if (!chan) {
-        syntax_error(s_ChanServ, u, "INFO", CHAN_INFO_SYNTAX);
-    } else if (!(ci = cs_findchan(chan))) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
-    } else if (ci->flags & CI_VERBOTEN) {
-        if (is_oper(u) && ci->forbidby)
-            notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN_OPER, chan,
-                        ci->forbidby,
-                        (ci->forbidreason ? ci->
-                         forbidreason : getstring(u->na, NO_REASON)));
-        else
-            notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
-    } else if (!ci->founder) {
-        /* Paranoia... this shouldn't be able to happen */
-        delchan(ci);
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
-    } else {
-
-        /* Should we show all fields? Only for sadmins and identified users */
-        if (param && stricmp(param, "ALL") == 0 &&
-            (check_access(u, ci, CA_INFO) || is_servadmin))
-            show_all = 1;
-
-        notice_lang(s_ChanServ, u, CHAN_INFO_HEADER, chan);
-        notice_lang(s_ChanServ, u, CHAN_INFO_NO_FOUNDER,
-                    ci->founder->display);
-
-        if (show_all && ci->successor)
-            notice_lang(s_ChanServ, u, CHAN_INFO_NO_SUCCESSOR,
-                        ci->successor->display);
-
-        notice_lang(s_ChanServ, u, CHAN_INFO_DESCRIPTION, ci->desc);
-        tm = localtime(&ci->time_registered);
-        strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm);
-        notice_lang(s_ChanServ, u, CHAN_INFO_TIME_REGGED, buf);
-        tm = localtime(&ci->last_used);
-        strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm);
-        notice_lang(s_ChanServ, u, CHAN_INFO_LAST_USED, buf);
-        if (ci->last_topic
-            && (show_all || (!(ci->mlock_on & anope_get_secret_mode())
-                             && (!ci->c
-                                 || !(ci->c->
-                                      mode & anope_get_secret_mode()))))) {
-            notice_lang(s_ChanServ, u, CHAN_INFO_LAST_TOPIC,
-                        ci->last_topic);
-            notice_lang(s_ChanServ, u, CHAN_INFO_TOPIC_SET_BY,
-                        ci->last_topic_setter);
-        }
-
-        if (ci->entry_message && show_all)
-            notice_lang(s_ChanServ, u, CHAN_INFO_ENTRYMSG,
-                        ci->entry_message);
-        if (ci->url)
-            notice_lang(s_ChanServ, u, CHAN_INFO_URL, ci->url);
-        if (ci->email)
-            notice_lang(s_ChanServ, u, CHAN_INFO_EMAIL, ci->email);
-
-        if (show_all) {
-            notice_lang(s_ChanServ, u, CHAN_INFO_BANTYPE, ci->bantype);
-
-            end = buf;
-            *end = 0;
-            if (ci->flags & CI_KEEPTOPIC) {
-                end += snprintf(end, sizeof(buf) - (end - buf), "%s",
-                                getstring(u->na, CHAN_INFO_OPT_KEEPTOPIC));
-                need_comma = 1;
-            }
-            if (ci->flags & CI_OPNOTICE) {
-                end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
-                                need_comma ? commastr : "",
-                                getstring(u->na, CHAN_INFO_OPT_OPNOTICE));
-                need_comma = 1;
-            }
-            if (ci->flags & CI_PEACE) {
-                end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
-                                need_comma ? commastr : "",
-                                getstring(u->na, CHAN_INFO_OPT_PEACE));
-                need_comma = 1;
-            }
-            if (ci->flags & CI_PRIVATE) {
-                end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
-                                need_comma ? commastr : "",
-                                getstring(u->na, CHAN_INFO_OPT_PRIVATE));
-                need_comma = 1;
-            }
-            if (ci->flags & CI_RESTRICTED) {
-                end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
-                                need_comma ? commastr : "",
-                                getstring(u->na,
-                                          CHAN_INFO_OPT_RESTRICTED));
-                need_comma = 1;
-            }
-            if (ci->flags & CI_SECURE) {
-                end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
-                                need_comma ? commastr : "",
-                                getstring(u->na, CHAN_INFO_OPT_SECURE));
-                need_comma = 1;
-            }
-            if (ci->flags & CI_SECUREOPS) {
-                end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
-                                need_comma ? commastr : "",
-                                getstring(u->na, CHAN_INFO_OPT_SECUREOPS));
-                need_comma = 1;
-            }
-            if (ci->flags & CI_SECUREFOUNDER) {
-                end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
-                                need_comma ? commastr : "",
-                                getstring(u->na,
-                                          CHAN_INFO_OPT_SECUREFOUNDER));
-                need_comma = 1;
-            }
-            if ((ci->flags & CI_SIGNKICK)
-                || (ci->flags & CI_SIGNKICK_LEVEL)) {
-                end +=
-                    snprintf(end, sizeof(buf) - (end - buf), "%s%s",
-                             need_comma ? commastr : "", getstring(u->na,
-                                                                   CHAN_INFO_OPT_SIGNKICK));
-                need_comma = 1;
-            }
-            if (ci->flags & CI_TOPICLOCK) {
-                end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
-                                need_comma ? commastr : "",
-                                getstring(u->na, CHAN_INFO_OPT_TOPICLOCK));
-                need_comma = 1;
-            }
-            if (ci->flags & CI_XOP) {
-                end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
-                                need_comma ? commastr : "",
-                                getstring(u->na, CHAN_INFO_OPT_XOP));
-                need_comma = 1;
-            }
-            notice_lang(s_ChanServ, u, CHAN_INFO_OPTIONS,
-                        *buf ? buf : getstring(u->na, CHAN_INFO_OPT_NONE));
-            notice_lang(s_ChanServ, u, CHAN_INFO_MODE_LOCK,
-                        get_mlock_modes(ci, 1));
-
-        }
-        if (show_all) {
-            if (ci->flags & CI_NO_EXPIRE) {
-                notice_lang(s_ChanServ, u, CHAN_INFO_NO_EXPIRE);
-            } else {
-                if (is_servadmin) {
-                    expt = ci->last_used + CSExpire;
-                    tm = localtime(&expt);
-                    strftime_lang(buf, sizeof(buf), u,
-                                  STRFTIME_DATE_TIME_FORMAT, tm);
-                    notice_lang(s_ChanServ, u, CHAN_INFO_EXPIRE, buf);
-                }
-            }
-        }
-        if (ci->flags & CI_SUSPENDED) {
-            notice_lang(s_ChanServ, u, CHAN_X_SUSPENDED, ci->forbidby,
-                        (ci->forbidreason ? ci->
-                         forbidreason : getstring(u->na, NO_REASON)));
-        }
-
-        if (!show_all && (check_access(u, ci, CA_INFO) || is_servadmin))
-            notice_lang(s_ChanServ, u, NICK_INFO_FOR_MORE, s_ChanServ,
-                        ci->name);
-
-    }
-    return MOD_CONT;
+	char *chan = strtok(NULL, " ");
+	char *param = strtok(NULL, " ");
+	ChannelInfo *ci;
+	char buf[BUFSIZE], *end;
+	struct tm *tm;
+	int need_comma = 0;
+	const char *commastr = getstring(u->na, COMMA_SPACE);
+	int is_servadmin = is_services_admin(u);
+	int show_all = 0;
+	time_t expt;
+
+	if (!chan) {
+		syntax_error(s_ChanServ, u, "INFO", CHAN_INFO_SYNTAX);
+	} else if (!(ci = cs_findchan(chan))) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
+	} else if (ci->flags & CI_VERBOTEN) {
+		if (is_oper(u) && ci->forbidby)
+			notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN_OPER, chan,
+						ci->forbidby,
+						(ci->forbidreason ? ci->
+						 forbidreason : getstring(u->na, NO_REASON)));
+		else
+			notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
+	} else if (!ci->founder) {
+		/* Paranoia... this shouldn't be able to happen */
+		delchan(ci);
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
+	} else {
+
+		/* Should we show all fields? Only for sadmins and identified users */
+		if (param && stricmp(param, "ALL") == 0 &&
+			(check_access(u, ci, CA_INFO) || is_servadmin))
+			show_all = 1;
+
+		notice_lang(s_ChanServ, u, CHAN_INFO_HEADER, chan);
+		notice_lang(s_ChanServ, u, CHAN_INFO_NO_FOUNDER,
+					ci->founder->display);
+
+		if (show_all && ci->successor)
+			notice_lang(s_ChanServ, u, CHAN_INFO_NO_SUCCESSOR,
+						ci->successor->display);
+
+		notice_lang(s_ChanServ, u, CHAN_INFO_DESCRIPTION, ci->desc);
+		tm = localtime(&ci->time_registered);
+		strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm);
+		notice_lang(s_ChanServ, u, CHAN_INFO_TIME_REGGED, buf);
+		tm = localtime(&ci->last_used);
+		strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm);
+		notice_lang(s_ChanServ, u, CHAN_INFO_LAST_USED, buf);
+		if (ci->last_topic
+			&& (show_all || (!(ci->mlock_on & anope_get_secret_mode())
+							 && (!ci->c
+								 || !(ci->c->
+									  mode & anope_get_secret_mode()))))) {
+			notice_lang(s_ChanServ, u, CHAN_INFO_LAST_TOPIC,
+						ci->last_topic);
+			notice_lang(s_ChanServ, u, CHAN_INFO_TOPIC_SET_BY,
+						ci->last_topic_setter);
+		}
+
+		if (ci->entry_message && show_all)
+			notice_lang(s_ChanServ, u, CHAN_INFO_ENTRYMSG,
+						ci->entry_message);
+		if (ci->url)
+			notice_lang(s_ChanServ, u, CHAN_INFO_URL, ci->url);
+		if (ci->email)
+			notice_lang(s_ChanServ, u, CHAN_INFO_EMAIL, ci->email);
+
+		if (show_all) {
+			notice_lang(s_ChanServ, u, CHAN_INFO_BANTYPE, ci->bantype);
+
+			end = buf;
+			*end = 0;
+			if (ci->flags & CI_KEEPTOPIC) {
+				end += snprintf(end, sizeof(buf) - (end - buf), "%s",
+								getstring(u->na, CHAN_INFO_OPT_KEEPTOPIC));
+				need_comma = 1;
+			}
+			if (ci->flags & CI_OPNOTICE) {
+				end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
+								need_comma ? commastr : "",
+								getstring(u->na, CHAN_INFO_OPT_OPNOTICE));
+				need_comma = 1;
+			}
+			if (ci->flags & CI_PEACE) {
+				end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
+								need_comma ? commastr : "",
+								getstring(u->na, CHAN_INFO_OPT_PEACE));
+				need_comma = 1;
+			}
+			if (ci->flags & CI_PRIVATE) {
+				end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
+								need_comma ? commastr : "",
+								getstring(u->na, CHAN_INFO_OPT_PRIVATE));
+				need_comma = 1;
+			}
+			if (ci->flags & CI_RESTRICTED) {
+				end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
+								need_comma ? commastr : "",
+								getstring(u->na,
+										  CHAN_INFO_OPT_RESTRICTED));
+				need_comma = 1;
+			}
+			if (ci->flags & CI_SECURE) {
+				end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
+								need_comma ? commastr : "",
+								getstring(u->na, CHAN_INFO_OPT_SECURE));
+				need_comma = 1;
+			}
+			if (ci->flags & CI_SECUREOPS) {
+				end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
+								need_comma ? commastr : "",
+								getstring(u->na, CHAN_INFO_OPT_SECUREOPS));
+				need_comma = 1;
+			}
+			if (ci->flags & CI_SECUREFOUNDER) {
+				end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
+								need_comma ? commastr : "",
+								getstring(u->na,
+										  CHAN_INFO_OPT_SECUREFOUNDER));
+				need_comma = 1;
+			}
+			if ((ci->flags & CI_SIGNKICK)
+				|| (ci->flags & CI_SIGNKICK_LEVEL)) {
+				end +=
+					snprintf(end, sizeof(buf) - (end - buf), "%s%s",
+							 need_comma ? commastr : "", getstring(u->na,
+																   CHAN_INFO_OPT_SIGNKICK));
+				need_comma = 1;
+			}
+			if (ci->flags & CI_TOPICLOCK) {
+				end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
+								need_comma ? commastr : "",
+								getstring(u->na, CHAN_INFO_OPT_TOPICLOCK));
+				need_comma = 1;
+			}
+			if (ci->flags & CI_XOP) {
+				end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
+								need_comma ? commastr : "",
+								getstring(u->na, CHAN_INFO_OPT_XOP));
+				need_comma = 1;
+			}
+			notice_lang(s_ChanServ, u, CHAN_INFO_OPTIONS,
+						*buf ? buf : getstring(u->na, CHAN_INFO_OPT_NONE));
+			notice_lang(s_ChanServ, u, CHAN_INFO_MODE_LOCK,
+						get_mlock_modes(ci, 1));
+
+		}
+		if (show_all) {
+			if (ci->flags & CI_NO_EXPIRE) {
+				notice_lang(s_ChanServ, u, CHAN_INFO_NO_EXPIRE);
+			} else {
+				if (is_servadmin) {
+					expt = ci->last_used + CSExpire;
+					tm = localtime(&expt);
+					strftime_lang(buf, sizeof(buf), u,
+								  STRFTIME_DATE_TIME_FORMAT, tm);
+					notice_lang(s_ChanServ, u, CHAN_INFO_EXPIRE, buf);
+				}
+			}
+		}
+		if (ci->flags & CI_SUSPENDED) {
+			notice_lang(s_ChanServ, u, CHAN_X_SUSPENDED, ci->forbidby,
+						(ci->forbidreason ? ci->
+						 forbidreason : getstring(u->na, NO_REASON)));
+		}
+
+		if (!show_all && (check_access(u, ci, CA_INFO) || is_servadmin))
+			notice_lang(s_ChanServ, u, NICK_INFO_FOR_MORE, s_ChanServ,
+						ci->name);
+
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("cs_info", CSInfo)
diff --git a/src/core/cs_invite.c b/src/core/cs_invite.c
index 191e7dcee..c75afc459 100644
--- a/src/core/cs_invite.c
+++ b/src/core/cs_invite.c
@@ -44,7 +44,7 @@ class CSInvite : public Module
  **/
 void myChanServHelp(User * u)
 {
-    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_INVITE);
+	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_INVITE);
 }
 
 /**
@@ -54,26 +54,26 @@ void myChanServHelp(User * u)
  **/
 int do_invite(User * u)
 {
-    char *chan = strtok(NULL, " ");
-    Channel *c;
-    ChannelInfo *ci;
+	char *chan = strtok(NULL, " ");
+	Channel *c;
+	ChannelInfo *ci;
 
-    if (!chan) {
-        syntax_error(s_ChanServ, u, "INVITE", CHAN_INVITE_SYNTAX);
-    } else if (!(c = findchan(chan))) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
-    } else if (!(ci = c->ci)) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
-    } else if (ci->flags & CI_VERBOTEN) {
-        notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
-    } else if (ci->flags & CI_SUSPENDED) {
-        notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
-    } else if (!u || !check_access(u, ci, CA_INVITE)) {
-        notice_lang(s_ChanServ, u, PERMISSION_DENIED);
-    } else {
-        ircdproto->SendInvite(whosends(ci), chan, u->nick);
-    }
-    return MOD_CONT;
+	if (!chan) {
+		syntax_error(s_ChanServ, u, "INVITE", CHAN_INVITE_SYNTAX);
+	} else if (!(c = findchan(chan))) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
+	} else if (!(ci = c->ci)) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
+	} else if (ci->flags & CI_VERBOTEN) {
+		notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
+	} else if (ci->flags & CI_SUSPENDED) {
+		notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
+	} else if (!u || !check_access(u, ci, CA_INVITE)) {
+		notice_lang(s_ChanServ, u, PERMISSION_DENIED);
+	} else {
+		ircdproto->SendInvite(whosends(ci), chan, u->nick);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("cs_invite", CSInvite)
diff --git a/src/core/cs_kick.c b/src/core/cs_kick.c
index 50f21ba37..a8eb7b2b3 100644
--- a/src/core/cs_kick.c
+++ b/src/core/cs_kick.c
@@ -42,7 +42,7 @@ class CSKick : public Module
  **/
 void myChanServHelp(User * u)
 {
-    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_KICK);
+	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_KICK);
 }
 
 /**
@@ -52,90 +52,90 @@ void myChanServHelp(User * u)
  **/
 int do_cs_kick(User * u)
 {
-    char *chan = strtok(NULL, " ");
-    char *params = strtok(NULL, " ");
-    char *reason = strtok(NULL, "");
-
-    Channel *c;
-    ChannelInfo *ci;
-    User *u2;
-
-    int is_same;
-
-    if (!reason) {
-        reason = "Requested";
-    } else {
-        if (strlen(reason) > 200)
-            reason[200] = '\0';
-    }
-
-    if (!chan) {
-        struct u_chanlist *uc, *next;
-
-        /* Kicks the user on every channels he is on. */
-
-        for (uc = u->chans; uc; uc = next) {
-            next = uc->next;
-            if ((ci = uc->chan->ci) && !(ci->flags & CI_VERBOTEN)
-                && check_access(u, ci, CA_KICKME)) {
-                const char *av[3];
-
-                if ((ci->flags & CI_SIGNKICK)
-                    || ((ci->flags & CI_SIGNKICK_LEVEL)
-                        && !check_access(u, ci, CA_SIGNKICK)))
-                    ircdproto->SendKick(whosends(ci), ci->name, u->nick,
-                                   "%s (%s)", reason, u->nick);
-                else
-                    ircdproto->SendKick(whosends(ci), ci->name, u->nick, "%s",
-                                   reason);
-                av[0] = ci->name;
-                av[1] = u->nick;
-                av[2] = reason;
-                do_kick(s_ChanServ, 3, av);
-            }
-        }
-
-        return MOD_CONT;
-    } else if (!params) {
-        params = u->nick;
-    }
-
-    is_same = (params == u->nick) ? 1 : (stricmp(params, u->nick) == 0);
-
-    if (!(c = findchan(chan))) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
-    } else if (!(ci = c->ci)) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
-    } else if (ci->flags & CI_VERBOTEN) {
-        notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
-    } else if (is_same ? !(u2 = u) : !(u2 = finduser(params))) {
-        notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, params);
-    } else if (!is_on_chan(c, u2)) {
-        notice_lang(s_ChanServ, u, NICK_X_NOT_ON_CHAN, u2->nick, c->name);
-    } else if (!is_same ? !check_access(u, ci, CA_KICK) :
-               !check_access(u, ci, CA_KICKME)) {
-        notice_lang(s_ChanServ, u, ACCESS_DENIED);
-    } else if (!is_same && (ci->flags & CI_PEACE)
-               && (get_access(u2, ci) >= get_access(u, ci))) {
-        notice_lang(s_ChanServ, u, PERMISSION_DENIED);
-    } else if (is_protected(u2)) {
-        notice_lang(s_ChanServ, u, PERMISSION_DENIED);
-    } else {
-        const char *av[3];
-
-        if ((ci->flags & CI_SIGNKICK)
-            || ((ci->flags & CI_SIGNKICK_LEVEL)
-                && !check_access(u, ci, CA_SIGNKICK)))
-            ircdproto->SendKick(whosends(ci), ci->name, params, "%s (%s)",
-                           reason, u->nick);
-        else
-            ircdproto->SendKick(whosends(ci), ci->name, params, "%s", reason);
-        av[0] = ci->name;
-        av[1] = params;
-        av[2] = reason;
-        do_kick(s_ChanServ, 3, av);
-    }
-    return MOD_CONT;
+	char *chan = strtok(NULL, " ");
+	char *params = strtok(NULL, " ");
+	char *reason = strtok(NULL, "");
+
+	Channel *c;
+	ChannelInfo *ci;
+	User *u2;
+
+	int is_same;
+
+	if (!reason) {
+		reason = "Requested";
+	} else {
+		if (strlen(reason) > 200)
+			reason[200] = '\0';
+	}
+
+	if (!chan) {
+		struct u_chanlist *uc, *next;
+
+		/* Kicks the user on every channels he is on. */
+
+		for (uc = u->chans; uc; uc = next) {
+			next = uc->next;
+			if ((ci = uc->chan->ci) && !(ci->flags & CI_VERBOTEN)
+				&& check_access(u, ci, CA_KICKME)) {
+				const char *av[3];
+
+				if ((ci->flags & CI_SIGNKICK)
+					|| ((ci->flags & CI_SIGNKICK_LEVEL)
+						&& !check_access(u, ci, CA_SIGNKICK)))
+					ircdproto->SendKick(whosends(ci), ci->name, u->nick,
+								   "%s (%s)", reason, u->nick);
+				else
+					ircdproto->SendKick(whosends(ci), ci->name, u->nick, "%s",
+								   reason);
+				av[0] = ci->name;
+				av[1] = u->nick;
+				av[2] = reason;
+				do_kick(s_ChanServ, 3, av);
+			}
+		}
+
+		return MOD_CONT;
+	} else if (!params) {
+		params = u->nick;
+	}
+
+	is_same = (params == u->nick) ? 1 : (stricmp(params, u->nick) == 0);
+
+	if (!(c = findchan(chan))) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
+	} else if (!(ci = c->ci)) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
+	} else if (ci->flags & CI_VERBOTEN) {
+		notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
+	} else if (is_same ? !(u2 = u) : !(u2 = finduser(params))) {
+		notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, params);
+	} else if (!is_on_chan(c, u2)) {
+		notice_lang(s_ChanServ, u, NICK_X_NOT_ON_CHAN, u2->nick, c->name);
+	} else if (!is_same ? !check_access(u, ci, CA_KICK) :
+			   !check_access(u, ci, CA_KICKME)) {
+		notice_lang(s_ChanServ, u, ACCESS_DENIED);
+	} else if (!is_same && (ci->flags & CI_PEACE)
+			   && (get_access(u2, ci) >= get_access(u, ci))) {
+		notice_lang(s_ChanServ, u, PERMISSION_DENIED);
+	} else if (is_protected(u2)) {
+		notice_lang(s_ChanServ, u, PERMISSION_DENIED);
+	} else {
+		const char *av[3];
+
+		if ((ci->flags & CI_SIGNKICK)
+			|| ((ci->flags & CI_SIGNKICK_LEVEL)
+				&& !check_access(u, ci, CA_SIGNKICK)))
+			ircdproto->SendKick(whosends(ci), ci->name, params, "%s (%s)",
+						   reason, u->nick);
+		else
+			ircdproto->SendKick(whosends(ci), ci->name, params, "%s", reason);
+		av[0] = ci->name;
+		av[1] = params;
+		av[2] = reason;
+		do_kick(s_ChanServ, 3, av);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("cs_kick", CSKick)
diff --git a/src/core/cs_list.c b/src/core/cs_list.c
index d5eb57fa3..a6e81d33c 100644
--- a/src/core/cs_list.c
+++ b/src/core/cs_list.c
@@ -45,9 +45,9 @@ class CSList : public Module
  **/
 void myChanServHelp(User * u)
 {
-    if (!CSListOpersOnly || (is_oper(u))) {
-        notice_lang(s_ChanServ, u, CHAN_HELP_CMD_LIST);
-    }
+	if (!CSListOpersOnly || (is_oper(u))) {
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_LIST);
+	}
 }
 
 /**
@@ -57,130 +57,130 @@ void myChanServHelp(User * u)
  **/
 int do_list(User * u)
 {
-    char *pattern = strtok(NULL, " ");
-    int spattern_size;
-    char *spattern;
-    ChannelInfo *ci;
-    int nchans, i;
-    char buf[BUFSIZE];
-    int is_servadmin = is_services_admin(u);
-    int count = 0, from = 0, to = 0, tofree = 0;
-    char *tmp = NULL;
-    char *s = NULL;
-    char *keyword;
-    int32 matchflags = 0;
-
-    if (!(!CSListOpersOnly || (is_oper(u)))) {
-        notice_lang(s_ChanServ, u, ACCESS_DENIED);
-        return MOD_STOP;
-    }
-
-    if (!pattern) {
-        syntax_error(s_ChanServ, u, "LIST",
-                     is_servadmin ? CHAN_LIST_SERVADMIN_SYNTAX :
-                     CHAN_LIST_SYNTAX);
-    } else {
-
-        if (pattern) {
-            if (pattern[0] == '#') {
-                tmp = myStrGetOnlyToken((pattern + 1), '-', 0); /* Read FROM out */
-                if (!tmp) {
-                	notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE);
-                	notice_lang(s_ChanServ, u, CS_LIST_INCORRECT_RANGE);
-                    return MOD_CONT;
-                }
-                for (s = tmp; *s; s++) {
-                    if (!isdigit(*s)) {
-                        free(tmp);
-        		       	notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE);
-		               	notice_lang(s_ChanServ, u, CS_LIST_INCORRECT_RANGE);
-                        return MOD_CONT;
-                    }
-                }
-                from = atoi(tmp);
-                free(tmp);
-                tmp = myStrGetTokenRemainder(pattern, '-', 1);  /* Read TO out */
-                if (!tmp) {
-                	notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE);
-                	notice_lang(s_ChanServ, u, CS_LIST_INCORRECT_RANGE);
-                    return MOD_CONT;
-                }
-                for (s = tmp; *s; s++) {
-                    if (!isdigit(*s)) {
-                        free(tmp);
-	                	notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE);
-    	            	notice_lang(s_ChanServ, u, CS_LIST_INCORRECT_RANGE);
-                        return MOD_CONT;
-                    }
-                }
-                to = atoi(tmp);
-                free(tmp);
-                pattern = sstrdup("*");
-                tofree = 1;
-            }
-        }
-
-        nchans = 0;
-
-        while (is_servadmin && (keyword = strtok(NULL, " "))) {
-            if (stricmp(keyword, "FORBIDDEN") == 0)
-                matchflags |= CI_VERBOTEN;
-            if (stricmp(keyword, "SUSPENDED") == 0)
-                matchflags |= CI_SUSPENDED;
-            if (stricmp(keyword, "NOEXPIRE") == 0)
-                matchflags |= CI_NO_EXPIRE;
-        }
-        
-        spattern_size = (strlen(pattern) + 2) * sizeof(char);
-        spattern = (char *)smalloc(spattern_size);
-        snprintf(spattern, spattern_size, "#%s", pattern);
-        
-
-        notice_lang(s_ChanServ, u, CHAN_LIST_HEADER, pattern);
-        for (i = 0; i < 256; i++) {
-            for (ci = chanlists[i]; ci; ci = ci->next) {
-                if (!is_servadmin && ((ci->flags & CI_PRIVATE)
-                                      || (ci->flags & CI_VERBOTEN)))
-                    continue;
-                if ((matchflags != 0) && !(ci->flags & matchflags))
-                    continue;
-
-                if ((stricmp(pattern, ci->name) == 0)
-                	|| (stricmp(spattern, ci->name) == 0)
-                    || match_wild_nocase(pattern, ci->name)
-                    || match_wild_nocase(spattern, ci->name)) {
-                    if ((((count + 1 >= from) && (count + 1 <= to))
-                         || ((from == 0) && (to == 0)))
-                        && (++nchans <= CSListMax)) {
-                        char noexpire_char = ' ';
-                        if (is_servadmin && (ci->flags & CI_NO_EXPIRE))
-                            noexpire_char = '!';
-
-                        if (ci->flags & CI_VERBOTEN) {
-                            snprintf(buf, sizeof(buf),
-                                     "%-20s  [Forbidden]", ci->name);
-                        } else if (ci->flags & CI_SUSPENDED) {
-                            snprintf(buf, sizeof(buf),
-                                     "%-20s  [Suspended]", ci->name);
-                        } else {
-                            snprintf(buf, sizeof(buf), "%-20s  %s",
-                                     ci->name, ci->desc ? ci->desc : "");
-                        }
-
-                        notice_user(s_ChanServ, u, "  %c%s",
-                                    noexpire_char, buf);
-                    }
-                    count++;
-                }
-            }
-        }
-        notice_lang(s_ChanServ, u, CHAN_LIST_END,
-                    nchans > CSListMax ? CSListMax : nchans, nchans);
-        free(spattern);
-    }
-    if (tofree)
-        free(pattern);
-    return MOD_CONT;
+	char *pattern = strtok(NULL, " ");
+	int spattern_size;
+	char *spattern;
+	ChannelInfo *ci;
+	int nchans, i;
+	char buf[BUFSIZE];
+	int is_servadmin = is_services_admin(u);
+	int count = 0, from = 0, to = 0, tofree = 0;
+	char *tmp = NULL;
+	char *s = NULL;
+	char *keyword;
+	int32 matchflags = 0;
+
+	if (!(!CSListOpersOnly || (is_oper(u)))) {
+		notice_lang(s_ChanServ, u, ACCESS_DENIED);
+		return MOD_STOP;
+	}
+
+	if (!pattern) {
+		syntax_error(s_ChanServ, u, "LIST",
+					 is_servadmin ? CHAN_LIST_SERVADMIN_SYNTAX :
+					 CHAN_LIST_SYNTAX);
+	} else {
+
+		if (pattern) {
+			if (pattern[0] == '#') {
+				tmp = myStrGetOnlyToken((pattern + 1), '-', 0); /* Read FROM out */
+				if (!tmp) {
+					notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE);
+					notice_lang(s_ChanServ, u, CS_LIST_INCORRECT_RANGE);
+					return MOD_CONT;
+				}
+				for (s = tmp; *s; s++) {
+					if (!isdigit(*s)) {
+						free(tmp);
+					   	notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE);
+					   	notice_lang(s_ChanServ, u, CS_LIST_INCORRECT_RANGE);
+						return MOD_CONT;
+					}
+				}
+				from = atoi(tmp);
+				free(tmp);
+				tmp = myStrGetTokenRemainder(pattern, '-', 1);  /* Read TO out */
+				if (!tmp) {
+					notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE);
+					notice_lang(s_ChanServ, u, CS_LIST_INCORRECT_RANGE);
+					return MOD_CONT;
+				}
+				for (s = tmp; *s; s++) {
+					if (!isdigit(*s)) {
+						free(tmp);
+						notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE);
+						notice_lang(s_ChanServ, u, CS_LIST_INCORRECT_RANGE);
+						return MOD_CONT;
+					}
+				}
+				to = atoi(tmp);
+				free(tmp);
+				pattern = sstrdup("*");
+				tofree = 1;
+			}
+		}
+
+		nchans = 0;
+
+		while (is_servadmin && (keyword = strtok(NULL, " "))) {
+			if (stricmp(keyword, "FORBIDDEN") == 0)
+				matchflags |= CI_VERBOTEN;
+			if (stricmp(keyword, "SUSPENDED") == 0)
+				matchflags |= CI_SUSPENDED;
+			if (stricmp(keyword, "NOEXPIRE") == 0)
+				matchflags |= CI_NO_EXPIRE;
+		}
+		
+		spattern_size = (strlen(pattern) + 2) * sizeof(char);
+		spattern = (char *)smalloc(spattern_size);
+		snprintf(spattern, spattern_size, "#%s", pattern);
+		
+
+		notice_lang(s_ChanServ, u, CHAN_LIST_HEADER, pattern);
+		for (i = 0; i < 256; i++) {
+			for (ci = chanlists[i]; ci; ci = ci->next) {
+				if (!is_servadmin && ((ci->flags & CI_PRIVATE)
+									  || (ci->flags & CI_VERBOTEN)))
+					continue;
+				if ((matchflags != 0) && !(ci->flags & matchflags))
+					continue;
+
+				if ((stricmp(pattern, ci->name) == 0)
+					|| (stricmp(spattern, ci->name) == 0)
+					|| match_wild_nocase(pattern, ci->name)
+					|| match_wild_nocase(spattern, ci->name)) {
+					if ((((count + 1 >= from) && (count + 1 <= to))
+						 || ((from == 0) && (to == 0)))
+						&& (++nchans <= CSListMax)) {
+						char noexpire_char = ' ';
+						if (is_servadmin && (ci->flags & CI_NO_EXPIRE))
+							noexpire_char = '!';
+
+						if (ci->flags & CI_VERBOTEN) {
+							snprintf(buf, sizeof(buf),
+									 "%-20s  [Forbidden]", ci->name);
+						} else if (ci->flags & CI_SUSPENDED) {
+							snprintf(buf, sizeof(buf),
+									 "%-20s  [Suspended]", ci->name);
+						} else {
+							snprintf(buf, sizeof(buf), "%-20s  %s",
+									 ci->name, ci->desc ? ci->desc : "");
+						}
+
+						notice_user(s_ChanServ, u, "  %c%s",
+									noexpire_char, buf);
+					}
+					count++;
+				}
+			}
+		}
+		notice_lang(s_ChanServ, u, CHAN_LIST_END,
+					nchans > CSListMax ? CSListMax : nchans, nchans);
+		free(spattern);
+	}
+	if (tofree)
+		free(pattern);
+	return MOD_CONT;
 
 }
 
diff --git a/src/core/cs_logout.c b/src/core/cs_logout.c
index e1d8124ee..16e2a8ebc 100644
--- a/src/core/cs_logout.c
+++ b/src/core/cs_logout.c
@@ -44,7 +44,7 @@ class CSLogout : public Module
  **/
 void myChanServHelp(User * u)
 {
-    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_LOGOUT);
+	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_LOGOUT);
 }
 
 /**
@@ -54,65 +54,65 @@ void myChanServHelp(User * u)
  **/
 int do_logout(User * u)
 {
-    char *chan = strtok(NULL, " ");
-    char *nick = strtok(NULL, " ");
-    ChannelInfo *ci;
-    User *u2 = NULL;
-    int is_servadmin = is_services_admin(u);
+	char *chan = strtok(NULL, " ");
+	char *nick = strtok(NULL, " ");
+	ChannelInfo *ci;
+	User *u2 = NULL;
+	int is_servadmin = is_services_admin(u);
 
-    if (!chan || (!nick && !is_servadmin)) {
-        syntax_error(s_ChanServ, u, "LOGOUT",
-                     (!is_servadmin ? CHAN_LOGOUT_SYNTAX :
-                      CHAN_LOGOUT_SERVADMIN_SYNTAX));
-    } else if (!(ci = cs_findchan(chan))) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
-    } else if (!is_servadmin && (ci->flags & CI_VERBOTEN)) {
-        notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
-    } else if (nick && !(u2 = finduser(nick))) {
-        notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, nick);
-    } else if (!is_servadmin && u2 != u && !is_real_founder(u, ci)) {
-        notice_lang(s_ChanServ, u, ACCESS_DENIED);
+	if (!chan || (!nick && !is_servadmin)) {
+		syntax_error(s_ChanServ, u, "LOGOUT",
+					 (!is_servadmin ? CHAN_LOGOUT_SYNTAX :
+					  CHAN_LOGOUT_SERVADMIN_SYNTAX));
+	} else if (!(ci = cs_findchan(chan))) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
+	} else if (!is_servadmin && (ci->flags & CI_VERBOTEN)) {
+		notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
+	} else if (nick && !(u2 = finduser(nick))) {
+		notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, nick);
+	} else if (!is_servadmin && u2 != u && !is_real_founder(u, ci)) {
+		notice_lang(s_ChanServ, u, ACCESS_DENIED);
 	/* Since founders can not logout we should tell them -katsklaw */
-    } else if (u2 == u && is_real_founder(u, ci)) {
+	} else if (u2 == u && is_real_founder(u, ci)) {
 	notice_lang(s_ChanServ, u, CHAN_LOGOUT_FOUNDER_FAILED, chan);
-    } else {
-        if (u2) {
-            make_unidentified(u2, ci);
-            notice_lang(s_ChanServ, u, CHAN_LOGOUT_SUCCEEDED, nick, chan);
-            alog("%s: User %s!%s@%s has been logged out of channel %s.",
-                 s_ChanServ, u2->nick, u2->username, u2->host, chan);
-        } else {
-            int i;
-            for (i = 0; i < 1024; i++)
-                for (u2 = userlist[i]; u2; u2 = u2->next)
-                    make_unidentified(u2, ci);
-            notice_lang(s_ChanServ, u, CHAN_LOGOUT_ALL_SUCCEEDED, chan);
-            alog("%s: All users identified have been logged out of channel %s.", s_ChanServ, chan);
-        }
+	} else {
+		if (u2) {
+			make_unidentified(u2, ci);
+			notice_lang(s_ChanServ, u, CHAN_LOGOUT_SUCCEEDED, nick, chan);
+			alog("%s: User %s!%s@%s has been logged out of channel %s.",
+				 s_ChanServ, u2->nick, u2->username, u2->host, chan);
+		} else {
+			int i;
+			for (i = 0; i < 1024; i++)
+				for (u2 = userlist[i]; u2; u2 = u2->next)
+					make_unidentified(u2, ci);
+			notice_lang(s_ChanServ, u, CHAN_LOGOUT_ALL_SUCCEEDED, chan);
+			alog("%s: All users identified have been logged out of channel %s.", s_ChanServ, chan);
+		}
 
-    }
-    return MOD_CONT;
+	}
+	return MOD_CONT;
 }
 
 void make_unidentified(User * u, ChannelInfo * ci)
 {
-    struct u_chaninfolist *uci;
+	struct u_chaninfolist *uci;
 
-    if (!u || !ci)
-        return;
+	if (!u || !ci)
+		return;
 
-    for (uci = u->founder_chans; uci; uci = uci->next) {
-        if (uci->chan == ci) {
-            if (uci->next)
-                uci->next->prev = uci->prev;
-            if (uci->prev)
-                uci->prev->next = uci->next;
-            else
-                u->founder_chans = uci->next;
-            free(uci);
-            break;
-        }
-    }
+	for (uci = u->founder_chans; uci; uci = uci->next) {
+		if (uci->chan == ci) {
+			if (uci->next)
+				uci->next->prev = uci->prev;
+			if (uci->prev)
+				uci->prev->next = uci->next;
+			else
+				u->founder_chans = uci->next;
+			free(uci);
+			break;
+		}
+	}
 }
 
 MODULE_INIT("cs_logout", CSLogout)
diff --git a/src/core/cs_modes.c b/src/core/cs_modes.c
index 8a33bc6fd..e84de54bb 100644
--- a/src/core/cs_modes.c
+++ b/src/core/cs_modes.c
@@ -86,26 +86,26 @@ class CSModes : public Module
  **/
 void myChanServHelp(User * u)
 {
-    if (ircd->owner) {
-        notice_lang(s_ChanServ, u, CHAN_HELP_CMD_OWNER);
-        notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DEOWNER);
-    }
-    if (ircd->protect) {
-        notice_lang(s_ChanServ, u, CHAN_HELP_CMD_PROTECT);
-        notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DEPROTECT);
-    } else if (ircd->admin) {
-        notice_lang(s_ChanServ, u, CHAN_HELP_CMD_ADMIN);
-        notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DEADMIN);
-    }
-
-    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_OP);
-    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DEOP);
-    if (ircd->halfop) {
-        notice_lang(s_ChanServ, u, CHAN_HELP_CMD_HALFOP);
-        notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DEHALFOP);
-    }
-    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_VOICE);
-    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DEVOICE);
+	if (ircd->owner) {
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_OWNER);
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DEOWNER);
+	}
+	if (ircd->protect) {
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_PROTECT);
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DEPROTECT);
+	} else if (ircd->admin) {
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_ADMIN);
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DEADMIN);
+	}
+
+	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_OP);
+	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DEOP);
+	if (ircd->halfop) {
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_HALFOP);
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DEHALFOP);
+	}
+	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_VOICE);
+	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DEVOICE);
 }
 
 /**
@@ -116,256 +116,256 @@ void myChanServHelp(User * u)
 
 int do_op(User * u)
 {
-    return do_util(u, &csmodeutils[MUT_OP]);
+	return do_util(u, &csmodeutils[MUT_OP]);
 }
 
 /*************************************************************************/
 
 int do_deop(User * u)
 {
-    return do_util(u, &csmodeutils[MUT_DEOP]);
+	return do_util(u, &csmodeutils[MUT_DEOP]);
 }
 
 /*************************************************************************/
 
 int do_voice(User * u)
 {
-    return do_util(u, &csmodeutils[MUT_VOICE]);
+	return do_util(u, &csmodeutils[MUT_VOICE]);
 }
 
 /*************************************************************************/
 
 int do_devoice(User * u)
 {
-    return do_util(u, &csmodeutils[MUT_DEVOICE]);
+	return do_util(u, &csmodeutils[MUT_DEVOICE]);
 }
 
 /*************************************************************************/
 
 int do_halfop(User * u)
 {
-    if (ircd->halfop) {
-        return do_util(u, &csmodeutils[MUT_HALFOP]);
-    } else {
-        return MOD_CONT;
-    }
+	if (ircd->halfop) {
+		return do_util(u, &csmodeutils[MUT_HALFOP]);
+	} else {
+		return MOD_CONT;
+	}
 }
 
 /*************************************************************************/
 
 int do_dehalfop(User * u)
 {
-    if (ircd->halfop) {
-        return do_util(u, &csmodeutils[MUT_DEHALFOP]);
-    } else {
-        return MOD_CONT;
-    }
+	if (ircd->halfop) {
+		return do_util(u, &csmodeutils[MUT_DEHALFOP]);
+	} else {
+		return MOD_CONT;
+	}
 }
 
 /*************************************************************************/
 
 int do_protect(User * u)
 {
-    if (ircd->protect || ircd->admin) {
-        return do_util(u, &csmodeutils[MUT_PROTECT]);
-    } else {
-        return MOD_CONT;
-    }
+	if (ircd->protect || ircd->admin) {
+		return do_util(u, &csmodeutils[MUT_PROTECT]);
+	} else {
+		return MOD_CONT;
+	}
 }
 
 /*************************************************************************/
 
 int do_deprotect(User * u)
 {
-    if (ircd->protect || ircd->admin) {
-        return do_util(u, &csmodeutils[MUT_DEPROTECT]);
-    } else {
-        return MOD_CONT;
-    }
+	if (ircd->protect || ircd->admin) {
+		return do_util(u, &csmodeutils[MUT_DEPROTECT]);
+	} else {
+		return MOD_CONT;
+	}
 }
 
 /*************************************************************************/
 
 int do_owner(User * u)
 {
-    const char *av[2];
-    char *chan = strtok(NULL, " ");
-
-    Channel *c;
-    ChannelInfo *ci;
-    struct u_chanlist *uc;
-
-    if (!ircd->owner) {
-        return MOD_CONT;
-    }
-
-    if (!chan) {
-        av[0] = ircd->ownerset;
-        av[1] = u->nick;
-
-        /* Sets the mode to the user on every channels he is on. */
-
-        for (uc = u->chans; uc; uc = uc->next) {
-            if ((ci = uc->chan->ci) && !(ci->flags & CI_VERBOTEN)
-                && is_founder(u, ci)) {
-                ircdproto->SendMode(whosends(ci), uc->chan->name, "%s %s",
-                               av[0], u->nick);
-                chan_set_modes(s_ChanServ, uc->chan, 2, av, 1);
-            }
-        }
-
-        return MOD_CONT;
-    }
-
-    if (!(c = findchan(chan))) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
-    } else if (!(ci = c->ci)) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, c->name);
-    } else if (ci->flags & CI_VERBOTEN) {
-        notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, ci->name);
-    } else if (!is_on_chan(c, u)) {
-        notice_lang(s_ChanServ, u, NICK_X_NOT_ON_CHAN, u->nick, c->name);
-    } else if (!is_founder(u, ci)) {
-        notice_lang(s_ChanServ, u, ACCESS_DENIED);
-    } else {
-        ircdproto->SendMode(whosends(ci), c->name, "%s %s", ircd->ownerset,
-                       u->nick);
-
-        av[0] = ircd->ownerset;
-        av[1] = u->nick;
-        chan_set_modes(s_ChanServ, c, 2, av, 1);
-    }
-    return MOD_CONT;
+	const char *av[2];
+	char *chan = strtok(NULL, " ");
+
+	Channel *c;
+	ChannelInfo *ci;
+	struct u_chanlist *uc;
+
+	if (!ircd->owner) {
+		return MOD_CONT;
+	}
+
+	if (!chan) {
+		av[0] = ircd->ownerset;
+		av[1] = u->nick;
+
+		/* Sets the mode to the user on every channels he is on. */
+
+		for (uc = u->chans; uc; uc = uc->next) {
+			if ((ci = uc->chan->ci) && !(ci->flags & CI_VERBOTEN)
+				&& is_founder(u, ci)) {
+				ircdproto->SendMode(whosends(ci), uc->chan->name, "%s %s",
+							   av[0], u->nick);
+				chan_set_modes(s_ChanServ, uc->chan, 2, av, 1);
+			}
+		}
+
+		return MOD_CONT;
+	}
+
+	if (!(c = findchan(chan))) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
+	} else if (!(ci = c->ci)) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, c->name);
+	} else if (ci->flags & CI_VERBOTEN) {
+		notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, ci->name);
+	} else if (!is_on_chan(c, u)) {
+		notice_lang(s_ChanServ, u, NICK_X_NOT_ON_CHAN, u->nick, c->name);
+	} else if (!is_founder(u, ci)) {
+		notice_lang(s_ChanServ, u, ACCESS_DENIED);
+	} else {
+		ircdproto->SendMode(whosends(ci), c->name, "%s %s", ircd->ownerset,
+					   u->nick);
+
+		av[0] = ircd->ownerset;
+		av[1] = u->nick;
+		chan_set_modes(s_ChanServ, c, 2, av, 1);
+	}
+	return MOD_CONT;
 }
 
 /*************************************************************************/
 
 int do_deowner(User * u)
 {
-    const char *av[2];
-    char *chan = strtok(NULL, " ");
-
-    Channel *c;
-    ChannelInfo *ci;
-    struct u_chanlist *uc;
-
-    if (!ircd->owner) {
-        return MOD_CONT;
-    }
-
-    if (!chan) {
-        av[0] = ircd->ownerunset;
-        av[1] = u->nick;
-
-        /* Sets the mode to the user on every channels he is on. */
-
-        for (uc = u->chans; uc; uc = uc->next) {
-            if ((ci = uc->chan->ci) && !(ci->flags & CI_VERBOTEN)
-                && is_founder(u, ci)) {
-                ircdproto->SendMode(whosends(ci), uc->chan->name, "%s %s",
-                               av[0], u->nick);
-                chan_set_modes(s_ChanServ, uc->chan, 2, av, 1);
-            }
-        }
-
-        return MOD_CONT;
-    }
-
-    if (!(c = findchan(chan))) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
-    } else if (!(ci = c->ci)) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, c->name);
-    } else if (ci->flags & CI_VERBOTEN) {
-        notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, ci->name);
-    } else if (!is_on_chan(c, u)) {
-        notice_lang(s_ChanServ, u, NICK_X_NOT_ON_CHAN, u->nick, c->name);
-    } else if (!is_founder(u, ci)) {
-        notice_lang(s_ChanServ, u, ACCESS_DENIED);
-    } else {
-        ircdproto->SendMode(whosends(ci), c->name, "%s %s", ircd->ownerunset,
-                       u->nick);
-
-        av[0] = ircd->ownerunset;
-        av[1] = u->nick;
-        chan_set_modes(s_ChanServ, c, 2, av, 1);
-    }
-    return MOD_CONT;
+	const char *av[2];
+	char *chan = strtok(NULL, " ");
+
+	Channel *c;
+	ChannelInfo *ci;
+	struct u_chanlist *uc;
+
+	if (!ircd->owner) {
+		return MOD_CONT;
+	}
+
+	if (!chan) {
+		av[0] = ircd->ownerunset;
+		av[1] = u->nick;
+
+		/* Sets the mode to the user on every channels he is on. */
+
+		for (uc = u->chans; uc; uc = uc->next) {
+			if ((ci = uc->chan->ci) && !(ci->flags & CI_VERBOTEN)
+				&& is_founder(u, ci)) {
+				ircdproto->SendMode(whosends(ci), uc->chan->name, "%s %s",
+							   av[0], u->nick);
+				chan_set_modes(s_ChanServ, uc->chan, 2, av, 1);
+			}
+		}
+
+		return MOD_CONT;
+	}
+
+	if (!(c = findchan(chan))) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
+	} else if (!(ci = c->ci)) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, c->name);
+	} else if (ci->flags & CI_VERBOTEN) {
+		notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, ci->name);
+	} else if (!is_on_chan(c, u)) {
+		notice_lang(s_ChanServ, u, NICK_X_NOT_ON_CHAN, u->nick, c->name);
+	} else if (!is_founder(u, ci)) {
+		notice_lang(s_ChanServ, u, ACCESS_DENIED);
+	} else {
+		ircdproto->SendMode(whosends(ci), c->name, "%s %s", ircd->ownerunset,
+					   u->nick);
+
+		av[0] = ircd->ownerunset;
+		av[1] = u->nick;
+		chan_set_modes(s_ChanServ, c, 2, av, 1);
+	}
+	return MOD_CONT;
 }
 
 /* do_util: not a command, but does the job of other */
 
 int do_util(User * u, CSModeUtil * util)
 {
-    const char *av[2];
-    char *chan = strtok(NULL, " ");
-    char *nick = strtok(NULL, " ");
-
-    Channel *c;
-    ChannelInfo *ci;
-    User *u2;
-
-    int is_same;
-
-    if (!chan) {
-        struct u_chanlist *uc;
-
-        av[0] = util->mode;
-        av[1] = u->nick;
-
-        /* Sets the mode to the user on every channels he is on. */
-
-        for (uc = u->chans; uc; uc = uc->next) {
-            if ((ci = uc->chan->ci) && !(ci->flags & CI_VERBOTEN)
-                && check_access(u, ci, util->levelself)) {
-                ircdproto->SendMode(whosends(ci), uc->chan->name, "%s %s",
-                               util->mode, u->nick);
-                chan_set_modes(s_ChanServ, uc->chan, 2, av, 2);
-
-                if (util->notice && ci->flags & util->notice)
-                    ircdproto->SendMessage(whosends(ci), uc->chan->name,
-                           "%s command used for %s by %s", util->name,
-                           u->nick, u->nick);
-            }
-        }
-
-        return MOD_CONT;
-    } else if (!nick) {
-        nick = u->nick;
-    }
-
-    is_same = (nick == u->nick) ? 1 : (stricmp(nick, u->nick) == 0);
-
-    if (!(c = findchan(chan))) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
-    } else if (!(ci = c->ci)) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, c->name);
-    } else if (ci->flags & CI_VERBOTEN) {
-        notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, ci->name);
-    } else if (is_same ? !(u2 = u) : !(u2 = finduser(nick))) {
-        notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, nick);
-    } else if (!is_on_chan(c, u2)) {
-        notice_lang(s_ChanServ, u, NICK_X_NOT_ON_CHAN, u2->nick, c->name);
-    } else if (is_same ? !check_access(u, ci, util->levelself) :
-               !check_access(u, ci, util->level)) {
-        notice_lang(s_ChanServ, u, ACCESS_DENIED);
-    } else if (*util->mode == '-' && !is_same && (ci->flags & CI_PEACE)
-               && (get_access(u2, ci) >= get_access(u, ci))) {
-        notice_lang(s_ChanServ, u, PERMISSION_DENIED);
-    } else if (*util->mode == '-' && is_protected(u2) && !is_same) {
-        notice_lang(s_ChanServ, u, PERMISSION_DENIED);
-    } else {
-        ircdproto->SendMode(whosends(ci), c->name, "%s %s", util->mode,
-                       u2->nick);
-
-        av[0] = util->mode;
-        av[1] = u2->nick;
-        chan_set_modes(s_ChanServ, c, 2, av, 2);
-
-        if (util->notice && ci->flags & util->notice)
-            ircdproto->SendMessage(whosends(ci), c->name, "%s command used for %s by %s",
-                   util->name, u2->nick, u->nick);
-    }
-    return MOD_CONT;
+	const char *av[2];
+	char *chan = strtok(NULL, " ");
+	char *nick = strtok(NULL, " ");
+
+	Channel *c;
+	ChannelInfo *ci;
+	User *u2;
+
+	int is_same;
+
+	if (!chan) {
+		struct u_chanlist *uc;
+
+		av[0] = util->mode;
+		av[1] = u->nick;
+
+		/* Sets the mode to the user on every channels he is on. */
+
+		for (uc = u->chans; uc; uc = uc->next) {
+			if ((ci = uc->chan->ci) && !(ci->flags & CI_VERBOTEN)
+				&& check_access(u, ci, util->levelself)) {
+				ircdproto->SendMode(whosends(ci), uc->chan->name, "%s %s",
+							   util->mode, u->nick);
+				chan_set_modes(s_ChanServ, uc->chan, 2, av, 2);
+
+				if (util->notice && ci->flags & util->notice)
+					ircdproto->SendMessage(whosends(ci), uc->chan->name,
+						   "%s command used for %s by %s", util->name,
+						   u->nick, u->nick);
+			}
+		}
+
+		return MOD_CONT;
+	} else if (!nick) {
+		nick = u->nick;
+	}
+
+	is_same = (nick == u->nick) ? 1 : (stricmp(nick, u->nick) == 0);
+
+	if (!(c = findchan(chan))) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
+	} else if (!(ci = c->ci)) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, c->name);
+	} else if (ci->flags & CI_VERBOTEN) {
+		notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, ci->name);
+	} else if (is_same ? !(u2 = u) : !(u2 = finduser(nick))) {
+		notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, nick);
+	} else if (!is_on_chan(c, u2)) {
+		notice_lang(s_ChanServ, u, NICK_X_NOT_ON_CHAN, u2->nick, c->name);
+	} else if (is_same ? !check_access(u, ci, util->levelself) :
+			   !check_access(u, ci, util->level)) {
+		notice_lang(s_ChanServ, u, ACCESS_DENIED);
+	} else if (*util->mode == '-' && !is_same && (ci->flags & CI_PEACE)
+			   && (get_access(u2, ci) >= get_access(u, ci))) {
+		notice_lang(s_ChanServ, u, PERMISSION_DENIED);
+	} else if (*util->mode == '-' && is_protected(u2) && !is_same) {
+		notice_lang(s_ChanServ, u, PERMISSION_DENIED);
+	} else {
+		ircdproto->SendMode(whosends(ci), c->name, "%s %s", util->mode,
+					   u2->nick);
+
+		av[0] = util->mode;
+		av[1] = u2->nick;
+		chan_set_modes(s_ChanServ, c, 2, av, 2);
+
+		if (util->notice && ci->flags & util->notice)
+			ircdproto->SendMessage(whosends(ci), c->name, "%s command used for %s by %s",
+				   util->name, u2->nick, u->nick);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("cs_modes", CSModes)
diff --git a/src/core/cs_register.c b/src/core/cs_register.c
index 2fb180b76..524790330 100644
--- a/src/core/cs_register.c
+++ b/src/core/cs_register.c
@@ -45,7 +45,7 @@ class CSRegister : public Module
  **/
 void myChanServHelp(User * u)
 {
-    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_REGISTER);
+	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_REGISTER);
 }
 
 /**
@@ -55,125 +55,125 @@ void myChanServHelp(User * u)
  **/
 int do_register(User * u)
 {
-    char *chan = strtok(NULL, " ");
-    char *pass = strtok(NULL, " ");
-    char *desc = strtok(NULL, "");
-    NickCore *nc;
-    Channel *c;
-    ChannelInfo *ci;
-    struct u_chaninfolist *uc;
-    int is_servadmin = is_services_admin(u);
-    char founderpass[PASSMAX];
-    char tmp_pass[PASSMAX];
-
-    if (readonly) {
-        notice_lang(s_ChanServ, u, CHAN_REGISTER_DISABLED);
-        return MOD_CONT;
-    }
-
-    if (checkDefCon(DEFCON_NO_NEW_CHANNELS)) {
-        notice_lang(s_ChanServ, u, OPER_DEFCON_DENIED);
-        return MOD_CONT;
-    }
-
-    if (!desc) {
-        syntax_error(s_ChanServ, u, "REGISTER", CHAN_REGISTER_SYNTAX);
-    } else if (*chan == '&') {
-        notice_lang(s_ChanServ, u, CHAN_REGISTER_NOT_LOCAL);
-    } else if (*chan != '#') {
-        notice_lang(s_ChanServ, u, CHAN_SYMBOL_REQUIRED);
-    } else if (!ircdproto->IsChannelValid(chan)) {
-        notice_lang(s_ChanServ, u, CHAN_X_INVALID, chan);
-    } else if (!u->na || !(nc = u->na->nc)) {
-        notice_lang(s_ChanServ, u, CHAN_MUST_REGISTER_NICK, s_NickServ);
-    } else if (!nick_recognized(u)) {
-        notice_lang(s_ChanServ, u, CHAN_MUST_IDENTIFY_NICK, s_NickServ,
-                    s_NickServ);
-    } else if (!(c = findchan(chan))) {
-        notice_lang(s_ChanServ, u, CHAN_REGISTER_NONE_CHANNEL, chan);
-    } else if ((ci = cs_findchan(chan)) != NULL) {
-        if (ci->flags & CI_VERBOTEN) {
-            alog("%s: Attempt to register FORBIDden channel %s by %s!%s@%s", s_ChanServ, ci->name, u->nick, u->username, u->host);
-            notice_lang(s_ChanServ, u, CHAN_MAY_NOT_BE_REGISTERED, chan);
-        } else {
-            notice_lang(s_ChanServ, u, CHAN_ALREADY_REGISTERED, chan);
-        }
-    } else if (!stricmp(chan, "#")) {
-        notice_lang(s_ChanServ, u, CHAN_MAY_NOT_BE_REGISTERED, chan);
-    } else if (!chan_has_user_status(c, u, CUS_OP)) {
-        notice_lang(s_ChanServ, u, CHAN_MUST_BE_CHANOP);
-
-    } else if (!is_servadmin && CSMaxReg && nc->channelcount >= CSMaxReg) {
-        notice_lang(s_ChanServ, u, nc->channelcount >
-                    CSMaxReg ? CHAN_EXCEEDED_CHANNEL_LIMIT : CHAN_REACHED_CHANNEL_LIMIT, CSMaxReg);
-    } else if (stricmp(u->nick, pass) == 0
-               || (StrictPasswords && strlen(pass) < 5)) {
-        notice_lang(s_ChanServ, u, MORE_OBSCURE_PASSWORD);
-    } else if(enc_encrypt_check_len(strlen(pass), PASSMAX - 1)) {
-        notice_lang(s_ChanServ, u, PASSWORD_TOO_LONG);
-    } else if (!(ci = makechan(chan))) {
-        alog("%s: makechan() failed for REGISTER %s", s_ChanServ, chan);
-        notice_lang(s_ChanServ, u, CHAN_REGISTRATION_FAILED);
-
-    } else if (strscpy(founderpass, pass, PASSMAX),
-               enc_encrypt_in_place(founderpass, PASSMAX) < 0) {
-        alog("%s: Couldn't encrypt password for %s (REGISTER)",
-             s_ChanServ, chan);
-        notice_lang(s_ChanServ, u, CHAN_REGISTRATION_FAILED);
-        delchan(ci);
-    } else {
-        c->ci = ci;
-        ci->c = c;
-        ci->bantype = CSDefBantype;
-        ci->flags = CSDefFlags;
-        ci->mlock_on = ircd->defmlock;
-        ci->memos.memomax = MSMaxMemos;
-        ci->last_used = ci->time_registered;
-        ci->founder = nc;
-
-        memset(pass, 0, strlen(pass));
-        memcpy(ci->founderpass, founderpass, PASSMAX);
-        ci->desc = sstrdup(desc);
-        if (c->topic) {
-            ci->last_topic = sstrdup(c->topic);
-            strscpy(ci->last_topic_setter, c->topic_setter, NICKMAX);
-            ci->last_topic_time = c->topic_time;
-        } else {
-            /* Set this to something, otherwise it will maliform the topic */
-            strscpy(ci->last_topic_setter, s_ChanServ, NICKMAX);
-        }
-        ci->bi = NULL;
-        ci->botflags = BSDefFlags;
-        ci->founder->channelcount++;
-        alog("%s: Channel '%s' registered by %s!%s@%s", s_ChanServ, chan,
-             u->nick, u->username, u->host);
-        notice_lang(s_ChanServ, u, CHAN_REGISTERED, chan, u->nick);
-
-        if(enc_decrypt(ci->founderpass,tmp_pass,PASSMAX - 1) == 1) {
-            notice_lang(s_ChanServ, u, CHAN_PASSWORD_IS, tmp_pass);
-        }
-
-        uc = (struct u_chaninfolist *)scalloc(sizeof(*uc), 1);
-        uc->next = u->founder_chans;
-        uc->prev = NULL;
-        if (u->founder_chans)
-            u->founder_chans->prev = uc;
-        u->founder_chans = uc;
-        uc->chan = ci;
-        /* Implement new mode lock */
-        check_modes(c);
-        /* On most ircds you do not receive the admin/owner mode till its registered */
-        if (ircd->admin) {
-            ircdproto->SendMode(findbot(s_ChanServ), chan, "%s %s", ircd->adminset,
-                           u->nick);
-        }
-        if (ircd->owner && ircd->ownerset) {
-            ircdproto->SendMode(findbot(s_ChanServ), chan, "%s %s", ircd->ownerset,
-                           u->nick);
-        }
-        send_event(EVENT_CHAN_REGISTERED, 1, chan);
-    }
-    return MOD_CONT;
+	char *chan = strtok(NULL, " ");
+	char *pass = strtok(NULL, " ");
+	char *desc = strtok(NULL, "");
+	NickCore *nc;
+	Channel *c;
+	ChannelInfo *ci;
+	struct u_chaninfolist *uc;
+	int is_servadmin = is_services_admin(u);
+	char founderpass[PASSMAX];
+	char tmp_pass[PASSMAX];
+
+	if (readonly) {
+		notice_lang(s_ChanServ, u, CHAN_REGISTER_DISABLED);
+		return MOD_CONT;
+	}
+
+	if (checkDefCon(DEFCON_NO_NEW_CHANNELS)) {
+		notice_lang(s_ChanServ, u, OPER_DEFCON_DENIED);
+		return MOD_CONT;
+	}
+
+	if (!desc) {
+		syntax_error(s_ChanServ, u, "REGISTER", CHAN_REGISTER_SYNTAX);
+	} else if (*chan == '&') {
+		notice_lang(s_ChanServ, u, CHAN_REGISTER_NOT_LOCAL);
+	} else if (*chan != '#') {
+		notice_lang(s_ChanServ, u, CHAN_SYMBOL_REQUIRED);
+	} else if (!ircdproto->IsChannelValid(chan)) {
+		notice_lang(s_ChanServ, u, CHAN_X_INVALID, chan);
+	} else if (!u->na || !(nc = u->na->nc)) {
+		notice_lang(s_ChanServ, u, CHAN_MUST_REGISTER_NICK, s_NickServ);
+	} else if (!nick_recognized(u)) {
+		notice_lang(s_ChanServ, u, CHAN_MUST_IDENTIFY_NICK, s_NickServ,
+					s_NickServ);
+	} else if (!(c = findchan(chan))) {
+		notice_lang(s_ChanServ, u, CHAN_REGISTER_NONE_CHANNEL, chan);
+	} else if ((ci = cs_findchan(chan)) != NULL) {
+		if (ci->flags & CI_VERBOTEN) {
+			alog("%s: Attempt to register FORBIDden channel %s by %s!%s@%s", s_ChanServ, ci->name, u->nick, u->username, u->host);
+			notice_lang(s_ChanServ, u, CHAN_MAY_NOT_BE_REGISTERED, chan);
+		} else {
+			notice_lang(s_ChanServ, u, CHAN_ALREADY_REGISTERED, chan);
+		}
+	} else if (!stricmp(chan, "#")) {
+		notice_lang(s_ChanServ, u, CHAN_MAY_NOT_BE_REGISTERED, chan);
+	} else if (!chan_has_user_status(c, u, CUS_OP)) {
+		notice_lang(s_ChanServ, u, CHAN_MUST_BE_CHANOP);
+
+	} else if (!is_servadmin && CSMaxReg && nc->channelcount >= CSMaxReg) {
+		notice_lang(s_ChanServ, u, nc->channelcount >
+					CSMaxReg ? CHAN_EXCEEDED_CHANNEL_LIMIT : CHAN_REACHED_CHANNEL_LIMIT, CSMaxReg);
+	} else if (stricmp(u->nick, pass) == 0
+			   || (StrictPasswords && strlen(pass) < 5)) {
+		notice_lang(s_ChanServ, u, MORE_OBSCURE_PASSWORD);
+	} else if(enc_encrypt_check_len(strlen(pass), PASSMAX - 1)) {
+		notice_lang(s_ChanServ, u, PASSWORD_TOO_LONG);
+	} else if (!(ci = makechan(chan))) {
+		alog("%s: makechan() failed for REGISTER %s", s_ChanServ, chan);
+		notice_lang(s_ChanServ, u, CHAN_REGISTRATION_FAILED);
+
+	} else if (strscpy(founderpass, pass, PASSMAX),
+			   enc_encrypt_in_place(founderpass, PASSMAX) < 0) {
+		alog("%s: Couldn't encrypt password for %s (REGISTER)",
+			 s_ChanServ, chan);
+		notice_lang(s_ChanServ, u, CHAN_REGISTRATION_FAILED);
+		delchan(ci);
+	} else {
+		c->ci = ci;
+		ci->c = c;
+		ci->bantype = CSDefBantype;
+		ci->flags = CSDefFlags;
+		ci->mlock_on = ircd->defmlock;
+		ci->memos.memomax = MSMaxMemos;
+		ci->last_used = ci->time_registered;
+		ci->founder = nc;
+
+		memset(pass, 0, strlen(pass));
+		memcpy(ci->founderpass, founderpass, PASSMAX);
+		ci->desc = sstrdup(desc);
+		if (c->topic) {
+			ci->last_topic = sstrdup(c->topic);
+			strscpy(ci->last_topic_setter, c->topic_setter, NICKMAX);
+			ci->last_topic_time = c->topic_time;
+		} else {
+			/* Set this to something, otherwise it will maliform the topic */
+			strscpy(ci->last_topic_setter, s_ChanServ, NICKMAX);
+		}
+		ci->bi = NULL;
+		ci->botflags = BSDefFlags;
+		ci->founder->channelcount++;
+		alog("%s: Channel '%s' registered by %s!%s@%s", s_ChanServ, chan,
+			 u->nick, u->username, u->host);
+		notice_lang(s_ChanServ, u, CHAN_REGISTERED, chan, u->nick);
+
+		if(enc_decrypt(ci->founderpass,tmp_pass,PASSMAX - 1) == 1) {
+			notice_lang(s_ChanServ, u, CHAN_PASSWORD_IS, tmp_pass);
+		}
+
+		uc = (struct u_chaninfolist *)scalloc(sizeof(*uc), 1);
+		uc->next = u->founder_chans;
+		uc->prev = NULL;
+		if (u->founder_chans)
+			u->founder_chans->prev = uc;
+		u->founder_chans = uc;
+		uc->chan = ci;
+		/* Implement new mode lock */
+		check_modes(c);
+		/* On most ircds you do not receive the admin/owner mode till its registered */
+		if (ircd->admin) {
+			ircdproto->SendMode(findbot(s_ChanServ), chan, "%s %s", ircd->adminset,
+						   u->nick);
+		}
+		if (ircd->owner && ircd->ownerset) {
+			ircdproto->SendMode(findbot(s_ChanServ), chan, "%s %s", ircd->ownerset,
+						   u->nick);
+		}
+		send_event(EVENT_CHAN_REGISTERED, 1, chan);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("cs_register", CSRegister)
diff --git a/src/core/cs_sendpass.c b/src/core/cs_sendpass.c
index 2e37f2e33..d6cf929f0 100644
--- a/src/core/cs_sendpass.c
+++ b/src/core/cs_sendpass.c
@@ -51,7 +51,7 @@ class CSSendPass : public Module
  **/
 void myChanServHelp(User * u)
 {
-    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_SENDPASS);
+	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_SENDPASS);
 }
 
 /**
@@ -62,56 +62,56 @@ void myChanServHelp(User * u)
 int do_sendpass(User * u)
 {
 
-    char *chan = strtok(NULL, " ");
-    ChannelInfo *ci;
-    NickCore *founder;
-
-    if (!chan) {
-        syntax_error(s_ChanServ, u, "SENDPASS", CHAN_SENDPASS_SYNTAX);
-    } else if (RestrictMail && !is_services_oper(u)) {
-        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);
-    } else if (ci->flags & CI_VERBOTEN) {
-        notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
-    } else {
-        char buf[BUFSIZE];
-        char tmp_pass[PASSMAX];
-        if(enc_decrypt(ci->founderpass,tmp_pass,PASSMAX - 1)==1) {
-            MailInfo *mail;
-
-            snprintf(buf, sizeof(buf),
-                     getstring2(founder, CHAN_SENDPASS_SUBJECT), ci->name);
-            mail = MailBegin(u, founder, buf, s_ChanServ);
-            if (!mail)
-                return MOD_CONT;
-
-            fprintf(mail->pipe, getstring2(founder, CHAN_SENDPASS_HEAD));
-            fprintf(mail->pipe, "\n\n");
-            fprintf(mail->pipe, getstring2(founder, CHAN_SENDPASS_LINE_1),
-                    ci->name);
-            fprintf(mail->pipe, "\n\n");
-            fprintf(mail->pipe, getstring2(founder, CHAN_SENDPASS_LINE_2),
-                    tmp_pass);
-            fprintf(mail->pipe, "\n\n");
-            fprintf(mail->pipe, getstring2(founder, CHAN_SENDPASS_LINE_3));
-            fprintf(mail->pipe, "\n\n");
-            fprintf(mail->pipe, getstring2(founder, CHAN_SENDPASS_LINE_4));
-            fprintf(mail->pipe, "\n\n");
-            fprintf(mail->pipe, getstring2(founder, CHAN_SENDPASS_LINE_5),
-                    NetworkName);
-            fprintf(mail->pipe, "\n.\n");
+	char *chan = strtok(NULL, " ");
+	ChannelInfo *ci;
+	NickCore *founder;
+
+	if (!chan) {
+		syntax_error(s_ChanServ, u, "SENDPASS", CHAN_SENDPASS_SYNTAX);
+	} else if (RestrictMail && !is_services_oper(u)) {
+		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);
+	} else if (ci->flags & CI_VERBOTEN) {
+		notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
+	} else {
+		char buf[BUFSIZE];
+		char tmp_pass[PASSMAX];
+		if(enc_decrypt(ci->founderpass,tmp_pass,PASSMAX - 1)==1) {
+			MailInfo *mail;
+
+			snprintf(buf, sizeof(buf),
+					 getstring2(founder, CHAN_SENDPASS_SUBJECT), ci->name);
+			mail = MailBegin(u, founder, buf, s_ChanServ);
+			if (!mail)
+				return MOD_CONT;
+
+			fprintf(mail->pipe, getstring2(founder, CHAN_SENDPASS_HEAD));
+			fprintf(mail->pipe, "\n\n");
+			fprintf(mail->pipe, getstring2(founder, CHAN_SENDPASS_LINE_1),
+					ci->name);
+			fprintf(mail->pipe, "\n\n");
+			fprintf(mail->pipe, getstring2(founder, CHAN_SENDPASS_LINE_2),
+					tmp_pass);
+			fprintf(mail->pipe, "\n\n");
+			fprintf(mail->pipe, getstring2(founder, CHAN_SENDPASS_LINE_3));
+			fprintf(mail->pipe, "\n\n");
+			fprintf(mail->pipe, getstring2(founder, CHAN_SENDPASS_LINE_4));
+			fprintf(mail->pipe, "\n\n");
+			fprintf(mail->pipe, getstring2(founder, CHAN_SENDPASS_LINE_5),
+					NetworkName);
+			fprintf(mail->pipe, "\n.\n");
  
-            MailEnd(mail);
-
-            alog("%s: %s!%s@%s used SENDPASS on %s", s_ChanServ, u->nick,
-                 u->username, u->host, chan);
-            notice_lang(s_ChanServ, u, CHAN_SENDPASS_OK, chan);
-        } else {
-            notice_lang(s_ChanServ, u, CHAN_SENDPASS_UNAVAILABLE);
-        }
-    }
-    return MOD_CONT;
+			MailEnd(mail);
+
+			alog("%s: %s!%s@%s used SENDPASS on %s", s_ChanServ, u->nick,
+				 u->username, u->host, chan);
+			notice_lang(s_ChanServ, u, CHAN_SENDPASS_OK, chan);
+		} else {
+			notice_lang(s_ChanServ, u, CHAN_SENDPASS_UNAVAILABLE);
+		}
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("cs_sendpass", CSSendPass)
diff --git a/src/core/cs_set.c b/src/core/cs_set.c
index e731f94b4..0a49d259d 100644
--- a/src/core/cs_set.c
+++ b/src/core/cs_set.c
@@ -109,7 +109,7 @@ class CSSet : public Module
  **/
 void myChanServHelp(User * u)
 {
-    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_SET);
+	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_SET);
 }
 
 /**
@@ -128,582 +128,582 @@ void myChanServHelp(User * u)
  */
 int do_set(User * u)
 {
-    char *chan = strtok(NULL, " ");
-    char *cmd = strtok(NULL, " ");
-    char *param;
-    ChannelInfo *ci;
-    int is_servadmin = is_services_admin(u);
-
-    if (readonly) {
-        notice_lang(s_ChanServ, u, CHAN_SET_DISABLED);
-        return MOD_CONT;
-    }
-
-    if (cmd) {
-        if (stricmp(cmd, "DESC") == 0 || stricmp(cmd, "ENTRYMSG") == 0)
-            param = strtok(NULL, "");
-        else
-            param = strtok(NULL, " ");
-    } else {
-        param = NULL;
-    }
-
-    if (!param && (!cmd || (stricmp(cmd, "SUCCESSOR") != 0 &&
-                            stricmp(cmd, "URL") != 0 &&
-                            stricmp(cmd, "EMAIL") != 0 &&
-                            stricmp(cmd, "ENTRYMSG") != 0))) {
-        syntax_error(s_ChanServ, u, "SET", CHAN_SET_SYNTAX);
-    } else if (!(ci = cs_findchan(chan))) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
-    } else if (ci->flags & CI_VERBOTEN) {
-        notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
-    } else if (!is_servadmin && !check_access(u, ci, CA_SET)) {
-        notice_lang(s_ChanServ, u, ACCESS_DENIED);
-    } else if (stricmp(cmd, "FOUNDER") == 0) {
-        if (!is_servadmin
-            && (ci->
-                flags & CI_SECUREFOUNDER ? !is_real_founder(u,
-                                                            ci) :
-                !is_founder(u, ci))) {
-            notice_lang(s_ChanServ, u, ACCESS_DENIED);
-        } else {
-            do_set_founder(u, ci, param);
-        }
-    } else if (stricmp(cmd, "SUCCESSOR") == 0) {
-        if (!is_servadmin
-            && (ci->
-                flags & CI_SECUREFOUNDER ? !is_real_founder(u,
-                                                            ci) :
-                !is_founder(u, ci))) {
-            notice_lang(s_ChanServ, u, ACCESS_DENIED);
-        } else {
-            do_set_successor(u, ci, param);
-        }
-    } else if (stricmp(cmd, "PASSWORD") == 0) {
-        if (!is_servadmin
-            && (ci->
-                flags & CI_SECUREFOUNDER ? !is_real_founder(u,
-                                                            ci) :
-                !is_founder(u, ci))) {
-            notice_lang(s_ChanServ, u, ACCESS_DENIED);
-        } else {
-            do_set_password(u, ci, param);
-        }
-    } else if (stricmp(cmd, "DESC") == 0) {
-        do_set_desc(u, ci, param);
-    } else if (stricmp(cmd, "URL") == 0) {
-        do_set_url(u, ci, param);
-    } else if (stricmp(cmd, "EMAIL") == 0) {
-        do_set_email(u, ci, param);
-    } else if (stricmp(cmd, "ENTRYMSG") == 0) {
-        do_set_entrymsg(u, ci, param);
-    } else if (stricmp(cmd, "TOPIC") == 0) {
-        notice_lang(s_ChanServ, u, OBSOLETE_COMMAND, "TOPIC");
-    } else if (stricmp(cmd, "BANTYPE") == 0) {
-        do_set_bantype(u, ci, param);
-    } else if (stricmp(cmd, "MLOCK") == 0) {
-        do_set_mlock(u, ci, param);
-    } else if (stricmp(cmd, "KEEPTOPIC") == 0) {
-        do_set_keeptopic(u, ci, param);
-    } else if (stricmp(cmd, "TOPICLOCK") == 0) {
-        do_set_topiclock(u, ci, param);
-    } else if (stricmp(cmd, "PRIVATE") == 0) {
-        do_set_private(u, ci, param);
-    } else if (stricmp(cmd, "SECUREOPS") == 0) {
-        do_set_secureops(u, ci, param);
-    } else if (stricmp(cmd, "SECUREFOUNDER") == 0) {
-        if (!is_servadmin
-            && (ci->
-                flags & CI_SECUREFOUNDER ? !is_real_founder(u,
-                                                            ci) :
-                !is_founder(u, ci))) {
-            notice_lang(s_ChanServ, u, ACCESS_DENIED);
-        } else {
-            do_set_securefounder(u, ci, param);
-        }
-    } else if (stricmp(cmd, "RESTRICTED") == 0) {
-        do_set_restricted(u, ci, param);
-    } else if (stricmp(cmd, "SECURE") == 0) {
-        do_set_secure(u, ci, param);
-    } else if (stricmp(cmd, "SIGNKICK") == 0) {
-        do_set_signkick(u, ci, param);
-    } else if (stricmp(cmd, "OPNOTICE") == 0) {
-        do_set_opnotice(u, ci, param);
-    } else if (stricmp(cmd, "XOP") == 0) {
-        if (!(findModule("cs_xop"))) {
-            notice_lang(s_ChanServ, u, CHAN_XOP_NOT_AVAILABLE, cmd);
-        } else {
-            do_set_xop(u, ci, param);
-        }
-    } else if (stricmp(cmd, "PEACE") == 0) {
-        do_set_peace(u, ci, param);
-    } else if (stricmp(cmd, "NOEXPIRE") == 0) {
-        do_set_noexpire(u, ci, param);
-    } else {
-        notice_lang(s_ChanServ, u, CHAN_SET_UNKNOWN_OPTION, cmd);
-        notice_lang(s_ChanServ, u, MORE_INFO, s_ChanServ, "SET");
-    }
-    return MOD_CONT;
+	char *chan = strtok(NULL, " ");
+	char *cmd = strtok(NULL, " ");
+	char *param;
+	ChannelInfo *ci;
+	int is_servadmin = is_services_admin(u);
+
+	if (readonly) {
+		notice_lang(s_ChanServ, u, CHAN_SET_DISABLED);
+		return MOD_CONT;
+	}
+
+	if (cmd) {
+		if (stricmp(cmd, "DESC") == 0 || stricmp(cmd, "ENTRYMSG") == 0)
+			param = strtok(NULL, "");
+		else
+			param = strtok(NULL, " ");
+	} else {
+		param = NULL;
+	}
+
+	if (!param && (!cmd || (stricmp(cmd, "SUCCESSOR") != 0 &&
+							stricmp(cmd, "URL") != 0 &&
+							stricmp(cmd, "EMAIL") != 0 &&
+							stricmp(cmd, "ENTRYMSG") != 0))) {
+		syntax_error(s_ChanServ, u, "SET", CHAN_SET_SYNTAX);
+	} else if (!(ci = cs_findchan(chan))) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
+	} else if (ci->flags & CI_VERBOTEN) {
+		notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
+	} else if (!is_servadmin && !check_access(u, ci, CA_SET)) {
+		notice_lang(s_ChanServ, u, ACCESS_DENIED);
+	} else if (stricmp(cmd, "FOUNDER") == 0) {
+		if (!is_servadmin
+			&& (ci->
+				flags & CI_SECUREFOUNDER ? !is_real_founder(u,
+															ci) :
+				!is_founder(u, ci))) {
+			notice_lang(s_ChanServ, u, ACCESS_DENIED);
+		} else {
+			do_set_founder(u, ci, param);
+		}
+	} else if (stricmp(cmd, "SUCCESSOR") == 0) {
+		if (!is_servadmin
+			&& (ci->
+				flags & CI_SECUREFOUNDER ? !is_real_founder(u,
+															ci) :
+				!is_founder(u, ci))) {
+			notice_lang(s_ChanServ, u, ACCESS_DENIED);
+		} else {
+			do_set_successor(u, ci, param);
+		}
+	} else if (stricmp(cmd, "PASSWORD") == 0) {
+		if (!is_servadmin
+			&& (ci->
+				flags & CI_SECUREFOUNDER ? !is_real_founder(u,
+															ci) :
+				!is_founder(u, ci))) {
+			notice_lang(s_ChanServ, u, ACCESS_DENIED);
+		} else {
+			do_set_password(u, ci, param);
+		}
+	} else if (stricmp(cmd, "DESC") == 0) {
+		do_set_desc(u, ci, param);
+	} else if (stricmp(cmd, "URL") == 0) {
+		do_set_url(u, ci, param);
+	} else if (stricmp(cmd, "EMAIL") == 0) {
+		do_set_email(u, ci, param);
+	} else if (stricmp(cmd, "ENTRYMSG") == 0) {
+		do_set_entrymsg(u, ci, param);
+	} else if (stricmp(cmd, "TOPIC") == 0) {
+		notice_lang(s_ChanServ, u, OBSOLETE_COMMAND, "TOPIC");
+	} else if (stricmp(cmd, "BANTYPE") == 0) {
+		do_set_bantype(u, ci, param);
+	} else if (stricmp(cmd, "MLOCK") == 0) {
+		do_set_mlock(u, ci, param);
+	} else if (stricmp(cmd, "KEEPTOPIC") == 0) {
+		do_set_keeptopic(u, ci, param);
+	} else if (stricmp(cmd, "TOPICLOCK") == 0) {
+		do_set_topiclock(u, ci, param);
+	} else if (stricmp(cmd, "PRIVATE") == 0) {
+		do_set_private(u, ci, param);
+	} else if (stricmp(cmd, "SECUREOPS") == 0) {
+		do_set_secureops(u, ci, param);
+	} else if (stricmp(cmd, "SECUREFOUNDER") == 0) {
+		if (!is_servadmin
+			&& (ci->
+				flags & CI_SECUREFOUNDER ? !is_real_founder(u,
+															ci) :
+				!is_founder(u, ci))) {
+			notice_lang(s_ChanServ, u, ACCESS_DENIED);
+		} else {
+			do_set_securefounder(u, ci, param);
+		}
+	} else if (stricmp(cmd, "RESTRICTED") == 0) {
+		do_set_restricted(u, ci, param);
+	} else if (stricmp(cmd, "SECURE") == 0) {
+		do_set_secure(u, ci, param);
+	} else if (stricmp(cmd, "SIGNKICK") == 0) {
+		do_set_signkick(u, ci, param);
+	} else if (stricmp(cmd, "OPNOTICE") == 0) {
+		do_set_opnotice(u, ci, param);
+	} else if (stricmp(cmd, "XOP") == 0) {
+		if (!(findModule("cs_xop"))) {
+			notice_lang(s_ChanServ, u, CHAN_XOP_NOT_AVAILABLE, cmd);
+		} else {
+			do_set_xop(u, ci, param);
+		}
+	} else if (stricmp(cmd, "PEACE") == 0) {
+		do_set_peace(u, ci, param);
+	} else if (stricmp(cmd, "NOEXPIRE") == 0) {
+		do_set_noexpire(u, ci, param);
+	} else {
+		notice_lang(s_ChanServ, u, CHAN_SET_UNKNOWN_OPTION, cmd);
+		notice_lang(s_ChanServ, u, MORE_INFO, s_ChanServ, "SET");
+	}
+	return MOD_CONT;
 }
 
 /*************************************************************************/
 
 int do_set_founder(User * u, ChannelInfo * ci, char *param)
 {
-    NickAlias *na = findnick(param);
-    NickCore *nc, *nc0 = ci->founder;
-
-    if (!na) {
-        notice_lang(s_ChanServ, u, NICK_X_NOT_REGISTERED, param);
-        return MOD_CONT;
-    } else if (na->status & NS_VERBOTEN) {
-        notice_lang(s_ChanServ, u, NICK_X_FORBIDDEN, param);
-        return MOD_CONT;
-    }
-
-    nc = na->nc;
-    if (CSMaxReg && nc->channelcount >= CSMaxReg && !is_services_admin(u)) {
-        notice_lang(s_ChanServ, u, CHAN_SET_FOUNDER_TOO_MANY_CHANS, param);
-        return MOD_CONT;
-    }
-
-    alog("%s: Changing founder of %s from %s to %s by %s!%s@%s",
-         s_ChanServ, ci->name, ci->founder->display, nc->display, u->nick,
-         u->username, u->host);
-
-    /* Founder and successor must not be the same group */
-    if (nc == ci->successor)
-        ci->successor = NULL;
-
-    nc0->channelcount--;
-    ci->founder = nc;
-    nc->channelcount++;
-
-    notice_lang(s_ChanServ, u, CHAN_FOUNDER_CHANGED, ci->name, param);
-    return MOD_CONT;
+	NickAlias *na = findnick(param);
+	NickCore *nc, *nc0 = ci->founder;
+
+	if (!na) {
+		notice_lang(s_ChanServ, u, NICK_X_NOT_REGISTERED, param);
+		return MOD_CONT;
+	} else if (na->status & NS_VERBOTEN) {
+		notice_lang(s_ChanServ, u, NICK_X_FORBIDDEN, param);
+		return MOD_CONT;
+	}
+
+	nc = na->nc;
+	if (CSMaxReg && nc->channelcount >= CSMaxReg && !is_services_admin(u)) {
+		notice_lang(s_ChanServ, u, CHAN_SET_FOUNDER_TOO_MANY_CHANS, param);
+		return MOD_CONT;
+	}
+
+	alog("%s: Changing founder of %s from %s to %s by %s!%s@%s",
+		 s_ChanServ, ci->name, ci->founder->display, nc->display, u->nick,
+		 u->username, u->host);
+
+	/* Founder and successor must not be the same group */
+	if (nc == ci->successor)
+		ci->successor = NULL;
+
+	nc0->channelcount--;
+	ci->founder = nc;
+	nc->channelcount++;
+
+	notice_lang(s_ChanServ, u, CHAN_FOUNDER_CHANGED, ci->name, param);
+	return MOD_CONT;
 }
 
 /*************************************************************************/
 
 int do_set_successor(User * u, ChannelInfo * ci, char *param)
 {
-    NickAlias *na;
-    NickCore *nc;
-
-    if (param) {
-        na = findnick(param);
-
-        if (!na) {
-            notice_lang(s_ChanServ, u, NICK_X_NOT_REGISTERED, param);
-            return MOD_CONT;
-        }
-        if (na->status & NS_VERBOTEN) {
-            notice_lang(s_ChanServ, u, NICK_X_FORBIDDEN, param);
-            return MOD_CONT;
-        }
-        if (na->nc == ci->founder) {
-            notice_lang(s_ChanServ, u, CHAN_SUCCESSOR_IS_FOUNDER, param,
-                        ci->name);
-            return MOD_CONT;
-        }
-        nc = na->nc;
-
-    } else {
-        nc = NULL;
-    }
-
-    alog("%s: Changing successor of %s from %s to %s by %s!%s@%s",
-         s_ChanServ, ci->name,
-         (ci->successor ? ci->successor->display : "none"),
-         (nc ? nc->display : "none"), u->nick, u->username, u->host);
-
-    ci->successor = nc;
-
-    if (nc)
-        notice_lang(s_ChanServ, u, CHAN_SUCCESSOR_CHANGED, ci->name,
-                    param);
-    else
-        notice_lang(s_ChanServ, u, CHAN_SUCCESSOR_UNSET, ci->name);
-    return MOD_CONT;
+	NickAlias *na;
+	NickCore *nc;
+
+	if (param) {
+		na = findnick(param);
+
+		if (!na) {
+			notice_lang(s_ChanServ, u, NICK_X_NOT_REGISTERED, param);
+			return MOD_CONT;
+		}
+		if (na->status & NS_VERBOTEN) {
+			notice_lang(s_ChanServ, u, NICK_X_FORBIDDEN, param);
+			return MOD_CONT;
+		}
+		if (na->nc == ci->founder) {
+			notice_lang(s_ChanServ, u, CHAN_SUCCESSOR_IS_FOUNDER, param,
+						ci->name);
+			return MOD_CONT;
+		}
+		nc = na->nc;
+
+	} else {
+		nc = NULL;
+	}
+
+	alog("%s: Changing successor of %s from %s to %s by %s!%s@%s",
+		 s_ChanServ, ci->name,
+		 (ci->successor ? ci->successor->display : "none"),
+		 (nc ? nc->display : "none"), u->nick, u->username, u->host);
+
+	ci->successor = nc;
+
+	if (nc)
+		notice_lang(s_ChanServ, u, CHAN_SUCCESSOR_CHANGED, ci->name,
+					param);
+	else
+		notice_lang(s_ChanServ, u, CHAN_SUCCESSOR_UNSET, ci->name);
+	return MOD_CONT;
 }
 
 /*************************************************************************/
 
 int do_set_password(User * u, ChannelInfo * ci, char *param)
 {
-    int len = strlen(param);
-
-    if (stricmp(u->nick, param) == 0 || (StrictPasswords && len < 5)) {
-        notice_lang(s_ChanServ, u, MORE_OBSCURE_PASSWORD);
-        return MOD_CONT;
-    }
-
-    if (enc_encrypt_check_len(len ,PASSMAX - 1)) {
-        notice_lang(s_ChanServ, u, PASSWORD_TOO_LONG);
-        return MOD_CONT;
-    }
-
-    if (enc_encrypt(param, len, ci->founderpass, PASSMAX -1) < 0) {
-        memset(param, 0, strlen(param));
-        alog("%s: Failed to encrypt password for %s (set)", s_ChanServ,
-             ci->name);
-        notice_lang(s_ChanServ, u, CHAN_SET_PASSWORD_FAILED);
-        return MOD_CONT;
-    }
-
-    memset(param, 0, strlen(param));
-    notice_lang(s_ChanServ, u, CHAN_PASSWORD_CHANGED, ci->name);
-
-    if (get_access(u, ci) < ACCESS_FOUNDER) {
-        alog("%s: %s!%s@%s set password as Services admin for %s",
-             s_ChanServ, u->nick, u->username, u->host, ci->name);
-        if (WallSetpass)
-            ircdproto->SendGlobops(s_ChanServ,
-                             "\2%s\2 set password as Services admin for channel \2%s\2",
-                             u->nick, ci->name);
-    } else {
-        alog("%s: %s!%s@%s changed password of %s (founder: %s)",
-             s_ChanServ, u->nick, u->username, u->host,
-             ci->name, ci->founder->display);
-    }
-    return MOD_CONT;
+	int len = strlen(param);
+
+	if (stricmp(u->nick, param) == 0 || (StrictPasswords && len < 5)) {
+		notice_lang(s_ChanServ, u, MORE_OBSCURE_PASSWORD);
+		return MOD_CONT;
+	}
+
+	if (enc_encrypt_check_len(len ,PASSMAX - 1)) {
+		notice_lang(s_ChanServ, u, PASSWORD_TOO_LONG);
+		return MOD_CONT;
+	}
+
+	if (enc_encrypt(param, len, ci->founderpass, PASSMAX -1) < 0) {
+		memset(param, 0, strlen(param));
+		alog("%s: Failed to encrypt password for %s (set)", s_ChanServ,
+			 ci->name);
+		notice_lang(s_ChanServ, u, CHAN_SET_PASSWORD_FAILED);
+		return MOD_CONT;
+	}
+
+	memset(param, 0, strlen(param));
+	notice_lang(s_ChanServ, u, CHAN_PASSWORD_CHANGED, ci->name);
+
+	if (get_access(u, ci) < ACCESS_FOUNDER) {
+		alog("%s: %s!%s@%s set password as Services admin for %s",
+			 s_ChanServ, u->nick, u->username, u->host, ci->name);
+		if (WallSetpass)
+			ircdproto->SendGlobops(s_ChanServ,
+							 "\2%s\2 set password as Services admin for channel \2%s\2",
+							 u->nick, ci->name);
+	} else {
+		alog("%s: %s!%s@%s changed password of %s (founder: %s)",
+			 s_ChanServ, u->nick, u->username, u->host,
+			 ci->name, ci->founder->display);
+	}
+	return MOD_CONT;
 }
 
 /*************************************************************************/
 
 int do_set_desc(User * u, ChannelInfo * ci, char *param)
 {
-    if (ci->desc)
-        free(ci->desc);
-    ci->desc = sstrdup(param);
-    notice_lang(s_ChanServ, u, CHAN_DESC_CHANGED, ci->name, param);
-    return MOD_CONT;
+	if (ci->desc)
+		free(ci->desc);
+	ci->desc = sstrdup(param);
+	notice_lang(s_ChanServ, u, CHAN_DESC_CHANGED, ci->name, param);
+	return MOD_CONT;
 }
 
 /*************************************************************************/
 
 int do_set_url(User * u, ChannelInfo * ci, char *param)
 {
-    if (ci->url)
-        free(ci->url);
-    if (param) {
-        ci->url = sstrdup(param);
-        notice_lang(s_ChanServ, u, CHAN_URL_CHANGED, ci->name, param);
-    } else {
-        ci->url = NULL;
-        notice_lang(s_ChanServ, u, CHAN_URL_UNSET, ci->name);
-    }
-    return MOD_CONT;
+	if (ci->url)
+		free(ci->url);
+	if (param) {
+		ci->url = sstrdup(param);
+		notice_lang(s_ChanServ, u, CHAN_URL_CHANGED, ci->name, param);
+	} else {
+		ci->url = NULL;
+		notice_lang(s_ChanServ, u, CHAN_URL_UNSET, ci->name);
+	}
+	return MOD_CONT;
 }
 
 /*************************************************************************/
 
 int do_set_email(User * u, ChannelInfo * ci, char *param)
 {
-    if (ci->email)
-        free(ci->email);
-    if (param) {
-        ci->email = sstrdup(param);
-        notice_lang(s_ChanServ, u, CHAN_EMAIL_CHANGED, ci->name, param);
-    } else {
-        ci->email = NULL;
-        notice_lang(s_ChanServ, u, CHAN_EMAIL_UNSET, ci->name);
-    }
-    return MOD_CONT;
+	if (ci->email)
+		free(ci->email);
+	if (param) {
+		ci->email = sstrdup(param);
+		notice_lang(s_ChanServ, u, CHAN_EMAIL_CHANGED, ci->name, param);
+	} else {
+		ci->email = NULL;
+		notice_lang(s_ChanServ, u, CHAN_EMAIL_UNSET, ci->name);
+	}
+	return MOD_CONT;
 }
 
 /*************************************************************************/
 
 int do_set_entrymsg(User * u, ChannelInfo * ci, char *param)
 {
-    if (ci->entry_message)
-        free(ci->entry_message);
-    if (param) {
-        ci->entry_message = sstrdup(param);
-        notice_lang(s_ChanServ, u, CHAN_ENTRY_MSG_CHANGED, ci->name,
-                    param);
-    } else {
-        ci->entry_message = NULL;
-        notice_lang(s_ChanServ, u, CHAN_ENTRY_MSG_UNSET, ci->name);
-    }
-    return MOD_CONT;
+	if (ci->entry_message)
+		free(ci->entry_message);
+	if (param) {
+		ci->entry_message = sstrdup(param);
+		notice_lang(s_ChanServ, u, CHAN_ENTRY_MSG_CHANGED, ci->name,
+					param);
+	} else {
+		ci->entry_message = NULL;
+		notice_lang(s_ChanServ, u, CHAN_ENTRY_MSG_UNSET, ci->name);
+	}
+	return MOD_CONT;
 }
 
 /*************************************************************************/
 
 int do_set_mlock(User * u, ChannelInfo * ci, char *param)
 {
-    int add = -1;               /* 1 if adding, 0 if deleting, -1 if neither */
-    unsigned char mode;
-    CBMode *cbm;
-
-    if (checkDefCon(DEFCON_NO_MLOCK_CHANGE)) {
-        notice_lang(s_ChanServ, u, OPER_DEFCON_DENIED);
-        return MOD_CONT;
-    }
-
-    /* Reinitialize everything */
-    if (ircd->chanreg) {
-        ci->mlock_on = ircd->regmode;
-    } else {
-        ci->mlock_on = 0;
-    }
-    ci->mlock_off = ci->mlock_limit = 0;
-    ci->mlock_key = NULL;
-    if (ircd->fmode) {
-        ci->mlock_flood = NULL;
-    }
-    if (ircd->Lmode) {
-        ci->mlock_redirect = NULL;
-    }
-
-    while ((mode = *param++)) {
-        switch (mode) {
-        case '+':
-            add = 1;
-            continue;
-        case '-':
-            add = 0;
-            continue;
-        default:
-            if (add < 0)
-                continue;
-        }
-
-        if ((int) mode < 128 && (cbm = &cbmodes[(int) mode])->flag != 0) {
-            if ((cbm->flags & CBM_NO_MLOCK)
-                || ((cbm->flags & CBM_NO_USER_MLOCK) && !is_oper(u))) {
-                notice_lang(s_ChanServ, u, CHAN_SET_MLOCK_IMPOSSIBLE_CHAR,
-                            mode);
-            } else if (add) {
-                ci->mlock_on |= cbm->flag;
-                ci->mlock_off &= ~cbm->flag;
-                if (cbm->cssetvalue)
-                    cbm->cssetvalue(ci, strtok(NULL, " "));
-            } else {
-                ci->mlock_off |= cbm->flag;
-                if (ci->mlock_on & cbm->flag) {
-                    ci->mlock_on &= ~cbm->flag;
-                    if (cbm->cssetvalue)
-                        cbm->cssetvalue(ci, NULL);
-                }
-            }
-        } else {
-            notice_lang(s_ChanServ, u, CHAN_SET_MLOCK_UNKNOWN_CHAR, mode);
-        }
-    }                           /* while (*param) */
-
-    if (ircd->Lmode) {
-        /* We can't mlock +L if +l is not mlocked as well. */
-        if ((ci->mlock_on & ircd->chan_lmode)
-            && !(ci->mlock_on & anope_get_limit_mode())) {
-            ci->mlock_on &= ~ircd->chan_lmode;
-            free(ci->mlock_redirect);
-            notice_lang(s_ChanServ, u, CHAN_SET_MLOCK_L_REQUIRED);
-        }
-    }
-
-    /* Some ircd we can't set NOKNOCK without INVITE */
-    /* So check if we need there is a NOKNOCK MODE and that we need INVITEONLY */
-    if (ircd->noknock && ircd->knock_needs_i) {
-        if ((ci->mlock_on & ircd->noknock)
-            && !(ci->mlock_on & anope_get_invite_mode())) {
-            ci->mlock_on &= ~ircd->noknock;
-            notice_lang(s_ChanServ, u, CHAN_SET_MLOCK_K_REQUIRED);
-        }
-    }
-
-    /* Since we always enforce mode r there is no way to have no
-     * mode lock at all.
-     */
-    if (get_mlock_modes(ci, 0)) {
-        notice_lang(s_ChanServ, u, CHAN_MLOCK_CHANGED, ci->name,
-                    get_mlock_modes(ci, 0));
-    }
-
-    /* Implement the new lock. */
-    if (ci->c)
-        check_modes(ci->c);
-    return MOD_CONT;
+	int add = -1;			   /* 1 if adding, 0 if deleting, -1 if neither */
+	unsigned char mode;
+	CBMode *cbm;
+
+	if (checkDefCon(DEFCON_NO_MLOCK_CHANGE)) {
+		notice_lang(s_ChanServ, u, OPER_DEFCON_DENIED);
+		return MOD_CONT;
+	}
+
+	/* Reinitialize everything */
+	if (ircd->chanreg) {
+		ci->mlock_on = ircd->regmode;
+	} else {
+		ci->mlock_on = 0;
+	}
+	ci->mlock_off = ci->mlock_limit = 0;
+	ci->mlock_key = NULL;
+	if (ircd->fmode) {
+		ci->mlock_flood = NULL;
+	}
+	if (ircd->Lmode) {
+		ci->mlock_redirect = NULL;
+	}
+
+	while ((mode = *param++)) {
+		switch (mode) {
+		case '+':
+			add = 1;
+			continue;
+		case '-':
+			add = 0;
+			continue;
+		default:
+			if (add < 0)
+				continue;
+		}
+
+		if ((int) mode < 128 && (cbm = &cbmodes[(int) mode])->flag != 0) {
+			if ((cbm->flags & CBM_NO_MLOCK)
+				|| ((cbm->flags & CBM_NO_USER_MLOCK) && !is_oper(u))) {
+				notice_lang(s_ChanServ, u, CHAN_SET_MLOCK_IMPOSSIBLE_CHAR,
+							mode);
+			} else if (add) {
+				ci->mlock_on |= cbm->flag;
+				ci->mlock_off &= ~cbm->flag;
+				if (cbm->cssetvalue)
+					cbm->cssetvalue(ci, strtok(NULL, " "));
+			} else {
+				ci->mlock_off |= cbm->flag;
+				if (ci->mlock_on & cbm->flag) {
+					ci->mlock_on &= ~cbm->flag;
+					if (cbm->cssetvalue)
+						cbm->cssetvalue(ci, NULL);
+				}
+			}
+		} else {
+			notice_lang(s_ChanServ, u, CHAN_SET_MLOCK_UNKNOWN_CHAR, mode);
+		}
+	}						   /* while (*param) */
+
+	if (ircd->Lmode) {
+		/* We can't mlock +L if +l is not mlocked as well. */
+		if ((ci->mlock_on & ircd->chan_lmode)
+			&& !(ci->mlock_on & anope_get_limit_mode())) {
+			ci->mlock_on &= ~ircd->chan_lmode;
+			free(ci->mlock_redirect);
+			notice_lang(s_ChanServ, u, CHAN_SET_MLOCK_L_REQUIRED);
+		}
+	}
+
+	/* Some ircd we can't set NOKNOCK without INVITE */
+	/* So check if we need there is a NOKNOCK MODE and that we need INVITEONLY */
+	if (ircd->noknock && ircd->knock_needs_i) {
+		if ((ci->mlock_on & ircd->noknock)
+			&& !(ci->mlock_on & anope_get_invite_mode())) {
+			ci->mlock_on &= ~ircd->noknock;
+			notice_lang(s_ChanServ, u, CHAN_SET_MLOCK_K_REQUIRED);
+		}
+	}
+
+	/* Since we always enforce mode r there is no way to have no
+	 * mode lock at all.
+	 */
+	if (get_mlock_modes(ci, 0)) {
+		notice_lang(s_ChanServ, u, CHAN_MLOCK_CHANGED, ci->name,
+					get_mlock_modes(ci, 0));
+	}
+
+	/* Implement the new lock. */
+	if (ci->c)
+		check_modes(ci->c);
+	return MOD_CONT;
 }
 
 /*************************************************************************/
 
 int do_set_bantype(User * u, ChannelInfo * ci, char *param)
 {
-    char *endptr;
-
-    int16 bantype = strtol(param, &endptr, 10);
-
-    if (*endptr != 0 || bantype < 0 || bantype > 3) {
-        notice_lang(s_ChanServ, u, CHAN_SET_BANTYPE_INVALID, param);
-    } else {
-        ci->bantype = bantype;
-        notice_lang(s_ChanServ, u, CHAN_SET_BANTYPE_CHANGED, ci->name,
-                    ci->bantype);
-    }
-    return MOD_CONT;
+	char *endptr;
+
+	int16 bantype = strtol(param, &endptr, 10);
+
+	if (*endptr != 0 || bantype < 0 || bantype > 3) {
+		notice_lang(s_ChanServ, u, CHAN_SET_BANTYPE_INVALID, param);
+	} else {
+		ci->bantype = bantype;
+		notice_lang(s_ChanServ, u, CHAN_SET_BANTYPE_CHANGED, ci->name,
+					ci->bantype);
+	}
+	return MOD_CONT;
 }
 
 /*************************************************************************/
 
 int do_set_keeptopic(User * u, ChannelInfo * ci, char *param)
 {
-    if (stricmp(param, "ON") == 0) {
-        ci->flags |= CI_KEEPTOPIC;
-        notice_lang(s_ChanServ, u, CHAN_SET_KEEPTOPIC_ON, ci->name);
-    } else if (stricmp(param, "OFF") == 0) {
-        ci->flags &= ~CI_KEEPTOPIC;
-        notice_lang(s_ChanServ, u, CHAN_SET_KEEPTOPIC_OFF, ci->name);
-    } else {
-        syntax_error(s_ChanServ, u, "SET KEEPTOPIC",
-                     CHAN_SET_KEEPTOPIC_SYNTAX);
-    }
-    return MOD_CONT;
+	if (stricmp(param, "ON") == 0) {
+		ci->flags |= CI_KEEPTOPIC;
+		notice_lang(s_ChanServ, u, CHAN_SET_KEEPTOPIC_ON, ci->name);
+	} else if (stricmp(param, "OFF") == 0) {
+		ci->flags &= ~CI_KEEPTOPIC;
+		notice_lang(s_ChanServ, u, CHAN_SET_KEEPTOPIC_OFF, ci->name);
+	} else {
+		syntax_error(s_ChanServ, u, "SET KEEPTOPIC",
+					 CHAN_SET_KEEPTOPIC_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 /*************************************************************************/
 
 int do_set_topiclock(User * u, ChannelInfo * ci, char *param)
 {
-    if (stricmp(param, "ON") == 0) {
-        ci->flags |= CI_TOPICLOCK;
-        notice_lang(s_ChanServ, u, CHAN_SET_TOPICLOCK_ON, ci->name);
-    } else if (stricmp(param, "OFF") == 0) {
-        ci->flags &= ~CI_TOPICLOCK;
-        notice_lang(s_ChanServ, u, CHAN_SET_TOPICLOCK_OFF, ci->name);
-    } else {
-        syntax_error(s_ChanServ, u, "SET TOPICLOCK",
-                     CHAN_SET_TOPICLOCK_SYNTAX);
-    }
-    return MOD_CONT;
+	if (stricmp(param, "ON") == 0) {
+		ci->flags |= CI_TOPICLOCK;
+		notice_lang(s_ChanServ, u, CHAN_SET_TOPICLOCK_ON, ci->name);
+	} else if (stricmp(param, "OFF") == 0) {
+		ci->flags &= ~CI_TOPICLOCK;
+		notice_lang(s_ChanServ, u, CHAN_SET_TOPICLOCK_OFF, ci->name);
+	} else {
+		syntax_error(s_ChanServ, u, "SET TOPICLOCK",
+					 CHAN_SET_TOPICLOCK_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 /*************************************************************************/
 
 int do_set_private(User * u, ChannelInfo * ci, char *param)
 {
-    if (stricmp(param, "ON") == 0) {
-        ci->flags |= CI_PRIVATE;
-        notice_lang(s_ChanServ, u, CHAN_SET_PRIVATE_ON, ci->name);
-    } else if (stricmp(param, "OFF") == 0) {
-        ci->flags &= ~CI_PRIVATE;
-        notice_lang(s_ChanServ, u, CHAN_SET_PRIVATE_OFF, ci->name);
-    } else {
-        syntax_error(s_ChanServ, u, "SET PRIVATE",
-                     CHAN_SET_PRIVATE_SYNTAX);
-    }
-    return MOD_CONT;
+	if (stricmp(param, "ON") == 0) {
+		ci->flags |= CI_PRIVATE;
+		notice_lang(s_ChanServ, u, CHAN_SET_PRIVATE_ON, ci->name);
+	} else if (stricmp(param, "OFF") == 0) {
+		ci->flags &= ~CI_PRIVATE;
+		notice_lang(s_ChanServ, u, CHAN_SET_PRIVATE_OFF, ci->name);
+	} else {
+		syntax_error(s_ChanServ, u, "SET PRIVATE",
+					 CHAN_SET_PRIVATE_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 /*************************************************************************/
 
 int do_set_secureops(User * u, ChannelInfo * ci, char *param)
 {
-    if (stricmp(param, "ON") == 0) {
-        ci->flags |= CI_SECUREOPS;
-        notice_lang(s_ChanServ, u, CHAN_SET_SECUREOPS_ON, ci->name);
-    } else if (stricmp(param, "OFF") == 0) {
-        ci->flags &= ~CI_SECUREOPS;
-        notice_lang(s_ChanServ, u, CHAN_SET_SECUREOPS_OFF, ci->name);
-    } else {
-        syntax_error(s_ChanServ, u, "SET SECUREOPS",
-                     CHAN_SET_SECUREOPS_SYNTAX);
-    }
-    return MOD_CONT;
+	if (stricmp(param, "ON") == 0) {
+		ci->flags |= CI_SECUREOPS;
+		notice_lang(s_ChanServ, u, CHAN_SET_SECUREOPS_ON, ci->name);
+	} else if (stricmp(param, "OFF") == 0) {
+		ci->flags &= ~CI_SECUREOPS;
+		notice_lang(s_ChanServ, u, CHAN_SET_SECUREOPS_OFF, ci->name);
+	} else {
+		syntax_error(s_ChanServ, u, "SET SECUREOPS",
+					 CHAN_SET_SECUREOPS_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 /*************************************************************************/
 
 int do_set_securefounder(User * u, ChannelInfo * ci, char *param)
 {
-    if (stricmp(param, "ON") == 0) {
-        ci->flags |= CI_SECUREFOUNDER;
-        notice_lang(s_ChanServ, u, CHAN_SET_SECUREFOUNDER_ON, ci->name);
-    } else if (stricmp(param, "OFF") == 0) {
-        ci->flags &= ~CI_SECUREFOUNDER;
-        notice_lang(s_ChanServ, u, CHAN_SET_SECUREFOUNDER_OFF, ci->name);
-    } else {
-        syntax_error(s_ChanServ, u, "SET SECUREFOUNDER",
-                     CHAN_SET_SECUREFOUNDER_SYNTAX);
-    }
-    return MOD_CONT;
+	if (stricmp(param, "ON") == 0) {
+		ci->flags |= CI_SECUREFOUNDER;
+		notice_lang(s_ChanServ, u, CHAN_SET_SECUREFOUNDER_ON, ci->name);
+	} else if (stricmp(param, "OFF") == 0) {
+		ci->flags &= ~CI_SECUREFOUNDER;
+		notice_lang(s_ChanServ, u, CHAN_SET_SECUREFOUNDER_OFF, ci->name);
+	} else {
+		syntax_error(s_ChanServ, u, "SET SECUREFOUNDER",
+					 CHAN_SET_SECUREFOUNDER_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 /*************************************************************************/
 
 int do_set_restricted(User * u, ChannelInfo * ci, char *param)
 {
-    if (stricmp(param, "ON") == 0) {
-        ci->flags |= CI_RESTRICTED;
-        if (ci->levels[CA_NOJOIN] < 0)
-            ci->levels[CA_NOJOIN] = 0;
-        notice_lang(s_ChanServ, u, CHAN_SET_RESTRICTED_ON, ci->name);
-    } else if (stricmp(param, "OFF") == 0) {
-        ci->flags &= ~CI_RESTRICTED;
-        if (ci->levels[CA_NOJOIN] >= 0)
-            ci->levels[CA_NOJOIN] = -2;
-        notice_lang(s_ChanServ, u, CHAN_SET_RESTRICTED_OFF, ci->name);
-    } else {
-        syntax_error(s_ChanServ, u, "SET RESTRICTED",
-                     CHAN_SET_RESTRICTED_SYNTAX);
-    }
-    return MOD_CONT;
+	if (stricmp(param, "ON") == 0) {
+		ci->flags |= CI_RESTRICTED;
+		if (ci->levels[CA_NOJOIN] < 0)
+			ci->levels[CA_NOJOIN] = 0;
+		notice_lang(s_ChanServ, u, CHAN_SET_RESTRICTED_ON, ci->name);
+	} else if (stricmp(param, "OFF") == 0) {
+		ci->flags &= ~CI_RESTRICTED;
+		if (ci->levels[CA_NOJOIN] >= 0)
+			ci->levels[CA_NOJOIN] = -2;
+		notice_lang(s_ChanServ, u, CHAN_SET_RESTRICTED_OFF, ci->name);
+	} else {
+		syntax_error(s_ChanServ, u, "SET RESTRICTED",
+					 CHAN_SET_RESTRICTED_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 /*************************************************************************/
 
 int do_set_secure(User * u, ChannelInfo * ci, char *param)
 {
-    if (stricmp(param, "ON") == 0) {
-        ci->flags |= CI_SECURE;
-        notice_lang(s_ChanServ, u, CHAN_SET_SECURE_ON, ci->name);
-    } else if (stricmp(param, "OFF") == 0) {
-        ci->flags &= ~CI_SECURE;
-        notice_lang(s_ChanServ, u, CHAN_SET_SECURE_OFF, ci->name);
-    } else {
-        syntax_error(s_ChanServ, u, "SET SECURE", CHAN_SET_SECURE_SYNTAX);
-    }
-    return MOD_CONT;
+	if (stricmp(param, "ON") == 0) {
+		ci->flags |= CI_SECURE;
+		notice_lang(s_ChanServ, u, CHAN_SET_SECURE_ON, ci->name);
+	} else if (stricmp(param, "OFF") == 0) {
+		ci->flags &= ~CI_SECURE;
+		notice_lang(s_ChanServ, u, CHAN_SET_SECURE_OFF, ci->name);
+	} else {
+		syntax_error(s_ChanServ, u, "SET SECURE", CHAN_SET_SECURE_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 /*************************************************************************/
 
 int do_set_signkick(User * u, ChannelInfo * ci, char *param)
 {
-    if (stricmp(param, "ON") == 0) {
-        ci->flags |= CI_SIGNKICK;
-        ci->flags &= ~CI_SIGNKICK_LEVEL;
-        notice_lang(s_ChanServ, u, CHAN_SET_SIGNKICK_ON, ci->name);
-    } else if (stricmp(param, "LEVEL") == 0) {
-        ci->flags |= CI_SIGNKICK_LEVEL;
-        ci->flags &= ~CI_SIGNKICK;
-        notice_lang(s_ChanServ, u, CHAN_SET_SIGNKICK_LEVEL, ci->name);
-    } else if (stricmp(param, "OFF") == 0) {
-        ci->flags &= ~(CI_SIGNKICK | CI_SIGNKICK_LEVEL);
-        notice_lang(s_ChanServ, u, CHAN_SET_SIGNKICK_OFF, ci->name);
-    } else {
-        syntax_error(s_ChanServ, u, "SET SIGNKICK",
-                     CHAN_SET_SIGNKICK_SYNTAX);
-    }
-    return MOD_CONT;
+	if (stricmp(param, "ON") == 0) {
+		ci->flags |= CI_SIGNKICK;
+		ci->flags &= ~CI_SIGNKICK_LEVEL;
+		notice_lang(s_ChanServ, u, CHAN_SET_SIGNKICK_ON, ci->name);
+	} else if (stricmp(param, "LEVEL") == 0) {
+		ci->flags |= CI_SIGNKICK_LEVEL;
+		ci->flags &= ~CI_SIGNKICK;
+		notice_lang(s_ChanServ, u, CHAN_SET_SIGNKICK_LEVEL, ci->name);
+	} else if (stricmp(param, "OFF") == 0) {
+		ci->flags &= ~(CI_SIGNKICK | CI_SIGNKICK_LEVEL);
+		notice_lang(s_ChanServ, u, CHAN_SET_SIGNKICK_OFF, ci->name);
+	} else {
+		syntax_error(s_ChanServ, u, "SET SIGNKICK",
+					 CHAN_SET_SIGNKICK_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 /*************************************************************************/
 
 int do_set_opnotice(User * u, ChannelInfo * ci, char *param)
 {
-    if (stricmp(param, "ON") == 0) {
-        ci->flags |= CI_OPNOTICE;
-        notice_lang(s_ChanServ, u, CHAN_SET_OPNOTICE_ON, ci->name);
-    } else if (stricmp(param, "OFF") == 0) {
-        ci->flags &= ~CI_OPNOTICE;
-        notice_lang(s_ChanServ, u, CHAN_SET_OPNOTICE_OFF, ci->name);
-    } else {
-        syntax_error(s_ChanServ, u, "SET OPNOTICE",
-                     CHAN_SET_OPNOTICE_SYNTAX);
-    }
-    return MOD_CONT;
+	if (stricmp(param, "ON") == 0) {
+		ci->flags |= CI_OPNOTICE;
+		notice_lang(s_ChanServ, u, CHAN_SET_OPNOTICE_ON, ci->name);
+	} else if (stricmp(param, "OFF") == 0) {
+		ci->flags &= ~CI_OPNOTICE;
+		notice_lang(s_ChanServ, u, CHAN_SET_OPNOTICE_OFF, ci->name);
+	} else {
+		syntax_error(s_ChanServ, u, "SET OPNOTICE",
+					 CHAN_SET_OPNOTICE_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 /*************************************************************************/
@@ -712,54 +712,54 @@ int do_set_opnotice(User * u, ChannelInfo * ci, char *param)
 
 int do_set_xop(User * u, ChannelInfo * ci, char *param)
 {
-    if (stricmp(param, "ON") == 0) {
-        if (!(ci->flags & CI_XOP)) {
-            int i;
-            ChanAccess *access;
-
-            for (access = ci->access, i = 0; i < ci->accesscount;
-                 access++, i++) {
-                if (!access->in_use)
-                    continue;
-                /* This will probably cause wrong levels to be set, but hey,
-                 * it's better than losing it altogether.
-                 */
-                if (CHECKLEV(CA_AKICK) || CHECKLEV(CA_SET)) {
-                    access->level = ACCESS_SOP;
-                } else if (CHECKLEV(CA_AUTOOP) || CHECKLEV(CA_OPDEOP)
-                           || CHECKLEV(CA_OPDEOPME)) {
-                    access->level = ACCESS_AOP;
-                } else if (ircd->halfop) {
-                    if (CHECKLEV(CA_AUTOHALFOP) || CHECKLEV(CA_HALFOP)
-                        || CHECKLEV(CA_HALFOPME)) {
-                        access->level = ACCESS_HOP;
-                    }
-                } else if (CHECKLEV(CA_AUTOVOICE) || CHECKLEV(CA_VOICE)
-                           || CHECKLEV(CA_VOICEME)) {
-                    access->level = ACCESS_VOP;
-                } else {
-                    access->in_use = 0;
-                    access->nc = NULL;
-                }
-            }
-
-            reset_levels(ci);
-            ci->flags |= CI_XOP;
-        }
-
-        alog("%s: %s!%s@%s enabled XOP for %s", s_ChanServ, u->nick,
-             u->username, u->host, ci->name);
-        notice_lang(s_ChanServ, u, CHAN_SET_XOP_ON, ci->name);
-    } else if (stricmp(param, "OFF") == 0) {
-        ci->flags &= ~CI_XOP;
-
-        alog("%s: %s!%s@%s disabled XOP for %s", s_ChanServ, u->nick,
-             u->username, u->host, ci->name);
-        notice_lang(s_ChanServ, u, CHAN_SET_XOP_OFF, ci->name);
-    } else {
-        syntax_error(s_ChanServ, u, "SET XOP", CHAN_SET_XOP_SYNTAX);
-    }
-    return MOD_CONT;
+	if (stricmp(param, "ON") == 0) {
+		if (!(ci->flags & CI_XOP)) {
+			int i;
+			ChanAccess *access;
+
+			for (access = ci->access, i = 0; i < ci->accesscount;
+				 access++, i++) {
+				if (!access->in_use)
+					continue;
+				/* This will probably cause wrong levels to be set, but hey,
+				 * it's better than losing it altogether.
+				 */
+				if (CHECKLEV(CA_AKICK) || CHECKLEV(CA_SET)) {
+					access->level = ACCESS_SOP;
+				} else if (CHECKLEV(CA_AUTOOP) || CHECKLEV(CA_OPDEOP)
+						   || CHECKLEV(CA_OPDEOPME)) {
+					access->level = ACCESS_AOP;
+				} else if (ircd->halfop) {
+					if (CHECKLEV(CA_AUTOHALFOP) || CHECKLEV(CA_HALFOP)
+						|| CHECKLEV(CA_HALFOPME)) {
+						access->level = ACCESS_HOP;
+					}
+				} else if (CHECKLEV(CA_AUTOVOICE) || CHECKLEV(CA_VOICE)
+						   || CHECKLEV(CA_VOICEME)) {
+					access->level = ACCESS_VOP;
+				} else {
+					access->in_use = 0;
+					access->nc = NULL;
+				}
+			}
+
+			reset_levels(ci);
+			ci->flags |= CI_XOP;
+		}
+
+		alog("%s: %s!%s@%s enabled XOP for %s", s_ChanServ, u->nick,
+			 u->username, u->host, ci->name);
+		notice_lang(s_ChanServ, u, CHAN_SET_XOP_ON, ci->name);
+	} else if (stricmp(param, "OFF") == 0) {
+		ci->flags &= ~CI_XOP;
+
+		alog("%s: %s!%s@%s disabled XOP for %s", s_ChanServ, u->nick,
+			 u->username, u->host, ci->name);
+		notice_lang(s_ChanServ, u, CHAN_SET_XOP_OFF, ci->name);
+	} else {
+		syntax_error(s_ChanServ, u, "SET XOP", CHAN_SET_XOP_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 #undef CHECKLEV
@@ -768,37 +768,37 @@ int do_set_xop(User * u, ChannelInfo * ci, char *param)
 
 int do_set_peace(User * u, ChannelInfo * ci, char *param)
 {
-    if (stricmp(param, "ON") == 0) {
-        ci->flags |= CI_PEACE;
-        notice_lang(s_ChanServ, u, CHAN_SET_PEACE_ON, ci->name);
-    } else if (stricmp(param, "OFF") == 0) {
-        ci->flags &= ~CI_PEACE;
-        notice_lang(s_ChanServ, u, CHAN_SET_PEACE_OFF, ci->name);
-    } else {
-        syntax_error(s_ChanServ, u, "SET PEACE", CHAN_SET_PEACE_SYNTAX);
-    }
-    return MOD_CONT;
+	if (stricmp(param, "ON") == 0) {
+		ci->flags |= CI_PEACE;
+		notice_lang(s_ChanServ, u, CHAN_SET_PEACE_ON, ci->name);
+	} else if (stricmp(param, "OFF") == 0) {
+		ci->flags &= ~CI_PEACE;
+		notice_lang(s_ChanServ, u, CHAN_SET_PEACE_OFF, ci->name);
+	} else {
+		syntax_error(s_ChanServ, u, "SET PEACE", CHAN_SET_PEACE_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 /*************************************************************************/
 
 int do_set_noexpire(User * u, ChannelInfo * ci, char *param)
 {
-    if (!is_services_admin(u)) {
-        notice_lang(s_ChanServ, u, PERMISSION_DENIED);
-        return MOD_CONT;
-    }
-    if (stricmp(param, "ON") == 0) {
-        ci->flags |= CI_NO_EXPIRE;
-        notice_lang(s_ChanServ, u, CHAN_SET_NOEXPIRE_ON, ci->name);
-    } else if (stricmp(param, "OFF") == 0) {
-        ci->flags &= ~CI_NO_EXPIRE;
-        notice_lang(s_ChanServ, u, CHAN_SET_NOEXPIRE_OFF, ci->name);
-    } else {
-        syntax_error(s_ChanServ, u, "SET NOEXPIRE",
-                     CHAN_SET_NOEXPIRE_SYNTAX);
-    }
-    return MOD_CONT;
+	if (!is_services_admin(u)) {
+		notice_lang(s_ChanServ, u, PERMISSION_DENIED);
+		return MOD_CONT;
+	}
+	if (stricmp(param, "ON") == 0) {
+		ci->flags |= CI_NO_EXPIRE;
+		notice_lang(s_ChanServ, u, CHAN_SET_NOEXPIRE_ON, ci->name);
+	} else if (stricmp(param, "OFF") == 0) {
+		ci->flags &= ~CI_NO_EXPIRE;
+		notice_lang(s_ChanServ, u, CHAN_SET_NOEXPIRE_OFF, ci->name);
+	} else {
+		syntax_error(s_ChanServ, u, "SET NOEXPIRE",
+					 CHAN_SET_NOEXPIRE_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("cs_set", CSSet)
diff --git a/src/core/cs_status.c b/src/core/cs_status.c
index 3a3a8301a..419688611 100644
--- a/src/core/cs_status.c
+++ b/src/core/cs_status.c
@@ -44,9 +44,9 @@ class CSStatus : public Module
  **/
 void myChanServHelp(User * u)
 {
-    if (is_services_admin(u)) {
-        notice_lang(s_ChanServ, u, CHAN_HELP_CMD_STATUS);
-    }
+	if (is_services_admin(u)) {
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_STATUS);
+	}
 }
 
 /**
@@ -56,35 +56,35 @@ void myChanServHelp(User * u)
  **/
 int do_status(User * u)
 {
-    ChannelInfo *ci;
-    User *u2;
-    char *nick, *chan;
-    char *temp = NULL;
+	ChannelInfo *ci;
+	User *u2;
+	char *nick, *chan;
+	char *temp = NULL;
 
-    chan = strtok(NULL, " ");
-    nick = strtok(NULL, " ");
-    if (!nick || strtok(NULL, " ")) {
-        notice_lang(s_ChanServ, u, CHAN_STATUS_SYNTAX);
-        return MOD_CONT;
-    }
-    if (!(ci = cs_findchan(chan))) {
-        temp = chan;
-        chan = nick;
-        nick = temp;
-        ci = cs_findchan(chan);
-    }
-    if (!ci) {
-        notice_lang(s_ChanServ, u, CHAN_STATUS_NOT_REGGED, temp);
-    } else if (ci->flags & CI_VERBOTEN) {
-        notice_lang(s_ChanServ, u, CHAN_STATUS_FORBIDDEN, chan);
-        return MOD_CONT;
-    } else if ((u2 = finduser(nick)) != NULL) {
-        notice_lang(s_ChanServ, u, CHAN_STATUS_INFO, chan, nick,
-                    get_access(u2, ci));
-    } else {                    /* !u2 */
-        notice_lang(s_ChanServ, u, CHAN_STATUS_NOTONLINE, nick);
-    }
-    return MOD_CONT;
+	chan = strtok(NULL, " ");
+	nick = strtok(NULL, " ");
+	if (!nick || strtok(NULL, " ")) {
+		notice_lang(s_ChanServ, u, CHAN_STATUS_SYNTAX);
+		return MOD_CONT;
+	}
+	if (!(ci = cs_findchan(chan))) {
+		temp = chan;
+		chan = nick;
+		nick = temp;
+		ci = cs_findchan(chan);
+	}
+	if (!ci) {
+		notice_lang(s_ChanServ, u, CHAN_STATUS_NOT_REGGED, temp);
+	} else if (ci->flags & CI_VERBOTEN) {
+		notice_lang(s_ChanServ, u, CHAN_STATUS_FORBIDDEN, chan);
+		return MOD_CONT;
+	} else if ((u2 = finduser(nick)) != NULL) {
+		notice_lang(s_ChanServ, u, CHAN_STATUS_INFO, chan, nick,
+					get_access(u2, ci));
+	} else {					/* !u2 */
+		notice_lang(s_ChanServ, u, CHAN_STATUS_NOTONLINE, nick);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("cs_status", CSStatus)
diff --git a/src/core/cs_suspend.c b/src/core/cs_suspend.c
index 21b4a5f1a..fd9500e90 100644
--- a/src/core/cs_suspend.c
+++ b/src/core/cs_suspend.c
@@ -46,10 +46,10 @@ 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);
-    }
+	if (is_services_oper(u)) {
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_SUSPEND);
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_UNSUSPEND);
+	}
 }
 
 /**
@@ -59,140 +59,140 @@ void myChanServHelp(User * u)
  **/
 int do_suspend(User * u)
 {
-    ChannelInfo *ci;
-    char *chan = strtok(NULL, " ");
-    char *reason = strtok(NULL, "");
-
-    Channel *c;
-
-    /* Assumes that permission checking has already been done. */
-    if (!chan || (ForceForbidReason && !reason)) {
-        syntax_error(s_ChanServ, u, "SUSPEND",
-                     (ForceForbidReason ? CHAN_SUSPEND_SYNTAX_REASON :
-                      CHAN_SUSPEND_SYNTAX));
-        return MOD_CONT;
-    }
-
-    if (chan[0] != '#') {
-        notice_lang(s_ChanServ, u, CHAN_UNSUSPEND_ERROR);
-        return MOD_CONT;
-    }
-
-    /* Only SUSPEND existing channels, otherwise use FORBID (bug #54) */
-    if ((ci = cs_findchan(chan)) == NULL) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
-        return MOD_CONT;
-    }
-
-    /* You should not SUSPEND a FORBIDEN channel */
-    if (ci->flags & CI_VERBOTEN) {
-        notice_lang(s_ChanServ, u, CHAN_MAY_NOT_BE_REGISTERED, chan);
-        return MOD_CONT;
-    }
-
-    if (readonly)
-        notice_lang(s_ChanServ, u, READ_ONLY_MODE);
-
-    if (ci) {
-        ci->flags |= CI_SUSPENDED;
-        ci->forbidby = sstrdup(u->nick);
-        if (reason)
-            ci->forbidreason = sstrdup(reason);
-
-        if ((c = findchan(ci->name))) {
-            struct c_userlist *cu, *next;
-            const char *av[3];
-
-            for (cu = c->users; cu; cu = next) {
-                next = cu->next;
-
-                if (is_oper(cu->user))
-                    continue;
-
-                av[0] = c->name;
-                av[1] = cu->user->nick;
-                av[2] = reason ? reason : "CHAN_SUSPEND_REASON";
-                ircdproto->SendKick(findbot(s_ChanServ), av[0], av[1], av[2]);
-                do_kick(s_ChanServ, 3, av);
-            }
-        }
-
-        if (WallForbid)
-            ircdproto->SendGlobops(s_ChanServ,
-                             "\2%s\2 used SUSPEND on channel \2%s\2",
-                             u->nick, ci->name);
-
-        alog("%s: %s set SUSPEND for channel %s", s_ChanServ, u->nick,
-             ci->name);
-        notice_lang(s_ChanServ, u, CHAN_SUSPEND_SUCCEEDED, chan);
-        send_event(EVENT_CHAN_SUSPENDED, 1, chan);
-    } else {
-        alog("%s: Valid SUSPEND for %s by %s failed", s_ChanServ, ci->name,
-             u->nick);
-        notice_lang(s_ChanServ, u, CHAN_SUSPEND_FAILED, chan);
-    }
-    return MOD_CONT;
+	ChannelInfo *ci;
+	char *chan = strtok(NULL, " ");
+	char *reason = strtok(NULL, "");
+
+	Channel *c;
+
+	/* Assumes that permission checking has already been done. */
+	if (!chan || (ForceForbidReason && !reason)) {
+		syntax_error(s_ChanServ, u, "SUSPEND",
+					 (ForceForbidReason ? CHAN_SUSPEND_SYNTAX_REASON :
+					  CHAN_SUSPEND_SYNTAX));
+		return MOD_CONT;
+	}
+
+	if (chan[0] != '#') {
+		notice_lang(s_ChanServ, u, CHAN_UNSUSPEND_ERROR);
+		return MOD_CONT;
+	}
+
+	/* Only SUSPEND existing channels, otherwise use FORBID (bug #54) */
+	if ((ci = cs_findchan(chan)) == NULL) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
+		return MOD_CONT;
+	}
+
+	/* You should not SUSPEND a FORBIDEN channel */
+	if (ci->flags & CI_VERBOTEN) {
+		notice_lang(s_ChanServ, u, CHAN_MAY_NOT_BE_REGISTERED, chan);
+		return MOD_CONT;
+	}
+
+	if (readonly)
+		notice_lang(s_ChanServ, u, READ_ONLY_MODE);
+
+	if (ci) {
+		ci->flags |= CI_SUSPENDED;
+		ci->forbidby = sstrdup(u->nick);
+		if (reason)
+			ci->forbidreason = sstrdup(reason);
+
+		if ((c = findchan(ci->name))) {
+			struct c_userlist *cu, *next;
+			const char *av[3];
+
+			for (cu = c->users; cu; cu = next) {
+				next = cu->next;
+
+				if (is_oper(cu->user))
+					continue;
+
+				av[0] = c->name;
+				av[1] = cu->user->nick;
+				av[2] = reason ? reason : "CHAN_SUSPEND_REASON";
+				ircdproto->SendKick(findbot(s_ChanServ), av[0], av[1], av[2]);
+				do_kick(s_ChanServ, 3, av);
+			}
+		}
+
+		if (WallForbid)
+			ircdproto->SendGlobops(s_ChanServ,
+							 "\2%s\2 used SUSPEND on channel \2%s\2",
+							 u->nick, ci->name);
+
+		alog("%s: %s set SUSPEND for channel %s", s_ChanServ, u->nick,
+			 ci->name);
+		notice_lang(s_ChanServ, u, CHAN_SUSPEND_SUCCEEDED, chan);
+		send_event(EVENT_CHAN_SUSPENDED, 1, chan);
+	} else {
+		alog("%s: Valid SUSPEND for %s by %s failed", s_ChanServ, ci->name,
+			 u->nick);
+		notice_lang(s_ChanServ, u, CHAN_SUSPEND_FAILED, chan);
+	}
+	return MOD_CONT;
 }
 
 /*************************************************************************/
 
 int do_unsuspend(User * u)
 {
-    ChannelInfo *ci;
-    char *chan = strtok(NULL, " ");
-
-    /* Assumes that permission checking has already been done. */
-    if (!chan) {
-        syntax_error(s_ChanServ, u, "UNSUSPEND", CHAN_UNSUSPEND_SYNTAX);
-        return MOD_CONT;
-    }
-    if (chan[0] != '#') {
-        notice_lang(s_ChanServ, u, CHAN_UNSUSPEND_ERROR);
-        return MOD_CONT;
-    }
-    if (readonly)
-        notice_lang(s_ChanServ, u, READ_ONLY_MODE);
-
-    /* Only UNSUSPEND already suspended channels */
-    if ((ci = cs_findchan(chan)) == NULL) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
-        return MOD_CONT;
-    }
-
-    if (!(ci->flags & CI_SUSPENDED))
-    {
-        notice_lang(s_ChanServ, u, CHAN_UNSUSPEND_FAILED, chan);
-        return MOD_CONT;
-    }
-
-    if (ci) {
-        ci->flags &= ~CI_SUSPENDED;
-        if (ci->forbidreason)
-        {
-        	free(ci->forbidreason);
-        	ci->forbidreason = NULL;
-        }
-        if (ci->forbidby)
-        {
-        	free(ci->forbidby);
-        	ci->forbidby = NULL;
-        }
-
-        if (WallForbid)
-            ircdproto->SendGlobops(s_ChanServ,
-                             "\2%s\2 used UNSUSPEND on channel \2%s\2",
-                             u->nick, ci->name);
-
-        alog("%s: %s set UNSUSPEND for channel %s", s_ChanServ, u->nick,
-             ci->name);
-        notice_lang(s_ChanServ, u, CHAN_UNSUSPEND_SUCCEEDED, chan);
-        send_event(EVENT_CHAN_UNSUSPEND, 1, chan);
-    } else {
-        alog("%s: Valid UNSUSPEND for %s by %s failed", s_ChanServ,
-             chan, u->nick);
-        notice_lang(s_ChanServ, u, CHAN_UNSUSPEND_FAILED, chan);
-    }
-    return MOD_CONT;
+	ChannelInfo *ci;
+	char *chan = strtok(NULL, " ");
+
+	/* Assumes that permission checking has already been done. */
+	if (!chan) {
+		syntax_error(s_ChanServ, u, "UNSUSPEND", CHAN_UNSUSPEND_SYNTAX);
+		return MOD_CONT;
+	}
+	if (chan[0] != '#') {
+		notice_lang(s_ChanServ, u, CHAN_UNSUSPEND_ERROR);
+		return MOD_CONT;
+	}
+	if (readonly)
+		notice_lang(s_ChanServ, u, READ_ONLY_MODE);
+
+	/* Only UNSUSPEND already suspended channels */
+	if ((ci = cs_findchan(chan)) == NULL) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
+		return MOD_CONT;
+	}
+
+	if (!(ci->flags & CI_SUSPENDED))
+	{
+		notice_lang(s_ChanServ, u, CHAN_UNSUSPEND_FAILED, chan);
+		return MOD_CONT;
+	}
+
+	if (ci) {
+		ci->flags &= ~CI_SUSPENDED;
+		if (ci->forbidreason)
+		{
+			free(ci->forbidreason);
+			ci->forbidreason = NULL;
+		}
+		if (ci->forbidby)
+		{
+			free(ci->forbidby);
+			ci->forbidby = NULL;
+		}
+
+		if (WallForbid)
+			ircdproto->SendGlobops(s_ChanServ,
+							 "\2%s\2 used UNSUSPEND on channel \2%s\2",
+							 u->nick, ci->name);
+
+		alog("%s: %s set UNSUSPEND for channel %s", s_ChanServ, u->nick,
+			 ci->name);
+		notice_lang(s_ChanServ, u, CHAN_UNSUSPEND_SUCCEEDED, chan);
+		send_event(EVENT_CHAN_UNSUSPEND, 1, chan);
+	} else {
+		alog("%s: Valid UNSUSPEND for %s by %s failed", s_ChanServ,
+			 chan, u->nick);
+		notice_lang(s_ChanServ, u, CHAN_UNSUSPEND_FAILED, chan);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("cs_suspend", CSSuspend)
diff --git a/src/core/cs_topic.c b/src/core/cs_topic.c
index c73de365c..111042403 100644
--- a/src/core/cs_topic.c
+++ b/src/core/cs_topic.c
@@ -43,7 +43,7 @@ class CSTopic : public Module
  **/
 void myChanServHelp(User * u)
 {
-    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_TOPIC);
+	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_TOPIC);
 }
 
 /**
@@ -53,57 +53,57 @@ void myChanServHelp(User * u)
  **/
 int do_cs_topic(User * u)
 {
-    char *chan = strtok(NULL, " ");
-    char *topic = strtok(NULL, "");
+	char *chan = strtok(NULL, " ");
+	char *topic = strtok(NULL, "");
 
-    Channel *c;
-    ChannelInfo *ci;
+	Channel *c;
+	ChannelInfo *ci;
 
-    if (!chan) {
-        syntax_error(s_ChanServ, u, "TOPIC", CHAN_TOPIC_SYNTAX);
-    } else if (!(c = findchan(chan))) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
-    } else if (!(ci = c->ci)) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, c->name);
-    } else if (ci->flags & CI_VERBOTEN) {
-        notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, ci->name);
-    } else if (!is_services_admin(u) && !check_access(u, ci, CA_TOPIC)) {
-        notice_lang(s_ChanServ, u, PERMISSION_DENIED);
-    } else {
-        if (ci->last_topic)
-            free(ci->last_topic);
-        ci->last_topic = topic ? sstrdup(topic) : NULL;
-        strscpy(ci->last_topic_setter, u->nick, NICKMAX);
-        ci->last_topic_time = time(NULL);
+	if (!chan) {
+		syntax_error(s_ChanServ, u, "TOPIC", CHAN_TOPIC_SYNTAX);
+	} else if (!(c = findchan(chan))) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan);
+	} else if (!(ci = c->ci)) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, c->name);
+	} else if (ci->flags & CI_VERBOTEN) {
+		notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, ci->name);
+	} else if (!is_services_admin(u) && !check_access(u, ci, CA_TOPIC)) {
+		notice_lang(s_ChanServ, u, PERMISSION_DENIED);
+	} else {
+		if (ci->last_topic)
+			free(ci->last_topic);
+		ci->last_topic = topic ? sstrdup(topic) : NULL;
+		strscpy(ci->last_topic_setter, u->nick, NICKMAX);
+		ci->last_topic_time = time(NULL);
 
-        if (c->topic)
-            free(c->topic);
-        c->topic = topic ? sstrdup(topic) : NULL;
-        strscpy(c->topic_setter, u->nick, NICKMAX);
-        if (ircd->topictsbackward) {
-            c->topic_time = c->topic_time - 1;
-        } else {
-            c->topic_time = ci->last_topic_time;
-        }
+		if (c->topic)
+			free(c->topic);
+		c->topic = topic ? sstrdup(topic) : NULL;
+		strscpy(c->topic_setter, u->nick, NICKMAX);
+		if (ircd->topictsbackward) {
+			c->topic_time = c->topic_time - 1;
+		} else {
+			c->topic_time = ci->last_topic_time;
+		}
 
-        if (is_services_admin(u) && !check_access(u, ci, CA_TOPIC))
-            alog("%s: %s!%s@%s changed topic of %s as services admin.",
-                 s_ChanServ, u->nick, u->username, u->host, c->name);
-        if (ircd->join2set) {
-            if (whosends(ci) == findbot(s_ChanServ)) {
-                ircdproto->SendJoin(findbot(s_ChanServ), c->name, c->creation_time);
-                ircdproto->SendMode(NULL, c->name, "+o %s", s_ChanServ);
-            }
-        }
-        ircdproto->SendTopic(whosends(ci), c->name, u->nick, topic ? topic : "",
-                        c->topic_time);
-        if (ircd->join2set) {
-            if (whosends(ci) == findbot(s_ChanServ)) {
-                ircdproto->SendPart(findbot(s_ChanServ), c->name, NULL);
-            }
-        }
-    }
-    return MOD_CONT;
+		if (is_services_admin(u) && !check_access(u, ci, CA_TOPIC))
+			alog("%s: %s!%s@%s changed topic of %s as services admin.",
+				 s_ChanServ, u->nick, u->username, u->host, c->name);
+		if (ircd->join2set) {
+			if (whosends(ci) == findbot(s_ChanServ)) {
+				ircdproto->SendJoin(findbot(s_ChanServ), c->name, c->creation_time);
+				ircdproto->SendMode(NULL, c->name, "+o %s", s_ChanServ);
+			}
+		}
+		ircdproto->SendTopic(whosends(ci), c->name, u->nick, topic ? topic : "",
+						c->topic_time);
+		if (ircd->join2set) {
+			if (whosends(ci) == findbot(s_ChanServ)) {
+				ircdproto->SendPart(findbot(s_ChanServ), c->name, NULL);
+			}
+		}
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("cs_topic", CSTopic)
diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c
index 51bf5e71c..bc724913f 100644
--- a/src/core/cs_xop.c
+++ b/src/core/cs_xop.c
@@ -24,62 +24,62 @@ int do_vop(User * u);
 void myChanServHelp(User * u);
 
 int xop_msgs[4][14] = {
-    {CHAN_AOP_SYNTAX,
-     CHAN_AOP_DISABLED,
-     CHAN_AOP_NICKS_ONLY,
-     CHAN_AOP_ADDED,
-     CHAN_AOP_MOVED,
-     CHAN_AOP_NO_SUCH_ENTRY,
-     CHAN_AOP_NOT_FOUND,
-     CHAN_AOP_NO_MATCH,
-     CHAN_AOP_DELETED,
-     CHAN_AOP_DELETED_ONE,
-     CHAN_AOP_DELETED_SEVERAL,
-     CHAN_AOP_LIST_EMPTY,
-     CHAN_AOP_LIST_HEADER,
-     CHAN_AOP_CLEAR},
-    {CHAN_SOP_SYNTAX,
-     CHAN_SOP_DISABLED,
-     CHAN_SOP_NICKS_ONLY,
-     CHAN_SOP_ADDED,
-     CHAN_SOP_MOVED,
-     CHAN_SOP_NO_SUCH_ENTRY,
-     CHAN_SOP_NOT_FOUND,
-     CHAN_SOP_NO_MATCH,
-     CHAN_SOP_DELETED,
-     CHAN_SOP_DELETED_ONE,
-     CHAN_SOP_DELETED_SEVERAL,
-     CHAN_SOP_LIST_EMPTY,
-     CHAN_SOP_LIST_HEADER,
-     CHAN_SOP_CLEAR},
-    {CHAN_VOP_SYNTAX,
-     CHAN_VOP_DISABLED,
-     CHAN_VOP_NICKS_ONLY,
-     CHAN_VOP_ADDED,
-     CHAN_VOP_MOVED,
-     CHAN_VOP_NO_SUCH_ENTRY,
-     CHAN_VOP_NOT_FOUND,
-     CHAN_VOP_NO_MATCH,
-     CHAN_VOP_DELETED,
-     CHAN_VOP_DELETED_ONE,
-     CHAN_VOP_DELETED_SEVERAL,
-     CHAN_VOP_LIST_EMPTY,
-     CHAN_VOP_LIST_HEADER,
-     CHAN_VOP_CLEAR},
-    {CHAN_HOP_SYNTAX,
-     CHAN_HOP_DISABLED,
-     CHAN_HOP_NICKS_ONLY,
-     CHAN_HOP_ADDED,
-     CHAN_HOP_MOVED,
-     CHAN_HOP_NO_SUCH_ENTRY,
-     CHAN_HOP_NOT_FOUND,
-     CHAN_HOP_NO_MATCH,
-     CHAN_HOP_DELETED,
-     CHAN_HOP_DELETED_ONE,
-     CHAN_HOP_DELETED_SEVERAL,
-     CHAN_HOP_LIST_EMPTY,
-     CHAN_HOP_LIST_HEADER,
-     CHAN_HOP_CLEAR}
+	{CHAN_AOP_SYNTAX,
+	 CHAN_AOP_DISABLED,
+	 CHAN_AOP_NICKS_ONLY,
+	 CHAN_AOP_ADDED,
+	 CHAN_AOP_MOVED,
+	 CHAN_AOP_NO_SUCH_ENTRY,
+	 CHAN_AOP_NOT_FOUND,
+	 CHAN_AOP_NO_MATCH,
+	 CHAN_AOP_DELETED,
+	 CHAN_AOP_DELETED_ONE,
+	 CHAN_AOP_DELETED_SEVERAL,
+	 CHAN_AOP_LIST_EMPTY,
+	 CHAN_AOP_LIST_HEADER,
+	 CHAN_AOP_CLEAR},
+	{CHAN_SOP_SYNTAX,
+	 CHAN_SOP_DISABLED,
+	 CHAN_SOP_NICKS_ONLY,
+	 CHAN_SOP_ADDED,
+	 CHAN_SOP_MOVED,
+	 CHAN_SOP_NO_SUCH_ENTRY,
+	 CHAN_SOP_NOT_FOUND,
+	 CHAN_SOP_NO_MATCH,
+	 CHAN_SOP_DELETED,
+	 CHAN_SOP_DELETED_ONE,
+	 CHAN_SOP_DELETED_SEVERAL,
+	 CHAN_SOP_LIST_EMPTY,
+	 CHAN_SOP_LIST_HEADER,
+	 CHAN_SOP_CLEAR},
+	{CHAN_VOP_SYNTAX,
+	 CHAN_VOP_DISABLED,
+	 CHAN_VOP_NICKS_ONLY,
+	 CHAN_VOP_ADDED,
+	 CHAN_VOP_MOVED,
+	 CHAN_VOP_NO_SUCH_ENTRY,
+	 CHAN_VOP_NOT_FOUND,
+	 CHAN_VOP_NO_MATCH,
+	 CHAN_VOP_DELETED,
+	 CHAN_VOP_DELETED_ONE,
+	 CHAN_VOP_DELETED_SEVERAL,
+	 CHAN_VOP_LIST_EMPTY,
+	 CHAN_VOP_LIST_HEADER,
+	 CHAN_VOP_CLEAR},
+	{CHAN_HOP_SYNTAX,
+	 CHAN_HOP_DISABLED,
+	 CHAN_HOP_NICKS_ONLY,
+	 CHAN_HOP_ADDED,
+	 CHAN_HOP_MOVED,
+	 CHAN_HOP_NO_SUCH_ENTRY,
+	 CHAN_HOP_NOT_FOUND,
+	 CHAN_HOP_NO_MATCH,
+	 CHAN_HOP_DELETED,
+	 CHAN_HOP_DELETED_ONE,
+	 CHAN_HOP_DELETED_SEVERAL,
+	 CHAN_HOP_LIST_EMPTY,
+	 CHAN_HOP_LIST_HEADER,
+	 CHAN_HOP_CLEAR}
 };
 
 class CSXOP : public Module
@@ -117,12 +117,12 @@ class CSXOP : public Module
  **/
 void myChanServHelp(User * u)
 {
-    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_SOP);
-    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_AOP);
-    if (ircd->halfop) {
-        notice_lang(s_ChanServ, u, CHAN_HELP_CMD_HOP);
-    }
-    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_VOP);
+	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_SOP);
+	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_AOP);
+	if (ircd->halfop) {
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_HOP);
+	}
+	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_VOP);
 }
 
 /**
@@ -132,28 +132,28 @@ void myChanServHelp(User * u)
  **/
 int do_aop(User * u)
 {
-    return do_xop(u, "AOP", ACCESS_AOP, xop_msgs[0]);
+	return do_xop(u, "AOP", ACCESS_AOP, xop_msgs[0]);
 }
 
 /*************************************************************************/
 
 int do_hop(User * u)
 {
-    return do_xop(u, "HOP", ACCESS_HOP, xop_msgs[3]);
+	return do_xop(u, "HOP", ACCESS_HOP, xop_msgs[3]);
 }
 
 /*************************************************************************/
 
 int do_sop(User * u)
 {
-    return do_xop(u, "SOP", ACCESS_SOP, xop_msgs[1]);
+	return do_xop(u, "SOP", ACCESS_SOP, xop_msgs[1]);
 }
 
 /*************************************************************************/
 
 int do_vop(User * u)
 {
-    return do_xop(u, "VOP", ACCESS_VOP, xop_msgs[2]);
+	return do_xop(u, "VOP", ACCESS_VOP, xop_msgs[2]);
 }
 
 /* `last' is set to the last index this routine was called with
@@ -162,338 +162,338 @@ int do_vop(User * u)
 
 int xop_del(User * u, ChannelInfo * ci, ChanAccess * access, int *perm, int uacc, int xlev)
 {
-    char *nick = access->nc->display;
-    if (!access->in_use || access->level != xlev)
-        return 0;
-    if (!is_services_admin(u) && uacc <= access->level) {
-        (*perm)++;
-        return 0;
-    }
-    access->nc = NULL;
-    access->in_use = 0;
-    send_event(EVENT_ACCESS_DEL, 3, ci->name, u->nick, nick);
-    return 1;
+	char *nick = access->nc->display;
+	if (!access->in_use || access->level != xlev)
+		return 0;
+	if (!is_services_admin(u) && uacc <= access->level) {
+		(*perm)++;
+		return 0;
+	}
+	access->nc = NULL;
+	access->in_use = 0;
+	send_event(EVENT_ACCESS_DEL, 3, ci->name, u->nick, nick);
+	return 1;
 }
 
 int xop_del_callback(User * u, int num, va_list args)
 {
-    ChannelInfo *ci = va_arg(args, ChannelInfo *);
-    int *last = va_arg(args, int *);
-    int *perm = va_arg(args, int *);
-    int uacc = va_arg(args, int);
-    int xlev = va_arg(args, int);
+	ChannelInfo *ci = va_arg(args, ChannelInfo *);
+	int *last = va_arg(args, int *);
+	int *perm = va_arg(args, int *);
+	int uacc = va_arg(args, int);
+	int xlev = va_arg(args, int);
 
-    if (num < 1 || num > ci->accesscount)
-        return 0;
-    *last = num;
+	if (num < 1 || num > ci->accesscount)
+		return 0;
+	*last = num;
 
-    return xop_del(u, ci, &ci->access[num - 1], perm, uacc, xlev);
+	return xop_del(u, ci, &ci->access[num - 1], perm, uacc, xlev);
 }
 
 
 int xop_list(User * u, int index, ChannelInfo * ci,
-             int *sent_header, int xlev, int xmsg)
+			 int *sent_header, int xlev, int xmsg)
 {
-    ChanAccess *access = &ci->access[index];
+	ChanAccess *access = &ci->access[index];
 
-    if (!access->in_use || access->level != xlev)
-        return 0;
+	if (!access->in_use || access->level != xlev)
+		return 0;
 
-    if (!*sent_header) {
-        notice_lang(s_ChanServ, u, xmsg, ci->name);
-        *sent_header = 1;
-    }
+	if (!*sent_header) {
+		notice_lang(s_ChanServ, u, xmsg, ci->name);
+		*sent_header = 1;
+	}
 
-    notice_lang(s_ChanServ, u, CHAN_XOP_LIST_FORMAT, index + 1,
-                access->nc->display);
-    return 1;
+	notice_lang(s_ChanServ, u, CHAN_XOP_LIST_FORMAT, index + 1,
+				access->nc->display);
+	return 1;
 }
 
 int xop_list_callback(User * u, int num, va_list args)
 {
-    ChannelInfo *ci = va_arg(args, ChannelInfo *);
-    int *sent_header = va_arg(args, int *);
-    int xlev = va_arg(args, int);
-    int xmsg = va_arg(args, int);
+	ChannelInfo *ci = va_arg(args, ChannelInfo *);
+	int *sent_header = va_arg(args, int *);
+	int xlev = va_arg(args, int);
+	int xmsg = va_arg(args, int);
 
-    if (num < 1 || num > ci->accesscount)
-        return 0;
+	if (num < 1 || num > ci->accesscount)
+		return 0;
 
-    return xop_list(u, num - 1, ci, sent_header, xlev, xmsg);
+	return xop_list(u, num - 1, ci, sent_header, xlev, xmsg);
 }
 
 
 int do_xop(User * u, const char *xname, int xlev, int *xmsgs)
 {
-    char *chan = strtok(NULL, " ");
-    char *cmd = strtok(NULL, " ");
-    char *nick = strtok(NULL, " ");
-    char event_access[BUFSIZE];
-
-    ChannelInfo *ci;
-    NickAlias *na;
-    NickCore *nc;
-
-    int i;
-    int change = 0;
-    short ulev;
-    int is_list = (cmd && stricmp(cmd, "LIST") == 0);
-    int is_servadmin = is_services_admin(u);
-    ChanAccess *access;
-
-    /* If CLEAR, we don't need any parameters.
-     * If LIST, we don't *require* any parameters, but we can take any.
-     * If DEL or ADD we require a nick. */
-    if (!cmd || ((is_list || !stricmp(cmd, "CLEAR")) ? 0 : !nick)) {
-        syntax_error(s_ChanServ, u, xname, xmsgs[0]);
-    } else if (!(ci = cs_findchan(chan))) {
-        notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
-    } else if (ci->flags & CI_VERBOTEN) {
-        notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
-    } else if (!(ci->flags & CI_XOP)) {
-        notice_lang(s_ChanServ, u, CHAN_XOP_ACCESS, s_ChanServ);
-    } else if (stricmp(cmd, "ADD") == 0) {
-        if (readonly) {
-            notice_lang(s_ChanServ, u, xmsgs[1]);
-            return MOD_CONT;
-        }
-
-        ulev = get_access(u, ci);
-
-        if ((xlev >= ulev || ulev < ACCESS_AOP) && !is_servadmin) {
-            notice_lang(s_ChanServ, u, PERMISSION_DENIED);
-            return MOD_CONT;
-        }
-
-        na = findnick(nick);
-        if (!na) {
-            notice_lang(s_ChanServ, u, xmsgs[2]);
-            return MOD_CONT;
-        } else if (na->status & NS_VERBOTEN) {
-            notice_lang(s_ChanServ, u, NICK_X_FORBIDDEN, na->nick);
-            return MOD_CONT;
-        }
-
-        nc = na->nc;
-        for (access = ci->access, i = 0; i < ci->accesscount;
-             access++, i++) {
-            if (access->nc == nc) {
-                /**
-                 * Patch provided by PopCorn to prevert AOP's reducing SOP's levels
-                 **/
-                if ((access->level >= ulev) && (!is_servadmin)) {
-                    notice_lang(s_ChanServ, u, PERMISSION_DENIED);
-                    return MOD_CONT;
-                }
-                change++;
-                break;
-            }
-        }
-
-        if (!change) {
-            /* All entries should be in use so we no longer need
-             * to go over the entire list..
-            for (i = 0; i < ci->accesscount; i++)
-                if (!ci->access[i].in_use)
-                    break;
-             */
-
-            if (i < CSAccessMax) {
-                ci->accesscount++;
-                ci->access =
-                    (ChanAccess *)srealloc(ci->access,
-                             sizeof(ChanAccess) * ci->accesscount);
-            } else {
-                notice_lang(s_ChanServ, u, CHAN_XOP_REACHED_LIMIT,
-                            CSAccessMax);
-                return MOD_CONT;
-            }
-
-            access = &ci->access[i];
-            access->nc = nc;
-        }
-
-        access->in_use = 1;
-        access->level = xlev;
-        access->last_seen = 0;
-
-        alog("%s: %s!%s@%s (level %d) %s access level %d to %s (group %s) on channel %s", s_ChanServ, u->nick, u->username, u->host, ulev, change ? "changed" : "set", access->level, na->nick, nc->display, ci->name);
-
-        snprintf(event_access, BUFSIZE, "%d", access->level);
-
-        if (!change) {
-            send_event(EVENT_ACCESS_ADD, 4, ci->name, u->nick, na->nick,
-                       event_access);
-            notice_lang(s_ChanServ, u, xmsgs[3], access->nc->display,
-                        ci->name);
-        } else {
-            send_event(EVENT_ACCESS_CHANGE, 4, ci->name, u->nick, na->nick,
-                       event_access);
-            notice_lang(s_ChanServ, u, xmsgs[4], access->nc->display,
-                        ci->name);
-        }
-
-    } else if (stricmp(cmd, "DEL") == 0) {
-        int deleted, a, b;
-        if (readonly) {
-            notice_lang(s_ChanServ, u, xmsgs[1]);
-            return MOD_CONT;
-        }
-
-        if (ci->accesscount == 0) {
-            notice_lang(s_ChanServ, u, xmsgs[11], chan);
-            return MOD_CONT;
-        }
-
-        ulev = get_access(u, ci);
-
-        if ((xlev >= ulev || ulev < ACCESS_AOP) && !is_servadmin) {
-            notice_lang(s_ChanServ, u, PERMISSION_DENIED);
-            return MOD_CONT;
-        }
-
-        /* Special case: is it a number/list?  Only do search if it isn't. */
-        if (isdigit(*nick) && strspn(nick, "1234567890,-") == strlen(nick)) {
-            int count, last = -1, perm = 0;
-            deleted =
-                process_numlist(nick, &count, xop_del_callback, u, ci,
-                                &last, &perm, ulev, xlev);
-            if (!deleted) {
-                if (perm) {
-                    notice_lang(s_ChanServ, u, PERMISSION_DENIED);
-                } else if (count == 1) {
-                    notice_lang(s_ChanServ, u, xmsgs[5], last, ci->name);
-                } else {
-                    notice_lang(s_ChanServ, u, xmsgs[7], ci->name);
-                }
-            } else if (deleted == 1) {
-                notice_lang(s_ChanServ, u, xmsgs[9], ci->name);
-            } else {
-                notice_lang(s_ChanServ, u, xmsgs[10], deleted, ci->name);
-            }
-        } else {
-            na = findnick(nick);
-            if (!na) {
-                notice_lang(s_ChanServ, u, NICK_X_NOT_REGISTERED, nick);
-                return MOD_CONT;
-            }
-            nc = na->nc;
-
-            for (i = 0; i < ci->accesscount; i++)
-                if (ci->access[i].nc == nc && ci->access[i].level == xlev)
-                    break;
-
-            if (i == ci->accesscount) {
-                notice_lang(s_ChanServ, u, xmsgs[6], nick, chan);
-                return MOD_CONT;
-            }
-
-            access = &ci->access[i];
-            if (!is_servadmin && ulev <= access->level) {
-                deleted = 0;
-                notice_lang(s_ChanServ, u, PERMISSION_DENIED);
-            } else {
-                notice_lang(s_ChanServ, u, xmsgs[8], access->nc->display,
-                            ci->name);
-                access->nc = NULL;
-                access->in_use = 0;
-                send_event(EVENT_ACCESS_DEL, 3, ci->name, u->nick,
-                           na->nick);
-                deleted = 1;
-            }
-        }
-        if (deleted) {
-            /* Reordering - DrStein */
-            for (b = 0; b < ci->accesscount; b++) {
-                if (ci->access[b].in_use) {
-                    for (a = 0; a < ci->accesscount; a++) {
-                        if (a > b)
-                            break;
-                        if (!ci->access[a].in_use) {
-                            ci->access[a].in_use = 1;
-                            ci->access[a].level = ci->access[b].level;
-                            ci->access[a].nc = ci->access[b].nc;
-                            ci->access[a].last_seen =
-                                ci->access[b].last_seen;
-                            ci->access[b].nc = NULL;
-                            ci->access[b].in_use = 0;
-                            break;
-                        }
-                    }
-                }
-            }
-
-            /* If the patch provided in bug #706 is applied, this should be placed
-             * before sending the events! */
-            /* After reordering only the entries at the end could still be empty.
-             * We ll free the places no longer in use... */
-            for (i = ci->accesscount - 1; i >= 0; i--) {
-                if (ci->access[i].in_use == 1)
-                    break;
-
-                ci->accesscount--;
-            }
-            ci->access =
-                (ChanAccess *)srealloc(ci->access,sizeof(ChanAccess) * ci->accesscount);
-        }
-    } else if (stricmp(cmd, "LIST") == 0) {
-        int sent_header = 0;
-
-        ulev = get_access(u, ci);
-
-        if (!is_servadmin && ulev < ACCESS_AOP) {
-            notice_lang(s_ChanServ, u, ACCESS_DENIED);
-            return MOD_CONT;
-        }
-
-        if (ci->accesscount == 0) {
-            notice_lang(s_ChanServ, u, xmsgs[11], ci->name);
-            return MOD_CONT;
-        }
-
-        if (nick && strspn(nick, "1234567890,-") == strlen(nick)) {
-            process_numlist(nick, NULL, xop_list_callback, u, ci,
-                            &sent_header, xlev, xmsgs[12]);
-        } else {
-            for (i = 0; i < ci->accesscount; i++) {
-                if (nick && ci->access[i].nc
-                    && !match_wild_nocase(nick, ci->access[i].nc->display))
-                    continue;
-                xop_list(u, i, ci, &sent_header, xlev, xmsgs[12]);
-            }
-        }
-        if (!sent_header)
-            notice_lang(s_ChanServ, u, xmsgs[7], chan);
-    } else if (stricmp(cmd, "CLEAR") == 0) {
-        if (readonly) {
-            notice_lang(s_ChanServ, u, CHAN_ACCESS_DISABLED);
-            return MOD_CONT;
-        }
-
-        if (ci->accesscount == 0) {
-            notice_lang(s_ChanServ, u, CHAN_ACCESS_LIST_EMPTY, chan);
-            return MOD_CONT;
-        }
-
-        if (!is_servadmin && !is_founder(u, ci)) {
-            notice_lang(s_ChanServ, u, PERMISSION_DENIED);
-            return MOD_CONT;
-        }
-
-        for (i = 0; i < ci->accesscount; i++) {
-            if (ci->access[i].in_use && ci->access[i].level == xlev) {
-                ci->access[i].nc = NULL;
-                ci->access[i].in_use = 0;
-            }
-        }
-
-        send_event(EVENT_ACCESS_CLEAR, 2, ci->name, u->nick);
-
-        notice_lang(s_ChanServ, u, xmsgs[13], ci->name);
-    } else {
-        syntax_error(s_ChanServ, u, xname, xmsgs[0]);
-    }
-    return MOD_CONT;
+	char *chan = strtok(NULL, " ");
+	char *cmd = strtok(NULL, " ");
+	char *nick = strtok(NULL, " ");
+	char event_access[BUFSIZE];
+
+	ChannelInfo *ci;
+	NickAlias *na;
+	NickCore *nc;
+
+	int i;
+	int change = 0;
+	short ulev;
+	int is_list = (cmd && stricmp(cmd, "LIST") == 0);
+	int is_servadmin = is_services_admin(u);
+	ChanAccess *access;
+
+	/* If CLEAR, we don't need any parameters.
+	 * If LIST, we don't *require* any parameters, but we can take any.
+	 * If DEL or ADD we require a nick. */
+	if (!cmd || ((is_list || !stricmp(cmd, "CLEAR")) ? 0 : !nick)) {
+		syntax_error(s_ChanServ, u, xname, xmsgs[0]);
+	} else if (!(ci = cs_findchan(chan))) {
+		notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
+	} else if (ci->flags & CI_VERBOTEN) {
+		notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
+	} else if (!(ci->flags & CI_XOP)) {
+		notice_lang(s_ChanServ, u, CHAN_XOP_ACCESS, s_ChanServ);
+	} else if (stricmp(cmd, "ADD") == 0) {
+		if (readonly) {
+			notice_lang(s_ChanServ, u, xmsgs[1]);
+			return MOD_CONT;
+		}
+
+		ulev = get_access(u, ci);
+
+		if ((xlev >= ulev || ulev < ACCESS_AOP) && !is_servadmin) {
+			notice_lang(s_ChanServ, u, PERMISSION_DENIED);
+			return MOD_CONT;
+		}
+
+		na = findnick(nick);
+		if (!na) {
+			notice_lang(s_ChanServ, u, xmsgs[2]);
+			return MOD_CONT;
+		} else if (na->status & NS_VERBOTEN) {
+			notice_lang(s_ChanServ, u, NICK_X_FORBIDDEN, na->nick);
+			return MOD_CONT;
+		}
+
+		nc = na->nc;
+		for (access = ci->access, i = 0; i < ci->accesscount;
+			 access++, i++) {
+			if (access->nc == nc) {
+				/**
+				 * Patch provided by PopCorn to prevert AOP's reducing SOP's levels
+				 **/
+				if ((access->level >= ulev) && (!is_servadmin)) {
+					notice_lang(s_ChanServ, u, PERMISSION_DENIED);
+					return MOD_CONT;
+				}
+				change++;
+				break;
+			}
+		}
+
+		if (!change) {
+			/* All entries should be in use so we no longer need
+			 * to go over the entire list..
+			for (i = 0; i < ci->accesscount; i++)
+				if (!ci->access[i].in_use)
+					break;
+			 */
+
+			if (i < CSAccessMax) {
+				ci->accesscount++;
+				ci->access =
+					(ChanAccess *)srealloc(ci->access,
+							 sizeof(ChanAccess) * ci->accesscount);
+			} else {
+				notice_lang(s_ChanServ, u, CHAN_XOP_REACHED_LIMIT,
+							CSAccessMax);
+				return MOD_CONT;
+			}
+
+			access = &ci->access[i];
+			access->nc = nc;
+		}
+
+		access->in_use = 1;
+		access->level = xlev;
+		access->last_seen = 0;
+
+		alog("%s: %s!%s@%s (level %d) %s access level %d to %s (group %s) on channel %s", s_ChanServ, u->nick, u->username, u->host, ulev, change ? "changed" : "set", access->level, na->nick, nc->display, ci->name);
+
+		snprintf(event_access, BUFSIZE, "%d", access->level);
+
+		if (!change) {
+			send_event(EVENT_ACCESS_ADD, 4, ci->name, u->nick, na->nick,
+					   event_access);
+			notice_lang(s_ChanServ, u, xmsgs[3], access->nc->display,
+						ci->name);
+		} else {
+			send_event(EVENT_ACCESS_CHANGE, 4, ci->name, u->nick, na->nick,
+					   event_access);
+			notice_lang(s_ChanServ, u, xmsgs[4], access->nc->display,
+						ci->name);
+		}
+
+	} else if (stricmp(cmd, "DEL") == 0) {
+		int deleted, a, b;
+		if (readonly) {
+			notice_lang(s_ChanServ, u, xmsgs[1]);
+			return MOD_CONT;
+		}
+
+		if (ci->accesscount == 0) {
+			notice_lang(s_ChanServ, u, xmsgs[11], chan);
+			return MOD_CONT;
+		}
+
+		ulev = get_access(u, ci);
+
+		if ((xlev >= ulev || ulev < ACCESS_AOP) && !is_servadmin) {
+			notice_lang(s_ChanServ, u, PERMISSION_DENIED);
+			return MOD_CONT;
+		}
+
+		/* Special case: is it a number/list?  Only do search if it isn't. */
+		if (isdigit(*nick) && strspn(nick, "1234567890,-") == strlen(nick)) {
+			int count, last = -1, perm = 0;
+			deleted =
+				process_numlist(nick, &count, xop_del_callback, u, ci,
+								&last, &perm, ulev, xlev);
+			if (!deleted) {
+				if (perm) {
+					notice_lang(s_ChanServ, u, PERMISSION_DENIED);
+				} else if (count == 1) {
+					notice_lang(s_ChanServ, u, xmsgs[5], last, ci->name);
+				} else {
+					notice_lang(s_ChanServ, u, xmsgs[7], ci->name);
+				}
+			} else if (deleted == 1) {
+				notice_lang(s_ChanServ, u, xmsgs[9], ci->name);
+			} else {
+				notice_lang(s_ChanServ, u, xmsgs[10], deleted, ci->name);
+			}
+		} else {
+			na = findnick(nick);
+			if (!na) {
+				notice_lang(s_ChanServ, u, NICK_X_NOT_REGISTERED, nick);
+				return MOD_CONT;
+			}
+			nc = na->nc;
+
+			for (i = 0; i < ci->accesscount; i++)
+				if (ci->access[i].nc == nc && ci->access[i].level == xlev)
+					break;
+
+			if (i == ci->accesscount) {
+				notice_lang(s_ChanServ, u, xmsgs[6], nick, chan);
+				return MOD_CONT;
+			}
+
+			access = &ci->access[i];
+			if (!is_servadmin && ulev <= access->level) {
+				deleted = 0;
+				notice_lang(s_ChanServ, u, PERMISSION_DENIED);
+			} else {
+				notice_lang(s_ChanServ, u, xmsgs[8], access->nc->display,
+							ci->name);
+				access->nc = NULL;
+				access->in_use = 0;
+				send_event(EVENT_ACCESS_DEL, 3, ci->name, u->nick,
+						   na->nick);
+				deleted = 1;
+			}
+		}
+		if (deleted) {
+			/* Reordering - DrStein */
+			for (b = 0; b < ci->accesscount; b++) {
+				if (ci->access[b].in_use) {
+					for (a = 0; a < ci->accesscount; a++) {
+						if (a > b)
+							break;
+						if (!ci->access[a].in_use) {
+							ci->access[a].in_use = 1;
+							ci->access[a].level = ci->access[b].level;
+							ci->access[a].nc = ci->access[b].nc;
+							ci->access[a].last_seen =
+								ci->access[b].last_seen;
+							ci->access[b].nc = NULL;
+							ci->access[b].in_use = 0;
+							break;
+						}
+					}
+				}
+			}
+
+			/* If the patch provided in bug #706 is applied, this should be placed
+			 * before sending the events! */
+			/* After reordering only the entries at the end could still be empty.
+			 * We ll free the places no longer in use... */
+			for (i = ci->accesscount - 1; i >= 0; i--) {
+				if (ci->access[i].in_use == 1)
+					break;
+
+				ci->accesscount--;
+			}
+			ci->access =
+				(ChanAccess *)srealloc(ci->access,sizeof(ChanAccess) * ci->accesscount);
+		}
+	} else if (stricmp(cmd, "LIST") == 0) {
+		int sent_header = 0;
+
+		ulev = get_access(u, ci);
+
+		if (!is_servadmin && ulev < ACCESS_AOP) {
+			notice_lang(s_ChanServ, u, ACCESS_DENIED);
+			return MOD_CONT;
+		}
+
+		if (ci->accesscount == 0) {
+			notice_lang(s_ChanServ, u, xmsgs[11], ci->name);
+			return MOD_CONT;
+		}
+
+		if (nick && strspn(nick, "1234567890,-") == strlen(nick)) {
+			process_numlist(nick, NULL, xop_list_callback, u, ci,
+							&sent_header, xlev, xmsgs[12]);
+		} else {
+			for (i = 0; i < ci->accesscount; i++) {
+				if (nick && ci->access[i].nc
+					&& !match_wild_nocase(nick, ci->access[i].nc->display))
+					continue;
+				xop_list(u, i, ci, &sent_header, xlev, xmsgs[12]);
+			}
+		}
+		if (!sent_header)
+			notice_lang(s_ChanServ, u, xmsgs[7], chan);
+	} else if (stricmp(cmd, "CLEAR") == 0) {
+		if (readonly) {
+			notice_lang(s_ChanServ, u, CHAN_ACCESS_DISABLED);
+			return MOD_CONT;
+		}
+
+		if (ci->accesscount == 0) {
+			notice_lang(s_ChanServ, u, CHAN_ACCESS_LIST_EMPTY, chan);
+			return MOD_CONT;
+		}
+
+		if (!is_servadmin && !is_founder(u, ci)) {
+			notice_lang(s_ChanServ, u, PERMISSION_DENIED);
+			return MOD_CONT;
+		}
+
+		for (i = 0; i < ci->accesscount; i++) {
+			if (ci->access[i].in_use && ci->access[i].level == xlev) {
+				ci->access[i].nc = NULL;
+				ci->access[i].in_use = 0;
+			}
+		}
+
+		send_event(EVENT_ACCESS_CLEAR, 2, ci->name, u->nick);
+
+		notice_lang(s_ChanServ, u, xmsgs[13], ci->name);
+	} else {
+		syntax_error(s_ChanServ, u, xname, xmsgs[0]);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("cs_xop", CSXOP)
diff --git a/src/core/enc_md5.c b/src/core/enc_md5.c
index d3f304487..015b4af2e 100644
--- a/src/core/enc_md5.c
+++ b/src/core/enc_md5.c
@@ -5,7 +5,7 @@
  * Contact us at dev@anope.org
  *
  * Taken from IRC Services and is copyright (c) 1996-2002 Andrew Church.
- *     E-mail: <achurch@achurch.org>
+ *	 E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
  * details.
@@ -44,9 +44,9 @@ typedef unsigned int UINT4;
 
 /* MD5 context. */
 typedef struct {
-  UINT4 state[4];                                   /* state (ABCD) */
-  UINT4 count[2];        /* number of bits, modulo 2^64 (lsb first) */
-  unsigned char buffer[64];                         /* input buffer */
+  UINT4 state[4];								   /* state (ABCD) */
+  UINT4 count[2];		/* number of bits, modulo 2^64 (lsb first) */
+  unsigned char buffer[64];						 /* input buffer */
 } MD5_CTX;
 
 /* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
@@ -323,60 +323,60 @@ void Decode (UINT4 *output, unsigned char *input, unsigned int len)
 
 int md5_encrypt(const char *src, int len, char *dest, int size)
 {
-    MD5_CTX context;
-    char tmp[33];
+	MD5_CTX context;
+	char tmp[33];
 
-    if (size < 16)
+	if (size < 16)
 	return -1;
 
-    MD5Init(&context);
-    MD5Update(&context, (unsigned char *)src, len);
-    MD5Final((unsigned char *)dest, &context);
-    
-    if(debug) {
-        memset(tmp,0,33);
-        binary_to_hex((unsigned char *)dest,tmp,16);
+	MD5Init(&context);
+	MD5Update(&context, (unsigned char *)src, len);
+	MD5Final((unsigned char *)dest, &context);
+	
+	if(debug) {
+		memset(tmp,0,33);
+		binary_to_hex((unsigned char *)dest,tmp,16);
 	/* Dont log source if we were encrypting in place :) */
-        if (memcmp(src, dest, 16) != 0) {
-            alog("enc_md5: hashed from [%s] to [%s]",src,tmp); 
+		if (memcmp(src, dest, 16) != 0) {
+			alog("enc_md5: hashed from [%s] to [%s]",src,tmp); 
 	} else {
-            alog("enc_md5: hashed password to [%s]",tmp); 
+			alog("enc_md5: hashed password to [%s]",tmp); 
 	}
-    }
-    
-    return 0;
+	}
+	
+	return 0;
 }
 
 
 int md5_encrypt_in_place(char *buf, int size)
 {
-    return md5_encrypt(buf, strlen(buf), buf, size);
+	return md5_encrypt(buf, strlen(buf), buf, size);
 }
 
 
 int md5_encrypt_check_len(int passlen, int bufsize)
 {
-    if (bufsize < 16)
+	if (bufsize < 16)
 	fatal("enc_md5: md5_check_len(): buffer too small (%d)", bufsize);
-    return 0;
+	return 0;
 }
 
 
 int md5_decrypt(const char *src, char *dest, int size)
 {
-    return 0;
+	return 0;
 }
 
 
 int md5_check_password(const char *plaintext, const char *password)
 {
-    char buf[BUFSIZE];
+	char buf[BUFSIZE];
 
-    if (md5_encrypt(plaintext, strlen(plaintext), buf, sizeof(buf)) < 0)
+	if (md5_encrypt(plaintext, strlen(plaintext), buf, sizeof(buf)) < 0)
 	return -1;
-    if (memcmp(buf, password, 16) == 0)
+	if (memcmp(buf, password, 16) == 0)
 	return 1;
-    return 0;
+	return 0;
 }
 
 /*************************************************************************/
diff --git a/src/core/enc_none.c b/src/core/enc_none.c
index 16a4a812b..f58ca15e3 100644
--- a/src/core/enc_none.c
+++ b/src/core/enc_none.c
@@ -42,38 +42,38 @@ class ENone : public Module
 };
 
 int plain_encrypt(const char *src,int len,char *dest,int size) {
-    if(size>=len) {
-        memset(dest,0,size);
-        strncpy(dest,src,len);
-        dest[len] = '\0';
-        return 0;
-    }
-    return -1;
+	if(size>=len) {
+		memset(dest,0,size);
+		strncpy(dest,src,len);
+		dest[len] = '\0';
+		return 0;
+	}
+	return -1;
 }
 
 int plain_encrypt_in_place(char *buf, int size) {
-    return 0;
+	return 0;
 }
 
 int plain_encrypt_check_len(int passlen, int bufsize) {
-    if(bufsize>=passlen) {
-        return 0;
-    }
-    return bufsize;
+	if(bufsize>=passlen) {
+		return 0;
+	}
+	return bufsize;
 }
 
 int plain_decrypt(const char *src, char *dest, int size) {
-    memset(dest,0,size);
-    strncpy(dest,src,size);
-    dest[size] = '\0';
-    return 1;
+	memset(dest,0,size);
+	strncpy(dest,src,size);
+	dest[size] = '\0';
+	return 1;
 }
 
 int plain_check_password(const char *plaintext, const char *password) {
-    if(strcmp(plaintext,password)==0) {
-        return 1;
-    }
-    return 0;
+	if(strcmp(plaintext,password)==0) {
+		return 1;
+	}
+	return 0;
 }
 
 /* EOF */
diff --git a/src/core/enc_old.c b/src/core/enc_old.c
index 2fe9ac2d5..befcd105b 100644
--- a/src/core/enc_old.c
+++ b/src/core/enc_old.c
@@ -16,16 +16,16 @@
 
 void binary_to_hex(unsigned char *bin, char *hex, int length)
 {
-    static const char trans[] = "0123456789ABCDEF";
-    int i;
+	static const char trans[] = "0123456789ABCDEF";
+	int i;
 
-    for(i = 0; i < length; i++)
-    {
-        hex[i  << 1]      = trans[bin[i] >> 4];
-        hex[(i << 1) + 1] = trans[bin[i] & 0xf];
-    }
+	for(i = 0; i < length; i++)
+	{
+		hex[i  << 1]	  = trans[bin[i] >> 4];
+		hex[(i << 1) + 1] = trans[bin[i] & 0xf];
+	}
 
-    hex[i << 1] = '\0';
+	hex[i << 1] = '\0';
 }
 
 
@@ -62,9 +62,9 @@ typedef unsigned int UINT4;
 
 /* MD5 context. */
 typedef struct {
-    UINT4 state[4];             /* state (ABCD) */
-    UINT4 count[2];             /* number of bits, modulo 2^64 (lsb first) */
-    unsigned char buffer[64];   /* input buffer */
+	UINT4 state[4];			 /* state (ABCD) */
+	UINT4 count[2];			 /* number of bits, modulo 2^64 (lsb first) */
+	unsigned char buffer[64];   /* input buffer */
 } MD5_CTX;
 
 /* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
@@ -96,9 +96,9 @@ static void Encode(unsigned char *, UINT4 *, unsigned int);
 static void Decode(UINT4 *, unsigned char *, unsigned int);
 
 static unsigned char PADDING[64] = {
-    0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
 /* F, G, H and I are basic MD5 functions.
@@ -140,13 +140,13 @@ Rotation is separate from addition to prevent recomputation.
  */
 static void MD5Init(MD5_CTX *context)
 {
-    context->count[0] = context->count[1] = 0;
-    /* Load magic initialization constants.
-     */
-    context->state[0] = 0x67452301;
-    context->state[1] = 0xefcdab89;
-    context->state[2] = 0x98badcfe;
-    context->state[3] = 0x10325476;
+	context->count[0] = context->count[1] = 0;
+	/* Load magic initialization constants.
+	 */
+	context->state[0] = 0x67452301;
+	context->state[1] = 0xefcdab89;
+	context->state[2] = 0x98badcfe;
+	context->state[3] = 0x10325476;
 }
 
 /* MD5 block update operation. Continues an MD5 message-digest
@@ -155,37 +155,37 @@ static void MD5Init(MD5_CTX *context)
  */
 static void MD5Update(MD5_CTX *context, unsigned char *input, unsigned int inputLen)
 {
-    unsigned int i, index, partLen;
+	unsigned int i, index, partLen;
 
-    /* Compute number of bytes mod 64 */
-    index = (unsigned int) ((context->count[0] >> 3) & 0x3F);
+	/* Compute number of bytes mod 64 */
+	index = (unsigned int) ((context->count[0] >> 3) & 0x3F);
 
-    /* Update number of bits */
-    if ((context->count[0] += ((UINT4) inputLen << 3))
-        < ((UINT4) inputLen << 3))
-        context->count[1]++;
-    context->count[1] += ((UINT4) inputLen >> 29);
+	/* Update number of bits */
+	if ((context->count[0] += ((UINT4) inputLen << 3))
+		< ((UINT4) inputLen << 3))
+		context->count[1]++;
+	context->count[1] += ((UINT4) inputLen >> 29);
 
-    partLen = 64 - index;
+	partLen = 64 - index;
 
-    /* Transform as many times as possible.
-     */
-    if (inputLen >= partLen) {
-        memcpy
-            ((POINTER) & context->buffer[index], (POINTER) input, partLen);
-        MD5Transform(context->state, context->buffer);
+	/* Transform as many times as possible.
+	 */
+	if (inputLen >= partLen) {
+		memcpy
+			((POINTER) & context->buffer[index], (POINTER) input, partLen);
+		MD5Transform(context->state, context->buffer);
 
-        for (i = partLen; i + 63 < inputLen; i += 64)
-            MD5Transform(context->state, &input[i]);
+		for (i = partLen; i + 63 < inputLen; i += 64)
+			MD5Transform(context->state, &input[i]);
 
-        index = 0;
-    } else
-        i = 0;
+		index = 0;
+	} else
+		i = 0;
 
-    /* Buffer remaining input */
-    memcpy
-        ((POINTER) & context->buffer[index], (POINTER) & input[i],
-         inputLen - i);
+	/* Buffer remaining input */
+	memcpy
+		((POINTER) & context->buffer[index], (POINTER) & input[i],
+		 inputLen - i);
 }
 
 /* MD5 finalization. Ends an MD5 message-digest operation, writing the
@@ -193,116 +193,116 @@ static void MD5Update(MD5_CTX *context, unsigned char *input, unsigned int input
  */
 static void MD5Final(unsigned char digest[16], MD5_CTX *context)
 {
-    unsigned char bits[8];
-    unsigned int index, padLen;
-
-    /* Save number of bits */
-    Encode(bits, context->count, 8);
-
-    /* Pad out to 56 mod 64.
-     */
-    index = (unsigned int) ((context->count[0] >> 3) & 0x3f);
-    padLen = (index < 56) ? (56 - index) : (120 - index);
-    MD5Update(context, PADDING, padLen);
-
-    /* Append length (before padding) */
-    MD5Update(context, bits, 8);
-    /* Store state in digest */
-    Encode(digest, context->state, 16);
-
-    /* Zeroize sensitive information.
-     */
-    memset((POINTER) context, 0, sizeof(*context));
+	unsigned char bits[8];
+	unsigned int index, padLen;
+
+	/* Save number of bits */
+	Encode(bits, context->count, 8);
+
+	/* Pad out to 56 mod 64.
+	 */
+	index = (unsigned int) ((context->count[0] >> 3) & 0x3f);
+	padLen = (index < 56) ? (56 - index) : (120 - index);
+	MD5Update(context, PADDING, padLen);
+
+	/* Append length (before padding) */
+	MD5Update(context, bits, 8);
+	/* Store state in digest */
+	Encode(digest, context->state, 16);
+
+	/* Zeroize sensitive information.
+	 */
+	memset((POINTER) context, 0, sizeof(*context));
 }
 
 /* MD5 basic transformation. Transforms state based on block.
  */
 static void MD5Transform(UINT4 state[4], unsigned char block[64])
 {
-    UINT4 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
-
-    Decode(x, block, 64);
-
-    /* Round 1 */
-    FF(a, b, c, d, x[0], S11, 0xd76aa478);      /* 1 */
-    FF(d, a, b, c, x[1], S12, 0xe8c7b756);      /* 2 */
-    FF(c, d, a, b, x[2], S13, 0x242070db);      /* 3 */
-    FF(b, c, d, a, x[3], S14, 0xc1bdceee);      /* 4 */
-    FF(a, b, c, d, x[4], S11, 0xf57c0faf);      /* 5 */
-    FF(d, a, b, c, x[5], S12, 0x4787c62a);      /* 6 */
-    FF(c, d, a, b, x[6], S13, 0xa8304613);      /* 7 */
-    FF(b, c, d, a, x[7], S14, 0xfd469501);      /* 8 */
-    FF(a, b, c, d, x[8], S11, 0x698098d8);      /* 9 */
-    FF(d, a, b, c, x[9], S12, 0x8b44f7af);      /* 10 */
-    FF(c, d, a, b, x[10], S13, 0xffff5bb1);     /* 11 */
-    FF(b, c, d, a, x[11], S14, 0x895cd7be);     /* 12 */
-    FF(a, b, c, d, x[12], S11, 0x6b901122);     /* 13 */
-    FF(d, a, b, c, x[13], S12, 0xfd987193);     /* 14 */
-    FF(c, d, a, b, x[14], S13, 0xa679438e);     /* 15 */
-    FF(b, c, d, a, x[15], S14, 0x49b40821);     /* 16 */
-
-    /* Round 2 */
-    GG(a, b, c, d, x[1], S21, 0xf61e2562);      /* 17 */
-    GG(d, a, b, c, x[6], S22, 0xc040b340);      /* 18 */
-    GG(c, d, a, b, x[11], S23, 0x265e5a51);     /* 19 */
-    GG(b, c, d, a, x[0], S24, 0xe9b6c7aa);      /* 20 */
-    GG(a, b, c, d, x[5], S21, 0xd62f105d);      /* 21 */
-    GG(d, a, b, c, x[10], S22, 0x2441453);      /* 22 */
-    GG(c, d, a, b, x[15], S23, 0xd8a1e681);     /* 23 */
-    GG(b, c, d, a, x[4], S24, 0xe7d3fbc8);      /* 24 */
-    GG(a, b, c, d, x[9], S21, 0x21e1cde6);      /* 25 */
-    GG(d, a, b, c, x[14], S22, 0xc33707d6);     /* 26 */
-    GG(c, d, a, b, x[3], S23, 0xf4d50d87);      /* 27 */
-    GG(b, c, d, a, x[8], S24, 0x455a14ed);      /* 28 */
-    GG(a, b, c, d, x[13], S21, 0xa9e3e905);     /* 29 */
-    GG(d, a, b, c, x[2], S22, 0xfcefa3f8);      /* 30 */
-    GG(c, d, a, b, x[7], S23, 0x676f02d9);      /* 31 */
-    GG(b, c, d, a, x[12], S24, 0x8d2a4c8a);     /* 32 */
-
-    /* Round 3 */
-    HH(a, b, c, d, x[5], S31, 0xfffa3942);      /* 33 */
-    HH(d, a, b, c, x[8], S32, 0x8771f681);      /* 34 */
-    HH(c, d, a, b, x[11], S33, 0x6d9d6122);     /* 35 */
-    HH(b, c, d, a, x[14], S34, 0xfde5380c);     /* 36 */
-    HH(a, b, c, d, x[1], S31, 0xa4beea44);      /* 37 */
-    HH(d, a, b, c, x[4], S32, 0x4bdecfa9);      /* 38 */
-    HH(c, d, a, b, x[7], S33, 0xf6bb4b60);      /* 39 */
-    HH(b, c, d, a, x[10], S34, 0xbebfbc70);     /* 40 */
-    HH(a, b, c, d, x[13], S31, 0x289b7ec6);     /* 41 */
-    HH(d, a, b, c, x[0], S32, 0xeaa127fa);      /* 42 */
-    HH(c, d, a, b, x[3], S33, 0xd4ef3085);      /* 43 */
-    HH(b, c, d, a, x[6], S34, 0x4881d05);       /* 44 */
-    HH(a, b, c, d, x[9], S31, 0xd9d4d039);      /* 45 */
-    HH(d, a, b, c, x[12], S32, 0xe6db99e5);     /* 46 */
-    HH(c, d, a, b, x[15], S33, 0x1fa27cf8);     /* 47 */
-    HH(b, c, d, a, x[2], S34, 0xc4ac5665);      /* 48 */
-
-    /* Round 4 */
-    II(a, b, c, d, x[0], S41, 0xf4292244);      /* 49 */
-    II(d, a, b, c, x[7], S42, 0x432aff97);      /* 50 */
-    II(c, d, a, b, x[14], S43, 0xab9423a7);     /* 51 */
-    II(b, c, d, a, x[5], S44, 0xfc93a039);      /* 52 */
-    II(a, b, c, d, x[12], S41, 0x655b59c3);     /* 53 */
-    II(d, a, b, c, x[3], S42, 0x8f0ccc92);      /* 54 */
-    II(c, d, a, b, x[10], S43, 0xffeff47d);     /* 55 */
-    II(b, c, d, a, x[1], S44, 0x85845dd1);      /* 56 */
-    II(a, b, c, d, x[8], S41, 0x6fa87e4f);      /* 57 */
-    II(d, a, b, c, x[15], S42, 0xfe2ce6e0);     /* 58 */
-    II(c, d, a, b, x[6], S43, 0xa3014314);      /* 59 */
-    II(b, c, d, a, x[13], S44, 0x4e0811a1);     /* 60 */
-    II(a, b, c, d, x[4], S41, 0xf7537e82);      /* 61 */
-    II(d, a, b, c, x[11], S42, 0xbd3af235);     /* 62 */
-    II(c, d, a, b, x[2], S43, 0x2ad7d2bb);      /* 63 */
-    II(b, c, d, a, x[9], S44, 0xeb86d391);      /* 64 */
-
-    state[0] += a;
-    state[1] += b;
-    state[2] += c;
-    state[3] += d;
-
-    /* Zeroize sensitive information.
-     */
-    memset((POINTER) x, 0, sizeof(x));
+	UINT4 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
+
+	Decode(x, block, 64);
+
+	/* Round 1 */
+	FF(a, b, c, d, x[0], S11, 0xd76aa478);	  /* 1 */
+	FF(d, a, b, c, x[1], S12, 0xe8c7b756);	  /* 2 */
+	FF(c, d, a, b, x[2], S13, 0x242070db);	  /* 3 */
+	FF(b, c, d, a, x[3], S14, 0xc1bdceee);	  /* 4 */
+	FF(a, b, c, d, x[4], S11, 0xf57c0faf);	  /* 5 */
+	FF(d, a, b, c, x[5], S12, 0x4787c62a);	  /* 6 */
+	FF(c, d, a, b, x[6], S13, 0xa8304613);	  /* 7 */
+	FF(b, c, d, a, x[7], S14, 0xfd469501);	  /* 8 */
+	FF(a, b, c, d, x[8], S11, 0x698098d8);	  /* 9 */
+	FF(d, a, b, c, x[9], S12, 0x8b44f7af);	  /* 10 */
+	FF(c, d, a, b, x[10], S13, 0xffff5bb1);	 /* 11 */
+	FF(b, c, d, a, x[11], S14, 0x895cd7be);	 /* 12 */
+	FF(a, b, c, d, x[12], S11, 0x6b901122);	 /* 13 */
+	FF(d, a, b, c, x[13], S12, 0xfd987193);	 /* 14 */
+	FF(c, d, a, b, x[14], S13, 0xa679438e);	 /* 15 */
+	FF(b, c, d, a, x[15], S14, 0x49b40821);	 /* 16 */
+
+	/* Round 2 */
+	GG(a, b, c, d, x[1], S21, 0xf61e2562);	  /* 17 */
+	GG(d, a, b, c, x[6], S22, 0xc040b340);	  /* 18 */
+	GG(c, d, a, b, x[11], S23, 0x265e5a51);	 /* 19 */
+	GG(b, c, d, a, x[0], S24, 0xe9b6c7aa);	  /* 20 */
+	GG(a, b, c, d, x[5], S21, 0xd62f105d);	  /* 21 */
+	GG(d, a, b, c, x[10], S22, 0x2441453);	  /* 22 */
+	GG(c, d, a, b, x[15], S23, 0xd8a1e681);	 /* 23 */
+	GG(b, c, d, a, x[4], S24, 0xe7d3fbc8);	  /* 24 */
+	GG(a, b, c, d, x[9], S21, 0x21e1cde6);	  /* 25 */
+	GG(d, a, b, c, x[14], S22, 0xc33707d6);	 /* 26 */
+	GG(c, d, a, b, x[3], S23, 0xf4d50d87);	  /* 27 */
+	GG(b, c, d, a, x[8], S24, 0x455a14ed);	  /* 28 */
+	GG(a, b, c, d, x[13], S21, 0xa9e3e905);	 /* 29 */
+	GG(d, a, b, c, x[2], S22, 0xfcefa3f8);	  /* 30 */
+	GG(c, d, a, b, x[7], S23, 0x676f02d9);	  /* 31 */
+	GG(b, c, d, a, x[12], S24, 0x8d2a4c8a);	 /* 32 */
+
+	/* Round 3 */
+	HH(a, b, c, d, x[5], S31, 0xfffa3942);	  /* 33 */
+	HH(d, a, b, c, x[8], S32, 0x8771f681);	  /* 34 */
+	HH(c, d, a, b, x[11], S33, 0x6d9d6122);	 /* 35 */
+	HH(b, c, d, a, x[14], S34, 0xfde5380c);	 /* 36 */
+	HH(a, b, c, d, x[1], S31, 0xa4beea44);	  /* 37 */
+	HH(d, a, b, c, x[4], S32, 0x4bdecfa9);	  /* 38 */
+	HH(c, d, a, b, x[7], S33, 0xf6bb4b60);	  /* 39 */
+	HH(b, c, d, a, x[10], S34, 0xbebfbc70);	 /* 40 */
+	HH(a, b, c, d, x[13], S31, 0x289b7ec6);	 /* 41 */
+	HH(d, a, b, c, x[0], S32, 0xeaa127fa);	  /* 42 */
+	HH(c, d, a, b, x[3], S33, 0xd4ef3085);	  /* 43 */
+	HH(b, c, d, a, x[6], S34, 0x4881d05);	   /* 44 */
+	HH(a, b, c, d, x[9], S31, 0xd9d4d039);	  /* 45 */
+	HH(d, a, b, c, x[12], S32, 0xe6db99e5);	 /* 46 */
+	HH(c, d, a, b, x[15], S33, 0x1fa27cf8);	 /* 47 */
+	HH(b, c, d, a, x[2], S34, 0xc4ac5665);	  /* 48 */
+
+	/* Round 4 */
+	II(a, b, c, d, x[0], S41, 0xf4292244);	  /* 49 */
+	II(d, a, b, c, x[7], S42, 0x432aff97);	  /* 50 */
+	II(c, d, a, b, x[14], S43, 0xab9423a7);	 /* 51 */
+	II(b, c, d, a, x[5], S44, 0xfc93a039);	  /* 52 */
+	II(a, b, c, d, x[12], S41, 0x655b59c3);	 /* 53 */
+	II(d, a, b, c, x[3], S42, 0x8f0ccc92);	  /* 54 */
+	II(c, d, a, b, x[10], S43, 0xffeff47d);	 /* 55 */
+	II(b, c, d, a, x[1], S44, 0x85845dd1);	  /* 56 */
+	II(a, b, c, d, x[8], S41, 0x6fa87e4f);	  /* 57 */
+	II(d, a, b, c, x[15], S42, 0xfe2ce6e0);	 /* 58 */
+	II(c, d, a, b, x[6], S43, 0xa3014314);	  /* 59 */
+	II(b, c, d, a, x[13], S44, 0x4e0811a1);	 /* 60 */
+	II(a, b, c, d, x[4], S41, 0xf7537e82);	  /* 61 */
+	II(d, a, b, c, x[11], S42, 0xbd3af235);	 /* 62 */
+	II(c, d, a, b, x[2], S43, 0x2ad7d2bb);	  /* 63 */
+	II(b, c, d, a, x[9], S44, 0xeb86d391);	  /* 64 */
+
+	state[0] += a;
+	state[1] += b;
+	state[2] += c;
+	state[3] += d;
+
+	/* Zeroize sensitive information.
+	 */
+	memset((POINTER) x, 0, sizeof(x));
 }
 
 /* Encodes input (UINT4) into output (unsigned char). Assumes len is
@@ -310,14 +310,14 @@ static void MD5Transform(UINT4 state[4], unsigned char block[64])
  */
 static void Encode(unsigned char *output, UINT4 *input, unsigned int len)
 {
-    unsigned int i, j;
-
-    for (i = 0, j = 0; j < len; i++, j += 4) {
-        output[j] = (unsigned char) (input[i] & 0xff);
-        output[j + 1] = (unsigned char) ((input[i] >> 8) & 0xff);
-        output[j + 2] = (unsigned char) ((input[i] >> 16) & 0xff);
-        output[j + 3] = (unsigned char) ((input[i] >> 24) & 0xff);
-    }
+	unsigned int i, j;
+
+	for (i = 0, j = 0; j < len; i++, j += 4) {
+		output[j] = (unsigned char) (input[i] & 0xff);
+		output[j + 1] = (unsigned char) ((input[i] >> 8) & 0xff);
+		output[j + 2] = (unsigned char) ((input[i] >> 16) & 0xff);
+		output[j + 3] = (unsigned char) ((input[i] >> 24) & 0xff);
+	}
 }
 
 /* Decodes input (unsigned char) into output (UINT4). Assumes len is
@@ -325,12 +325,12 @@ static void Encode(unsigned char *output, UINT4 *input, unsigned int len)
  */
 static void Decode(UINT4 *output, unsigned char *input, unsigned int len)
 {
-    unsigned int i, j;
+	unsigned int i, j;
 
-    for (i = 0, j = 0; j < len; i++, j += 4)
-        output[i] = ((UINT4) input[j]) | (((UINT4) input[j + 1]) << 8) |
-            (((UINT4) input[j + 2]) << 16) | (((UINT4) input[j + 3]) <<
-                                              24);
+	for (i = 0, j = 0; j < len; i++, j += 4)
+		output[i] = ((UINT4) input[j]) | (((UINT4) input[j + 1]) << 8) |
+			(((UINT4) input[j + 2]) << 16) | (((UINT4) input[j + 3]) <<
+											  24);
 }
 
 /*************************************************************************/
@@ -348,30 +348,30 @@ static void Decode(UINT4 *output, unsigned char *input, unsigned int len)
 int old_encrypt(const char *src, int len, char *dest, int size)
 {
 
-    MD5_CTX context;
-    char digest[33];
-    char tmp[33];
-    int i;
+	MD5_CTX context;
+	char digest[33];
+	char tmp[33];
+	int i;
 
-    if (size < 16)
-        return -1;
+	if (size < 16)
+		return -1;
 
-    memset(&context, 0, sizeof(context));
-    memset(&digest, 0, sizeof(digest));
+	memset(&context, 0, sizeof(context));
+	memset(&digest, 0, sizeof(digest));
 
-    MD5Init(&context);
-    MD5Update(&context, (unsigned char *)src, len);
-    MD5Final((unsigned char *)digest, &context);
-    for (i = 0; i < 32; i += 2)
-        dest[i / 2] = XTOI(digest[i]) << 4 | XTOI(digest[i + 1]);
+	MD5Init(&context);
+	MD5Update(&context, (unsigned char *)src, len);
+	MD5Final((unsigned char *)digest, &context);
+	for (i = 0; i < 32; i += 2)
+		dest[i / 2] = XTOI(digest[i]) << 4 | XTOI(digest[i + 1]);
 
-    if(debug) {
-        memset(tmp,0,33);
-        binary_to_hex((unsigned char *)dest,tmp,16);
-        alog("enc_old: Converted [%s] to [%s]",src,tmp); 
-    }
+	if(debug) {
+		memset(tmp,0,33);
+		binary_to_hex((unsigned char *)dest,tmp,16);
+		alog("enc_old: Converted [%s] to [%s]",src,tmp); 
+	}
 
-    return 0;
+	return 0;
 
 }
 
@@ -379,14 +379,14 @@ int old_encrypt(const char *src, int len, char *dest, int size)
 /* Shortcut for encrypting a null-terminated string in place. */
 int old_encrypt_in_place(char *buf, int size)
 {
-    return old_encrypt(buf, strlen(buf), buf, size);
+	return old_encrypt(buf, strlen(buf), buf, size);
 }
 
 int old_encrypt_check_len(int passlen, int bufsize)
 {
-    if (bufsize < 16)
-        fatal("enc_old: old_check_len(): buffer too small (%d)", bufsize);
-    return 0;
+	if (bufsize < 16)
+		fatal("enc_old: old_check_len(): buffer too small (%d)", bufsize);
+	return 0;
 }
 
 
@@ -395,19 +395,19 @@ int old_encrypt_check_len(int passlen, int bufsize)
 
 int old_check_password(const char *plaintext, const char *password)
 {
-    char buf[BUFSIZE];
-
-    if (old_encrypt(plaintext, strlen(plaintext), buf, sizeof(buf)) < 0)
-        return -1;
-    if (memcmp(buf, password, 16) == 0)
-        return 1;
-    else
-        return 0;
+	char buf[BUFSIZE];
+
+	if (old_encrypt(plaintext, strlen(plaintext), buf, sizeof(buf)) < 0)
+		return -1;
+	if (memcmp(buf, password, 16) == 0)
+		return 1;
+	else
+		return 0;
 }
 
 int old_decrypt(const char *src, char *dest, int size)
 {
-    return 0;
+	return 0;
 }
 
 class EOld : public Module
diff --git a/src/core/enc_sha1.c b/src/core/enc_sha1.c
index 1c35519fa..675a3f1b6 100644
--- a/src/core/enc_sha1.c
+++ b/src/core/enc_sha1.c
@@ -20,9 +20,9 @@ A million repetitions of "a"
 #include <string.h>
 
 typedef struct {
-    uint32 state[5];
-    uint32 count[2];
-    unsigned char buffer[64];
+	uint32 state[5];
+	uint32 count[2];
+	unsigned char buffer[64];
 } SHA1_CTX;
 
 void SHA1Transform(uint32 state[5], unsigned char const buffer[64]);
@@ -36,12 +36,12 @@ void SHA1Final(unsigned char digest[20], SHA1_CTX* context);
 /* I got the idea of expanding during the round function from SSLeay */
 #ifdef LITTLE_ENDIAN
 #define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
-    |(rol(block->l[i],8)&0x00FF00FF))
+	|(rol(block->l[i],8)&0x00FF00FF))
 #else
 #define blk0(i) block->l[i]
 #endif
 #define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
-    ^block->l[(i+2)&15]^block->l[i&15],1))
+	^block->l[(i+2)&15]^block->l[i&15],1))
 
 /* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
 #define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
@@ -57,52 +57,52 @@ void SHA1Transform(uint32 state[5], unsigned char const buffer[64])
 {
 uint32 a, b, c, d, e;
 typedef union {
-    unsigned char c[64];
-    uint32 l[16];
+	unsigned char c[64];
+	uint32 l[16];
 } CHAR64LONG16;
 CHAR64LONG16* block;
 #ifdef SHA1HANDSOFF
 static unsigned char workspace[64];
-    block = (CHAR64LONG16*)workspace;
-    memcpy(block, buffer, 64);
+	block = (CHAR64LONG16*)workspace;
+	memcpy(block, buffer, 64);
 #else
-    block = (CHAR64LONG16*)buffer;
+	block = (CHAR64LONG16*)buffer;
 #endif
-    /* Copy context->state[] to working vars */
-    a = state[0];
-    b = state[1];
-    c = state[2];
-    d = state[3];
-    e = state[4];
-    /* 4 rounds of 20 operations each. Loop unrolled. */
-    R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
-    R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
-    R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
-    R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
-    R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
-    R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
-    R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
-    R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
-    R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
-    R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
-    R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
-    R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
-    R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
-    R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
-    R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
-    R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
-    R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
-    R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
-    R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
-    R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
-    /* Add the working vars back into context.state[] */
-    state[0] += a;
-    state[1] += b;
-    state[2] += c;
-    state[3] += d;
-    state[4] += e;
-    /* Wipe variables */
-    a = b = c = d = e = 0;
+	/* Copy context->state[] to working vars */
+	a = state[0];
+	b = state[1];
+	c = state[2];
+	d = state[3];
+	e = state[4];
+	/* 4 rounds of 20 operations each. Loop unrolled. */
+	R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
+	R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
+	R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
+	R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
+	R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
+	R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
+	R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
+	R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
+	R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
+	R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
+	R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
+	R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
+	R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
+	R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
+	R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
+	R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
+	R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
+	R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
+	R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
+	R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
+	/* Add the working vars back into context.state[] */
+	state[0] += a;
+	state[1] += b;
+	state[2] += c;
+	state[3] += d;
+	state[4] += e;
+	/* Wipe variables */
+	a = b = c = d = e = 0;
 }
 
 
@@ -110,13 +110,13 @@ static unsigned char workspace[64];
 
 void SHA1Init(SHA1_CTX* context)
 {
-    /* SHA1 initialization constants */
-    context->state[0] = 0x67452301;
-    context->state[1] = 0xEFCDAB89;
-    context->state[2] = 0x98BADCFE;
-    context->state[3] = 0x10325476;
-    context->state[4] = 0xC3D2E1F0;
-    context->count[0] = context->count[1] = 0;
+	/* SHA1 initialization constants */
+	context->state[0] = 0x67452301;
+	context->state[1] = 0xEFCDAB89;
+	context->state[2] = 0x98BADCFE;
+	context->state[3] = 0x10325476;
+	context->state[4] = 0xC3D2E1F0;
+	context->count[0] = context->count[1] = 0;
 }
 
 
@@ -124,21 +124,21 @@ void SHA1Init(SHA1_CTX* context)
 
 void SHA1Update(SHA1_CTX* context, unsigned char const * data, uint32 len)
 {
-    uint32 i, j;
-
-    j = (context->count[0] >> 3) & 63;
-    if ((context->count[0] += len << 3) < (len << 3)) context->count[1]++;
-    context->count[1] += (len >> 29);
-    if ((j + len) > 63) {
-        memcpy(&context->buffer[j], data, (i = 64-j));
-        SHA1Transform(context->state, context->buffer);
-        for ( ; i + 63 < len; i += 64) {
-            SHA1Transform(context->state, &data[i]);
-        }
-        j = 0;
-    }
-    else i = 0;
-        memcpy(&context->buffer[j], &data[i], len - i);
+	uint32 i, j;
+
+	j = (context->count[0] >> 3) & 63;
+	if ((context->count[0] += len << 3) < (len << 3)) context->count[1]++;
+	context->count[1] += (len >> 29);
+	if ((j + len) > 63) {
+		memcpy(&context->buffer[j], data, (i = 64-j));
+		SHA1Transform(context->state, context->buffer);
+		for ( ; i + 63 < len; i += 64) {
+			SHA1Transform(context->state, &data[i]);
+		}
+		j = 0;
+	}
+	else i = 0;
+		memcpy(&context->buffer[j], &data[i], len - i);
 }
 
 
@@ -146,30 +146,30 @@ void SHA1Update(SHA1_CTX* context, unsigned char const * data, uint32 len)
 
 void SHA1Final(unsigned char digest[20], SHA1_CTX* context)
 {
-    uint32 i;
-    unsigned char finalcount[8];
-
-    for (i = 0; i < 8; i++) {
-        finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)]
-         >> ((3-(i & 3)) * 8) ) & 255);  /* Endian independent */
-    }
-    SHA1Update(context, (unsigned char *)"\200", 1);
-    while ((context->count[0] & 504) != 448) {
-        SHA1Update(context, (unsigned char *)"\0", 1);
-    }
-    SHA1Update(context, finalcount, 8);  /* Should cause a SHA1Transform() */
-    for (i = 0; i < 20; i++) {
-        digest[i] = (unsigned char)
-         ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
-    }
-    /* Wipe variables */
-    i = 0;
-    memset(context->buffer, 0, 64);
-    memset(context->state, 0, 20);
-    memset(context->count, 0, 8);
-    memset(&finalcount, 0, 8);
+	uint32 i;
+	unsigned char finalcount[8];
+
+	for (i = 0; i < 8; i++) {
+		finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)]
+		 >> ((3-(i & 3)) * 8) ) & 255);  /* Endian independent */
+	}
+	SHA1Update(context, (unsigned char *)"\200", 1);
+	while ((context->count[0] & 504) != 448) {
+		SHA1Update(context, (unsigned char *)"\0", 1);
+	}
+	SHA1Update(context, finalcount, 8);  /* Should cause a SHA1Transform() */
+	for (i = 0; i < 20; i++) {
+		digest[i] = (unsigned char)
+		 ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
+	}
+	/* Wipe variables */
+	i = 0;
+	memset(context->buffer, 0, 64);
+	memset(context->state, 0, 20);
+	memset(context->count, 0, 8);
+	memset(&finalcount, 0, 8);
 #ifdef SHA1HANDSOFF  /* make SHA1Transform overwrite it's own static vars */
-    SHA1Transform(context->state, context->buffer);
+	SHA1Transform(context->state, context->buffer);
 #endif
 }
 
@@ -177,71 +177,71 @@ void SHA1Final(unsigned char digest[20], SHA1_CTX* context)
 
 int sha1_encrypt(const char *src, int len, char *dest, int size)
 {
-    SHA1_CTX context;
-    unsigned char tmp[41];
-
-    if (size < 20)
-        return -1;
-
-    memset(dest,0,size);
-
-    SHA1Init(&context);
-    SHA1Update(&context, (unsigned char *)src, len);
-    SHA1Final((unsigned char *)dest, &context);
-
-    if(debug) {
-        memset(tmp,0,41);
-        binary_to_hex((unsigned char *)dest,(char *)tmp,20);
-       /* Dont log source if we were encrypting in place :) */
-        if (memcmp(src, dest, 20) != 0) {
-            alog("enc_sha1: hashed from [%s] to [%s]",src,tmp); 
-        } else {
-            alog("enc_sha1: hashed password to [%s]",tmp); 
-        }
-    }
-    
-    return 0;
+	SHA1_CTX context;
+	unsigned char tmp[41];
+
+	if (size < 20)
+		return -1;
+
+	memset(dest,0,size);
+
+	SHA1Init(&context);
+	SHA1Update(&context, (unsigned char *)src, len);
+	SHA1Final((unsigned char *)dest, &context);
+
+	if(debug) {
+		memset(tmp,0,41);
+		binary_to_hex((unsigned char *)dest,(char *)tmp,20);
+	   /* Dont log source if we were encrypting in place :) */
+		if (memcmp(src, dest, 20) != 0) {
+			alog("enc_sha1: hashed from [%s] to [%s]",src,tmp); 
+		} else {
+			alog("enc_sha1: hashed password to [%s]",tmp); 
+		}
+	}
+	
+	return 0;
 }
 
 
 int sha1_encrypt_in_place(char *buf, int size)
 {
-    char tmp[41];
-
-    memset(tmp,0,41);
-    if(sha1_encrypt(buf, strlen(buf), tmp, size)==0) {
-        memcpy(buf, tmp, size);
-    } else {
-        return -1;
-    }
-    return 0;
+	char tmp[41];
+
+	memset(tmp,0,41);
+	if(sha1_encrypt(buf, strlen(buf), tmp, size)==0) {
+		memcpy(buf, tmp, size);
+	} else {
+		return -1;
+	}
+	return 0;
 }
 
 
 int sha1_encrypt_check_len(int passlen, int bufsize)
 {
-    if (bufsize < 20)
-        fatal("enc_sha1: sha1_check_len(): buffer too small (%d)", bufsize);
-    return 0;
+	if (bufsize < 20)
+		fatal("enc_sha1: sha1_check_len(): buffer too small (%d)", bufsize);
+	return 0;
 }
 
 
 int sha1_decrypt(const char *src, char *dest, int size)
 {
-    return 0;
+	return 0;
 }
 
 
 int sha1_check_password(const char *plaintext, const char *password)
 {
-    char buf[BUFSIZE];
+	char buf[BUFSIZE];
 
-    if (sha1_encrypt(plaintext, strlen(plaintext), buf, sizeof(buf)) < 0)
-        return -1;
-    if (memcmp(buf, password, 20) == 0)
-        return 1;
+	if (sha1_encrypt(plaintext, strlen(plaintext), buf, sizeof(buf)) < 0)
+		return -1;
+	if (memcmp(buf, password, 20) == 0)
+		return 1;
 
-    return 0;
+	return 0;
 }
 
 /*************************************************************************/
diff --git a/src/core/he_help.c b/src/core/he_help.c
index afcb4c332..7e2604091 100644
--- a/src/core/he_help.c
+++ b/src/core/he_help.c
@@ -45,22 +45,22 @@ class HEHelp : public Module
  */
 int do_help(User * u)
 {
-    char *cmd = strtok(NULL, "");
+	char *cmd = strtok(NULL, "");
 
-    if (!cmd) {
-        notice_help(s_HelpServ, u, HELP_HELP, s_NickServ, s_ChanServ,
-                    s_MemoServ);
-        if (s_BotServ) {
-            notice_help(s_HelpServ, u, HELP_HELP_BOT, s_BotServ);
-        }
-        if (s_HostServ) {
-            notice_help(s_HelpServ, u, HELP_HELP_HOST, s_HostServ);
-        }
-        moduleDisplayHelp(7, u);
-    } else {
-        mod_help_cmd(s_HelpServ, u, HELPSERV, cmd);
-    }
-    return MOD_CONT;
+	if (!cmd) {
+		notice_help(s_HelpServ, u, HELP_HELP, s_NickServ, s_ChanServ,
+					s_MemoServ);
+		if (s_BotServ) {
+			notice_help(s_HelpServ, u, HELP_HELP_BOT, s_BotServ);
+		}
+		if (s_HostServ) {
+			notice_help(s_HelpServ, u, HELP_HELP_HOST, s_HostServ);
+		}
+		moduleDisplayHelp(7, u);
+	} else {
+		mod_help_cmd(s_HelpServ, u, HELPSERV, cmd);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("he_help", HEHelp)
diff --git a/src/core/hs_del.c b/src/core/hs_del.c
index d59bb2e2d..b4f7449ae 100644
--- a/src/core/hs_del.c
+++ b/src/core/hs_del.c
@@ -45,9 +45,9 @@ class HSDel : public Module
  **/
 void myHostServHelp(User * u)
 {
-    if (is_host_remover(u)) {
-        notice_lang(s_HostServ, u, HOST_HELP_CMD_DEL);
-    }
+	if (is_host_remover(u)) {
+		notice_lang(s_HostServ, u, HOST_HELP_CMD_DEL);
+	}
 }
 
 /**
@@ -57,25 +57,25 @@ void myHostServHelp(User * u)
  **/
 int do_del(User * u)
 {
-    NickAlias *na;
-    char *nick = strtok(NULL, " ");
-    if (nick) {
-        if ((na = findnick(nick))) {
-            if (na->status & NS_VERBOTEN) {
-                notice_lang(s_HostServ, u, NICK_X_FORBIDDEN, nick);
-                return MOD_CONT;
-            }
-            alog("vHost for user \002%s\002 deleted by oper \002%s\002",
-                 nick, u->nick);
-            delHostCore(nick);
-            notice_lang(s_HostServ, u, HOST_DEL, nick);
-        } else {
-            notice_lang(s_HostServ, u, HOST_NOREG, nick);
-        }
-    } else {
-        notice_lang(s_HostServ, u, HOST_DEL_SYNTAX, s_HostServ);
-    }
-    return MOD_CONT;
+	NickAlias *na;
+	char *nick = strtok(NULL, " ");
+	if (nick) {
+		if ((na = findnick(nick))) {
+			if (na->status & NS_VERBOTEN) {
+				notice_lang(s_HostServ, u, NICK_X_FORBIDDEN, nick);
+				return MOD_CONT;
+			}
+			alog("vHost for user \002%s\002 deleted by oper \002%s\002",
+				 nick, u->nick);
+			delHostCore(nick);
+			notice_lang(s_HostServ, u, HOST_DEL, nick);
+		} else {
+			notice_lang(s_HostServ, u, HOST_NOREG, nick);
+		}
+	} else {
+		notice_lang(s_HostServ, u, HOST_DEL_SYNTAX, s_HostServ);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("hs_del", HSDel)
diff --git a/src/core/hs_delall.c b/src/core/hs_delall.c
index e9173b746..c950afe60 100644
--- a/src/core/hs_delall.c
+++ b/src/core/hs_delall.c
@@ -45,9 +45,9 @@ class HSDelAll : public Module
  **/
 void myHostServHelp(User * u)
 {
-    if (is_host_remover(u)) {
-        notice_lang(s_HostServ, u, HOST_HELP_CMD_DELALL);
-    }
+	if (is_host_remover(u)) {
+		notice_lang(s_HostServ, u, HOST_HELP_CMD_DELALL);
+	}
 }
 
 /**
@@ -57,30 +57,30 @@ void myHostServHelp(User * u)
  **/
 int do_delall(User * u)
 {
-    int i;
-    char *nick = strtok(NULL, " ");
-    NickAlias *na;
-    NickCore *nc;
-    if (!nick) {
-        notice_lang(s_HostServ, u, HOST_DELALL_SYNTAX, s_HostServ);
-        return MOD_CONT;
-    }
-    if ((na = findnick(nick))) {
-        if (na->status & NS_VERBOTEN) {
-            notice_lang(s_HostServ, u, NICK_X_FORBIDDEN, nick);
-            return MOD_CONT;
-        }
-        nc = na->nc;
-        for (i = 0; i < nc->aliases.count; i++) {
-            na = (NickAlias *)nc->aliases.list[i];
-            delHostCore(na->nick);
-        }
-        alog("vHosts for all nicks in group \002%s\002 deleted by oper \002%s\002", nc->display, u->nick);
-        notice_lang(s_HostServ, u, HOST_DELALL, nc->display);
-    } else {
-        notice_lang(s_HostServ, u, HOST_NOREG, nick);
-    }
-    return MOD_CONT;
+	int i;
+	char *nick = strtok(NULL, " ");
+	NickAlias *na;
+	NickCore *nc;
+	if (!nick) {
+		notice_lang(s_HostServ, u, HOST_DELALL_SYNTAX, s_HostServ);
+		return MOD_CONT;
+	}
+	if ((na = findnick(nick))) {
+		if (na->status & NS_VERBOTEN) {
+			notice_lang(s_HostServ, u, NICK_X_FORBIDDEN, nick);
+			return MOD_CONT;
+		}
+		nc = na->nc;
+		for (i = 0; i < nc->aliases.count; i++) {
+			na = (NickAlias *)nc->aliases.list[i];
+			delHostCore(na->nick);
+		}
+		alog("vHosts for all nicks in group \002%s\002 deleted by oper \002%s\002", nc->display, u->nick);
+		notice_lang(s_HostServ, u, HOST_DELALL, nc->display);
+	} else {
+		notice_lang(s_HostServ, u, HOST_NOREG, nick);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("hs_delall", HSDelAll)
diff --git a/src/core/hs_group.c b/src/core/hs_group.c
index 240ee2719..336e5be92 100644
--- a/src/core/hs_group.c
+++ b/src/core/hs_group.c
@@ -18,7 +18,7 @@
 int do_group(User * u);
 void myHostServHelp(User * u);
 extern int do_hs_sync(NickCore * nc, char *vIdent, char *hostmask,
-                      char *creator, time_t time);
+					  char *creator, time_t time);
 
 
 class HSGroup : public Module
@@ -47,7 +47,7 @@ class HSGroup : public Module
  **/
 void myHostServHelp(User * u)
 {
-    notice_lang(s_HostServ, u, HOST_HELP_CMD_GROUP);
+	notice_lang(s_HostServ, u, HOST_HELP_CMD_GROUP);
 }
 
 /**
@@ -57,57 +57,57 @@ void myHostServHelp(User * u)
  **/
 int do_group(User * u)
 {
-    NickAlias *na;
-    HostCore *tmp;
-    char *vHost = NULL;
-    char *vIdent = NULL;
-    char *creator = NULL;
-    HostCore *head = NULL;
-    time_t time;
-    bool found = false;
-
-    head = hostCoreListHead();
-
-    if ((na = findnick(u->nick))) {
-        if (na->status & NS_IDENTIFIED) {
-
-            tmp = findHostCore(head, u->nick, &found);
-            if (found) {
-                if (tmp == NULL) {
-                    tmp = head; /* incase first in list */
-                } else if (tmp->next) { /* we dont want the previous entry were not inserting! */
-                    tmp = tmp->next;    /* jump to the next */
-                }
-
-                vHost = sstrdup(tmp->vHost);
-                if (tmp->vIdent)
-                    vIdent = sstrdup(tmp->vIdent);
-                creator = sstrdup(tmp->creator);
-                time = tmp->time;
-
-                do_hs_sync(na->nc, vIdent, vHost, creator, time);
-                if (tmp->vIdent) {
-                    notice_lang(s_HostServ, u, HOST_IDENT_GROUP,
-                                na->nc->display, vIdent, vHost);
-                } else {
-                    notice_lang(s_HostServ, u, HOST_GROUP, na->nc->display,
-                                vHost);
-                }
-                free(vHost);
-                if (vIdent)
-                    free(vIdent);
-                free(creator);
-
-            } else {
-                notice_lang(s_HostServ, u, HOST_NOT_ASSIGNED);
-            }
-        } else {
-            notice_lang(s_HostServ, u, HOST_ID);
-        }
-    } else {
-        notice_lang(s_HostServ, u, HOST_NOT_REGED);
-    }
-    return MOD_CONT;
+	NickAlias *na;
+	HostCore *tmp;
+	char *vHost = NULL;
+	char *vIdent = NULL;
+	char *creator = NULL;
+	HostCore *head = NULL;
+	time_t time;
+	bool found = false;
+
+	head = hostCoreListHead();
+
+	if ((na = findnick(u->nick))) {
+		if (na->status & NS_IDENTIFIED) {
+
+			tmp = findHostCore(head, u->nick, &found);
+			if (found) {
+				if (tmp == NULL) {
+					tmp = head; /* incase first in list */
+				} else if (tmp->next) { /* we dont want the previous entry were not inserting! */
+					tmp = tmp->next;	/* jump to the next */
+				}
+
+				vHost = sstrdup(tmp->vHost);
+				if (tmp->vIdent)
+					vIdent = sstrdup(tmp->vIdent);
+				creator = sstrdup(tmp->creator);
+				time = tmp->time;
+
+				do_hs_sync(na->nc, vIdent, vHost, creator, time);
+				if (tmp->vIdent) {
+					notice_lang(s_HostServ, u, HOST_IDENT_GROUP,
+								na->nc->display, vIdent, vHost);
+				} else {
+					notice_lang(s_HostServ, u, HOST_GROUP, na->nc->display,
+								vHost);
+				}
+				free(vHost);
+				if (vIdent)
+					free(vIdent);
+				free(creator);
+
+			} else {
+				notice_lang(s_HostServ, u, HOST_NOT_ASSIGNED);
+			}
+		} else {
+			notice_lang(s_HostServ, u, HOST_ID);
+		}
+	} else {
+		notice_lang(s_HostServ, u, HOST_NOT_REGED);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("hs_group", HSGroup)
diff --git a/src/core/hs_help.c b/src/core/hs_help.c
index abc009a6e..4b76c276c 100644
--- a/src/core/hs_help.c
+++ b/src/core/hs_help.c
@@ -42,15 +42,15 @@ class HSHelp : public Module
  **/
 int do_help(User * u)
 {
-    char *cmd = strtok(NULL, "");
-
-    if (!cmd) {
-        notice_help(s_HostServ, u, HOST_HELP, s_HostServ);
-        moduleDisplayHelp(6, u);
-    } else {
-        mod_help_cmd(s_HostServ, u, HOSTSERV, cmd);
-    }
-    return MOD_CONT;
+	char *cmd = strtok(NULL, "");
+
+	if (!cmd) {
+		notice_help(s_HostServ, u, HOST_HELP, s_HostServ);
+		moduleDisplayHelp(6, u);
+	} else {
+		mod_help_cmd(s_HostServ, u, HOSTSERV, cmd);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("hs_help", HSHelp)
diff --git a/src/core/hs_list.c b/src/core/hs_list.c
index da1ac5103..1fc8d226e 100644
--- a/src/core/hs_list.c
+++ b/src/core/hs_list.c
@@ -43,9 +43,9 @@ class HSList : public Module
  **/
 void myHostServHelp(User * u)
 {
-    if (is_services_oper(u)) {
-        notice_lang(s_HostServ, u, HOST_HELP_CMD_LIST);
-    }
+	if (is_services_oper(u)) {
+		notice_lang(s_HostServ, u, HOST_HELP_CMD_LIST);
+	}
 }
 
 /**
@@ -55,122 +55,122 @@ void myHostServHelp(User * u)
  **/
 int listOut(User * u)
 {
-    char *key = strtok(NULL, "");
-    struct tm *tm;
-    char buf[BUFSIZE];
-    int counter = 1;
-    int from = 0, to = 0;
-    char *tmp = NULL;
-    char *s = NULL;
-    int display_counter = 0;
-    HostCore *head = NULL;
-    HostCore *current;
+	char *key = strtok(NULL, "");
+	struct tm *tm;
+	char buf[BUFSIZE];
+	int counter = 1;
+	int from = 0, to = 0;
+	char *tmp = NULL;
+	char *s = NULL;
+	int display_counter = 0;
+	HostCore *head = NULL;
+	HostCore *current;
 
-    head = hostCoreListHead();
+	head = hostCoreListHead();
 
-    current = head;
-    if (current == NULL)
-        notice_lang(s_HostServ, u, HOST_EMPTY);
-    else {
-                /**
+	current = head;
+	if (current == NULL)
+		notice_lang(s_HostServ, u, HOST_EMPTY);
+	else {
+				/**
 		 * Do a check for a range here, then in the next loop
 		 * we'll only display what has been requested..
 		 **/
-        if (key) {
-            if (key[0] == '#') {
-                tmp = myStrGetOnlyToken((key + 1), '-', 0);     /* Read FROM out */
-                if (!tmp) {
-                	notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE);
-                    return MOD_CONT;
-                }
-                for (s = tmp; *s; s++) {
-                    if (!isdigit(*s)) {
-                        free(tmp);
-	                	notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE);
-                        return MOD_CONT;
-                    }
-                }
-                from = atoi(tmp);
-                free(tmp);
-                tmp = myStrGetTokenRemainder(key, '-', 1);      /* Read TO out */
-                if (!tmp) {
-                	notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE);
-                    return MOD_CONT;
-                }
-                for (s = tmp; *s; s++) {
-                    if (!isdigit(*s)) {
-                        free(tmp);
-	                	notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE);
-                        return MOD_CONT;
-                    }
-                }
-                to = atoi(tmp);
-                free(tmp);
-                key = NULL;
-            }
-        }
+		if (key) {
+			if (key[0] == '#') {
+				tmp = myStrGetOnlyToken((key + 1), '-', 0);	 /* Read FROM out */
+				if (!tmp) {
+					notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE);
+					return MOD_CONT;
+				}
+				for (s = tmp; *s; s++) {
+					if (!isdigit(*s)) {
+						free(tmp);
+						notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE);
+						return MOD_CONT;
+					}
+				}
+				from = atoi(tmp);
+				free(tmp);
+				tmp = myStrGetTokenRemainder(key, '-', 1);	  /* Read TO out */
+				if (!tmp) {
+					notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE);
+					return MOD_CONT;
+				}
+				for (s = tmp; *s; s++) {
+					if (!isdigit(*s)) {
+						free(tmp);
+						notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE);
+						return MOD_CONT;
+					}
+				}
+				to = atoi(tmp);
+				free(tmp);
+				key = NULL;
+			}
+		}
 
-        while (current != NULL) {
-            if (key) {
-                if (((match_wild_nocase(key, current->nick))
-                     || (match_wild_nocase(key, current->vHost)))
-                    && (display_counter < NSListMax)) {
-                    display_counter++;
-                    tm = localtime(&current->time);
-                    strftime_lang(buf, sizeof(buf), u,
-                                  STRFTIME_DATE_TIME_FORMAT, tm);
-                    if (current->vIdent) {
-                        notice_lang(s_HostServ, u, HOST_IDENT_ENTRY,
-                                    counter, current->nick,
-                                    current->vIdent, current->vHost,
-                                    current->creator, buf);
-                    } else {
-                        notice_lang(s_HostServ, u, HOST_ENTRY, counter,
-                                    current->nick, current->vHost,
-                                    current->creator, buf);
-                    }
-                }
-            } else {
-                        /**
+		while (current != NULL) {
+			if (key) {
+				if (((match_wild_nocase(key, current->nick))
+					 || (match_wild_nocase(key, current->vHost)))
+					&& (display_counter < NSListMax)) {
+					display_counter++;
+					tm = localtime(&current->time);
+					strftime_lang(buf, sizeof(buf), u,
+								  STRFTIME_DATE_TIME_FORMAT, tm);
+					if (current->vIdent) {
+						notice_lang(s_HostServ, u, HOST_IDENT_ENTRY,
+									counter, current->nick,
+									current->vIdent, current->vHost,
+									current->creator, buf);
+					} else {
+						notice_lang(s_HostServ, u, HOST_ENTRY, counter,
+									current->nick, current->vHost,
+									current->creator, buf);
+					}
+				}
+			} else {
+						/**
 			 * List the host if its in the display range, and not more
 			 * than NSListMax records have been displayed...
 			 **/
-                if ((((counter >= from) && (counter <= to))
-                     || ((from == 0) && (to == 0)))
-                    && (display_counter < NSListMax)) {
-                    display_counter++;
-                    tm = localtime(&current->time);
-                    strftime_lang(buf, sizeof(buf), u,
-                                  STRFTIME_DATE_TIME_FORMAT, tm);
-                    if (current->vIdent) {
-                        notice_lang(s_HostServ, u, HOST_IDENT_ENTRY,
-                                    counter, current->nick,
-                                    current->vIdent, current->vHost,
-                                    current->creator, buf);
-                    } else {
-                        notice_lang(s_HostServ, u, HOST_ENTRY, counter,
-                                    current->nick, current->vHost,
-                                    current->creator, buf);
-                    }
-                }
-            }
-            counter++;
-            current = current->next;
-        }
-        if (key) {
-            notice_lang(s_HostServ, u, HOST_LIST_KEY_FOOTER, key,
-                        display_counter);
-        } else {
-            if (from != 0) {
-                notice_lang(s_HostServ, u, HOST_LIST_RANGE_FOOTER, from,
-                            to);
-            } else {
-                notice_lang(s_HostServ, u, HOST_LIST_FOOTER,
-                            display_counter);
-            }
-        }
-    }
-    return MOD_CONT;
+				if ((((counter >= from) && (counter <= to))
+					 || ((from == 0) && (to == 0)))
+					&& (display_counter < NSListMax)) {
+					display_counter++;
+					tm = localtime(&current->time);
+					strftime_lang(buf, sizeof(buf), u,
+								  STRFTIME_DATE_TIME_FORMAT, tm);
+					if (current->vIdent) {
+						notice_lang(s_HostServ, u, HOST_IDENT_ENTRY,
+									counter, current->nick,
+									current->vIdent, current->vHost,
+									current->creator, buf);
+					} else {
+						notice_lang(s_HostServ, u, HOST_ENTRY, counter,
+									current->nick, current->vHost,
+									current->creator, buf);
+					}
+				}
+			}
+			counter++;
+			current = current->next;
+		}
+		if (key) {
+			notice_lang(s_HostServ, u, HOST_LIST_KEY_FOOTER, key,
+						display_counter);
+		} else {
+			if (from != 0) {
+				notice_lang(s_HostServ, u, HOST_LIST_RANGE_FOOTER, from,
+							to);
+			} else {
+				notice_lang(s_HostServ, u, HOST_LIST_FOOTER,
+							display_counter);
+			}
+		}
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("hs_list", HSList)
diff --git a/src/core/hs_off.c b/src/core/hs_off.c
index cd215a426..0ae8caf30 100644
--- a/src/core/hs_off.c
+++ b/src/core/hs_off.c
@@ -44,7 +44,7 @@ class HSOff : public Module
  **/
 void myHostServHelp(User * u)
 {
-    notice_lang(s_HostServ, u, HOST_HELP_CMD_OFF);
+	notice_lang(s_HostServ, u, HOST_HELP_CMD_OFF);
 }
 
 /**
@@ -54,24 +54,24 @@ void myHostServHelp(User * u)
  **/
 int do_off(User * u)
 {
-    NickAlias *na;
-    char *vhost;
-    char *vident = NULL;
-    if ((na = findnick(u->nick))) {
-        if (na->status & NS_IDENTIFIED) {
-            vhost = getvHost(u->nick);
-            vident = getvIdent(u->nick);
-            if (vhost == NULL && vident == NULL)
-                notice_lang(s_HostServ, u, HOST_NOT_ASSIGNED);
-            else
-                ircdproto->SendVhostDel(u);
-        } else {
-            notice_lang(s_HostServ, u, HOST_ID);
-        }
-    } else {
-        notice_lang(s_HostServ, u, HOST_NOT_REGED);
-    }
-    return MOD_CONT;
+	NickAlias *na;
+	char *vhost;
+	char *vident = NULL;
+	if ((na = findnick(u->nick))) {
+		if (na->status & NS_IDENTIFIED) {
+			vhost = getvHost(u->nick);
+			vident = getvIdent(u->nick);
+			if (vhost == NULL && vident == NULL)
+				notice_lang(s_HostServ, u, HOST_NOT_ASSIGNED);
+			else
+				ircdproto->SendVhostDel(u);
+		} else {
+			notice_lang(s_HostServ, u, HOST_ID);
+		}
+	} else {
+		notice_lang(s_HostServ, u, HOST_NOT_REGED);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("hs_off", HSOff)
diff --git a/src/core/hs_on.c b/src/core/hs_on.c
index aca596df6..0f558e2dc 100644
--- a/src/core/hs_on.c
+++ b/src/core/hs_on.c
@@ -44,7 +44,7 @@ class HSOn : public Module
  **/
 void myHostServHelp(User * u)
 {
-    notice_lang(s_HostServ, u, HOST_HELP_CMD_ON);
+	notice_lang(s_HostServ, u, HOST_HELP_CMD_ON);
 }
 
 /**
@@ -54,39 +54,39 @@ void myHostServHelp(User * u)
  **/
 int do_on(User * u)
 {
-    NickAlias *na;
-    char *vHost;
-    char *vIdent = NULL;
-    if ((na = findnick(u->nick))) {
-        if (na->status & NS_IDENTIFIED) {
-            vHost = getvHost(u->nick);
-            vIdent = getvIdent(u->nick);
-            if (vHost == NULL) {
-                notice_lang(s_HostServ, u, HOST_NOT_ASSIGNED);
-            } else {
-                if (vIdent) {
-                    notice_lang(s_HostServ, u, HOST_IDENT_ACTIVATED,
-                                vIdent, vHost);
-                } else {
-                    notice_lang(s_HostServ, u, HOST_ACTIVATED, vHost);
-                }
-                ircdproto->SendVhost(u->nick, vIdent, vHost);
-                if (ircd->vhost) {
-                    u->vhost = sstrdup(vHost);
-                }
-                if (ircd->vident) {
-                    if (vIdent)
-                        u->vident = sstrdup(vIdent);
-                }
-                set_lastmask(u);
-            }
-        } else {
-            notice_lang(s_HostServ, u, HOST_ID);
-        }
-    } else {
-        notice_lang(s_HostServ, u, HOST_NOT_REGED);
-    }
-    return MOD_CONT;
+	NickAlias *na;
+	char *vHost;
+	char *vIdent = NULL;
+	if ((na = findnick(u->nick))) {
+		if (na->status & NS_IDENTIFIED) {
+			vHost = getvHost(u->nick);
+			vIdent = getvIdent(u->nick);
+			if (vHost == NULL) {
+				notice_lang(s_HostServ, u, HOST_NOT_ASSIGNED);
+			} else {
+				if (vIdent) {
+					notice_lang(s_HostServ, u, HOST_IDENT_ACTIVATED,
+								vIdent, vHost);
+				} else {
+					notice_lang(s_HostServ, u, HOST_ACTIVATED, vHost);
+				}
+				ircdproto->SendVhost(u->nick, vIdent, vHost);
+				if (ircd->vhost) {
+					u->vhost = sstrdup(vHost);
+				}
+				if (ircd->vident) {
+					if (vIdent)
+						u->vident = sstrdup(vIdent);
+				}
+				set_lastmask(u);
+			}
+		} else {
+			notice_lang(s_HostServ, u, HOST_ID);
+		}
+	} else {
+		notice_lang(s_HostServ, u, HOST_NOT_REGED);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("hs_on", HSOn)
diff --git a/src/core/hs_set.c b/src/core/hs_set.c
index 56adda848..9886c1ce4 100644
--- a/src/core/hs_set.c
+++ b/src/core/hs_set.c
@@ -44,9 +44,9 @@ class HSSet : public Module
  **/
 void myHostServHelp(User * u)
 {
-    if (is_host_setter(u)) {
-        notice_lang(s_HostServ, u, HOST_HELP_CMD_SET);
-    }
+	if (is_host_setter(u)) {
+		notice_lang(s_HostServ, u, HOST_HELP_CMD_SET);
+	}
 }
 
 /**
@@ -56,112 +56,112 @@ void myHostServHelp(User * u)
  **/
 int myDoSet(User * u)
 {
-    char *nick = strtok(NULL, " ");
-    char *rawhostmask = strtok(NULL, " ");
-    char *hostmask = (char *)smalloc(HOSTMAX);
-
-    NickAlias *na;
-    int32 tmp_time;
-    char *s;
-
-    char *vIdent = NULL;
-
-    if (!nick || !rawhostmask) {
-        notice_lang(s_HostServ, u, HOST_SET_SYNTAX, s_HostServ);
-        free(hostmask);
-        return MOD_CONT;
-    }
-
-    vIdent = myStrGetOnlyToken(rawhostmask, '@', 0);    /* Get the first substring, @ as delimiter */
-    if (vIdent) {
-        rawhostmask = myStrGetTokenRemainder(rawhostmask, '@', 1);      /* get the remaining string */
-        if (!rawhostmask) {
-            notice_lang(s_HostServ, u, HOST_SET_SYNTAX, s_HostServ);
-            free(vIdent);
-            free(hostmask);
-            return MOD_CONT;
-        }
-        if (strlen(vIdent) > USERMAX - 1) {
-            notice_lang(s_HostServ, u, HOST_SET_IDENTTOOLONG, USERMAX);
-            free(vIdent);
-            free(rawhostmask);
-            free(hostmask);
-            return MOD_CONT;
-        } else {
-            for (s = vIdent; *s; s++) {
-                if (!isvalidchar(*s)) {
-                    notice_lang(s_HostServ, u, HOST_SET_IDENT_ERROR);
-                    free(vIdent);
-                    free(rawhostmask);
-                    free(hostmask);
-                    return MOD_CONT;
-                }
-            }
-        }
-        if (!ircd->vident) {
-            notice_lang(s_HostServ, u, HOST_NO_VIDENT);
-            free(vIdent);
-            free(rawhostmask);
-            free(hostmask);
-            return MOD_CONT;
-        }
-    }
-    if (strlen(rawhostmask) < HOSTMAX - 1)
-        snprintf(hostmask, HOSTMAX - 1, "%s", rawhostmask);
-    else {
-        notice_lang(s_HostServ, u, HOST_SET_TOOLONG, HOSTMAX);
-        if (vIdent) {
-            free(vIdent);
-            free(rawhostmask);
-        }
-        free(hostmask);
-        return MOD_CONT;
-    }
-
-    if (!isValidHost(hostmask, 3)) {
-        notice_lang(s_HostServ, u, HOST_SET_ERROR);
-        if (vIdent) {
-            free(vIdent);
-            free(rawhostmask);
-        }
-        free(hostmask);
-        return MOD_CONT;
-    }
-
-
-    tmp_time = time(NULL);
-
-    if ((na = findnick(nick))) {
-        if (na->status & NS_VERBOTEN) {
-            notice_lang(s_HostServ, u, NICK_X_FORBIDDEN, nick);
-            if (vIdent) {
-                free(vIdent);
-                free(rawhostmask);
-            }
-            free(hostmask);
-            return MOD_CONT;
-        }
-        if (vIdent && ircd->vident) {
-            alog("vHost for user \002%s\002 set to \002%s@%s\002 by oper \002%s\002", nick, vIdent, hostmask, u->nick);
-        } else {
-            alog("vHost for user \002%s\002 set to \002%s\002 by oper \002%s\002", nick, hostmask, u->nick);
-        }
-        addHostCore(nick, vIdent, hostmask, u->nick, tmp_time);
-        if (vIdent) {
-            notice_lang(s_HostServ, u, HOST_IDENT_SET, nick, vIdent,
-                        hostmask);
-        } else {
-            notice_lang(s_HostServ, u, HOST_SET, nick, hostmask);
-        }
-    } else {
-        notice_lang(s_HostServ, u, HOST_NOREG, nick);
-    }
-    free(hostmask);
-    if (vIdent) {
-        free(vIdent);
-        free(rawhostmask);
-    }
-    return MOD_CONT;
+	char *nick = strtok(NULL, " ");
+	char *rawhostmask = strtok(NULL, " ");
+	char *hostmask = (char *)smalloc(HOSTMAX);
+
+	NickAlias *na;
+	int32 tmp_time;
+	char *s;
+
+	char *vIdent = NULL;
+
+	if (!nick || !rawhostmask) {
+		notice_lang(s_HostServ, u, HOST_SET_SYNTAX, s_HostServ);
+		free(hostmask);
+		return MOD_CONT;
+	}
+
+	vIdent = myStrGetOnlyToken(rawhostmask, '@', 0);	/* Get the first substring, @ as delimiter */
+	if (vIdent) {
+		rawhostmask = myStrGetTokenRemainder(rawhostmask, '@', 1);	  /* get the remaining string */
+		if (!rawhostmask) {
+			notice_lang(s_HostServ, u, HOST_SET_SYNTAX, s_HostServ);
+			free(vIdent);
+			free(hostmask);
+			return MOD_CONT;
+		}
+		if (strlen(vIdent) > USERMAX - 1) {
+			notice_lang(s_HostServ, u, HOST_SET_IDENTTOOLONG, USERMAX);
+			free(vIdent);
+			free(rawhostmask);
+			free(hostmask);
+			return MOD_CONT;
+		} else {
+			for (s = vIdent; *s; s++) {
+				if (!isvalidchar(*s)) {
+					notice_lang(s_HostServ, u, HOST_SET_IDENT_ERROR);
+					free(vIdent);
+					free(rawhostmask);
+					free(hostmask);
+					return MOD_CONT;
+				}
+			}
+		}
+		if (!ircd->vident) {
+			notice_lang(s_HostServ, u, HOST_NO_VIDENT);
+			free(vIdent);
+			free(rawhostmask);
+			free(hostmask);
+			return MOD_CONT;
+		}
+	}
+	if (strlen(rawhostmask) < HOSTMAX - 1)
+		snprintf(hostmask, HOSTMAX - 1, "%s", rawhostmask);
+	else {
+		notice_lang(s_HostServ, u, HOST_SET_TOOLONG, HOSTMAX);
+		if (vIdent) {
+			free(vIdent);
+			free(rawhostmask);
+		}
+		free(hostmask);
+		return MOD_CONT;
+	}
+
+	if (!isValidHost(hostmask, 3)) {
+		notice_lang(s_HostServ, u, HOST_SET_ERROR);
+		if (vIdent) {
+			free(vIdent);
+			free(rawhostmask);
+		}
+		free(hostmask);
+		return MOD_CONT;
+	}
+
+
+	tmp_time = time(NULL);
+
+	if ((na = findnick(nick))) {
+		if (na->status & NS_VERBOTEN) {
+			notice_lang(s_HostServ, u, NICK_X_FORBIDDEN, nick);
+			if (vIdent) {
+				free(vIdent);
+				free(rawhostmask);
+			}
+			free(hostmask);
+			return MOD_CONT;
+		}
+		if (vIdent && ircd->vident) {
+			alog("vHost for user \002%s\002 set to \002%s@%s\002 by oper \002%s\002", nick, vIdent, hostmask, u->nick);
+		} else {
+			alog("vHost for user \002%s\002 set to \002%s\002 by oper \002%s\002", nick, hostmask, u->nick);
+		}
+		addHostCore(nick, vIdent, hostmask, u->nick, tmp_time);
+		if (vIdent) {
+			notice_lang(s_HostServ, u, HOST_IDENT_SET, nick, vIdent,
+						hostmask);
+		} else {
+			notice_lang(s_HostServ, u, HOST_SET, nick, hostmask);
+		}
+	} else {
+		notice_lang(s_HostServ, u, HOST_NOREG, nick);
+	}
+	free(hostmask);
+	if (vIdent) {
+		free(vIdent);
+		free(rawhostmask);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("hs_set", HSSet)
diff --git a/src/core/hs_setall.c b/src/core/hs_setall.c
index 88b81d6c5..2c220f638 100644
--- a/src/core/hs_setall.c
+++ b/src/core/hs_setall.c
@@ -18,7 +18,7 @@
 int do_setall(User * u);
 void myHostServHelp(User * u);
 extern int do_hs_sync(NickCore * nc, char *vIdent, char *hostmask,
-                      char *creator, time_t time);
+					  char *creator, time_t time);
 
 class HSSetAll : public Module
 {
@@ -45,9 +45,9 @@ class HSSetAll : public Module
  **/
 void myHostServHelp(User * u)
 {
-    if (is_host_setter(u)) {
-        notice_lang(s_HostServ, u, HOST_HELP_CMD_SETALL);
-    }
+	if (is_host_setter(u)) {
+		notice_lang(s_HostServ, u, HOST_HELP_CMD_SETALL);
+	}
 }
 
 /**
@@ -57,112 +57,112 @@ void myHostServHelp(User * u)
  **/
 int do_setall(User * u)
 {
-    char *nick = (char *)strtok(NULL, " ");
-    char *rawhostmask = strtok(NULL, " ");
-    char *hostmask = (char *)smalloc(HOSTMAX);
-
-    NickAlias *na;
-    int32 tmp_time;
-    char *s;
-
-    char *vIdent = NULL;
-
-    if (!nick || !rawhostmask) {
-        notice_lang(s_HostServ, u, HOST_SETALL_SYNTAX, s_HostServ);
-        free(hostmask);
-        return MOD_CONT;
-    }
-
-    vIdent = myStrGetOnlyToken(rawhostmask, '@', 0);    /* Get the first substring, @ as delimiter */
-    if (vIdent) {
-        rawhostmask = myStrGetTokenRemainder(rawhostmask, '@', 1);      /* get the remaining string */
-        if (!rawhostmask) {
-            notice_lang(s_HostServ, u, HOST_SETALL_SYNTAX, s_HostServ);
-            free(vIdent);
-            free(hostmask);
-            return MOD_CONT;
-        }
-        if (strlen(vIdent) > USERMAX - 1) {
-            notice_lang(s_HostServ, u, HOST_SET_IDENTTOOLONG, USERMAX);
-            free(vIdent);
-            free(rawhostmask);
-            free(hostmask);
-            return MOD_CONT;
-        } else {
-            for (s = vIdent; *s; s++) {
-                if (!isvalidchar(*s)) {
-                    notice_lang(s_HostServ, u, HOST_SET_IDENT_ERROR);
-                    free(vIdent);
-                    free(rawhostmask);
-                    free(hostmask);
-                    return MOD_CONT;
-                }
-            }
-        }
-        if (!ircd->vident) {
-            notice_lang(s_HostServ, u, HOST_NO_VIDENT);
-            free(vIdent);
-            free(rawhostmask);
-            free(hostmask);
-            return MOD_CONT;
-        }
-    }
-
-    if (strlen(rawhostmask) < HOSTMAX - 1)
-        snprintf(hostmask, HOSTMAX - 1, "%s", rawhostmask);
-    else {
-        notice_lang(s_HostServ, u, HOST_SET_TOOLONG, HOSTMAX);
-        if (vIdent) {
-            free(vIdent);
-            free(rawhostmask);
-        }
-        free(hostmask);
-        return MOD_CONT;
-    }
-
-    if (!isValidHost(hostmask, 3)) {
-        notice_lang(s_HostServ, u, HOST_SET_ERROR);
-        if (vIdent) {
-            free(vIdent);
-            free(rawhostmask);
-        }
-        free(hostmask);
-        return MOD_CONT;
-    }
-
-    tmp_time = time(NULL);
-
-    if ((na = findnick(nick))) {
-        if (na->status & NS_VERBOTEN) {
-            notice_lang(s_HostServ, u, NICK_X_FORBIDDEN, nick);
-            if (vIdent) {
-                free(vIdent);
-                free(rawhostmask);
-            }
-            free(hostmask);
-            return MOD_CONT;
-        }
-        if (vIdent && ircd->vident) {
-            alog("vHost for all nicks in group \002%s\002 set to \002%s@%s\002 by oper \002%s\002", nick, vIdent, hostmask, u->nick);
-        } else {
-            alog("vHost for all nicks in group \002%s\002 set to \002%s\002 by oper \002%s\002", nick, hostmask, u->nick);
-        }
-        do_hs_sync(na->nc, vIdent, hostmask, u->nick, tmp_time);
-        if (vIdent) {
-            notice_lang(s_HostServ, u, HOST_IDENT_SETALL, nick, vIdent,
-                        hostmask);
-        } else {
-            notice_lang(s_HostServ, u, HOST_SETALL, nick, hostmask);
-        }
-    } else {
-        notice_lang(s_HostServ, u, HOST_NOREG, nick);
-    }
-    if (vIdent) {
-        free(vIdent);
-        free(rawhostmask);
-    }
-    free(hostmask);
-    return MOD_CONT;
+	char *nick = (char *)strtok(NULL, " ");
+	char *rawhostmask = strtok(NULL, " ");
+	char *hostmask = (char *)smalloc(HOSTMAX);
+
+	NickAlias *na;
+	int32 tmp_time;
+	char *s;
+
+	char *vIdent = NULL;
+
+	if (!nick || !rawhostmask) {
+		notice_lang(s_HostServ, u, HOST_SETALL_SYNTAX, s_HostServ);
+		free(hostmask);
+		return MOD_CONT;
+	}
+
+	vIdent = myStrGetOnlyToken(rawhostmask, '@', 0);	/* Get the first substring, @ as delimiter */
+	if (vIdent) {
+		rawhostmask = myStrGetTokenRemainder(rawhostmask, '@', 1);	  /* get the remaining string */
+		if (!rawhostmask) {
+			notice_lang(s_HostServ, u, HOST_SETALL_SYNTAX, s_HostServ);
+			free(vIdent);
+			free(hostmask);
+			return MOD_CONT;
+		}
+		if (strlen(vIdent) > USERMAX - 1) {
+			notice_lang(s_HostServ, u, HOST_SET_IDENTTOOLONG, USERMAX);
+			free(vIdent);
+			free(rawhostmask);
+			free(hostmask);
+			return MOD_CONT;
+		} else {
+			for (s = vIdent; *s; s++) {
+				if (!isvalidchar(*s)) {
+					notice_lang(s_HostServ, u, HOST_SET_IDENT_ERROR);
+					free(vIdent);
+					free(rawhostmask);
+					free(hostmask);
+					return MOD_CONT;
+				}
+			}
+		}
+		if (!ircd->vident) {
+			notice_lang(s_HostServ, u, HOST_NO_VIDENT);
+			free(vIdent);
+			free(rawhostmask);
+			free(hostmask);
+			return MOD_CONT;
+		}
+	}
+
+	if (strlen(rawhostmask) < HOSTMAX - 1)
+		snprintf(hostmask, HOSTMAX - 1, "%s", rawhostmask);
+	else {
+		notice_lang(s_HostServ, u, HOST_SET_TOOLONG, HOSTMAX);
+		if (vIdent) {
+			free(vIdent);
+			free(rawhostmask);
+		}
+		free(hostmask);
+		return MOD_CONT;
+	}
+
+	if (!isValidHost(hostmask, 3)) {
+		notice_lang(s_HostServ, u, HOST_SET_ERROR);
+		if (vIdent) {
+			free(vIdent);
+			free(rawhostmask);
+		}
+		free(hostmask);
+		return MOD_CONT;
+	}
+
+	tmp_time = time(NULL);
+
+	if ((na = findnick(nick))) {
+		if (na->status & NS_VERBOTEN) {
+			notice_lang(s_HostServ, u, NICK_X_FORBIDDEN, nick);
+			if (vIdent) {
+				free(vIdent);
+				free(rawhostmask);
+			}
+			free(hostmask);
+			return MOD_CONT;
+		}
+		if (vIdent && ircd->vident) {
+			alog("vHost for all nicks in group \002%s\002 set to \002%s@%s\002 by oper \002%s\002", nick, vIdent, hostmask, u->nick);
+		} else {
+			alog("vHost for all nicks in group \002%s\002 set to \002%s\002 by oper \002%s\002", nick, hostmask, u->nick);
+		}
+		do_hs_sync(na->nc, vIdent, hostmask, u->nick, tmp_time);
+		if (vIdent) {
+			notice_lang(s_HostServ, u, HOST_IDENT_SETALL, nick, vIdent,
+						hostmask);
+		} else {
+			notice_lang(s_HostServ, u, HOST_SETALL, nick, hostmask);
+		}
+	} else {
+		notice_lang(s_HostServ, u, HOST_NOREG, nick);
+	}
+	if (vIdent) {
+		free(vIdent);
+		free(rawhostmask);
+	}
+	free(hostmask);
+	return MOD_CONT;
 }
 
 MODULE_INIT("hs_setall", HSSetAll)
diff --git a/src/core/ms_cancel.c b/src/core/ms_cancel.c
index b988743d1..c7a5402d0 100644
--- a/src/core/ms_cancel.c
+++ b/src/core/ms_cancel.c
@@ -42,7 +42,7 @@ class MSCancel : public Module
  **/
 void myMemoServHelp(User * u)
 {
-    notice_lang(s_MemoServ, u, MEMO_HELP_CMD_CANCEL);
+	notice_lang(s_MemoServ, u, MEMO_HELP_CMD_CANCEL);
 }
 
 /**
@@ -52,43 +52,43 @@ void myMemoServHelp(User * u)
  **/
 int do_cancel(User * u)
 {
-    int ischan;
-    int isforbid;
-    char *name = strtok(NULL, " ");
-    MemoInfo *mi;
+	int ischan;
+	int isforbid;
+	char *name = strtok(NULL, " ");
+	MemoInfo *mi;
 
-    if (!name) {
-        syntax_error(s_MemoServ, u, "CANCEL", MEMO_CANCEL_SYNTAX);
+	if (!name) {
+		syntax_error(s_MemoServ, u, "CANCEL", MEMO_CANCEL_SYNTAX);
 
-    } else if (!nick_recognized(u)) {
-        notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
+	} else if (!nick_recognized(u)) {
+		notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
 
-    } else if (!(mi = getmemoinfo(name, &ischan, &isforbid))) {
-        if (isforbid) {
-            notice_lang(s_MemoServ, u,
-                        ischan ? CHAN_X_FORBIDDEN :
-                        NICK_X_FORBIDDEN, name);
-        } else {
-            notice_lang(s_MemoServ, u,
-                        ischan ? CHAN_X_NOT_REGISTERED :
-                        NICK_X_NOT_REGISTERED, name);
-        }
-    } else {
-        int i;
+	} else if (!(mi = getmemoinfo(name, &ischan, &isforbid))) {
+		if (isforbid) {
+			notice_lang(s_MemoServ, u,
+						ischan ? CHAN_X_FORBIDDEN :
+						NICK_X_FORBIDDEN, name);
+		} else {
+			notice_lang(s_MemoServ, u,
+						ischan ? CHAN_X_NOT_REGISTERED :
+						NICK_X_NOT_REGISTERED, name);
+		}
+	} else {
+		int i;
 
-        for (i = mi->memocount - 1; i >= 0; i--) {
-            if ((mi->memos[i].flags & MF_UNREAD)
-                && !stricmp(mi->memos[i].sender, u->na->nc->display)
-                && (!(mi->memos[i].flags & MF_NOTIFYS))) {
-                delmemo(mi, mi->memos[i].number);
-                notice_lang(s_MemoServ, u, MEMO_CANCELLED, name);
-                return MOD_CONT;
-            }
-        }
+		for (i = mi->memocount - 1; i >= 0; i--) {
+			if ((mi->memos[i].flags & MF_UNREAD)
+				&& !stricmp(mi->memos[i].sender, u->na->nc->display)
+				&& (!(mi->memos[i].flags & MF_NOTIFYS))) {
+				delmemo(mi, mi->memos[i].number);
+				notice_lang(s_MemoServ, u, MEMO_CANCELLED, name);
+				return MOD_CONT;
+			}
+		}
 
-        notice_lang(s_MemoServ, u, MEMO_CANCEL_NONE);
-    }
-    return MOD_CONT;
+		notice_lang(s_MemoServ, u, MEMO_CANCEL_NONE);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("ms_cancel", MSCancel)
diff --git a/src/core/ms_check.c b/src/core/ms_check.c
index e5410d9b1..383291635 100644
--- a/src/core/ms_check.c
+++ b/src/core/ms_check.c
@@ -42,7 +42,7 @@ class MSCheck : public Module
  **/
 void myMemoServHelp(User * u)
 {
-    notice_lang(s_MemoServ, u, MEMO_HELP_CMD_CHECK);
+	notice_lang(s_MemoServ, u, MEMO_HELP_CMD_CHECK);
 }
 
 /**
@@ -52,56 +52,56 @@ void myMemoServHelp(User * u)
  **/
 int do_memocheck(User * u)
 {
-    NickAlias *na = NULL;
-    MemoInfo *mi = NULL;
-    int i, found = 0;
-    char *recipient = strtok(NULL, "");
-    struct tm *tm;
-    char timebuf[64];
-
-    if (!recipient) {
-        syntax_error(s_MemoServ, u, "CHECK", MEMO_CHECK_SYNTAX);
-        return MOD_CONT;
-    } else if (!nick_recognized(u)) {
-        notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
-        return MOD_CONT;
-    } else if (!(na = findnick(recipient))) {
-        notice_lang(s_MemoServ, u, NICK_X_NOT_REGISTERED, recipient);
-        return MOD_CONT;
-    }
-
-    if ((na->status & NS_VERBOTEN)) {
-        notice_lang(s_MemoServ, u, NICK_X_FORBIDDEN, recipient);
-        return MOD_CONT;
-    }
-
-    mi = &na->nc->memos;
+	NickAlias *na = NULL;
+	MemoInfo *mi = NULL;
+	int i, found = 0;
+	char *recipient = strtok(NULL, "");
+	struct tm *tm;
+	char timebuf[64];
+
+	if (!recipient) {
+		syntax_error(s_MemoServ, u, "CHECK", MEMO_CHECK_SYNTAX);
+		return MOD_CONT;
+	} else if (!nick_recognized(u)) {
+		notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
+		return MOD_CONT;
+	} else if (!(na = findnick(recipient))) {
+		notice_lang(s_MemoServ, u, NICK_X_NOT_REGISTERED, recipient);
+		return MOD_CONT;
+	}
+
+	if ((na->status & NS_VERBOTEN)) {
+		notice_lang(s_MemoServ, u, NICK_X_FORBIDDEN, recipient);
+		return MOD_CONT;
+	}
+
+	mi = &na->nc->memos;
 
 /* Okay, I know this looks strange but we wanna get the LAST memo, so we
-    have to loop backwards */
-
-    for (i = (mi->memocount - 1); i >= 0; i--) {
-        if (!stricmp(mi->memos[i].sender, u->na->nc->display)) {
-            found = 1;          /* Yes, we've found the memo */
-
-            tm = localtime(&mi->memos[i].time);
-            strftime_lang(timebuf, sizeof(timebuf), u,
-                          STRFTIME_DATE_TIME_FORMAT, tm);
-
-            if (mi->memos[i].flags & MF_UNREAD)
-                notice_lang(s_MemoServ, u, MEMO_CHECK_NOT_READ, na->nick,
-                            timebuf);
-            else
-                notice_lang(s_MemoServ, u, MEMO_CHECK_READ, na->nick,
-                            timebuf);
-            break;
-        }
-    }
-
-    if (!found)
-        notice_lang(s_MemoServ, u, MEMO_CHECK_NO_MEMO, na->nick);
-
-    return MOD_CONT;
+	have to loop backwards */
+
+	for (i = (mi->memocount - 1); i >= 0; i--) {
+		if (!stricmp(mi->memos[i].sender, u->na->nc->display)) {
+			found = 1;		  /* Yes, we've found the memo */
+
+			tm = localtime(&mi->memos[i].time);
+			strftime_lang(timebuf, sizeof(timebuf), u,
+						  STRFTIME_DATE_TIME_FORMAT, tm);
+
+			if (mi->memos[i].flags & MF_UNREAD)
+				notice_lang(s_MemoServ, u, MEMO_CHECK_NOT_READ, na->nick,
+							timebuf);
+			else
+				notice_lang(s_MemoServ, u, MEMO_CHECK_READ, na->nick,
+							timebuf);
+			break;
+		}
+	}
+
+	if (!found)
+		notice_lang(s_MemoServ, u, MEMO_CHECK_NO_MEMO, na->nick);
+
+	return MOD_CONT;
 }
 
 MODULE_INIT("ms_check", MSCheck)
diff --git a/src/core/ms_del.c b/src/core/ms_del.c
index 3cc877b9e..1f30eb25e 100644
--- a/src/core/ms_del.c
+++ b/src/core/ms_del.c
@@ -43,7 +43,7 @@ class MSDel : public Module
  **/
 void myMemoServHelp(User * u)
 {
-    notice_lang(s_MemoServ, u, MEMO_HELP_CMD_DEL);
+	notice_lang(s_MemoServ, u, MEMO_HELP_CMD_DEL);
 }
 
 /**
@@ -53,105 +53,105 @@ void myMemoServHelp(User * u)
  **/
 int do_del(User * u)
 {
-    MemoInfo *mi;
-    ChannelInfo *ci;
-    char *numstr = strtok(NULL, ""), *chan = NULL;
-    int last, last0, i;
-    char buf[BUFSIZE], *end;
-    int delcount, count, left;
+	MemoInfo *mi;
+	ChannelInfo *ci;
+	char *numstr = strtok(NULL, ""), *chan = NULL;
+	int last, last0, i;
+	char buf[BUFSIZE], *end;
+	int delcount, count, left;
 
-    if (numstr && *numstr == '#') {
-        chan = strtok(numstr, " ");
-        numstr = strtok(NULL, "");
-        if (!(ci = cs_findchan(chan))) {
-            notice_lang(s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan);
-            return MOD_CONT;
-        } else if (readonly) {
-            notice_lang(s_MemoServ, u, READ_ONLY_MODE);
-            return MOD_CONT;
-        } else if (ci->flags & CI_VERBOTEN) {
-            notice_lang(s_MemoServ, u, CHAN_X_FORBIDDEN, chan);
-            return MOD_CONT;
-        } else if (!check_access(u, ci, CA_MEMO)) {
-            notice_lang(s_MemoServ, u, ACCESS_DENIED);
-            return MOD_CONT;
-        }
-        mi = &ci->memos;
-    } else {
-        if (!nick_identified(u)) {
-            notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
-            return MOD_CONT;
-        }
-        mi = &u->na->nc->memos;
-    }
-    if (!numstr
-        || (!isdigit(*numstr) && stricmp(numstr, "ALL") != 0
-            && stricmp(numstr, "LAST") != 0)) {
-        syntax_error(s_MemoServ, u, "DEL", MEMO_DEL_SYNTAX);
-    } else if (mi->memocount == 0) {
-        if (chan)
-            notice_lang(s_MemoServ, u, MEMO_X_HAS_NO_MEMOS, chan);
-        else
-            notice_lang(s_MemoServ, u, MEMO_HAVE_NO_MEMOS);
-    } else {
-        if (isdigit(*numstr)) {
-            /* Delete a specific memo or memos. */
-            last = -1;          /* Last memo deleted */
-            last0 = -1;         /* Beginning of range of last memos deleted */
-            end = buf;
-            left = sizeof(buf);
-            delcount =
-                process_numlist(numstr, &count, del_memo_callback, u, mi,
-                                &last, &last0, &end, &left);
-            if (last != -1) {
-                /* Some memos got deleted; tell them which ones. */
-                if (delcount > 1) {
-                    if (last0 != last)
-                        end += snprintf(end, sizeof(buf) - (end - buf),
-                                        ",%d-%d", last0, last);
-                    else
-                        end += snprintf(end, sizeof(buf) - (end - buf),
-                                        ",%d", last);
-                    /* "buf+1" here because *buf == ',' */
-                    notice_lang(s_MemoServ, u, MEMO_DELETED_SEVERAL,
-                                buf + 1);
-                } else {
-                    notice_lang(s_MemoServ, u, MEMO_DELETED_ONE, last);
-                }
-            } else {
-                /* No memos were deleted.  Tell them so. */
-                if (count == 1)
-                    notice_lang(s_MemoServ, u, MEMO_DOES_NOT_EXIST,
-                                atoi(numstr));
-                else
-                    notice_lang(s_MemoServ, u, MEMO_DELETED_NONE);
-            }
-        } else if (stricmp(numstr, "LAST") == 0) {
-            /* Delete last memo. */
-            for (i = 0; i < mi->memocount; i++)
-                last = mi->memos[i].number;
-            delmemo(mi, last);
-            notice_lang(s_MemoServ, u, MEMO_DELETED_ONE, last);
-        } else {
-            /* Delete all memos. */
-            for (i = 0; i < mi->memocount; i++) {
-                free(mi->memos[i].text);
-                moduleCleanStruct(&mi->memos[i].moduleData);
-            }
-            free(mi->memos);
-            mi->memos = NULL;
-            mi->memocount = 0;
-            if (chan)
-                notice_lang(s_MemoServ, u, MEMO_CHAN_DELETED_ALL, chan);
-            else
-                notice_lang(s_MemoServ, u, MEMO_DELETED_ALL);
-        }
+	if (numstr && *numstr == '#') {
+		chan = strtok(numstr, " ");
+		numstr = strtok(NULL, "");
+		if (!(ci = cs_findchan(chan))) {
+			notice_lang(s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan);
+			return MOD_CONT;
+		} else if (readonly) {
+			notice_lang(s_MemoServ, u, READ_ONLY_MODE);
+			return MOD_CONT;
+		} else if (ci->flags & CI_VERBOTEN) {
+			notice_lang(s_MemoServ, u, CHAN_X_FORBIDDEN, chan);
+			return MOD_CONT;
+		} else if (!check_access(u, ci, CA_MEMO)) {
+			notice_lang(s_MemoServ, u, ACCESS_DENIED);
+			return MOD_CONT;
+		}
+		mi = &ci->memos;
+	} else {
+		if (!nick_identified(u)) {
+			notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
+			return MOD_CONT;
+		}
+		mi = &u->na->nc->memos;
+	}
+	if (!numstr
+		|| (!isdigit(*numstr) && stricmp(numstr, "ALL") != 0
+			&& stricmp(numstr, "LAST") != 0)) {
+		syntax_error(s_MemoServ, u, "DEL", MEMO_DEL_SYNTAX);
+	} else if (mi->memocount == 0) {
+		if (chan)
+			notice_lang(s_MemoServ, u, MEMO_X_HAS_NO_MEMOS, chan);
+		else
+			notice_lang(s_MemoServ, u, MEMO_HAVE_NO_MEMOS);
+	} else {
+		if (isdigit(*numstr)) {
+			/* Delete a specific memo or memos. */
+			last = -1;		  /* Last memo deleted */
+			last0 = -1;		 /* Beginning of range of last memos deleted */
+			end = buf;
+			left = sizeof(buf);
+			delcount =
+				process_numlist(numstr, &count, del_memo_callback, u, mi,
+								&last, &last0, &end, &left);
+			if (last != -1) {
+				/* Some memos got deleted; tell them which ones. */
+				if (delcount > 1) {
+					if (last0 != last)
+						end += snprintf(end, sizeof(buf) - (end - buf),
+										",%d-%d", last0, last);
+					else
+						end += snprintf(end, sizeof(buf) - (end - buf),
+										",%d", last);
+					/* "buf+1" here because *buf == ',' */
+					notice_lang(s_MemoServ, u, MEMO_DELETED_SEVERAL,
+								buf + 1);
+				} else {
+					notice_lang(s_MemoServ, u, MEMO_DELETED_ONE, last);
+				}
+			} else {
+				/* No memos were deleted.  Tell them so. */
+				if (count == 1)
+					notice_lang(s_MemoServ, u, MEMO_DOES_NOT_EXIST,
+								atoi(numstr));
+				else
+					notice_lang(s_MemoServ, u, MEMO_DELETED_NONE);
+			}
+		} else if (stricmp(numstr, "LAST") == 0) {
+			/* Delete last memo. */
+			for (i = 0; i < mi->memocount; i++)
+				last = mi->memos[i].number;
+			delmemo(mi, last);
+			notice_lang(s_MemoServ, u, MEMO_DELETED_ONE, last);
+		} else {
+			/* Delete all memos. */
+			for (i = 0; i < mi->memocount; i++) {
+				free(mi->memos[i].text);
+				moduleCleanStruct(&mi->memos[i].moduleData);
+			}
+			free(mi->memos);
+			mi->memos = NULL;
+			mi->memocount = 0;
+			if (chan)
+				notice_lang(s_MemoServ, u, MEMO_CHAN_DELETED_ALL, chan);
+			else
+				notice_lang(s_MemoServ, u, MEMO_DELETED_ALL);
+		}
 
-        /* Reset the order */
-        for (i = 0; i < mi->memocount; i++)
-            mi->memos[i].number = i + 1;
-    }
-    return MOD_CONT;
+		/* Reset the order */
+		for (i = 0; i < mi->memocount; i++)
+			mi->memos[i].number = i + 1;
+	}
+	return MOD_CONT;
 }
 
 /**
@@ -163,30 +163,30 @@ int do_del(User * u)
  */
 int del_memo_callback(User * u, int num, va_list args)
 {
-    MemoInfo *mi = va_arg(args, MemoInfo *);
-    int *last = va_arg(args, int *);
-    int *last0 = va_arg(args, int *);
-    char **end = va_arg(args, char **);
-    int *left = va_arg(args, int *);
+	MemoInfo *mi = va_arg(args, MemoInfo *);
+	int *last = va_arg(args, int *);
+	int *last0 = va_arg(args, int *);
+	char **end = va_arg(args, char **);
+	int *left = va_arg(args, int *);
 
-    if (delmemo(mi, num)) {
-        if (num != (*last) + 1) {
-            if (*last != -1) {
-                int len;
-                if (*last0 != *last)
-                    len = snprintf(*end, *left, ",%d-%d", *last0, *last);
-                else
-                    len = snprintf(*end, *left, ",%d", *last);
-                *end += len;
-                *left -= len;
-            }
-            *last0 = num;
-        }
-        *last = num;
-        return 1;
-    } else {
-        return 0;
-    }
+	if (delmemo(mi, num)) {
+		if (num != (*last) + 1) {
+			if (*last != -1) {
+				int len;
+				if (*last0 != *last)
+					len = snprintf(*end, *left, ",%d-%d", *last0, *last);
+				else
+					len = snprintf(*end, *left, ",%d", *last);
+				*end += len;
+				*left -= len;
+			}
+			*last0 = num;
+		}
+		*last = num;
+		return 1;
+	} else {
+		return 0;
+	}
 }
 
 MODULE_INIT("ms_del", MSDel)
diff --git a/src/core/ms_help.c b/src/core/ms_help.c
index 7a8961190..0b04957a3 100644
--- a/src/core/ms_help.c
+++ b/src/core/ms_help.c
@@ -42,16 +42,16 @@ class MSHelp : public Module
  **/
 int do_help(User * u)
 {
-    char *cmd = strtok(NULL, "");
-
-    if (!cmd) {
-        notice_help(s_MemoServ, u, MEMO_HELP_HEADER);
-        moduleDisplayHelp(3, u);
-        notice_help(s_MemoServ, u, MEMO_HELP_FOOTER, s_ChanServ);
-    } else {
-        mod_help_cmd(s_MemoServ, u, MEMOSERV, cmd);
-    }
-    return MOD_CONT;
+	char *cmd = strtok(NULL, "");
+
+	if (!cmd) {
+		notice_help(s_MemoServ, u, MEMO_HELP_HEADER);
+		moduleDisplayHelp(3, u);
+		notice_help(s_MemoServ, u, MEMO_HELP_FOOTER, s_ChanServ);
+	} else {
+		mod_help_cmd(s_MemoServ, u, MEMOSERV, cmd);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("ms_help", MSHelp)
diff --git a/src/core/ms_info.c b/src/core/ms_info.c
index 74985cb2e..501730416 100644
--- a/src/core/ms_info.c
+++ b/src/core/ms_info.c
@@ -42,7 +42,7 @@ class MSInfo : public Module
  **/
 void myMemoServHelp(User * u)
 {
-    notice_lang(s_MemoServ, u, MEMO_HELP_CMD_INFO);
+	notice_lang(s_MemoServ, u, MEMO_HELP_CMD_INFO);
 }
 
 /**
@@ -52,169 +52,169 @@ void myMemoServHelp(User * u)
  **/
 int do_info(User * u)
 {
-    MemoInfo *mi;
-    NickAlias *na = NULL;
-    ChannelInfo *ci = NULL;
-    char *name = strtok(NULL, " ");
-    int is_servadmin = is_services_admin(u);
-    int hardmax = 0;
-
-    if (is_servadmin && name && *name != '#') {
-        na = findnick(name);
-        if (!na) {
-            notice_lang(s_MemoServ, u, NICK_X_NOT_REGISTERED, name);
-            return MOD_CONT;
-        } else if (na->status & NS_VERBOTEN) {
-            notice_lang(s_MemoServ, u, NICK_X_FORBIDDEN, name);
-            return MOD_CONT;
-        }
-        mi = &na->nc->memos;
-        hardmax = na->nc->flags & NI_MEMO_HARDMAX ? 1 : 0;
-    } else if (name && *name == '#') {
-        ci = cs_findchan(name);
-        if (!ci) {
-            notice_lang(s_MemoServ, u, CHAN_X_NOT_REGISTERED, name);
-            return MOD_CONT;
-        } else if (ci->flags & CI_VERBOTEN) {
-            notice_lang(s_MemoServ, u, CHAN_X_FORBIDDEN, name);
-            return MOD_CONT;
-        } else if (!check_access(u, ci, CA_MEMO)) {
-            notice_lang(s_MemoServ, u, ACCESS_DENIED);
-            return MOD_CONT;
-        }
-        mi = &ci->memos;
-        hardmax = ci->flags & CI_MEMO_HARDMAX ? 1 : 0;
-    } else if (name) {          /* It's not a chan and we aren't services admin */
-        notice_lang(s_MemoServ, u, ACCESS_DENIED);
-        return MOD_CONT;
-    } else {                    /* !name */
-        if (!nick_identified(u)) {
-            notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
-            return MOD_CONT;
-        }
-        mi = &u->na->nc->memos;
-        hardmax = u->na->nc->flags & NI_MEMO_HARDMAX ? 1 : 0;
-    }
-
-    if (name && (ci || na->nc != u->na->nc)) {
-
-        if (!mi->memocount) {
-            notice_lang(s_MemoServ, u, MEMO_INFO_X_NO_MEMOS, name);
-        } else if (mi->memocount == 1) {
-            if (mi->memos[0].flags & MF_UNREAD)
-                notice_lang(s_MemoServ, u, MEMO_INFO_X_MEMO_UNREAD, name);
-            else
-                notice_lang(s_MemoServ, u, MEMO_INFO_X_MEMO, name);
-        } else {
-            int count = 0, i;
-            for (i = 0; i < mi->memocount; i++) {
-                if (mi->memos[i].flags & MF_UNREAD)
-                    count++;
-            }
-            if (count == mi->memocount)
-                notice_lang(s_MemoServ, u, MEMO_INFO_X_MEMOS_ALL_UNREAD,
-                            name, count);
-            else if (count == 0)
-                notice_lang(s_MemoServ, u, MEMO_INFO_X_MEMOS, name,
-                            mi->memocount);
-            else if (count == 1)
-                notice_lang(s_MemoServ, u, MEMO_INFO_X_MEMOS_ONE_UNREAD,
-                            name, mi->memocount);
-            else
-                notice_lang(s_MemoServ, u, MEMO_INFO_X_MEMOS_SOME_UNREAD,
-                            name, mi->memocount, count);
-        }
-        if (mi->memomax == 0) {
-            if (hardmax)
-                notice_lang(s_MemoServ, u, MEMO_INFO_X_HARD_LIMIT, name,
-                            mi->memomax);
-            else
-                notice_lang(s_MemoServ, u, MEMO_INFO_X_LIMIT, name,
-                            mi->memomax);
-        } else if (mi->memomax > 0) {
-            if (hardmax)
-                notice_lang(s_MemoServ, u, MEMO_INFO_X_HARD_LIMIT, name,
-                            mi->memomax);
-            else
-                notice_lang(s_MemoServ, u, MEMO_INFO_X_LIMIT, name,
-                            mi->memomax);
-        } else {
-            notice_lang(s_MemoServ, u, MEMO_INFO_X_NO_LIMIT, name);
-        }
-
-        /* I ripped this code out of ircservices 4.4.5, since I didn't want
-           to rewrite the whole thing (it pisses me off). */
-        if (na) {
-            if ((na->nc->flags & NI_MEMO_RECEIVE)
-                && (na->nc->flags & NI_MEMO_SIGNON)) {
-                notice_lang(s_MemoServ, u, MEMO_INFO_X_NOTIFY_ON, name);
-            } else if (na->nc->flags & NI_MEMO_RECEIVE) {
-                notice_lang(s_MemoServ, u, MEMO_INFO_X_NOTIFY_RECEIVE,
-                            name);
-            } else if (na->nc->flags & NI_MEMO_SIGNON) {
-                notice_lang(s_MemoServ, u, MEMO_INFO_X_NOTIFY_SIGNON,
-                            name);
-            } else {
-                notice_lang(s_MemoServ, u, MEMO_INFO_X_NOTIFY_OFF, name);
-            }
-        }
-
-    } else {                    /* !name || (!ci || na->nc == u->na->nc) */
-
-        if (!mi->memocount) {
-            notice_lang(s_MemoServ, u, MEMO_INFO_NO_MEMOS);
-        } else if (mi->memocount == 1) {
-            if (mi->memos[0].flags & MF_UNREAD)
-                notice_lang(s_MemoServ, u, MEMO_INFO_MEMO_UNREAD);
-            else
-                notice_lang(s_MemoServ, u, MEMO_INFO_MEMO);
-        } else {
-            int count = 0, i;
-            for (i = 0; i < mi->memocount; i++) {
-                if (mi->memos[i].flags & MF_UNREAD)
-                    count++;
-            }
-            if (count == mi->memocount)
-                notice_lang(s_MemoServ, u, MEMO_INFO_MEMOS_ALL_UNREAD,
-                            count);
-            else if (count == 0)
-                notice_lang(s_MemoServ, u, MEMO_INFO_MEMOS, mi->memocount);
-            else if (count == 1)
-                notice_lang(s_MemoServ, u, MEMO_INFO_MEMOS_ONE_UNREAD,
-                            mi->memocount);
-            else
-                notice_lang(s_MemoServ, u, MEMO_INFO_MEMOS_SOME_UNREAD,
-                            mi->memocount, count);
-        }
-
-        if (mi->memomax == 0) {
-            if (!is_servadmin && 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)
-                notice_lang(s_MemoServ, u, MEMO_INFO_HARD_LIMIT,
-                            mi->memomax);
-            else
-                notice_lang(s_MemoServ, u, MEMO_INFO_LIMIT, mi->memomax);
-        } else {
-            notice_lang(s_MemoServ, u, MEMO_INFO_NO_LIMIT);
-        }
-
-        /* Ripped too. But differently because of a seg fault (loughs) */
-        if ((u->na->nc->flags & NI_MEMO_RECEIVE)
-            && (u->na->nc->flags & NI_MEMO_SIGNON)) {
-            notice_lang(s_MemoServ, u, MEMO_INFO_NOTIFY_ON);
-        } else if (u->na->nc->flags & NI_MEMO_RECEIVE) {
-            notice_lang(s_MemoServ, u, MEMO_INFO_NOTIFY_RECEIVE);
-        } else if (u->na->nc->flags & NI_MEMO_SIGNON) {
-            notice_lang(s_MemoServ, u, MEMO_INFO_NOTIFY_SIGNON);
-        } else {
-            notice_lang(s_MemoServ, u, MEMO_INFO_NOTIFY_OFF);
-        }
-    }
-    return MOD_CONT;            /* if (name && (ci || na->nc != u->na->nc)) */
+	MemoInfo *mi;
+	NickAlias *na = NULL;
+	ChannelInfo *ci = NULL;
+	char *name = strtok(NULL, " ");
+	int is_servadmin = is_services_admin(u);
+	int hardmax = 0;
+
+	if (is_servadmin && name && *name != '#') {
+		na = findnick(name);
+		if (!na) {
+			notice_lang(s_MemoServ, u, NICK_X_NOT_REGISTERED, name);
+			return MOD_CONT;
+		} else if (na->status & NS_VERBOTEN) {
+			notice_lang(s_MemoServ, u, NICK_X_FORBIDDEN, name);
+			return MOD_CONT;
+		}
+		mi = &na->nc->memos;
+		hardmax = na->nc->flags & NI_MEMO_HARDMAX ? 1 : 0;
+	} else if (name && *name == '#') {
+		ci = cs_findchan(name);
+		if (!ci) {
+			notice_lang(s_MemoServ, u, CHAN_X_NOT_REGISTERED, name);
+			return MOD_CONT;
+		} else if (ci->flags & CI_VERBOTEN) {
+			notice_lang(s_MemoServ, u, CHAN_X_FORBIDDEN, name);
+			return MOD_CONT;
+		} else if (!check_access(u, ci, CA_MEMO)) {
+			notice_lang(s_MemoServ, u, ACCESS_DENIED);
+			return MOD_CONT;
+		}
+		mi = &ci->memos;
+		hardmax = ci->flags & CI_MEMO_HARDMAX ? 1 : 0;
+	} else if (name) {		  /* It's not a chan and we aren't services admin */
+		notice_lang(s_MemoServ, u, ACCESS_DENIED);
+		return MOD_CONT;
+	} else {					/* !name */
+		if (!nick_identified(u)) {
+			notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
+			return MOD_CONT;
+		}
+		mi = &u->na->nc->memos;
+		hardmax = u->na->nc->flags & NI_MEMO_HARDMAX ? 1 : 0;
+	}
+
+	if (name && (ci || na->nc != u->na->nc)) {
+
+		if (!mi->memocount) {
+			notice_lang(s_MemoServ, u, MEMO_INFO_X_NO_MEMOS, name);
+		} else if (mi->memocount == 1) {
+			if (mi->memos[0].flags & MF_UNREAD)
+				notice_lang(s_MemoServ, u, MEMO_INFO_X_MEMO_UNREAD, name);
+			else
+				notice_lang(s_MemoServ, u, MEMO_INFO_X_MEMO, name);
+		} else {
+			int count = 0, i;
+			for (i = 0; i < mi->memocount; i++) {
+				if (mi->memos[i].flags & MF_UNREAD)
+					count++;
+			}
+			if (count == mi->memocount)
+				notice_lang(s_MemoServ, u, MEMO_INFO_X_MEMOS_ALL_UNREAD,
+							name, count);
+			else if (count == 0)
+				notice_lang(s_MemoServ, u, MEMO_INFO_X_MEMOS, name,
+							mi->memocount);
+			else if (count == 1)
+				notice_lang(s_MemoServ, u, MEMO_INFO_X_MEMOS_ONE_UNREAD,
+							name, mi->memocount);
+			else
+				notice_lang(s_MemoServ, u, MEMO_INFO_X_MEMOS_SOME_UNREAD,
+							name, mi->memocount, count);
+		}
+		if (mi->memomax == 0) {
+			if (hardmax)
+				notice_lang(s_MemoServ, u, MEMO_INFO_X_HARD_LIMIT, name,
+							mi->memomax);
+			else
+				notice_lang(s_MemoServ, u, MEMO_INFO_X_LIMIT, name,
+							mi->memomax);
+		} else if (mi->memomax > 0) {
+			if (hardmax)
+				notice_lang(s_MemoServ, u, MEMO_INFO_X_HARD_LIMIT, name,
+							mi->memomax);
+			else
+				notice_lang(s_MemoServ, u, MEMO_INFO_X_LIMIT, name,
+							mi->memomax);
+		} else {
+			notice_lang(s_MemoServ, u, MEMO_INFO_X_NO_LIMIT, name);
+		}
+
+		/* I ripped this code out of ircservices 4.4.5, since I didn't want
+		   to rewrite the whole thing (it pisses me off). */
+		if (na) {
+			if ((na->nc->flags & NI_MEMO_RECEIVE)
+				&& (na->nc->flags & NI_MEMO_SIGNON)) {
+				notice_lang(s_MemoServ, u, MEMO_INFO_X_NOTIFY_ON, name);
+			} else if (na->nc->flags & NI_MEMO_RECEIVE) {
+				notice_lang(s_MemoServ, u, MEMO_INFO_X_NOTIFY_RECEIVE,
+							name);
+			} else if (na->nc->flags & NI_MEMO_SIGNON) {
+				notice_lang(s_MemoServ, u, MEMO_INFO_X_NOTIFY_SIGNON,
+							name);
+			} else {
+				notice_lang(s_MemoServ, u, MEMO_INFO_X_NOTIFY_OFF, name);
+			}
+		}
+
+	} else {					/* !name || (!ci || na->nc == u->na->nc) */
+
+		if (!mi->memocount) {
+			notice_lang(s_MemoServ, u, MEMO_INFO_NO_MEMOS);
+		} else if (mi->memocount == 1) {
+			if (mi->memos[0].flags & MF_UNREAD)
+				notice_lang(s_MemoServ, u, MEMO_INFO_MEMO_UNREAD);
+			else
+				notice_lang(s_MemoServ, u, MEMO_INFO_MEMO);
+		} else {
+			int count = 0, i;
+			for (i = 0; i < mi->memocount; i++) {
+				if (mi->memos[i].flags & MF_UNREAD)
+					count++;
+			}
+			if (count == mi->memocount)
+				notice_lang(s_MemoServ, u, MEMO_INFO_MEMOS_ALL_UNREAD,
+							count);
+			else if (count == 0)
+				notice_lang(s_MemoServ, u, MEMO_INFO_MEMOS, mi->memocount);
+			else if (count == 1)
+				notice_lang(s_MemoServ, u, MEMO_INFO_MEMOS_ONE_UNREAD,
+							mi->memocount);
+			else
+				notice_lang(s_MemoServ, u, MEMO_INFO_MEMOS_SOME_UNREAD,
+							mi->memocount, count);
+		}
+
+		if (mi->memomax == 0) {
+			if (!is_servadmin && 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)
+				notice_lang(s_MemoServ, u, MEMO_INFO_HARD_LIMIT,
+							mi->memomax);
+			else
+				notice_lang(s_MemoServ, u, MEMO_INFO_LIMIT, mi->memomax);
+		} else {
+			notice_lang(s_MemoServ, u, MEMO_INFO_NO_LIMIT);
+		}
+
+		/* Ripped too. But differently because of a seg fault (loughs) */
+		if ((u->na->nc->flags & NI_MEMO_RECEIVE)
+			&& (u->na->nc->flags & NI_MEMO_SIGNON)) {
+			notice_lang(s_MemoServ, u, MEMO_INFO_NOTIFY_ON);
+		} else if (u->na->nc->flags & NI_MEMO_RECEIVE) {
+			notice_lang(s_MemoServ, u, MEMO_INFO_NOTIFY_RECEIVE);
+		} else if (u->na->nc->flags & NI_MEMO_SIGNON) {
+			notice_lang(s_MemoServ, u, MEMO_INFO_NOTIFY_SIGNON);
+		} else {
+			notice_lang(s_MemoServ, u, MEMO_INFO_NOTIFY_OFF);
+		}
+	}
+	return MOD_CONT;			/* if (name && (ci || na->nc != u->na->nc)) */
 }
 
 MODULE_INIT("ms_info", MSInfo)
diff --git a/src/core/ms_list.c b/src/core/ms_list.c
index 4ea74fbfe..148433ff0 100644
--- a/src/core/ms_list.c
+++ b/src/core/ms_list.c
@@ -44,7 +44,7 @@ class MSList : public Module
  **/
 void myMemoServHelp(User * u)
 {
-    notice_lang(s_MemoServ, u, MEMO_HELP_CMD_LIST);
+	notice_lang(s_MemoServ, u, MEMO_HELP_CMD_LIST);
 }
 
 /**
@@ -54,68 +54,68 @@ void myMemoServHelp(User * u)
  **/
 int do_list(User * u)
 {
-    char *param = strtok(NULL, " "), *chan = NULL;
-    ChannelInfo *ci;
-    MemoInfo *mi;
-    Memo *m;
-    int i;
+	char *param = strtok(NULL, " "), *chan = NULL;
+	ChannelInfo *ci;
+	MemoInfo *mi;
+	Memo *m;
+	int i;
 
-    if (param && *param == '#') {
-        chan = param;
-        param = strtok(NULL, " ");
-        if (!(ci = cs_findchan(chan))) {
-            notice_lang(s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan);
-            return MOD_CONT;
-        } else if (ci->flags & CI_VERBOTEN) {
-            notice_lang(s_MemoServ, u, CHAN_X_FORBIDDEN, chan);
-            return MOD_CONT;
-        } else if (!check_access(u, ci, CA_MEMO)) {
-            notice_lang(s_MemoServ, u, ACCESS_DENIED);
-            return MOD_CONT;
-        }
-        mi = &ci->memos;
-    } else {
-        if (!nick_identified(u)) {
-            notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
-            return MOD_CONT;
-        }
-        mi = &u->na->nc->memos;
-    }
-    if (param && !isdigit(*param) && stricmp(param, "NEW") != 0) {
-        syntax_error(s_MemoServ, u, "LIST", MEMO_LIST_SYNTAX);
-    } else if (mi->memocount == 0) {
-        if (chan)
-            notice_lang(s_MemoServ, u, MEMO_X_HAS_NO_MEMOS, chan);
-        else
-            notice_lang(s_MemoServ, u, MEMO_HAVE_NO_MEMOS);
-    } else {
-        int sent_header = 0;
-        if (param && isdigit(*param)) {
-            process_numlist(param, NULL, list_memo_callback, u,
-                            mi, &sent_header, chan);
-        } else {
-            if (param) {
-                for (i = 0, m = mi->memos; i < mi->memocount; i++, m++) {
-                    if (m->flags & MF_UNREAD)
-                        break;
-                }
-                if (i == mi->memocount) {
-                    if (chan)
-                        notice_lang(s_MemoServ, u, MEMO_X_HAS_NO_NEW_MEMOS,
-                                    chan);
-                    else
-                        notice_lang(s_MemoServ, u, MEMO_HAVE_NO_NEW_MEMOS);
-                    return MOD_CONT;
-                }
-            }
-            for (i = 0, m = mi->memos; i < mi->memocount; i++, m++) {
-                if (param && !(m->flags & MF_UNREAD))
-                    continue;
-                list_memo(u, i, mi, &sent_header, param != NULL, chan);
-            }
-        }
-    }
-    return MOD_CONT;
+	if (param && *param == '#') {
+		chan = param;
+		param = strtok(NULL, " ");
+		if (!(ci = cs_findchan(chan))) {
+			notice_lang(s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan);
+			return MOD_CONT;
+		} else if (ci->flags & CI_VERBOTEN) {
+			notice_lang(s_MemoServ, u, CHAN_X_FORBIDDEN, chan);
+			return MOD_CONT;
+		} else if (!check_access(u, ci, CA_MEMO)) {
+			notice_lang(s_MemoServ, u, ACCESS_DENIED);
+			return MOD_CONT;
+		}
+		mi = &ci->memos;
+	} else {
+		if (!nick_identified(u)) {
+			notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
+			return MOD_CONT;
+		}
+		mi = &u->na->nc->memos;
+	}
+	if (param && !isdigit(*param) && stricmp(param, "NEW") != 0) {
+		syntax_error(s_MemoServ, u, "LIST", MEMO_LIST_SYNTAX);
+	} else if (mi->memocount == 0) {
+		if (chan)
+			notice_lang(s_MemoServ, u, MEMO_X_HAS_NO_MEMOS, chan);
+		else
+			notice_lang(s_MemoServ, u, MEMO_HAVE_NO_MEMOS);
+	} else {
+		int sent_header = 0;
+		if (param && isdigit(*param)) {
+			process_numlist(param, NULL, list_memo_callback, u,
+							mi, &sent_header, chan);
+		} else {
+			if (param) {
+				for (i = 0, m = mi->memos; i < mi->memocount; i++, m++) {
+					if (m->flags & MF_UNREAD)
+						break;
+				}
+				if (i == mi->memocount) {
+					if (chan)
+						notice_lang(s_MemoServ, u, MEMO_X_HAS_NO_NEW_MEMOS,
+									chan);
+					else
+						notice_lang(s_MemoServ, u, MEMO_HAVE_NO_NEW_MEMOS);
+					return MOD_CONT;
+				}
+			}
+			for (i = 0, m = mi->memos; i < mi->memocount; i++, m++) {
+				if (param && !(m->flags & MF_UNREAD))
+					continue;
+				list_memo(u, i, mi, &sent_header, param != NULL, chan);
+			}
+		}
+	}
+	return MOD_CONT;
 }
 
 /**
@@ -127,17 +127,17 @@ int do_list(User * u)
  */
 int list_memo_callback(User * u, int num, va_list args)
 {
-    MemoInfo *mi = va_arg(args, MemoInfo *);
-    int *sent_header = va_arg(args, int *);
-    const char *chan = va_arg(args, const char *);
-    int i;
+	MemoInfo *mi = va_arg(args, MemoInfo *);
+	int *sent_header = va_arg(args, int *);
+	const char *chan = va_arg(args, const char *);
+	int i;
 
-    for (i = 0; i < mi->memocount; i++) {
-        if (mi->memos[i].number == num)
-            break;
-    }
-    /* Range checking done by list_memo() */
-    return list_memo(u, i, mi, sent_header, 0, chan);
+	for (i = 0; i < mi->memocount; i++) {
+		if (mi->memos[i].number == num)
+			break;
+	}
+	/* Range checking done by list_memo() */
+	return list_memo(u, i, mi, sent_header, 0, chan);
 }
 
 /**
@@ -152,34 +152,34 @@ int list_memo_callback(User * u, int num, va_list args)
  */
 int list_memo(User * u, int index, MemoInfo * mi, int *sent_header, int newi, const char *chan)
 {
-    Memo *m;
-    char timebuf[64];
-    struct tm tm;
+	Memo *m;
+	char timebuf[64];
+	struct tm tm;
 
-    if (index < 0 || index >= mi->memocount)
-        return 0;
-    if (!*sent_header) {
-        if (chan) {
-            notice_lang(s_MemoServ, u,
-                        newi ? MEMO_LIST_CHAN_NEW_MEMOS :
-                        MEMO_LIST_CHAN_MEMOS, chan, s_MemoServ, chan);
-        } else {
-            notice_lang(s_MemoServ, u,
-                        newi ? MEMO_LIST_NEW_MEMOS : MEMO_LIST_MEMOS,
-                        u->nick, s_MemoServ);
-        }
-        notice_lang(s_MemoServ, u, MEMO_LIST_HEADER);
-        *sent_header = 1;
-    }
-    m = &mi->memos[index];
-    tm = *localtime(&m->time);
-    strftime_lang(timebuf, sizeof(timebuf),
-                  u, STRFTIME_DATE_TIME_FORMAT, &tm);
-    timebuf[sizeof(timebuf) - 1] = 0;   /* just in case */
-    notice_lang(s_MemoServ, u, MEMO_LIST_FORMAT,
-                (m->flags & MF_UNREAD) ? '*' : ' ',
-                m->number, m->sender, timebuf);
-    return 1;
+	if (index < 0 || index >= mi->memocount)
+		return 0;
+	if (!*sent_header) {
+		if (chan) {
+			notice_lang(s_MemoServ, u,
+						newi ? MEMO_LIST_CHAN_NEW_MEMOS :
+						MEMO_LIST_CHAN_MEMOS, chan, s_MemoServ, chan);
+		} else {
+			notice_lang(s_MemoServ, u,
+						newi ? MEMO_LIST_NEW_MEMOS : MEMO_LIST_MEMOS,
+						u->nick, s_MemoServ);
+		}
+		notice_lang(s_MemoServ, u, MEMO_LIST_HEADER);
+		*sent_header = 1;
+	}
+	m = &mi->memos[index];
+	tm = *localtime(&m->time);
+	strftime_lang(timebuf, sizeof(timebuf),
+				  u, STRFTIME_DATE_TIME_FORMAT, &tm);
+	timebuf[sizeof(timebuf) - 1] = 0;   /* just in case */
+	notice_lang(s_MemoServ, u, MEMO_LIST_FORMAT,
+				(m->flags & MF_UNREAD) ? '*' : ' ',
+				m->number, m->sender, timebuf);
+	return 1;
 }
 
 MODULE_INIT("ms_list", MSList)
diff --git a/src/core/ms_read.c b/src/core/ms_read.c
index 3877b7458..07f293156 100644
--- a/src/core/ms_read.c
+++ b/src/core/ms_read.c
@@ -46,7 +46,7 @@ class MSRead : public Module
  **/
 void myMemoServHelp(User * u)
 {
-    notice_lang(s_MemoServ, u, MEMO_HELP_CMD_READ);
+	notice_lang(s_MemoServ, u, MEMO_HELP_CMD_READ);
 }
 
 /**
@@ -56,78 +56,78 @@ void myMemoServHelp(User * u)
  **/
 int do_read(User * u)
 {
-    MemoInfo *mi;
-    ChannelInfo *ci;
-    char *numstr = strtok(NULL, " "), *chan = NULL;
-    int num, count;
-
-    if (numstr && *numstr == '#') {
-        chan = numstr;
-        numstr = strtok(NULL, " ");
-        if (!(ci = cs_findchan(chan))) {
-            notice_lang(s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan);
-            return MOD_CONT;
-        } else if (ci->flags & CI_VERBOTEN) {
-            notice_lang(s_MemoServ, u, CHAN_X_FORBIDDEN, chan);
-            return MOD_CONT;
-        } else if (!check_access(u, ci, CA_MEMO)) {
-            notice_lang(s_MemoServ, u, ACCESS_DENIED);
-            return MOD_CONT;
-        }
-        mi = &ci->memos;
-    } else {
-        if (!nick_identified(u)) {
-            notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
-            return MOD_CONT;
-        }
-        mi = &u->na->nc->memos;
-    }
-    num = numstr ? atoi(numstr) : -1;
-    if (!numstr
-        || (stricmp(numstr, "LAST") != 0 && stricmp(numstr, "NEW") != 0
-            && num <= 0)) {
-        syntax_error(s_MemoServ, u, "READ", MEMO_READ_SYNTAX);
-
-    } else if (mi->memocount == 0) {
-        if (chan)
-            notice_lang(s_MemoServ, u, MEMO_X_HAS_NO_MEMOS, chan);
-        else
-            notice_lang(s_MemoServ, u, MEMO_HAVE_NO_MEMOS);
-
-    } else {
-        int i;
-
-        if (stricmp(numstr, "NEW") == 0) {
-            int readcount = 0;
-            for (i = 0; i < mi->memocount; i++) {
-                if (mi->memos[i].flags & MF_UNREAD) {
-                    read_memo(u, i, mi, chan);
-                    readcount++;
-                }
-            }
-            if (!readcount) {
-                if (chan)
-                    notice_lang(s_MemoServ, u, MEMO_X_HAS_NO_NEW_MEMOS,
-                                chan);
-                else
-                    notice_lang(s_MemoServ, u, MEMO_HAVE_NO_NEW_MEMOS);
-            }
-        } else if (stricmp(numstr, "LAST") == 0) {
-            for (i = 0; i < mi->memocount - 1; i++);
-            read_memo(u, i, mi, chan);
-        } else {                /* number[s] */
-            if (!process_numlist(numstr, &count, read_memo_callback, u,
-                                 mi, chan)) {
-                if (count == 1)
-                    notice_lang(s_MemoServ, u, MEMO_DOES_NOT_EXIST, num);
-                else
-                    notice_lang(s_MemoServ, u, MEMO_LIST_NOT_FOUND,
-                                numstr);
-            }
-        }
-
-    }
-    return MOD_CONT;
+	MemoInfo *mi;
+	ChannelInfo *ci;
+	char *numstr = strtok(NULL, " "), *chan = NULL;
+	int num, count;
+
+	if (numstr && *numstr == '#') {
+		chan = numstr;
+		numstr = strtok(NULL, " ");
+		if (!(ci = cs_findchan(chan))) {
+			notice_lang(s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan);
+			return MOD_CONT;
+		} else if (ci->flags & CI_VERBOTEN) {
+			notice_lang(s_MemoServ, u, CHAN_X_FORBIDDEN, chan);
+			return MOD_CONT;
+		} else if (!check_access(u, ci, CA_MEMO)) {
+			notice_lang(s_MemoServ, u, ACCESS_DENIED);
+			return MOD_CONT;
+		}
+		mi = &ci->memos;
+	} else {
+		if (!nick_identified(u)) {
+			notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
+			return MOD_CONT;
+		}
+		mi = &u->na->nc->memos;
+	}
+	num = numstr ? atoi(numstr) : -1;
+	if (!numstr
+		|| (stricmp(numstr, "LAST") != 0 && stricmp(numstr, "NEW") != 0
+			&& num <= 0)) {
+		syntax_error(s_MemoServ, u, "READ", MEMO_READ_SYNTAX);
+
+	} else if (mi->memocount == 0) {
+		if (chan)
+			notice_lang(s_MemoServ, u, MEMO_X_HAS_NO_MEMOS, chan);
+		else
+			notice_lang(s_MemoServ, u, MEMO_HAVE_NO_MEMOS);
+
+	} else {
+		int i;
+
+		if (stricmp(numstr, "NEW") == 0) {
+			int readcount = 0;
+			for (i = 0; i < mi->memocount; i++) {
+				if (mi->memos[i].flags & MF_UNREAD) {
+					read_memo(u, i, mi, chan);
+					readcount++;
+				}
+			}
+			if (!readcount) {
+				if (chan)
+					notice_lang(s_MemoServ, u, MEMO_X_HAS_NO_NEW_MEMOS,
+								chan);
+				else
+					notice_lang(s_MemoServ, u, MEMO_HAVE_NO_NEW_MEMOS);
+			}
+		} else if (stricmp(numstr, "LAST") == 0) {
+			for (i = 0; i < mi->memocount - 1; i++);
+			read_memo(u, i, mi, chan);
+		} else {				/* number[s] */
+			if (!process_numlist(numstr, &count, read_memo_callback, u,
+								 mi, chan)) {
+				if (count == 1)
+					notice_lang(s_MemoServ, u, MEMO_DOES_NOT_EXIST, num);
+				else
+					notice_lang(s_MemoServ, u, MEMO_LIST_NOT_FOUND,
+								numstr);
+			}
+		}
+
+	}
+	return MOD_CONT;
 }
 
 /**
@@ -139,16 +139,16 @@ int do_read(User * u)
  */
 int read_memo_callback(User * u, int num, va_list args)
 {
-    MemoInfo *mi = va_arg(args, MemoInfo *);
-    const char *chan = va_arg(args, const char *);
-    int i;
-
-    for (i = 0; i < mi->memocount; i++) {
-        if (mi->memos[i].number == num)
-            break;
-    }
-    /* Range check done in read_memo */
-    return read_memo(u, i, mi, chan);
+	MemoInfo *mi = va_arg(args, MemoInfo *);
+	const char *chan = va_arg(args, const char *);
+	int i;
+
+	for (i = 0; i < mi->memocount; i++) {
+		if (mi->memos[i].number == num)
+			break;
+	}
+	/* Range check done in read_memo */
+	return read_memo(u, i, mi, chan);
 }
 
 /**
@@ -161,32 +161,32 @@ int read_memo_callback(User * u, int num, va_list args)
  */
 int read_memo(User * u, int index, MemoInfo * mi, const char *chan)
 {
-    Memo *m;
-    char timebuf[64];
-    struct tm tm;
-
-    if (index < 0 || index >= mi->memocount)
-        return 0;
-    m = &mi->memos[index];
-    tm = *localtime(&m->time);
-    strftime_lang(timebuf, sizeof(timebuf),
-                  u, STRFTIME_DATE_TIME_FORMAT, &tm);
-    timebuf[sizeof(timebuf) - 1] = 0;
-    if (chan)
-        notice_lang(s_MemoServ, u, MEMO_CHAN_HEADER, m->number,
-                    m->sender, timebuf, s_MemoServ, chan, m->number);
-    else
-        notice_lang(s_MemoServ, u, MEMO_HEADER, m->number,
-                    m->sender, timebuf, s_MemoServ, m->number);
-    notice_lang(s_MemoServ, u, MEMO_TEXT, m->text);
-    m->flags &= ~MF_UNREAD;
-
-    /* Check if a receipt notification was requested */
-    if (m->flags & MF_RECEIPT) {
-        rsend_notify(u, m, chan);
-    }
-
-    return 1;
+	Memo *m;
+	char timebuf[64];
+	struct tm tm;
+
+	if (index < 0 || index >= mi->memocount)
+		return 0;
+	m = &mi->memos[index];
+	tm = *localtime(&m->time);
+	strftime_lang(timebuf, sizeof(timebuf),
+				  u, STRFTIME_DATE_TIME_FORMAT, &tm);
+	timebuf[sizeof(timebuf) - 1] = 0;
+	if (chan)
+		notice_lang(s_MemoServ, u, MEMO_CHAN_HEADER, m->number,
+					m->sender, timebuf, s_MemoServ, chan, m->number);
+	else
+		notice_lang(s_MemoServ, u, MEMO_HEADER, m->number,
+					m->sender, timebuf, s_MemoServ, m->number);
+	notice_lang(s_MemoServ, u, MEMO_TEXT, m->text);
+	m->flags &= ~MF_UNREAD;
+
+	/* Check if a receipt notification was requested */
+	if (m->flags & MF_RECEIPT) {
+		rsend_notify(u, m, chan);
+	}
+
+	return 1;
 }
 
 MODULE_INIT("ms_read", MSRead)
diff --git a/src/core/ms_rsend.c b/src/core/ms_rsend.c
index 2ce4f3b7a..2b2f3f985 100644
--- a/src/core/ms_rsend.c
+++ b/src/core/ms_rsend.c
@@ -51,10 +51,10 @@ void AnopeFini(void)
  **/
 void myMemoServHelp(User * u)
 {
-    if (((MSMemoReceipt == 1) && (is_services_oper(u)))
-        || (MSMemoReceipt == 2)) {
-        notice_lang(s_MemoServ, u, MEMO_HELP_CMD_RSEND);
-    }
+	if (((MSMemoReceipt == 1) && (is_services_oper(u)))
+		|| (MSMemoReceipt == 2)) {
+		notice_lang(s_MemoServ, u, MEMO_HELP_CMD_RSEND);
+	}
 }
 
 /**
@@ -64,52 +64,52 @@ void myMemoServHelp(User * u)
  **/
 int do_rsend(User * u)
 {
-    char *name = strtok(NULL, " ");
-    char *text = strtok(NULL, "");
-    NickAlias *na = NULL;
-    int z = 3;
-
-
-
-    /* check if the variables are here */
-    if (!name || !text) {
-        notice_lang(s_MemoServ, u, MEMO_RSEND_SYNTAX);
-        return MOD_CONT;
-    }
-
-    /* prevent user from rsend to themselves */
-    if ((na = findnick(name))) {
-        if (u->na) {
-            if (stricmp(na->nc->display, u->na->nc->display) == 0) {
-                notice_lang(s_MemoServ, u, MEMO_NO_RSEND_SELF);
-                return MOD_CONT;
-            }
-        } else {
-            notice_lang(s_MemoServ, u, NICK_X_NOT_REGISTERED, name);
-            return MOD_CONT;
-        }
-    }
-
-    if (MSMemoReceipt == 1) {
-        /* Services opers and above can use rsend */
-        if (is_services_oper(u)) {
-            memo_send(u, name, text, z);
-        } else {
-            notice_lang(s_MemoServ, u, ACCESS_DENIED);
-        }
-    } else if (MSMemoReceipt == 2) {
-        /* Everybody can use rsend */
-        memo_send(u, name, text, z);
-    } else {
-        /* rsend has been disabled */
-        if (debug) {
-            alog("debug: MSMemoReceipt is set misconfigured to %d",
-                 MSMemoReceipt);
-        }
-        notice_lang(s_MemoServ, u, MEMO_RSEND_DISABLED);
-    }
-
-    return MOD_CONT;
+	char *name = strtok(NULL, " ");
+	char *text = strtok(NULL, "");
+	NickAlias *na = NULL;
+	int z = 3;
+
+
+
+	/* check if the variables are here */
+	if (!name || !text) {
+		notice_lang(s_MemoServ, u, MEMO_RSEND_SYNTAX);
+		return MOD_CONT;
+	}
+
+	/* prevent user from rsend to themselves */
+	if ((na = findnick(name))) {
+		if (u->na) {
+			if (stricmp(na->nc->display, u->na->nc->display) == 0) {
+				notice_lang(s_MemoServ, u, MEMO_NO_RSEND_SELF);
+				return MOD_CONT;
+			}
+		} else {
+			notice_lang(s_MemoServ, u, NICK_X_NOT_REGISTERED, name);
+			return MOD_CONT;
+		}
+	}
+
+	if (MSMemoReceipt == 1) {
+		/* Services opers and above can use rsend */
+		if (is_services_oper(u)) {
+			memo_send(u, name, text, z);
+		} else {
+			notice_lang(s_MemoServ, u, ACCESS_DENIED);
+		}
+	} else if (MSMemoReceipt == 2) {
+		/* Everybody can use rsend */
+		memo_send(u, name, text, z);
+	} else {
+		/* rsend has been disabled */
+		if (debug) {
+			alog("debug: MSMemoReceipt is set misconfigured to %d",
+				 MSMemoReceipt);
+		}
+		notice_lang(s_MemoServ, u, MEMO_RSEND_DISABLED);
+	}
+
+	return MOD_CONT;
 }
 
 MODULE_INIT("ms_rsend", MSRSend)
diff --git a/src/core/ms_send.c b/src/core/ms_send.c
index 0189603b3..52d386348 100644
--- a/src/core/ms_send.c
+++ b/src/core/ms_send.c
@@ -42,7 +42,7 @@ class MSSend : public Module
  **/
 void myMemoServHelp(User * u)
 {
-    notice_lang(s_MemoServ, u, MEMO_HELP_CMD_SEND);
+	notice_lang(s_MemoServ, u, MEMO_HELP_CMD_SEND);
 }
 
 /**
@@ -52,11 +52,11 @@ void myMemoServHelp(User * u)
  **/
 int do_send(User * u)
 {
-    char *name = strtok(NULL, " ");
-    char *text = strtok(NULL, "");
-    int z = 0;
-    memo_send(u, name, text, z);
-    return MOD_CONT;
+	char *name = strtok(NULL, " ");
+	char *text = strtok(NULL, "");
+	int z = 0;
+	memo_send(u, name, text, z);
+	return MOD_CONT;
 }
 
 MODULE_INIT("ms_send", MSSend)
diff --git a/src/core/ms_sendall.c b/src/core/ms_sendall.c
index 9f9d98e37..7668f5009 100644
--- a/src/core/ms_sendall.c
+++ b/src/core/ms_sendall.c
@@ -42,9 +42,9 @@ class MSSendAll : public Module
  **/
 void myMemoServHelp(User * u)
 {
-    if (is_services_admin(u)) {
-        notice_lang(s_MemoServ, u, MEMO_HELP_CMD_SENDALL);
-    }
+	if (is_services_admin(u)) {
+		notice_lang(s_MemoServ, u, MEMO_HELP_CMD_SENDALL);
+	}
 }
 
 /**
@@ -54,31 +54,31 @@ void myMemoServHelp(User * u)
  **/
 int do_sendall(User * u)
 {
-    int i, z = 1;
-    NickCore *nc;
-    char *text = strtok(NULL, "");
+	int i, z = 1;
+	NickCore *nc;
+	char *text = strtok(NULL, "");
 
-    if (readonly) {
-        notice_lang(s_MemoServ, u, MEMO_SEND_DISABLED);
-        return MOD_CONT;
-    } else if (checkDefCon(DEFCON_NO_NEW_MEMOS)) {
-        notice_lang(s_MemoServ, u, OPER_DEFCON_DENIED);
-        return MOD_CONT;
-    } else if (!text) {
-        syntax_error(s_MemoServ, u, "SENDALL", MEMO_SEND_SYNTAX);
-        return MOD_CONT;
-    }
+	if (readonly) {
+		notice_lang(s_MemoServ, u, MEMO_SEND_DISABLED);
+		return MOD_CONT;
+	} else if (checkDefCon(DEFCON_NO_NEW_MEMOS)) {
+		notice_lang(s_MemoServ, u, OPER_DEFCON_DENIED);
+		return MOD_CONT;
+	} else if (!text) {
+		syntax_error(s_MemoServ, u, "SENDALL", MEMO_SEND_SYNTAX);
+		return MOD_CONT;
+	}
 
 
-    for (i = 0; i < 1024; i++) {
-        for (nc = nclists[i]; nc; nc = nc->next) {
-            if (stricmp(u->nick, nc->display) != 0)
-                memo_send(u, nc->display, text, z);
-        }                       /* /nc */
-    }                           /* /i */
+	for (i = 0; i < 1024; i++) {
+		for (nc = nclists[i]; nc; nc = nc->next) {
+			if (stricmp(u->nick, nc->display) != 0)
+				memo_send(u, nc->display, text, z);
+		}					   /* /nc */
+	}						   /* /i */
 
-    notice_lang(s_MemoServ, u, MEMO_MASS_SENT);
-    return MOD_CONT;
+	notice_lang(s_MemoServ, u, MEMO_MASS_SENT);
+	return MOD_CONT;
 }
 
 MODULE_INIT("ms_sendall", MSSendAll)
diff --git a/src/core/ms_set.c b/src/core/ms_set.c
index d9cbaf717..a4aebd3e0 100644
--- a/src/core/ms_set.c
+++ b/src/core/ms_set.c
@@ -53,7 +53,7 @@ class MSSet : public Module
  **/
 void myMemoServHelp(User * u)
 {
-    notice_lang(s_MemoServ, u, MEMO_HELP_CMD_SET);
+	notice_lang(s_MemoServ, u, MEMO_HELP_CMD_SET);
 }
 
 /**
@@ -63,28 +63,28 @@ void myMemoServHelp(User * u)
  **/
 int do_set(User * u)
 {
-    char *cmd = strtok(NULL, " ");
-    char *param = strtok(NULL, "");
-    MemoInfo *mi = &u->na->nc->memos;
-
-    if (readonly) {
-        notice_lang(s_MemoServ, u, MEMO_SET_DISABLED);
-        return MOD_CONT;
-    }
-    if (!param) {
-        syntax_error(s_MemoServ, u, "SET", MEMO_SET_SYNTAX);
-    } else if (!nick_identified(u)) {
-        notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
-        return MOD_CONT;
-    } else if (stricmp(cmd, "NOTIFY") == 0) {
-        do_set_notify(u, mi, param);
-    } else if (stricmp(cmd, "LIMIT") == 0) {
-        do_set_limit(u, mi, param);
-    } else {
-        notice_lang(s_MemoServ, u, MEMO_SET_UNKNOWN_OPTION, cmd);
-        notice_lang(s_MemoServ, u, MORE_INFO, s_MemoServ, "SET");
-    }
-    return MOD_CONT;
+	char *cmd = strtok(NULL, " ");
+	char *param = strtok(NULL, "");
+	MemoInfo *mi = &u->na->nc->memos;
+
+	if (readonly) {
+		notice_lang(s_MemoServ, u, MEMO_SET_DISABLED);
+		return MOD_CONT;
+	}
+	if (!param) {
+		syntax_error(s_MemoServ, u, "SET", MEMO_SET_SYNTAX);
+	} else if (!nick_identified(u)) {
+		notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
+		return MOD_CONT;
+	} else if (stricmp(cmd, "NOTIFY") == 0) {
+		do_set_notify(u, mi, param);
+	} else if (stricmp(cmd, "LIMIT") == 0) {
+		do_set_limit(u, mi, param);
+	} else {
+		notice_lang(s_MemoServ, u, MEMO_SET_UNKNOWN_OPTION, cmd);
+		notice_lang(s_MemoServ, u, MORE_INFO, s_MemoServ, "SET");
+	}
+	return MOD_CONT;
 }
 
 /**
@@ -94,34 +94,34 @@ int do_set(User * u)
  **/
 int do_set_notify(User * u, MemoInfo * mi, char *param)
 {
-    if (stricmp(param, "ON") == 0) {
-        u->na->nc->flags |= NI_MEMO_SIGNON | NI_MEMO_RECEIVE;
-        notice_lang(s_MemoServ, u, MEMO_SET_NOTIFY_ON, s_MemoServ);
-    } else if (stricmp(param, "LOGON") == 0) {
-        u->na->nc->flags |= NI_MEMO_SIGNON;
-        u->na->nc->flags &= ~NI_MEMO_RECEIVE;
-        notice_lang(s_MemoServ, u, MEMO_SET_NOTIFY_LOGON, s_MemoServ);
-    } else if (stricmp(param, "NEW") == 0) {
-        u->na->nc->flags &= ~NI_MEMO_SIGNON;
-        u->na->nc->flags |= NI_MEMO_RECEIVE;
-        notice_lang(s_MemoServ, u, MEMO_SET_NOTIFY_NEW, s_MemoServ);
-    } else if (stricmp(param, "MAIL") == 0) {
-        if (u->na->nc->email) {
-            u->na->nc->flags |= NI_MEMO_MAIL;
-            notice_lang(s_MemoServ, u, MEMO_SET_NOTIFY_MAIL);
-        } else {
-            notice_lang(s_MemoServ, u, MEMO_SET_NOTIFY_INVALIDMAIL);
-        }
-    } else if (stricmp(param, "NOMAIL") == 0) {
-        u->na->nc->flags &= ~NI_MEMO_MAIL;
-        notice_lang(s_MemoServ, u, MEMO_SET_NOTIFY_NOMAIL);
-    } else if (stricmp(param, "OFF") == 0) {
-        u->na->nc->flags &= ~(NI_MEMO_SIGNON | NI_MEMO_RECEIVE);
-        notice_lang(s_MemoServ, u, MEMO_SET_NOTIFY_OFF, s_MemoServ);
-    } else {
-        syntax_error(s_MemoServ, u, "SET NOTIFY", MEMO_SET_NOTIFY_SYNTAX);
-    }
-    return MOD_CONT;
+	if (stricmp(param, "ON") == 0) {
+		u->na->nc->flags |= NI_MEMO_SIGNON | NI_MEMO_RECEIVE;
+		notice_lang(s_MemoServ, u, MEMO_SET_NOTIFY_ON, s_MemoServ);
+	} else if (stricmp(param, "LOGON") == 0) {
+		u->na->nc->flags |= NI_MEMO_SIGNON;
+		u->na->nc->flags &= ~NI_MEMO_RECEIVE;
+		notice_lang(s_MemoServ, u, MEMO_SET_NOTIFY_LOGON, s_MemoServ);
+	} else if (stricmp(param, "NEW") == 0) {
+		u->na->nc->flags &= ~NI_MEMO_SIGNON;
+		u->na->nc->flags |= NI_MEMO_RECEIVE;
+		notice_lang(s_MemoServ, u, MEMO_SET_NOTIFY_NEW, s_MemoServ);
+	} else if (stricmp(param, "MAIL") == 0) {
+		if (u->na->nc->email) {
+			u->na->nc->flags |= NI_MEMO_MAIL;
+			notice_lang(s_MemoServ, u, MEMO_SET_NOTIFY_MAIL);
+		} else {
+			notice_lang(s_MemoServ, u, MEMO_SET_NOTIFY_INVALIDMAIL);
+		}
+	} else if (stricmp(param, "NOMAIL") == 0) {
+		u->na->nc->flags &= ~NI_MEMO_MAIL;
+		notice_lang(s_MemoServ, u, MEMO_SET_NOTIFY_NOMAIL);
+	} else if (stricmp(param, "OFF") == 0) {
+		u->na->nc->flags &= ~(NI_MEMO_SIGNON | NI_MEMO_RECEIVE);
+		notice_lang(s_MemoServ, u, MEMO_SET_NOTIFY_OFF, s_MemoServ);
+	} else {
+		syntax_error(s_MemoServ, u, "SET NOTIFY", MEMO_SET_NOTIFY_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 /**
@@ -131,122 +131,122 @@ int do_set_notify(User * u, MemoInfo * mi, char *param)
  **/
 int do_set_limit(User * u, MemoInfo * mi, char *param)
 {
-    char *p1 = strtok(param, " ");
-    char *p2 = strtok(NULL, " ");
-    char *p3 = strtok(NULL, " ");
-    char *user = NULL, *chan = NULL;
-    int32 limit;
-    NickAlias *na = u->na;
-    ChannelInfo *ci = NULL;
-    int is_servadmin = is_services_admin(u);
-
-    if (p1 && *p1 == '#') {
-        chan = p1;
-        p1 = p2;
-        p2 = p3;
-        p3 = strtok(NULL, " ");
-        if (!(ci = cs_findchan(chan))) {
-            notice_lang(s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan);
-            return MOD_CONT;
-        } else if (ci->flags & CI_VERBOTEN) {
-            notice_lang(s_MemoServ, u, CHAN_X_FORBIDDEN, chan);
-            return MOD_CONT;
-        } else if (!is_servadmin && !check_access(u, ci, CA_MEMO)) {
-            notice_lang(s_MemoServ, u, ACCESS_DENIED);
-            return MOD_CONT;
-        }
-        mi = &ci->memos;
-    }
-    if (is_servadmin) {
-        if (p2 && stricmp(p2, "HARD") != 0 && !chan) {
-            if (!(na = findnick(p1))) {
-                notice_lang(s_MemoServ, u, NICK_X_NOT_REGISTERED, p1);
-                return MOD_CONT;
-            }
-            user = p1;
-            mi = &na->nc->memos;
-            p1 = p2;
-            p2 = p3;
-        } else if (!p1) {
-            syntax_error(s_MemoServ, u, "SET LIMIT",
-                         MEMO_SET_LIMIT_SERVADMIN_SYNTAX);
-            return MOD_CONT;
-        }
-        if ((!isdigit(*p1) && stricmp(p1, "NONE") != 0) ||
-            (p2 && stricmp(p2, "HARD") != 0)) {
-            syntax_error(s_MemoServ, u, "SET LIMIT",
-                         MEMO_SET_LIMIT_SERVADMIN_SYNTAX);
-            return MOD_CONT;
-        }
-        if (chan) {
-            if (p2)
-                ci->flags |= CI_MEMO_HARDMAX;
-            else
-                ci->flags &= ~CI_MEMO_HARDMAX;
-        } else {
-            if (p2)
-                na->nc->flags |= NI_MEMO_HARDMAX;
-            else
-                na->nc->flags &= ~NI_MEMO_HARDMAX;
-        }
-        limit = atoi(p1);
-        if (limit < 0 || limit > 32767) {
-            notice_lang(s_MemoServ, u, MEMO_SET_LIMIT_OVERFLOW, 32767);
-            limit = 32767;
-        }
-        if (stricmp(p1, "NONE") == 0)
-            limit = -1;
-    } else {
-        if (!p1 || p2 || !isdigit(*p1)) {
-            syntax_error(s_MemoServ, u, "SET LIMIT",
-                         MEMO_SET_LIMIT_SYNTAX);
-            return MOD_CONT;
-        }
-        if (chan && (ci->flags & CI_MEMO_HARDMAX)) {
-            notice_lang(s_MemoServ, u, MEMO_SET_LIMIT_FORBIDDEN, chan);
-            return MOD_CONT;
-        } else if (!chan && (na->nc->flags & NI_MEMO_HARDMAX)) {
-            notice_lang(s_MemoServ, u, MEMO_SET_YOUR_LIMIT_FORBIDDEN);
-            return MOD_CONT;
-        }
-        limit = atoi(p1);
-        /* The first character is a digit, but we could still go negative
-         * from overflow... watch out! */
-        if (limit < 0 || (MSMaxMemos > 0 && limit > MSMaxMemos)) {
-            if (chan) {
-                notice_lang(s_MemoServ, u, MEMO_SET_LIMIT_TOO_HIGH,
-                            chan, MSMaxMemos);
-            } else {
-                notice_lang(s_MemoServ, u, MEMO_SET_YOUR_LIMIT_TOO_HIGH,
-                            MSMaxMemos);
-            }
-            return MOD_CONT;
-        } else if (limit > 32767) {
-            notice_lang(s_MemoServ, u, MEMO_SET_LIMIT_OVERFLOW, 32767);
-            limit = 32767;
-        }
-    }
-    mi->memomax = limit;
-    if (limit > 0) {
-        if (!chan && na->nc == u->na->nc)
-            notice_lang(s_MemoServ, u, MEMO_SET_YOUR_LIMIT, limit);
-        else
-            notice_lang(s_MemoServ, u, MEMO_SET_LIMIT,
-                        chan ? chan : user, limit);
-    } else if (limit == 0) {
-        if (!chan && na->nc == u->na->nc)
-            notice_lang(s_MemoServ, u, MEMO_SET_YOUR_LIMIT_ZERO);
-        else
-            notice_lang(s_MemoServ, u, MEMO_SET_LIMIT_ZERO,
-                        chan ? chan : user);
-    } else {
-        if (!chan && na->nc == u->na->nc)
-            notice_lang(s_MemoServ, u, MEMO_UNSET_YOUR_LIMIT);
-        else
-            notice_lang(s_MemoServ, u, MEMO_UNSET_LIMIT,
-                        chan ? chan : user);
-    }
-    return MOD_CONT;
+	char *p1 = strtok(param, " ");
+	char *p2 = strtok(NULL, " ");
+	char *p3 = strtok(NULL, " ");
+	char *user = NULL, *chan = NULL;
+	int32 limit;
+	NickAlias *na = u->na;
+	ChannelInfo *ci = NULL;
+	int is_servadmin = is_services_admin(u);
+
+	if (p1 && *p1 == '#') {
+		chan = p1;
+		p1 = p2;
+		p2 = p3;
+		p3 = strtok(NULL, " ");
+		if (!(ci = cs_findchan(chan))) {
+			notice_lang(s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan);
+			return MOD_CONT;
+		} else if (ci->flags & CI_VERBOTEN) {
+			notice_lang(s_MemoServ, u, CHAN_X_FORBIDDEN, chan);
+			return MOD_CONT;
+		} else if (!is_servadmin && !check_access(u, ci, CA_MEMO)) {
+			notice_lang(s_MemoServ, u, ACCESS_DENIED);
+			return MOD_CONT;
+		}
+		mi = &ci->memos;
+	}
+	if (is_servadmin) {
+		if (p2 && stricmp(p2, "HARD") != 0 && !chan) {
+			if (!(na = findnick(p1))) {
+				notice_lang(s_MemoServ, u, NICK_X_NOT_REGISTERED, p1);
+				return MOD_CONT;
+			}
+			user = p1;
+			mi = &na->nc->memos;
+			p1 = p2;
+			p2 = p3;
+		} else if (!p1) {
+			syntax_error(s_MemoServ, u, "SET LIMIT",
+						 MEMO_SET_LIMIT_SERVADMIN_SYNTAX);
+			return MOD_CONT;
+		}
+		if ((!isdigit(*p1) && stricmp(p1, "NONE") != 0) ||
+			(p2 && stricmp(p2, "HARD") != 0)) {
+			syntax_error(s_MemoServ, u, "SET LIMIT",
+						 MEMO_SET_LIMIT_SERVADMIN_SYNTAX);
+			return MOD_CONT;
+		}
+		if (chan) {
+			if (p2)
+				ci->flags |= CI_MEMO_HARDMAX;
+			else
+				ci->flags &= ~CI_MEMO_HARDMAX;
+		} else {
+			if (p2)
+				na->nc->flags |= NI_MEMO_HARDMAX;
+			else
+				na->nc->flags &= ~NI_MEMO_HARDMAX;
+		}
+		limit = atoi(p1);
+		if (limit < 0 || limit > 32767) {
+			notice_lang(s_MemoServ, u, MEMO_SET_LIMIT_OVERFLOW, 32767);
+			limit = 32767;
+		}
+		if (stricmp(p1, "NONE") == 0)
+			limit = -1;
+	} else {
+		if (!p1 || p2 || !isdigit(*p1)) {
+			syntax_error(s_MemoServ, u, "SET LIMIT",
+						 MEMO_SET_LIMIT_SYNTAX);
+			return MOD_CONT;
+		}
+		if (chan && (ci->flags & CI_MEMO_HARDMAX)) {
+			notice_lang(s_MemoServ, u, MEMO_SET_LIMIT_FORBIDDEN, chan);
+			return MOD_CONT;
+		} else if (!chan && (na->nc->flags & NI_MEMO_HARDMAX)) {
+			notice_lang(s_MemoServ, u, MEMO_SET_YOUR_LIMIT_FORBIDDEN);
+			return MOD_CONT;
+		}
+		limit = atoi(p1);
+		/* The first character is a digit, but we could still go negative
+		 * from overflow... watch out! */
+		if (limit < 0 || (MSMaxMemos > 0 && limit > MSMaxMemos)) {
+			if (chan) {
+				notice_lang(s_MemoServ, u, MEMO_SET_LIMIT_TOO_HIGH,
+							chan, MSMaxMemos);
+			} else {
+				notice_lang(s_MemoServ, u, MEMO_SET_YOUR_LIMIT_TOO_HIGH,
+							MSMaxMemos);
+			}
+			return MOD_CONT;
+		} else if (limit > 32767) {
+			notice_lang(s_MemoServ, u, MEMO_SET_LIMIT_OVERFLOW, 32767);
+			limit = 32767;
+		}
+	}
+	mi->memomax = limit;
+	if (limit > 0) {
+		if (!chan && na->nc == u->na->nc)
+			notice_lang(s_MemoServ, u, MEMO_SET_YOUR_LIMIT, limit);
+		else
+			notice_lang(s_MemoServ, u, MEMO_SET_LIMIT,
+						chan ? chan : user, limit);
+	} else if (limit == 0) {
+		if (!chan && na->nc == u->na->nc)
+			notice_lang(s_MemoServ, u, MEMO_SET_YOUR_LIMIT_ZERO);
+		else
+			notice_lang(s_MemoServ, u, MEMO_SET_LIMIT_ZERO,
+						chan ? chan : user);
+	} else {
+		if (!chan && na->nc == u->na->nc)
+			notice_lang(s_MemoServ, u, MEMO_UNSET_YOUR_LIMIT);
+		else
+			notice_lang(s_MemoServ, u, MEMO_UNSET_LIMIT,
+						chan ? chan : user);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("ms_set", MSSet)
diff --git a/src/core/ms_staff.c b/src/core/ms_staff.c
index d5cfcae4a..3dda46217 100644
--- a/src/core/ms_staff.c
+++ b/src/core/ms_staff.c
@@ -42,9 +42,9 @@ class MSStaff : public Module
  **/
 void myMemoServHelp(User * u)
 {
-    if (is_services_oper(u)) {
-        notice_lang(s_MemoServ, u, MEMO_HELP_CMD_STAFF);
-    }
+	if (is_services_oper(u)) {
+		notice_lang(s_MemoServ, u, MEMO_HELP_CMD_STAFF);
+	}
 }
 
 /**
@@ -54,28 +54,28 @@ void myMemoServHelp(User * u)
  **/
 int do_staff(User * u)
 {
-    NickCore *nc;
-    int i, z = 0;
-    char *text = strtok(NULL, "");
+	NickCore *nc;
+	int i, z = 0;
+	char *text = strtok(NULL, "");
 
-    if (readonly) {
-        notice_lang(s_MemoServ, u, MEMO_SEND_DISABLED);
-        return MOD_CONT;
-    } else if (checkDefCon(DEFCON_NO_NEW_MEMOS)) {
-        notice_lang(s_MemoServ, u, OPER_DEFCON_DENIED);
-        return MOD_CONT;
-    } else if (text == NULL) {
-        syntax_error(s_MemoServ, u, "SEND", MEMO_SEND_SYNTAX);
-        return MOD_CONT;
-    }
+	if (readonly) {
+		notice_lang(s_MemoServ, u, MEMO_SEND_DISABLED);
+		return MOD_CONT;
+	} else if (checkDefCon(DEFCON_NO_NEW_MEMOS)) {
+		notice_lang(s_MemoServ, u, OPER_DEFCON_DENIED);
+		return MOD_CONT;
+	} else if (text == NULL) {
+		syntax_error(s_MemoServ, u, "SEND", MEMO_SEND_SYNTAX);
+		return MOD_CONT;
+	}
 
-    for (i = 0; i < 1024; i++) {
-        for (nc = nclists[i]; nc; nc = nc->next) {
-            if (nick_is_services_oper(nc))
-                memo_send(u, nc->display, text, z);
-        }
-    }
-    return MOD_CONT;
+	for (i = 0; i < 1024; i++) {
+		for (nc = nclists[i]; nc; nc = nc->next) {
+			if (nick_is_services_oper(nc))
+				memo_send(u, nc->display, text, z);
+		}
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("ms_staff", MSStaff)
diff --git a/src/core/ns_access.c b/src/core/ns_access.c
index 8e32d9919..502268cdf 100644
--- a/src/core/ns_access.c
+++ b/src/core/ns_access.c
@@ -44,7 +44,7 @@ class NSAccess : public Module
  **/
 void myNickServHelp(User * u)
 {
-    notice_lang(s_NickServ, u, NICK_HELP_CMD_ACCESS);
+	notice_lang(s_NickServ, u, NICK_HELP_CMD_ACCESS);
 }
 
 /**
@@ -54,125 +54,125 @@ void myNickServHelp(User * u)
  **/
 int do_access(User * u)
 {
-    char *cmd = strtok(NULL, " ");
-    char *mask = strtok(NULL, " ");
-    NickAlias *na;
-    int i;
-    char **access;
-
-    if (cmd && stricmp(cmd, "LIST") == 0 && mask && is_services_admin(u)
-        && (na = findnick(mask))) {
-
-        if (na->nc->accesscount == 0) {
-            notice_lang(s_NickServ, u, NICK_ACCESS_LIST_X_EMPTY, na->nick);
-            return MOD_CONT;
-        }
-
-        if (na->status & NS_VERBOTEN) {
-            notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
-            return MOD_CONT;
-        }
-
-        if (na->nc->flags & NI_SUSPENDED) {
-            notice_lang(s_NickServ, u, NICK_X_SUSPENDED, na->nick);
-            return MOD_CONT;
-        }
-
-
-        notice_lang(s_NickServ, u, NICK_ACCESS_LIST_X, mask);
-        mask = strtok(NULL, " ");
-        for (access = na->nc->access, i = 0; i < na->nc->accesscount;
-             access++, i++) {
-            if (mask && !match_wild(mask, *access))
-                continue;
-            notice_user(s_NickServ, u, "    %s", *access);
-        }
-
-    } else if (!cmd || ((stricmp(cmd, "LIST") == 0) ? !!mask : !mask)) {
-        syntax_error(s_NickServ, u, "ACCESS", NICK_ACCESS_SYNTAX);
-
-    } else if (mask && !strchr(mask, '@')) {
-        notice_lang(s_NickServ, u, BAD_USERHOST_MASK);
-        notice_lang(s_NickServ, u, MORE_INFO, s_NickServ, "ACCESS");
-
-    } else if (!(na = u->na)) {
-        notice_lang(s_NickServ, u, NICK_NOT_REGISTERED);
-
-    } else if (na->status & NS_VERBOTEN) {
-        notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
-
-    } else if (na->nc->flags & NI_SUSPENDED) {
-        notice_lang(s_NickServ, u, NICK_X_SUSPENDED, na->nick);
-
-    } else if (!nick_identified(u)) {
-        notice_lang(s_NickServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
-
-    } else if (stricmp(cmd, "ADD") == 0) {
-        if (na->nc->accesscount >= NSAccessMax) {
-            notice_lang(s_NickServ, u, NICK_ACCESS_REACHED_LIMIT,
-                        NSAccessMax);
-            return MOD_CONT;
-        }
-
-        for (access = na->nc->access, i = 0; i < na->nc->accesscount;
-             access++, i++) {
-            if (strcmp(*access, mask) == 0) {
-                notice_lang(s_NickServ, u, NICK_ACCESS_ALREADY_PRESENT,
-                            *access);
-                return MOD_CONT;
-            }
-        }
-
-        na->nc->accesscount++;
-        na->nc->access =
-            (char **)srealloc(na->nc->access, sizeof(char *) * na->nc->accesscount);
-        na->nc->access[na->nc->accesscount - 1] = sstrdup(mask);
-        notice_lang(s_NickServ, u, NICK_ACCESS_ADDED, mask);
-
-    } else if (stricmp(cmd, "DEL") == 0) {
-
-        for (access = na->nc->access, i = 0; i < na->nc->accesscount;
-             access++, i++) {
-            if (stricmp(*access, mask) == 0)
-                break;
-        }
-        if (i == na->nc->accesscount) {
-            notice_lang(s_NickServ, u, NICK_ACCESS_NOT_FOUND, mask);
-            return MOD_CONT;
-        }
-
-        notice_lang(s_NickServ, u, NICK_ACCESS_DELETED, *access);
-        free(*access);
-        na->nc->accesscount--;
-        if (i < na->nc->accesscount)    /* if it wasn't the last entry... */
-            memmove(access, access + 1,
-                    (na->nc->accesscount - i) * sizeof(char *));
-        if (na->nc->accesscount)        /* if there are any entries left... */
-            na->nc->access =
-                (char **)srealloc(na->nc->access,
-                         na->nc->accesscount * sizeof(char *));
-        else {
-            free(na->nc->access);
-            na->nc->access = NULL;
-        }
-    } else if (stricmp(cmd, "LIST") == 0) {
-        if (na->nc->accesscount == 0) {
-            notice_lang(s_NickServ, u, NICK_ACCESS_LIST_EMPTY, u->nick);
-            return MOD_CONT;
-        }
-
-        notice_lang(s_NickServ, u, NICK_ACCESS_LIST);
-        for (access = na->nc->access, i = 0; i < na->nc->accesscount;
-             access++, i++) {
-            if (mask && !match_wild(mask, *access))
-                continue;
-            notice_user(s_NickServ, u, "    %s", *access);
-        }
-    } else {
-        syntax_error(s_NickServ, u, "ACCESS", NICK_ACCESS_SYNTAX);
-
-    }
-    return MOD_CONT;
+	char *cmd = strtok(NULL, " ");
+	char *mask = strtok(NULL, " ");
+	NickAlias *na;
+	int i;
+	char **access;
+
+	if (cmd && stricmp(cmd, "LIST") == 0 && mask && is_services_admin(u)
+		&& (na = findnick(mask))) {
+
+		if (na->nc->accesscount == 0) {
+			notice_lang(s_NickServ, u, NICK_ACCESS_LIST_X_EMPTY, na->nick);
+			return MOD_CONT;
+		}
+
+		if (na->status & NS_VERBOTEN) {
+			notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
+			return MOD_CONT;
+		}
+
+		if (na->nc->flags & NI_SUSPENDED) {
+			notice_lang(s_NickServ, u, NICK_X_SUSPENDED, na->nick);
+			return MOD_CONT;
+		}
+
+
+		notice_lang(s_NickServ, u, NICK_ACCESS_LIST_X, mask);
+		mask = strtok(NULL, " ");
+		for (access = na->nc->access, i = 0; i < na->nc->accesscount;
+			 access++, i++) {
+			if (mask && !match_wild(mask, *access))
+				continue;
+			notice_user(s_NickServ, u, "	%s", *access);
+		}
+
+	} else if (!cmd || ((stricmp(cmd, "LIST") == 0) ? !!mask : !mask)) {
+		syntax_error(s_NickServ, u, "ACCESS", NICK_ACCESS_SYNTAX);
+
+	} else if (mask && !strchr(mask, '@')) {
+		notice_lang(s_NickServ, u, BAD_USERHOST_MASK);
+		notice_lang(s_NickServ, u, MORE_INFO, s_NickServ, "ACCESS");
+
+	} else if (!(na = u->na)) {
+		notice_lang(s_NickServ, u, NICK_NOT_REGISTERED);
+
+	} else if (na->status & NS_VERBOTEN) {
+		notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
+
+	} else if (na->nc->flags & NI_SUSPENDED) {
+		notice_lang(s_NickServ, u, NICK_X_SUSPENDED, na->nick);
+
+	} else if (!nick_identified(u)) {
+		notice_lang(s_NickServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
+
+	} else if (stricmp(cmd, "ADD") == 0) {
+		if (na->nc->accesscount >= NSAccessMax) {
+			notice_lang(s_NickServ, u, NICK_ACCESS_REACHED_LIMIT,
+						NSAccessMax);
+			return MOD_CONT;
+		}
+
+		for (access = na->nc->access, i = 0; i < na->nc->accesscount;
+			 access++, i++) {
+			if (strcmp(*access, mask) == 0) {
+				notice_lang(s_NickServ, u, NICK_ACCESS_ALREADY_PRESENT,
+							*access);
+				return MOD_CONT;
+			}
+		}
+
+		na->nc->accesscount++;
+		na->nc->access =
+			(char **)srealloc(na->nc->access, sizeof(char *) * na->nc->accesscount);
+		na->nc->access[na->nc->accesscount - 1] = sstrdup(mask);
+		notice_lang(s_NickServ, u, NICK_ACCESS_ADDED, mask);
+
+	} else if (stricmp(cmd, "DEL") == 0) {
+
+		for (access = na->nc->access, i = 0; i < na->nc->accesscount;
+			 access++, i++) {
+			if (stricmp(*access, mask) == 0)
+				break;
+		}
+		if (i == na->nc->accesscount) {
+			notice_lang(s_NickServ, u, NICK_ACCESS_NOT_FOUND, mask);
+			return MOD_CONT;
+		}
+
+		notice_lang(s_NickServ, u, NICK_ACCESS_DELETED, *access);
+		free(*access);
+		na->nc->accesscount--;
+		if (i < na->nc->accesscount)	/* if it wasn't the last entry... */
+			memmove(access, access + 1,
+					(na->nc->accesscount - i) * sizeof(char *));
+		if (na->nc->accesscount)		/* if there are any entries left... */
+			na->nc->access =
+				(char **)srealloc(na->nc->access,
+						 na->nc->accesscount * sizeof(char *));
+		else {
+			free(na->nc->access);
+			na->nc->access = NULL;
+		}
+	} else if (stricmp(cmd, "LIST") == 0) {
+		if (na->nc->accesscount == 0) {
+			notice_lang(s_NickServ, u, NICK_ACCESS_LIST_EMPTY, u->nick);
+			return MOD_CONT;
+		}
+
+		notice_lang(s_NickServ, u, NICK_ACCESS_LIST);
+		for (access = na->nc->access, i = 0; i < na->nc->accesscount;
+			 access++, i++) {
+			if (mask && !match_wild(mask, *access))
+				continue;
+			notice_user(s_NickServ, u, "	%s", *access);
+		}
+	} else {
+		syntax_error(s_NickServ, u, "ACCESS", NICK_ACCESS_SYNTAX);
+
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("ns_access", NSAccess)
diff --git a/src/core/ns_alist.c b/src/core/ns_alist.c
index ce0d88546..d71e7d1e9 100644
--- a/src/core/ns_alist.c
+++ b/src/core/ns_alist.c
@@ -44,7 +44,7 @@ class NSAList : public Module
  **/
 void myNickServHelp(User * u)
 {
-    notice_lang(s_NickServ, u, NICK_HELP_CMD_ALIST);
+	notice_lang(s_NickServ, u, NICK_HELP_CMD_ALIST);
 }
 
 /**
@@ -64,111 +64,111 @@ int do_alist(User * u)
  * -jester
  */
 
-    char *nick = NULL;
-    char *lev = NULL;
-
-    NickAlias *na;
-
-    int min_level = 0;
-    int is_servadmin = is_services_admin(u);
-
-    if (!is_servadmin) {
-        /* Non service admins can only see their own levels */
-        na = u->na;
-    } else {
-        /* Services admins can request ALIST on nicks.
-         * The first argument for service admins must
-         * always be a nickname.
-         */
-        nick = strtok(NULL, " ");
-
-        /* If an argument was passed, use it as the nick to see levels
-         * for, else check levels for the user calling the command */
-        if (nick) {
-            na = findnick(nick);
-        } else {
-            na = u->na;
-        }
-    }
-
-    /* If available, get level from arguments */
-    lev = strtok(NULL, " ");
-
-    /* if a level was given, make sure it's an int for later */
-    if (lev) {
-        if (stricmp(lev, "FOUNDER") == 0) {
-            min_level = ACCESS_FOUNDER;
-        } else if (stricmp(lev, "SOP") == 0) {
-            min_level = ACCESS_SOP;
-        } else if (stricmp(lev, "AOP") == 0) {
-            min_level = ACCESS_AOP;
-        } else if (stricmp(lev, "HOP") == 0) {
-            min_level = ACCESS_HOP;
-        } else if (stricmp(lev, "VOP") == 0) {
-            min_level = ACCESS_VOP;
-        } else {
-            min_level = atoi(lev);
-        }
-    }
-
-    if (!nick_identified(u)) {
-        notice_lang(s_NickServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
-    } else if (is_servadmin && nick && !na) {
-        notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
-    } else if (na->status & NS_VERBOTEN) {
-        notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
-    } else if (min_level <= ACCESS_INVALID || min_level > ACCESS_FOUNDER) {
-        notice_lang(s_NickServ, u, CHAN_ACCESS_LEVEL_RANGE,
-                    ACCESS_INVALID + 1, ACCESS_FOUNDER - 1);
-    } else {
-        int i, level;
-        int chan_count = 0;
-        int match_count = 0;
-        ChannelInfo *ci;
-
-        notice_lang(s_NickServ, u, (is_servadmin ? NICK_ALIST_HEADER_X :
-                                    NICK_ALIST_HEADER), na->nick);
-
-        for (i = 0; i < 256; i++) {
-            for ((ci = chanlists[i]); ci; (ci = ci->next)) {
-
-                if ((level = get_access_level(ci, na))) {
-                    chan_count++;
-
-                    if (min_level > level) {
-                        continue;
-                    }
-
-                    match_count++;
-
-                    if ((ci->flags & CI_XOP) || (level == ACCESS_FOUNDER)) {
-                        const char *xop;
-
-                        xop = get_xop_level(level);
-
-                        notice_lang(s_NickServ, u, NICK_ALIST_XOP_FORMAT,
-                                    match_count,
-                                    ((ci->
-                                      flags & CI_NO_EXPIRE) ? '!' : ' '),
-                                    ci->name, xop,
-                                    (ci->desc ? ci->desc : ""));
-                    } else {
-                        notice_lang(s_NickServ, u,
-                                    NICK_ALIST_ACCESS_FORMAT, match_count,
-                                    ((ci->
-                                      flags & CI_NO_EXPIRE) ? '!' : ' '),
-                                    ci->name, level,
-                                    (ci->desc ? ci->desc : ""));
-
-                    }
-                }
-            }
-        }
-
-        notice_lang(s_NickServ, u, NICK_ALIST_FOOTER, match_count,
-                    chan_count);
-    }
-    return MOD_CONT;
+	char *nick = NULL;
+	char *lev = NULL;
+
+	NickAlias *na;
+
+	int min_level = 0;
+	int is_servadmin = is_services_admin(u);
+
+	if (!is_servadmin) {
+		/* Non service admins can only see their own levels */
+		na = u->na;
+	} else {
+		/* Services admins can request ALIST on nicks.
+		 * The first argument for service admins must
+		 * always be a nickname.
+		 */
+		nick = strtok(NULL, " ");
+
+		/* If an argument was passed, use it as the nick to see levels
+		 * for, else check levels for the user calling the command */
+		if (nick) {
+			na = findnick(nick);
+		} else {
+			na = u->na;
+		}
+	}
+
+	/* If available, get level from arguments */
+	lev = strtok(NULL, " ");
+
+	/* if a level was given, make sure it's an int for later */
+	if (lev) {
+		if (stricmp(lev, "FOUNDER") == 0) {
+			min_level = ACCESS_FOUNDER;
+		} else if (stricmp(lev, "SOP") == 0) {
+			min_level = ACCESS_SOP;
+		} else if (stricmp(lev, "AOP") == 0) {
+			min_level = ACCESS_AOP;
+		} else if (stricmp(lev, "HOP") == 0) {
+			min_level = ACCESS_HOP;
+		} else if (stricmp(lev, "VOP") == 0) {
+			min_level = ACCESS_VOP;
+		} else {
+			min_level = atoi(lev);
+		}
+	}
+
+	if (!nick_identified(u)) {
+		notice_lang(s_NickServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
+	} else if (is_servadmin && nick && !na) {
+		notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
+	} else if (na->status & NS_VERBOTEN) {
+		notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
+	} else if (min_level <= ACCESS_INVALID || min_level > ACCESS_FOUNDER) {
+		notice_lang(s_NickServ, u, CHAN_ACCESS_LEVEL_RANGE,
+					ACCESS_INVALID + 1, ACCESS_FOUNDER - 1);
+	} else {
+		int i, level;
+		int chan_count = 0;
+		int match_count = 0;
+		ChannelInfo *ci;
+
+		notice_lang(s_NickServ, u, (is_servadmin ? NICK_ALIST_HEADER_X :
+									NICK_ALIST_HEADER), na->nick);
+
+		for (i = 0; i < 256; i++) {
+			for ((ci = chanlists[i]); ci; (ci = ci->next)) {
+
+				if ((level = get_access_level(ci, na))) {
+					chan_count++;
+
+					if (min_level > level) {
+						continue;
+					}
+
+					match_count++;
+
+					if ((ci->flags & CI_XOP) || (level == ACCESS_FOUNDER)) {
+						const char *xop;
+
+						xop = get_xop_level(level);
+
+						notice_lang(s_NickServ, u, NICK_ALIST_XOP_FORMAT,
+									match_count,
+									((ci->
+									  flags & CI_NO_EXPIRE) ? '!' : ' '),
+									ci->name, xop,
+									(ci->desc ? ci->desc : ""));
+					} else {
+						notice_lang(s_NickServ, u,
+									NICK_ALIST_ACCESS_FORMAT, match_count,
+									((ci->
+									  flags & CI_NO_EXPIRE) ? '!' : ' '),
+									ci->name, level,
+									(ci->desc ? ci->desc : ""));
+
+					}
+				}
+			}
+		}
+
+		notice_lang(s_NickServ, u, NICK_ALIST_FOOTER, match_count,
+					chan_count);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("ns_alist", NSAList)
diff --git a/src/core/ns_drop.c b/src/core/ns_drop.c
index fcd2734b6..1d528dd45 100644
--- a/src/core/ns_drop.c
+++ b/src/core/ns_drop.c
@@ -46,7 +46,7 @@ class NSDrop : public Module
  **/
 void myNickServHelp(User * u)
 {
-    notice_lang(s_NickServ, u, NICK_HELP_CMD_DROP);
+	notice_lang(s_NickServ, u, NICK_HELP_CMD_DROP);
 }
 
 /**
@@ -56,89 +56,89 @@ void myNickServHelp(User * u)
  **/
 int do_drop(User * u)
 {
-    char *nick = strtok(NULL, " ");
-    NickAlias *na;
-    NickRequest *nr = NULL;
-    int is_servadmin = is_services_admin(u);
-    int is_mine;                /* Does the nick being dropped belong to the user that is dropping? */
-    char *my_nick = NULL;
-
-    if (readonly && !is_servadmin) {
-        notice_lang(s_NickServ, u, NICK_DROP_DISABLED);
-        return MOD_CONT;
-    }
-
-    if (!(na = (nick ? findnick(nick) : u->na))) {
-        if (nick) {
-            if ((nr = findrequestnick(nick)) && is_servadmin) {
-                if (readonly)
-                    notice_lang(s_NickServ, u, READ_ONLY_MODE);
-                if (WallDrop)
-                    ircdproto->SendGlobops(s_NickServ,
-                                     "\2%s\2 used DROP on \2%s\2", u->nick,
-                                     nick);
-                alog("%s: %s!%s@%s dropped nickname %s (e-mail: %s)",
-                     s_NickServ, u->nick, u->username, u->host,
-                     nr->nick, nr->email);
-                delnickrequest(nr);
-                notice_lang(s_NickServ, u, NICK_X_DROPPED, nick);
-            } else {
-                notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
-            }
-        } else
-            notice_lang(s_NickServ, u, NICK_NOT_REGISTERED);
-        return MOD_CONT;
-    }
-
-    is_mine = (u->na && (u->na->nc == na->nc));
-    if (is_mine && !nick)
-        my_nick = sstrdup(na->nick);
-
-    if (is_mine && !nick_identified(u)) {
-        notice_lang(s_NickServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
-    } else if (!is_mine && !is_servadmin) {
-        notice_lang(s_NickServ, u, ACCESS_DENIED);
-    } else if (NSSecureAdmins && !is_mine && nick_is_services_admin(na->nc)
-               && !is_services_root(u)) {
-        notice_lang(s_NickServ, u, PERMISSION_DENIED);
-    } else {
-        if (readonly)
-            notice_lang(s_NickServ, u, READ_ONLY_MODE);
-
-        if (ircd->sqline && (na->status & NS_VERBOTEN)) {
-            ircdproto->SendSQLineDel(na->nick);
-        }
-
-        alog("%s: %s!%s@%s dropped nickname %s (group %s) (e-mail: %s)",
-             s_NickServ, u->nick, u->username, u->host,
-             na->nick, na->nc->display,
-             (na->nc->email ? na->nc->email : "none"));
-        delnick(na);
-        send_event(EVENT_NICK_DROPPED, 1, (my_nick ? my_nick : nick));
-
-        if (!is_mine) {
-            if (WallDrop)
-                ircdproto->SendGlobops(s_NickServ, "\2%s\2 used DROP on \2%s\2",
-                                 u->nick, nick);
-            notice_lang(s_NickServ, u, NICK_X_DROPPED, nick);
-        } else {
-            if (nick)
-                notice_lang(s_NickServ, u, NICK_X_DROPPED, nick);
-            else
-                notice_lang(s_NickServ, u, NICK_DROPPED);
-            if (my_nick) {
-                free(my_nick);
-            }
-        }
-    }
-    return MOD_CONT;
+	char *nick = strtok(NULL, " ");
+	NickAlias *na;
+	NickRequest *nr = NULL;
+	int is_servadmin = is_services_admin(u);
+	int is_mine;				/* Does the nick being dropped belong to the user that is dropping? */
+	char *my_nick = NULL;
+
+	if (readonly && !is_servadmin) {
+		notice_lang(s_NickServ, u, NICK_DROP_DISABLED);
+		return MOD_CONT;
+	}
+
+	if (!(na = (nick ? findnick(nick) : u->na))) {
+		if (nick) {
+			if ((nr = findrequestnick(nick)) && is_servadmin) {
+				if (readonly)
+					notice_lang(s_NickServ, u, READ_ONLY_MODE);
+				if (WallDrop)
+					ircdproto->SendGlobops(s_NickServ,
+									 "\2%s\2 used DROP on \2%s\2", u->nick,
+									 nick);
+				alog("%s: %s!%s@%s dropped nickname %s (e-mail: %s)",
+					 s_NickServ, u->nick, u->username, u->host,
+					 nr->nick, nr->email);
+				delnickrequest(nr);
+				notice_lang(s_NickServ, u, NICK_X_DROPPED, nick);
+			} else {
+				notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
+			}
+		} else
+			notice_lang(s_NickServ, u, NICK_NOT_REGISTERED);
+		return MOD_CONT;
+	}
+
+	is_mine = (u->na && (u->na->nc == na->nc));
+	if (is_mine && !nick)
+		my_nick = sstrdup(na->nick);
+
+	if (is_mine && !nick_identified(u)) {
+		notice_lang(s_NickServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
+	} else if (!is_mine && !is_servadmin) {
+		notice_lang(s_NickServ, u, ACCESS_DENIED);
+	} else if (NSSecureAdmins && !is_mine && nick_is_services_admin(na->nc)
+			   && !is_services_root(u)) {
+		notice_lang(s_NickServ, u, PERMISSION_DENIED);
+	} else {
+		if (readonly)
+			notice_lang(s_NickServ, u, READ_ONLY_MODE);
+
+		if (ircd->sqline && (na->status & NS_VERBOTEN)) {
+			ircdproto->SendSQLineDel(na->nick);
+		}
+
+		alog("%s: %s!%s@%s dropped nickname %s (group %s) (e-mail: %s)",
+			 s_NickServ, u->nick, u->username, u->host,
+			 na->nick, na->nc->display,
+			 (na->nc->email ? na->nc->email : "none"));
+		delnick(na);
+		send_event(EVENT_NICK_DROPPED, 1, (my_nick ? my_nick : nick));
+
+		if (!is_mine) {
+			if (WallDrop)
+				ircdproto->SendGlobops(s_NickServ, "\2%s\2 used DROP on \2%s\2",
+								 u->nick, nick);
+			notice_lang(s_NickServ, u, NICK_X_DROPPED, nick);
+		} else {
+			if (nick)
+				notice_lang(s_NickServ, u, NICK_X_DROPPED, nick);
+			else
+				notice_lang(s_NickServ, u, NICK_DROPPED);
+			if (my_nick) {
+				free(my_nick);
+			}
+		}
+	}
+	return MOD_CONT;
 }
 
 
 int do_unlink(User * u)
 {
-    notice_lang(s_NickServ, u, OBSOLETE_COMMAND, "DROP");
-    return MOD_CONT;
+	notice_lang(s_NickServ, u, OBSOLETE_COMMAND, "DROP");
+	return MOD_CONT;
 }
 
 MODULE_INIT("ns_drop", NSDrop)
diff --git a/src/core/ns_forbid.c b/src/core/ns_forbid.c
index 6a6fc87af..cc3ed5b90 100644
--- a/src/core/ns_forbid.c
+++ b/src/core/ns_forbid.c
@@ -45,9 +45,9 @@ class NSForbid : public Module
  **/
 void myNickServHelp(User * u)
 {
-    if (is_services_admin(u)) {
-        notice_lang(s_NickServ, u, NICK_HELP_CMD_FORBID);
-    }
+	if (is_services_admin(u)) {
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_FORBID);
+	}
 }
 
 /**
@@ -57,87 +57,87 @@ void myNickServHelp(User * u)
  **/
 int do_forbid(User * u)
 {
-    NickAlias *na;
-    char *nick = strtok(NULL, " ");
-    char *reason = strtok(NULL, "");
-
-    /* Assumes that permission checking has already been done. */
-    if (!nick || (ForceForbidReason && !reason)) {
-        syntax_error(s_NickServ, u, "FORBID",
-                     (ForceForbidReason ? NICK_FORBID_SYNTAX_REASON :
-                      NICK_FORBID_SYNTAX));
-        return MOD_CONT;
-    }
-
-    if (readonly)
-        notice_lang(s_NickServ, u, READ_ONLY_MODE);
-    if (!ircdproto->IsNickValid(nick)) {
-        notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, nick);
-        return MOD_CONT;
-    }
-    if ((na = findnick(nick)) != NULL) {
-        if (NSSecureAdmins && nick_is_services_admin(na->nc)
-            && !is_services_root(u)) {
-            notice_lang(s_NickServ, u, PERMISSION_DENIED);
-            return MOD_CONT;
-        }
-        delnick(na);
-    }
-    na = makenick(nick);
-    if (na) {
-        na->status |= NS_VERBOTEN;
-        na->last_usermask = sstrdup(u->nick);
-        if (reason)
-            na->last_realname = sstrdup(reason);
-
-        na->u = finduser(na->nick);
-        if (na->u)
-            na->u->na = na;
-
-        if (na->u) {
-            notice_lang(s_NickServ, na->u, FORCENICKCHANGE_NOW);
-            collide(na, 0);
-        }
-
-
-        if (ircd->sqline) {
-            ircdproto->SendSQLine(na->nick, ((reason) ? reason : "Forbidden"));
-        }
-
-        if (WallForbid)
-            ircdproto->SendGlobops(s_NickServ, "\2%s\2 used FORBID on \2%s\2",
-                             u->nick, nick);
-
-        alog("%s: %s set FORBID for nick %s", s_NickServ, u->nick, nick);
-        notice_lang(s_NickServ, u, NICK_FORBID_SUCCEEDED, nick);
-        send_event(EVENT_NICK_FORBIDDEN, 1, nick);
-    } else {
-        alog("%s: Valid FORBID for %s by %s failed", s_NickServ, nick,
-             u->nick);
-        notice_lang(s_NickServ, u, NICK_FORBID_FAILED, nick);
-    }
-    return MOD_CONT;
+	NickAlias *na;
+	char *nick = strtok(NULL, " ");
+	char *reason = strtok(NULL, "");
+
+	/* Assumes that permission checking has already been done. */
+	if (!nick || (ForceForbidReason && !reason)) {
+		syntax_error(s_NickServ, u, "FORBID",
+					 (ForceForbidReason ? NICK_FORBID_SYNTAX_REASON :
+					  NICK_FORBID_SYNTAX));
+		return MOD_CONT;
+	}
+
+	if (readonly)
+		notice_lang(s_NickServ, u, READ_ONLY_MODE);
+	if (!ircdproto->IsNickValid(nick)) {
+		notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, nick);
+		return MOD_CONT;
+	}
+	if ((na = findnick(nick)) != NULL) {
+		if (NSSecureAdmins && nick_is_services_admin(na->nc)
+			&& !is_services_root(u)) {
+			notice_lang(s_NickServ, u, PERMISSION_DENIED);
+			return MOD_CONT;
+		}
+		delnick(na);
+	}
+	na = makenick(nick);
+	if (na) {
+		na->status |= NS_VERBOTEN;
+		na->last_usermask = sstrdup(u->nick);
+		if (reason)
+			na->last_realname = sstrdup(reason);
+
+		na->u = finduser(na->nick);
+		if (na->u)
+			na->u->na = na;
+
+		if (na->u) {
+			notice_lang(s_NickServ, na->u, FORCENICKCHANGE_NOW);
+			collide(na, 0);
+		}
+
+
+		if (ircd->sqline) {
+			ircdproto->SendSQLine(na->nick, ((reason) ? reason : "Forbidden"));
+		}
+
+		if (WallForbid)
+			ircdproto->SendGlobops(s_NickServ, "\2%s\2 used FORBID on \2%s\2",
+							 u->nick, nick);
+
+		alog("%s: %s set FORBID for nick %s", s_NickServ, u->nick, nick);
+		notice_lang(s_NickServ, u, NICK_FORBID_SUCCEEDED, nick);
+		send_event(EVENT_NICK_FORBIDDEN, 1, nick);
+	} else {
+		alog("%s: Valid FORBID for %s by %s failed", s_NickServ, nick,
+			 u->nick);
+		notice_lang(s_NickServ, u, NICK_FORBID_FAILED, nick);
+	}
+	return MOD_CONT;
 }
 
 NickAlias *makenick(const char *nick)
 {
-    NickAlias *na;
-    NickCore *nc;
-
-    /* First make the core */
-    nc = (NickCore *)scalloc(1, sizeof(NickCore));
-    nc->display = sstrdup(nick);
-    slist_init(&nc->aliases);
-    insert_core(nc);
-    alog("%s: group %s has been created", s_NickServ, nc->display);
-
-    /* Then make the alias */
-    na = (NickAlias *)scalloc(1, sizeof(NickAlias));
-    na->nick = sstrdup(nick);
-    na->nc = nc;
-    slist_add(&nc->aliases, na);
-    alpha_insert_alias(na);
-    return na;
+	NickAlias *na;
+	NickCore *nc;
+
+	/* First make the core */
+	nc = (NickCore *)scalloc(1, sizeof(NickCore));
+	nc->display = sstrdup(nick);
+	slist_init(&nc->aliases);
+	insert_core(nc);
+	alog("%s: group %s has been created", s_NickServ, nc->display);
+
+	/* Then make the alias */
+	na = (NickAlias *)scalloc(1, sizeof(NickAlias));
+	na->nick = sstrdup(nick);
+	na->nc = nc;
+	slist_add(&nc->aliases, na);
+	alpha_insert_alias(na);
+	return na;
 }
 
 MODULE_INIT("ns_forbid", NSForbid)
diff --git a/src/core/ns_getemail.c b/src/core/ns_getemail.c
index 19e51389b..3089470b3 100644
--- a/src/core/ns_getemail.c
+++ b/src/core/ns_getemail.c
@@ -10,8 +10,8 @@
  *
  *
  * A simple call to check for all emails that a user may have registered 
- * with. It returns the nicks that match the email you provide. Wild     
- * Cards are not excepted. Must use user@email-host.                     
+ * with. It returns the nicks that match the email you provide. Wild	 
+ * Cards are not excepted. Must use user@email-host.					 
  * 
  * $Id$
  *
@@ -47,9 +47,9 @@ class NSGetEMail : public Module
  **/
 void myNickServHelp(User * u)
 {
-    if (is_services_admin(u)) {
-        notice_lang(s_NickServ, u, NICK_HELP_CMD_GETEMAIL);
-    }
+	if (is_services_admin(u)) {
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_GETEMAIL);
+	}
 }
 
 /**
@@ -59,32 +59,32 @@ void myNickServHelp(User * u)
  **/
 int do_getemail(User * u)
 {
-    char *email = strtok(NULL, " ");
-    int i, j = 0;
-    NickCore *nc;
+	char *email = strtok(NULL, " ");
+	int i, j = 0;
+	NickCore *nc;
 
-    if (!email) {
-        syntax_error(s_NickServ, u, "GETMAIL", NICK_GETEMAIL_SYNTAX);
-        return MOD_CONT;
-    }
-    alog("%s: %s!%s@%s used GETEMAIL on %s", s_NickServ, u->nick,
-         u->username, u->host, email);
-    for (i = 0; i < 1024; i++) {
-        for (nc = nclists[i]; nc; nc = nc->next) {
-            if (nc->email) {
-                if (stricmp(nc->email, email) == 0) {
-                    j++;
-                    notice_lang(s_NickServ, u, NICK_GETEMAIL_EMAILS_ARE,
-                                nc->display, email);
-                }
-            }
-        }
-    }
-    if (j <= 0) {
-        notice_lang(s_NickServ, u, NICK_GETEMAIL_NOT_USED, email);
-        return MOD_CONT;
-    }
-    return MOD_CONT;
+	if (!email) {
+		syntax_error(s_NickServ, u, "GETMAIL", NICK_GETEMAIL_SYNTAX);
+		return MOD_CONT;
+	}
+	alog("%s: %s!%s@%s used GETEMAIL on %s", s_NickServ, u->nick,
+		 u->username, u->host, email);
+	for (i = 0; i < 1024; i++) {
+		for (nc = nclists[i]; nc; nc = nc->next) {
+			if (nc->email) {
+				if (stricmp(nc->email, email) == 0) {
+					j++;
+					notice_lang(s_NickServ, u, NICK_GETEMAIL_EMAILS_ARE,
+								nc->display, email);
+				}
+			}
+		}
+	}
+	if (j <= 0) {
+		notice_lang(s_NickServ, u, NICK_GETEMAIL_NOT_USED, email);
+		return MOD_CONT;
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("ns_getemail", NSGetEMail)
diff --git a/src/core/ns_getpass.c b/src/core/ns_getpass.c
index c741e76c9..90af1aa5f 100644
--- a/src/core/ns_getpass.c
+++ b/src/core/ns_getpass.c
@@ -42,9 +42,9 @@ class NSGetPass : public Module
  **/
 void myNickServHelp(User * u)
 {
-    if (is_services_admin(u)) {
-        notice_lang(s_NickServ, u, NICK_HELP_CMD_GETPASS);
-    }
+	if (is_services_admin(u)) {
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_GETPASS);
+	}
 }
 
 /**
@@ -54,47 +54,47 @@ void myNickServHelp(User * u)
  **/
 int do_getpass(User * u)
 {
-    char *nick = strtok(NULL, " ");
-    char tmp_pass[PASSMAX];
-    NickAlias *na;
-    NickRequest *nr = NULL;
+	char *nick = strtok(NULL, " ");
+	char tmp_pass[PASSMAX];
+	NickAlias *na;
+	NickRequest *nr = NULL;
 
-    if (!nick) {
-        syntax_error(s_NickServ, u, "GETPASS", NICK_GETPASS_SYNTAX);
-    } else if (!(na = findnick(nick))) {
-        if ((nr = findrequestnick(nick))) {
-            alog("%s: %s!%s@%s used GETPASS on %s", s_NickServ, u->nick,
-                 u->username, u->host, nick);
-            if (WallGetpass)
-                ircdproto->SendGlobops(s_NickServ,
-                                 "\2%s\2 used GETPASS on \2%s\2", u->nick,
-                                 nick);
-            notice_lang(s_NickServ, u, NICK_GETPASS_PASSCODE_IS, nick,
-                        nr->passcode);
-        } else {
-            notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
-        }
-    } else if (na->status & NS_VERBOTEN) {
-        notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
-    } else if (NSSecureAdmins && nick_is_services_admin(na->nc)
-               && !is_services_root(u)) {
-        notice_lang(s_NickServ, u, PERMISSION_DENIED);
-    } else if (NSRestrictGetPass && !is_services_root(u)) {
-        notice_lang(s_NickServ, u, PERMISSION_DENIED);
-    } else {
-        if(enc_decrypt(na->nc->pass,tmp_pass,PASSMAX - 1)==1) {
-            alog("%s: %s!%s@%s used GETPASS on %s", s_NickServ, u->nick,
-                 u->username, u->host, nick);
-            if (WallGetpass)
-                ircdproto->SendGlobops(s_NickServ, "\2%s\2 used GETPASS on \2%s\2",
-                                 u->nick, nick);
-            notice_lang(s_NickServ, u, NICK_GETPASS_PASSWORD_IS, nick,
-                        tmp_pass);
-        } else {
-            notice_lang(s_NickServ, u, NICK_GETPASS_UNAVAILABLE);
-        }
-    }
-    return MOD_CONT;
+	if (!nick) {
+		syntax_error(s_NickServ, u, "GETPASS", NICK_GETPASS_SYNTAX);
+	} else if (!(na = findnick(nick))) {
+		if ((nr = findrequestnick(nick))) {
+			alog("%s: %s!%s@%s used GETPASS on %s", s_NickServ, u->nick,
+				 u->username, u->host, nick);
+			if (WallGetpass)
+				ircdproto->SendGlobops(s_NickServ,
+								 "\2%s\2 used GETPASS on \2%s\2", u->nick,
+								 nick);
+			notice_lang(s_NickServ, u, NICK_GETPASS_PASSCODE_IS, nick,
+						nr->passcode);
+		} else {
+			notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
+		}
+	} else if (na->status & NS_VERBOTEN) {
+		notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
+	} else if (NSSecureAdmins && nick_is_services_admin(na->nc)
+			   && !is_services_root(u)) {
+		notice_lang(s_NickServ, u, PERMISSION_DENIED);
+	} else if (NSRestrictGetPass && !is_services_root(u)) {
+		notice_lang(s_NickServ, u, PERMISSION_DENIED);
+	} else {
+		if(enc_decrypt(na->nc->pass,tmp_pass,PASSMAX - 1)==1) {
+			alog("%s: %s!%s@%s used GETPASS on %s", s_NickServ, u->nick,
+				 u->username, u->host, nick);
+			if (WallGetpass)
+				ircdproto->SendGlobops(s_NickServ, "\2%s\2 used GETPASS on \2%s\2",
+								 u->nick, nick);
+			notice_lang(s_NickServ, u, NICK_GETPASS_PASSWORD_IS, nick,
+						tmp_pass);
+		} else {
+			notice_lang(s_NickServ, u, NICK_GETPASS_UNAVAILABLE);
+		}
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("ns_getpass", NSGetPass)
diff --git a/src/core/ns_ghost.c b/src/core/ns_ghost.c
index 49f036cc6..4eb825a6f 100644
--- a/src/core/ns_ghost.c
+++ b/src/core/ns_ghost.c
@@ -44,7 +44,7 @@ class NSGhost : public Module
  **/
 void myNickServHelp(User * u)
 {
-    notice_lang(s_NickServ, u, NICK_HELP_CMD_GHOST);
+	notice_lang(s_NickServ, u, NICK_HELP_CMD_GHOST);
 }
 
 /**
@@ -54,58 +54,58 @@ void myNickServHelp(User * u)
  **/
 int do_ghost(User * u)
 {
-    char *nick = strtok(NULL, " ");
-    char *pass = strtok(NULL, " ");
-    NickAlias *na;
-    User *u2;
+	char *nick = strtok(NULL, " ");
+	char *pass = strtok(NULL, " ");
+	NickAlias *na;
+	User *u2;
 
-    if (!nick) {
-        syntax_error(s_NickServ, u, "GHOST", NICK_GHOST_SYNTAX);
-    } else if (!(u2 = finduser(nick))) {
-        notice_lang(s_NickServ, u, NICK_X_NOT_IN_USE, nick);
-    } else if (!(na = u2->na)) {
-        notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
-    } else if (na->status & NS_VERBOTEN) {
-        notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
-    } else if (na->nc->flags & NI_SUSPENDED) {
-        notice_lang(s_NickServ, u, NICK_X_SUSPENDED, na->nick);
-    } else if (stricmp(nick, u->nick) == 0) {
-        notice_lang(s_NickServ, u, NICK_NO_GHOST_SELF);
-    } else if (pass) {
-        int res = enc_check_password(pass, na->nc->pass);
-        if (res == 1) {
-            char buf[NICKMAX + 32];
-            snprintf(buf, sizeof(buf), "GHOST command used by %s",
-                     u->nick);
-            if (LimitSessions) {
-                del_session(u2->host);
-            }
-            kill_user(s_NickServ, nick, buf);
-            notice_lang(s_NickServ, u, NICK_GHOST_KILLED, nick);
-        } else {
-            notice_lang(s_NickServ, u, ACCESS_DENIED);
-            if (res == 0) {
-                alog("%s: GHOST: invalid password for %s by %s!%s@%s",
-                     s_NickServ, nick, u->nick, u->username, u->host);
-                bad_password(u);
-            }
-        }
-    } else {
-        if (group_identified(u, na->nc)
-            || (!(na->nc->flags & NI_SECURE) && is_on_access(u, na->nc))) {
-            char buf[NICKMAX + 32];
-            snprintf(buf, sizeof(buf), "GHOST command used by %s",
-                     u->nick);
-            if (LimitSessions) {
-                del_session(u2->host);
-            }
-            kill_user(s_NickServ, nick, buf);
-            notice_lang(s_NickServ, u, NICK_GHOST_KILLED, nick);
-        } else {
-            notice_lang(s_NickServ, u, ACCESS_DENIED);
-        }
-    }
-    return MOD_CONT;
+	if (!nick) {
+		syntax_error(s_NickServ, u, "GHOST", NICK_GHOST_SYNTAX);
+	} else if (!(u2 = finduser(nick))) {
+		notice_lang(s_NickServ, u, NICK_X_NOT_IN_USE, nick);
+	} else if (!(na = u2->na)) {
+		notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
+	} else if (na->status & NS_VERBOTEN) {
+		notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
+	} else if (na->nc->flags & NI_SUSPENDED) {
+		notice_lang(s_NickServ, u, NICK_X_SUSPENDED, na->nick);
+	} else if (stricmp(nick, u->nick) == 0) {
+		notice_lang(s_NickServ, u, NICK_NO_GHOST_SELF);
+	} else if (pass) {
+		int res = enc_check_password(pass, na->nc->pass);
+		if (res == 1) {
+			char buf[NICKMAX + 32];
+			snprintf(buf, sizeof(buf), "GHOST command used by %s",
+					 u->nick);
+			if (LimitSessions) {
+				del_session(u2->host);
+			}
+			kill_user(s_NickServ, nick, buf);
+			notice_lang(s_NickServ, u, NICK_GHOST_KILLED, nick);
+		} else {
+			notice_lang(s_NickServ, u, ACCESS_DENIED);
+			if (res == 0) {
+				alog("%s: GHOST: invalid password for %s by %s!%s@%s",
+					 s_NickServ, nick, u->nick, u->username, u->host);
+				bad_password(u);
+			}
+		}
+	} else {
+		if (group_identified(u, na->nc)
+			|| (!(na->nc->flags & NI_SECURE) && is_on_access(u, na->nc))) {
+			char buf[NICKMAX + 32];
+			snprintf(buf, sizeof(buf), "GHOST command used by %s",
+					 u->nick);
+			if (LimitSessions) {
+				del_session(u2->host);
+			}
+			kill_user(s_NickServ, nick, buf);
+			notice_lang(s_NickServ, u, NICK_GHOST_KILLED, nick);
+		} else {
+			notice_lang(s_NickServ, u, ACCESS_DENIED);
+		}
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("ns_ghost", NSGhost)
diff --git a/src/core/ns_group.c b/src/core/ns_group.c
index b420be531..14ce0386f 100644
--- a/src/core/ns_group.c
+++ b/src/core/ns_group.c
@@ -60,8 +60,8 @@ class NSGroup : public Module
  **/
 void myNickServHelp(User * u)
 {
-    notice_lang(s_NickServ, u, NICK_HELP_CMD_GROUP);
-    notice_lang(s_NickServ, u, NICK_HELP_CMD_GLIST);
+	notice_lang(s_NickServ, u, NICK_HELP_CMD_GROUP);
+	notice_lang(s_NickServ, u, NICK_HELP_CMD_GLIST);
 }
 
 /**
@@ -73,162 +73,162 @@ void myNickServHelp(User * u)
 
 int do_group(User * u)
 {
-    NickAlias *na, *target;
-    NickCore *nc;
-    char *nick = strtok(NULL, " ");
-    char *pass = strtok(NULL, " ");
-    int i;
-    char tsbuf[16];
-    char modes[512];
-    int len;
-
-    if (NSEmailReg && (findrequestnick(u->nick))) {
-        notice_lang(s_NickServ, u, NICK_REQUESTED);
-        return MOD_CONT;
-    }
-
-    if (readonly) {
-        notice_lang(s_NickServ, u, NICK_GROUP_DISABLED);
-        return MOD_CONT;
-    }
-    if (checkDefCon(DEFCON_NO_NEW_NICKS)) {
-        notice_lang(s_NickServ, u, OPER_DEFCON_DENIED);
-        return MOD_CONT;
-    }
-
-    if (RestrictOperNicks) {
-        for (i = 0; i < RootNumber; i++) {
-            if (stristr(u->nick, ServicesRoots[i]) && !is_oper(u)) {
-                notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED,
-                            u->nick);
-                return MOD_CONT;
-            }
-        }
-        for (i = 0; i < servadmins.count && (nc = (NickCore *)servadmins.list[i]); i++) {
-            if (stristr(u->nick, nc->display) && !is_oper(u)) {
-                notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED,
-                            u->nick);
-                return MOD_CONT;
-            }
-        }
-        for (i = 0; i < servopers.count && (nc = (NickCore *)servopers.list[i]); i++) {
-            if (stristr(u->nick, nc->display) && !is_oper(u)) {
-                notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED,
-                            u->nick);
-                return MOD_CONT;
-            }
-        }
-    }
-
-    if (!nick || !pass) {
-        syntax_error(s_NickServ, u, "GROUP", NICK_GROUP_SYNTAX);
-    } else if (!(target = findnick(nick))) {
-        notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
-    } else if (time(NULL) < u->lastnickreg + NSRegDelay) {
-        notice_lang(s_NickServ, u, NICK_GROUP_PLEASE_WAIT, NSRegDelay);
-    } else if (u->na && (u->na->status & NS_VERBOTEN)) {
-        alog("%s: %s@%s tried to use GROUP from FORBIDden nick %s",
-             s_NickServ, u->username, u->host, u->nick);
-        notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, u->nick);
-    } else if (u->na && (u->na->nc->flags & NI_SUSPENDED)) {
-        alog("%s: %s!%s@%s tried to use GROUP from SUSPENDED nick %s",
-             s_NickServ, u->nick, u->username, u->host, target->nick);
-        notice_lang(s_NickServ, u, NICK_X_SUSPENDED, u->nick);
-    } else if (u->na && NSNoGroupChange) {
-        notice_lang(s_NickServ, u, NICK_GROUP_CHANGE_DISABLED, s_NickServ);
-    } else if (u->na && !nick_identified(u)) {
-        notice_lang(s_NickServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
-    } else if (target && (target->nc->flags & NI_SUSPENDED)) {
-        alog("%s: %s!%s@%s tried to use GROUP from SUSPENDED nick %s",
-             s_NickServ, u->nick, u->username, u->host, target->nick);
-        notice_lang(s_NickServ, u, NICK_X_SUSPENDED, target->nick);
-    } else if (target->status & NS_VERBOTEN) {
-        notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, nick);
-    } else if (u->na && target->nc == u->na->nc) {
-        notice_lang(s_NickServ, u, NICK_GROUP_SAME, target->nick);
-    } else if (NSMaxAliases && (target->nc->aliases.count >= NSMaxAliases)
-               && !nick_is_services_admin(target->nc)) {
-        notice_lang(s_NickServ, u, NICK_GROUP_TOO_MANY, target->nick,
-                    s_NickServ, s_NickServ);
-    } else if (enc_check_password(pass, target->nc->pass) != 1) {
-        alog("%s: Failed GROUP for %s!%s@%s (invalid password)",
-             s_NickServ, u->nick, u->username, u->host);
-        notice_lang(s_NickServ, u, PASSWORD_INCORRECT);
-        bad_password(u);
-    } else {
-        /* If the nick is already registered, drop it.
-         * If not, check that it is valid.
-         */
-        if (u->na) {
-            delnick(u->na);
-        } else {
-            int prefixlen = strlen(NSGuestNickPrefix);
-            int nicklen = strlen(u->nick);
-
-            if (nicklen <= prefixlen + 7 && nicklen >= prefixlen + 1
-                && stristr(u->nick, NSGuestNickPrefix) == u->nick
-                && strspn(u->nick + prefixlen,
-                          "1234567890") == nicklen - prefixlen) {
-                notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED,
-                            u->nick);
-                return MOD_CONT;
-            }
-        }
-        na = makealias(u->nick, target->nc);
-
-        if (na) {
-            na->last_usermask =
-                (char *)scalloc(strlen(common_get_vident(u)) +
-                        strlen(common_get_vhost(u)) + 2, 1);
-            sprintf(na->last_usermask, "%s@%s", common_get_vident(u),
-                    common_get_vhost(u));
-            na->last_realname = sstrdup(u->realname);
-            na->time_registered = na->last_seen = time(NULL);
-            na->status = (int16) (NS_IDENTIFIED | NS_RECOGNIZED);
-
-            if (!(na->nc->flags & NI_SERVICES_ROOT)) {
-                for (i = 0; i < RootNumber; i++) {
-                    if (!stricmp(ServicesRoots[i], u->nick)) {
-                        na->nc->flags |= NI_SERVICES_ROOT;
-                        break;
-                    }
-                }
-            }
-
-            u->na = na;
-            na->u = u;
-
-            send_event(EVENT_GROUP, 1, u->nick);
-            alog("%s: %s!%s@%s makes %s join group of %s (%s) (e-mail: %s)", s_NickServ, u->nick, u->username, u->host, u->nick, target->nick, target->nc->display, (target->nc->email ? target->nc->email : "none"));
-            notice_lang(s_NickServ, u, NICK_GROUP_JOINED, target->nick);
-
-            u->lastnickreg = time(NULL);
-            snprintf(tsbuf, sizeof(tsbuf), "%lu",
-                     (unsigned long int) u->timestamp);
-            if (ircd->modeonreg) {
-                len = strlen(ircd->modeonreg);
-                strncpy(modes,ircd->modeonreg,512);
-	       if(ircd->rootmodeonid && is_services_root(u)) { 
-                    strncat(modes,ircd->rootmodeonid,512-len);
-	        } else if(ircd->adminmodeonid && is_services_admin(u)) {
-                    strncat(modes,ircd->adminmodeonid,512-len);
-	        } else if(ircd->opermodeonid && is_services_oper(u)) {
-                    strncat(modes,ircd->opermodeonid,512-len);
-                }
-                if (ircd->tsonmode) {
-                    common_svsmode(u, modes, tsbuf);
-                } else {
-                    common_svsmode(u, modes, NULL);
-                }
-            }
-
-            check_memos(u);
-        } else {
-            alog("%s: makealias(%s) failed", s_NickServ, u->nick);
-            notice_lang(s_NickServ, u, NICK_GROUP_FAILED);
-        }
-    }
-    return MOD_CONT;
+	NickAlias *na, *target;
+	NickCore *nc;
+	char *nick = strtok(NULL, " ");
+	char *pass = strtok(NULL, " ");
+	int i;
+	char tsbuf[16];
+	char modes[512];
+	int len;
+
+	if (NSEmailReg && (findrequestnick(u->nick))) {
+		notice_lang(s_NickServ, u, NICK_REQUESTED);
+		return MOD_CONT;
+	}
+
+	if (readonly) {
+		notice_lang(s_NickServ, u, NICK_GROUP_DISABLED);
+		return MOD_CONT;
+	}
+	if (checkDefCon(DEFCON_NO_NEW_NICKS)) {
+		notice_lang(s_NickServ, u, OPER_DEFCON_DENIED);
+		return MOD_CONT;
+	}
+
+	if (RestrictOperNicks) {
+		for (i = 0; i < RootNumber; i++) {
+			if (stristr(u->nick, ServicesRoots[i]) && !is_oper(u)) {
+				notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED,
+							u->nick);
+				return MOD_CONT;
+			}
+		}
+		for (i = 0; i < servadmins.count && (nc = (NickCore *)servadmins.list[i]); i++) {
+			if (stristr(u->nick, nc->display) && !is_oper(u)) {
+				notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED,
+							u->nick);
+				return MOD_CONT;
+			}
+		}
+		for (i = 0; i < servopers.count && (nc = (NickCore *)servopers.list[i]); i++) {
+			if (stristr(u->nick, nc->display) && !is_oper(u)) {
+				notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED,
+							u->nick);
+				return MOD_CONT;
+			}
+		}
+	}
+
+	if (!nick || !pass) {
+		syntax_error(s_NickServ, u, "GROUP", NICK_GROUP_SYNTAX);
+	} else if (!(target = findnick(nick))) {
+		notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
+	} else if (time(NULL) < u->lastnickreg + NSRegDelay) {
+		notice_lang(s_NickServ, u, NICK_GROUP_PLEASE_WAIT, NSRegDelay);
+	} else if (u->na && (u->na->status & NS_VERBOTEN)) {
+		alog("%s: %s@%s tried to use GROUP from FORBIDden nick %s",
+			 s_NickServ, u->username, u->host, u->nick);
+		notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, u->nick);
+	} else if (u->na && (u->na->nc->flags & NI_SUSPENDED)) {
+		alog("%s: %s!%s@%s tried to use GROUP from SUSPENDED nick %s",
+			 s_NickServ, u->nick, u->username, u->host, target->nick);
+		notice_lang(s_NickServ, u, NICK_X_SUSPENDED, u->nick);
+	} else if (u->na && NSNoGroupChange) {
+		notice_lang(s_NickServ, u, NICK_GROUP_CHANGE_DISABLED, s_NickServ);
+	} else if (u->na && !nick_identified(u)) {
+		notice_lang(s_NickServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
+	} else if (target && (target->nc->flags & NI_SUSPENDED)) {
+		alog("%s: %s!%s@%s tried to use GROUP from SUSPENDED nick %s",
+			 s_NickServ, u->nick, u->username, u->host, target->nick);
+		notice_lang(s_NickServ, u, NICK_X_SUSPENDED, target->nick);
+	} else if (target->status & NS_VERBOTEN) {
+		notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, nick);
+	} else if (u->na && target->nc == u->na->nc) {
+		notice_lang(s_NickServ, u, NICK_GROUP_SAME, target->nick);
+	} else if (NSMaxAliases && (target->nc->aliases.count >= NSMaxAliases)
+			   && !nick_is_services_admin(target->nc)) {
+		notice_lang(s_NickServ, u, NICK_GROUP_TOO_MANY, target->nick,
+					s_NickServ, s_NickServ);
+	} else if (enc_check_password(pass, target->nc->pass) != 1) {
+		alog("%s: Failed GROUP for %s!%s@%s (invalid password)",
+			 s_NickServ, u->nick, u->username, u->host);
+		notice_lang(s_NickServ, u, PASSWORD_INCORRECT);
+		bad_password(u);
+	} else {
+		/* If the nick is already registered, drop it.
+		 * If not, check that it is valid.
+		 */
+		if (u->na) {
+			delnick(u->na);
+		} else {
+			int prefixlen = strlen(NSGuestNickPrefix);
+			int nicklen = strlen(u->nick);
+
+			if (nicklen <= prefixlen + 7 && nicklen >= prefixlen + 1
+				&& stristr(u->nick, NSGuestNickPrefix) == u->nick
+				&& strspn(u->nick + prefixlen,
+						  "1234567890") == nicklen - prefixlen) {
+				notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED,
+							u->nick);
+				return MOD_CONT;
+			}
+		}
+		na = makealias(u->nick, target->nc);
+
+		if (na) {
+			na->last_usermask =
+				(char *)scalloc(strlen(common_get_vident(u)) +
+						strlen(common_get_vhost(u)) + 2, 1);
+			sprintf(na->last_usermask, "%s@%s", common_get_vident(u),
+					common_get_vhost(u));
+			na->last_realname = sstrdup(u->realname);
+			na->time_registered = na->last_seen = time(NULL);
+			na->status = (int16) (NS_IDENTIFIED | NS_RECOGNIZED);
+
+			if (!(na->nc->flags & NI_SERVICES_ROOT)) {
+				for (i = 0; i < RootNumber; i++) {
+					if (!stricmp(ServicesRoots[i], u->nick)) {
+						na->nc->flags |= NI_SERVICES_ROOT;
+						break;
+					}
+				}
+			}
+
+			u->na = na;
+			na->u = u;
+
+			send_event(EVENT_GROUP, 1, u->nick);
+			alog("%s: %s!%s@%s makes %s join group of %s (%s) (e-mail: %s)", s_NickServ, u->nick, u->username, u->host, u->nick, target->nick, target->nc->display, (target->nc->email ? target->nc->email : "none"));
+			notice_lang(s_NickServ, u, NICK_GROUP_JOINED, target->nick);
+
+			u->lastnickreg = time(NULL);
+			snprintf(tsbuf, sizeof(tsbuf), "%lu",
+					 (unsigned long int) u->timestamp);
+			if (ircd->modeonreg) {
+				len = strlen(ircd->modeonreg);
+				strncpy(modes,ircd->modeonreg,512);
+		   if(ircd->rootmodeonid && is_services_root(u)) { 
+					strncat(modes,ircd->rootmodeonid,512-len);
+			} else if(ircd->adminmodeonid && is_services_admin(u)) {
+					strncat(modes,ircd->adminmodeonid,512-len);
+			} else if(ircd->opermodeonid && is_services_oper(u)) {
+					strncat(modes,ircd->opermodeonid,512-len);
+				}
+				if (ircd->tsonmode) {
+					common_svsmode(u, modes, tsbuf);
+				} else {
+					common_svsmode(u, modes, NULL);
+				}
+			}
+
+			check_memos(u);
+		} else {
+			alog("%s: makealias(%s) failed", s_NickServ, u->nick);
+			notice_lang(s_NickServ, u, NICK_GROUP_FAILED);
+		}
+	}
+	return MOD_CONT;
 }
 
 
@@ -236,79 +236,79 @@ int do_group(User * u)
 
 NickAlias *makealias(const char *nick, NickCore * nc)
 {
-    NickAlias *na;
-
-    /* Just need to make the alias */
-    na = (NickAlias *)scalloc(1, sizeof(NickAlias));
-    na->nick = sstrdup(nick);
-    na->nc = nc;
-    slist_add(&nc->aliases, na);
-    alpha_insert_alias(na);
-    return na;
+	NickAlias *na;
+
+	/* Just need to make the alias */
+	na = (NickAlias *)scalloc(1, sizeof(NickAlias));
+	na->nick = sstrdup(nick);
+	na->nc = nc;
+	slist_add(&nc->aliases, na);
+	alpha_insert_alias(na);
+	return na;
 }
 
 
 int do_link(User * u)
 {
-    notice_lang(s_NickServ, u, OBSOLETE_COMMAND, "GROUP");
-    return MOD_CONT;
+	notice_lang(s_NickServ, u, OBSOLETE_COMMAND, "GROUP");
+	return MOD_CONT;
 }
 
 int do_glist(User * u)
 {
-    char *nick = strtok(NULL, " ");
-
-    NickAlias *na, *na2;
-    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)) {
-        notice_lang(s_NickServ, u,
-                    (nick_ided ? ACCESS_DENIED :
-                     NICK_IDENTIFY_REQUIRED), s_NickServ);
-    } else if ((!nick ? !(na = u->na) : !(na = findnick(nick)))) {
-        notice_lang(s_NickServ, u,
-                    (!nick ? NICK_NOT_REGISTERED : NICK_X_NOT_REGISTERED),
-                    nick);
-    } else if (na->status & NS_VERBOTEN) {
-        notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
-    } else {
-        time_t expt;
-        struct tm *tm;
-        char buf[BUFSIZE];
-        int wont_expire;
-
-        notice_lang(s_NickServ, u,
-                    nick ? NICK_GLIST_HEADER_X : NICK_GLIST_HEADER,
-                    na->nc->display);
-        for (i = 0; i < na->nc->aliases.count; i++) {
-            na2 = (NickAlias *)na->nc->aliases.list[i];
-            if (na2->nc == na->nc) {
-                if (!(wont_expire = na2->status & NS_NO_EXPIRE)) {
-                    expt = na2->last_seen + NSExpire;
-                    tm = localtime(&expt);
-                    strftime_lang(buf, sizeof(buf), na2->u,
-                                  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, NICK_GLIST_FOOTER,
-                    na->nc->aliases.count);
-    }
-    return MOD_CONT;
+	char *nick = strtok(NULL, " ");
+
+	NickAlias *na, *na2;
+	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)) {
+		notice_lang(s_NickServ, u,
+					(nick_ided ? ACCESS_DENIED :
+					 NICK_IDENTIFY_REQUIRED), s_NickServ);
+	} else if ((!nick ? !(na = u->na) : !(na = findnick(nick)))) {
+		notice_lang(s_NickServ, u,
+					(!nick ? NICK_NOT_REGISTERED : NICK_X_NOT_REGISTERED),
+					nick);
+	} else if (na->status & NS_VERBOTEN) {
+		notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
+	} else {
+		time_t expt;
+		struct tm *tm;
+		char buf[BUFSIZE];
+		int wont_expire;
+
+		notice_lang(s_NickServ, u,
+					nick ? NICK_GLIST_HEADER_X : NICK_GLIST_HEADER,
+					na->nc->display);
+		for (i = 0; i < na->nc->aliases.count; i++) {
+			na2 = (NickAlias *)na->nc->aliases.list[i];
+			if (na2->nc == na->nc) {
+				if (!(wont_expire = na2->status & NS_NO_EXPIRE)) {
+					expt = na2->last_seen + NSExpire;
+					tm = localtime(&expt);
+					strftime_lang(buf, sizeof(buf), na2->u,
+								  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, NICK_GLIST_FOOTER,
+					na->nc->aliases.count);
+	}
+	return MOD_CONT;
 }
 
 
 int do_listlinks(User * u)
 {
-    notice_lang(s_NickServ, u, OBSOLETE_COMMAND, "GLIST");
-    return MOD_CONT;
+	notice_lang(s_NickServ, u, OBSOLETE_COMMAND, "GLIST");
+	return MOD_CONT;
 }
 
 MODULE_INIT("ns_group", NSGroup)
diff --git a/src/core/ns_help.c b/src/core/ns_help.c
index ace2384f2..013a0589a 100644
--- a/src/core/ns_help.c
+++ b/src/core/ns_help.c
@@ -41,28 +41,28 @@ class NSHelp : public Module
  **/
 int do_help(User * u)
 {
-    char *cmd = strtok(NULL, "");
+	char *cmd = strtok(NULL, "");
 
-    if (!cmd) {
-        notice_help(s_NickServ, u, NICK_HELP);
-        moduleDisplayHelp(1, u);
-        if (is_services_admin(u)) {
-            notice_help(s_NickServ, u, NICK_SERVADMIN_HELP);
-        }
-        if (NSExpire >= 86400)
-            notice_help(s_NickServ, u, NICK_HELP_EXPIRES,
-                        NSExpire / 86400);
-        notice_help(s_NickServ, u, NICK_HELP_FOOTER);
-    } else if (stricmp(cmd, "SET LANGUAGE") == 0) {
-        int i;
-        notice_help(s_NickServ, u, NICK_HELP_SET_LANGUAGE);
-        for (i = 0; i < NUM_LANGS && langlist[i] >= 0; i++)
-            notice_user(s_NickServ, u, "    %2d) %s", i + 1,
-                        langnames[langlist[i]]);
-    } else {
-        mod_help_cmd(s_NickServ, u, NICKSERV, cmd);
-    }
-    return MOD_CONT;
+	if (!cmd) {
+		notice_help(s_NickServ, u, NICK_HELP);
+		moduleDisplayHelp(1, u);
+		if (is_services_admin(u)) {
+			notice_help(s_NickServ, u, NICK_SERVADMIN_HELP);
+		}
+		if (NSExpire >= 86400)
+			notice_help(s_NickServ, u, NICK_HELP_EXPIRES,
+						NSExpire / 86400);
+		notice_help(s_NickServ, u, NICK_HELP_FOOTER);
+	} else if (stricmp(cmd, "SET LANGUAGE") == 0) {
+		int i;
+		notice_help(s_NickServ, u, NICK_HELP_SET_LANGUAGE);
+		for (i = 0; i < NUM_LANGS && langlist[i] >= 0; i++)
+			notice_user(s_NickServ, u, "	%2d) %s", i + 1,
+						langnames[langlist[i]]);
+	} else {
+		mod_help_cmd(s_NickServ, u, NICKSERV, cmd);
+	}
+	return MOD_CONT;
 }
 
 /* EOF */
diff --git a/src/core/ns_identify.c b/src/core/ns_identify.c
index 89a33a89e..cd92731aa 100644
--- a/src/core/ns_identify.c
+++ b/src/core/ns_identify.c
@@ -15,8 +15,8 @@
 
 #include "module.h"
 
-#define TO_COLLIDE   0          /* Collide the user with this nick */
-#define TO_RELEASE   1          /* Release a collided nick */
+#define TO_COLLIDE   0		  /* Collide the user with this nick */
+#define TO_RELEASE   1		  /* Release a collided nick */
 
 int do_identify(User * u);
 void myNickServHelp(User * u);
@@ -51,7 +51,7 @@ class NSIdentify : public Module
  **/
 void myNickServHelp(User * u)
 {
-    notice_lang(s_NickServ, u, NICK_HELP_CMD_IDENTIFY);
+	notice_lang(s_NickServ, u, NICK_HELP_CMD_IDENTIFY);
 }
 
 /**
@@ -61,100 +61,100 @@ void myNickServHelp(User * u)
  **/
 int do_identify(User * u)
 {
-    char *pass = strtok(NULL, " ");
-    NickAlias *na;
-    NickRequest *nr;
-    int res;
-    char tsbuf[16];
-    char modes[512];
-    int len;
-
-    if (!pass) {
-        syntax_error(s_NickServ, u, "IDENTIFY", NICK_IDENTIFY_SYNTAX);
-    } else if (!(na = u->na)) {
-        if ((nr = findrequestnick(u->nick))) {
-            notice_lang(s_NickServ, u, NICK_IS_PREREG);
-        } else {
-            notice_lang(s_NickServ, u, NICK_NOT_REGISTERED);
-        }
-    } else if (na->status & NS_VERBOTEN) {
-        notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
-    } else if (na->nc->flags & NI_SUSPENDED) {
-        notice_lang(s_NickServ, u, NICK_X_SUSPENDED, na->nick);
-    } else if (nick_identified(u)) {
-        notice_lang(s_NickServ, u, NICK_ALREADY_IDENTIFIED);
-    } else if (!(res = enc_check_password(pass, na->nc->pass))) {
-        alog("%s: Failed IDENTIFY for %s!%s@%s", s_NickServ, u->nick,
-             u->username, u->host);
-        notice_lang(s_NickServ, u, PASSWORD_INCORRECT);
-        bad_password(u);
-    } else if (res == -1) {
-        notice_lang(s_NickServ, u, NICK_IDENTIFY_FAILED);
-    } else {
-        if (!(na->status & NS_IDENTIFIED) && !(na->status & NS_RECOGNIZED)) {
-            if (na->last_usermask)
-                free(na->last_usermask);
-            na->last_usermask =
-                (char *)scalloc(strlen(common_get_vident(u)) +
-                        strlen(common_get_vhost(u)) + 2, 1);
-            sprintf(na->last_usermask, "%s@%s", common_get_vident(u),
-                    common_get_vhost(u));
-            if (na->last_realname)
-                free(na->last_realname);
-            na->last_realname = sstrdup(u->realname);
-        }
-
-        na->status |= NS_IDENTIFIED;
-        na->last_seen = time(NULL);
-        snprintf(tsbuf, sizeof(tsbuf), "%lu",
-                 (unsigned long int) u->timestamp);
-
-        if (ircd->modeonreg) {
-            len = strlen(ircd->modeonreg);
-	    strncpy(modes,ircd->modeonreg,512);
-	    if(ircd->rootmodeonid && is_services_root(u)) { 
-                strncat(modes,ircd->rootmodeonid,512-len);
-	    } else if(ircd->adminmodeonid && is_services_admin(u)) {
-                strncat(modes,ircd->adminmodeonid,512-len);
-	    } else if(ircd->opermodeonid && is_services_oper(u)) {
-                strncat(modes,ircd->opermodeonid,512-len);
-	    }
-            if (ircd->tsonmode) {
-                common_svsmode(u, modes, tsbuf);
-            } else {
-                common_svsmode(u, modes, "");
-            }
-        }
-        send_event(EVENT_NICK_IDENTIFY, 1, u->nick);
-        alog("%s: %s!%s@%s identified for nick %s", s_NickServ, u->nick,
-             u->username, u->host, u->nick);
-        notice_lang(s_NickServ, u, NICK_IDENTIFY_SUCCEEDED);
-        if (ircd->vhost) {
-            do_on_id(u);
-        }
-        if (NSModeOnID) {
-            do_setmodes(u);
-        }
-
-        if (NSForceEmail && u->na && !u->na->nc->email) {
-            notice_lang(s_NickServ, u, NICK_IDENTIFY_EMAIL_REQUIRED);
-            notice_help(s_NickServ, u, NICK_IDENTIFY_EMAIL_HOWTO);
-        }
-
-        if (!(na->status & NS_RECOGNIZED))
-            check_memos(u);
-
-        /* Enable nick tracking if enabled */
-        if (NSNickTracking)
-            nsStartNickTracking(u);
-
-        /* Clear any timers */
-        if (na->nc->flags & NI_KILLPROTECT) {
-            del_ns_timeout(na, TO_COLLIDE);
-        }
-
-    }
-    return MOD_CONT;
+	char *pass = strtok(NULL, " ");
+	NickAlias *na;
+	NickRequest *nr;
+	int res;
+	char tsbuf[16];
+	char modes[512];
+	int len;
+
+	if (!pass) {
+		syntax_error(s_NickServ, u, "IDENTIFY", NICK_IDENTIFY_SYNTAX);
+	} else if (!(na = u->na)) {
+		if ((nr = findrequestnick(u->nick))) {
+			notice_lang(s_NickServ, u, NICK_IS_PREREG);
+		} else {
+			notice_lang(s_NickServ, u, NICK_NOT_REGISTERED);
+		}
+	} else if (na->status & NS_VERBOTEN) {
+		notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
+	} else if (na->nc->flags & NI_SUSPENDED) {
+		notice_lang(s_NickServ, u, NICK_X_SUSPENDED, na->nick);
+	} else if (nick_identified(u)) {
+		notice_lang(s_NickServ, u, NICK_ALREADY_IDENTIFIED);
+	} else if (!(res = enc_check_password(pass, na->nc->pass))) {
+		alog("%s: Failed IDENTIFY for %s!%s@%s", s_NickServ, u->nick,
+			 u->username, u->host);
+		notice_lang(s_NickServ, u, PASSWORD_INCORRECT);
+		bad_password(u);
+	} else if (res == -1) {
+		notice_lang(s_NickServ, u, NICK_IDENTIFY_FAILED);
+	} else {
+		if (!(na->status & NS_IDENTIFIED) && !(na->status & NS_RECOGNIZED)) {
+			if (na->last_usermask)
+				free(na->last_usermask);
+			na->last_usermask =
+				(char *)scalloc(strlen(common_get_vident(u)) +
+						strlen(common_get_vhost(u)) + 2, 1);
+			sprintf(na->last_usermask, "%s@%s", common_get_vident(u),
+					common_get_vhost(u));
+			if (na->last_realname)
+				free(na->last_realname);
+			na->last_realname = sstrdup(u->realname);
+		}
+
+		na->status |= NS_IDENTIFIED;
+		na->last_seen = time(NULL);
+		snprintf(tsbuf, sizeof(tsbuf), "%lu",
+				 (unsigned long int) u->timestamp);
+
+		if (ircd->modeonreg) {
+			len = strlen(ircd->modeonreg);
+		strncpy(modes,ircd->modeonreg,512);
+		if(ircd->rootmodeonid && is_services_root(u)) { 
+				strncat(modes,ircd->rootmodeonid,512-len);
+		} else if(ircd->adminmodeonid && is_services_admin(u)) {
+				strncat(modes,ircd->adminmodeonid,512-len);
+		} else if(ircd->opermodeonid && is_services_oper(u)) {
+				strncat(modes,ircd->opermodeonid,512-len);
+		}
+			if (ircd->tsonmode) {
+				common_svsmode(u, modes, tsbuf);
+			} else {
+				common_svsmode(u, modes, "");
+			}
+		}
+		send_event(EVENT_NICK_IDENTIFY, 1, u->nick);
+		alog("%s: %s!%s@%s identified for nick %s", s_NickServ, u->nick,
+			 u->username, u->host, u->nick);
+		notice_lang(s_NickServ, u, NICK_IDENTIFY_SUCCEEDED);
+		if (ircd->vhost) {
+			do_on_id(u);
+		}
+		if (NSModeOnID) {
+			do_setmodes(u);
+		}
+
+		if (NSForceEmail && u->na && !u->na->nc->email) {
+			notice_lang(s_NickServ, u, NICK_IDENTIFY_EMAIL_REQUIRED);
+			notice_help(s_NickServ, u, NICK_IDENTIFY_EMAIL_HOWTO);
+		}
+
+		if (!(na->status & NS_RECOGNIZED))
+			check_memos(u);
+
+		/* Enable nick tracking if enabled */
+		if (NSNickTracking)
+			nsStartNickTracking(u);
+
+		/* Clear any timers */
+		if (na->nc->flags & NI_KILLPROTECT) {
+			del_ns_timeout(na, TO_COLLIDE);
+		}
+
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("ns_identify", NSIdentify)
diff --git a/src/core/ns_info.c b/src/core/ns_info.c
index 9644626ec..0ce3e0894 100644
--- a/src/core/ns_info.c
+++ b/src/core/ns_info.c
@@ -46,7 +46,7 @@ class NSInfo : public Module
  **/
 void myNickServHelp(User * u)
 {
-    notice_lang(s_NickServ, u, NICK_HELP_CMD_INFO);
+	notice_lang(s_NickServ, u, NICK_HELP_CMD_INFO);
 }
 
 /**
@@ -64,210 +64,210 @@ int do_info(User * u)
  * -TheShadow (13 Mar 1999)
  */
 
-    char *nick = strtok(NULL, " ");
-    char *param = strtok(NULL, " ");
+	char *nick = strtok(NULL, " ");
+	char *param = strtok(NULL, " ");
 
-    NickAlias *na;
-    NickRequest *nr = NULL;
+	NickAlias *na;
+	NickRequest *nr = NULL;
 	/* Being an oper is enough from now on -GD */
-    int is_servadmin = is_services_oper(u);
-
-    if (!nick) {
-        syntax_error(s_NickServ, u, "INFO", NICK_INFO_SYNTAX);
-    } else if (!(na = findnick(nick))) {
-        if ((nr = findrequestnick(nick))) {
-            notice_lang(s_NickServ, u, NICK_IS_PREREG);
-            if (param && stricmp(param, "ALL") == 0 && is_servadmin) {
-                notice_lang(s_NickServ, u, NICK_INFO_EMAIL, nr->email);
-            } else {
-                if (is_servadmin) {
-                    notice_lang(s_NickServ, u, NICK_INFO_FOR_MORE,
-                                s_NickServ, nr->nick);
-                }
-            }
-        } else if (nickIsServices(nick, 1)) {
-            notice_lang(s_NickServ, u, NICK_X_IS_SERVICES, nick);
-        } else {
-            notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
-        }
-    } else if (na->status & NS_VERBOTEN) {
-        if (is_oper(u) && na->last_usermask)
-            notice_lang(s_NickServ, u, NICK_X_FORBIDDEN_OPER, nick,
-                        na->last_usermask,
-                        (na->last_realname ? na->
-                         last_realname : getstring(u->na, NO_REASON)));
-        else
-            notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, nick);
-    } else {
-        struct tm *tm;
-        char buf[BUFSIZE], *end;
-        const char *commastr = getstring(u->na, COMMA_SPACE);
-        int need_comma = 0;
-        int nick_online = 0;
-        int show_hidden = 0;
-        time_t expt;
-
-        /* Is the real owner of the nick we're looking up online? -TheShadow */
-        if (na->status & (NS_RECOGNIZED | NS_IDENTIFIED))
-            nick_online = 1;
-
-        /* Only show hidden fields to owner and sadmins and only when the ALL
-         * parameter is used. -TheShadow */
-        if (param && stricmp(param, "ALL") == 0 && u->na
-            && ((nick_identified(u) && (na->nc == u->na->nc))
-                || is_servadmin))
-            show_hidden = 1;
-
-        notice_lang(s_NickServ, u, NICK_INFO_REALNAME, na->nick,
-                    na->last_realname);
-
-        if ((nick_identified(u) && (na->nc == u->na->nc)) || is_servadmin) {
-
-            if (nick_is_services_root(na->nc))
-                notice_lang(s_NickServ, u, NICK_INFO_SERVICES_ROOT,
-                            na->nick);
-            else if (nick_is_services_admin(na->nc))
-                notice_lang(s_NickServ, u, NICK_INFO_SERVICES_ADMIN,
-                            na->nick);
-            else if (nick_is_services_oper(na->nc))
-                notice_lang(s_NickServ, u, NICK_INFO_SERVICES_OPER,
-                            na->nick);
-
-        } else {
-
-            if (nick_is_services_root(na->nc)
-                && !(na->nc->flags & NI_HIDE_STATUS))
-                notice_lang(s_NickServ, u, NICK_INFO_SERVICES_ROOT,
-                            na->nick);
-            else if (nick_is_services_admin(na->nc)
-                     && !(na->nc->flags & NI_HIDE_STATUS))
-                notice_lang(s_NickServ, u, NICK_INFO_SERVICES_ADMIN,
-                            na->nick);
-            else if (nick_is_services_oper(na->nc)
-                     && !(na->nc->flags & NI_HIDE_STATUS))
-                notice_lang(s_NickServ, u, NICK_INFO_SERVICES_OPER,
-                            na->nick);
-
-        }
-
-        if (nick_online) {
-            if (show_hidden || !(na->nc->flags & NI_HIDE_MASK))
-                notice_lang(s_NickServ, u, NICK_INFO_ADDRESS_ONLINE,
-                            na->last_usermask);
-            else
-                notice_lang(s_NickServ, u, NICK_INFO_ADDRESS_ONLINE_NOHOST,
-                            na->nick);
-        } else {
-            if (show_hidden || !(na->nc->flags & NI_HIDE_MASK))
-                notice_lang(s_NickServ, u, NICK_INFO_ADDRESS,
-                            na->last_usermask);
-        }
-
-        tm = localtime(&na->time_registered);
-        strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm);
-        notice_lang(s_NickServ, u, NICK_INFO_TIME_REGGED, buf);
-
-        if (!nick_online) {
-            tm = localtime(&na->last_seen);
-            strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT,
-                          tm);
-            notice_lang(s_NickServ, u, NICK_INFO_LAST_SEEN, buf);
-        }
-
-        if (na->last_quit
-            && (show_hidden || !(na->nc->flags & NI_HIDE_QUIT)))
-            notice_lang(s_NickServ, u, NICK_INFO_LAST_QUIT, na->last_quit);
-
-        if (na->nc->url)
-            notice_lang(s_NickServ, u, NICK_INFO_URL, na->nc->url);
-        if (na->nc->email
-            && (show_hidden || !(na->nc->flags & NI_HIDE_EMAIL)))
-            notice_lang(s_NickServ, u, NICK_INFO_EMAIL, na->nc->email);
-        if (na->nc->icq)
-            notice_lang(s_NickServ, u, NICK_INFO_ICQ, na->nc->icq);
-
-        if (show_hidden) {
-            if (s_HostServ && ircd->vhost) {
-                if (getvHost(na->nick) != NULL) {
-                    if (ircd->vident && getvIdent(na->nick) != NULL) {
-                        notice_lang(s_NickServ, u, NICK_INFO_VHOST2,
-                                    getvIdent(na->nick),
-                                    getvHost(na->nick));
-                    } else {
-                        notice_lang(s_NickServ, u, NICK_INFO_VHOST,
-                                    getvHost(na->nick));
-                    }
-                }
-            }
-            if (na->nc->greet)
-                notice_lang(s_NickServ, u, NICK_INFO_GREET, na->nc->greet);
-
-            *buf = 0;
-            end = buf;
-
-            if (na->nc->flags & NI_KILLPROTECT) {
-                end += snprintf(end, sizeof(buf) - (end - buf), "%s",
-                                getstring(u->na, NICK_INFO_OPT_KILL));
-                need_comma = 1;
-            }
-            if (na->nc->flags & NI_SECURE) {
-                end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
-                                need_comma ? commastr : "",
-                                getstring(u->na, NICK_INFO_OPT_SECURE));
-                need_comma = 1;
-            }
-            if (na->nc->flags & NI_PRIVATE) {
-                end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
-                                need_comma ? commastr : "",
-                                getstring(u->na, NICK_INFO_OPT_PRIVATE));
-                need_comma = 1;
-            }
-            if (na->nc->flags & NI_MSG) {
-                end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
-                                need_comma ? commastr : "",
-                                getstring(u->na, NICK_INFO_OPT_MSG));
-                need_comma = 1;
-            }
-            if (!(na->nc->flags & NI_AUTOOP)) {
-                end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
-                                need_comma ? commastr : "",
-                                getstring(u->na, NICK_INFO_OPT_AUTOOP));
-                need_comma = 1;
-            }
-
-            notice_lang(s_NickServ, u, NICK_INFO_OPTIONS,
-                        *buf ? buf : getstring(u->na, NICK_INFO_OPT_NONE));
-
-            if (na->nc->flags & NI_SUSPENDED) {
-                if (na->last_quit) {
-                    notice_lang(s_NickServ, u, NICK_INFO_SUSPENDED,
-                                na->last_quit);
-                } else {
-                    notice_lang(s_NickServ, u,
-                                NICK_INFO_SUSPENDED_NO_REASON);
-                }
-            }
-
-            if (na->status & NS_NO_EXPIRE) {
-                notice_lang(s_NickServ, u, NICK_INFO_NO_EXPIRE);
-            } else {
-                if (is_services_admin(u)) {
-                    expt = na->last_seen + NSExpire;
-                    tm = localtime(&expt);
-                    strftime_lang(buf, sizeof(buf), na->u,
-                                  STRFTIME_DATE_TIME_FORMAT, tm);
-                    notice_lang(s_NickServ, u, NICK_INFO_EXPIRE, buf);
-                }
-            }
-        }
-
-        if (!show_hidden
-            && ((u->na && (na->nc == u->na->nc) && nick_identified(u))
-                || is_servadmin))
-            notice_lang(s_NickServ, u, NICK_INFO_FOR_MORE, s_NickServ,
-                        na->nick);
-    }
-    return MOD_CONT;
+	int is_servadmin = is_services_oper(u);
+
+	if (!nick) {
+		syntax_error(s_NickServ, u, "INFO", NICK_INFO_SYNTAX);
+	} else if (!(na = findnick(nick))) {
+		if ((nr = findrequestnick(nick))) {
+			notice_lang(s_NickServ, u, NICK_IS_PREREG);
+			if (param && stricmp(param, "ALL") == 0 && is_servadmin) {
+				notice_lang(s_NickServ, u, NICK_INFO_EMAIL, nr->email);
+			} else {
+				if (is_servadmin) {
+					notice_lang(s_NickServ, u, NICK_INFO_FOR_MORE,
+								s_NickServ, nr->nick);
+				}
+			}
+		} else if (nickIsServices(nick, 1)) {
+			notice_lang(s_NickServ, u, NICK_X_IS_SERVICES, nick);
+		} else {
+			notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
+		}
+	} else if (na->status & NS_VERBOTEN) {
+		if (is_oper(u) && na->last_usermask)
+			notice_lang(s_NickServ, u, NICK_X_FORBIDDEN_OPER, nick,
+						na->last_usermask,
+						(na->last_realname ? na->
+						 last_realname : getstring(u->na, NO_REASON)));
+		else
+			notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, nick);
+	} else {
+		struct tm *tm;
+		char buf[BUFSIZE], *end;
+		const char *commastr = getstring(u->na, COMMA_SPACE);
+		int need_comma = 0;
+		int nick_online = 0;
+		int show_hidden = 0;
+		time_t expt;
+
+		/* Is the real owner of the nick we're looking up online? -TheShadow */
+		if (na->status & (NS_RECOGNIZED | NS_IDENTIFIED))
+			nick_online = 1;
+
+		/* Only show hidden fields to owner and sadmins and only when the ALL
+		 * parameter is used. -TheShadow */
+		if (param && stricmp(param, "ALL") == 0 && u->na
+			&& ((nick_identified(u) && (na->nc == u->na->nc))
+				|| is_servadmin))
+			show_hidden = 1;
+
+		notice_lang(s_NickServ, u, NICK_INFO_REALNAME, na->nick,
+					na->last_realname);
+
+		if ((nick_identified(u) && (na->nc == u->na->nc)) || is_servadmin) {
+
+			if (nick_is_services_root(na->nc))
+				notice_lang(s_NickServ, u, NICK_INFO_SERVICES_ROOT,
+							na->nick);
+			else if (nick_is_services_admin(na->nc))
+				notice_lang(s_NickServ, u, NICK_INFO_SERVICES_ADMIN,
+							na->nick);
+			else if (nick_is_services_oper(na->nc))
+				notice_lang(s_NickServ, u, NICK_INFO_SERVICES_OPER,
+							na->nick);
+
+		} else {
+
+			if (nick_is_services_root(na->nc)
+				&& !(na->nc->flags & NI_HIDE_STATUS))
+				notice_lang(s_NickServ, u, NICK_INFO_SERVICES_ROOT,
+							na->nick);
+			else if (nick_is_services_admin(na->nc)
+					 && !(na->nc->flags & NI_HIDE_STATUS))
+				notice_lang(s_NickServ, u, NICK_INFO_SERVICES_ADMIN,
+							na->nick);
+			else if (nick_is_services_oper(na->nc)
+					 && !(na->nc->flags & NI_HIDE_STATUS))
+				notice_lang(s_NickServ, u, NICK_INFO_SERVICES_OPER,
+							na->nick);
+
+		}
+
+		if (nick_online) {
+			if (show_hidden || !(na->nc->flags & NI_HIDE_MASK))
+				notice_lang(s_NickServ, u, NICK_INFO_ADDRESS_ONLINE,
+							na->last_usermask);
+			else
+				notice_lang(s_NickServ, u, NICK_INFO_ADDRESS_ONLINE_NOHOST,
+							na->nick);
+		} else {
+			if (show_hidden || !(na->nc->flags & NI_HIDE_MASK))
+				notice_lang(s_NickServ, u, NICK_INFO_ADDRESS,
+							na->last_usermask);
+		}
+
+		tm = localtime(&na->time_registered);
+		strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm);
+		notice_lang(s_NickServ, u, NICK_INFO_TIME_REGGED, buf);
+
+		if (!nick_online) {
+			tm = localtime(&na->last_seen);
+			strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT,
+						  tm);
+			notice_lang(s_NickServ, u, NICK_INFO_LAST_SEEN, buf);
+		}
+
+		if (na->last_quit
+			&& (show_hidden || !(na->nc->flags & NI_HIDE_QUIT)))
+			notice_lang(s_NickServ, u, NICK_INFO_LAST_QUIT, na->last_quit);
+
+		if (na->nc->url)
+			notice_lang(s_NickServ, u, NICK_INFO_URL, na->nc->url);
+		if (na->nc->email
+			&& (show_hidden || !(na->nc->flags & NI_HIDE_EMAIL)))
+			notice_lang(s_NickServ, u, NICK_INFO_EMAIL, na->nc->email);
+		if (na->nc->icq)
+			notice_lang(s_NickServ, u, NICK_INFO_ICQ, na->nc->icq);
+
+		if (show_hidden) {
+			if (s_HostServ && ircd->vhost) {
+				if (getvHost(na->nick) != NULL) {
+					if (ircd->vident && getvIdent(na->nick) != NULL) {
+						notice_lang(s_NickServ, u, NICK_INFO_VHOST2,
+									getvIdent(na->nick),
+									getvHost(na->nick));
+					} else {
+						notice_lang(s_NickServ, u, NICK_INFO_VHOST,
+									getvHost(na->nick));
+					}
+				}
+			}
+			if (na->nc->greet)
+				notice_lang(s_NickServ, u, NICK_INFO_GREET, na->nc->greet);
+
+			*buf = 0;
+			end = buf;
+
+			if (na->nc->flags & NI_KILLPROTECT) {
+				end += snprintf(end, sizeof(buf) - (end - buf), "%s",
+								getstring(u->na, NICK_INFO_OPT_KILL));
+				need_comma = 1;
+			}
+			if (na->nc->flags & NI_SECURE) {
+				end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
+								need_comma ? commastr : "",
+								getstring(u->na, NICK_INFO_OPT_SECURE));
+				need_comma = 1;
+			}
+			if (na->nc->flags & NI_PRIVATE) {
+				end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
+								need_comma ? commastr : "",
+								getstring(u->na, NICK_INFO_OPT_PRIVATE));
+				need_comma = 1;
+			}
+			if (na->nc->flags & NI_MSG) {
+				end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
+								need_comma ? commastr : "",
+								getstring(u->na, NICK_INFO_OPT_MSG));
+				need_comma = 1;
+			}
+			if (!(na->nc->flags & NI_AUTOOP)) {
+				end += snprintf(end, sizeof(buf) - (end - buf), "%s%s",
+								need_comma ? commastr : "",
+								getstring(u->na, NICK_INFO_OPT_AUTOOP));
+				need_comma = 1;
+			}
+
+			notice_lang(s_NickServ, u, NICK_INFO_OPTIONS,
+						*buf ? buf : getstring(u->na, NICK_INFO_OPT_NONE));
+
+			if (na->nc->flags & NI_SUSPENDED) {
+				if (na->last_quit) {
+					notice_lang(s_NickServ, u, NICK_INFO_SUSPENDED,
+								na->last_quit);
+				} else {
+					notice_lang(s_NickServ, u,
+								NICK_INFO_SUSPENDED_NO_REASON);
+				}
+			}
+
+			if (na->status & NS_NO_EXPIRE) {
+				notice_lang(s_NickServ, u, NICK_INFO_NO_EXPIRE);
+			} else {
+				if (is_services_admin(u)) {
+					expt = na->last_seen + NSExpire;
+					tm = localtime(&expt);
+					strftime_lang(buf, sizeof(buf), na->u,
+								  STRFTIME_DATE_TIME_FORMAT, tm);
+					notice_lang(s_NickServ, u, NICK_INFO_EXPIRE, buf);
+				}
+			}
+		}
+
+		if (!show_hidden
+			&& ((u->na && (na->nc == u->na->nc) && nick_identified(u))
+				|| is_servadmin))
+			notice_lang(s_NickServ, u, NICK_INFO_FOR_MORE, s_NickServ,
+						na->nick);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("ns_info", NSInfo)
diff --git a/src/core/ns_list.c b/src/core/ns_list.c
index ed4ba9ab4..795eba051 100644
--- a/src/core/ns_list.c
+++ b/src/core/ns_list.c
@@ -45,9 +45,9 @@ class NSList : public Module
  **/
 void myNickServHelp(User * u)
 {
-    if (!NSListOpersOnly || (is_oper(u))) {
-        notice_lang(s_NickServ, u, NICK_HELP_CMD_LIST);
-    }
+	if (!NSListOpersOnly || (is_oper(u))) {
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_LIST);
+	}
 }
 
 /**
@@ -73,164 +73,164 @@ int do_list(User * u)
  */
 
 
-    char *pattern = strtok(NULL, " ");
-    char *keyword;
-    NickAlias *na;
-    NickCore *mync;
-    int nnicks, i;
-    char buf[BUFSIZE];
-    int is_servadmin = is_services_admin(u);
-    int16 matchflags = 0;
-    NickRequest *nr = NULL;
-    int nronly = 0;
-    int susp_keyword = 0;
-    char noexpire_char = ' ';
-    int count = 0, from = 0, to = 0, tofree = 0;
-    char *tmp = NULL;
-    char *s = NULL;
-
-    if (!(!NSListOpersOnly || (is_oper(u)))) {  /* reverse the help logic */
-        notice_lang(s_NickServ, u, ACCESS_DENIED);
-        return MOD_STOP;
-    }
-
-    if (!pattern) {
-        syntax_error(s_NickServ, u, "LIST",
-                     is_servadmin ? NICK_LIST_SERVADMIN_SYNTAX :
-                     NICK_LIST_SYNTAX);
-    } else {
-
-        if (pattern) {
-            if (pattern[0] == '#') {
-                tmp = myStrGetOnlyToken((pattern + 1), '-', 0); /* Read FROM out */
-                if (!tmp) {
-                	notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE);
-                    return MOD_CONT;
-                }
-                for (s = tmp; *s; s++) {
-                    if (!isdigit(*s)) {
-                        free(tmp);
-	                	notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE);
-                        return MOD_CONT;
-                    }
-                }
-                from = atoi(tmp);
-                free(tmp);
-                tmp = myStrGetTokenRemainder(pattern, '-', 1);  /* Read TO out */
-                if (!tmp) {
-                	notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE);
-                    return MOD_CONT;
-                }
-                for (s = tmp; *s; s++) {
-                    if (!isdigit(*s)) {
-                        free(tmp);
-	                	notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE);
-                        return MOD_CONT;
-                    }
-                }
-                to = atoi(tmp);
-                free(tmp);
-                pattern = sstrdup("*");
-                tofree = 1;
-            }
-        }
-
-        nnicks = 0;
-
-        while (is_servadmin && (keyword = strtok(NULL, " "))) {
-            if (stricmp(keyword, "FORBIDDEN") == 0)
-                matchflags |= NS_VERBOTEN;
-            if (stricmp(keyword, "NOEXPIRE") == 0)
-                matchflags |= NS_NO_EXPIRE;
-            if (stricmp(keyword, "SUSPENDED") == 0)
-                susp_keyword = 1;
-            if (stricmp(keyword, "UNCONFIRMED") == 0)
-                nronly = 1;
-        }
-
-        mync = (nick_identified(u) ? u->na->nc : NULL);
-
-        notice_lang(s_NickServ, u, NICK_LIST_HEADER, pattern);
-        if (nronly != 1) {
-            for (i = 0; i < 1024; i++) {
-                for (na = nalists[i]; na; na = na->next) {
-                    /* Don't show private and forbidden nicks to non-services admins. */
-                    if ((na->status & NS_VERBOTEN) && !is_servadmin)
-                        continue;
-                    if ((na->nc->flags & NI_PRIVATE) && !is_servadmin
-                        && na->nc != mync)
-                        continue;
-                    if ((matchflags != 0) && !(na->status & matchflags) && (susp_keyword == 0))
-                        continue;
-		    else if ((susp_keyword == 1) && !(na->nc->flags & NI_SUSPENDED))
-                        continue;
-
-                    /* We no longer compare the pattern against the output buffer.
-                     * Instead we build a nice nick!user@host buffer to compare.
-                     * The output is then generated separately. -TheShadow */
-                    snprintf(buf, sizeof(buf), "%s!%s", na->nick,
-                             (na->last_usermask
-                              && !(na->status & NS_VERBOTEN)) ? na->
-                             last_usermask : "*@*");
-                    if (stricmp(pattern, na->nick) == 0
-                        || match_wild_nocase(pattern, buf)) {
-
-                        if ((((count + 1 >= from) && (count + 1 <= to))
-                             || ((from == 0) && (to == 0)))
-                            && (++nnicks <= NSListMax)) {
-                            if (is_servadmin
-                                && (na->status & NS_NO_EXPIRE))
-                                noexpire_char = '!';
-                            else {
-                                noexpire_char = ' ';
-                            }
-                            if ((na->nc->flags & NI_HIDE_MASK)
-                                && !is_servadmin && na->nc != mync) {
-                                snprintf(buf, sizeof(buf),
-                                         "%-20s  [Hostname Hidden]",
-                                         na->nick);
-                            } else if (na->status & NS_VERBOTEN) {
-                                snprintf(buf, sizeof(buf),
-                                         "%-20s  [Forbidden]", na->nick);
-                            } else if (na->nc->flags & NI_SUSPENDED) {
-                                snprintf(buf, sizeof(buf),
-                                         "%-20s  [Suspended]", na->nick);
-                            } else {
-                                snprintf(buf, sizeof(buf), "%-20s  %s",
-                                         na->nick, na->last_usermask);
-                            }
-                            notice_user(s_NickServ, u, "   %c%s",
-                                        noexpire_char, buf);
-                        }
-                        count++;
-                    }
-                }
-            }
-        }
-
-        if (nronly == 1 || (is_servadmin && matchflags == 0)) {
-            noexpire_char = ' ';
-            for (i = 0; i < 1024; i++) {
-                for (nr = nrlists[i]; nr; nr = nr->next) {
-                    snprintf(buf, sizeof(buf), "%s!*@*", nr->nick);
-                    if (stricmp(pattern, nr->nick) == 0
-                        || match_wild_nocase(pattern, buf)) {
-                        if (++nnicks <= NSListMax) {
-                            snprintf(buf, sizeof(buf),
-                                     "%-20s  [UNCONFIRMED]", nr->nick);
-                            notice_user(s_NickServ, u, "   %c%s",
-                                        noexpire_char, buf);
-                        }
-                    }
-                }
-            }
-        }
-        notice_lang(s_NickServ, u, NICK_LIST_RESULTS,
-                    nnicks > NSListMax ? NSListMax : nnicks, nnicks);
-    }
-    if (tofree)
-        free(pattern);
-    return MOD_CONT;
+	char *pattern = strtok(NULL, " ");
+	char *keyword;
+	NickAlias *na;
+	NickCore *mync;
+	int nnicks, i;
+	char buf[BUFSIZE];
+	int is_servadmin = is_services_admin(u);
+	int16 matchflags = 0;
+	NickRequest *nr = NULL;
+	int nronly = 0;
+	int susp_keyword = 0;
+	char noexpire_char = ' ';
+	int count = 0, from = 0, to = 0, tofree = 0;
+	char *tmp = NULL;
+	char *s = NULL;
+
+	if (!(!NSListOpersOnly || (is_oper(u)))) {  /* reverse the help logic */
+		notice_lang(s_NickServ, u, ACCESS_DENIED);
+		return MOD_STOP;
+	}
+
+	if (!pattern) {
+		syntax_error(s_NickServ, u, "LIST",
+					 is_servadmin ? NICK_LIST_SERVADMIN_SYNTAX :
+					 NICK_LIST_SYNTAX);
+	} else {
+
+		if (pattern) {
+			if (pattern[0] == '#') {
+				tmp = myStrGetOnlyToken((pattern + 1), '-', 0); /* Read FROM out */
+				if (!tmp) {
+					notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE);
+					return MOD_CONT;
+				}
+				for (s = tmp; *s; s++) {
+					if (!isdigit(*s)) {
+						free(tmp);
+						notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE);
+						return MOD_CONT;
+					}
+				}
+				from = atoi(tmp);
+				free(tmp);
+				tmp = myStrGetTokenRemainder(pattern, '-', 1);  /* Read TO out */
+				if (!tmp) {
+					notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE);
+					return MOD_CONT;
+				}
+				for (s = tmp; *s; s++) {
+					if (!isdigit(*s)) {
+						free(tmp);
+						notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE);
+						return MOD_CONT;
+					}
+				}
+				to = atoi(tmp);
+				free(tmp);
+				pattern = sstrdup("*");
+				tofree = 1;
+			}
+		}
+
+		nnicks = 0;
+
+		while (is_servadmin && (keyword = strtok(NULL, " "))) {
+			if (stricmp(keyword, "FORBIDDEN") == 0)
+				matchflags |= NS_VERBOTEN;
+			if (stricmp(keyword, "NOEXPIRE") == 0)
+				matchflags |= NS_NO_EXPIRE;
+			if (stricmp(keyword, "SUSPENDED") == 0)
+				susp_keyword = 1;
+			if (stricmp(keyword, "UNCONFIRMED") == 0)
+				nronly = 1;
+		}
+
+		mync = (nick_identified(u) ? u->na->nc : NULL);
+
+		notice_lang(s_NickServ, u, NICK_LIST_HEADER, pattern);
+		if (nronly != 1) {
+			for (i = 0; i < 1024; i++) {
+				for (na = nalists[i]; na; na = na->next) {
+					/* Don't show private and forbidden nicks to non-services admins. */
+					if ((na->status & NS_VERBOTEN) && !is_servadmin)
+						continue;
+					if ((na->nc->flags & NI_PRIVATE) && !is_servadmin
+						&& na->nc != mync)
+						continue;
+					if ((matchflags != 0) && !(na->status & matchflags) && (susp_keyword == 0))
+						continue;
+			else if ((susp_keyword == 1) && !(na->nc->flags & NI_SUSPENDED))
+						continue;
+
+					/* We no longer compare the pattern against the output buffer.
+					 * Instead we build a nice nick!user@host buffer to compare.
+					 * The output is then generated separately. -TheShadow */
+					snprintf(buf, sizeof(buf), "%s!%s", na->nick,
+							 (na->last_usermask
+							  && !(na->status & NS_VERBOTEN)) ? na->
+							 last_usermask : "*@*");
+					if (stricmp(pattern, na->nick) == 0
+						|| match_wild_nocase(pattern, buf)) {
+
+						if ((((count + 1 >= from) && (count + 1 <= to))
+							 || ((from == 0) && (to == 0)))
+							&& (++nnicks <= NSListMax)) {
+							if (is_servadmin
+								&& (na->status & NS_NO_EXPIRE))
+								noexpire_char = '!';
+							else {
+								noexpire_char = ' ';
+							}
+							if ((na->nc->flags & NI_HIDE_MASK)
+								&& !is_servadmin && na->nc != mync) {
+								snprintf(buf, sizeof(buf),
+										 "%-20s  [Hostname Hidden]",
+										 na->nick);
+							} else if (na->status & NS_VERBOTEN) {
+								snprintf(buf, sizeof(buf),
+										 "%-20s  [Forbidden]", na->nick);
+							} else if (na->nc->flags & NI_SUSPENDED) {
+								snprintf(buf, sizeof(buf),
+										 "%-20s  [Suspended]", na->nick);
+							} else {
+								snprintf(buf, sizeof(buf), "%-20s  %s",
+										 na->nick, na->last_usermask);
+							}
+							notice_user(s_NickServ, u, "   %c%s",
+										noexpire_char, buf);
+						}
+						count++;
+					}
+				}
+			}
+		}
+
+		if (nronly == 1 || (is_servadmin && matchflags == 0)) {
+			noexpire_char = ' ';
+			for (i = 0; i < 1024; i++) {
+				for (nr = nrlists[i]; nr; nr = nr->next) {
+					snprintf(buf, sizeof(buf), "%s!*@*", nr->nick);
+					if (stricmp(pattern, nr->nick) == 0
+						|| match_wild_nocase(pattern, buf)) {
+						if (++nnicks <= NSListMax) {
+							snprintf(buf, sizeof(buf),
+									 "%-20s  [UNCONFIRMED]", nr->nick);
+							notice_user(s_NickServ, u, "   %c%s",
+										noexpire_char, buf);
+						}
+					}
+				}
+			}
+		}
+		notice_lang(s_NickServ, u, NICK_LIST_RESULTS,
+					nnicks > NSListMax ? NSListMax : nnicks, nnicks);
+	}
+	if (tofree)
+		free(pattern);
+	return MOD_CONT;
 }
 
 MODULE_INIT("ns_list", NSList)
diff --git a/src/core/ns_logout.c b/src/core/ns_logout.c
index f523dc072..fa7c69d96 100644
--- a/src/core/ns_logout.c
+++ b/src/core/ns_logout.c
@@ -15,8 +15,8 @@
 
 #include "module.h"
 
-#define TO_COLLIDE   0          /* Collide the user with this nick */
-#define TO_RELEASE   1          /* Release a collided nick */
+#define TO_COLLIDE   0		  /* Collide the user with this nick */
+#define TO_RELEASE   1		  /* Release a collided nick */
 
 int do_logout(User * u);
 void myNickServHelp(User * u);
@@ -47,7 +47,7 @@ class NSLogout : public Module
  **/
 void myNickServHelp(User * u)
 {
-    notice_lang(s_NickServ, u, NICK_HELP_CMD_LOGOUT);
+	notice_lang(s_NickServ, u, NICK_HELP_CMD_LOGOUT);
 }
 
 /**
@@ -57,60 +57,60 @@ void myNickServHelp(User * u)
  **/
 int do_logout(User * u)
 {
-    char *nick = strtok(NULL, " ");
-    char *param = strtok(NULL, " ");
-    User *u2;
-
-    if (!is_services_admin(u) && nick) {
-        syntax_error(s_NickServ, u, "LOGOUT", NICK_LOGOUT_SYNTAX);
-    } else if (!(u2 = (nick ? finduser(nick) : u))) {
-        notice_lang(s_NickServ, u, NICK_X_NOT_IN_USE, nick);
-    } else if (!u2->na) {
-        if (nick)
-            notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
-        else
-            notice_lang(s_NickServ, u, NICK_NOT_REGISTERED);
-    } else if (u2->na->status & NS_VERBOTEN) {
-        notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, u2->na->nick);
-    } else if (!nick && !nick_identified(u)) {
-        notice_lang(s_NickServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
-    } else if (nick && is_services_admin(u2)) {
-        notice_lang(s_NickServ, u, NICK_LOGOUT_SERVICESADMIN, nick);
-    } else {
-        if (nick && param && !stricmp(param, "REVALIDATE")) {
-            cancel_user(u2);
-            validate_user(u2);
-        } else {
-            u2->na->status &= ~(NS_IDENTIFIED | NS_RECOGNIZED);
-        }
-
-        if (ircd->modeonreg) {
-            common_svsmode(u2, ircd->modeonunreg, "1");
-        }
-
-        u->isSuperAdmin = 0;    /* Dont let people logout and remain a SuperAdmin */
-        alog("%s: %s!%s@%s logged out nickname %s", s_NickServ, u->nick,
-             u->username, u->host, u2->nick);
-
-        if (nick)
-            notice_lang(s_NickServ, u, NICK_LOGOUT_X_SUCCEEDED, nick);
-        else
-            notice_lang(s_NickServ, u, NICK_LOGOUT_SUCCEEDED);
-
-        /* Stop nick tracking if enabled */
-        if (NSNickTracking)
+	char *nick = strtok(NULL, " ");
+	char *param = strtok(NULL, " ");
+	User *u2;
+
+	if (!is_services_admin(u) && nick) {
+		syntax_error(s_NickServ, u, "LOGOUT", NICK_LOGOUT_SYNTAX);
+	} else if (!(u2 = (nick ? finduser(nick) : u))) {
+		notice_lang(s_NickServ, u, NICK_X_NOT_IN_USE, nick);
+	} else if (!u2->na) {
+		if (nick)
+			notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
+		else
+			notice_lang(s_NickServ, u, NICK_NOT_REGISTERED);
+	} else if (u2->na->status & NS_VERBOTEN) {
+		notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, u2->na->nick);
+	} else if (!nick && !nick_identified(u)) {
+		notice_lang(s_NickServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
+	} else if (nick && is_services_admin(u2)) {
+		notice_lang(s_NickServ, u, NICK_LOGOUT_SERVICESADMIN, nick);
+	} else {
+		if (nick && param && !stricmp(param, "REVALIDATE")) {
+			cancel_user(u2);
+			validate_user(u2);
+		} else {
+			u2->na->status &= ~(NS_IDENTIFIED | NS_RECOGNIZED);
+		}
+
+		if (ircd->modeonreg) {
+			common_svsmode(u2, ircd->modeonunreg, "1");
+		}
+
+		u->isSuperAdmin = 0;	/* Dont let people logout and remain a SuperAdmin */
+		alog("%s: %s!%s@%s logged out nickname %s", s_NickServ, u->nick,
+			 u->username, u->host, u2->nick);
+
+		if (nick)
+			notice_lang(s_NickServ, u, NICK_LOGOUT_X_SUCCEEDED, nick);
+		else
+			notice_lang(s_NickServ, u, NICK_LOGOUT_SUCCEEDED);
+
+		/* Stop nick tracking if enabled */
+		if (NSNickTracking)
 			/* Shouldn't this be u2? -GD */
-            nsStopNickTracking(u);
+			nsStopNickTracking(u);
 
-        /* Clear any timers again */
-        if (u->na->nc->flags & NI_KILLPROTECT) {
-            del_ns_timeout(u->na, TO_COLLIDE);
-        }
+		/* Clear any timers again */
+		if (u->na->nc->flags & NI_KILLPROTECT) {
+			del_ns_timeout(u->na, TO_COLLIDE);
+		}
 		
 		/* Send out an event */
 		send_event(EVENT_NICK_LOGOUT, 1, u2->nick);
-    }
-    return MOD_CONT;
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("ns_logout", NSLogout)
diff --git a/src/core/ns_recover.c b/src/core/ns_recover.c
index 0180ca222..c055cbf93 100644
--- a/src/core/ns_recover.c
+++ b/src/core/ns_recover.c
@@ -45,7 +45,7 @@ class NSRecover : public Module
  **/
 void myNickServHelp(User * u)
 {
-    notice_lang(s_NickServ, u, NICK_HELP_CMD_RECOVER);
+	notice_lang(s_NickServ, u, NICK_HELP_CMD_RECOVER);
 }
 
 /**
@@ -54,15 +54,15 @@ void myNickServHelp(User * u)
  **/
 int myHelpResonse(User * u)
 {
-    char relstr[192];
+	char relstr[192];
 
-    /* Convert NSReleaseTimeout seconds to string format */
-    duration(u->na, relstr, sizeof(relstr), NSReleaseTimeout);
-    
-    notice_help(s_NickServ, u, NICK_HELP_RECOVER, relstr);
-    do_help_limited(s_NickServ, u, c);
+	/* Convert NSReleaseTimeout seconds to string format */
+	duration(u->na, relstr, sizeof(relstr), NSReleaseTimeout);
+	
+	notice_help(s_NickServ, u, NICK_HELP_RECOVER, relstr);
+	do_help_limited(s_NickServ, u, c);
 
-    return MOD_CONT;
+	return MOD_CONT;
 }
 
 /**
@@ -72,55 +72,55 @@ int myHelpResonse(User * u)
  **/
 int do_recover(User * u)
 {
-    char *nick = strtok(NULL, " ");
-    char *pass = strtok(NULL, " ");
-    NickAlias *na;
-    User *u2;
-
-    if (!nick) {
-        syntax_error(s_NickServ, u, "RECOVER", NICK_RECOVER_SYNTAX);
-    } else if (!(u2 = finduser(nick))) {
-        notice_lang(s_NickServ, u, NICK_X_NOT_IN_USE, nick);
-    } else if (!(na = u2->na)) {
-        notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
-    } else if (na->status & NS_VERBOTEN) {
-        notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
-    } else if (na->nc->flags & NI_SUSPENDED) {
-        notice_lang(s_NickServ, u, NICK_X_SUSPENDED, na->nick);
-    } else if (stricmp(nick, u->nick) == 0) {
-        notice_lang(s_NickServ, u, NICK_NO_RECOVER_SELF);
-    } else if (pass) {
-        int res = enc_check_password(pass, na->nc->pass);
-
-        if (res == 1) {
-            char relstr[192];
-
-            notice_lang(s_NickServ, u2, FORCENICKCHANGE_NOW);
-            collide(na, 0);
-
-            /* Convert NSReleaseTimeout seconds to string format */
-            duration(u2->na, relstr, sizeof(relstr), NSReleaseTimeout);
-
-            notice_lang(s_NickServ, u, NICK_RECOVERED, s_NickServ, nick, relstr);
-        } else {
-            notice_lang(s_NickServ, u, ACCESS_DENIED);
-            if (res == 0) {
-                alog("%s: RECOVER: invalid password for %s by %s!%s@%s",
-                     s_NickServ, nick, u->nick, u->username, u->host);
-                bad_password(u);
-            }
-        }
-    } else {
-        if (group_identified(u, na->nc)
-            || (!(na->nc->flags & NI_SECURE) && is_on_access(u, na->nc))) {
-            notice_lang(s_NickServ, u2, FORCENICKCHANGE_NOW);
-            collide(na, 0);
-            notice_lang(s_NickServ, u, NICK_RECOVERED, s_NickServ, nick);
-        } else {
-            notice_lang(s_NickServ, u, ACCESS_DENIED);
-        }
-    }
-    return MOD_CONT;
+	char *nick = strtok(NULL, " ");
+	char *pass = strtok(NULL, " ");
+	NickAlias *na;
+	User *u2;
+
+	if (!nick) {
+		syntax_error(s_NickServ, u, "RECOVER", NICK_RECOVER_SYNTAX);
+	} else if (!(u2 = finduser(nick))) {
+		notice_lang(s_NickServ, u, NICK_X_NOT_IN_USE, nick);
+	} else if (!(na = u2->na)) {
+		notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
+	} else if (na->status & NS_VERBOTEN) {
+		notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
+	} else if (na->nc->flags & NI_SUSPENDED) {
+		notice_lang(s_NickServ, u, NICK_X_SUSPENDED, na->nick);
+	} else if (stricmp(nick, u->nick) == 0) {
+		notice_lang(s_NickServ, u, NICK_NO_RECOVER_SELF);
+	} else if (pass) {
+		int res = enc_check_password(pass, na->nc->pass);
+
+		if (res == 1) {
+			char relstr[192];
+
+			notice_lang(s_NickServ, u2, FORCENICKCHANGE_NOW);
+			collide(na, 0);
+
+			/* Convert NSReleaseTimeout seconds to string format */
+			duration(u2->na, relstr, sizeof(relstr), NSReleaseTimeout);
+
+			notice_lang(s_NickServ, u, NICK_RECOVERED, s_NickServ, nick, relstr);
+		} else {
+			notice_lang(s_NickServ, u, ACCESS_DENIED);
+			if (res == 0) {
+				alog("%s: RECOVER: invalid password for %s by %s!%s@%s",
+					 s_NickServ, nick, u->nick, u->username, u->host);
+				bad_password(u);
+			}
+		}
+	} else {
+		if (group_identified(u, na->nc)
+			|| (!(na->nc->flags & NI_SECURE) && is_on_access(u, na->nc))) {
+			notice_lang(s_NickServ, u2, FORCENICKCHANGE_NOW);
+			collide(na, 0);
+			notice_lang(s_NickServ, u, NICK_RECOVERED, s_NickServ, nick);
+		} else {
+			notice_lang(s_NickServ, u, ACCESS_DENIED);
+		}
+	}
+	return MOD_CONT;
 }
 
 /* EOF */
diff --git a/src/core/ns_register.c b/src/core/ns_register.c
index f3f08f6fe..a90c0ca0c 100644
--- a/src/core/ns_register.c
+++ b/src/core/ns_register.c
@@ -58,11 +58,11 @@ class NSRegister : public Module
  **/
 void myNickServHelp(User * u)
 {
-    notice_lang(s_NickServ, u, NICK_HELP_CMD_REGISTER);
-    if (NSEmailReg) {
-        notice_lang(s_NickServ, u, NICK_HELP_CMD_CONFIRM);
-        notice_lang(s_NickServ, u, NICK_HELP_CMD_RESEND);
-    }
+	notice_lang(s_NickServ, u, NICK_HELP_CMD_REGISTER);
+	if (NSEmailReg) {
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_CONFIRM);
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_RESEND);
+	}
 }
 
 /**
@@ -72,408 +72,408 @@ void myNickServHelp(User * u)
  **/
 int do_register(User * u)
 {
-    NickRequest *nr = NULL, *anr = NULL;
-    NickCore *nc = NULL;
-    int prefixlen = strlen(NSGuestNickPrefix);
-    int nicklen = strlen(u->nick);
-    char *pass = strtok(NULL, " ");
-    char *email = strtok(NULL, " ");
-    char passcode[11];
-    int idx, min = 1, max = 62, i = 0;
-    int chars[] =
-        { ' ', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
-        'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y',
-        'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L',
-        'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y',
-        'Z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'
-    };
-
-    if (readonly) {
-        notice_lang(s_NickServ, u, NICK_REGISTRATION_DISABLED);
-        return MOD_CONT;
-    }
-
-    if (checkDefCon(DEFCON_NO_NEW_NICKS)) {
-        notice_lang(s_NickServ, u, OPER_DEFCON_DENIED);
-        return MOD_CONT;
-    }
-
-    if (!is_oper(u) && NickRegDelay
-        && ((time(NULL) - u->my_signon) < NickRegDelay)) {
-        notice_lang(s_NickServ, u, NICK_REG_DELAY, NickRegDelay);
-        return MOD_CONT;
-    }
-
-    if ((anr = findrequestnick(u->nick))) {
-        notice_lang(s_NickServ, u, NICK_REQUESTED);
-        return MOD_CONT;
-    }
-    /* Prevent "Guest" nicks from being registered. -TheShadow */
-
-    /* Guest nick can now have a series of between 1 and 7 digits.
-     *      --lara
-     */
-    if (nicklen <= prefixlen + 7 && nicklen >= prefixlen + 1 &&
-        stristr(u->nick, NSGuestNickPrefix) == u->nick &&
-        strspn(u->nick + prefixlen, "1234567890") == nicklen - prefixlen) {
-        notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED, u->nick);
-        return MOD_CONT;
-    }
-
-    if (!ircdproto->IsNickValid(u->nick)) {
-        notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, u->nick);
-        return MOD_CONT;
-    }
-
-    if (RestrictOperNicks) {
-        for (i = 0; i < RootNumber; i++) {
-            if (stristr(u->nick, ServicesRoots[i]) && !is_oper(u)) {
-                notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED,
-                            u->nick);
-                return MOD_CONT;
-            }
-        }
-        for (i = 0; i < servadmins.count && (nc = (NickCore *)servadmins.list[i]); i++) {
-            if (stristr(u->nick, nc->display) && !is_oper(u)) {
-                notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED,
-                            u->nick);
-                return MOD_CONT;
-            }
-        }
-        for (i = 0; i < servopers.count && (nc = (NickCore *)servopers.list[i]); i++) {
-            if (stristr(u->nick, nc->display) && !is_oper(u)) {
-                notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED,
-                            u->nick);
-                return MOD_CONT;
-            }
-        }
-    }
-
-    if (!pass) {
-        if (NSForceEmail) {
-            syntax_error(s_NickServ, u, "REGISTER",
-                         NICK_REGISTER_SYNTAX_EMAIL);
-        } else {
-            syntax_error(s_NickServ, u, "REGISTER", NICK_REGISTER_SYNTAX);
-        }
-    } else if (NSForceEmail && !email) {
-        syntax_error(s_NickServ, u, "REGISTER",
-                     NICK_REGISTER_SYNTAX_EMAIL);
-    } else if (time(NULL) < u->lastnickreg + NSRegDelay) {
-        notice_lang(s_NickServ, u, NICK_REG_PLEASE_WAIT, NSRegDelay);
-    } else if (u->na) {         /* i.e. there's already such a nick regged */
-        if (u->na->status & NS_VERBOTEN) {
-            alog("%s: %s@%s tried to register FORBIDden nick %s",
-                 s_NickServ, u->username, u->host, u->nick);
-            notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED, u->nick);
-        } else {
-            notice_lang(s_NickServ, u, NICK_ALREADY_REGISTERED, u->nick);
-        }
-    } else if (stricmp(u->nick, pass) == 0
-               || (StrictPasswords && strlen(pass) < 5)) {
-        notice_lang(s_NickServ, u, MORE_OBSCURE_PASSWORD);
-    } else if (enc_encrypt_check_len(strlen(pass), PASSMAX - 1)) {
-        notice_lang(s_NickServ, u, PASSWORD_TOO_LONG);
-    } else if (email && !MailValidate(email)) {
-        notice_lang(s_NickServ, u, MAIL_X_INVALID, email);
-    } else {
-        for (idx = 0; idx < 9; idx++) {
-            passcode[idx] =
-                chars[(1 +
-                       (int) (((float) (max - min)) * getrandom16() /
-                              (65535 + 1.0)) + min)];
-        } passcode[idx] = '\0';
-        nr = makerequest(u->nick);
-        nr->passcode = sstrdup(passcode);
-        strscpy(nr->password, pass, PASSMAX);
-        memset(pass, 0, strlen(pass));
-        /* We are paranoid about keeping a plain text pass in memory, yet we would write
-         * it to a database.. - Viper */
-        enc_encrypt_in_place(nr->password, PASSMAX);
-        if (email) {
-            nr->email = sstrdup(email);
-        }
-        nr->requested = time(NULL);
-        if (NSEmailReg) {
-            if (do_sendregmail(u, nr) == 0) {
-                notice_lang(s_NickServ, u, NICK_ENTER_REG_CODE, email,
-                            s_NickServ);
-                alog("%s: sent registration verification code to %s",
-                     s_NickServ, nr->email);
-            } else {
-                alog("%s: Unable to send registration verification mail",
-                     s_NickServ);
-                notice_lang(s_NickServ, u, NICK_REG_UNABLE);
-                delnickrequest(nr);     /* Delete the NickRequest if we couldnt send the mail */
-                return MOD_CONT;
-            }
-        } else {
-            do_confirm(u);
-        }
-
-    }
-    return MOD_CONT;
+	NickRequest *nr = NULL, *anr = NULL;
+	NickCore *nc = NULL;
+	int prefixlen = strlen(NSGuestNickPrefix);
+	int nicklen = strlen(u->nick);
+	char *pass = strtok(NULL, " ");
+	char *email = strtok(NULL, " ");
+	char passcode[11];
+	int idx, min = 1, max = 62, i = 0;
+	int chars[] =
+		{ ' ', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
+		'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y',
+		'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L',
+		'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y',
+		'Z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'
+	};
+
+	if (readonly) {
+		notice_lang(s_NickServ, u, NICK_REGISTRATION_DISABLED);
+		return MOD_CONT;
+	}
+
+	if (checkDefCon(DEFCON_NO_NEW_NICKS)) {
+		notice_lang(s_NickServ, u, OPER_DEFCON_DENIED);
+		return MOD_CONT;
+	}
+
+	if (!is_oper(u) && NickRegDelay
+		&& ((time(NULL) - u->my_signon) < NickRegDelay)) {
+		notice_lang(s_NickServ, u, NICK_REG_DELAY, NickRegDelay);
+		return MOD_CONT;
+	}
+
+	if ((anr = findrequestnick(u->nick))) {
+		notice_lang(s_NickServ, u, NICK_REQUESTED);
+		return MOD_CONT;
+	}
+	/* Prevent "Guest" nicks from being registered. -TheShadow */
+
+	/* Guest nick can now have a series of between 1 and 7 digits.
+	 *	  --lara
+	 */
+	if (nicklen <= prefixlen + 7 && nicklen >= prefixlen + 1 &&
+		stristr(u->nick, NSGuestNickPrefix) == u->nick &&
+		strspn(u->nick + prefixlen, "1234567890") == nicklen - prefixlen) {
+		notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED, u->nick);
+		return MOD_CONT;
+	}
+
+	if (!ircdproto->IsNickValid(u->nick)) {
+		notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, u->nick);
+		return MOD_CONT;
+	}
+
+	if (RestrictOperNicks) {
+		for (i = 0; i < RootNumber; i++) {
+			if (stristr(u->nick, ServicesRoots[i]) && !is_oper(u)) {
+				notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED,
+							u->nick);
+				return MOD_CONT;
+			}
+		}
+		for (i = 0; i < servadmins.count && (nc = (NickCore *)servadmins.list[i]); i++) {
+			if (stristr(u->nick, nc->display) && !is_oper(u)) {
+				notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED,
+							u->nick);
+				return MOD_CONT;
+			}
+		}
+		for (i = 0; i < servopers.count && (nc = (NickCore *)servopers.list[i]); i++) {
+			if (stristr(u->nick, nc->display) && !is_oper(u)) {
+				notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED,
+							u->nick);
+				return MOD_CONT;
+			}
+		}
+	}
+
+	if (!pass) {
+		if (NSForceEmail) {
+			syntax_error(s_NickServ, u, "REGISTER",
+						 NICK_REGISTER_SYNTAX_EMAIL);
+		} else {
+			syntax_error(s_NickServ, u, "REGISTER", NICK_REGISTER_SYNTAX);
+		}
+	} else if (NSForceEmail && !email) {
+		syntax_error(s_NickServ, u, "REGISTER",
+					 NICK_REGISTER_SYNTAX_EMAIL);
+	} else if (time(NULL) < u->lastnickreg + NSRegDelay) {
+		notice_lang(s_NickServ, u, NICK_REG_PLEASE_WAIT, NSRegDelay);
+	} else if (u->na) {		 /* i.e. there's already such a nick regged */
+		if (u->na->status & NS_VERBOTEN) {
+			alog("%s: %s@%s tried to register FORBIDden nick %s",
+				 s_NickServ, u->username, u->host, u->nick);
+			notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED, u->nick);
+		} else {
+			notice_lang(s_NickServ, u, NICK_ALREADY_REGISTERED, u->nick);
+		}
+	} else if (stricmp(u->nick, pass) == 0
+			   || (StrictPasswords && strlen(pass) < 5)) {
+		notice_lang(s_NickServ, u, MORE_OBSCURE_PASSWORD);
+	} else if (enc_encrypt_check_len(strlen(pass), PASSMAX - 1)) {
+		notice_lang(s_NickServ, u, PASSWORD_TOO_LONG);
+	} else if (email && !MailValidate(email)) {
+		notice_lang(s_NickServ, u, MAIL_X_INVALID, email);
+	} else {
+		for (idx = 0; idx < 9; idx++) {
+			passcode[idx] =
+				chars[(1 +
+					   (int) (((float) (max - min)) * getrandom16() /
+							  (65535 + 1.0)) + min)];
+		} passcode[idx] = '\0';
+		nr = makerequest(u->nick);
+		nr->passcode = sstrdup(passcode);
+		strscpy(nr->password, pass, PASSMAX);
+		memset(pass, 0, strlen(pass));
+		/* We are paranoid about keeping a plain text pass in memory, yet we would write
+		 * it to a database.. - Viper */
+		enc_encrypt_in_place(nr->password, PASSMAX);
+		if (email) {
+			nr->email = sstrdup(email);
+		}
+		nr->requested = time(NULL);
+		if (NSEmailReg) {
+			if (do_sendregmail(u, nr) == 0) {
+				notice_lang(s_NickServ, u, NICK_ENTER_REG_CODE, email,
+							s_NickServ);
+				alog("%s: sent registration verification code to %s",
+					 s_NickServ, nr->email);
+			} else {
+				alog("%s: Unable to send registration verification mail",
+					 s_NickServ);
+				notice_lang(s_NickServ, u, NICK_REG_UNABLE);
+				delnickrequest(nr);	 /* Delete the NickRequest if we couldnt send the mail */
+				return MOD_CONT;
+			}
+		} else {
+			do_confirm(u);
+		}
+
+	}
+	return MOD_CONT;
 }
 
 /*************************************************************************/
 
 int ns_do_register(User * u)
 {
-    return do_register(u);
+	return do_register(u);
 }
 
 
 int do_confirm(User * u)
 {
 
-    NickRequest *nr = NULL;
-    NickAlias *na = NULL;
-    char *passcode = strtok(NULL, " ");
-    char *email = NULL;
-    int forced = 0;
-    User *utmp = NULL;
-    char modes[512];
-    int len;
-
-    nr = findrequestnick(u->nick);
-
-    if (NSEmailReg) {
-        if (!passcode) {
-            notice_lang(s_NickServ, u, NICK_CONFIRM_INVALID);
-            return MOD_CONT;
-        }
-
-        if (!nr) {
-            if (is_services_admin(u)) {
+	NickRequest *nr = NULL;
+	NickAlias *na = NULL;
+	char *passcode = strtok(NULL, " ");
+	char *email = NULL;
+	int forced = 0;
+	User *utmp = NULL;
+	char modes[512];
+	int len;
+
+	nr = findrequestnick(u->nick);
+
+	if (NSEmailReg) {
+		if (!passcode) {
+			notice_lang(s_NickServ, u, NICK_CONFIRM_INVALID);
+			return MOD_CONT;
+		}
+
+		if (!nr) {
+			if (is_services_admin(u)) {
 /* If an admin, their nick is obviously already regged, so look at the passcode to get the nick
    of the user they are trying to validate, and push that user through regardless of passcode */
-                nr = findrequestnick(passcode);
-                if (nr) {
-                    utmp = finduser(passcode);
-                    if (utmp) {
-                        sprintf(passcode,
-                                "FORCE_ACTIVATION_DUE_TO_OPER_CONFIRM %s",
-                                nr->passcode);
-                        passcode = strtok(passcode, " ");
-                        notice_lang(s_NickServ, u, NICK_FORCE_REG,
-                                    nr->nick);
-                        do_confirm(utmp);
-                        return MOD_CONT;
-                    } else {
-                        passcode = sstrdup(nr->passcode);
-                        forced = 1;
-                    }
-                } else {
-                    notice_lang(s_NickServ, u, NICK_CONFIRM_NOT_FOUND,
-                                s_NickServ);
-                    return MOD_CONT;
-                }
-            } else {
-                notice_lang(s_NickServ, u, NICK_CONFIRM_NOT_FOUND,
-                            s_NickServ);
-                return MOD_CONT;
-            }
-        }
-
-        if (stricmp(nr->passcode, passcode) != 0) {
-            notice_lang(s_NickServ, u, NICK_CONFIRM_INVALID);
-            return MOD_CONT;
-        }
-    }
-
-    if (!nr) {
-        notice_lang(s_NickServ, u, NICK_REGISTRATION_FAILED);
-        return MOD_CONT;
-    }
-
-    if (nr->email) {
-        email = sstrdup(nr->email);
-    }
-    na = makenick(nr->nick);
-
-    if (na) {
-        int i;
-        char tsbuf[16];
-        char tmp_pass[PASSMAX];
-
-        memcpy(na->nc->pass, nr->password, PASSMAX);
-        na->status = (int16) (NS_IDENTIFIED | NS_RECOGNIZED);
-/*        na->nc->flags |= NI_ENCRYPTEDPW; */
-
-        na->nc->flags |= NSDefFlags;
-        for (i = 0; i < RootNumber; i++) {
-            if (!stricmp(ServicesRoots[i], nr->nick)) {
-                na->nc->flags |= NI_SERVICES_ROOT;
-                break;
-            }
-        }
-
-        na->nc->memos.memomax = MSMaxMemos;
-
-        if (forced == 1) {
-            na->last_usermask = sstrdup("*@*");
-            na->last_realname = sstrdup("unknown");
-        } else {
-            na->last_usermask =
-                (char *)scalloc(strlen(common_get_vident(u)) +
-                        strlen(common_get_vhost(u)) + 2, 1);
-            sprintf(na->last_usermask, "%s@%s", common_get_vident(u),
-                    common_get_vhost(u));
-            na->last_realname = sstrdup(u->realname);
-        }
-        na->time_registered = na->last_seen = time(NULL);
-        if (NSAddAccessOnReg) {
-            na->nc->accesscount = 1;
-            na->nc->access = (char **)scalloc(sizeof(char *), 1);
-            na->nc->access[0] = create_mask(u);
-        } else {
-            na->nc->accesscount = 0;
-            na->nc->access = NULL;
-        }
-        na->nc->language = NSDefLanguage;
-        if (email)
-            na->nc->email = sstrdup(email);
-        if (forced != 1) {
-            u->na = na;
-            na->u = u;
-            alog("%s: '%s' registered by %s@%s (e-mail: %s)", s_NickServ,
-                 u->nick, u->username, u->host, (email ? email : "none"));
-            if (NSAddAccessOnReg)
-                notice_lang(s_NickServ, u, NICK_REGISTERED, u->nick,
-                            na->nc->access[0]);
-            else
-                notice_lang(s_NickServ, u, NICK_REGISTERED_NO_MASK,
-                            u->nick);
-            send_event(EVENT_NICK_REGISTERED, 1, u->nick);
-
-            if(enc_decrypt(na->nc->pass, tmp_pass, PASSMAX - 1)==1)
-                notice_lang(s_NickServ, u, NICK_PASSWORD_IS, tmp_pass);
-
-            u->lastnickreg = time(NULL);
-            if (ircd->modeonreg) {
-                len = strlen(ircd->modeonreg);
-                strncpy(modes,ircd->modeonreg,512);
-            if(ircd->rootmodeonid && is_services_root(u)) {
-                    strncat(modes,ircd->rootmodeonid,512-len);
-            } else if(ircd->adminmodeonid && is_services_admin(u)) {
-                    strncat(modes,ircd->adminmodeonid,512-len);
-            } else if(ircd->opermodeonid && is_services_oper(u)) {
-                    strncat(modes,ircd->opermodeonid,512-len);
-                }
-
-                if (ircd->tsonmode) {
-                    snprintf(tsbuf, sizeof(tsbuf), "%lu",
-                             (unsigned long int) u->timestamp);
-                    common_svsmode(u, modes, tsbuf);
-                } else {
-                    common_svsmode(u, modes, NULL);
-                }
-            }
-
-        } else {
-            notice_lang(s_NickServ, u, NICK_FORCE_REG, nr->nick);
-        }
-        delnickrequest(nr);     /* remove the nick request */
-    } else {
-        alog("%s: makenick(%s) failed", s_NickServ, u->nick);
-        notice_lang(s_NickServ, u, NICK_REGISTRATION_FAILED);
-    }
-
-    /* Enable nick tracking if enabled */
-    if (NSNickTracking)
-        nsStartNickTracking(u);
-
-    return MOD_CONT;
+				nr = findrequestnick(passcode);
+				if (nr) {
+					utmp = finduser(passcode);
+					if (utmp) {
+						sprintf(passcode,
+								"FORCE_ACTIVATION_DUE_TO_OPER_CONFIRM %s",
+								nr->passcode);
+						passcode = strtok(passcode, " ");
+						notice_lang(s_NickServ, u, NICK_FORCE_REG,
+									nr->nick);
+						do_confirm(utmp);
+						return MOD_CONT;
+					} else {
+						passcode = sstrdup(nr->passcode);
+						forced = 1;
+					}
+				} else {
+					notice_lang(s_NickServ, u, NICK_CONFIRM_NOT_FOUND,
+								s_NickServ);
+					return MOD_CONT;
+				}
+			} else {
+				notice_lang(s_NickServ, u, NICK_CONFIRM_NOT_FOUND,
+							s_NickServ);
+				return MOD_CONT;
+			}
+		}
+
+		if (stricmp(nr->passcode, passcode) != 0) {
+			notice_lang(s_NickServ, u, NICK_CONFIRM_INVALID);
+			return MOD_CONT;
+		}
+	}
+
+	if (!nr) {
+		notice_lang(s_NickServ, u, NICK_REGISTRATION_FAILED);
+		return MOD_CONT;
+	}
+
+	if (nr->email) {
+		email = sstrdup(nr->email);
+	}
+	na = makenick(nr->nick);
+
+	if (na) {
+		int i;
+		char tsbuf[16];
+		char tmp_pass[PASSMAX];
+
+		memcpy(na->nc->pass, nr->password, PASSMAX);
+		na->status = (int16) (NS_IDENTIFIED | NS_RECOGNIZED);
+/*		na->nc->flags |= NI_ENCRYPTEDPW; */
+
+		na->nc->flags |= NSDefFlags;
+		for (i = 0; i < RootNumber; i++) {
+			if (!stricmp(ServicesRoots[i], nr->nick)) {
+				na->nc->flags |= NI_SERVICES_ROOT;
+				break;
+			}
+		}
+
+		na->nc->memos.memomax = MSMaxMemos;
+
+		if (forced == 1) {
+			na->last_usermask = sstrdup("*@*");
+			na->last_realname = sstrdup("unknown");
+		} else {
+			na->last_usermask =
+				(char *)scalloc(strlen(common_get_vident(u)) +
+						strlen(common_get_vhost(u)) + 2, 1);
+			sprintf(na->last_usermask, "%s@%s", common_get_vident(u),
+					common_get_vhost(u));
+			na->last_realname = sstrdup(u->realname);
+		}
+		na->time_registered = na->last_seen = time(NULL);
+		if (NSAddAccessOnReg) {
+			na->nc->accesscount = 1;
+			na->nc->access = (char **)scalloc(sizeof(char *), 1);
+			na->nc->access[0] = create_mask(u);
+		} else {
+			na->nc->accesscount = 0;
+			na->nc->access = NULL;
+		}
+		na->nc->language = NSDefLanguage;
+		if (email)
+			na->nc->email = sstrdup(email);
+		if (forced != 1) {
+			u->na = na;
+			na->u = u;
+			alog("%s: '%s' registered by %s@%s (e-mail: %s)", s_NickServ,
+				 u->nick, u->username, u->host, (email ? email : "none"));
+			if (NSAddAccessOnReg)
+				notice_lang(s_NickServ, u, NICK_REGISTERED, u->nick,
+							na->nc->access[0]);
+			else
+				notice_lang(s_NickServ, u, NICK_REGISTERED_NO_MASK,
+							u->nick);
+			send_event(EVENT_NICK_REGISTERED, 1, u->nick);
+
+			if(enc_decrypt(na->nc->pass, tmp_pass, PASSMAX - 1)==1)
+				notice_lang(s_NickServ, u, NICK_PASSWORD_IS, tmp_pass);
+
+			u->lastnickreg = time(NULL);
+			if (ircd->modeonreg) {
+				len = strlen(ircd->modeonreg);
+				strncpy(modes,ircd->modeonreg,512);
+			if(ircd->rootmodeonid && is_services_root(u)) {
+					strncat(modes,ircd->rootmodeonid,512-len);
+			} else if(ircd->adminmodeonid && is_services_admin(u)) {
+					strncat(modes,ircd->adminmodeonid,512-len);
+			} else if(ircd->opermodeonid && is_services_oper(u)) {
+					strncat(modes,ircd->opermodeonid,512-len);
+				}
+
+				if (ircd->tsonmode) {
+					snprintf(tsbuf, sizeof(tsbuf), "%lu",
+							 (unsigned long int) u->timestamp);
+					common_svsmode(u, modes, tsbuf);
+				} else {
+					common_svsmode(u, modes, NULL);
+				}
+			}
+
+		} else {
+			notice_lang(s_NickServ, u, NICK_FORCE_REG, nr->nick);
+		}
+		delnickrequest(nr);	 /* remove the nick request */
+	} else {
+		alog("%s: makenick(%s) failed", s_NickServ, u->nick);
+		notice_lang(s_NickServ, u, NICK_REGISTRATION_FAILED);
+	}
+
+	/* Enable nick tracking if enabled */
+	if (NSNickTracking)
+		nsStartNickTracking(u);
+
+	return MOD_CONT;
 }
 
 NickRequest *makerequest(const char *nick)
 {
-    NickRequest *nr;
+	NickRequest *nr;
 
-    nr = (NickRequest *)scalloc(1, sizeof(NickRequest));
-    nr->nick = sstrdup(nick);
-    insert_requestnick(nr);
-    alog("%s: Nick %s has been requested", s_NickServ, nr->nick);
-    return nr;
+	nr = (NickRequest *)scalloc(1, sizeof(NickRequest));
+	nr->nick = sstrdup(nick);
+	insert_requestnick(nr);
+	alog("%s: Nick %s has been requested", s_NickServ, nr->nick);
+	return nr;
 }
 
 /* Creates a full new nick (alias + core) in NickServ database. */
 
 NickAlias *makenick(const char *nick)
 {
-    NickAlias *na;
-    NickCore *nc;
-
-    /* First make the core */
-    nc = (NickCore *)scalloc(1, sizeof(NickCore));
-    nc->display = sstrdup(nick);
-    slist_init(&nc->aliases);
-    insert_core(nc);
-    alog("%s: group %s has been created", s_NickServ, nc->display);
-
-    /* Then make the alias */
-    na = (NickAlias *)scalloc(1, sizeof(NickAlias));
-    na->nick = sstrdup(nick);
-    na->nc = nc;
-    slist_add(&nc->aliases, na);
-    alpha_insert_alias(na);
-    return na;
+	NickAlias *na;
+	NickCore *nc;
+
+	/* First make the core */
+	nc = (NickCore *)scalloc(1, sizeof(NickCore));
+	nc->display = sstrdup(nick);
+	slist_init(&nc->aliases);
+	insert_core(nc);
+	alog("%s: group %s has been created", s_NickServ, nc->display);
+
+	/* Then make the alias */
+	na = (NickAlias *)scalloc(1, sizeof(NickAlias));
+	na->nick = sstrdup(nick);
+	na->nc = nc;
+	slist_add(&nc->aliases, na);
+	alpha_insert_alias(na);
+	return na;
 }
 
 /* Register a nick. */
 
 int do_resend(User * u)
 {
-    NickRequest *nr = NULL;
-    if (NSEmailReg) {
-        if ((nr = findrequestnick(u->nick))) {
-            if (time(NULL) < nr->lastmail + NSResendDelay) {
-               return MOD_CONT;
-            } else {
-                nr->lastmail = time(NULL);
-            }
-            if (do_sendregmail(u, nr) == 0) {
-                notice_lang(s_NickServ, u, NICK_REG_RESENT, nr->email);
-                alog("%s: re-sent registration verification code for %s to %s", s_NickServ, nr->nick, nr->email);
-            } else {
-                alog("%s: Unable to re-send registration verification mail for %s", s_NickServ, nr->nick);
-                return MOD_CONT;
-            }
-        }
-    }
-    return MOD_CONT;
+	NickRequest *nr = NULL;
+	if (NSEmailReg) {
+		if ((nr = findrequestnick(u->nick))) {
+			if (time(NULL) < nr->lastmail + NSResendDelay) {
+			   return MOD_CONT;
+			} else {
+				nr->lastmail = time(NULL);
+			}
+			if (do_sendregmail(u, nr) == 0) {
+				notice_lang(s_NickServ, u, NICK_REG_RESENT, nr->email);
+				alog("%s: re-sent registration verification code for %s to %s", s_NickServ, nr->nick, nr->email);
+			} else {
+				alog("%s: Unable to re-send registration verification mail for %s", s_NickServ, nr->nick);
+				return MOD_CONT;
+			}
+		}
+	}
+	return MOD_CONT;
 }
 
 int do_sendregmail(User * u, NickRequest * nr)
 {
-    MailInfo *mail = NULL;
-    char buf[BUFSIZE];
-
-    if (!(nr || u)) {
-        return -1;
-    }
-    snprintf(buf, sizeof(buf), getstring2(NULL, NICK_REG_MAIL_SUBJECT),
-             nr->nick);
-    mail = MailRegBegin(u, nr, buf, s_NickServ);
-    if (!mail) {
-        return -1;
-    }
-    fprintf(mail->pipe, getstring2(NULL, NICK_REG_MAIL_HEAD));
-    fprintf(mail->pipe, "\n\n");
-    fprintf(mail->pipe, getstring2(NULL, NICK_REG_MAIL_LINE_1), nr->nick);
-    fprintf(mail->pipe, "\n\n");
-    fprintf(mail->pipe, getstring2(NULL, NICK_REG_MAIL_LINE_2), s_NickServ,
-            nr->passcode);
-    fprintf(mail->pipe, "\n\n");
-    fprintf(mail->pipe, getstring2(NULL, NICK_REG_MAIL_LINE_3));
-    fprintf(mail->pipe, "\n\n");
-    fprintf(mail->pipe, getstring2(NULL, NICK_REG_MAIL_LINE_4));
-    fprintf(mail->pipe, "\n\n");
-    fprintf(mail->pipe, getstring2(NULL, NICK_REG_MAIL_LINE_5),
-            NetworkName);
-    fprintf(mail->pipe, "\n.\n");
-    MailEnd(mail);
-    return 0;
+	MailInfo *mail = NULL;
+	char buf[BUFSIZE];
+
+	if (!(nr || u)) {
+		return -1;
+	}
+	snprintf(buf, sizeof(buf), getstring2(NULL, NICK_REG_MAIL_SUBJECT),
+			 nr->nick);
+	mail = MailRegBegin(u, nr, buf, s_NickServ);
+	if (!mail) {
+		return -1;
+	}
+	fprintf(mail->pipe, getstring2(NULL, NICK_REG_MAIL_HEAD));
+	fprintf(mail->pipe, "\n\n");
+	fprintf(mail->pipe, getstring2(NULL, NICK_REG_MAIL_LINE_1), nr->nick);
+	fprintf(mail->pipe, "\n\n");
+	fprintf(mail->pipe, getstring2(NULL, NICK_REG_MAIL_LINE_2), s_NickServ,
+			nr->passcode);
+	fprintf(mail->pipe, "\n\n");
+	fprintf(mail->pipe, getstring2(NULL, NICK_REG_MAIL_LINE_3));
+	fprintf(mail->pipe, "\n\n");
+	fprintf(mail->pipe, getstring2(NULL, NICK_REG_MAIL_LINE_4));
+	fprintf(mail->pipe, "\n\n");
+	fprintf(mail->pipe, getstring2(NULL, NICK_REG_MAIL_LINE_5),
+			NetworkName);
+	fprintf(mail->pipe, "\n.\n");
+	MailEnd(mail);
+	return 0;
 }
 
 
diff --git a/src/core/ns_release.c b/src/core/ns_release.c
index a13bc310d..28173ab36 100644
--- a/src/core/ns_release.c
+++ b/src/core/ns_release.c
@@ -47,7 +47,7 @@ class NSRelease : public Module
  **/
 void myNickServHelp(User * u)
 {
-    notice_lang(s_NickServ, u, NICK_HELP_CMD_RELEASE);
+	notice_lang(s_NickServ, u, NICK_HELP_CMD_RELEASE);
 }
 
 /**
@@ -56,15 +56,15 @@ void myNickServHelp(User * u)
  **/
 int myHelpResonse(User * u)
 {
-    char relstr[192];
+	char relstr[192];
 
-    /* Convert NSReleaseTimeout seconds to string format */
-    duration(u->na, relstr, sizeof(relstr), NSReleaseTimeout);
-    
-    notice_help(s_NickServ, u, NICK_HELP_RELEASE, relstr);
-    do_help_limited(s_NickServ, u, c);
+	/* Convert NSReleaseTimeout seconds to string format */
+	duration(u->na, relstr, sizeof(relstr), NSReleaseTimeout);
+	
+	notice_help(s_NickServ, u, NICK_HELP_RELEASE, relstr);
+	do_help_limited(s_NickServ, u, c);
 
-    return MOD_CONT;
+	return MOD_CONT;
 }
 
 /**
@@ -74,43 +74,43 @@ int myHelpResonse(User * u)
  **/
 int do_release(User * u)
 {
-    char *nick = strtok(NULL, " ");
-    char *pass = strtok(NULL, " ");
-    NickAlias *na;
-
-    if (!nick) {
-        syntax_error(s_NickServ, u, "RELEASE", NICK_RELEASE_SYNTAX);
-    } else if (!(na = findnick(nick))) {
-        notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
-    } else if (na->status & NS_VERBOTEN) {
-        notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
-    } else if (na->nc->flags & NI_SUSPENDED) {
-        notice_lang(s_NickServ, u, NICK_X_SUSPENDED, na->nick);
-    } else if (!(na->status & NS_KILL_HELD)) {
-        notice_lang(s_NickServ, u, NICK_RELEASE_NOT_HELD, nick);
-    } else if (pass) {
-        int res = enc_check_password(pass, na->nc->pass);
-        if (res == 1) {
-            release(na, 0);
-            notice_lang(s_NickServ, u, NICK_RELEASED);
-        } else {
-            notice_lang(s_NickServ, u, ACCESS_DENIED);
-            if (res == 0) {
-                alog("%s: RELEASE: invalid password for %s by %s!%s@%s",
-                     s_NickServ, nick, u->nick, u->username, u->host);
-                bad_password(u);
-            }
-        }
-    } else {
-        if (group_identified(u, na->nc)
-            || (!(na->nc->flags & NI_SECURE) && is_on_access(u, na->nc))) {
-            release(na, 0);
-            notice_lang(s_NickServ, u, NICK_RELEASED);
-        } else {
-            notice_lang(s_NickServ, u, ACCESS_DENIED);
-        }
-    }
-    return MOD_CONT;
+	char *nick = strtok(NULL, " ");
+	char *pass = strtok(NULL, " ");
+	NickAlias *na;
+
+	if (!nick) {
+		syntax_error(s_NickServ, u, "RELEASE", NICK_RELEASE_SYNTAX);
+	} else if (!(na = findnick(nick))) {
+		notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
+	} else if (na->status & NS_VERBOTEN) {
+		notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
+	} else if (na->nc->flags & NI_SUSPENDED) {
+		notice_lang(s_NickServ, u, NICK_X_SUSPENDED, na->nick);
+	} else if (!(na->status & NS_KILL_HELD)) {
+		notice_lang(s_NickServ, u, NICK_RELEASE_NOT_HELD, nick);
+	} else if (pass) {
+		int res = enc_check_password(pass, na->nc->pass);
+		if (res == 1) {
+			release(na, 0);
+			notice_lang(s_NickServ, u, NICK_RELEASED);
+		} else {
+			notice_lang(s_NickServ, u, ACCESS_DENIED);
+			if (res == 0) {
+				alog("%s: RELEASE: invalid password for %s by %s!%s@%s",
+					 s_NickServ, nick, u->nick, u->username, u->host);
+				bad_password(u);
+			}
+		}
+	} else {
+		if (group_identified(u, na->nc)
+			|| (!(na->nc->flags & NI_SECURE) && is_on_access(u, na->nc))) {
+			release(na, 0);
+			notice_lang(s_NickServ, u, NICK_RELEASED);
+		} else {
+			notice_lang(s_NickServ, u, ACCESS_DENIED);
+		}
+	}
+	return MOD_CONT;
 }
 
 /* EOF */
diff --git a/src/core/ns_saset.c b/src/core/ns_saset.c
index f3e8b8c72..a1e922a4e 100644
--- a/src/core/ns_saset.c
+++ b/src/core/ns_saset.c
@@ -87,8 +87,8 @@ class NSSASet : public Module
  **/
 void myNickServHelp(User * u)
 {
-    if (is_services_oper(u))
-        notice_lang(s_NickServ, u, NICK_HELP_CMD_SASET);
+	if (is_services_oper(u))
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_SASET);
 }
 
 /**
@@ -98,407 +98,407 @@ void myNickServHelp(User * u)
  **/
 int do_saset(User * u)
 {
-    char *nick = strtok(NULL, " ");
-    char *cmd = strtok(NULL, " ");
-    char *param = strtok(NULL, " ");
+	char *nick = strtok(NULL, " ");
+	char *cmd = strtok(NULL, " ");
+	char *param = strtok(NULL, " ");
 
-    NickAlias *na;
+	NickAlias *na;
 
-    if (readonly) {
-        notice_lang(s_NickServ, u, NICK_SASET_DISABLED);
-        return MOD_CONT;
-    }
+	if (readonly) {
+		notice_lang(s_NickServ, u, NICK_SASET_DISABLED);
+		return MOD_CONT;
+	}
 	if (!nick) {
 		syntax_error(s_NickServ, u, "SASET", NICK_SASET_SYNTAX);
 		return MOD_CONT;
 	}
-    if (!(na = findnick(nick))) {
-        notice_lang(s_NickServ, u, NICK_SASET_BAD_NICK, nick);
-        return MOD_CONT;
-    }
-
-    if (!param
-        && (!cmd
-            || (stricmp(cmd, "URL") != 0 && stricmp(cmd, "EMAIL") != 0
-                && stricmp(cmd, "GREET") != 0
-                && stricmp(cmd, "ICQ") != 0))) {
-        syntax_error(s_NickServ, u, "SASET", NICK_SASET_SYNTAX);
-    } else if (!na) {
-        notice_lang(s_NickServ, u, NICK_NOT_REGISTERED, nick);
-    } else if (na->status & NS_VERBOTEN) {
-        notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
-    } else if (na->nc->flags & NI_SUSPENDED) {
-        notice_lang(s_NickServ, u, NICK_X_SUSPENDED, na->nick);
-    } else if (stricmp(cmd, "DISPLAY") == 0) {
-        do_saset_display(u, na->nc, param);
-    } else if (stricmp(cmd, "PASSWORD") == 0) {
-        do_saset_password(u, na->nc, param);
-    } else if (stricmp(cmd, "URL") == 0) {
-        do_saset_url(u, na->nc, param);
-    } else if (stricmp(cmd, "EMAIL") == 0) {
-        do_saset_email(u, na->nc, param);
-    } else if (stricmp(cmd, "ICQ") == 0) {
-        do_saset_icq(u, na->nc, param);
-    } else if (stricmp(cmd, "GREET") == 0) {
-        do_saset_greet(u, na->nc, param);
-    } else if (stricmp(cmd, "KILL") == 0) {
-        do_saset_kill(u, na->nc, param);
-    } else if (stricmp(cmd, "SECURE") == 0) {
-        do_saset_secure(u, na->nc, param);
-    } else if (stricmp(cmd, "PRIVATE") == 0) {
-        do_saset_private(u, na->nc, param);
-    } else if (stricmp(cmd, "MSG") == 0) {
-        do_saset_msg(u, na->nc, param);
-    } else if (stricmp(cmd, "HIDE") == 0) {
-        do_saset_hide(u, na->nc, param);
-    } else if (stricmp(cmd, "NOEXPIRE") == 0) {
-        do_saset_noexpire(u, na, param);
-    } else if (stricmp(cmd, "AUTOOP") == 0) {
-        do_saset_autoop(u, na->nc, param);
-    } else if (stricmp(cmd, "LANGUAGE") == 0) {
-        do_saset_language(u, na->nc, param);
-    } else {
-        notice_lang(s_NickServ, u, NICK_SASET_UNKNOWN_OPTION, cmd);
-    }
-    return MOD_CONT;
+	if (!(na = findnick(nick))) {
+		notice_lang(s_NickServ, u, NICK_SASET_BAD_NICK, nick);
+		return MOD_CONT;
+	}
+
+	if (!param
+		&& (!cmd
+			|| (stricmp(cmd, "URL") != 0 && stricmp(cmd, "EMAIL") != 0
+				&& stricmp(cmd, "GREET") != 0
+				&& stricmp(cmd, "ICQ") != 0))) {
+		syntax_error(s_NickServ, u, "SASET", NICK_SASET_SYNTAX);
+	} else if (!na) {
+		notice_lang(s_NickServ, u, NICK_NOT_REGISTERED, nick);
+	} else if (na->status & NS_VERBOTEN) {
+		notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
+	} else if (na->nc->flags & NI_SUSPENDED) {
+		notice_lang(s_NickServ, u, NICK_X_SUSPENDED, na->nick);
+	} else if (stricmp(cmd, "DISPLAY") == 0) {
+		do_saset_display(u, na->nc, param);
+	} else if (stricmp(cmd, "PASSWORD") == 0) {
+		do_saset_password(u, na->nc, param);
+	} else if (stricmp(cmd, "URL") == 0) {
+		do_saset_url(u, na->nc, param);
+	} else if (stricmp(cmd, "EMAIL") == 0) {
+		do_saset_email(u, na->nc, param);
+	} else if (stricmp(cmd, "ICQ") == 0) {
+		do_saset_icq(u, na->nc, param);
+	} else if (stricmp(cmd, "GREET") == 0) {
+		do_saset_greet(u, na->nc, param);
+	} else if (stricmp(cmd, "KILL") == 0) {
+		do_saset_kill(u, na->nc, param);
+	} else if (stricmp(cmd, "SECURE") == 0) {
+		do_saset_secure(u, na->nc, param);
+	} else if (stricmp(cmd, "PRIVATE") == 0) {
+		do_saset_private(u, na->nc, param);
+	} else if (stricmp(cmd, "MSG") == 0) {
+		do_saset_msg(u, na->nc, param);
+	} else if (stricmp(cmd, "HIDE") == 0) {
+		do_saset_hide(u, na->nc, param);
+	} else if (stricmp(cmd, "NOEXPIRE") == 0) {
+		do_saset_noexpire(u, na, param);
+	} else if (stricmp(cmd, "AUTOOP") == 0) {
+		do_saset_autoop(u, na->nc, param);
+	} else if (stricmp(cmd, "LANGUAGE") == 0) {
+		do_saset_language(u, na->nc, param);
+	} else {
+		notice_lang(s_NickServ, u, NICK_SASET_UNKNOWN_OPTION, cmd);
+	}
+	return MOD_CONT;
 }
 
 int do_saset_display(User * u, NickCore * nc, char *param)
 {
-    int i;
-    NickAlias *na;
-
-    /* First check whether param is a valid nick of the group */
-    for (i = 0; i < nc->aliases.count; i++) {
-        na = (NickAlias *)nc->aliases.list[i];
-        if (stricmp(na->nick, param) == 0) {
-            param = na->nick;   /* Because case may differ */
-            break;
-        }
-    }
-
-    if (i == nc->aliases.count) {
-        notice_lang(s_NickServ, u, NICK_SASET_DISPLAY_INVALID,
-                    nc->display);
-        return MOD_CONT;
-    }
-
-    change_core_display(nc, param);
-    notice_lang(s_NickServ, u, NICK_SASET_DISPLAY_CHANGED, nc->display);
-
-    /* Enable nick tracking if enabled */
-    if (NSNickTracking)
-        nsStartNickTracking(u);
-
-    return MOD_CONT;
+	int i;
+	NickAlias *na;
+
+	/* First check whether param is a valid nick of the group */
+	for (i = 0; i < nc->aliases.count; i++) {
+		na = (NickAlias *)nc->aliases.list[i];
+		if (stricmp(na->nick, param) == 0) {
+			param = na->nick;   /* Because case may differ */
+			break;
+		}
+	}
+
+	if (i == nc->aliases.count) {
+		notice_lang(s_NickServ, u, NICK_SASET_DISPLAY_INVALID,
+					nc->display);
+		return MOD_CONT;
+	}
+
+	change_core_display(nc, param);
+	notice_lang(s_NickServ, u, NICK_SASET_DISPLAY_CHANGED, nc->display);
+
+	/* Enable nick tracking if enabled */
+	if (NSNickTracking)
+		nsStartNickTracking(u);
+
+	return MOD_CONT;
 }
 
 int do_saset_password(User * u, NickCore * nc, char *param)
 {
-    int len = strlen(param);
-    char tmp_pass[PASSMAX];
-
-    if (NSSecureAdmins && u->na->nc != nc && nick_is_services_admin(nc)
-        && !is_services_root(u)) {
-        notice_lang(s_NickServ, u, PERMISSION_DENIED);
-        return MOD_CONT;
-    } else if (stricmp(nc->display, param) == 0
-               || (StrictPasswords && len < 5)) {
-        notice_lang(s_NickServ, u, MORE_OBSCURE_PASSWORD);
-        return MOD_CONT;
-    } else if (enc_encrypt_check_len(len ,PASSMAX - 1)) {
-        notice_lang(s_NickServ, u, PASSWORD_TOO_LONG);
-        return MOD_CONT;
-    }
-
-    if (enc_encrypt(param, len, nc->pass, PASSMAX - 1) < 0) {
-        memset(param, 0, len);
-        alog("%s: Failed to encrypt password for %s (set)", s_NickServ,
-             nc->display);
-        notice_lang(s_NickServ, u, NICK_SASET_PASSWORD_FAILED,
-                    nc->display);
-        return MOD_CONT;
-    }
-    memset(param, 0, len);
-
-    if(enc_decrypt(nc->pass,tmp_pass,PASSMAX - 1)==1) {
-        notice_lang(s_NickServ, u, NICK_SASET_PASSWORD_CHANGED_TO, nc->display,
-                    tmp_pass);
-    } else {
-        notice_lang(s_NickServ, u, NICK_SASET_PASSWORD_CHANGED, nc->display);
-    }
-
-    alog("%s: %s!%s@%s used SASET PASSWORD on %s (e-mail: %s)", s_NickServ,
-         u->nick, u->username, u->host, nc->display,
-         (nc->email ? nc->email : "none"));
-    if (WallSetpass)
-        ircdproto->SendGlobops(s_NickServ,
-                         "\2%s\2 used SASET PASSWORD on \2%s\2",
-                         u->nick, nc->display);
-    return MOD_CONT;
+	int len = strlen(param);
+	char tmp_pass[PASSMAX];
+
+	if (NSSecureAdmins && u->na->nc != nc && nick_is_services_admin(nc)
+		&& !is_services_root(u)) {
+		notice_lang(s_NickServ, u, PERMISSION_DENIED);
+		return MOD_CONT;
+	} else if (stricmp(nc->display, param) == 0
+			   || (StrictPasswords && len < 5)) {
+		notice_lang(s_NickServ, u, MORE_OBSCURE_PASSWORD);
+		return MOD_CONT;
+	} else if (enc_encrypt_check_len(len ,PASSMAX - 1)) {
+		notice_lang(s_NickServ, u, PASSWORD_TOO_LONG);
+		return MOD_CONT;
+	}
+
+	if (enc_encrypt(param, len, nc->pass, PASSMAX - 1) < 0) {
+		memset(param, 0, len);
+		alog("%s: Failed to encrypt password for %s (set)", s_NickServ,
+			 nc->display);
+		notice_lang(s_NickServ, u, NICK_SASET_PASSWORD_FAILED,
+					nc->display);
+		return MOD_CONT;
+	}
+	memset(param, 0, len);
+
+	if(enc_decrypt(nc->pass,tmp_pass,PASSMAX - 1)==1) {
+		notice_lang(s_NickServ, u, NICK_SASET_PASSWORD_CHANGED_TO, nc->display,
+					tmp_pass);
+	} else {
+		notice_lang(s_NickServ, u, NICK_SASET_PASSWORD_CHANGED, nc->display);
+	}
+
+	alog("%s: %s!%s@%s used SASET PASSWORD on %s (e-mail: %s)", s_NickServ,
+		 u->nick, u->username, u->host, nc->display,
+		 (nc->email ? nc->email : "none"));
+	if (WallSetpass)
+		ircdproto->SendGlobops(s_NickServ,
+						 "\2%s\2 used SASET PASSWORD on \2%s\2",
+						 u->nick, nc->display);
+	return MOD_CONT;
 }
 
 int do_saset_url(User * u, NickCore * nc, char *param)
 {
-    if (nc->url)
-        free(nc->url);
-
-    if (param) {
-        nc->url = sstrdup(param);
-        notice_lang(s_NickServ, u, NICK_SASET_URL_CHANGED, nc->display,
-                    param);
-    } else {
-        nc->url = NULL;
-        notice_lang(s_NickServ, u, NICK_SASET_URL_UNSET, nc->display);
-    }
-    return MOD_CONT;
+	if (nc->url)
+		free(nc->url);
+
+	if (param) {
+		nc->url = sstrdup(param);
+		notice_lang(s_NickServ, u, NICK_SASET_URL_CHANGED, nc->display,
+					param);
+	} else {
+		nc->url = NULL;
+		notice_lang(s_NickServ, u, NICK_SASET_URL_UNSET, nc->display);
+	}
+	return MOD_CONT;
 }
 
 int do_saset_email(User * u, NickCore * nc, char *param)
 {
-    if (!param && NSForceEmail) {
-        notice_lang(s_NickServ, u, NICK_SASET_EMAIL_UNSET_IMPOSSIBLE);
-        return MOD_CONT;
-    } else if (NSSecureAdmins && u->na->nc != nc
-               && nick_is_services_admin(nc)
-               && !is_services_root(u)) {
-        notice_lang(s_NickServ, u, PERMISSION_DENIED);
-        return MOD_CONT;
-    } else if (param && !MailValidate(param)) {
-        notice_lang(s_NickServ, u, MAIL_X_INVALID, param);
-        return MOD_CONT;
-    }
-
-    alog("%s: %s!%s@%s used SASET EMAIL on %s (e-mail: %s)", s_NickServ,
-         u->nick, u->username, u->host, nc->display,
-         (nc->email ? nc->email : "none"));
-
-    if (nc->email)
-        free(nc->email);
-
-    if (param) {
-        nc->email = sstrdup(param);
-        notice_lang(s_NickServ, u, NICK_SASET_EMAIL_CHANGED, nc->display,
-                    param);
-    } else {
-        nc->email = NULL;
-        notice_lang(s_NickServ, u, NICK_SASET_EMAIL_UNSET, nc->display);
-    }
-    return MOD_CONT;
+	if (!param && NSForceEmail) {
+		notice_lang(s_NickServ, u, NICK_SASET_EMAIL_UNSET_IMPOSSIBLE);
+		return MOD_CONT;
+	} else if (NSSecureAdmins && u->na->nc != nc
+			   && nick_is_services_admin(nc)
+			   && !is_services_root(u)) {
+		notice_lang(s_NickServ, u, PERMISSION_DENIED);
+		return MOD_CONT;
+	} else if (param && !MailValidate(param)) {
+		notice_lang(s_NickServ, u, MAIL_X_INVALID, param);
+		return MOD_CONT;
+	}
+
+	alog("%s: %s!%s@%s used SASET EMAIL on %s (e-mail: %s)", s_NickServ,
+		 u->nick, u->username, u->host, nc->display,
+		 (nc->email ? nc->email : "none"));
+
+	if (nc->email)
+		free(nc->email);
+
+	if (param) {
+		nc->email = sstrdup(param);
+		notice_lang(s_NickServ, u, NICK_SASET_EMAIL_CHANGED, nc->display,
+					param);
+	} else {
+		nc->email = NULL;
+		notice_lang(s_NickServ, u, NICK_SASET_EMAIL_UNSET, nc->display);
+	}
+	return MOD_CONT;
 }
 
 int do_saset_icq(User * u, NickCore * nc, char *param)
 {
-    if (param) {
-        int32 tmp = atol(param);
-        if (tmp == 0) {
-            notice_lang(s_NickServ, u, NICK_SASET_ICQ_INVALID, param);
-        } else {
-            nc->icq = tmp;
-            notice_lang(s_NickServ, u, NICK_SASET_ICQ_CHANGED, nc->display,
-                        param);
-        }
-    } else {
-        nc->icq = 0;
-        notice_lang(s_NickServ, u, NICK_SASET_ICQ_UNSET, nc->display);
-    }
-    return MOD_CONT;
+	if (param) {
+		int32 tmp = atol(param);
+		if (tmp == 0) {
+			notice_lang(s_NickServ, u, NICK_SASET_ICQ_INVALID, param);
+		} else {
+			nc->icq = tmp;
+			notice_lang(s_NickServ, u, NICK_SASET_ICQ_CHANGED, nc->display,
+						param);
+		}
+	} else {
+		nc->icq = 0;
+		notice_lang(s_NickServ, u, NICK_SASET_ICQ_UNSET, nc->display);
+	}
+	return MOD_CONT;
 }
 
 int do_saset_greet(User * u, NickCore * nc, char *param)
 {
-    if (nc->greet)
-        free(nc->greet);
-
-    if (param) {
-        char buf[BUFSIZE];
-        char *end = strtok(NULL, "");
-
-        snprintf(buf, sizeof(buf), "%s%s%s", param, (end ? " " : ""),
-                 (end ? end : ""));
-
-        nc->greet = sstrdup(buf);
-        notice_lang(s_NickServ, u, NICK_SASET_GREET_CHANGED, nc->display,
-                    buf);
-    } else {
-        nc->greet = NULL;
-        notice_lang(s_NickServ, u, NICK_SASET_GREET_UNSET, nc->display);
-    }
-    return MOD_CONT;
+	if (nc->greet)
+		free(nc->greet);
+
+	if (param) {
+		char buf[BUFSIZE];
+		char *end = strtok(NULL, "");
+
+		snprintf(buf, sizeof(buf), "%s%s%s", param, (end ? " " : ""),
+				 (end ? end : ""));
+
+		nc->greet = sstrdup(buf);
+		notice_lang(s_NickServ, u, NICK_SASET_GREET_CHANGED, nc->display,
+					buf);
+	} else {
+		nc->greet = NULL;
+		notice_lang(s_NickServ, u, NICK_SASET_GREET_UNSET, nc->display);
+	}
+	return MOD_CONT;
 }
 
 int do_saset_kill(User * u, NickCore * nc, char *param)
 {
-    if (stricmp(param, "ON") == 0) {
-        nc->flags |= NI_KILLPROTECT;
-        nc->flags &= ~(NI_KILL_QUICK | NI_KILL_IMMED);
-        notice_lang(s_NickServ, u, NICK_SASET_KILL_ON, nc->display);
-    } else if (stricmp(param, "QUICK") == 0) {
-        nc->flags |= NI_KILLPROTECT | NI_KILL_QUICK;
-        nc->flags &= ~NI_KILL_IMMED;
-        notice_lang(s_NickServ, u, NICK_SASET_KILL_QUICK, nc->display);
-    } else if (stricmp(param, "IMMED") == 0) {
-        if (NSAllowKillImmed) {
-            nc->flags |= NI_KILLPROTECT | NI_KILL_IMMED;
-            nc->flags &= ~NI_KILL_QUICK;
-            notice_lang(s_NickServ, u, NICK_SASET_KILL_IMMED, nc->display);
-        } else {
-            notice_lang(s_NickServ, u, NICK_SASET_KILL_IMMED_DISABLED);
-        }
-    } else if (stricmp(param, "OFF") == 0) {
-        nc->flags &= ~(NI_KILLPROTECT | NI_KILL_QUICK | NI_KILL_IMMED);
-        notice_lang(s_NickServ, u, NICK_SASET_KILL_OFF, nc->display);
-    } else {
-        syntax_error(s_NickServ, u, "SASET KILL",
-                     NSAllowKillImmed ? NICK_SASET_KILL_IMMED_SYNTAX :
-                     NICK_SASET_KILL_SYNTAX);
-    }
-    return MOD_CONT;
+	if (stricmp(param, "ON") == 0) {
+		nc->flags |= NI_KILLPROTECT;
+		nc->flags &= ~(NI_KILL_QUICK | NI_KILL_IMMED);
+		notice_lang(s_NickServ, u, NICK_SASET_KILL_ON, nc->display);
+	} else if (stricmp(param, "QUICK") == 0) {
+		nc->flags |= NI_KILLPROTECT | NI_KILL_QUICK;
+		nc->flags &= ~NI_KILL_IMMED;
+		notice_lang(s_NickServ, u, NICK_SASET_KILL_QUICK, nc->display);
+	} else if (stricmp(param, "IMMED") == 0) {
+		if (NSAllowKillImmed) {
+			nc->flags |= NI_KILLPROTECT | NI_KILL_IMMED;
+			nc->flags &= ~NI_KILL_QUICK;
+			notice_lang(s_NickServ, u, NICK_SASET_KILL_IMMED, nc->display);
+		} else {
+			notice_lang(s_NickServ, u, NICK_SASET_KILL_IMMED_DISABLED);
+		}
+	} else if (stricmp(param, "OFF") == 0) {
+		nc->flags &= ~(NI_KILLPROTECT | NI_KILL_QUICK | NI_KILL_IMMED);
+		notice_lang(s_NickServ, u, NICK_SASET_KILL_OFF, nc->display);
+	} else {
+		syntax_error(s_NickServ, u, "SASET KILL",
+					 NSAllowKillImmed ? NICK_SASET_KILL_IMMED_SYNTAX :
+					 NICK_SASET_KILL_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 int do_saset_secure(User * u, NickCore * nc, char *param)
 {
-    if (stricmp(param, "ON") == 0) {
-        nc->flags |= NI_SECURE;
-        notice_lang(s_NickServ, u, NICK_SASET_SECURE_ON, nc->display);
-    } else if (stricmp(param, "OFF") == 0) {
-        nc->flags &= ~NI_SECURE;
-        notice_lang(s_NickServ, u, NICK_SASET_SECURE_OFF, nc->display);
-    } else {
-        syntax_error(s_NickServ, u, "SASET SECURE",
-                     NICK_SASET_SECURE_SYNTAX);
-    }
-    return MOD_CONT;
+	if (stricmp(param, "ON") == 0) {
+		nc->flags |= NI_SECURE;
+		notice_lang(s_NickServ, u, NICK_SASET_SECURE_ON, nc->display);
+	} else if (stricmp(param, "OFF") == 0) {
+		nc->flags &= ~NI_SECURE;
+		notice_lang(s_NickServ, u, NICK_SASET_SECURE_OFF, nc->display);
+	} else {
+		syntax_error(s_NickServ, u, "SASET SECURE",
+					 NICK_SASET_SECURE_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 int do_saset_private(User * u, NickCore * nc, char *param)
 {
-    if (stricmp(param, "ON") == 0) {
-        nc->flags |= NI_PRIVATE;
-        notice_lang(s_NickServ, u, NICK_SASET_PRIVATE_ON, nc->display);
-    } else if (stricmp(param, "OFF") == 0) {
-        nc->flags &= ~NI_PRIVATE;
-        notice_lang(s_NickServ, u, NICK_SASET_PRIVATE_OFF, nc->display);
-    } else {
-        syntax_error(s_NickServ, u, "SASET PRIVATE",
-                     NICK_SASET_PRIVATE_SYNTAX);
-    }
-    return MOD_CONT;
+	if (stricmp(param, "ON") == 0) {
+		nc->flags |= NI_PRIVATE;
+		notice_lang(s_NickServ, u, NICK_SASET_PRIVATE_ON, nc->display);
+	} else if (stricmp(param, "OFF") == 0) {
+		nc->flags &= ~NI_PRIVATE;
+		notice_lang(s_NickServ, u, NICK_SASET_PRIVATE_OFF, nc->display);
+	} else {
+		syntax_error(s_NickServ, u, "SASET PRIVATE",
+					 NICK_SASET_PRIVATE_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 int do_saset_msg(User * u, NickCore * nc, char *param)
 {
-    if (!UsePrivmsg) {
-        notice_lang(s_NickServ, u, NICK_SASET_OPTION_DISABLED, "MSG");
-        return MOD_CONT;
-    }
-
-    if (stricmp(param, "ON") == 0) {
-        nc->flags |= NI_MSG;
-        notice_lang(s_NickServ, u, NICK_SASET_MSG_ON, nc->display);
-    } else if (stricmp(param, "OFF") == 0) {
-        nc->flags &= ~NI_MSG;
-        notice_lang(s_NickServ, u, NICK_SASET_MSG_OFF, nc->display);
-    } else {
-        syntax_error(s_NickServ, u, "SASET MSG", NICK_SASET_MSG_SYNTAX);
-    }
-    return MOD_CONT;
+	if (!UsePrivmsg) {
+		notice_lang(s_NickServ, u, NICK_SASET_OPTION_DISABLED, "MSG");
+		return MOD_CONT;
+	}
+
+	if (stricmp(param, "ON") == 0) {
+		nc->flags |= NI_MSG;
+		notice_lang(s_NickServ, u, NICK_SASET_MSG_ON, nc->display);
+	} else if (stricmp(param, "OFF") == 0) {
+		nc->flags &= ~NI_MSG;
+		notice_lang(s_NickServ, u, NICK_SASET_MSG_OFF, nc->display);
+	} else {
+		syntax_error(s_NickServ, u, "SASET MSG", NICK_SASET_MSG_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 int do_saset_hide(User * u, NickCore * nc, char *param)
 {
-    int flag, onmsg, offmsg;
-
-    if (stricmp(param, "EMAIL") == 0) {
-        flag = NI_HIDE_EMAIL;
-        onmsg = NICK_SASET_HIDE_EMAIL_ON;
-        offmsg = NICK_SASET_HIDE_EMAIL_OFF;
-    } else if (stricmp(param, "USERMASK") == 0) {
-        flag = NI_HIDE_MASK;
-        onmsg = NICK_SASET_HIDE_MASK_ON;
-        offmsg = NICK_SASET_HIDE_MASK_OFF;
-    } else if (stricmp(param, "STATUS") == 0) {
-        flag = NI_HIDE_STATUS;
-        onmsg = NICK_SASET_HIDE_STATUS_ON;
-        offmsg = NICK_SASET_HIDE_STATUS_OFF;
-    } else if (stricmp(param, "QUIT") == 0) {
-        flag = NI_HIDE_QUIT;
-        onmsg = NICK_SASET_HIDE_QUIT_ON;
-        offmsg = NICK_SASET_HIDE_QUIT_OFF;
-    } else {
-        syntax_error(s_NickServ, u, "SASET HIDE", NICK_SASET_HIDE_SYNTAX);
-        return MOD_CONT;
-    }
-
-    param = strtok(NULL, " ");
-    if (!param) {
-        syntax_error(s_NickServ, u, "SASET HIDE", NICK_SASET_HIDE_SYNTAX);
-    } else if (stricmp(param, "ON") == 0) {
-        nc->flags |= flag;
-        notice_lang(s_NickServ, u, onmsg, nc->display, s_NickServ);
-    } else if (stricmp(param, "OFF") == 0) {
-        nc->flags &= ~flag;
-        notice_lang(s_NickServ, u, offmsg, nc->display, s_NickServ);
-    } else {
-        syntax_error(s_NickServ, u, "SASET HIDE", NICK_SASET_HIDE_SYNTAX);
-    }
-    return MOD_CONT;
+	int flag, onmsg, offmsg;
+
+	if (stricmp(param, "EMAIL") == 0) {
+		flag = NI_HIDE_EMAIL;
+		onmsg = NICK_SASET_HIDE_EMAIL_ON;
+		offmsg = NICK_SASET_HIDE_EMAIL_OFF;
+	} else if (stricmp(param, "USERMASK") == 0) {
+		flag = NI_HIDE_MASK;
+		onmsg = NICK_SASET_HIDE_MASK_ON;
+		offmsg = NICK_SASET_HIDE_MASK_OFF;
+	} else if (stricmp(param, "STATUS") == 0) {
+		flag = NI_HIDE_STATUS;
+		onmsg = NICK_SASET_HIDE_STATUS_ON;
+		offmsg = NICK_SASET_HIDE_STATUS_OFF;
+	} else if (stricmp(param, "QUIT") == 0) {
+		flag = NI_HIDE_QUIT;
+		onmsg = NICK_SASET_HIDE_QUIT_ON;
+		offmsg = NICK_SASET_HIDE_QUIT_OFF;
+	} else {
+		syntax_error(s_NickServ, u, "SASET HIDE", NICK_SASET_HIDE_SYNTAX);
+		return MOD_CONT;
+	}
+
+	param = strtok(NULL, " ");
+	if (!param) {
+		syntax_error(s_NickServ, u, "SASET HIDE", NICK_SASET_HIDE_SYNTAX);
+	} else if (stricmp(param, "ON") == 0) {
+		nc->flags |= flag;
+		notice_lang(s_NickServ, u, onmsg, nc->display, s_NickServ);
+	} else if (stricmp(param, "OFF") == 0) {
+		nc->flags &= ~flag;
+		notice_lang(s_NickServ, u, offmsg, nc->display, s_NickServ);
+	} else {
+		syntax_error(s_NickServ, u, "SASET HIDE", NICK_SASET_HIDE_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 int do_saset_noexpire(User * u, NickAlias * na, char *param)
 {
-    if (!param) {
-        syntax_error(s_NickServ, u, "SASET NOEXPIRE",
-                     NICK_SASET_NOEXPIRE_SYNTAX);
-        return MOD_CONT;
-    }
-    if (stricmp(param, "ON") == 0) {
-        na->status |= NS_NO_EXPIRE;
-        notice_lang(s_NickServ, u, NICK_SASET_NOEXPIRE_ON, na->nick);
-    } else if (stricmp(param, "OFF") == 0) {
-        na->status &= ~NS_NO_EXPIRE;
-        notice_lang(s_NickServ, u, NICK_SASET_NOEXPIRE_OFF, na->nick);
-    } else {
-        syntax_error(s_NickServ, u, "SASET NOEXPIRE",
-                     NICK_SASET_NOEXPIRE_SYNTAX);
-    }
-    return MOD_CONT;
+	if (!param) {
+		syntax_error(s_NickServ, u, "SASET NOEXPIRE",
+					 NICK_SASET_NOEXPIRE_SYNTAX);
+		return MOD_CONT;
+	}
+	if (stricmp(param, "ON") == 0) {
+		na->status |= NS_NO_EXPIRE;
+		notice_lang(s_NickServ, u, NICK_SASET_NOEXPIRE_ON, na->nick);
+	} else if (stricmp(param, "OFF") == 0) {
+		na->status &= ~NS_NO_EXPIRE;
+		notice_lang(s_NickServ, u, NICK_SASET_NOEXPIRE_OFF, na->nick);
+	} else {
+		syntax_error(s_NickServ, u, "SASET NOEXPIRE",
+					 NICK_SASET_NOEXPIRE_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 int do_saset_autoop(User * u, NickCore * nc, char *param)
 {
-    if (stricmp(param, "ON") == 0) {
-        nc->flags &= ~NI_AUTOOP;
-        notice_lang(s_NickServ, u, NICK_SASET_AUTOOP_ON, nc->display);
-    } else if (stricmp(param, "OFF") == 0) {
+	if (stricmp(param, "ON") == 0) {
+		nc->flags &= ~NI_AUTOOP;
+		notice_lang(s_NickServ, u, NICK_SASET_AUTOOP_ON, nc->display);
+	} else if (stricmp(param, "OFF") == 0) {
 	nc->flags |= NI_AUTOOP;
-        notice_lang(s_NickServ, u, NICK_SASET_AUTOOP_OFF, nc->display);
-    } else {
-        syntax_error(s_NickServ, u, "SET AUTOOP", NICK_SASET_AUTOOP_SYNTAX);
-    }
+		notice_lang(s_NickServ, u, NICK_SASET_AUTOOP_OFF, nc->display);
+	} else {
+		syntax_error(s_NickServ, u, "SET AUTOOP", NICK_SASET_AUTOOP_SYNTAX);
+	}
 
-    return MOD_CONT;
+	return MOD_CONT;
 }
 
 int do_saset_language(User * u, NickCore * nc, char *param)
 {
-    int langnum;
-
-    if (param[strspn(param, "0123456789")] != 0) {      /* i.e. not a number */
-        syntax_error(s_NickServ, u, "SASET LANGUAGE",
-                     NICK_SASET_LANGUAGE_SYNTAX);
-        return MOD_CONT;
-    }
-    langnum = atoi(param) - 1;
-    if (langnum < 0 || langnum >= NUM_LANGS || langlist[langnum] < 0) {
-        notice_lang(s_NickServ, u, NICK_SASET_LANGUAGE_UNKNOWN, langnum + 1,
-                    s_NickServ);
-        return MOD_CONT;
-    }
-    nc->language = langlist[langnum];
-    notice_lang(s_NickServ, u, NICK_SASET_LANGUAGE_CHANGED);
-
-    return MOD_CONT;
+	int langnum;
+
+	if (param[strspn(param, "0123456789")] != 0) {	  /* i.e. not a number */
+		syntax_error(s_NickServ, u, "SASET LANGUAGE",
+					 NICK_SASET_LANGUAGE_SYNTAX);
+		return MOD_CONT;
+	}
+	langnum = atoi(param) - 1;
+	if (langnum < 0 || langnum >= NUM_LANGS || langlist[langnum] < 0) {
+		notice_lang(s_NickServ, u, NICK_SASET_LANGUAGE_UNKNOWN, langnum + 1,
+					s_NickServ);
+		return MOD_CONT;
+	}
+	nc->language = langlist[langnum];
+	notice_lang(s_NickServ, u, NICK_SASET_LANGUAGE_CHANGED);
+
+	return MOD_CONT;
 }
 
 /* EOF */
diff --git a/src/core/ns_sendpass.c b/src/core/ns_sendpass.c
index 03ac69d38..dae1562da 100644
--- a/src/core/ns_sendpass.c
+++ b/src/core/ns_sendpass.c
@@ -47,7 +47,7 @@ class NSSendPass : public Module
  **/
 void myNickServHelp(User * u)
 {
-    notice_lang(s_NickServ, u, NICK_HELP_CMD_SENDPASS);
+	notice_lang(s_NickServ, u, NICK_HELP_CMD_SENDPASS);
 }
 
 /**
@@ -58,55 +58,55 @@ void myNickServHelp(User * u)
 int do_sendpass(User * u)
 {
 
-    char *nick = strtok(NULL, " ");
-    NickAlias *na;
-
-    if (!nick) {
-        syntax_error(s_NickServ, u, "SENDPASS", NICK_SENDPASS_SYNTAX);
-    } else if (RestrictMail && !is_services_oper(u)) {
-        notice_lang(s_NickServ, u, PERMISSION_DENIED);
-    } else if (!(na = findnick(nick))) {
-        notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
-    } else if (na->status & NS_VERBOTEN) {
-        notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
-    } else {
-        char buf[BUFSIZE];
-        char tmp_pass[PASSMAX];
-        if(enc_decrypt(na->nc->pass,tmp_pass,PASSMAX - 1)==1) {
-            MailInfo *mail;
-
-            snprintf(buf, sizeof(buf), getstring(na, NICK_SENDPASS_SUBJECT),
-                     na->nick);
-            mail = MailBegin(u, na->nc, buf, s_NickServ);
-            if (!mail)
-                return MOD_CONT;
-
-            fprintf(mail->pipe, getstring(na, NICK_SENDPASS_HEAD));
-            fprintf(mail->pipe, "\n\n");
-            fprintf(mail->pipe, getstring(na, NICK_SENDPASS_LINE_1), na->nick);
-            fprintf(mail->pipe, "\n\n");
-            fprintf(mail->pipe, getstring(na, NICK_SENDPASS_LINE_2),
-                    tmp_pass);
-            fprintf(mail->pipe, "\n\n");
-            fprintf(mail->pipe, getstring(na, NICK_SENDPASS_LINE_3));
-            fprintf(mail->pipe, "\n\n");
-            fprintf(mail->pipe, getstring(na, NICK_SENDPASS_LINE_4));
-            fprintf(mail->pipe, "\n\n");
-            fprintf(mail->pipe, getstring(na, NICK_SENDPASS_LINE_5),
-                    NetworkName);
-            fprintf(mail->pipe, "\n.\n");
-
-            MailEnd(mail);
-
-            alog("%s: %s!%s@%s used SENDPASS on %s", s_NickServ, u->nick,
-                 u->username, u->host, nick);
-            notice_lang(s_NickServ, u, NICK_SENDPASS_OK, nick);
-        } else {
-            notice_lang(s_NickServ, u, NICK_SENDPASS_UNAVAILABLE);
-        }
-    }
-
-    return MOD_CONT;
+	char *nick = strtok(NULL, " ");
+	NickAlias *na;
+
+	if (!nick) {
+		syntax_error(s_NickServ, u, "SENDPASS", NICK_SENDPASS_SYNTAX);
+	} else if (RestrictMail && !is_services_oper(u)) {
+		notice_lang(s_NickServ, u, PERMISSION_DENIED);
+	} else if (!(na = findnick(nick))) {
+		notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
+	} else if (na->status & NS_VERBOTEN) {
+		notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
+	} else {
+		char buf[BUFSIZE];
+		char tmp_pass[PASSMAX];
+		if(enc_decrypt(na->nc->pass,tmp_pass,PASSMAX - 1)==1) {
+			MailInfo *mail;
+
+			snprintf(buf, sizeof(buf), getstring(na, NICK_SENDPASS_SUBJECT),
+					 na->nick);
+			mail = MailBegin(u, na->nc, buf, s_NickServ);
+			if (!mail)
+				return MOD_CONT;
+
+			fprintf(mail->pipe, getstring(na, NICK_SENDPASS_HEAD));
+			fprintf(mail->pipe, "\n\n");
+			fprintf(mail->pipe, getstring(na, NICK_SENDPASS_LINE_1), na->nick);
+			fprintf(mail->pipe, "\n\n");
+			fprintf(mail->pipe, getstring(na, NICK_SENDPASS_LINE_2),
+					tmp_pass);
+			fprintf(mail->pipe, "\n\n");
+			fprintf(mail->pipe, getstring(na, NICK_SENDPASS_LINE_3));
+			fprintf(mail->pipe, "\n\n");
+			fprintf(mail->pipe, getstring(na, NICK_SENDPASS_LINE_4));
+			fprintf(mail->pipe, "\n\n");
+			fprintf(mail->pipe, getstring(na, NICK_SENDPASS_LINE_5),
+					NetworkName);
+			fprintf(mail->pipe, "\n.\n");
+
+			MailEnd(mail);
+
+			alog("%s: %s!%s@%s used SENDPASS on %s", s_NickServ, u->nick,
+				 u->username, u->host, nick);
+			notice_lang(s_NickServ, u, NICK_SENDPASS_OK, nick);
+		} else {
+			notice_lang(s_NickServ, u, NICK_SENDPASS_UNAVAILABLE);
+		}
+	}
+
+	return MOD_CONT;
 }
 
 MODULE_INIT("ns_sendpass", NSSendPass)
diff --git a/src/core/ns_set.c b/src/core/ns_set.c
index b8af7ebfb..b6c91b281 100644
--- a/src/core/ns_set.c
+++ b/src/core/ns_set.c
@@ -82,7 +82,7 @@ class NSSet : public Module
  **/
 void myNickServHelp(User * u)
 {
-    notice_lang(s_NickServ, u, NICK_HELP_CMD_SET);
+	notice_lang(s_NickServ, u, NICK_HELP_CMD_SET);
 }
 
 /**
@@ -92,359 +92,359 @@ void myNickServHelp(User * u)
  **/
 int do_set(User * u)
 {
-    char *cmd = strtok(NULL, " ");
-    char *param = strtok(NULL, " ");
-    NickAlias *na = u->na;
-
-    if (readonly) {
-        notice_lang(s_NickServ, u, NICK_SET_DISABLED);
-        return MOD_CONT;
-    }
-
-    if (!param
-        && (!cmd
-            || (stricmp(cmd, "URL") != 0 && stricmp(cmd, "EMAIL") != 0
-                && stricmp(cmd, "GREET") != 0
-                && stricmp(cmd, "ICQ") != 0))) {
-        syntax_error(s_NickServ, u, "SET", NICK_SET_SYNTAX);
-    } else if (!na) {
-        notice_lang(s_NickServ, u, NICK_NOT_REGISTERED);
-    } else if (na->status & NS_VERBOTEN) {
-        notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
-    } else if (na->nc->flags & NI_SUSPENDED) {
-        notice_lang(s_NickServ, u, NICK_X_SUSPENDED, na->nick);
-    } else if (!nick_identified(u)) {
-        notice_lang(s_NickServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
-    } else if (stricmp(cmd, "DISPLAY") == 0) {
-        do_set_display(u, na->nc, param);
-    } else if (stricmp(cmd, "PASSWORD") == 0) {
-        do_set_password(u, na->nc, param);
-    } else if (stricmp(cmd, "LANGUAGE") == 0) {
-        do_set_language(u, na->nc, param);
-    } else if (stricmp(cmd, "URL") == 0) {
-        do_set_url(u, na->nc, param);
-    } else if (stricmp(cmd, "EMAIL") == 0) {
-        do_set_email(u, na->nc, param);
-    } else if (stricmp(cmd, "ICQ") == 0) {
-        do_set_icq(u, na->nc, param);
-    } else if (stricmp(cmd, "GREET") == 0) {
-        do_set_greet(u, na->nc, param);
-    } else if (stricmp(cmd, "KILL") == 0) {
-        do_set_kill(u, na->nc, param);
-    } else if (stricmp(cmd, "SECURE") == 0) {
-        do_set_secure(u, na->nc, param);
-    } else if (stricmp(cmd, "PRIVATE") == 0) {
-        do_set_private(u, na->nc, param);
-    } else if (stricmp(cmd, "MSG") == 0) {
-        do_set_msg(u, na->nc, param);
-    } else if (stricmp(cmd, "HIDE") == 0) {
-        do_set_hide(u, na->nc, param);
-    } else if (stricmp(cmd, "AUTOOP") == 0) {
-        do_set_autoop(u, na->nc, param);
-    } else {
-        notice_lang(s_NickServ, u, NICK_SET_UNKNOWN_OPTION, cmd);
-    }
-    return MOD_CONT;
+	char *cmd = strtok(NULL, " ");
+	char *param = strtok(NULL, " ");
+	NickAlias *na = u->na;
+
+	if (readonly) {
+		notice_lang(s_NickServ, u, NICK_SET_DISABLED);
+		return MOD_CONT;
+	}
+
+	if (!param
+		&& (!cmd
+			|| (stricmp(cmd, "URL") != 0 && stricmp(cmd, "EMAIL") != 0
+				&& stricmp(cmd, "GREET") != 0
+				&& stricmp(cmd, "ICQ") != 0))) {
+		syntax_error(s_NickServ, u, "SET", NICK_SET_SYNTAX);
+	} else if (!na) {
+		notice_lang(s_NickServ, u, NICK_NOT_REGISTERED);
+	} else if (na->status & NS_VERBOTEN) {
+		notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
+	} else if (na->nc->flags & NI_SUSPENDED) {
+		notice_lang(s_NickServ, u, NICK_X_SUSPENDED, na->nick);
+	} else if (!nick_identified(u)) {
+		notice_lang(s_NickServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
+	} else if (stricmp(cmd, "DISPLAY") == 0) {
+		do_set_display(u, na->nc, param);
+	} else if (stricmp(cmd, "PASSWORD") == 0) {
+		do_set_password(u, na->nc, param);
+	} else if (stricmp(cmd, "LANGUAGE") == 0) {
+		do_set_language(u, na->nc, param);
+	} else if (stricmp(cmd, "URL") == 0) {
+		do_set_url(u, na->nc, param);
+	} else if (stricmp(cmd, "EMAIL") == 0) {
+		do_set_email(u, na->nc, param);
+	} else if (stricmp(cmd, "ICQ") == 0) {
+		do_set_icq(u, na->nc, param);
+	} else if (stricmp(cmd, "GREET") == 0) {
+		do_set_greet(u, na->nc, param);
+	} else if (stricmp(cmd, "KILL") == 0) {
+		do_set_kill(u, na->nc, param);
+	} else if (stricmp(cmd, "SECURE") == 0) {
+		do_set_secure(u, na->nc, param);
+	} else if (stricmp(cmd, "PRIVATE") == 0) {
+		do_set_private(u, na->nc, param);
+	} else if (stricmp(cmd, "MSG") == 0) {
+		do_set_msg(u, na->nc, param);
+	} else if (stricmp(cmd, "HIDE") == 0) {
+		do_set_hide(u, na->nc, param);
+	} else if (stricmp(cmd, "AUTOOP") == 0) {
+		do_set_autoop(u, na->nc, param);
+	} else {
+		notice_lang(s_NickServ, u, NICK_SET_UNKNOWN_OPTION, cmd);
+	}
+	return MOD_CONT;
 }
 
 int do_set_display(User * u, NickCore * nc, char *param)
 {
-    int i;
-    NickAlias *na;
-
-    /* First check whether param is a valid nick of the group */
-    for (i = 0; i < nc->aliases.count; i++) {
-        na = (NickAlias *)nc->aliases.list[i];
-        if (!stricmp(na->nick, param)) {
-            param = na->nick;   /* Because case may differ */
-            break;
-        }
-    }
-
-    if (i == nc->aliases.count) {
-        notice_lang(s_NickServ, u, NICK_SET_DISPLAY_INVALID);
-        return MOD_CONT;
-    }
-
-    change_core_display(nc, param);
-    notice_lang(s_NickServ, u, NICK_SET_DISPLAY_CHANGED, nc->display);
-
-    /* Enable nick tracking if enabled */
-    if (NSNickTracking)
-        nsStartNickTracking(u);
-
-    return MOD_CONT;
+	int i;
+	NickAlias *na;
+
+	/* First check whether param is a valid nick of the group */
+	for (i = 0; i < nc->aliases.count; i++) {
+		na = (NickAlias *)nc->aliases.list[i];
+		if (!stricmp(na->nick, param)) {
+			param = na->nick;   /* Because case may differ */
+			break;
+		}
+	}
+
+	if (i == nc->aliases.count) {
+		notice_lang(s_NickServ, u, NICK_SET_DISPLAY_INVALID);
+		return MOD_CONT;
+	}
+
+	change_core_display(nc, param);
+	notice_lang(s_NickServ, u, NICK_SET_DISPLAY_CHANGED, nc->display);
+
+	/* Enable nick tracking if enabled */
+	if (NSNickTracking)
+		nsStartNickTracking(u);
+
+	return MOD_CONT;
 }
 
 int do_set_password(User * u, NickCore * nc, char *param)
 {
-    int len = strlen(param);
-    char tmp_pass[PASSMAX];
-
-    if (stricmp(nc->display, param) == 0 || (StrictPasswords && len < 5)) {
-        notice_lang(s_NickServ, u, MORE_OBSCURE_PASSWORD);
-        return MOD_CONT;
-    } else if (enc_encrypt_check_len(len ,PASSMAX - 1)) {
-        notice_lang(s_NickServ, u, PASSWORD_TOO_LONG);
-        return MOD_CONT;
-    }
-
-    if (enc_encrypt(param, len, nc->pass, PASSMAX - 1) < 0) {
-        memset(param, 0, len);
-        alog("%s: Failed to encrypt password for %s (set)", s_NickServ,
-             nc->display);
-        notice_lang(s_NickServ, u, NICK_SET_PASSWORD_FAILED);
-        return MOD_CONT;
-    }
-    memset(param, 0, len);
-
-    if(enc_decrypt(nc->pass,tmp_pass,PASSMAX - 1)==1) {
-        notice_lang(s_NickServ, u, NICK_SET_PASSWORD_CHANGED_TO, tmp_pass);
-    } else {
-        notice_lang(s_NickServ, u, NICK_SET_PASSWORD_CHANGED);
-    }
-
-    alog("%s: %s!%s@%s (e-mail: %s) changed its password.", s_NickServ,
-         u->nick, u->username, u->host, (nc->email ? nc->email : "none"));
-
-    return MOD_CONT;
+	int len = strlen(param);
+	char tmp_pass[PASSMAX];
+
+	if (stricmp(nc->display, param) == 0 || (StrictPasswords && len < 5)) {
+		notice_lang(s_NickServ, u, MORE_OBSCURE_PASSWORD);
+		return MOD_CONT;
+	} else if (enc_encrypt_check_len(len ,PASSMAX - 1)) {
+		notice_lang(s_NickServ, u, PASSWORD_TOO_LONG);
+		return MOD_CONT;
+	}
+
+	if (enc_encrypt(param, len, nc->pass, PASSMAX - 1) < 0) {
+		memset(param, 0, len);
+		alog("%s: Failed to encrypt password for %s (set)", s_NickServ,
+			 nc->display);
+		notice_lang(s_NickServ, u, NICK_SET_PASSWORD_FAILED);
+		return MOD_CONT;
+	}
+	memset(param, 0, len);
+
+	if(enc_decrypt(nc->pass,tmp_pass,PASSMAX - 1)==1) {
+		notice_lang(s_NickServ, u, NICK_SET_PASSWORD_CHANGED_TO, tmp_pass);
+	} else {
+		notice_lang(s_NickServ, u, NICK_SET_PASSWORD_CHANGED);
+	}
+
+	alog("%s: %s!%s@%s (e-mail: %s) changed its password.", s_NickServ,
+		 u->nick, u->username, u->host, (nc->email ? nc->email : "none"));
+
+	return MOD_CONT;
 }
 
 int do_set_language(User * u, NickCore * nc, char *param)
 {
-    int langnum;
-
-    if (param[strspn(param, "0123456789")] != 0) {      /* i.e. not a number */
-        syntax_error(s_NickServ, u, "SET LANGUAGE",
-                     NICK_SET_LANGUAGE_SYNTAX);
-        return MOD_CONT;
-    }
-    langnum = atoi(param) - 1;
-    if (langnum < 0 || langnum >= NUM_LANGS || langlist[langnum] < 0) {
-        notice_lang(s_NickServ, u, NICK_SET_LANGUAGE_UNKNOWN, langnum + 1,
-                    s_NickServ);
-        return MOD_CONT;
-    }
-    nc->language = langlist[langnum];
-    notice_lang(s_NickServ, u, NICK_SET_LANGUAGE_CHANGED);
-    return MOD_CONT;
+	int langnum;
+
+	if (param[strspn(param, "0123456789")] != 0) {	  /* i.e. not a number */
+		syntax_error(s_NickServ, u, "SET LANGUAGE",
+					 NICK_SET_LANGUAGE_SYNTAX);
+		return MOD_CONT;
+	}
+	langnum = atoi(param) - 1;
+	if (langnum < 0 || langnum >= NUM_LANGS || langlist[langnum] < 0) {
+		notice_lang(s_NickServ, u, NICK_SET_LANGUAGE_UNKNOWN, langnum + 1,
+					s_NickServ);
+		return MOD_CONT;
+	}
+	nc->language = langlist[langnum];
+	notice_lang(s_NickServ, u, NICK_SET_LANGUAGE_CHANGED);
+	return MOD_CONT;
 }
 
 int do_set_url(User * u, NickCore * nc, char *param)
 {
-    if (nc->url)
-        free(nc->url);
-
-    if (param) {
-        nc->url = sstrdup(param);
-        notice_lang(s_NickServ, u, NICK_SET_URL_CHANGED, param);
-    } else {
-        nc->url = NULL;
-        notice_lang(s_NickServ, u, NICK_SET_URL_UNSET);
-    }
-    return MOD_CONT;
+	if (nc->url)
+		free(nc->url);
+
+	if (param) {
+		nc->url = sstrdup(param);
+		notice_lang(s_NickServ, u, NICK_SET_URL_CHANGED, param);
+	} else {
+		nc->url = NULL;
+		notice_lang(s_NickServ, u, NICK_SET_URL_UNSET);
+	}
+	return MOD_CONT;
 }
 
 int do_set_email(User * u, NickCore * nc, char *param)
 {
-    if (!param && NSForceEmail) {
-        notice_lang(s_NickServ, u, NICK_SET_EMAIL_UNSET_IMPOSSIBLE);
-        return MOD_CONT;
-    } else if (param && !MailValidate(param)) {
-        notice_lang(s_NickServ, u, MAIL_X_INVALID, param);
-        return MOD_CONT;
-    }
-
-    alog("%s: %s!%s@%s (e-mail: %s) changed its e-mail to %s.",
-         s_NickServ, u->nick, u->username, u->host,
-         (nc->email ? nc->email : "none"), (param ? param : "none"));
-
-    if (nc->email)
-        free(nc->email);
-
-    if (param) {
-        nc->email = sstrdup(param);
-        notice_lang(s_NickServ, u, NICK_SET_EMAIL_CHANGED, param);
-    } else {
-        nc->email = NULL;
-        notice_lang(s_NickServ, u, NICK_SET_EMAIL_UNSET);
-    }
-    return MOD_CONT;
+	if (!param && NSForceEmail) {
+		notice_lang(s_NickServ, u, NICK_SET_EMAIL_UNSET_IMPOSSIBLE);
+		return MOD_CONT;
+	} else if (param && !MailValidate(param)) {
+		notice_lang(s_NickServ, u, MAIL_X_INVALID, param);
+		return MOD_CONT;
+	}
+
+	alog("%s: %s!%s@%s (e-mail: %s) changed its e-mail to %s.",
+		 s_NickServ, u->nick, u->username, u->host,
+		 (nc->email ? nc->email : "none"), (param ? param : "none"));
+
+	if (nc->email)
+		free(nc->email);
+
+	if (param) {
+		nc->email = sstrdup(param);
+		notice_lang(s_NickServ, u, NICK_SET_EMAIL_CHANGED, param);
+	} else {
+		nc->email = NULL;
+		notice_lang(s_NickServ, u, NICK_SET_EMAIL_UNSET);
+	}
+	return MOD_CONT;
 }
 
 int do_set_icq(User * u, NickCore * nc, char *param)
 {
-    if (param) {
-        int32 tmp = atol(param);
-        if (!tmp) {
-            notice_lang(s_NickServ, u, NICK_SET_ICQ_INVALID, param);
-        } else {
-            nc->icq = tmp;
-            notice_lang(s_NickServ, u, NICK_SET_ICQ_CHANGED, param);
-        }
-    } else {
-        nc->icq = 0;
-        notice_lang(s_NickServ, u, NICK_SET_ICQ_UNSET);
-    }
-    return MOD_CONT;
+	if (param) {
+		int32 tmp = atol(param);
+		if (!tmp) {
+			notice_lang(s_NickServ, u, NICK_SET_ICQ_INVALID, param);
+		} else {
+			nc->icq = tmp;
+			notice_lang(s_NickServ, u, NICK_SET_ICQ_CHANGED, param);
+		}
+	} else {
+		nc->icq = 0;
+		notice_lang(s_NickServ, u, NICK_SET_ICQ_UNSET);
+	}
+	return MOD_CONT;
 }
 
 int do_set_greet(User * u, NickCore * nc, char *param)
 {
-    if (nc->greet)
-        free(nc->greet);
-
-    if (param) {
-        char buf[BUFSIZE];
-        char *end = strtok(NULL, "");
-
-        snprintf(buf, sizeof(buf), "%s%s%s", param, (end ? " " : ""),
-                 (end ? end : ""));
-
-        nc->greet = sstrdup(buf);
-        notice_lang(s_NickServ, u, NICK_SET_GREET_CHANGED, buf);
-    } else {
-        nc->greet = NULL;
-        notice_lang(s_NickServ, u, NICK_SET_GREET_UNSET);
-    }
-    return MOD_CONT;
+	if (nc->greet)
+		free(nc->greet);
+
+	if (param) {
+		char buf[BUFSIZE];
+		char *end = strtok(NULL, "");
+
+		snprintf(buf, sizeof(buf), "%s%s%s", param, (end ? " " : ""),
+				 (end ? end : ""));
+
+		nc->greet = sstrdup(buf);
+		notice_lang(s_NickServ, u, NICK_SET_GREET_CHANGED, buf);
+	} else {
+		nc->greet = NULL;
+		notice_lang(s_NickServ, u, NICK_SET_GREET_UNSET);
+	}
+	return MOD_CONT;
 }
 
 int do_set_kill(User * u, NickCore * nc, char *param)
 {
-    if (stricmp(param, "ON") == 0) {
-        nc->flags |= NI_KILLPROTECT;
-        nc->flags &= ~(NI_KILL_QUICK | NI_KILL_IMMED);
-        notice_lang(s_NickServ, u, NICK_SET_KILL_ON);
-    } else if (stricmp(param, "QUICK") == 0) {
-        nc->flags |= NI_KILLPROTECT | NI_KILL_QUICK;
-        nc->flags &= ~NI_KILL_IMMED;
-        notice_lang(s_NickServ, u, NICK_SET_KILL_QUICK);
-    } else if (stricmp(param, "IMMED") == 0) {
-        if (NSAllowKillImmed) {
-            nc->flags |= NI_KILLPROTECT | NI_KILL_IMMED;
-            nc->flags &= ~NI_KILL_QUICK;
-            notice_lang(s_NickServ, u, NICK_SET_KILL_IMMED);
-        } else {
-            notice_lang(s_NickServ, u, NICK_SET_KILL_IMMED_DISABLED);
-        }
-    } else if (stricmp(param, "OFF") == 0) {
-        nc->flags &= ~(NI_KILLPROTECT | NI_KILL_QUICK | NI_KILL_IMMED);
-        notice_lang(s_NickServ, u, NICK_SET_KILL_OFF);
-    } else {
-        syntax_error(s_NickServ, u, "SET KILL",
-                     NSAllowKillImmed ? NICK_SET_KILL_IMMED_SYNTAX :
-                     NICK_SET_KILL_SYNTAX);
-    }
-    return MOD_CONT;
+	if (stricmp(param, "ON") == 0) {
+		nc->flags |= NI_KILLPROTECT;
+		nc->flags &= ~(NI_KILL_QUICK | NI_KILL_IMMED);
+		notice_lang(s_NickServ, u, NICK_SET_KILL_ON);
+	} else if (stricmp(param, "QUICK") == 0) {
+		nc->flags |= NI_KILLPROTECT | NI_KILL_QUICK;
+		nc->flags &= ~NI_KILL_IMMED;
+		notice_lang(s_NickServ, u, NICK_SET_KILL_QUICK);
+	} else if (stricmp(param, "IMMED") == 0) {
+		if (NSAllowKillImmed) {
+			nc->flags |= NI_KILLPROTECT | NI_KILL_IMMED;
+			nc->flags &= ~NI_KILL_QUICK;
+			notice_lang(s_NickServ, u, NICK_SET_KILL_IMMED);
+		} else {
+			notice_lang(s_NickServ, u, NICK_SET_KILL_IMMED_DISABLED);
+		}
+	} else if (stricmp(param, "OFF") == 0) {
+		nc->flags &= ~(NI_KILLPROTECT | NI_KILL_QUICK | NI_KILL_IMMED);
+		notice_lang(s_NickServ, u, NICK_SET_KILL_OFF);
+	} else {
+		syntax_error(s_NickServ, u, "SET KILL",
+					 NSAllowKillImmed ? NICK_SET_KILL_IMMED_SYNTAX :
+					 NICK_SET_KILL_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 int do_set_secure(User * u, NickCore * nc, char *param)
 {
-    if (stricmp(param, "ON") == 0) {
-        nc->flags |= NI_SECURE;
-        notice_lang(s_NickServ, u, NICK_SET_SECURE_ON);
-    } else if (stricmp(param, "OFF") == 0) {
-        nc->flags &= ~NI_SECURE;
-        notice_lang(s_NickServ, u, NICK_SET_SECURE_OFF);
-    } else {
-        syntax_error(s_NickServ, u, "SET SECURE", NICK_SET_SECURE_SYNTAX);
-    }
-    return MOD_CONT;
+	if (stricmp(param, "ON") == 0) {
+		nc->flags |= NI_SECURE;
+		notice_lang(s_NickServ, u, NICK_SET_SECURE_ON);
+	} else if (stricmp(param, "OFF") == 0) {
+		nc->flags &= ~NI_SECURE;
+		notice_lang(s_NickServ, u, NICK_SET_SECURE_OFF);
+	} else {
+		syntax_error(s_NickServ, u, "SET SECURE", NICK_SET_SECURE_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 int do_set_private(User * u, NickCore * nc, char *param)
 {
-    if (stricmp(param, "ON") == 0) {
-        nc->flags |= NI_PRIVATE;
-        notice_lang(s_NickServ, u, NICK_SET_PRIVATE_ON);
-    } else if (stricmp(param, "OFF") == 0) {
-        nc->flags &= ~NI_PRIVATE;
-        notice_lang(s_NickServ, u, NICK_SET_PRIVATE_OFF);
-    } else {
-        syntax_error(s_NickServ, u, "SET PRIVATE",
-                     NICK_SET_PRIVATE_SYNTAX);
-    }
-    return MOD_CONT;
+	if (stricmp(param, "ON") == 0) {
+		nc->flags |= NI_PRIVATE;
+		notice_lang(s_NickServ, u, NICK_SET_PRIVATE_ON);
+	} else if (stricmp(param, "OFF") == 0) {
+		nc->flags &= ~NI_PRIVATE;
+		notice_lang(s_NickServ, u, NICK_SET_PRIVATE_OFF);
+	} else {
+		syntax_error(s_NickServ, u, "SET PRIVATE",
+					 NICK_SET_PRIVATE_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 int do_set_msg(User * u, NickCore * nc, char *param)
 {
-    if (!UsePrivmsg) {
-        notice_lang(s_NickServ, u, NICK_SET_OPTION_DISABLED, "MSG");
-        return MOD_CONT;
-    }
-
-    if (stricmp(param, "ON") == 0) {
-        nc->flags |= NI_MSG;
-        notice_lang(s_NickServ, u, NICK_SET_MSG_ON);
-    } else if (stricmp(param, "OFF") == 0) {
-        nc->flags &= ~NI_MSG;
-        notice_lang(s_NickServ, u, NICK_SET_MSG_OFF);
-    } else {
-        syntax_error(s_NickServ, u, "SET MSG", NICK_SET_MSG_SYNTAX);
-    }
-    return MOD_CONT;
+	if (!UsePrivmsg) {
+		notice_lang(s_NickServ, u, NICK_SET_OPTION_DISABLED, "MSG");
+		return MOD_CONT;
+	}
+
+	if (stricmp(param, "ON") == 0) {
+		nc->flags |= NI_MSG;
+		notice_lang(s_NickServ, u, NICK_SET_MSG_ON);
+	} else if (stricmp(param, "OFF") == 0) {
+		nc->flags &= ~NI_MSG;
+		notice_lang(s_NickServ, u, NICK_SET_MSG_OFF);
+	} else {
+		syntax_error(s_NickServ, u, "SET MSG", NICK_SET_MSG_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 int do_set_hide(User * u, NickCore * nc, char *param)
 {
-    int flag, onmsg, offmsg;
-
-    if (stricmp(param, "EMAIL") == 0) {
-        flag = NI_HIDE_EMAIL;
-        onmsg = NICK_SET_HIDE_EMAIL_ON;
-        offmsg = NICK_SET_HIDE_EMAIL_OFF;
-    } else if (stricmp(param, "USERMASK") == 0) {
-        flag = NI_HIDE_MASK;
-        onmsg = NICK_SET_HIDE_MASK_ON;
-        offmsg = NICK_SET_HIDE_MASK_OFF;
-    } else if (stricmp(param, "STATUS") == 0) {
-        flag = NI_HIDE_STATUS;
-        onmsg = NICK_SET_HIDE_STATUS_ON;
-        offmsg = NICK_SET_HIDE_STATUS_OFF;
-    } else if (stricmp(param, "QUIT") == 0) {
-        flag = NI_HIDE_QUIT;
-        onmsg = NICK_SET_HIDE_QUIT_ON;
-        offmsg = NICK_SET_HIDE_QUIT_OFF;
-    } else {
-        syntax_error(s_NickServ, u, "SET HIDE", NICK_SET_HIDE_SYNTAX);
-        return MOD_CONT;
-    }
-
-    param = strtok(NULL, " ");
-    if (!param) {
-        syntax_error(s_NickServ, u, "SET HIDE", NICK_SET_HIDE_SYNTAX);
-    } else if (stricmp(param, "ON") == 0) {
-        nc->flags |= flag;
-        notice_lang(s_NickServ, u, onmsg, s_NickServ);
-    } else if (stricmp(param, "OFF") == 0) {
-        nc->flags &= ~flag;
-        notice_lang(s_NickServ, u, offmsg, s_NickServ);
-    } else {
-        syntax_error(s_NickServ, u, "SET HIDE", NICK_SET_HIDE_SYNTAX);
-    }
-    return MOD_CONT;
+	int flag, onmsg, offmsg;
+
+	if (stricmp(param, "EMAIL") == 0) {
+		flag = NI_HIDE_EMAIL;
+		onmsg = NICK_SET_HIDE_EMAIL_ON;
+		offmsg = NICK_SET_HIDE_EMAIL_OFF;
+	} else if (stricmp(param, "USERMASK") == 0) {
+		flag = NI_HIDE_MASK;
+		onmsg = NICK_SET_HIDE_MASK_ON;
+		offmsg = NICK_SET_HIDE_MASK_OFF;
+	} else if (stricmp(param, "STATUS") == 0) {
+		flag = NI_HIDE_STATUS;
+		onmsg = NICK_SET_HIDE_STATUS_ON;
+		offmsg = NICK_SET_HIDE_STATUS_OFF;
+	} else if (stricmp(param, "QUIT") == 0) {
+		flag = NI_HIDE_QUIT;
+		onmsg = NICK_SET_HIDE_QUIT_ON;
+		offmsg = NICK_SET_HIDE_QUIT_OFF;
+	} else {
+		syntax_error(s_NickServ, u, "SET HIDE", NICK_SET_HIDE_SYNTAX);
+		return MOD_CONT;
+	}
+
+	param = strtok(NULL, " ");
+	if (!param) {
+		syntax_error(s_NickServ, u, "SET HIDE", NICK_SET_HIDE_SYNTAX);
+	} else if (stricmp(param, "ON") == 0) {
+		nc->flags |= flag;
+		notice_lang(s_NickServ, u, onmsg, s_NickServ);
+	} else if (stricmp(param, "OFF") == 0) {
+		nc->flags &= ~flag;
+		notice_lang(s_NickServ, u, offmsg, s_NickServ);
+	} else {
+		syntax_error(s_NickServ, u, "SET HIDE", NICK_SET_HIDE_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 int do_set_autoop(User *u, NickCore *nc, char *param) {
 
-    /**
-     * This works the other way around, the absence of this flag denotes ON
-     * This is so when people upgrade, and dont have the flag
-     * the default is on
-     **/
-    if (stricmp(param, "ON") == 0) {
-        nc->flags &= ~NI_AUTOOP;
-        notice_lang(s_NickServ, u, NICK_SET_AUTOOP_ON);
-    } else if (stricmp(param, "OFF") == 0) {
+	/**
+	 * This works the other way around, the absence of this flag denotes ON
+	 * This is so when people upgrade, and dont have the flag
+	 * the default is on
+	 **/
+	if (stricmp(param, "ON") == 0) {
+		nc->flags &= ~NI_AUTOOP;
+		notice_lang(s_NickServ, u, NICK_SET_AUTOOP_ON);
+	} else if (stricmp(param, "OFF") == 0) {
 	nc->flags |= NI_AUTOOP;
-        notice_lang(s_NickServ, u, NICK_SET_AUTOOP_OFF);
-    } else {
-        syntax_error(s_NickServ, u, "SET AUTOOP", NICK_SET_AUTOOP_SYNTAX);
-    }
+		notice_lang(s_NickServ, u, NICK_SET_AUTOOP_OFF);
+	} else {
+		syntax_error(s_NickServ, u, "SET AUTOOP", NICK_SET_AUTOOP_SYNTAX);
+	}
 
-    return MOD_CONT;
+	return MOD_CONT;
 }
 
 
diff --git a/src/core/ns_status.c b/src/core/ns_status.c
index 45fb1c3e8..a67d12c3c 100644
--- a/src/core/ns_status.c
+++ b/src/core/ns_status.c
@@ -42,7 +42,7 @@ class NSStatus : public Module
  **/
 void myNickServHelp(User * u)
 {
-    notice_lang(s_NickServ, u, NICK_HELP_CMD_STATUS);
+	notice_lang(s_NickServ, u, NICK_HELP_CMD_STATUS);
 }
 
 /**
@@ -52,32 +52,32 @@ void myNickServHelp(User * u)
  **/
 int do_status(User * u)
 {
-    User *u2;
-    NickAlias *na = NULL;
-    int i = 0;
-    char *nick = strtok(NULL, " ");
+	User *u2;
+	NickAlias *na = NULL;
+	int i = 0;
+	char *nick = strtok(NULL, " ");
 
-    /* If no nickname is given, we assume that the user
-     * is asking for himself */
-    if (!nick)
-        nick = u->nick;
+	/* If no nickname is given, we assume that the user
+	 * is asking for himself */
+	if (!nick)
+		nick = u->nick;
 
-    while (nick && (i++ < 16)) {
-        if (!(u2 = finduser(nick)))     /* Nick is not online */
-            notice_lang(s_NickServ, u, NICK_STATUS_0, nick);
-        else if (nick_identified(u2))   /* Nick is identified */
-            notice_lang(s_NickServ, u, NICK_STATUS_3, nick);
-        else if (nick_recognized(u2))   /* Nick is recognised, but NOT identified */
-            notice_lang(s_NickServ, u, NICK_STATUS_2, nick);
-        else if ((na = findnick(nick)) == NULL) /* Nick is online, but NOT a registered */
-            notice_lang(s_NickServ, u, NICK_STATUS_0, nick);
-        else
-            notice_lang(s_NickServ, u, NICK_STATUS_1, nick);
+	while (nick && (i++ < 16)) {
+		if (!(u2 = finduser(nick)))	 /* Nick is not online */
+			notice_lang(s_NickServ, u, NICK_STATUS_0, nick);
+		else if (nick_identified(u2))   /* Nick is identified */
+			notice_lang(s_NickServ, u, NICK_STATUS_3, nick);
+		else if (nick_recognized(u2))   /* Nick is recognised, but NOT identified */
+			notice_lang(s_NickServ, u, NICK_STATUS_2, nick);
+		else if ((na = findnick(nick)) == NULL) /* Nick is online, but NOT a registered */
+			notice_lang(s_NickServ, u, NICK_STATUS_0, nick);
+		else
+			notice_lang(s_NickServ, u, NICK_STATUS_1, nick);
 
-        /* Get the next nickname */
-        nick = strtok(NULL, " ");
-    }
-    return MOD_CONT;
+		/* Get the next nickname */
+		nick = strtok(NULL, " ");
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("ns_status", NSStatus)
diff --git a/src/core/ns_suspend.c b/src/core/ns_suspend.c
index 76966b149..4428e710e 100644
--- a/src/core/ns_suspend.c
+++ b/src/core/ns_suspend.c
@@ -45,10 +45,10 @@ class NSSuspend : public Module
  **/
 void myNickServHelp(User * u)
 {
-    if (is_services_oper(u)) {
-        notice_lang(s_NickServ, u, NICK_HELP_CMD_SUSPEND);
-        notice_lang(s_NickServ, u, NICK_HELP_CMD_UNSUSPEND);
-    }
+	if (is_services_oper(u)) {
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_SUSPEND);
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_UNSUSPEND);
+	}
 }
 
 /**
@@ -58,121 +58,121 @@ void myNickServHelp(User * u)
  **/
 int do_suspend(User * u)
 {
-    NickAlias *na, *na2;
-    char *nick = strtok(NULL, " ");
-    char *reason = strtok(NULL, "");
-    int i;
-
-    if (!nick || !reason) {
-        syntax_error(s_NickServ, u, "SUSPEND", NICK_SUSPEND_SYNTAX);
-        return MOD_CONT;
-    }
-
-    if (readonly) {
-        notice_lang(s_NickServ, u, READ_ONLY_MODE);
-        return MOD_CONT;
-    }
-
-    if ((na = findnick(nick)) == NULL) {
-        notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
-        return MOD_CONT;
-    }
-
-    if (na->status & NS_VERBOTEN) {
-        notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
-        return MOD_CONT;
-    }
-
-    if (NSSecureAdmins && nick_is_services_admin(na->nc)
-        && !is_services_root(u)) {
-        notice_lang(s_NickServ, u, PERMISSION_DENIED);
-        return MOD_CONT;
-    }
-
-    if (na) {
-        na->nc->flags |= NI_SUSPENDED;
-        na->nc->flags |= NI_SECURE;
-        na->nc->flags &= ~(NI_KILLPROTECT | NI_KILL_QUICK | NI_KILL_IMMED);
-
-        for (i = 0; i < na->nc->aliases.count; i++) {
-            na2 = (NickAlias *)na->nc->aliases.list[i];
-            if (na2->nc == na->nc) {
-                na2->status &= ~(NS_IDENTIFIED | NS_RECOGNIZED);
-                na2->last_quit = sstrdup(reason);
-            }
-        }
-
-        if (WallForbid)
-            ircdproto->SendGlobops(s_NickServ, "\2%s\2 used SUSPEND on \2%s\2",
-                             u->nick, nick);
-
-        alog("%s: %s set SUSPEND for nick %s", s_NickServ, u->nick, nick);
-        notice_lang(s_NickServ, u, NICK_SUSPEND_SUCCEEDED, nick);
-        send_event(EVENT_NICK_SUSPENDED, 1, nick);
-
-    } else {
-
-        alog("%s: Valid SUSPEND for %s by %s failed", s_NickServ, nick,
-             u->nick);
-        notice_lang(s_NickServ, u, NICK_SUSPEND_FAILED, nick);
-
-    }
-    return MOD_CONT;
+	NickAlias *na, *na2;
+	char *nick = strtok(NULL, " ");
+	char *reason = strtok(NULL, "");
+	int i;
+
+	if (!nick || !reason) {
+		syntax_error(s_NickServ, u, "SUSPEND", NICK_SUSPEND_SYNTAX);
+		return MOD_CONT;
+	}
+
+	if (readonly) {
+		notice_lang(s_NickServ, u, READ_ONLY_MODE);
+		return MOD_CONT;
+	}
+
+	if ((na = findnick(nick)) == NULL) {
+		notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
+		return MOD_CONT;
+	}
+
+	if (na->status & NS_VERBOTEN) {
+		notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
+		return MOD_CONT;
+	}
+
+	if (NSSecureAdmins && nick_is_services_admin(na->nc)
+		&& !is_services_root(u)) {
+		notice_lang(s_NickServ, u, PERMISSION_DENIED);
+		return MOD_CONT;
+	}
+
+	if (na) {
+		na->nc->flags |= NI_SUSPENDED;
+		na->nc->flags |= NI_SECURE;
+		na->nc->flags &= ~(NI_KILLPROTECT | NI_KILL_QUICK | NI_KILL_IMMED);
+
+		for (i = 0; i < na->nc->aliases.count; i++) {
+			na2 = (NickAlias *)na->nc->aliases.list[i];
+			if (na2->nc == na->nc) {
+				na2->status &= ~(NS_IDENTIFIED | NS_RECOGNIZED);
+				na2->last_quit = sstrdup(reason);
+			}
+		}
+
+		if (WallForbid)
+			ircdproto->SendGlobops(s_NickServ, "\2%s\2 used SUSPEND on \2%s\2",
+							 u->nick, nick);
+
+		alog("%s: %s set SUSPEND for nick %s", s_NickServ, u->nick, nick);
+		notice_lang(s_NickServ, u, NICK_SUSPEND_SUCCEEDED, nick);
+		send_event(EVENT_NICK_SUSPENDED, 1, nick);
+
+	} else {
+
+		alog("%s: Valid SUSPEND for %s by %s failed", s_NickServ, nick,
+			 u->nick);
+		notice_lang(s_NickServ, u, NICK_SUSPEND_FAILED, nick);
+
+	}
+	return MOD_CONT;
 }
 
 /*************************************************************************/
 
 int do_unsuspend(User * u)
 {
-    NickAlias *na;
-    char *nick = strtok(NULL, " ");
-
-    if (!nick) {
-        syntax_error(s_NickServ, u, "UNSUSPEND", NICK_UNSUSPEND_SYNTAX);
-        return MOD_CONT;
-    }
-
-    if (readonly) {
-        notice_lang(s_NickServ, u, READ_ONLY_MODE);
-        return MOD_CONT;
-    }
-
-    if ((na = findnick(nick)) == NULL) {
-        notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
-        return MOD_CONT;
-    }
-
-    if (na->status & NS_VERBOTEN) {
-        notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
-        return MOD_CONT;
-    }
-    if (NSSecureAdmins && nick_is_services_admin(na->nc)
-        && !is_services_root(u)) {
-        notice_lang(s_NickServ, u, PERMISSION_DENIED);
-        return MOD_CONT;
-    }
-
-    if (na) {
-        na->nc->flags &= ~NI_SUSPENDED;
-
-        if (WallForbid)
-            ircdproto->SendGlobops(s_NickServ, "\2%s\2 used UNSUSPEND on \2%s\2",
-                             u->nick, nick);
-
-        alog("%s: %s set UNSUSPEND for nick %s", s_NickServ, u->nick,
-             nick);
-        notice_lang(s_NickServ, u, NICK_UNSUSPEND_SUCCEEDED, nick);
-        send_event(EVENT_NICK_UNSUSPEND, 1, nick);
-
-    } else {
-
-        alog("%s: Valid UNSUSPEND for %s by %s failed", s_NickServ, nick,
-             u->nick);
-        notice_lang(s_NickServ, u, NICK_UNSUSPEND_FAILED, nick);
-
-    }
-
-    return MOD_CONT;
+	NickAlias *na;
+	char *nick = strtok(NULL, " ");
+
+	if (!nick) {
+		syntax_error(s_NickServ, u, "UNSUSPEND", NICK_UNSUSPEND_SYNTAX);
+		return MOD_CONT;
+	}
+
+	if (readonly) {
+		notice_lang(s_NickServ, u, READ_ONLY_MODE);
+		return MOD_CONT;
+	}
+
+	if ((na = findnick(nick)) == NULL) {
+		notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
+		return MOD_CONT;
+	}
+
+	if (na->status & NS_VERBOTEN) {
+		notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
+		return MOD_CONT;
+	}
+	if (NSSecureAdmins && nick_is_services_admin(na->nc)
+		&& !is_services_root(u)) {
+		notice_lang(s_NickServ, u, PERMISSION_DENIED);
+		return MOD_CONT;
+	}
+
+	if (na) {
+		na->nc->flags &= ~NI_SUSPENDED;
+
+		if (WallForbid)
+			ircdproto->SendGlobops(s_NickServ, "\2%s\2 used UNSUSPEND on \2%s\2",
+							 u->nick, nick);
+
+		alog("%s: %s set UNSUSPEND for nick %s", s_NickServ, u->nick,
+			 nick);
+		notice_lang(s_NickServ, u, NICK_UNSUSPEND_SUCCEEDED, nick);
+		send_event(EVENT_NICK_UNSUSPEND, 1, nick);
+
+	} else {
+
+		alog("%s: Valid UNSUSPEND for %s by %s failed", s_NickServ, nick,
+			 u->nick);
+		notice_lang(s_NickServ, u, NICK_UNSUSPEND_FAILED, nick);
+
+	}
+
+	return MOD_CONT;
 
 }
 
diff --git a/src/core/ns_update.c b/src/core/ns_update.c
index 851339943..76794a86d 100644
--- a/src/core/ns_update.c
+++ b/src/core/ns_update.c
@@ -44,7 +44,7 @@ class NSUpdate : public Module
  **/
 void myNickServHelp(User * u)
 {
-    notice_lang(s_NickServ, u, NICK_HELP_CMD_UPDATE);
+	notice_lang(s_NickServ, u, NICK_HELP_CMD_UPDATE);
 }
 
 /**
@@ -54,26 +54,26 @@ void myNickServHelp(User * u)
  **/
 int do_nickupdate(User * u)
 {
-    NickAlias *na;
+	NickAlias *na;
 
-    if (!nick_identified(u)) {
-        notice_lang(s_NickServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
-    } else {
-        na = u->na;
-        if (NSModeOnID)
-            do_setmodes(u);
-        check_memos(u);
-        if (na->last_realname)
-            free(na->last_realname);
-        na->last_realname = sstrdup(u->realname);
-        na->status |= NS_IDENTIFIED;
-        na->last_seen = time(NULL);
-        if (ircd->vhost) {
-            do_on_id(u);
-        }
-        notice_lang(s_NickServ, u, NICK_UPDATE_SUCCESS, s_NickServ);
-    }
-    return MOD_CONT;
+	if (!nick_identified(u)) {
+		notice_lang(s_NickServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
+	} else {
+		na = u->na;
+		if (NSModeOnID)
+			do_setmodes(u);
+		check_memos(u);
+		if (na->last_realname)
+			free(na->last_realname);
+		na->last_realname = sstrdup(u->realname);
+		na->status |= NS_IDENTIFIED;
+		na->last_seen = time(NULL);
+		if (ircd->vhost) {
+			do_on_id(u);
+		}
+		notice_lang(s_NickServ, u, NICK_UPDATE_SUCCESS, s_NickServ);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("ns_update", NSUpdate)
diff --git a/src/core/os_admin.c b/src/core/os_admin.c
index d394b526c..d7e8c3c75 100644
--- a/src/core/os_admin.c
+++ b/src/core/os_admin.c
@@ -17,7 +17,7 @@
 
 int do_admin(User * u);
 int admin_list_callback(SList * slist, int number, void *item,
-                        va_list args);
+						va_list args);
 int admin_list(int number, NickCore * nc, User * u, int *sent_header);
 void myOperServHelp(User * u);
 
@@ -49,7 +49,7 @@ class OSAdmin : public Module
  **/
 void myOperServHelp(User * u)
 {
-    notice_lang(s_OperServ, u, OPER_HELP_CMD_ADMIN);
+	notice_lang(s_OperServ, u, OPER_HELP_CMD_ADMIN);
 }
 
 /**
@@ -59,176 +59,176 @@ void myOperServHelp(User * u)
  **/
 int do_admin(User * u)
 {
-    char *cmd = strtok(NULL, " ");
-    char *nick = strtok(NULL, " ");
-    NickAlias *na;
-    int res = 0;
-
-    if (!cmd || (!nick && stricmp(cmd, "LIST") && stricmp(cmd, "CLEAR"))) {
-        syntax_error(s_OperServ, u, "ADMIN", OPER_ADMIN_SYNTAX);
-    } else if (!stricmp(cmd, "ADD")) {
-        if (!is_services_root(u)) {
-            notice_lang(s_OperServ, u, PERMISSION_DENIED);
-            return MOD_CONT;
-        }
-
-        if (!(na = findnick(nick))) {
-            notice_lang(s_OperServ, u, NICK_X_NOT_REGISTERED, nick);
-            return MOD_CONT;
-        }
-
-        if (na->status & NS_VERBOTEN) {
-            notice_lang(s_OperServ, u, NICK_X_FORBIDDEN, nick);
-            return MOD_CONT;
-        }
-
-        if (na->nc->flags & NI_SERVICES_ADMIN
-            || slist_indexof(&servadmins, na->nc) != -1) {
-            notice_lang(s_OperServ, u, OPER_ADMIN_EXISTS, nick);
-            return MOD_CONT;
-        }
-
-        res = slist_add(&servadmins, na->nc);
-        if (res == -2) {
-            notice_lang(s_OperServ, u, OPER_ADMIN_REACHED_LIMIT, nick);
-            return MOD_CONT;
-        } else {
-            if (na->nc->flags & NI_SERVICES_OPER
-                && (res = slist_indexof(&servopers, na->nc)) != -1) {
-                slist_delete(&servopers, res);
-                na->nc->flags |= NI_SERVICES_ADMIN;
-                notice_lang(s_OperServ, u, OPER_ADMIN_MOVED, nick);
-            } else {
-                na->nc->flags |= NI_SERVICES_ADMIN;
-                notice_lang(s_OperServ, u, OPER_ADMIN_ADDED, nick);
-            }
-        }
-
-        if (readonly)
-            notice_lang(s_OperServ, u, READ_ONLY_MODE);
-    } else if (!stricmp(cmd, "DEL")) {
-        if (!is_services_root(u)) {
-            notice_lang(s_OperServ, u, PERMISSION_DENIED);
-            return MOD_CONT;
-        }
-
-        if (servadmins.count == 0) {
-            notice_lang(s_OperServ, u, OPER_ADMIN_LIST_EMPTY);
-            return MOD_CONT;
-        }
-
-        if (isdigit(*nick) && strspn(nick, "1234567890,-") == strlen(nick)) {
-            /* Deleting a range */
-            res = slist_delete_range(&servadmins, nick, NULL);
-            if (res == 0) {
-                notice_lang(s_OperServ, u, OPER_ADMIN_NO_MATCH);
-                return MOD_CONT;
-            } else if (res == 1) {
-                notice_lang(s_OperServ, u, OPER_ADMIN_DELETED_ONE);
-            } else {
-                notice_lang(s_OperServ, u, OPER_ADMIN_DELETED_SEVERAL,
-                            res);
-            }
-        } else {
-            if (!(na = findnick(nick))) {
-                notice_lang(s_OperServ, u, NICK_X_NOT_REGISTERED, nick);
-                return MOD_CONT;
-            }
-
-            if (na->status & NS_VERBOTEN) {
-                notice_lang(s_OperServ, u, NICK_X_FORBIDDEN, nick);
-                return MOD_CONT;
-            }
-
-            if (!(na->nc->flags & NI_SERVICES_ADMIN)
-                || (res = slist_indexof(&servadmins, na->nc)) == -1) {
-                notice_lang(s_OperServ, u, OPER_ADMIN_NOT_FOUND, nick);
-                return MOD_CONT;
-            }
-
-            slist_delete(&servadmins, res);
-            notice_lang(s_OperServ, u, OPER_ADMIN_DELETED, nick);
-        }
-
-        if (readonly)
-            notice_lang(s_OperServ, u, READ_ONLY_MODE);
-    } else if (!stricmp(cmd, "LIST")) {
-        int sent_header = 0;
+	char *cmd = strtok(NULL, " ");
+	char *nick = strtok(NULL, " ");
+	NickAlias *na;
+	int res = 0;
+
+	if (!cmd || (!nick && stricmp(cmd, "LIST") && stricmp(cmd, "CLEAR"))) {
+		syntax_error(s_OperServ, u, "ADMIN", OPER_ADMIN_SYNTAX);
+	} else if (!stricmp(cmd, "ADD")) {
+		if (!is_services_root(u)) {
+			notice_lang(s_OperServ, u, PERMISSION_DENIED);
+			return MOD_CONT;
+		}
+
+		if (!(na = findnick(nick))) {
+			notice_lang(s_OperServ, u, NICK_X_NOT_REGISTERED, nick);
+			return MOD_CONT;
+		}
+
+		if (na->status & NS_VERBOTEN) {
+			notice_lang(s_OperServ, u, NICK_X_FORBIDDEN, nick);
+			return MOD_CONT;
+		}
+
+		if (na->nc->flags & NI_SERVICES_ADMIN
+			|| slist_indexof(&servadmins, na->nc) != -1) {
+			notice_lang(s_OperServ, u, OPER_ADMIN_EXISTS, nick);
+			return MOD_CONT;
+		}
+
+		res = slist_add(&servadmins, na->nc);
+		if (res == -2) {
+			notice_lang(s_OperServ, u, OPER_ADMIN_REACHED_LIMIT, nick);
+			return MOD_CONT;
+		} else {
+			if (na->nc->flags & NI_SERVICES_OPER
+				&& (res = slist_indexof(&servopers, na->nc)) != -1) {
+				slist_delete(&servopers, res);
+				na->nc->flags |= NI_SERVICES_ADMIN;
+				notice_lang(s_OperServ, u, OPER_ADMIN_MOVED, nick);
+			} else {
+				na->nc->flags |= NI_SERVICES_ADMIN;
+				notice_lang(s_OperServ, u, OPER_ADMIN_ADDED, nick);
+			}
+		}
+
+		if (readonly)
+			notice_lang(s_OperServ, u, READ_ONLY_MODE);
+	} else if (!stricmp(cmd, "DEL")) {
+		if (!is_services_root(u)) {
+			notice_lang(s_OperServ, u, PERMISSION_DENIED);
+			return MOD_CONT;
+		}
+
+		if (servadmins.count == 0) {
+			notice_lang(s_OperServ, u, OPER_ADMIN_LIST_EMPTY);
+			return MOD_CONT;
+		}
+
+		if (isdigit(*nick) && strspn(nick, "1234567890,-") == strlen(nick)) {
+			/* Deleting a range */
+			res = slist_delete_range(&servadmins, nick, NULL);
+			if (res == 0) {
+				notice_lang(s_OperServ, u, OPER_ADMIN_NO_MATCH);
+				return MOD_CONT;
+			} else if (res == 1) {
+				notice_lang(s_OperServ, u, OPER_ADMIN_DELETED_ONE);
+			} else {
+				notice_lang(s_OperServ, u, OPER_ADMIN_DELETED_SEVERAL,
+							res);
+			}
+		} else {
+			if (!(na = findnick(nick))) {
+				notice_lang(s_OperServ, u, NICK_X_NOT_REGISTERED, nick);
+				return MOD_CONT;
+			}
+
+			if (na->status & NS_VERBOTEN) {
+				notice_lang(s_OperServ, u, NICK_X_FORBIDDEN, nick);
+				return MOD_CONT;
+			}
+
+			if (!(na->nc->flags & NI_SERVICES_ADMIN)
+				|| (res = slist_indexof(&servadmins, na->nc)) == -1) {
+				notice_lang(s_OperServ, u, OPER_ADMIN_NOT_FOUND, nick);
+				return MOD_CONT;
+			}
+
+			slist_delete(&servadmins, res);
+			notice_lang(s_OperServ, u, OPER_ADMIN_DELETED, nick);
+		}
+
+		if (readonly)
+			notice_lang(s_OperServ, u, READ_ONLY_MODE);
+	} else if (!stricmp(cmd, "LIST")) {
+		int sent_header = 0;
 		
-        if (servadmins.count == 0) {
-            notice_lang(s_OperServ, u, OPER_ADMIN_LIST_EMPTY);
-            return MOD_CONT;
-        }
-
-        if (!nick || (isdigit(*nick)
-                      && strspn(nick, "1234567890,-") == strlen(nick))) {
-            res =
-                slist_enum(&servadmins, nick, &admin_list_callback, u,
-                           &sent_header);
-            if (res == 0) {
-                notice_lang(s_OperServ, u, OPER_ADMIN_NO_MATCH);
-                return MOD_CONT;
-            } else {
-                notice_lang(s_OperServ, u, END_OF_ANY_LIST, "Admin");
-            }
-        } else {
-            int i;
-
-            for (i = 0; i < servadmins.count; i++)
-                if (!stricmp
-                    (nick, ((NickCore *) servadmins.list[i])->display)
-                    || match_wild_nocase(nick,
-                                         ((NickCore *) servadmins.
-                                          list[i])->display))
-                    admin_list(i + 1, (NickCore *)servadmins.list[i], u, &sent_header);
-
-            if (!sent_header)
-                notice_lang(s_OperServ, u, OPER_ADMIN_NO_MATCH);
-            else {
-                notice_lang(s_OperServ, u, END_OF_ANY_LIST, "Admin");
-            }
-        }
-    } else if (!stricmp(cmd, "CLEAR")) {
-        if (!is_services_root(u)) {
-            notice_lang(s_OperServ, u, PERMISSION_DENIED);
-            return MOD_CONT;
-        }
-
-        if (servadmins.count == 0) {
-            notice_lang(s_OperServ, u, OPER_ADMIN_LIST_EMPTY);
-            return MOD_CONT;
-        }
-
-        slist_clear(&servadmins, 1);
-        notice_lang(s_OperServ, u, OPER_ADMIN_CLEAR);
-    } else {
-        syntax_error(s_OperServ, u, "ADMIN", OPER_ADMIN_SYNTAX);
-    }
-    return MOD_CONT;
+		if (servadmins.count == 0) {
+			notice_lang(s_OperServ, u, OPER_ADMIN_LIST_EMPTY);
+			return MOD_CONT;
+		}
+
+		if (!nick || (isdigit(*nick)
+					  && strspn(nick, "1234567890,-") == strlen(nick))) {
+			res =
+				slist_enum(&servadmins, nick, &admin_list_callback, u,
+						   &sent_header);
+			if (res == 0) {
+				notice_lang(s_OperServ, u, OPER_ADMIN_NO_MATCH);
+				return MOD_CONT;
+			} else {
+				notice_lang(s_OperServ, u, END_OF_ANY_LIST, "Admin");
+			}
+		} else {
+			int i;
+
+			for (i = 0; i < servadmins.count; i++)
+				if (!stricmp
+					(nick, ((NickCore *) servadmins.list[i])->display)
+					|| match_wild_nocase(nick,
+										 ((NickCore *) servadmins.
+										  list[i])->display))
+					admin_list(i + 1, (NickCore *)servadmins.list[i], u, &sent_header);
+
+			if (!sent_header)
+				notice_lang(s_OperServ, u, OPER_ADMIN_NO_MATCH);
+			else {
+				notice_lang(s_OperServ, u, END_OF_ANY_LIST, "Admin");
+			}
+		}
+	} else if (!stricmp(cmd, "CLEAR")) {
+		if (!is_services_root(u)) {
+			notice_lang(s_OperServ, u, PERMISSION_DENIED);
+			return MOD_CONT;
+		}
+
+		if (servadmins.count == 0) {
+			notice_lang(s_OperServ, u, OPER_ADMIN_LIST_EMPTY);
+			return MOD_CONT;
+		}
+
+		slist_clear(&servadmins, 1);
+		notice_lang(s_OperServ, u, OPER_ADMIN_CLEAR);
+	} else {
+		syntax_error(s_OperServ, u, "ADMIN", OPER_ADMIN_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 int admin_list_callback(SList * slist, int number, void *item,
-                        va_list args)
+						va_list args)
 {
-    User *u = va_arg(args, User *);
-    int *sent_header = va_arg(args, int *);
+	User *u = va_arg(args, User *);
+	int *sent_header = va_arg(args, int *);
 
-    return admin_list(number, (NickCore *)item, u, sent_header);
+	return admin_list(number, (NickCore *)item, u, sent_header);
 }
 
 int admin_list(int number, NickCore * nc, User * u, int *sent_header)
 {
-    if (!nc)
-        return 0;
+	if (!nc)
+		return 0;
 
-    if (!*sent_header) {
-        notice_lang(s_OperServ, u, OPER_ADMIN_LIST_HEADER);
-        *sent_header = 1;
-    }
+	if (!*sent_header) {
+		notice_lang(s_OperServ, u, OPER_ADMIN_LIST_HEADER);
+		*sent_header = 1;
+	}
 
-    notice_lang(s_OperServ, u, OPER_ADMIN_LIST_FORMAT, number,
-                nc->display);
-    return 1;
+	notice_lang(s_OperServ, u, OPER_ADMIN_LIST_FORMAT, number,
+				nc->display);
+	return 1;
 }
 
 MODULE_INIT("os_admin", OSAdmin)
diff --git a/src/core/os_akill.c b/src/core/os_akill.c
index 3762ca286..c67433013 100644
--- a/src/core/os_akill.c
+++ b/src/core/os_akill.c
@@ -17,10 +17,10 @@
 
 int do_akill(User * u);
 int akill_view_callback(SList * slist, int number, void *item,
-                        va_list args);
+						va_list args);
 int akill_view(int number, Akill * ak, User * u, int *sent_header);
 int akill_list_callback(SList * slist, int number, void *item,
-                        va_list args);
+						va_list args);
 int akill_list(int number, Akill * ak, User * u, int *sent_header);
 void myOperServHelp(User * u);
 
@@ -49,9 +49,9 @@ class OSAKill : public Module
  **/
 void myOperServHelp(User * u)
 {
-    if (is_services_oper(u)) {
-        notice_lang(s_OperServ, u, OPER_HELP_CMD_AKILL);
-    }
+	if (is_services_oper(u)) {
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_AKILL);
+	}
 }
 
 /**
@@ -63,8 +63,8 @@ void myOperServHelp(User * u)
 
 int do_akill(User * u)
 {
-    char *cmd = strtok(NULL, " ");
-    char breason[BUFSIZE];
+	char *cmd = strtok(NULL, " ");
+	char breason[BUFSIZE];
 
 	if (!cmd)
 	{
@@ -72,306 +72,306 @@ int do_akill(User * u)
 		return MOD_CONT;
 	}
 
-    if (!stricmp(cmd, "ADD")) {
-        int deleted = 0;
-        char *expiry, *mask, *reason;
-        time_t expires;
-
-        mask = strtok(NULL, " ");
-        if (mask && *mask == '+') {
-            expiry = mask;
-            mask = strtok(NULL, " ");
-        } else {
-            expiry = NULL;
-        }
-
-        expires = expiry ? dotime(expiry) : AutokillExpiry;
-        /* If the expiry given does not contain a final letter, it's in days,
-         * said the doc. Ah well.
-         */
-        if (expiry && isdigit(expiry[strlen(expiry) - 1]))
-            expires *= 86400;
-        /* Do not allow less than a minute expiry time */
-        if (expires != 0 && expires < 60) {
-            notice_lang(s_OperServ, u, BAD_EXPIRY_TIME);
-            return MOD_CONT;
-        } else if (expires > 0) {
-            expires += time(NULL);
-        }
-
-        if (mask && (reason = strtok(NULL, ""))) {
-            /* We first do some sanity check on the proposed mask. */
-            if (strchr(mask, '!')) {
-                notice_lang(s_OperServ, u, OPER_AKILL_NO_NICK);
-                return MOD_CONT;
-            }
-
-            if (!strchr(mask, '@')) {
-                notice_lang(s_OperServ, u, BAD_USERHOST_MASK);
-                return MOD_CONT;
-            }
-
-            if (mask && strspn(mask, "~@.*?") == strlen(mask)) {
-                notice_lang(s_OperServ, u, USERHOST_MASK_TOO_WIDE, mask);
-                return MOD_CONT;
-            }
-
-            /**
-             * Changed sprintf() to snprintf()and increased the size of
-             * breason to match bufsize
-             * -Rob
-             **/
-            if (AddAkiller) {
-                snprintf(breason, sizeof(breason), "[%s] %s", u->nick,
-                         reason);
-                reason = sstrdup(breason);
-            }
-
-            deleted = add_akill(u, mask, u->nick, expires, reason);
-            if (deleted < 0) {
-                if (AddAkiller) {
-                    free(reason);
-                }
-                return MOD_CONT;
-            } else if (deleted) {
-                notice_lang(s_OperServ, u, OPER_AKILL_DELETED_SEVERAL,
-                            deleted);
-            }
-            notice_lang(s_OperServ, u, OPER_AKILL_ADDED, mask);
-
-            if (WallOSAkill) {
-                char buf[128];
-
-                if (!expires) {
-                    strcpy(buf, "does not expire");
-                } else {
-                    int wall_expiry = expires - time(NULL);
-                    char *s = NULL;
-
-                    if (wall_expiry >= 86400) {
-                        wall_expiry /= 86400;
-                        s = "day";
-                    } else if (wall_expiry >= 3600) {
-                        wall_expiry /= 3600;
-                        s = "hour";
-                    } else if (wall_expiry >= 60) {
-                        wall_expiry /= 60;
-                        s = "minute";
-                    }
-
-                    snprintf(buf, sizeof(buf), "expires in %d %s%s",
-                             wall_expiry, s,
-                             (wall_expiry == 1) ? "" : "s");
-                }
-
-                ircdproto->SendGlobops(s_OperServ,
-                                 "%s added an AKILL for %s (%s) (%s)",
-                                 u->nick, mask, reason, buf);
-            }
-
-            if (readonly) {
-                notice_lang(s_OperServ, u, READ_ONLY_MODE);
-            }
-            if (AddAkiller) {
-                free(reason);
-            }
-        } else {
-            syntax_error(s_OperServ, u, "AKILL", OPER_AKILL_SYNTAX);
-        }
-
-    } else if (!stricmp(cmd, "DEL")) {
-
-        char *mask;
-        int res = 0;
-
-        mask = strtok(NULL, " ");
-
-        if (!mask) {
-            syntax_error(s_OperServ, u, "AKILL", OPER_AKILL_SYNTAX);
-            return MOD_CONT;
-        }
-
-        if (akills.count == 0) {
-            notice_lang(s_OperServ, u, OPER_AKILL_LIST_EMPTY);
-            return MOD_CONT;
-        }
-
-        if (isdigit(*mask) && strspn(mask, "1234567890,-") == strlen(mask)) {
-            /* Deleting a range */
-            res = slist_delete_range(&akills, mask, NULL);
-            if (res == 0) {
-                notice_lang(s_OperServ, u, OPER_AKILL_NO_MATCH);
-                return MOD_CONT;
-            } else if (res == 1) {
-                notice_lang(s_OperServ, u, OPER_AKILL_DELETED_ONE);
-            } else {
-                notice_lang(s_OperServ, u, OPER_AKILL_DELETED_SEVERAL,
-                            res);
-            }
-        } else {
-            if ((res = slist_indexof(&akills, mask)) == -1) {
-                notice_lang(s_OperServ, u, OPER_AKILL_NOT_FOUND, mask);
-                return MOD_CONT;
-            }
-
-            slist_delete(&akills, res);
-            notice_lang(s_OperServ, u, OPER_AKILL_DELETED, mask);
-        }
-
-        if (readonly)
-            notice_lang(s_OperServ, u, READ_ONLY_MODE);
-
-    } else if (!stricmp(cmd, "LIST")) {
-        char *mask;
-        int res, sent_header = 0;
-
-        if (akills.count == 0) {
-            notice_lang(s_OperServ, u, OPER_AKILL_LIST_EMPTY);
-            return MOD_CONT;
-        }
-
-        mask = strtok(NULL, " ");
-
-        if (!mask || (isdigit(*mask)
-                      && strspn(mask, "1234567890,-") == strlen(mask))) {
-            res =
-                slist_enum(&akills, mask, &akill_list_callback, u,
-                           &sent_header);
-            if (res == 0) {
-                notice_lang(s_OperServ, u, OPER_AKILL_NO_MATCH);
-                return MOD_CONT;
-            } else {
-                notice_lang(s_OperServ, u, END_OF_ANY_LIST, "Akill");
-            }
-        } else {
-            int i;
-            char amask[BUFSIZE];
-
-            for (i = 0; i < akills.count; i++) {
-                snprintf(amask, sizeof(amask), "%s@%s",
-                         ((Akill *) akills.list[i])->user,
-                         ((Akill *) akills.list[i])->host);
-                if (!stricmp(mask, amask)
-                    || match_wild_nocase(mask, amask))
-                    akill_list(i + 1, (Akill *)akills.list[i], u, &sent_header);
-            }
-
-            if (!sent_header)
-                notice_lang(s_OperServ, u, OPER_AKILL_NO_MATCH);
-            else {
-                notice_lang(s_OperServ, u, END_OF_ANY_LIST, "Akill");
-            }
-        }
-    } else if (!stricmp(cmd, "VIEW")) {
-        char *mask;
-        int res, sent_header = 0;
-
-        if (akills.count == 0) {
-            notice_lang(s_OperServ, u, OPER_AKILL_LIST_EMPTY);
-            return MOD_CONT;
-        }
-
-        mask = strtok(NULL, " ");
-
-        if (!mask || (isdigit(*mask)
-                      && strspn(mask, "1234567890,-") == strlen(mask))) {
-            res =
-                slist_enum(&akills, mask, &akill_view_callback, u,
-                           &sent_header);
-            if (res == 0) {
-                notice_lang(s_OperServ, u, OPER_AKILL_NO_MATCH);
-                return MOD_CONT;
-            }
-        } else {
-            int i;
-            char amask[BUFSIZE];
-
-            for (i = 0; i < akills.count; i++) {
-                snprintf(amask, sizeof(amask), "%s@%s",
-                         ((Akill *) akills.list[i])->user,
-                         ((Akill *) akills.list[i])->host);
-                if (!stricmp(mask, amask)
-                    || match_wild_nocase(mask, amask))
-                    akill_view(i + 1, (Akill *)akills.list[i], u, &sent_header);
-            }
-
-            if (!sent_header)
-                notice_lang(s_OperServ, u, OPER_AKILL_NO_MATCH);
-        }
-    } else if (!stricmp(cmd, "CLEAR")) {
-        slist_clear(&akills, 1);
-        notice_lang(s_OperServ, u, OPER_AKILL_CLEAR);
-    } else {
-        syntax_error(s_OperServ, u, "AKILL", OPER_AKILL_SYNTAX);
-    }
-    return MOD_CONT;
+	if (!stricmp(cmd, "ADD")) {
+		int deleted = 0;
+		char *expiry, *mask, *reason;
+		time_t expires;
+
+		mask = strtok(NULL, " ");
+		if (mask && *mask == '+') {
+			expiry = mask;
+			mask = strtok(NULL, " ");
+		} else {
+			expiry = NULL;
+		}
+
+		expires = expiry ? dotime(expiry) : AutokillExpiry;
+		/* If the expiry given does not contain a final letter, it's in days,
+		 * said the doc. Ah well.
+		 */
+		if (expiry && isdigit(expiry[strlen(expiry) - 1]))
+			expires *= 86400;
+		/* Do not allow less than a minute expiry time */
+		if (expires != 0 && expires < 60) {
+			notice_lang(s_OperServ, u, BAD_EXPIRY_TIME);
+			return MOD_CONT;
+		} else if (expires > 0) {
+			expires += time(NULL);
+		}
+
+		if (mask && (reason = strtok(NULL, ""))) {
+			/* We first do some sanity check on the proposed mask. */
+			if (strchr(mask, '!')) {
+				notice_lang(s_OperServ, u, OPER_AKILL_NO_NICK);
+				return MOD_CONT;
+			}
+
+			if (!strchr(mask, '@')) {
+				notice_lang(s_OperServ, u, BAD_USERHOST_MASK);
+				return MOD_CONT;
+			}
+
+			if (mask && strspn(mask, "~@.*?") == strlen(mask)) {
+				notice_lang(s_OperServ, u, USERHOST_MASK_TOO_WIDE, mask);
+				return MOD_CONT;
+			}
+
+			/**
+			 * Changed sprintf() to snprintf()and increased the size of
+			 * breason to match bufsize
+			 * -Rob
+			 **/
+			if (AddAkiller) {
+				snprintf(breason, sizeof(breason), "[%s] %s", u->nick,
+						 reason);
+				reason = sstrdup(breason);
+			}
+
+			deleted = add_akill(u, mask, u->nick, expires, reason);
+			if (deleted < 0) {
+				if (AddAkiller) {
+					free(reason);
+				}
+				return MOD_CONT;
+			} else if (deleted) {
+				notice_lang(s_OperServ, u, OPER_AKILL_DELETED_SEVERAL,
+							deleted);
+			}
+			notice_lang(s_OperServ, u, OPER_AKILL_ADDED, mask);
+
+			if (WallOSAkill) {
+				char buf[128];
+
+				if (!expires) {
+					strcpy(buf, "does not expire");
+				} else {
+					int wall_expiry = expires - time(NULL);
+					char *s = NULL;
+
+					if (wall_expiry >= 86400) {
+						wall_expiry /= 86400;
+						s = "day";
+					} else if (wall_expiry >= 3600) {
+						wall_expiry /= 3600;
+						s = "hour";
+					} else if (wall_expiry >= 60) {
+						wall_expiry /= 60;
+						s = "minute";
+					}
+
+					snprintf(buf, sizeof(buf), "expires in %d %s%s",
+							 wall_expiry, s,
+							 (wall_expiry == 1) ? "" : "s");
+				}
+
+				ircdproto->SendGlobops(s_OperServ,
+								 "%s added an AKILL for %s (%s) (%s)",
+								 u->nick, mask, reason, buf);
+			}
+
+			if (readonly) {
+				notice_lang(s_OperServ, u, READ_ONLY_MODE);
+			}
+			if (AddAkiller) {
+				free(reason);
+			}
+		} else {
+			syntax_error(s_OperServ, u, "AKILL", OPER_AKILL_SYNTAX);
+		}
+
+	} else if (!stricmp(cmd, "DEL")) {
+
+		char *mask;
+		int res = 0;
+
+		mask = strtok(NULL, " ");
+
+		if (!mask) {
+			syntax_error(s_OperServ, u, "AKILL", OPER_AKILL_SYNTAX);
+			return MOD_CONT;
+		}
+
+		if (akills.count == 0) {
+			notice_lang(s_OperServ, u, OPER_AKILL_LIST_EMPTY);
+			return MOD_CONT;
+		}
+
+		if (isdigit(*mask) && strspn(mask, "1234567890,-") == strlen(mask)) {
+			/* Deleting a range */
+			res = slist_delete_range(&akills, mask, NULL);
+			if (res == 0) {
+				notice_lang(s_OperServ, u, OPER_AKILL_NO_MATCH);
+				return MOD_CONT;
+			} else if (res == 1) {
+				notice_lang(s_OperServ, u, OPER_AKILL_DELETED_ONE);
+			} else {
+				notice_lang(s_OperServ, u, OPER_AKILL_DELETED_SEVERAL,
+							res);
+			}
+		} else {
+			if ((res = slist_indexof(&akills, mask)) == -1) {
+				notice_lang(s_OperServ, u, OPER_AKILL_NOT_FOUND, mask);
+				return MOD_CONT;
+			}
+
+			slist_delete(&akills, res);
+			notice_lang(s_OperServ, u, OPER_AKILL_DELETED, mask);
+		}
+
+		if (readonly)
+			notice_lang(s_OperServ, u, READ_ONLY_MODE);
+
+	} else if (!stricmp(cmd, "LIST")) {
+		char *mask;
+		int res, sent_header = 0;
+
+		if (akills.count == 0) {
+			notice_lang(s_OperServ, u, OPER_AKILL_LIST_EMPTY);
+			return MOD_CONT;
+		}
+
+		mask = strtok(NULL, " ");
+
+		if (!mask || (isdigit(*mask)
+					  && strspn(mask, "1234567890,-") == strlen(mask))) {
+			res =
+				slist_enum(&akills, mask, &akill_list_callback, u,
+						   &sent_header);
+			if (res == 0) {
+				notice_lang(s_OperServ, u, OPER_AKILL_NO_MATCH);
+				return MOD_CONT;
+			} else {
+				notice_lang(s_OperServ, u, END_OF_ANY_LIST, "Akill");
+			}
+		} else {
+			int i;
+			char amask[BUFSIZE];
+
+			for (i = 0; i < akills.count; i++) {
+				snprintf(amask, sizeof(amask), "%s@%s",
+						 ((Akill *) akills.list[i])->user,
+						 ((Akill *) akills.list[i])->host);
+				if (!stricmp(mask, amask)
+					|| match_wild_nocase(mask, amask))
+					akill_list(i + 1, (Akill *)akills.list[i], u, &sent_header);
+			}
+
+			if (!sent_header)
+				notice_lang(s_OperServ, u, OPER_AKILL_NO_MATCH);
+			else {
+				notice_lang(s_OperServ, u, END_OF_ANY_LIST, "Akill");
+			}
+		}
+	} else if (!stricmp(cmd, "VIEW")) {
+		char *mask;
+		int res, sent_header = 0;
+
+		if (akills.count == 0) {
+			notice_lang(s_OperServ, u, OPER_AKILL_LIST_EMPTY);
+			return MOD_CONT;
+		}
+
+		mask = strtok(NULL, " ");
+
+		if (!mask || (isdigit(*mask)
+					  && strspn(mask, "1234567890,-") == strlen(mask))) {
+			res =
+				slist_enum(&akills, mask, &akill_view_callback, u,
+						   &sent_header);
+			if (res == 0) {
+				notice_lang(s_OperServ, u, OPER_AKILL_NO_MATCH);
+				return MOD_CONT;
+			}
+		} else {
+			int i;
+			char amask[BUFSIZE];
+
+			for (i = 0; i < akills.count; i++) {
+				snprintf(amask, sizeof(amask), "%s@%s",
+						 ((Akill *) akills.list[i])->user,
+						 ((Akill *) akills.list[i])->host);
+				if (!stricmp(mask, amask)
+					|| match_wild_nocase(mask, amask))
+					akill_view(i + 1, (Akill *)akills.list[i], u, &sent_header);
+			}
+
+			if (!sent_header)
+				notice_lang(s_OperServ, u, OPER_AKILL_NO_MATCH);
+		}
+	} else if (!stricmp(cmd, "CLEAR")) {
+		slist_clear(&akills, 1);
+		notice_lang(s_OperServ, u, OPER_AKILL_CLEAR);
+	} else {
+		syntax_error(s_OperServ, u, "AKILL", OPER_AKILL_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 int akill_view(int number, Akill * ak, User * u, int *sent_header)
 {
-    char mask[BUFSIZE];
-    char timebuf[32], expirebuf[256];
-    struct tm tm;
-
-    if (!ak)
-        return 0;
-
-    if (!*sent_header) {
-        notice_lang(s_OperServ, u, OPER_AKILL_VIEW_HEADER);
-        *sent_header = 1;
-    }
-
-    snprintf(mask, sizeof(mask), "%s@%s", ak->user, ak->host);
-    tm = *localtime(&ak->seton);
-    strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_SHORT_DATE_FORMAT,
-                  &tm);
-    expire_left(u->na, expirebuf, sizeof(expirebuf), ak->expires);
-    notice_lang(s_OperServ, u, OPER_AKILL_VIEW_FORMAT, number, mask,
-                ak->by, timebuf, expirebuf, ak->reason);
-
-    return 1;
+	char mask[BUFSIZE];
+	char timebuf[32], expirebuf[256];
+	struct tm tm;
+
+	if (!ak)
+		return 0;
+
+	if (!*sent_header) {
+		notice_lang(s_OperServ, u, OPER_AKILL_VIEW_HEADER);
+		*sent_header = 1;
+	}
+
+	snprintf(mask, sizeof(mask), "%s@%s", ak->user, ak->host);
+	tm = *localtime(&ak->seton);
+	strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_SHORT_DATE_FORMAT,
+				  &tm);
+	expire_left(u->na, expirebuf, sizeof(expirebuf), ak->expires);
+	notice_lang(s_OperServ, u, OPER_AKILL_VIEW_FORMAT, number, mask,
+				ak->by, timebuf, expirebuf, ak->reason);
+
+	return 1;
 }
 
 /* Lists an AKILL entry, prefixing it with the header if needed */
 
 int akill_list_callback(SList * slist, int number, void *item,
-                        va_list args)
+						va_list args)
 {
-    User *u = va_arg(args, User *);
-    int *sent_header = va_arg(args, int *);
+	User *u = va_arg(args, User *);
+	int *sent_header = va_arg(args, int *);
 
-    return akill_list(number, (Akill *)item, u, sent_header);
+	return akill_list(number, (Akill *)item, u, sent_header);
 }
 
 /* Callback for enumeration purposes */
 
 int akill_view_callback(SList * slist, int number, void *item,
-                        va_list args)
+						va_list args)
 {
-    User *u = va_arg(args, User *);
-    int *sent_header = va_arg(args, int *);
+	User *u = va_arg(args, User *);
+	int *sent_header = va_arg(args, int *);
 
-    return akill_view(number, (Akill *)item, u, sent_header);
+	return akill_view(number, (Akill *)item, u, sent_header);
 }
 
 /* Lists an AKILL entry, prefixing it with the header if needed */
 int akill_list(int number, Akill * ak, User * u, int *sent_header)
 {
-    char mask[BUFSIZE];
+	char mask[BUFSIZE];
 
-    if (!ak)
-        return 0;
+	if (!ak)
+		return 0;
 
-    if (!*sent_header) {
-        notice_lang(s_OperServ, u, OPER_AKILL_LIST_HEADER);
-        *sent_header = 1;
-    }
+	if (!*sent_header) {
+		notice_lang(s_OperServ, u, OPER_AKILL_LIST_HEADER);
+		*sent_header = 1;
+	}
 
-    snprintf(mask, sizeof(mask), "%s@%s", ak->user, ak->host);
-    notice_lang(s_OperServ, u, OPER_AKILL_LIST_FORMAT, number, mask,
-                ak->reason);
+	snprintf(mask, sizeof(mask), "%s@%s", ak->user, ak->host);
+	notice_lang(s_OperServ, u, OPER_AKILL_LIST_FORMAT, number, mask,
+				ak->reason);
 
-    return 1;
+	return 1;
 }
 
 MODULE_INIT("os_akill", OSAKill)
diff --git a/src/core/os_chankill.c b/src/core/os_chankill.c
index ef35e2432..881dee421 100644
--- a/src/core/os_chankill.c
+++ b/src/core/os_chankill.c
@@ -44,9 +44,9 @@ class OSChanKill : public Module
  **/
 void myOperServHelp(User * u)
 {
-    if (is_services_admin(u)) {
-        notice_lang(s_OperServ, u, OPER_HELP_CMD_CHANKILL);
-    }
+	if (is_services_admin(u)) {
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_CHANKILL);
+	}
 }
 
 /**
@@ -59,64 +59,64 @@ void myOperServHelp(User * u)
  **/
 int do_chankill(User * u)
 {
-    char *expiry, *channel, *reason;
-    time_t expires;
-    char breason[BUFSIZE];
-    char mask[USERMAX + HOSTMAX + 2];
-    struct c_userlist *cu, *next;
-    Channel *c;
-
-    channel = strtok(NULL, " ");
-    if (channel && *channel == '+') {
-        expiry = channel;
-        channel = strtok(NULL, " ");
-    } else {
-        expiry = NULL;
-    }
-
-    expires = expiry ? dotime(expiry) : ChankillExpiry;
-    if (expiry && isdigit(expiry[strlen(expiry) - 1]))
-        expires *= 86400;
-    if (expires != 0 && expires < 60) {
-        notice_lang(s_OperServ, u, BAD_EXPIRY_TIME);
-        return MOD_CONT;
-    } else if (expires > 0) {
-        expires += time(NULL);
-    }
-
-    if (channel && (reason = strtok(NULL, ""))) {
-
-        if (AddAkiller) {
-            snprintf(breason, sizeof(breason), "[%s] %s", u->nick, reason);
-            reason = sstrdup(breason);
-        }
-
-        if ((c = findchan(channel))) {
-            for (cu = c->users; cu; cu = next) {
-                next = cu->next;
-                if (is_oper(cu->user)) {
-                    continue;
-                }
-                (void) strncpy(mask, "*@", 3); /* Use *@" for the akill's, */
-                strncat(mask, cu->user->host, HOSTMAX);
-                add_akill(NULL, mask, s_OperServ, expires, reason);
-                check_akill(cu->user->nick, cu->user->username,
-                            cu->user->host, NULL, NULL);
-            }
-            if (WallOSAkill) {
-                ircdproto->SendGlobops(s_OperServ, "%s used CHANKILL on %s (%s)",
-                                 u->nick, channel, reason);
-            }
-        } else {
-            notice_lang(s_OperServ, u, CHAN_X_NOT_IN_USE, channel);
-        }
-        if (AddAkiller) {
-            free(reason);
-        }
-    } else {
-        syntax_error(s_OperServ, u, "CHANKILL", OPER_CHANKILL_SYNTAX);
-    }
-    return MOD_CONT;
+	char *expiry, *channel, *reason;
+	time_t expires;
+	char breason[BUFSIZE];
+	char mask[USERMAX + HOSTMAX + 2];
+	struct c_userlist *cu, *next;
+	Channel *c;
+
+	channel = strtok(NULL, " ");
+	if (channel && *channel == '+') {
+		expiry = channel;
+		channel = strtok(NULL, " ");
+	} else {
+		expiry = NULL;
+	}
+
+	expires = expiry ? dotime(expiry) : ChankillExpiry;
+	if (expiry && isdigit(expiry[strlen(expiry) - 1]))
+		expires *= 86400;
+	if (expires != 0 && expires < 60) {
+		notice_lang(s_OperServ, u, BAD_EXPIRY_TIME);
+		return MOD_CONT;
+	} else if (expires > 0) {
+		expires += time(NULL);
+	}
+
+	if (channel && (reason = strtok(NULL, ""))) {
+
+		if (AddAkiller) {
+			snprintf(breason, sizeof(breason), "[%s] %s", u->nick, reason);
+			reason = sstrdup(breason);
+		}
+
+		if ((c = findchan(channel))) {
+			for (cu = c->users; cu; cu = next) {
+				next = cu->next;
+				if (is_oper(cu->user)) {
+					continue;
+				}
+				(void) strncpy(mask, "*@", 3); /* Use *@" for the akill's, */
+				strncat(mask, cu->user->host, HOSTMAX);
+				add_akill(NULL, mask, s_OperServ, expires, reason);
+				check_akill(cu->user->nick, cu->user->username,
+							cu->user->host, NULL, NULL);
+			}
+			if (WallOSAkill) {
+				ircdproto->SendGlobops(s_OperServ, "%s used CHANKILL on %s (%s)",
+								 u->nick, channel, reason);
+			}
+		} else {
+			notice_lang(s_OperServ, u, CHAN_X_NOT_IN_USE, channel);
+		}
+		if (AddAkiller) {
+			free(reason);
+		}
+	} else {
+		syntax_error(s_OperServ, u, "CHANKILL", OPER_CHANKILL_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("os_chankill", OSChanKill)
diff --git a/src/core/os_chanlist.c b/src/core/os_chanlist.c
index 4725eb4bf..c51d87385 100644
--- a/src/core/os_chanlist.c
+++ b/src/core/os_chanlist.c
@@ -47,7 +47,7 @@ class OSChanList : public Module
  **/
 void myOperServHelp(User * u)
 {
-    notice_lang(s_OperServ, u, OPER_HELP_CMD_CHANLIST);
+	notice_lang(s_OperServ, u, OPER_HELP_CMD_CHANLIST);
 }
 
 /**
@@ -57,49 +57,49 @@ void myOperServHelp(User * u)
  **/
 int do_chanlist(User * u)
 {
-    char *pattern = strtok(NULL, " ");
-    char *opt = strtok(NULL, " ");
-
-    int modes = 0;
-    User *u2;
-
-    if (opt && !stricmp(opt, "SECRET"))
-        modes |= (anope_get_secret_mode() | anope_get_private_mode());
-
-    if (pattern && (u2 = finduser(pattern))) {
-        struct u_chanlist *uc;
-
-        notice_lang(s_OperServ, u, OPER_CHANLIST_HEADER_USER, u2->nick);
-
-        for (uc = u2->chans; uc; uc = uc->next) {
-            if (modes && !(uc->chan->mode & modes))
-                continue;
-            notice_lang(s_OperServ, u, OPER_CHANLIST_RECORD,
-                        uc->chan->name, uc->chan->usercount,
-                        chan_get_modes(uc->chan, 1, 1),
-                        (uc->chan->topic ? uc->chan->topic : ""));
-        }
-    } else {
-        int i;
-        Channel *c;
-
-        notice_lang(s_OperServ, u, OPER_CHANLIST_HEADER);
-
-        for (i = 0; i < 1024; i++) {
-            for (c = chanlist[i]; c; c = c->next) {
-                if (pattern && !match_wild_nocase(pattern, c->name))
-                    continue;
-                if (modes && !(c->mode & modes))
-                    continue;
-                notice_lang(s_OperServ, u, OPER_CHANLIST_RECORD, c->name,
-                            c->usercount, chan_get_modes(c, 1, 1),
-                            (c->topic ? c->topic : ""));
-            }
-        }
-    }
-
-    notice_lang(s_OperServ, u, OPER_CHANLIST_END);
-    return MOD_CONT;
+	char *pattern = strtok(NULL, " ");
+	char *opt = strtok(NULL, " ");
+
+	int modes = 0;
+	User *u2;
+
+	if (opt && !stricmp(opt, "SECRET"))
+		modes |= (anope_get_secret_mode() | anope_get_private_mode());
+
+	if (pattern && (u2 = finduser(pattern))) {
+		struct u_chanlist *uc;
+
+		notice_lang(s_OperServ, u, OPER_CHANLIST_HEADER_USER, u2->nick);
+
+		for (uc = u2->chans; uc; uc = uc->next) {
+			if (modes && !(uc->chan->mode & modes))
+				continue;
+			notice_lang(s_OperServ, u, OPER_CHANLIST_RECORD,
+						uc->chan->name, uc->chan->usercount,
+						chan_get_modes(uc->chan, 1, 1),
+						(uc->chan->topic ? uc->chan->topic : ""));
+		}
+	} else {
+		int i;
+		Channel *c;
+
+		notice_lang(s_OperServ, u, OPER_CHANLIST_HEADER);
+
+		for (i = 0; i < 1024; i++) {
+			for (c = chanlist[i]; c; c = c->next) {
+				if (pattern && !match_wild_nocase(pattern, c->name))
+					continue;
+				if (modes && !(c->mode & modes))
+					continue;
+				notice_lang(s_OperServ, u, OPER_CHANLIST_RECORD, c->name,
+							c->usercount, chan_get_modes(c, 1, 1),
+							(c->topic ? c->topic : ""));
+			}
+		}
+	}
+
+	notice_lang(s_OperServ, u, OPER_CHANLIST_END);
+	return MOD_CONT;
 }
 
 MODULE_INIT("os_chanlist", OSChanList)
diff --git a/src/core/os_clearmodes.c b/src/core/os_clearmodes.c
index 8fb27f5ff..fce9efc57 100644
--- a/src/core/os_clearmodes.c
+++ b/src/core/os_clearmodes.c
@@ -44,9 +44,9 @@ class OSClearModes : public Module
  **/
 void myOperServHelp(User * u)
 {
-    if (is_services_oper(u)) {
-        notice_lang(s_OperServ, u, OPER_HELP_CMD_CLEARMODES);
-    }
+	if (is_services_oper(u)) {
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_CLEARMODES);
+	}
 }
 
 /**
@@ -56,242 +56,242 @@ void myOperServHelp(User * u)
  **/
 int do_clearmodes(User * u)
 {
-    char *s;
-    const char *argv[2];
-    char *chan = strtok(NULL, " ");
-    Channel *c;
-    int all = 0;
-    struct c_userlist *cu, *next;
-    Entry *entry, *nexte;
+	char *s;
+	const char *argv[2];
+	char *chan = strtok(NULL, " ");
+	Channel *c;
+	int all = 0;
+	struct c_userlist *cu, *next;
+	Entry *entry, *nexte;
 
-    if (!chan) {
-        syntax_error(s_OperServ, u, "CLEARMODES", OPER_CLEARMODES_SYNTAX);
-        return MOD_CONT;
-    } else if (!(c = findchan(chan))) {
-        notice_lang(s_OperServ, u, CHAN_X_NOT_IN_USE, chan);
-        return MOD_CONT;
-    } else if (c->bouncy_modes) {
-        notice_lang(s_OperServ, u, OPER_BOUNCY_MODES_U_LINE);
-        return MOD_CONT;
-    } else {
-        s = strtok(NULL, " ");
-        if (s) {
-            if (stricmp(s, "ALL") == 0) {
-                all = 1;
-            } else {
-                syntax_error(s_OperServ, u, "CLEARMODES",
-                             OPER_CLEARMODES_SYNTAX);
-                return MOD_CONT;
-            }
-        }
+	if (!chan) {
+		syntax_error(s_OperServ, u, "CLEARMODES", OPER_CLEARMODES_SYNTAX);
+		return MOD_CONT;
+	} else if (!(c = findchan(chan))) {
+		notice_lang(s_OperServ, u, CHAN_X_NOT_IN_USE, chan);
+		return MOD_CONT;
+	} else if (c->bouncy_modes) {
+		notice_lang(s_OperServ, u, OPER_BOUNCY_MODES_U_LINE);
+		return MOD_CONT;
+	} else {
+		s = strtok(NULL, " ");
+		if (s) {
+			if (stricmp(s, "ALL") == 0) {
+				all = 1;
+			} else {
+				syntax_error(s_OperServ, u, "CLEARMODES",
+							 OPER_CLEARMODES_SYNTAX);
+				return MOD_CONT;
+			}
+		}
 
-        if (WallOSClearmodes) {
-            ircdproto->SendGlobops(s_OperServ, "%s used CLEARMODES%s on %s",
-                             u->nick, all ? " ALL" : "", chan);
-        }
-        if (all) {
-            /* Clear mode +o */
-            if (ircd->svsmode_ucmode) {
-                ircdproto->SendSVSModeChan(c->name, "-o", NULL);
-                for (cu = c->users; cu; cu = next) {
-                    next = cu->next;
-                    if (!chan_has_user_status(c, cu->user, CUS_OP)) {
-                        continue;
-                    }
-                    argv[0] = "-o";
-                    argv[1] = cu->user->nick;
-                    chan_set_modes(s_OperServ, c, 2, argv, 0);
-                }
-            } else {
-                for (cu = c->users; cu; cu = next) {
-                    next = cu->next;
-                    if (!chan_has_user_status(c, cu->user, CUS_OP))
-                        continue;
-                    argv[0] = "-o";
-                    argv[1] = cu->user->nick;
-                    ircdproto->SendMode(findbot(s_OperServ), c->name, "-o %s",
-                                   cu->user->nick);
-                    chan_set_modes(s_OperServ, c, 2, argv, 0);
-                }
-            }
+		if (WallOSClearmodes) {
+			ircdproto->SendGlobops(s_OperServ, "%s used CLEARMODES%s on %s",
+							 u->nick, all ? " ALL" : "", chan);
+		}
+		if (all) {
+			/* Clear mode +o */
+			if (ircd->svsmode_ucmode) {
+				ircdproto->SendSVSModeChan(c->name, "-o", NULL);
+				for (cu = c->users; cu; cu = next) {
+					next = cu->next;
+					if (!chan_has_user_status(c, cu->user, CUS_OP)) {
+						continue;
+					}
+					argv[0] = "-o";
+					argv[1] = cu->user->nick;
+					chan_set_modes(s_OperServ, c, 2, argv, 0);
+				}
+			} else {
+				for (cu = c->users; cu; cu = next) {
+					next = cu->next;
+					if (!chan_has_user_status(c, cu->user, CUS_OP))
+						continue;
+					argv[0] = "-o";
+					argv[1] = cu->user->nick;
+					ircdproto->SendMode(findbot(s_OperServ), c->name, "-o %s",
+								   cu->user->nick);
+					chan_set_modes(s_OperServ, c, 2, argv, 0);
+				}
+			}
 
-            if (ircd->svsmode_ucmode) {
-                ircdproto->SendSVSModeChan(c->name, "-v", NULL);
-                for (cu = c->users; cu; cu = next) {
-                    next = cu->next;
-                    if (!chan_has_user_status(c, cu->user, CUS_VOICE)) {
-                        continue;
-                    }
-                    argv[0] = "-v";
-                    argv[1] = cu->user->nick;
-                    chan_set_modes(s_OperServ, c, 2, argv, 0);
-                }
-            } else {
-                /* Clear mode +v */
-                for (cu = c->users; cu; cu = next) {
-                    next = cu->next;
-                    if (!chan_has_user_status(c, cu->user, CUS_VOICE))
-                        continue;
-                    argv[0] = "-v";
-                    argv[1] = cu->user->nick;
-                    ircdproto->SendMode(findbot(s_OperServ), c->name, "-v %s",
-                                   cu->user->nick);
-                    chan_set_modes(s_OperServ, c, 2, argv, 0);
-                }
-            }
+			if (ircd->svsmode_ucmode) {
+				ircdproto->SendSVSModeChan(c->name, "-v", NULL);
+				for (cu = c->users; cu; cu = next) {
+					next = cu->next;
+					if (!chan_has_user_status(c, cu->user, CUS_VOICE)) {
+						continue;
+					}
+					argv[0] = "-v";
+					argv[1] = cu->user->nick;
+					chan_set_modes(s_OperServ, c, 2, argv, 0);
+				}
+			} else {
+				/* Clear mode +v */
+				for (cu = c->users; cu; cu = next) {
+					next = cu->next;
+					if (!chan_has_user_status(c, cu->user, CUS_VOICE))
+						continue;
+					argv[0] = "-v";
+					argv[1] = cu->user->nick;
+					ircdproto->SendMode(findbot(s_OperServ), c->name, "-v %s",
+								   cu->user->nick);
+					chan_set_modes(s_OperServ, c, 2, argv, 0);
+				}
+			}
 
-            /* Clear mode +h */
-            if (ircd->svsmode_ucmode && ircd->halfop) {
-                ircdproto->SendSVSModeChan(c->name, "-h", NULL);
-                for (cu = c->users; cu; cu = next) {
-                    next = cu->next;
-                    if (!chan_has_user_status(c, cu->user, CUS_HALFOP)) {
-                        continue;
-                    }
-                    argv[0] = "-h";
-                    argv[1] = cu->user->nick;
-                    chan_set_modes(s_OperServ, c, 2, argv, 0);
-                }
-            } else {
-                for (cu = c->users; cu; cu = next) {
-                    next = cu->next;
-                    if (!chan_has_user_status(c, cu->user, CUS_HALFOP))
-                        continue;
-                    argv[0] = "-h";
-                    argv[1] = cu->user->nick;
-                    ircdproto->SendMode(findbot(s_OperServ), c->name, "-h %s",
-                                   cu->user->nick);
-                    chan_set_modes(s_OperServ, c, 2, argv, 0);
-                }
-            }
-            /* Clear mode Owners */
-            if (ircd->svsmode_ucmode && ircd->owner) {
-                ircdproto->SendSVSModeChan(c->name, ircd->ownerunset, NULL);
-                for (cu = c->users; cu; cu = next) {
-                    next = cu->next;
-                    if (!chan_has_user_status(c, cu->user, CUS_HALFOP)) {
-                        continue;
-                    }
-                    argv[0] = ircd->ownerunset;
-                    argv[1] = cu->user->nick;
-                    chan_set_modes(s_OperServ, c, 2, argv, 0);
-                }
-            } else {
-                for (cu = c->users; cu; cu = next) {
-                    next = cu->next;
-                    if (!chan_has_user_status(c, cu->user, CUS_OWNER))
-                        continue;
-                    argv[0] = ircd->ownerunset;
-                    argv[1] = cu->user->nick;
-                    ircdproto->SendMode(findbot(s_OperServ), c->name, "%s %s",
-                                   ircd->ownerunset, cu->user->nick);
-                    chan_set_modes(s_OperServ, c, 2, argv, 0);
-                }
-            }
-            /* Clear mode protected or admins */
-            if (ircd->svsmode_ucmode && (ircd->protect || ircd->admin)) {
+			/* Clear mode +h */
+			if (ircd->svsmode_ucmode && ircd->halfop) {
+				ircdproto->SendSVSModeChan(c->name, "-h", NULL);
+				for (cu = c->users; cu; cu = next) {
+					next = cu->next;
+					if (!chan_has_user_status(c, cu->user, CUS_HALFOP)) {
+						continue;
+					}
+					argv[0] = "-h";
+					argv[1] = cu->user->nick;
+					chan_set_modes(s_OperServ, c, 2, argv, 0);
+				}
+			} else {
+				for (cu = c->users; cu; cu = next) {
+					next = cu->next;
+					if (!chan_has_user_status(c, cu->user, CUS_HALFOP))
+						continue;
+					argv[0] = "-h";
+					argv[1] = cu->user->nick;
+					ircdproto->SendMode(findbot(s_OperServ), c->name, "-h %s",
+								   cu->user->nick);
+					chan_set_modes(s_OperServ, c, 2, argv, 0);
+				}
+			}
+			/* Clear mode Owners */
+			if (ircd->svsmode_ucmode && ircd->owner) {
+				ircdproto->SendSVSModeChan(c->name, ircd->ownerunset, NULL);
+				for (cu = c->users; cu; cu = next) {
+					next = cu->next;
+					if (!chan_has_user_status(c, cu->user, CUS_HALFOP)) {
+						continue;
+					}
+					argv[0] = ircd->ownerunset;
+					argv[1] = cu->user->nick;
+					chan_set_modes(s_OperServ, c, 2, argv, 0);
+				}
+			} else {
+				for (cu = c->users; cu; cu = next) {
+					next = cu->next;
+					if (!chan_has_user_status(c, cu->user, CUS_OWNER))
+						continue;
+					argv[0] = ircd->ownerunset;
+					argv[1] = cu->user->nick;
+					ircdproto->SendMode(findbot(s_OperServ), c->name, "%s %s",
+								   ircd->ownerunset, cu->user->nick);
+					chan_set_modes(s_OperServ, c, 2, argv, 0);
+				}
+			}
+			/* Clear mode protected or admins */
+			if (ircd->svsmode_ucmode && (ircd->protect || ircd->admin)) {
 
-                ircdproto->SendSVSModeChan(c->name, ircd->adminunset, NULL);
-                for (cu = c->users; cu; cu = next) {
-                    next = cu->next;
-                    if (!chan_has_user_status(c, cu->user, CUS_HALFOP)) {
-                        continue;
-                    }
-                    argv[0] = ircd->adminunset;
-                    argv[1] = cu->user->nick;
-                    chan_set_modes(s_OperServ, c, 2, argv, 0);
-                }
-            } else {
-                for (cu = c->users; cu; cu = next) {
-                    next = cu->next;
-                    if (!chan_has_user_status(c, cu->user, CUS_PROTECT))
-                        continue;
-                    argv[0] = ircd->adminunset;
-                    argv[1] = cu->user->nick;
-                    ircdproto->SendMode(findbot(s_OperServ), c->name, "%s %s",
-                                   ircd->adminunset, cu->user->nick);
-                    chan_set_modes(s_OperServ, c, 2, argv, 0);
-                }
-            }
+				ircdproto->SendSVSModeChan(c->name, ircd->adminunset, NULL);
+				for (cu = c->users; cu; cu = next) {
+					next = cu->next;
+					if (!chan_has_user_status(c, cu->user, CUS_HALFOP)) {
+						continue;
+					}
+					argv[0] = ircd->adminunset;
+					argv[1] = cu->user->nick;
+					chan_set_modes(s_OperServ, c, 2, argv, 0);
+				}
+			} else {
+				for (cu = c->users; cu; cu = next) {
+					next = cu->next;
+					if (!chan_has_user_status(c, cu->user, CUS_PROTECT))
+						continue;
+					argv[0] = ircd->adminunset;
+					argv[1] = cu->user->nick;
+					ircdproto->SendMode(findbot(s_OperServ), c->name, "%s %s",
+								   ircd->adminunset, cu->user->nick);
+					chan_set_modes(s_OperServ, c, 2, argv, 0);
+				}
+			}
 
 
-        }
+		}
 
-        if (c->mode) {
-            /* Clear modes the bulk of the modes */
-            ircdproto->SendMode(findbot(s_OperServ), c->name, "%s", ircd->modestoremove);
-            argv[0] = ircd->modestoremove;
-            chan_set_modes(s_OperServ, c, 1, argv, 0);
+		if (c->mode) {
+			/* Clear modes the bulk of the modes */
+			ircdproto->SendMode(findbot(s_OperServ), c->name, "%s", ircd->modestoremove);
+			argv[0] = ircd->modestoremove;
+			chan_set_modes(s_OperServ, c, 1, argv, 0);
 
-            /* to prevent the internals from complaining send -k, -L, -f by themselves if we need
-               to send them - TSL */
-            if (c->key) {
-                ircdproto->SendMode(findbot(s_OperServ), c->name, "-k %s", c->key);
-                argv[0] = "-k";
-                argv[1] = c->key;
-                chan_set_modes(s_OperServ, c, 2, argv, 0);
-            }
-            if (ircd->Lmode && c->redirect) {
-                ircdproto->SendMode(findbot(s_OperServ), c->name, "-L %s", c->redirect);
-                argv[0] = "-L";
-                argv[1] = c->redirect;
-                chan_set_modes(s_OperServ, c, 2, argv, 0);
-            }
-            if (ircd->fmode && c->flood) {
-                if (flood_mode_char_remove) {
-                    ircdproto->SendMode(findbot(s_OperServ), c->name, "%s %s",
-                                   flood_mode_char_remove, c->flood);
-                    argv[0] = flood_mode_char_remove;
-                    argv[1] = c->flood;
-                    chan_set_modes(s_OperServ, c, 2, argv, 0);
-                } else {
-                    if (debug) {
-                        alog("debug: flood_mode_char_remove was not set unable to remove flood/throttle modes");
-                    }
-                }
-            }
-        }
+			/* to prevent the internals from complaining send -k, -L, -f by themselves if we need
+			   to send them - TSL */
+			if (c->key) {
+				ircdproto->SendMode(findbot(s_OperServ), c->name, "-k %s", c->key);
+				argv[0] = "-k";
+				argv[1] = c->key;
+				chan_set_modes(s_OperServ, c, 2, argv, 0);
+			}
+			if (ircd->Lmode && c->redirect) {
+				ircdproto->SendMode(findbot(s_OperServ), c->name, "-L %s", c->redirect);
+				argv[0] = "-L";
+				argv[1] = c->redirect;
+				chan_set_modes(s_OperServ, c, 2, argv, 0);
+			}
+			if (ircd->fmode && c->flood) {
+				if (flood_mode_char_remove) {
+					ircdproto->SendMode(findbot(s_OperServ), c->name, "%s %s",
+								   flood_mode_char_remove, c->flood);
+					argv[0] = flood_mode_char_remove;
+					argv[1] = c->flood;
+					chan_set_modes(s_OperServ, c, 2, argv, 0);
+				} else {
+					if (debug) {
+						alog("debug: flood_mode_char_remove was not set unable to remove flood/throttle modes");
+					}
+				}
+			}
+		}
 
-        /* Clear bans */
-        if (c->bans && c->bans->count) {
-            for (entry = c->bans->entries; entry; entry = nexte) {
-                nexte = entry->next;
-                argv[0] = "-b";
-                argv[1] = entry->mask;
-                ircdproto->SendMode(findbot(s_OperServ), c->name, "-b %s", entry->mask);
-                chan_set_modes(s_OperServ, c, 2, argv, 0);
-            }
-        }
+		/* Clear bans */
+		if (c->bans && c->bans->count) {
+			for (entry = c->bans->entries; entry; entry = nexte) {
+				nexte = entry->next;
+				argv[0] = "-b";
+				argv[1] = entry->mask;
+				ircdproto->SendMode(findbot(s_OperServ), c->name, "-b %s", entry->mask);
+				chan_set_modes(s_OperServ, c, 2, argv, 0);
+			}
+		}
 
-        /* Clear excepts */
-        if (ircd->except && c->excepts && c->excepts->count) {
-            for (entry = c->excepts->entries; entry; entry = nexte) {
-                nexte = entry->next;
-                argv[0] = "-e";
-                argv[1] = entry->mask;
-                ircdproto->SendMode(findbot(s_OperServ), c->name, "-e %s", entry->mask);
-                chan_set_modes(s_OperServ, c, 2, argv, 0);
-            }
-        }
+		/* Clear excepts */
+		if (ircd->except && c->excepts && c->excepts->count) {
+			for (entry = c->excepts->entries; entry; entry = nexte) {
+				nexte = entry->next;
+				argv[0] = "-e";
+				argv[1] = entry->mask;
+				ircdproto->SendMode(findbot(s_OperServ), c->name, "-e %s", entry->mask);
+				chan_set_modes(s_OperServ, c, 2, argv, 0);
+			}
+		}
 
-        /* Clear invites */
-        if (ircd->invitemode && c->invites && c->invites->count) {
-            for (entry = c->invites->entries; entry; entry = nexte) {
-                nexte = entry->next;
-                argv[0] = "-I";
-                argv[1] = entry->mask;
-                ircdproto->SendMode(findbot(s_OperServ), c->name, "-I %s", entry->mask);
-                chan_set_modes(s_OperServ, c, 2, argv, 0);
-            }
-        }
-    }
+		/* Clear invites */
+		if (ircd->invitemode && c->invites && c->invites->count) {
+			for (entry = c->invites->entries; entry; entry = nexte) {
+				nexte = entry->next;
+				argv[0] = "-I";
+				argv[1] = entry->mask;
+				ircdproto->SendMode(findbot(s_OperServ), c->name, "-I %s", entry->mask);
+				chan_set_modes(s_OperServ, c, 2, argv, 0);
+			}
+		}
+	}
 
-    if (all) {
-        notice_lang(s_OperServ, u, OPER_CLEARMODES_ALL_DONE, chan);
-    } else {
-        notice_lang(s_OperServ, u, OPER_CLEARMODES_DONE, chan);
-    }
-    return MOD_CONT;
+	if (all) {
+		notice_lang(s_OperServ, u, OPER_CLEARMODES_ALL_DONE, chan);
+	} else {
+		notice_lang(s_OperServ, u, OPER_CLEARMODES_DONE, chan);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("os_clearmodes", OSClearModes)
diff --git a/src/core/os_defcon.c b/src/core/os_defcon.c
index 66aefc92a..69afa7bf2 100644
--- a/src/core/os_defcon.c
+++ b/src/core/os_defcon.c
@@ -49,9 +49,9 @@ class OSDEFCON : public Module
  **/
 void myOperServHelp(User * u)
 {
-    if (is_services_admin(u)) {
-        notice_lang(s_OperServ, u, OPER_HELP_CMD_DEFCON);
-    }
+	if (is_services_admin(u)) {
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_DEFCON);
+	}
 }
 
 /**
@@ -66,52 +66,52 @@ void myOperServHelp(User * u)
  **/
 int do_defcon(User * u)
 {
-    char *lvl = strtok(NULL, " ");
-    int newLevel = 0;
-    char *langglobal;
-    langglobal = getstring(NULL, DEFCON_GLOBAL);
-
-    if (!DefConLevel) {         /* If we dont have a .conf setting! */
-        notice_lang(s_OperServ, u, OPER_DEFCON_NO_CONF);
-        return MOD_CONT;
-    }
-
-    if (!lvl) {
-        notice_lang(s_OperServ, u, OPER_DEFCON_CHANGED, DefConLevel);
-        defcon_sendlvls(u);
-        return MOD_CONT;
-    }
-    newLevel = atoi(lvl);
-    if (newLevel < 1 || newLevel > 5) {
-        notice_lang(s_OperServ, u, OPER_DEFCON_SYNTAX);
-        return MOD_CONT;
-    }
-    DefConLevel = newLevel;
-    send_event(EVENT_DEFCON_LEVEL, 1, lvl);
-    DefContimer = time(NULL);
-    notice_lang(s_OperServ, u, OPER_DEFCON_CHANGED, DefConLevel);
-    defcon_sendlvls(u);
-    alog("Defcon level changed to %d by Oper %s", newLevel, u->nick);
-    ircdproto->SendGlobops(s_OperServ, getstring2(NULL, OPER_DEFCON_WALL),
-                     u->nick, newLevel);
-    /* Global notice the user what is happening. Also any Message that
-       the Admin would like to add. Set in config file. */
-    if (GlobalOnDefcon) {
-        if ((DefConLevel == 5) && (DefConOffMessage)) {
-            oper_global(NULL, "%s", DefConOffMessage);
-        } else {
-            oper_global(NULL, langglobal, DefConLevel);
-        }
-    }
-    if (GlobalOnDefconMore) {
-        if ((DefConOffMessage) && DefConLevel == 5) {
-        } else {
-            oper_global(NULL, "%s", DefconMessage);
-        }
-    }
-    /* Run any defcon functions, e.g. FORCE CHAN MODE */
-    runDefCon();
-    return MOD_CONT;
+	char *lvl = strtok(NULL, " ");
+	int newLevel = 0;
+	char *langglobal;
+	langglobal = getstring(NULL, DEFCON_GLOBAL);
+
+	if (!DefConLevel) {		 /* If we dont have a .conf setting! */
+		notice_lang(s_OperServ, u, OPER_DEFCON_NO_CONF);
+		return MOD_CONT;
+	}
+
+	if (!lvl) {
+		notice_lang(s_OperServ, u, OPER_DEFCON_CHANGED, DefConLevel);
+		defcon_sendlvls(u);
+		return MOD_CONT;
+	}
+	newLevel = atoi(lvl);
+	if (newLevel < 1 || newLevel > 5) {
+		notice_lang(s_OperServ, u, OPER_DEFCON_SYNTAX);
+		return MOD_CONT;
+	}
+	DefConLevel = newLevel;
+	send_event(EVENT_DEFCON_LEVEL, 1, lvl);
+	DefContimer = time(NULL);
+	notice_lang(s_OperServ, u, OPER_DEFCON_CHANGED, DefConLevel);
+	defcon_sendlvls(u);
+	alog("Defcon level changed to %d by Oper %s", newLevel, u->nick);
+	ircdproto->SendGlobops(s_OperServ, getstring2(NULL, OPER_DEFCON_WALL),
+					 u->nick, newLevel);
+	/* Global notice the user what is happening. Also any Message that
+	   the Admin would like to add. Set in config file. */
+	if (GlobalOnDefcon) {
+		if ((DefConLevel == 5) && (DefConOffMessage)) {
+			oper_global(NULL, "%s", DefConOffMessage);
+		} else {
+			oper_global(NULL, langglobal, DefConLevel);
+		}
+	}
+	if (GlobalOnDefconMore) {
+		if ((DefConOffMessage) && DefConLevel == 5) {
+		} else {
+			oper_global(NULL, "%s", DefconMessage);
+		}
+	}
+	/* Run any defcon functions, e.g. FORCE CHAN MODE */
+	runDefCon();
+	return MOD_CONT;
 }
 
 
@@ -121,38 +121,38 @@ int do_defcon(User * u)
  **/
 void defcon_sendlvls(User * u)
 {
-    if (checkDefCon(DEFCON_NO_NEW_CHANNELS)) {
-        notice_lang(s_OperServ, u, OPER_HELP_DEFCON_NO_NEW_CHANNELS);
-    }
-    if (checkDefCon(DEFCON_NO_NEW_NICKS)) {
-        notice_lang(s_OperServ, u, OPER_HELP_DEFCON_NO_NEW_NICKS);
-    }
-    if (checkDefCon(DEFCON_NO_MLOCK_CHANGE)) {
-        notice_lang(s_OperServ, u, OPER_HELP_DEFCON_NO_MLOCK_CHANGE);
-    }
-    if (checkDefCon(DEFCON_FORCE_CHAN_MODES) && (DefConChanModes)) {
-        notice_lang(s_OperServ, u, OPER_HELP_DEFCON_FORCE_CHAN_MODES,
-                    DefConChanModes);
-    }
-    if (checkDefCon(DEFCON_REDUCE_SESSION)) {
-        notice_lang(s_OperServ, u, OPER_HELP_DEFCON_REDUCE_SESSION,
-                    DefConSessionLimit);
-    }
-    if (checkDefCon(DEFCON_NO_NEW_CLIENTS)) {
-        notice_lang(s_OperServ, u, OPER_HELP_DEFCON_NO_NEW_CLIENTS);
-    }
-    if (checkDefCon(DEFCON_OPER_ONLY)) {
-        notice_lang(s_OperServ, u, OPER_HELP_DEFCON_OPER_ONLY);
-    }
-    if (checkDefCon(DEFCON_SILENT_OPER_ONLY)) {
-        notice_lang(s_OperServ, u, OPER_HELP_DEFCON_SILENT_OPER_ONLY);
-    }
-    if (checkDefCon(DEFCON_AKILL_NEW_CLIENTS)) {
-        notice_lang(s_OperServ, u, OPER_HELP_DEFCON_AKILL_NEW_CLIENTS);
-    }
-    if (checkDefCon(DEFCON_NO_NEW_MEMOS)) {
-        notice_lang(s_OperServ, u, OPER_HELP_DEFCON_NO_NEW_MEMOS);
-    }
+	if (checkDefCon(DEFCON_NO_NEW_CHANNELS)) {
+		notice_lang(s_OperServ, u, OPER_HELP_DEFCON_NO_NEW_CHANNELS);
+	}
+	if (checkDefCon(DEFCON_NO_NEW_NICKS)) {
+		notice_lang(s_OperServ, u, OPER_HELP_DEFCON_NO_NEW_NICKS);
+	}
+	if (checkDefCon(DEFCON_NO_MLOCK_CHANGE)) {
+		notice_lang(s_OperServ, u, OPER_HELP_DEFCON_NO_MLOCK_CHANGE);
+	}
+	if (checkDefCon(DEFCON_FORCE_CHAN_MODES) && (DefConChanModes)) {
+		notice_lang(s_OperServ, u, OPER_HELP_DEFCON_FORCE_CHAN_MODES,
+					DefConChanModes);
+	}
+	if (checkDefCon(DEFCON_REDUCE_SESSION)) {
+		notice_lang(s_OperServ, u, OPER_HELP_DEFCON_REDUCE_SESSION,
+					DefConSessionLimit);
+	}
+	if (checkDefCon(DEFCON_NO_NEW_CLIENTS)) {
+		notice_lang(s_OperServ, u, OPER_HELP_DEFCON_NO_NEW_CLIENTS);
+	}
+	if (checkDefCon(DEFCON_OPER_ONLY)) {
+		notice_lang(s_OperServ, u, OPER_HELP_DEFCON_OPER_ONLY);
+	}
+	if (checkDefCon(DEFCON_SILENT_OPER_ONLY)) {
+		notice_lang(s_OperServ, u, OPER_HELP_DEFCON_SILENT_OPER_ONLY);
+	}
+	if (checkDefCon(DEFCON_AKILL_NEW_CLIENTS)) {
+		notice_lang(s_OperServ, u, OPER_HELP_DEFCON_AKILL_NEW_CLIENTS);
+	}
+	if (checkDefCon(DEFCON_NO_NEW_MEMOS)) {
+		notice_lang(s_OperServ, u, OPER_HELP_DEFCON_NO_NEW_MEMOS);
+	}
 }
 
 MODULE_INIT("os_defcon", OSDEFCON)
diff --git a/src/core/os_global.c b/src/core/os_global.c
index d311c8f94..c538d26bd 100644
--- a/src/core/os_global.c
+++ b/src/core/os_global.c
@@ -44,9 +44,9 @@ class OSGlobal : public Module
  **/
 void myOperServHelp(User * u)
 {
-    if (is_services_admin(u)) {
-        notice_lang(s_OperServ, u, OPER_HELP_CMD_GLOBAL);
-    }
+	if (is_services_admin(u)) {
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_GLOBAL);
+	}
 }
 
 /**
@@ -56,17 +56,17 @@ void myOperServHelp(User * u)
  **/
 int do_global(User * u)
 {
-    char *msg = strtok(NULL, "");
+	char *msg = strtok(NULL, "");
 
-    if (!msg) {
-        syntax_error(s_OperServ, u, "GLOBAL", OPER_GLOBAL_SYNTAX);
-        return MOD_CONT;
-    }
-    if (WallOSGlobal)
-        ircdproto->SendGlobops(s_OperServ, "\2%s\2 just used GLOBAL command.",
-                         u->nick);
-    oper_global(u->nick, "%s", msg);
-    return MOD_CONT;
+	if (!msg) {
+		syntax_error(s_OperServ, u, "GLOBAL", OPER_GLOBAL_SYNTAX);
+		return MOD_CONT;
+	}
+	if (WallOSGlobal)
+		ircdproto->SendGlobops(s_OperServ, "\2%s\2 just used GLOBAL command.",
+						 u->nick);
+	oper_global(u->nick, "%s", msg);
+	return MOD_CONT;
 }
 
 MODULE_INIT("os_global", OSGlobal)
diff --git a/src/core/os_help.c b/src/core/os_help.c
index 7f1155eb1..fad752f54 100644
--- a/src/core/os_help.c
+++ b/src/core/os_help.c
@@ -41,16 +41,16 @@ class OSHelp : public Module
  **/
 int do_help(User * u)
 {
-    const char *cmd = strtok(NULL, "");
-
-    if (!cmd) {
-        notice_help(s_OperServ, u, OPER_HELP);
-        moduleDisplayHelp(5, u);
-        notice_help(s_OperServ, u, OPER_HELP_LOGGED);
-    } else {
-        mod_help_cmd(s_OperServ, u, OPERSERV, cmd);
-    }
-    return MOD_CONT;
+	const char *cmd = strtok(NULL, "");
+
+	if (!cmd) {
+		notice_help(s_OperServ, u, OPER_HELP);
+		moduleDisplayHelp(5, u);
+		notice_help(s_OperServ, u, OPER_HELP_LOGGED);
+	} else {
+		mod_help_cmd(s_OperServ, u, OPERSERV, cmd);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("os_help", OSHelp)
diff --git a/src/core/os_ignore.c b/src/core/os_ignore.c
index 4ec37c730..088f51061 100644
--- a/src/core/os_ignore.c
+++ b/src/core/os_ignore.c
@@ -43,9 +43,9 @@ class OSIgnore : public Module
  **/
 void myOperServHelp(User * u)
 {
-    if (is_services_admin(u)) {
-        notice_lang(s_OperServ, u, OPER_HELP_CMD_IGNORE);
-    }
+	if (is_services_admin(u)) {
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_IGNORE);
+	}
 }
 
 /**
@@ -55,79 +55,79 @@ void myOperServHelp(User * u)
  **/
 int do_ignoreuser(User * u)
 {
-    char *cmd = strtok(NULL, " ");
-    int t;
-
-    if (!cmd) {
-        notice_lang(s_OperServ, u, OPER_IGNORE_SYNTAX);
-        return MOD_CONT;
-    }
-
-    if (!stricmp(cmd, "ADD")) {
-        char *time = strtok(NULL, " ");
-        char *nick = strtok(NULL, " ");
-        char *rest = strtok(NULL, "");
-
-        if (!nick) {
-            notice_lang(s_OperServ, u, OPER_IGNORE_SYNTAX);
-            return MOD_CONT;
-        } else if (!time) {
-            notice_lang(s_OperServ, u, OPER_IGNORE_SYNTAX);
-            return MOD_CONT;
-        } else {
-            t = dotime(time);
-            rest = NULL;
-
-            if (t <= -1) {
-                notice_lang(s_OperServ, u, OPER_IGNORE_VALID_TIME);
-                return MOD_CONT;
-            } else if (t == 0) {
-                add_ignore(nick, t);
-                notice_lang(s_OperServ, u, OPER_IGNORE_PERM_DONE, nick);
-            } else {
-                add_ignore(nick, t);
-                notice_lang(s_OperServ, u, OPER_IGNORE_TIME_DONE, nick, time);
-            }
-        }
-    } else if (!stricmp(cmd, "LIST")) {
-        do_ignorelist(u);
-
-    } else if (!stricmp(cmd, "DEL")) {
-        char *nick = strtok(NULL, " ");
-        if (!nick) {
-            notice_lang(s_OperServ, u, OPER_IGNORE_SYNTAX);
-        } else {
-            if (delete_ignore(nick)) {
-                notice_lang(s_OperServ, u, OPER_IGNORE_DEL_DONE, nick);
-                return MOD_CONT;
-            }
-            notice_lang(s_OperServ, u, OPER_IGNORE_LIST_NOMATCH, nick);
-        }
-    } else if (!stricmp(cmd, "CLEAR")) {
-        clear_ignores();
-        notice_lang(s_OperServ, u, OPER_IGNORE_LIST_CLEARED);
-        return MOD_CONT;
-    } else
-        notice_lang(s_OperServ, u, OPER_IGNORE_SYNTAX);
-
-    return MOD_CONT;
+	char *cmd = strtok(NULL, " ");
+	int t;
+
+	if (!cmd) {
+		notice_lang(s_OperServ, u, OPER_IGNORE_SYNTAX);
+		return MOD_CONT;
+	}
+
+	if (!stricmp(cmd, "ADD")) {
+		char *time = strtok(NULL, " ");
+		char *nick = strtok(NULL, " ");
+		char *rest = strtok(NULL, "");
+
+		if (!nick) {
+			notice_lang(s_OperServ, u, OPER_IGNORE_SYNTAX);
+			return MOD_CONT;
+		} else if (!time) {
+			notice_lang(s_OperServ, u, OPER_IGNORE_SYNTAX);
+			return MOD_CONT;
+		} else {
+			t = dotime(time);
+			rest = NULL;
+
+			if (t <= -1) {
+				notice_lang(s_OperServ, u, OPER_IGNORE_VALID_TIME);
+				return MOD_CONT;
+			} else if (t == 0) {
+				add_ignore(nick, t);
+				notice_lang(s_OperServ, u, OPER_IGNORE_PERM_DONE, nick);
+			} else {
+				add_ignore(nick, t);
+				notice_lang(s_OperServ, u, OPER_IGNORE_TIME_DONE, nick, time);
+			}
+		}
+	} else if (!stricmp(cmd, "LIST")) {
+		do_ignorelist(u);
+
+	} else if (!stricmp(cmd, "DEL")) {
+		char *nick = strtok(NULL, " ");
+		if (!nick) {
+			notice_lang(s_OperServ, u, OPER_IGNORE_SYNTAX);
+		} else {
+			if (delete_ignore(nick)) {
+				notice_lang(s_OperServ, u, OPER_IGNORE_DEL_DONE, nick);
+				return MOD_CONT;
+			}
+			notice_lang(s_OperServ, u, OPER_IGNORE_LIST_NOMATCH, nick);
+		}
+	} else if (!stricmp(cmd, "CLEAR")) {
+		clear_ignores();
+		notice_lang(s_OperServ, u, OPER_IGNORE_LIST_CLEARED);
+		return MOD_CONT;
+	} else
+		notice_lang(s_OperServ, u, OPER_IGNORE_SYNTAX);
+
+	return MOD_CONT;
 }
 
 /* shows the Services ignore list */
 int do_ignorelist(User * u)
 {
-    IgnoreData *id;
+	IgnoreData *id;
 
-    if (!ignore) {
-        notice_lang(s_OperServ, u, OPER_IGNORE_LIST_EMPTY);
-        return MOD_CONT;
-    }
+	if (!ignore) {
+		notice_lang(s_OperServ, u, OPER_IGNORE_LIST_EMPTY);
+		return MOD_CONT;
+	}
 
-    notice_lang(s_OperServ, u, OPER_IGNORE_LIST);
-    for (id = ignore; id; id = id->next)
-        notice_user(s_OperServ, u, "%s", id->mask);
+	notice_lang(s_OperServ, u, OPER_IGNORE_LIST);
+	for (id = ignore; id; id = id->next)
+		notice_user(s_OperServ, u, "%s", id->mask);
 
-    return MOD_CONT;
+	return MOD_CONT;
 }
 
 MODULE_INIT("os_ignore", OSIgnore)
diff --git a/src/core/os_jupe.c b/src/core/os_jupe.c
index dcf550c4f..079ff4be1 100644
--- a/src/core/os_jupe.c
+++ b/src/core/os_jupe.c
@@ -43,9 +43,9 @@ class OSJupe : public Module
  **/
 void myOperServHelp(User * u)
 {
-    if (is_services_admin(u)) {
-        notice_lang(s_OperServ, u, OPER_HELP_CMD_JUPE);
-    }
+	if (is_services_admin(u)) {
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_JUPE);
+	}
 }
 
 /**
@@ -55,27 +55,27 @@ void myOperServHelp(User * u)
  **/
 int do_jupe(User * u)
 {
-    char *jserver = strtok(NULL, " ");
-    char *reason = strtok(NULL, "");
+	char *jserver = strtok(NULL, " ");
+	char *reason = strtok(NULL, "");
 
-    if (!jserver) {
-        syntax_error(s_OperServ, u, "JUPE", OPER_JUPE_SYNTAX);
-    } else {
-        if (!isValidHost(jserver, 3)) {
-            notice_lang(s_OperServ, u, OPER_JUPE_HOST_ERROR);
-        } else {
+	if (!jserver) {
+		syntax_error(s_OperServ, u, "JUPE", OPER_JUPE_SYNTAX);
+	} else {
+		if (!isValidHost(jserver, 3)) {
+			notice_lang(s_OperServ, u, OPER_JUPE_HOST_ERROR);
+		} else {
 			char rbuf[256];
 			snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", u->nick, reason ? ": " : "", reason ? reason : "");
 			if (findserver(servlist, jserver)) ircdproto->SendSquit(jserver, rbuf);
 			ircdproto->SendServer(jserver, 2, rbuf);
 			new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 
-            if (WallOSJupe)
-                ircdproto->SendGlobops(s_OperServ, "\2%s\2 used JUPE on \2%s\2",
-                                 u->nick, jserver);
-        }
-    }
-    return MOD_CONT;
+			if (WallOSJupe)
+				ircdproto->SendGlobops(s_OperServ, "\2%s\2 used JUPE on \2%s\2",
+								 u->nick, jserver);
+		}
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("os_jupe", OSJupe)
diff --git a/src/core/os_kick.c b/src/core/os_kick.c
index 7fc7f7aa2..fd47318fe 100644
--- a/src/core/os_kick.c
+++ b/src/core/os_kick.c
@@ -43,9 +43,9 @@ class OSKick : public Module
  **/
 void myOperServHelp(User * u)
 {
-    if (is_services_oper(u)) {
-        notice_lang(s_OperServ, u, OPER_HELP_CMD_KICK);
-    }
+	if (is_services_oper(u)) {
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_KICK);
+	}
 }
 
 /**
@@ -55,35 +55,35 @@ void myOperServHelp(User * u)
  **/
 int do_os_kick(User * u)
 {
-    const char *argv[3];
-    char *chan, *nick, *s;
-    Channel *c;
+	const char *argv[3];
+	char *chan, *nick, *s;
+	Channel *c;
 
-    chan = strtok(NULL, " ");
-    nick = strtok(NULL, " ");
-    s = strtok(NULL, "");
-    if (!chan || !nick || !s) {
-        syntax_error(s_OperServ, u, "KICK", OPER_KICK_SYNTAX);
-        return MOD_CONT;
-    }
-    if (!(c = findchan(chan))) {
-        notice_lang(s_OperServ, u, CHAN_X_NOT_IN_USE, chan);
-    } else if (c->bouncy_modes) {
-        notice_lang(s_OperServ, u, OPER_BOUNCY_MODES_U_LINE);
-        return MOD_CONT;
-    }
-    ircdproto->SendKick(findbot(s_OperServ), chan, nick, "%s (%s)", u->nick, s);
-    if (WallOSKick)
-        ircdproto->SendGlobops(s_OperServ, "%s used KICK on %s/%s", u->nick,
-                         nick, chan);
-    argv[0] = sstrdup(chan);
-    argv[1] = sstrdup(nick);
-    argv[2] = sstrdup(s);
-    do_kick(s_OperServ, 3, argv);
-    free((void *)argv[2]);
-    free((void *)argv[1]);
-    free((void *)argv[0]);
-    return MOD_CONT;
+	chan = strtok(NULL, " ");
+	nick = strtok(NULL, " ");
+	s = strtok(NULL, "");
+	if (!chan || !nick || !s) {
+		syntax_error(s_OperServ, u, "KICK", OPER_KICK_SYNTAX);
+		return MOD_CONT;
+	}
+	if (!(c = findchan(chan))) {
+		notice_lang(s_OperServ, u, CHAN_X_NOT_IN_USE, chan);
+	} else if (c->bouncy_modes) {
+		notice_lang(s_OperServ, u, OPER_BOUNCY_MODES_U_LINE);
+		return MOD_CONT;
+	}
+	ircdproto->SendKick(findbot(s_OperServ), chan, nick, "%s (%s)", u->nick, s);
+	if (WallOSKick)
+		ircdproto->SendGlobops(s_OperServ, "%s used KICK on %s/%s", u->nick,
+						 nick, chan);
+	argv[0] = sstrdup(chan);
+	argv[1] = sstrdup(nick);
+	argv[2] = sstrdup(s);
+	do_kick(s_OperServ, 3, argv);
+	free((void *)argv[2]);
+	free((void *)argv[1]);
+	free((void *)argv[0]);
+	return MOD_CONT;
 }
 
 MODULE_INIT("os_kick", OSKick)
diff --git a/src/core/os_logonnews.c b/src/core/os_logonnews.c
index 035c415db..0d26a543e 100644
--- a/src/core/os_logonnews.c
+++ b/src/core/os_logonnews.c
@@ -66,9 +66,9 @@ class OSLogonNews : public Module
  **/
 void myOperServHelp(User * u)
 {
-    if (is_services_admin(u)) {
-        notice_lang(s_OperServ, u, OPER_HELP_CMD_LOGONNEWS);
-    }
+	if (is_services_admin(u)) {
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_LOGONNEWS);
+	}
 }
 
 
@@ -76,17 +76,17 @@ void myOperServHelp(User * u)
  * Upon /os reload refresh the count
  **/
 int reload_config(int argc, char **argv) {
-    char buf[BUFSIZE];
+	char buf[BUFSIZE];
 
-    if (argc >= 1) {
-        if (!stricmp(argv[0], EVENT_START)) {
+	if (argc >= 1) {
+		if (!stricmp(argv[0], EVENT_START)) {
 			free(c->help_param1);
-            snprintf(buf, BUFSIZE, "%d", NewsCount),
-            c->help_param1 = sstrdup(buf);
-        }
-    }
+			snprintf(buf, BUFSIZE, "%d", NewsCount),
+			c->help_param1 = sstrdup(buf);
+		}
+	}
 
-    return MOD_CONT;
+	return MOD_CONT;
 }
 
 /* EOF */
diff --git a/src/core/os_mode.c b/src/core/os_mode.c
index 00be24c10..b004a826e 100644
--- a/src/core/os_mode.c
+++ b/src/core/os_mode.c
@@ -44,9 +44,9 @@ class OSMode : public Module
  **/
 void myOperServHelp(User * u)
 {
-    if (is_services_oper(u)) {
-        notice_lang(s_OperServ, u, OPER_HELP_CMD_MODE);
-    }
+	if (is_services_oper(u)) {
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_MODE);
+	}
 }
 
 /**
@@ -56,37 +56,37 @@ void myOperServHelp(User * u)
  **/
 int do_os_mode(User * u)
 {
-    int ac;
-    const char **av;
-    char *chan = strtok(NULL, " "), *modes = strtok(NULL, "");
-    Channel *c;
+	int ac;
+	const char **av;
+	char *chan = strtok(NULL, " "), *modes = strtok(NULL, "");
+	Channel *c;
 
-    if (!chan || !modes) {
-        syntax_error(s_OperServ, u, "MODE", OPER_MODE_SYNTAX);
-        return MOD_CONT;
-    }
+	if (!chan || !modes) {
+		syntax_error(s_OperServ, u, "MODE", OPER_MODE_SYNTAX);
+		return MOD_CONT;
+	}
 
-    if (!(c = findchan(chan))) {
-        notice_lang(s_OperServ, u, CHAN_X_NOT_IN_USE, chan);
-    } else if (c->bouncy_modes) {
-        notice_lang(s_OperServ, u, OPER_BOUNCY_MODES_U_LINE);
-        return MOD_CONT;
-    } else if ((ircd->adminmode) && (!is_services_admin(u))
-               && (c->mode & ircd->adminmode)) {
-        notice_lang(s_OperServ, u, PERMISSION_DENIED);
-        return MOD_CONT;
-    } else {
-        ircdproto->SendMode(findbot(s_OperServ), chan, "%s", modes);
+	if (!(c = findchan(chan))) {
+		notice_lang(s_OperServ, u, CHAN_X_NOT_IN_USE, chan);
+	} else if (c->bouncy_modes) {
+		notice_lang(s_OperServ, u, OPER_BOUNCY_MODES_U_LINE);
+		return MOD_CONT;
+	} else if ((ircd->adminmode) && (!is_services_admin(u))
+			   && (c->mode & ircd->adminmode)) {
+		notice_lang(s_OperServ, u, PERMISSION_DENIED);
+		return MOD_CONT;
+	} else {
+		ircdproto->SendMode(findbot(s_OperServ), chan, "%s", modes);
 
-        ac = split_buf(modes, &av, 1);
-        chan_set_modes(s_OperServ, c, ac, av, -1);
-        free(av);
+		ac = split_buf(modes, &av, 1);
+		chan_set_modes(s_OperServ, c, ac, av, -1);
+		free(av);
 
-        if (WallOSMode)
-            ircdproto->SendGlobops(s_OperServ, "%s used MODE %s on %s", u->nick,
-                             modes, chan);
-    }
-    return MOD_CONT;
+		if (WallOSMode)
+			ircdproto->SendGlobops(s_OperServ, "%s used MODE %s on %s", u->nick,
+							 modes, chan);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("os_mode", OSMode)
diff --git a/src/core/os_modinfo.c b/src/core/os_modinfo.c
index c01ac26f7..485ba89bb 100644
--- a/src/core/os_modinfo.c
+++ b/src/core/os_modinfo.c
@@ -44,7 +44,7 @@ class OSModInfo : public Module
  **/
 void myOperServHelp(User * u)
 {
-    notice_lang(s_OperServ, u, OPER_HELP_CMD_MODINFO);
+	notice_lang(s_OperServ, u, OPER_HELP_CMD_MODINFO);
 }
 
 /**
@@ -54,75 +54,75 @@ void myOperServHelp(User * u)
  **/
 int do_modinfo(User * u)
 {
-    char *file;
-    struct tm tm;
-    char timebuf[64];
-    Module *m;
-    int idx = 0;
+	char *file;
+	struct tm tm;
+	char timebuf[64];
+	Module *m;
+	int idx = 0;
 
-    file = strtok(NULL, "");
-    if (!file) {
-        syntax_error(s_OperServ, u, "MODINFO", OPER_MODULE_INFO_SYNTAX);
-        return MOD_CONT;
-    }
-    m = findModule(file);
-    if (m) {
-        tm = *localtime(&m->created);
-        strftime_lang(timebuf, sizeof(timebuf), u,
-                      STRFTIME_DATE_TIME_FORMAT, &tm);
-        notice_lang(s_OperServ, u, OPER_MODULE_INFO_LIST, m->name.c_str(),
-                    !m->version.empty() ? m->version.c_str() : "?",
-                    !m->author.empty() ? m->author.c_str() : "?", timebuf);
-        for (idx = 0; idx < MAX_CMD_HASH; idx++) {
-            showModuleCmdLoaded(HOSTSERV[idx], m->name.c_str(), u);
-            showModuleCmdLoaded(OPERSERV[idx], m->name.c_str(), u);
-            showModuleCmdLoaded(NICKSERV[idx], m->name.c_str(), u);
-            showModuleCmdLoaded(CHANSERV[idx], m->name.c_str(), u);
-            showModuleCmdLoaded(BOTSERV[idx], m->name.c_str(), u);
-            showModuleCmdLoaded(MEMOSERV[idx], m->name.c_str(), u);
-            showModuleCmdLoaded(HELPSERV[idx], m->name.c_str(), u);
-            showModuleMsgLoaded(IRCD[idx], m->name.c_str(), u);
+	file = strtok(NULL, "");
+	if (!file) {
+		syntax_error(s_OperServ, u, "MODINFO", OPER_MODULE_INFO_SYNTAX);
+		return MOD_CONT;
+	}
+	m = findModule(file);
+	if (m) {
+		tm = *localtime(&m->created);
+		strftime_lang(timebuf, sizeof(timebuf), u,
+					  STRFTIME_DATE_TIME_FORMAT, &tm);
+		notice_lang(s_OperServ, u, OPER_MODULE_INFO_LIST, m->name.c_str(),
+					!m->version.empty() ? m->version.c_str() : "?",
+					!m->author.empty() ? m->author.c_str() : "?", timebuf);
+		for (idx = 0; idx < MAX_CMD_HASH; idx++) {
+			showModuleCmdLoaded(HOSTSERV[idx], m->name.c_str(), u);
+			showModuleCmdLoaded(OPERSERV[idx], m->name.c_str(), u);
+			showModuleCmdLoaded(NICKSERV[idx], m->name.c_str(), u);
+			showModuleCmdLoaded(CHANSERV[idx], m->name.c_str(), u);
+			showModuleCmdLoaded(BOTSERV[idx], m->name.c_str(), u);
+			showModuleCmdLoaded(MEMOSERV[idx], m->name.c_str(), u);
+			showModuleCmdLoaded(HELPSERV[idx], m->name.c_str(), u);
+			showModuleMsgLoaded(IRCD[idx], m->name.c_str(), u);
 
-        }
-    } else {
-        notice_lang(s_OperServ, u, OPER_MODULE_NO_INFO, file);
-    }
-    return MOD_CONT;
+		}
+	} else {
+		notice_lang(s_OperServ, u, OPER_MODULE_NO_INFO, file);
+	}
+	return MOD_CONT;
 }
 
 int showModuleCmdLoaded(CommandHash * cmdList, const char *mod_name, User * u)
 {
-    Command *c;
-    CommandHash *current;
-    int display = 0;
+	Command *c;
+	CommandHash *current;
+	int display = 0;
 
-    for (current = cmdList; current; current = current->next) {
-        for (c = current->c; c; c = c->next) {
-            if ((c->mod_name) && (stricmp(c->mod_name, mod_name) == 0)) {
-                notice_lang(s_OperServ, u, OPER_MODULE_CMD_LIST,
-                            c->service, c->name);
-                display++;
-            }
-        }
-    }
-    return display;
+	for (current = cmdList; current; current = current->next) {
+		for (c = current->c; c; c = c->next) {
+			if ((c->mod_name) && (stricmp(c->mod_name, mod_name) == 0)) {
+				notice_lang(s_OperServ, u, OPER_MODULE_CMD_LIST,
+							c->service, c->name);
+				display++;
+			}
+		}
+	}
+	return display;
 }
 
 int showModuleMsgLoaded(MessageHash * msgList, const char *mod_name, User * u)
 {
-    Message *msg;
-    MessageHash *mcurrent;
-    int display = 0;
-    for (mcurrent = msgList; mcurrent; mcurrent = mcurrent->next) {
-        for (msg = mcurrent->m; msg; msg = msg->next) {
-            if ((msg->mod_name) && (stricmp(msg->mod_name, mod_name) == 0)) {
-                notice_lang(s_OperServ, u, OPER_MODULE_MSG_LIST,
-                            msg->name);
-                display++;
-            }
-        }
-    }
-    return display;
+	Message *msg;
+	MessageHash *mcurrent;
+	int display = 0;
+	for (mcurrent = msgList; mcurrent; mcurrent = mcurrent->next) {
+		for (msg = mcurrent->m; msg; msg = msg->next) {
+			if ((msg->mod_name) && (stricmp(msg->mod_name, mod_name) == 0)) {
+				notice_lang(s_OperServ, u, OPER_MODULE_MSG_LIST,
+							msg->name);
+				display++;
+			}
+		}
+	}
+	return display;
 }
 
 MODULE_INIT("os_modinfo", OSModInfo)
diff --git a/src/core/os_modlist.c b/src/core/os_modlist.c
index deb2beada..85f1fe936 100644
--- a/src/core/os_modlist.c
+++ b/src/core/os_modlist.c
@@ -43,7 +43,7 @@ class OSModList : public Module
  **/
 void myOperServHelp(User * u)
 {
-    notice_lang(s_OperServ, u, OPER_HELP_CMD_MODLIST);
+	notice_lang(s_OperServ, u, OPER_HELP_CMD_MODLIST);
 }
 
 /**
@@ -53,132 +53,132 @@ void myOperServHelp(User * u)
  **/
 int do_modlist(User * u)
 {
-    int idx;
-    int count = 0;
-    int showCore = 0;
-    int showThird = 1;
-    int showProto = 1;
-    int showEnc = 1;
-    int showSupported = 1;
-    int showQA = 1;
-
-    char *param;
-    ModuleHash *current = NULL;
-
-    char core[] = "Core";
-    char third[] = "3rd";
-    char proto[] = "Protocol";
-    char enc[] = "Encryption";
-    char supported[] = "Supported";
-    char qa[] = "QATested";
-
-    param = strtok(NULL, "");
-    if (param) {
-        if (stricmp(param, core) == 0) {
-            showCore = 1;
-            showThird = 0;
-            showProto = 0;
-            showEnc = 0;
-            showSupported = 0;
-            showQA = 0;
-        } else if (stricmp(param, third) == 0) {
-            showCore = 0;
-            showThird = 1;
-            showSupported = 0;
-            showQA = 0;
-            showProto = 0;
-            showEnc = 0;
-        } else if (stricmp(param, proto) == 0) {
-            showCore = 0;
-            showThird = 0;
-            showProto = 1;
-            showEnc = 0;
-            showSupported = 0;
-            showQA = 0;
-        } else if (stricmp(param, supported) == 0) {
-            showCore = 0;
-            showThird = 0;
-            showProto = 0;
-            showSupported = 1;
-            showEnc = 0;
-            showQA = 0;
-        } else if (stricmp(param, qa) == 0) {
-            showCore = 0;
-            showThird = 0;
-            showProto = 0;
-            showSupported = 0;
-            showEnc = 0;
-            showQA = 1;
-        } else if (stricmp(param, enc) == 0) {
-            showCore = 0;
-            showThird = 0;
-            showProto = 0;
-            showSupported = 0;
-            showEnc = 1;
-            showQA = 0;
-        }
-    }
-
-    notice_lang(s_OperServ, u, OPER_MODULE_LIST_HEADER);
-
-    for (idx = 0; idx != MAX_CMD_HASH; idx++) {
-        for (current = MODULE_HASH[idx]; current; current = current->next) {
-            switch (current->m->type) {
-            case CORE:
-                if (showCore) {
-                    notice_lang(s_OperServ, u, OPER_MODULE_LIST,
-                                current->name, current->m->version.c_str(), core);
-                    count++;
-                }
-                break;
-            case THIRD:
-                if (showThird) {
-                    notice_lang(s_OperServ, u, OPER_MODULE_LIST,
-                                current->name, current->m->version.c_str(), third);
-                    count++;
-                }
-                break;
-            case PROTOCOL:
-                if (showProto) {
-                    notice_lang(s_OperServ, u, OPER_MODULE_LIST,
-                                current->name, current->m->version.c_str(), proto);
-                    count++;
-                }
-                break;
-            case SUPPORTED:
-                if (showSupported) {
-                    notice_lang(s_OperServ, u, OPER_MODULE_LIST,
-                                current->name, current->m->version.c_str(),
-                                supported);
-                    count++;
-                }
-                break;
-            case QATESTED:
-                if (showQA) {
-                    notice_lang(s_OperServ, u, OPER_MODULE_LIST,
-                                current->name, current->m->version.c_str(), qa);
-                    count++;
-                }
-                break;
-            case ENCRYPTION:
-                if (showEnc) {
-                    notice_lang(s_OperServ, u, OPER_MODULE_LIST,
-                                current->name, current->m->version.c_str(), enc);
-                    count++;
-                }
-                break;
-
-            }
-
-        }
-    }
-    if (count == 0) {
-        notice_lang(s_OperServ, u, OPER_MODULE_NO_LIST);
-    } else {
-        notice_lang(s_OperServ, u, OPER_MODULE_LIST_FOOTER, count);
-    }
-
-    return MOD_CONT;
+	int idx;
+	int count = 0;
+	int showCore = 0;
+	int showThird = 1;
+	int showProto = 1;
+	int showEnc = 1;
+	int showSupported = 1;
+	int showQA = 1;
+
+	char *param;
+	ModuleHash *current = NULL;
+
+	char core[] = "Core";
+	char third[] = "3rd";
+	char proto[] = "Protocol";
+	char enc[] = "Encryption";
+	char supported[] = "Supported";
+	char qa[] = "QATested";
+
+	param = strtok(NULL, "");
+	if (param) {
+		if (stricmp(param, core) == 0) {
+			showCore = 1;
+			showThird = 0;
+			showProto = 0;
+			showEnc = 0;
+			showSupported = 0;
+			showQA = 0;
+		} else if (stricmp(param, third) == 0) {
+			showCore = 0;
+			showThird = 1;
+			showSupported = 0;
+			showQA = 0;
+			showProto = 0;
+			showEnc = 0;
+		} else if (stricmp(param, proto) == 0) {
+			showCore = 0;
+			showThird = 0;
+			showProto = 1;
+			showEnc = 0;
+			showSupported = 0;
+			showQA = 0;
+		} else if (stricmp(param, supported) == 0) {
+			showCore = 0;
+			showThird = 0;
+			showProto = 0;
+			showSupported = 1;
+			showEnc = 0;
+			showQA = 0;
+		} else if (stricmp(param, qa) == 0) {
+			showCore = 0;
+			showThird = 0;
+			showProto = 0;
+			showSupported = 0;
+			showEnc = 0;
+			showQA = 1;
+		} else if (stricmp(param, enc) == 0) {
+			showCore = 0;
+			showThird = 0;
+			showProto = 0;
+			showSupported = 0;
+			showEnc = 1;
+			showQA = 0;
+		}
+	}
+
+	notice_lang(s_OperServ, u, OPER_MODULE_LIST_HEADER);
+
+	for (idx = 0; idx != MAX_CMD_HASH; idx++) {
+		for (current = MODULE_HASH[idx]; current; current = current->next) {
+			switch (current->m->type) {
+			case CORE:
+				if (showCore) {
+					notice_lang(s_OperServ, u, OPER_MODULE_LIST,
+								current->name, current->m->version.c_str(), core);
+					count++;
+				}
+				break;
+			case THIRD:
+				if (showThird) {
+					notice_lang(s_OperServ, u, OPER_MODULE_LIST,
+								current->name, current->m->version.c_str(), third);
+					count++;
+				}
+				break;
+			case PROTOCOL:
+				if (showProto) {
+					notice_lang(s_OperServ, u, OPER_MODULE_LIST,
+								current->name, current->m->version.c_str(), proto);
+					count++;
+				}
+				break;
+			case SUPPORTED:
+				if (showSupported) {
+					notice_lang(s_OperServ, u, OPER_MODULE_LIST,
+								current->name, current->m->version.c_str(),
+								supported);
+					count++;
+				}
+				break;
+			case QATESTED:
+				if (showQA) {
+					notice_lang(s_OperServ, u, OPER_MODULE_LIST,
+								current->name, current->m->version.c_str(), qa);
+					count++;
+				}
+				break;
+			case ENCRYPTION:
+				if (showEnc) {
+					notice_lang(s_OperServ, u, OPER_MODULE_LIST,
+								current->name, current->m->version.c_str(), enc);
+					count++;
+				}
+				break;
+
+			}
+
+		}
+	}
+	if (count == 0) {
+		notice_lang(s_OperServ, u, OPER_MODULE_NO_LIST);
+	} else {
+		notice_lang(s_OperServ, u, OPER_MODULE_LIST_FOOTER, count);
+	}
+
+	return MOD_CONT;
 }
 
 MODULE_INIT("os_modlist", OSModList)
diff --git a/src/core/os_modload.c b/src/core/os_modload.c
index 3c7ce4a39..c48135901 100644
--- a/src/core/os_modload.c
+++ b/src/core/os_modload.c
@@ -43,9 +43,9 @@ class OSModLoad : public Module
  **/
 void myOperServHelp(User * u)
 {
-    if (is_services_root(u)) {
-        notice_lang(s_OperServ, u, OPER_HELP_CMD_MODLOAD);
-    }
+	if (is_services_root(u)) {
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_MODLOAD);
+	}
 }
 
 /**
@@ -77,7 +77,7 @@ int do_modload(User * u)
 		notice_lang(s_OperServ, u, OPER_MODULE_LOAD_FAIL, m->name.c_str());
 	}
 
-    return MOD_CONT;
+	return MOD_CONT;
 }
 
 MODULE_INIT("os_modload", OSModLoad)
diff --git a/src/core/os_modunload.c b/src/core/os_modunload.c
index 96790357f..994a056ad 100644
--- a/src/core/os_modunload.c
+++ b/src/core/os_modunload.c
@@ -45,9 +45,9 @@ class OSModUnLoad : public Module
  **/
 void myOperServHelp(User * u)
 {
-    if (is_services_root(u)) {
-        notice_lang(s_OperServ, u, OPER_HELP_CMD_MODUNLOAD);
-    }
+	if (is_services_root(u)) {
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_MODUNLOAD);
+	}
 }
 
 /**
diff --git a/src/core/os_noop.c b/src/core/os_noop.c
index e3ba6f190..a5f66a747 100644
--- a/src/core/os_noop.c
+++ b/src/core/os_noop.c
@@ -44,9 +44,9 @@ class OSNOOP : public Module
  **/
 void myOperServHelp(User * u)
 {
-    if (is_services_admin(u)) {
-        notice_lang(s_OperServ, u, OPER_HELP_CMD_NOOP);
-    }
+	if (is_services_admin(u)) {
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_NOOP);
+	}
 }
 
 /**
@@ -56,41 +56,41 @@ void myOperServHelp(User * u)
  **/
 int do_noop(User * u)
 {
-    char *cmd = strtok(NULL, " ");
-    char *server = strtok(NULL, " ");
+	char *cmd = strtok(NULL, " ");
+	char *server = strtok(NULL, " ");
 
-    if (!cmd || !server) {
-        syntax_error(s_OperServ, u, "NOOP", OPER_NOOP_SYNTAX);
-    } else if (!stricmp(cmd, "SET")) {
-        User *u2;
-        User *u3 = NULL;
-        char reason[NICKMAX + 32];
+	if (!cmd || !server) {
+		syntax_error(s_OperServ, u, "NOOP", OPER_NOOP_SYNTAX);
+	} else if (!stricmp(cmd, "SET")) {
+		User *u2;
+		User *u3 = NULL;
+		char reason[NICKMAX + 32];
 
-        /* Remove the O:lines */
-        ircdproto->SendSVSNOOP(server, 1);
+		/* Remove the O:lines */
+		ircdproto->SendSVSNOOP(server, 1);
 
-        snprintf(reason, sizeof(reason), "NOOP command used by %s",
-                 u->nick);
-        if (WallOSNoOp)
-            ircdproto->SendGlobops(s_OperServ, "\2%s\2 used NOOP on \2%s\2",
-                             u->nick, server);
-        notice_lang(s_OperServ, u, OPER_NOOP_SET, server);
+		snprintf(reason, sizeof(reason), "NOOP command used by %s",
+				 u->nick);
+		if (WallOSNoOp)
+			ircdproto->SendGlobops(s_OperServ, "\2%s\2 used NOOP on \2%s\2",
+							 u->nick, server);
+		notice_lang(s_OperServ, u, OPER_NOOP_SET, server);
 
-        /* Kill all the IRCops of the server */
-        for (u2 = firstuser(); u2; u2 = u3) {
-            u3 = nextuser();
-            if ((u2) && is_oper(u2) && (u2->server->name)
-                && match_wild(server, u2->server->name)) {
-                kill_user(s_OperServ, u2->nick, reason);
-            }
-        }
-    } else if (!stricmp(cmd, "REVOKE")) {
-        ircdproto->SendSVSNOOP(server, 0);
-        notice_lang(s_OperServ, u, OPER_NOOP_REVOKE, server);
-    } else {
-        syntax_error(s_OperServ, u, "NOOP", OPER_NOOP_SYNTAX);
-    }
-    return MOD_CONT;
+		/* Kill all the IRCops of the server */
+		for (u2 = firstuser(); u2; u2 = u3) {
+			u3 = nextuser();
+			if ((u2) && is_oper(u2) && (u2->server->name)
+				&& match_wild(server, u2->server->name)) {
+				kill_user(s_OperServ, u2->nick, reason);
+			}
+		}
+	} else if (!stricmp(cmd, "REVOKE")) {
+		ircdproto->SendSVSNOOP(server, 0);
+		notice_lang(s_OperServ, u, OPER_NOOP_REVOKE, server);
+	} else {
+		syntax_error(s_OperServ, u, "NOOP", OPER_NOOP_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("os_noop", OSNOOP)
diff --git a/src/core/os_oline.c b/src/core/os_oline.c
index 3cce00093..5f9f65fd1 100644
--- a/src/core/os_oline.c
+++ b/src/core/os_oline.c
@@ -47,9 +47,9 @@ class OSOLine : public Module
  **/
 void myOperServHelp(User * u)
 {
-    if (is_services_admin(u) && u->isSuperAdmin) {
-        notice_lang(s_OperServ, u, OPER_HELP_CMD_OLINE);
-    }
+	if (is_services_admin(u) && u->isSuperAdmin) {
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_OLINE);
+	}
 }
 
 /**
@@ -59,40 +59,40 @@ void myOperServHelp(User * u)
  **/
 int do_operoline(User * u)
 {
-    char *nick = strtok(NULL, " ");
-    char *flags = strtok(NULL, "");
-    User *u2 = NULL;
+	char *nick = strtok(NULL, " ");
+	char *flags = strtok(NULL, "");
+	User *u2 = NULL;
 
-    /* Only allow this if SuperAdmin is enabled */
-    if (!u->isSuperAdmin) {
-        notice_lang(s_OperServ, u, OPER_SUPER_ADMIN_ONLY);
-        return MOD_CONT;
-    }
+	/* Only allow this if SuperAdmin is enabled */
+	if (!u->isSuperAdmin) {
+		notice_lang(s_OperServ, u, OPER_SUPER_ADMIN_ONLY);
+		return MOD_CONT;
+	}
 
-    if (!nick || !flags) {
-        syntax_error(s_OperServ, u, "OLINE", OPER_OLINE_SYNTAX);
-        return MOD_CONT;
-    } else {
-        /* let's check whether the user is online */
-        if (!(u2 = finduser(nick))) {
-            notice_lang(s_OperServ, u, NICK_X_NOT_IN_USE, nick);
-        } else if (u2 && flags[0] == '+') {
-            ircdproto->SendSVSO(s_OperServ, nick, flags);
-            ircdproto->SendMode(findbot(s_OperServ), nick, "+o");
-            common_svsmode(u2, "+o", NULL);
-            notice_lang(s_OperServ, u2, OPER_OLINE_IRCOP);
-            notice_lang(s_OperServ, u, OPER_OLINE_SUCCESS, flags, nick);
-            ircdproto->SendGlobops(s_OperServ, "\2%s\2 used OLINE for %s",
-                             u->nick, nick);
-        } else if (u2 && flags[0] == '-') {
-            ircdproto->SendSVSO(s_OperServ, nick, flags);
-            notice_lang(s_OperServ, u, OPER_OLINE_SUCCESS, flags, nick);
-            ircdproto->SendGlobops(s_OperServ, "\2%s\2 used OLINE for %s",
-                             u->nick, nick);
-        } else
-            syntax_error(s_OperServ, u, "OLINE", OPER_OLINE_SYNTAX);
-    }
-    return MOD_CONT;
+	if (!nick || !flags) {
+		syntax_error(s_OperServ, u, "OLINE", OPER_OLINE_SYNTAX);
+		return MOD_CONT;
+	} else {
+		/* let's check whether the user is online */
+		if (!(u2 = finduser(nick))) {
+			notice_lang(s_OperServ, u, NICK_X_NOT_IN_USE, nick);
+		} else if (u2 && flags[0] == '+') {
+			ircdproto->SendSVSO(s_OperServ, nick, flags);
+			ircdproto->SendMode(findbot(s_OperServ), nick, "+o");
+			common_svsmode(u2, "+o", NULL);
+			notice_lang(s_OperServ, u2, OPER_OLINE_IRCOP);
+			notice_lang(s_OperServ, u, OPER_OLINE_SUCCESS, flags, nick);
+			ircdproto->SendGlobops(s_OperServ, "\2%s\2 used OLINE for %s",
+							 u->nick, nick);
+		} else if (u2 && flags[0] == '-') {
+			ircdproto->SendSVSO(s_OperServ, nick, flags);
+			notice_lang(s_OperServ, u, OPER_OLINE_SUCCESS, flags, nick);
+			ircdproto->SendGlobops(s_OperServ, "\2%s\2 used OLINE for %s",
+							 u->nick, nick);
+		} else
+			syntax_error(s_OperServ, u, "OLINE", OPER_OLINE_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("os_oline", OSOLine)
diff --git a/src/core/os_oper.c b/src/core/os_oper.c
index 15a56832b..f93dab779 100644
--- a/src/core/os_oper.c
+++ b/src/core/os_oper.c
@@ -17,7 +17,7 @@
 
 int do_oper(User * u);
 int oper_list_callback(SList * slist, int number, void *item,
-                       va_list args);
+					   va_list args);
 int oper_list(int number, NickCore * nc, User * u, int *sent_header);
 void myOperServHelp(User * u);
 
@@ -46,7 +46,7 @@ class OSOper : public Module
  **/
 void myOperServHelp(User * u)
 {
-    notice_lang(s_OperServ, u, OPER_HELP_CMD_OPER);
+	notice_lang(s_OperServ, u, OPER_HELP_CMD_OPER);
 }
 
 /**
@@ -56,181 +56,181 @@ void myOperServHelp(User * u)
  **/
 int do_oper(User * u)
 {
-    char *cmd = strtok(NULL, " ");
-    char *nick = strtok(NULL, " ");
-    NickAlias *na;
-    int res = 0;
-
-    if (!cmd || (!nick && stricmp(cmd, "LIST") && stricmp(cmd, "CLEAR"))) {
-        syntax_error(s_OperServ, u, "OPER", OPER_OPER_SYNTAX);
-    } else if (!stricmp(cmd, "ADD")) {
-        if (!is_services_root(u)) {
-            notice_lang(s_OperServ, u, PERMISSION_DENIED);
-            return MOD_CONT;
-        }
-
-        if (!(na = findnick(nick))) {
-            notice_lang(s_OperServ, u, NICK_X_NOT_REGISTERED, nick);
-            return MOD_CONT;
-        }
-
-        if (na->status & NS_VERBOTEN) {
-            notice_lang(s_OperServ, u, NICK_X_FORBIDDEN, nick);
-            return MOD_CONT;
-        }
-
-        if (na->nc->flags & NI_SERVICES_OPER
-            || slist_indexof(&servopers, na->nc) != -1) {
-            notice_lang(s_OperServ, u, OPER_OPER_EXISTS, nick);
-            return MOD_CONT;
-        }
-
-        res = slist_add(&servopers, na->nc);
-        if (res == -2) {
-            notice_lang(s_OperServ, u, OPER_OPER_REACHED_LIMIT, nick);
-            return MOD_CONT;
-        } else {
-            if (na->nc->flags & NI_SERVICES_ADMIN
-                && (res = slist_indexof(&servadmins, na->nc)) != -1) {
-                if (!is_services_root(u)) {
-                    notice_lang(s_OperServ, u, PERMISSION_DENIED);
-                    return MOD_CONT;
-                }
-                slist_delete(&servadmins, res);
-                na->nc->flags |= NI_SERVICES_OPER;
-                notice_lang(s_OperServ, u, OPER_OPER_MOVED, nick);
-            } else {
-                na->nc->flags |= NI_SERVICES_OPER;
-                notice_lang(s_OperServ, u, OPER_OPER_ADDED, nick);
-            }
-        }
-
-        if (readonly)
-            notice_lang(s_OperServ, u, READ_ONLY_MODE);
-    } else if (!stricmp(cmd, "DEL")) {
-        if (!is_services_root(u)) {
-            notice_lang(s_OperServ, u, PERMISSION_DENIED);
-            return MOD_CONT;
-        }
-
-        if (isdigit(*nick) && strspn(nick, "1234567890,-") == strlen(nick)) {
-            /* Deleting a range */
-            res = slist_delete_range(&servopers, nick, NULL);
-            if (res == 0) {
-                notice_lang(s_OperServ, u, OPER_OPER_NO_MATCH);
-                return MOD_CONT;
-            } else if (res == 1) {
-                notice_lang(s_OperServ, u, OPER_OPER_DELETED_ONE);
-            } else {
-                notice_lang(s_OperServ, u, OPER_OPER_DELETED_SEVERAL, res);
-            }
-        } else {
-            if (!(na = findnick(nick))) {
-                notice_lang(s_OperServ, u, NICK_X_NOT_REGISTERED, nick);
-                return MOD_CONT;
-            }
-
-            if (na->status & NS_VERBOTEN) {
-                notice_lang(s_OperServ, u, NICK_X_FORBIDDEN, nick);
-                return MOD_CONT;
-            }
-
-            if (!(na->nc->flags & NI_SERVICES_OPER)
-                || (res = slist_indexof(&servopers, na->nc)) == -1) {
-                notice_lang(s_OperServ, u, OPER_OPER_NOT_FOUND, nick);
-                return MOD_CONT;
-            }
-
-            slist_delete(&servopers, res);
-            notice_lang(s_OperServ, u, OPER_OPER_DELETED, nick);
-        }
-
-        if (readonly)
-            notice_lang(s_OperServ, u, READ_ONLY_MODE);
-    } else if (!stricmp(cmd, "LIST")) {
-        int sent_header = 0;
+	char *cmd = strtok(NULL, " ");
+	char *nick = strtok(NULL, " ");
+	NickAlias *na;
+	int res = 0;
+
+	if (!cmd || (!nick && stricmp(cmd, "LIST") && stricmp(cmd, "CLEAR"))) {
+		syntax_error(s_OperServ, u, "OPER", OPER_OPER_SYNTAX);
+	} else if (!stricmp(cmd, "ADD")) {
+		if (!is_services_root(u)) {
+			notice_lang(s_OperServ, u, PERMISSION_DENIED);
+			return MOD_CONT;
+		}
+
+		if (!(na = findnick(nick))) {
+			notice_lang(s_OperServ, u, NICK_X_NOT_REGISTERED, nick);
+			return MOD_CONT;
+		}
+
+		if (na->status & NS_VERBOTEN) {
+			notice_lang(s_OperServ, u, NICK_X_FORBIDDEN, nick);
+			return MOD_CONT;
+		}
+
+		if (na->nc->flags & NI_SERVICES_OPER
+			|| slist_indexof(&servopers, na->nc) != -1) {
+			notice_lang(s_OperServ, u, OPER_OPER_EXISTS, nick);
+			return MOD_CONT;
+		}
+
+		res = slist_add(&servopers, na->nc);
+		if (res == -2) {
+			notice_lang(s_OperServ, u, OPER_OPER_REACHED_LIMIT, nick);
+			return MOD_CONT;
+		} else {
+			if (na->nc->flags & NI_SERVICES_ADMIN
+				&& (res = slist_indexof(&servadmins, na->nc)) != -1) {
+				if (!is_services_root(u)) {
+					notice_lang(s_OperServ, u, PERMISSION_DENIED);
+					return MOD_CONT;
+				}
+				slist_delete(&servadmins, res);
+				na->nc->flags |= NI_SERVICES_OPER;
+				notice_lang(s_OperServ, u, OPER_OPER_MOVED, nick);
+			} else {
+				na->nc->flags |= NI_SERVICES_OPER;
+				notice_lang(s_OperServ, u, OPER_OPER_ADDED, nick);
+			}
+		}
+
+		if (readonly)
+			notice_lang(s_OperServ, u, READ_ONLY_MODE);
+	} else if (!stricmp(cmd, "DEL")) {
+		if (!is_services_root(u)) {
+			notice_lang(s_OperServ, u, PERMISSION_DENIED);
+			return MOD_CONT;
+		}
+
+		if (isdigit(*nick) && strspn(nick, "1234567890,-") == strlen(nick)) {
+			/* Deleting a range */
+			res = slist_delete_range(&servopers, nick, NULL);
+			if (res == 0) {
+				notice_lang(s_OperServ, u, OPER_OPER_NO_MATCH);
+				return MOD_CONT;
+			} else if (res == 1) {
+				notice_lang(s_OperServ, u, OPER_OPER_DELETED_ONE);
+			} else {
+				notice_lang(s_OperServ, u, OPER_OPER_DELETED_SEVERAL, res);
+			}
+		} else {
+			if (!(na = findnick(nick))) {
+				notice_lang(s_OperServ, u, NICK_X_NOT_REGISTERED, nick);
+				return MOD_CONT;
+			}
+
+			if (na->status & NS_VERBOTEN) {
+				notice_lang(s_OperServ, u, NICK_X_FORBIDDEN, nick);
+				return MOD_CONT;
+			}
+
+			if (!(na->nc->flags & NI_SERVICES_OPER)
+				|| (res = slist_indexof(&servopers, na->nc)) == -1) {
+				notice_lang(s_OperServ, u, OPER_OPER_NOT_FOUND, nick);
+				return MOD_CONT;
+			}
+
+			slist_delete(&servopers, res);
+			notice_lang(s_OperServ, u, OPER_OPER_DELETED, nick);
+		}
+
+		if (readonly)
+			notice_lang(s_OperServ, u, READ_ONLY_MODE);
+	} else if (!stricmp(cmd, "LIST")) {
+		int sent_header = 0;
 
 		if (!is_oper(u)) {
 			notice_lang(s_OperServ, u, PERMISSION_DENIED);
 			return MOD_CONT;
 		}
 		
-        if (servopers.count == 0) {
-            notice_lang(s_OperServ, u, OPER_OPER_LIST_EMPTY);
-            return MOD_CONT;
-        }
-
-        if (!nick || (isdigit(*nick)
-                      && strspn(nick, "1234567890,-") == strlen(nick))) {
-            res =
-                slist_enum(&servopers, nick, &oper_list_callback, u,
-                           &sent_header);
-            if (res == 0) {
-                notice_lang(s_OperServ, u, OPER_OPER_NO_MATCH);
-                return MOD_CONT;
-            } else {
-                notice_lang(s_OperServ, u, END_OF_ANY_LIST, "Oper");
-            }
-        } else {
-            int i;
-
-            for (i = 0; i < servopers.count; i++)
-                if (!stricmp
-                    (nick, ((NickCore *) servopers.list[i])->display)
-                    || match_wild_nocase(nick,
-                                         ((NickCore *) servopers.list[i])->
-                                         display))
-                    oper_list(i + 1, (NickCore *)servopers.list[i], u, &sent_header);
-
-            if (!sent_header)
-                notice_lang(s_OperServ, u, OPER_OPER_NO_MATCH);
-            else {
-                notice_lang(s_OperServ, u, END_OF_ANY_LIST, "Oper");
-            }
-        }
-    } else if (!stricmp(cmd, "CLEAR")) {
-        if (!is_services_root(u)) {
-            notice_lang(s_OperServ, u, PERMISSION_DENIED);
-            return MOD_CONT;
-        }
-
-        if (servopers.count == 0) {
-            notice_lang(s_OperServ, u, OPER_OPER_LIST_EMPTY);
-            return MOD_CONT;
-        }
-
-        slist_clear(&servopers, 1);
-        notice_lang(s_OperServ, u, OPER_OPER_CLEAR);
-    } else {
-        syntax_error(s_OperServ, u, "OPER", OPER_OPER_SYNTAX);
-    }
-    return MOD_CONT;
+		if (servopers.count == 0) {
+			notice_lang(s_OperServ, u, OPER_OPER_LIST_EMPTY);
+			return MOD_CONT;
+		}
+
+		if (!nick || (isdigit(*nick)
+					  && strspn(nick, "1234567890,-") == strlen(nick))) {
+			res =
+				slist_enum(&servopers, nick, &oper_list_callback, u,
+						   &sent_header);
+			if (res == 0) {
+				notice_lang(s_OperServ, u, OPER_OPER_NO_MATCH);
+				return MOD_CONT;
+			} else {
+				notice_lang(s_OperServ, u, END_OF_ANY_LIST, "Oper");
+			}
+		} else {
+			int i;
+
+			for (i = 0; i < servopers.count; i++)
+				if (!stricmp
+					(nick, ((NickCore *) servopers.list[i])->display)
+					|| match_wild_nocase(nick,
+										 ((NickCore *) servopers.list[i])->
+										 display))
+					oper_list(i + 1, (NickCore *)servopers.list[i], u, &sent_header);
+
+			if (!sent_header)
+				notice_lang(s_OperServ, u, OPER_OPER_NO_MATCH);
+			else {
+				notice_lang(s_OperServ, u, END_OF_ANY_LIST, "Oper");
+			}
+		}
+	} else if (!stricmp(cmd, "CLEAR")) {
+		if (!is_services_root(u)) {
+			notice_lang(s_OperServ, u, PERMISSION_DENIED);
+			return MOD_CONT;
+		}
+
+		if (servopers.count == 0) {
+			notice_lang(s_OperServ, u, OPER_OPER_LIST_EMPTY);
+			return MOD_CONT;
+		}
+
+		slist_clear(&servopers, 1);
+		notice_lang(s_OperServ, u, OPER_OPER_CLEAR);
+	} else {
+		syntax_error(s_OperServ, u, "OPER", OPER_OPER_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 /* Lists an oper entry, prefixing it with the header if needed */
 
 int oper_list(int number, NickCore * nc, User * u, int *sent_header)
 {
-    if (!nc)
-        return 0;
+	if (!nc)
+		return 0;
 
-    if (!*sent_header) {
-        notice_lang(s_OperServ, u, OPER_OPER_LIST_HEADER);
-        *sent_header = 1;
-    }
+	if (!*sent_header) {
+		notice_lang(s_OperServ, u, OPER_OPER_LIST_HEADER);
+		*sent_header = 1;
+	}
 
-    notice_lang(s_OperServ, u, OPER_OPER_LIST_FORMAT, number, nc->display);
-    return 1;
+	notice_lang(s_OperServ, u, OPER_OPER_LIST_FORMAT, number, nc->display);
+	return 1;
 }
 
 /* Callback for enumeration purposes */
 
 int oper_list_callback(SList * slist, int number, void *item, va_list args)
 {
-    User *u = va_arg(args, User *);
-    int *sent_header = va_arg(args, int *);
+	User *u = va_arg(args, User *);
+	int *sent_header = va_arg(args, int *);
 
-    return oper_list(number, (NickCore *)item, u, sent_header);
+	return oper_list(number, (NickCore *)item, u, sent_header);
 }
 
 MODULE_INIT("os_oper", OSOper)
diff --git a/src/core/os_opernews.c b/src/core/os_opernews.c
index 13b71da53..82fed8e76 100644
--- a/src/core/os_opernews.c
+++ b/src/core/os_opernews.c
@@ -50,7 +50,7 @@ class OSOperNews : public Module
 
 	~OSOperNews()
 	{
-	    free(c->help_param1);
+		free(c->help_param1);
 	}
 };
 
@@ -61,26 +61,26 @@ class OSOperNews : public Module
  **/
 void myOperServHelp(User * u)
 {
-    if (is_services_admin(u)) {
-        notice_lang(s_OperServ, u, OPER_HELP_CMD_OPERNEWS);
-    }
+	if (is_services_admin(u)) {
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_OPERNEWS);
+	}
 }
 
 /**
  * Upon /os reload refresh the count
  **/
 int reload_config(int argc, char **argv) {
-    char buf[BUFSIZE];
-
-    if (argc >= 1) {
-        if (!stricmp(argv[0], EVENT_START)) {
-            free(c->help_param1);
-            snprintf(buf, BUFSIZE, "%d", NewsCount),
-            c->help_param1 = sstrdup(buf);
-        }
-    }
+	char buf[BUFSIZE];
+
+	if (argc >= 1) {
+		if (!stricmp(argv[0], EVENT_START)) {
+			free(c->help_param1);
+			snprintf(buf, BUFSIZE, "%d", NewsCount),
+			c->help_param1 = sstrdup(buf);
+		}
+	}
 
-    return MOD_CONT;
+	return MOD_CONT;
 }
 
 
diff --git a/src/core/os_quit.c b/src/core/os_quit.c
index 42410c780..019cf9617 100644
--- a/src/core/os_quit.c
+++ b/src/core/os_quit.c
@@ -43,9 +43,9 @@ class OSQuit : public Module
  **/
 void myOperServHelp(User * u)
 {
-    if (is_services_root(u)) {
-        notice_lang(s_OperServ, u, OPER_HELP_CMD_QUIT);
-    }
+	if (is_services_root(u)) {
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_QUIT);
+	}
 }
 
 /**
@@ -55,17 +55,17 @@ void myOperServHelp(User * u)
  **/
 int do_os_quit(User * u)
 {
-    quitmsg = (char *)calloc(28 + strlen(u->nick), 1);
-    if (!quitmsg)
-        quitmsg = "QUIT command received, but out of memory!";
-    else
-        sprintf((char *)quitmsg, "QUIT command received from %s", u->nick); // XXX we know this is safe, but..
+	quitmsg = (char *)calloc(28 + strlen(u->nick), 1);
+	if (!quitmsg)
+		quitmsg = "QUIT command received, but out of memory!";
+	else
+		sprintf((char *)quitmsg, "QUIT command received from %s", u->nick); // XXX we know this is safe, but..
 
-    if (GlobalOnCycle) {
-        oper_global(NULL, "%s", GlobalOnCycleMessage);
-    }
-    quitting = 1;
-    return MOD_CONT;
+	if (GlobalOnCycle) {
+		oper_global(NULL, "%s", GlobalOnCycleMessage);
+	}
+	quitting = 1;
+	return MOD_CONT;
 }
 
 MODULE_INIT("os_quit", OSQuit)
diff --git a/src/core/os_randomnews.c b/src/core/os_randomnews.c
index 3c4db1985..d20b1b1fd 100644
--- a/src/core/os_randomnews.c
+++ b/src/core/os_randomnews.c
@@ -46,9 +46,9 @@ class OSRandomNews : public Module
  **/
 void myOperServHelp(User * u)
 {
-    if (is_services_admin(u)) {
-        notice_lang(s_OperServ, u, OPER_HELP_CMD_RANDOMNEWS);
-    }
+	if (is_services_admin(u)) {
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_RANDOMNEWS);
+	}
 }
 
 MODULE_INIT("os_randomnews", OSRandomNews)
diff --git a/src/core/os_raw.c b/src/core/os_raw.c
index be520e305..140b329e2 100644
--- a/src/core/os_raw.c
+++ b/src/core/os_raw.c
@@ -44,23 +44,23 @@ class OSRaw : public Module
  **/
 int do_raw(User * u)
 {
-    char *text = strtok(NULL, "");
-    if (!text)
-        syntax_error(s_OperServ, u, "RAW", OPER_RAW_SYNTAX);
-    else {
-        send_cmd(NULL, "%s", text);
-        if (WallOSRaw) {
-            char *kw = strtok(text, " ");
-            while (kw && *kw == ':')
-                kw = strtok(NULL, " ");
-            ircdproto->SendGlobops(s_OperServ,
-                             "\2%s\2 used RAW command for \2%s\2",
-                             u->nick,
-                             (kw ? kw : "\2non RFC compliant message\2"));
-        }
-        alog("%s used RAW command for %s", u->nick, text);
-    }
-    return MOD_CONT;
+	char *text = strtok(NULL, "");
+	if (!text)
+		syntax_error(s_OperServ, u, "RAW", OPER_RAW_SYNTAX);
+	else {
+		send_cmd(NULL, "%s", text);
+		if (WallOSRaw) {
+			char *kw = strtok(text, " ");
+			while (kw && *kw == ':')
+				kw = strtok(NULL, " ");
+			ircdproto->SendGlobops(s_OperServ,
+							 "\2%s\2 used RAW command for \2%s\2",
+							 u->nick,
+							 (kw ? kw : "\2non RFC compliant message\2"));
+		}
+		alog("%s used RAW command for %s", u->nick, text);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("os_raw", OSRaw)
diff --git a/src/core/os_reload.c b/src/core/os_reload.c
index 693838700..514fa42e7 100644
--- a/src/core/os_reload.c
+++ b/src/core/os_reload.c
@@ -43,9 +43,9 @@ class OSReload : public Module
  **/
 void myOperServHelp(User * u)
 {
-    if (is_services_root(u)) {
-        notice_lang(s_OperServ, u, OPER_HELP_CMD_RELOAD);
-    }
+	if (is_services_root(u)) {
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_RELOAD);
+	}
 }
 
 /**
@@ -55,19 +55,19 @@ void myOperServHelp(User * u)
  **/
 int do_reload(User * u)
 {
-    if (!read_config(1)) {
-        quitmsg = (char *)calloc(28 + strlen(u->nick), 1);
-        if (!quitmsg)
-            quitmsg =
-                "Error during the reload of the configuration file, but out of memory!";
-        else
-            sprintf((char *)quitmsg, /* XXX */
-                    "Error during the reload of the configuration file!");
-        quitting = 1;
-    }
-    send_event(EVENT_RELOAD, 1, EVENT_START);
-    notice_lang(s_OperServ, u, OPER_RELOAD);
-    return MOD_CONT;
+	if (!read_config(1)) {
+		quitmsg = (char *)calloc(28 + strlen(u->nick), 1);
+		if (!quitmsg)
+			quitmsg =
+				"Error during the reload of the configuration file, but out of memory!";
+		else
+			sprintf((char *)quitmsg, /* XXX */
+					"Error during the reload of the configuration file!");
+		quitting = 1;
+	}
+	send_event(EVENT_RELOAD, 1, EVENT_START);
+	notice_lang(s_OperServ, u, OPER_RELOAD);
+	return MOD_CONT;
 }
 
 MODULE_INIT("os_reload", OSReload)
diff --git a/src/core/os_restart.c b/src/core/os_restart.c
index 5380244a8..e690de97e 100644
--- a/src/core/os_restart.c
+++ b/src/core/os_restart.c
@@ -47,9 +47,9 @@ class OSRestart : public Module
  **/
 void myOperServHelp(User * u)
 {
-    if (is_services_root(u)) {
-        notice_lang(s_OperServ, u, OPER_HELP_CMD_RESTART);
-    }
+	if (is_services_root(u)) {
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_RESTART);
+	}
 }
 
 /**
@@ -60,21 +60,21 @@ void myOperServHelp(User * u)
 int do_restart(User * u)
 {
 #ifdef SERVICES_BIN
-    quitmsg = (char *)calloc(31 + strlen(u->nick), 1);
-    if (!quitmsg)
-        quitmsg = "RESTART command received, but out of memory!";
-    else
-        sprintf((char *)quitmsg, /* XXX */ "RESTART command received from %s", u->nick);
+	quitmsg = (char *)calloc(31 + strlen(u->nick), 1);
+	if (!quitmsg)
+		quitmsg = "RESTART command received, but out of memory!";
+	else
+		sprintf((char *)quitmsg, /* XXX */ "RESTART command received from %s", u->nick);
 
-    if (GlobalOnCycle) {
-        oper_global(NULL, "%s", GlobalOnCycleMessage);
-    }
-    /*    raise(SIGHUP); */
-    do_restart_services();
+	if (GlobalOnCycle) {
+		oper_global(NULL, "%s", GlobalOnCycleMessage);
+	}
+	/*	raise(SIGHUP); */
+	do_restart_services();
 #else
-    notice_lang(s_OperServ, u, OPER_CANNOT_RESTART);
+	notice_lang(s_OperServ, u, OPER_CANNOT_RESTART);
 #endif
-    return MOD_CONT;
+	return MOD_CONT;
 }
 
 MODULE_INIT("os_restart", OSRestart)
diff --git a/src/core/os_session.c b/src/core/os_session.c
index ddc8fe9b2..9a8bad41c 100644
--- a/src/core/os_session.c
+++ b/src/core/os_session.c
@@ -47,10 +47,10 @@ class OSSession : public Module
  **/
 void myOperServHelp(User * u)
 {
-    if (is_services_oper(u)) {
-        notice_lang(s_OperServ, u, OPER_HELP_CMD_SESSION);
-        notice_lang(s_OperServ, u, OPER_HELP_CMD_EXCEPTION);
-    }
+	if (is_services_oper(u)) {
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_SESSION);
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_EXCEPTION);
+	}
 }
 
 MODULE_INIT("os_session", OSSession)
diff --git a/src/core/os_set.c b/src/core/os_set.c
index 8472b56df..600a292d0 100644
--- a/src/core/os_set.c
+++ b/src/core/os_set.c
@@ -57,9 +57,9 @@ class OSSet : public Module
  **/
 void myOperServHelp(User * u)
 {
-    if (is_services_root(u)) {
-        notice_lang(s_OperServ, u, OPER_HELP_CMD_SET);
-    }
+	if (is_services_root(u)) {
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_SET);
+	}
 }
 
 /**
@@ -69,173 +69,173 @@ void myOperServHelp(User * u)
  **/
 int do_set(User * u)
 {
-    char *option = strtok(NULL, " ");
-    char *setting = strtok(NULL, " ");
-    int index;
-    Channel *c;
+	char *option = strtok(NULL, " ");
+	char *setting = strtok(NULL, " ");
+	int index;
+	Channel *c;
 
-    if (!option) {
-        syntax_error(s_OperServ, u, "SET", OPER_SET_SYNTAX);
-    } else if (stricmp(option, "LIST") == 0) {
-        index =
-            (allow_ignore ? OPER_SET_LIST_OPTION_ON :
-             OPER_SET_LIST_OPTION_OFF);
-        notice_lang(s_OperServ, u, index, "IGNORE");
-        index =
-            (readonly ? OPER_SET_LIST_OPTION_ON :
-             OPER_SET_LIST_OPTION_OFF);
-        notice_lang(s_OperServ, u, index, "READONLY");
-        index =
-            (logchan ? OPER_SET_LIST_OPTION_ON : OPER_SET_LIST_OPTION_OFF);
-        notice_lang(s_OperServ, u, index, "LOGCHAN");
-        index =
-            (debug ? OPER_SET_LIST_OPTION_ON : OPER_SET_LIST_OPTION_OFF);
-        notice_lang(s_OperServ, u, index, "DEBUG");
-        index =
-            (noexpire ? OPER_SET_LIST_OPTION_ON :
-             OPER_SET_LIST_OPTION_OFF);
-        notice_lang(s_OperServ, u, index, "NOEXPIRE");
+	if (!option) {
+		syntax_error(s_OperServ, u, "SET", OPER_SET_SYNTAX);
+	} else if (stricmp(option, "LIST") == 0) {
+		index =
+			(allow_ignore ? OPER_SET_LIST_OPTION_ON :
+			 OPER_SET_LIST_OPTION_OFF);
+		notice_lang(s_OperServ, u, index, "IGNORE");
+		index =
+			(readonly ? OPER_SET_LIST_OPTION_ON :
+			 OPER_SET_LIST_OPTION_OFF);
+		notice_lang(s_OperServ, u, index, "READONLY");
+		index =
+			(logchan ? OPER_SET_LIST_OPTION_ON : OPER_SET_LIST_OPTION_OFF);
+		notice_lang(s_OperServ, u, index, "LOGCHAN");
+		index =
+			(debug ? OPER_SET_LIST_OPTION_ON : OPER_SET_LIST_OPTION_OFF);
+		notice_lang(s_OperServ, u, index, "DEBUG");
+		index =
+			(noexpire ? OPER_SET_LIST_OPTION_ON :
+			 OPER_SET_LIST_OPTION_OFF);
+		notice_lang(s_OperServ, u, index, "NOEXPIRE");
 #ifdef USE_MYSQL
-        index =
-            (do_mysql ? OPER_SET_LIST_OPTION_ON :
-             OPER_SET_LIST_OPTION_OFF);
-        notice_lang(s_OperServ, u, index, "SQL");
+		index =
+			(do_mysql ? OPER_SET_LIST_OPTION_ON :
+			 OPER_SET_LIST_OPTION_OFF);
+		notice_lang(s_OperServ, u, index, "SQL");
 #endif
-    } else if (!setting) {
-        syntax_error(s_OperServ, u, "SET", OPER_SET_SYNTAX);
-    } else if (stricmp(option, "IGNORE") == 0) {
-        if (stricmp(setting, "on") == 0) {
-            allow_ignore = 1;
-            notice_lang(s_OperServ, u, OPER_SET_IGNORE_ON);
-        } else if (stricmp(setting, "off") == 0) {
-            allow_ignore = 0;
-            notice_lang(s_OperServ, u, OPER_SET_IGNORE_OFF);
-        } else {
-            notice_lang(s_OperServ, u, OPER_SET_IGNORE_ERROR);
-        }
+	} else if (!setting) {
+		syntax_error(s_OperServ, u, "SET", OPER_SET_SYNTAX);
+	} else if (stricmp(option, "IGNORE") == 0) {
+		if (stricmp(setting, "on") == 0) {
+			allow_ignore = 1;
+			notice_lang(s_OperServ, u, OPER_SET_IGNORE_ON);
+		} else if (stricmp(setting, "off") == 0) {
+			allow_ignore = 0;
+			notice_lang(s_OperServ, u, OPER_SET_IGNORE_OFF);
+		} else {
+			notice_lang(s_OperServ, u, OPER_SET_IGNORE_ERROR);
+		}
 #ifdef USE_MYSQL
-    } else if (stricmp(option, "SQL") == 0) {
-        if (stricmp(setting, "on") == 0) {
-            if (!MysqlHost) {
-                notice_lang(s_OperServ, u, OPER_SET_SQL_ERROR_DISABLED);
-            } else {
-                if (rdb_init()) {
-                    notice_lang(s_OperServ, u, OPER_SET_SQL_ON);
-                } else {
-                    notice_lang(s_OperServ, u, OPER_SET_SQL_ERROR_INIT);
-                }
-            }
-        } else if (stricmp(setting, "off") == 0) {
-            if (!MysqlHost) {
-                notice_lang(s_OperServ, u, OPER_SET_SQL_ERROR_DISABLED);
-            } else {
-                /* could call rdb_close() but that does nothing - TSL */
-                do_mysql = 0;
-                notice_lang(s_OperServ, u, OPER_SET_SQL_OFF);
-            }
-        } else {
-            notice_lang(s_OperServ, u, OPER_SET_SQL_ERROR);
-        }
+	} else if (stricmp(option, "SQL") == 0) {
+		if (stricmp(setting, "on") == 0) {
+			if (!MysqlHost) {
+				notice_lang(s_OperServ, u, OPER_SET_SQL_ERROR_DISABLED);
+			} else {
+				if (rdb_init()) {
+					notice_lang(s_OperServ, u, OPER_SET_SQL_ON);
+				} else {
+					notice_lang(s_OperServ, u, OPER_SET_SQL_ERROR_INIT);
+				}
+			}
+		} else if (stricmp(setting, "off") == 0) {
+			if (!MysqlHost) {
+				notice_lang(s_OperServ, u, OPER_SET_SQL_ERROR_DISABLED);
+			} else {
+				/* could call rdb_close() but that does nothing - TSL */
+				do_mysql = 0;
+				notice_lang(s_OperServ, u, OPER_SET_SQL_OFF);
+			}
+		} else {
+			notice_lang(s_OperServ, u, OPER_SET_SQL_ERROR);
+		}
 #endif
-    } else if (stricmp(option, "READONLY") == 0) {
-        if (stricmp(setting, "on") == 0) {
-            readonly = 1;
-            alog("Read-only mode activated");
-            close_log();
-            notice_lang(s_OperServ, u, OPER_SET_READONLY_ON);
-        } else if (stricmp(setting, "off") == 0) {
-            readonly = 0;
-            open_log();
-            alog("Read-only mode deactivated");
-            notice_lang(s_OperServ, u, OPER_SET_READONLY_OFF);
-        } else {
-            notice_lang(s_OperServ, u, OPER_SET_READONLY_ERROR);
-        }
+	} else if (stricmp(option, "READONLY") == 0) {
+		if (stricmp(setting, "on") == 0) {
+			readonly = 1;
+			alog("Read-only mode activated");
+			close_log();
+			notice_lang(s_OperServ, u, OPER_SET_READONLY_ON);
+		} else if (stricmp(setting, "off") == 0) {
+			readonly = 0;
+			open_log();
+			alog("Read-only mode deactivated");
+			notice_lang(s_OperServ, u, OPER_SET_READONLY_OFF);
+		} else {
+			notice_lang(s_OperServ, u, OPER_SET_READONLY_ERROR);
+		}
 
-    } else if (stricmp(option, "LOGCHAN") == 0) {
-        /* Unlike the other SET commands where only stricmp is necessary,
-         * we also have to ensure that LogChannel is defined or we can't
-         * send to it.
-         *
-         * -jester
-         */
-        if (LogChannel && (stricmp(setting, "on") == 0)) {
-            if (ircd->join2msg) {
-                c = findchan(LogChannel);
-                ircdproto->SendJoin(findbot(s_GlobalNoticer), LogChannel, c ? c->creation_time : time(NULL));
-            }
-            logchan = 1;
-            alog("Now sending log messages to %s", LogChannel);
-            notice_lang(s_OperServ, u, OPER_SET_LOGCHAN_ON, LogChannel);
-        } else if (LogChannel && (stricmp(setting, "off") == 0)) {
-            alog("No longer sending log messages to a channel");
-            if (ircd->join2msg) {
-                ircdproto->SendPart(findbot(s_GlobalNoticer), LogChannel, NULL);
-            }
-            logchan = 0;
-            notice_lang(s_OperServ, u, OPER_SET_LOGCHAN_OFF);
-        } else {
-            notice_lang(s_OperServ, u, OPER_SET_LOGCHAN_ERROR);
-        }
-        /**
-         * Allow the user to turn super admin on/off
+	} else if (stricmp(option, "LOGCHAN") == 0) {
+		/* Unlike the other SET commands where only stricmp is necessary,
+		 * we also have to ensure that LogChannel is defined or we can't
+		 * send to it.
+		 *
+		 * -jester
+		 */
+		if (LogChannel && (stricmp(setting, "on") == 0)) {
+			if (ircd->join2msg) {
+				c = findchan(LogChannel);
+				ircdproto->SendJoin(findbot(s_GlobalNoticer), LogChannel, c ? c->creation_time : time(NULL));
+			}
+			logchan = 1;
+			alog("Now sending log messages to %s", LogChannel);
+			notice_lang(s_OperServ, u, OPER_SET_LOGCHAN_ON, LogChannel);
+		} else if (LogChannel && (stricmp(setting, "off") == 0)) {
+			alog("No longer sending log messages to a channel");
+			if (ircd->join2msg) {
+				ircdproto->SendPart(findbot(s_GlobalNoticer), LogChannel, NULL);
+			}
+			logchan = 0;
+			notice_lang(s_OperServ, u, OPER_SET_LOGCHAN_OFF);
+		} else {
+			notice_lang(s_OperServ, u, OPER_SET_LOGCHAN_ERROR);
+		}
+		/**
+		 * Allow the user to turn super admin on/off
 	 *
 	 * Rob
-         **/
-    } else if (stricmp(option, "SUPERADMIN") == 0) {
-        if (!SuperAdmin) {
-            notice_lang(s_OperServ, u, OPER_SUPER_ADMIN_NOT_ENABLED);
-        } else if (stricmp(setting, "on") == 0) {
-            u->isSuperAdmin = 1;
-            notice_lang(s_OperServ, u, OPER_SUPER_ADMIN_ON);
-            alog("%s: %s is a SuperAdmin ", s_OperServ, u->nick);
-            ircdproto->SendGlobops(s_OperServ,
-                             getstring2(NULL, OPER_SUPER_ADMIN_WALL_ON),
-                             u->nick);
-        } else if (stricmp(setting, "off") == 0) {
-            u->isSuperAdmin = 0;
-            notice_lang(s_OperServ, u, OPER_SUPER_ADMIN_OFF);
-            alog("%s: %s is no longer a SuperAdmin", s_OperServ, u->nick);
-            ircdproto->SendGlobops(s_OperServ,
-                             getstring2(NULL, OPER_SUPER_ADMIN_WALL_OFF),
-                             u->nick);
-        } else {
-            notice_lang(s_OperServ, u, OPER_SUPER_ADMIN_SYNTAX);
-        }
-    } else if (stricmp(option, "DEBUG") == 0) {
-        if (stricmp(setting, "on") == 0) {
-            debug = 1;
-            alog("Debug mode activated");
-            notice_lang(s_OperServ, u, OPER_SET_DEBUG_ON);
-        } else if (stricmp(setting, "off") == 0 ||
-                   (*setting == '0' && atoi(setting) == 0)) {
-            alog("Debug mode deactivated");
-            debug = 0;
-            notice_lang(s_OperServ, u, OPER_SET_DEBUG_OFF);
-        } else if (isdigit(*setting) && atoi(setting) > 0) {
-            debug = atoi(setting);
-            alog("Debug mode activated (level %d)", debug);
-            notice_lang(s_OperServ, u, OPER_SET_DEBUG_LEVEL, debug);
-        } else {
-            notice_lang(s_OperServ, u, OPER_SET_DEBUG_ERROR);
-        }
+		 **/
+	} else if (stricmp(option, "SUPERADMIN") == 0) {
+		if (!SuperAdmin) {
+			notice_lang(s_OperServ, u, OPER_SUPER_ADMIN_NOT_ENABLED);
+		} else if (stricmp(setting, "on") == 0) {
+			u->isSuperAdmin = 1;
+			notice_lang(s_OperServ, u, OPER_SUPER_ADMIN_ON);
+			alog("%s: %s is a SuperAdmin ", s_OperServ, u->nick);
+			ircdproto->SendGlobops(s_OperServ,
+							 getstring2(NULL, OPER_SUPER_ADMIN_WALL_ON),
+							 u->nick);
+		} else if (stricmp(setting, "off") == 0) {
+			u->isSuperAdmin = 0;
+			notice_lang(s_OperServ, u, OPER_SUPER_ADMIN_OFF);
+			alog("%s: %s is no longer a SuperAdmin", s_OperServ, u->nick);
+			ircdproto->SendGlobops(s_OperServ,
+							 getstring2(NULL, OPER_SUPER_ADMIN_WALL_OFF),
+							 u->nick);
+		} else {
+			notice_lang(s_OperServ, u, OPER_SUPER_ADMIN_SYNTAX);
+		}
+	} else if (stricmp(option, "DEBUG") == 0) {
+		if (stricmp(setting, "on") == 0) {
+			debug = 1;
+			alog("Debug mode activated");
+			notice_lang(s_OperServ, u, OPER_SET_DEBUG_ON);
+		} else if (stricmp(setting, "off") == 0 ||
+				   (*setting == '0' && atoi(setting) == 0)) {
+			alog("Debug mode deactivated");
+			debug = 0;
+			notice_lang(s_OperServ, u, OPER_SET_DEBUG_OFF);
+		} else if (isdigit(*setting) && atoi(setting) > 0) {
+			debug = atoi(setting);
+			alog("Debug mode activated (level %d)", debug);
+			notice_lang(s_OperServ, u, OPER_SET_DEBUG_LEVEL, debug);
+		} else {
+			notice_lang(s_OperServ, u, OPER_SET_DEBUG_ERROR);
+		}
 
-    } else if (stricmp(option, "NOEXPIRE") == 0) {
-        if (stricmp(setting, "ON") == 0) {
-            noexpire = 1;
-            alog("No expire mode activated");
-            notice_lang(s_OperServ, u, OPER_SET_NOEXPIRE_ON);
-        } else if (stricmp(setting, "OFF") == 0) {
-            noexpire = 0;
-            alog("No expire mode deactivated");
-            notice_lang(s_OperServ, u, OPER_SET_NOEXPIRE_OFF);
-        } else {
-            notice_lang(s_OperServ, u, OPER_SET_NOEXPIRE_ERROR);
-        }
-    } else {
-        notice_lang(s_OperServ, u, OPER_SET_UNKNOWN_OPTION, option);
-    }
-    return MOD_CONT;
+	} else if (stricmp(option, "NOEXPIRE") == 0) {
+		if (stricmp(setting, "ON") == 0) {
+			noexpire = 1;
+			alog("No expire mode activated");
+			notice_lang(s_OperServ, u, OPER_SET_NOEXPIRE_ON);
+		} else if (stricmp(setting, "OFF") == 0) {
+			noexpire = 0;
+			alog("No expire mode deactivated");
+			notice_lang(s_OperServ, u, OPER_SET_NOEXPIRE_OFF);
+		} else {
+			notice_lang(s_OperServ, u, OPER_SET_NOEXPIRE_ERROR);
+		}
+	} else {
+		notice_lang(s_OperServ, u, OPER_SET_UNKNOWN_OPTION, option);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("os_set", OSSet)
diff --git a/src/core/os_sgline.c b/src/core/os_sgline.c
index 0cd6c10e9..49aa459fe 100644
--- a/src/core/os_sgline.c
+++ b/src/core/os_sgline.c
@@ -16,10 +16,10 @@
 #include "module.h"
 
 int sgline_view_callback(SList * slist, int number, void *item,
-                         va_list args);
+						 va_list args);
 int sgline_view(int number, SXLine * sx, User * u, int *sent_header);
 int sgline_list_callback(SList * slist, int number, void *item,
-                         va_list args);
+						 va_list args);
 int sgline_list(int number, SXLine * sx, User * u, int *sent_header);
 int do_sgline(User * u);
 
@@ -54,9 +54,9 @@ class OSSGLine : public Module
  **/
 void myOperServHelp(User * u)
 {
-    if (is_services_oper(u)) {
-        notice_lang(s_OperServ, u, OPER_HELP_CMD_SGLINE);
-    }
+	if (is_services_oper(u)) {
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_SGLINE);
+	}
 }
 
 /**
@@ -66,43 +66,43 @@ void myOperServHelp(User * u)
  **/
 int do_sgline(User * u)
 {
-    char *cmd = strtok(NULL, " ");
-
-    if (!cmd)
-        cmd = "";
-
-    if (!stricmp(cmd, "ADD")) {
-        int deleted = 0;
-        char *expiry, *mask, *reason;
-        time_t expires;
-
-        mask = strtok(NULL, ":");
-        if (mask && *mask == '+') {
-            expiry = mask;
-            mask = strchr(expiry, ' ');
-            if (mask) {
-                *mask = 0;
-                mask++;
-            }
-        } else {
-            expiry = NULL;
-        }
-
-        expires = expiry ? dotime(expiry) : SGLineExpiry;
-        /* If the expiry given does not contain a final letter, it's in days,
-         * said the doc. Ah well.
-         */
-        if (expiry && isdigit(expiry[strlen(expiry) - 1]))
-            expires *= 86400;
-        /* Do not allow less than a minute expiry time */
-        if (expires != 0 && expires < 60) {
-            notice_lang(s_OperServ, u, BAD_EXPIRY_TIME);
-            return MOD_CONT;
-        } else if (expires > 0) {
-            expires += time(NULL);
-        }
-
-        if (mask && (reason = strtok(NULL, ""))) {
+	char *cmd = strtok(NULL, " ");
+
+	if (!cmd)
+		cmd = "";
+
+	if (!stricmp(cmd, "ADD")) {
+		int deleted = 0;
+		char *expiry, *mask, *reason;
+		time_t expires;
+
+		mask = strtok(NULL, ":");
+		if (mask && *mask == '+') {
+			expiry = mask;
+			mask = strchr(expiry, ' ');
+			if (mask) {
+				*mask = 0;
+				mask++;
+			}
+		} else {
+			expiry = NULL;
+		}
+
+		expires = expiry ? dotime(expiry) : SGLineExpiry;
+		/* If the expiry given does not contain a final letter, it's in days,
+		 * said the doc. Ah well.
+		 */
+		if (expiry && isdigit(expiry[strlen(expiry) - 1]))
+			expires *= 86400;
+		/* Do not allow less than a minute expiry time */
+		if (expires != 0 && expires < 60) {
+			notice_lang(s_OperServ, u, BAD_EXPIRY_TIME);
+			return MOD_CONT;
+		} else if (expires > 0) {
+			expires += time(NULL);
+		}
+
+		if (mask && (reason = strtok(NULL, ""))) {
 			/* Clean up the last character of the mask if it is a space
 			 * See bug #761
 			 */
@@ -110,243 +110,243 @@ int do_sgline(User * u)
 			if (mask[masklen - 1] == ' ')
 				mask[masklen - 1] = '\0';
 
-            /* We first do some sanity check on the proposed mask. */
-
-            if (mask && strspn(mask, "*?") == strlen(mask)) {
-                notice_lang(s_OperServ, u, USERHOST_MASK_TOO_WIDE, mask);
-                return MOD_CONT;
-            }
-
-            deleted = add_sgline(u, mask, u->nick, expires, reason);
-            if (deleted < 0)
-                return MOD_CONT;
-            else if (deleted)
-                notice_lang(s_OperServ, u, OPER_SGLINE_DELETED_SEVERAL,
-                            deleted);
-            notice_lang(s_OperServ, u, OPER_SGLINE_ADDED, mask);
-
-            if (WallOSSGLine) {
-                char buf[128];
-
-                if (!expires) {
-                    strcpy(buf, "does not expire");
-                } else {
-                    int wall_expiry = expires - time(NULL);
-                    char *s = NULL;
-
-                    if (wall_expiry >= 86400) {
-                        wall_expiry /= 86400;
-                        s = "day";
-                    } else if (wall_expiry >= 3600) {
-                        wall_expiry /= 3600;
-                        s = "hour";
-                    } else if (wall_expiry >= 60) {
-                        wall_expiry /= 60;
-                        s = "minute";
-                    }
-
-                    snprintf(buf, sizeof(buf), "expires in %d %s%s",
-                             wall_expiry, s,
-                             (wall_expiry == 1) ? "" : "s");
-                }
-
-                ircdproto->SendGlobops(s_OperServ,
-                                 "%s added an SGLINE for %s (%s)", u->nick,
-                                 mask, buf);
-            }
-
-            if (readonly)
-                notice_lang(s_OperServ, u, READ_ONLY_MODE);
-
-        } else {
-            syntax_error(s_OperServ, u, "SGLINE", OPER_SGLINE_SYNTAX);
-        }
-
-    } else if (!stricmp(cmd, "DEL")) {
-
-        char *mask;
-        int res = 0;
-
-        mask = strtok(NULL, "");
-
-        if (!mask) {
-            syntax_error(s_OperServ, u, "SGLINE", OPER_SGLINE_SYNTAX);
-            return MOD_CONT;
-        }
-
-        if (sglines.count == 0) {
-            notice_lang(s_OperServ, u, OPER_SGLINE_LIST_EMPTY);
-            return MOD_CONT;
-        }
-
-        if (isdigit(*mask) && strspn(mask, "1234567890,-") == strlen(mask)) {
-            /* Deleting a range */
-            res = slist_delete_range(&sglines, mask, NULL);
-            if (res == 0) {
-                notice_lang(s_OperServ, u, OPER_SGLINE_NO_MATCH);
-                return MOD_CONT;
-            } else if (res == 1) {
-                notice_lang(s_OperServ, u, OPER_SGLINE_DELETED_ONE);
-            } else {
-                notice_lang(s_OperServ, u, OPER_SGLINE_DELETED_SEVERAL,
-                            res);
-            }
-        } else {
-            if ((res = slist_indexof(&sglines, mask)) == -1) {
-                notice_lang(s_OperServ, u, OPER_SGLINE_NOT_FOUND, mask);
-                return MOD_CONT;
-            }
-
-            slist_delete(&sglines, res);
-            notice_lang(s_OperServ, u, OPER_SGLINE_DELETED, mask);
-        }
-
-        if (readonly)
-            notice_lang(s_OperServ, u, READ_ONLY_MODE);
-
-    } else if (!stricmp(cmd, "LIST")) {
-        char *mask;
-        int res, sent_header = 0;
-
-        if (sglines.count == 0) {
-            notice_lang(s_OperServ, u, OPER_SGLINE_LIST_EMPTY);
-            return MOD_CONT;
-        }
-
-        mask = strtok(NULL, "");
-
-        if (!mask || (isdigit(*mask)
-                      && strspn(mask, "1234567890,-") == strlen(mask))) {
-            res =
-                slist_enum(&sglines, mask, &sgline_list_callback, u,
-                           &sent_header);
-            if (res == 0) {
-                notice_lang(s_OperServ, u, OPER_SGLINE_NO_MATCH);
-                return MOD_CONT;
-            }
-        } else {
-            int i;
-            char *amask;
-
-            for (i = 0; i < sglines.count; i++) {
-                amask = ((SXLine *) sglines.list[i])->mask;
-                if (!stricmp(mask, amask)
-                    || match_wild_nocase(mask, amask))
-                    sgline_list(i + 1, (SXLine *)sglines.list[i], u, &sent_header);
-            }
-
-            if (!sent_header)
-                notice_lang(s_OperServ, u, OPER_SGLINE_NO_MATCH);
-            else {
-                notice_lang(s_OperServ, u, END_OF_ANY_LIST, "SGLine");
-            }
-        }
-    } else if (!stricmp(cmd, "VIEW")) {
-        char *mask;
-        int res, sent_header = 0;
-
-        if (sglines.count == 0) {
-            notice_lang(s_OperServ, u, OPER_SGLINE_LIST_EMPTY);
-            return MOD_CONT;
-        }
-
-        mask = strtok(NULL, "");
-
-        if (!mask || (isdigit(*mask)
-                      && strspn(mask, "1234567890,-") == strlen(mask))) {
-            res =
-                slist_enum(&sglines, mask, &sgline_view_callback, u,
-                           &sent_header);
-            if (res == 0) {
-                notice_lang(s_OperServ, u, OPER_SGLINE_NO_MATCH);
-                return MOD_CONT;
-            }
-        } else {
-            int i;
-            char *amask;
-
-            for (i = 0; i < sglines.count; i++) {
-                amask = ((SXLine *) sglines.list[i])->mask;
-                if (!stricmp(mask, amask)
-                    || match_wild_nocase(mask, amask))
-                    sgline_view(i + 1, (SXLine *)sglines.list[i], u, &sent_header);
-            }
-
-            if (!sent_header)
-                notice_lang(s_OperServ, u, OPER_SGLINE_NO_MATCH);
-        }
-    } else if (!stricmp(cmd, "CLEAR")) {
-        slist_clear(&sglines, 1);
-        notice_lang(s_OperServ, u, OPER_SGLINE_CLEAR);
-    } else {
-        syntax_error(s_OperServ, u, "SGLINE", OPER_SGLINE_SYNTAX);
-    }
-    return MOD_CONT;
+			/* We first do some sanity check on the proposed mask. */
+
+			if (mask && strspn(mask, "*?") == strlen(mask)) {
+				notice_lang(s_OperServ, u, USERHOST_MASK_TOO_WIDE, mask);
+				return MOD_CONT;
+			}
+
+			deleted = add_sgline(u, mask, u->nick, expires, reason);
+			if (deleted < 0)
+				return MOD_CONT;
+			else if (deleted)
+				notice_lang(s_OperServ, u, OPER_SGLINE_DELETED_SEVERAL,
+							deleted);
+			notice_lang(s_OperServ, u, OPER_SGLINE_ADDED, mask);
+
+			if (WallOSSGLine) {
+				char buf[128];
+
+				if (!expires) {
+					strcpy(buf, "does not expire");
+				} else {
+					int wall_expiry = expires - time(NULL);
+					char *s = NULL;
+
+					if (wall_expiry >= 86400) {
+						wall_expiry /= 86400;
+						s = "day";
+					} else if (wall_expiry >= 3600) {
+						wall_expiry /= 3600;
+						s = "hour";
+					} else if (wall_expiry >= 60) {
+						wall_expiry /= 60;
+						s = "minute";
+					}
+
+					snprintf(buf, sizeof(buf), "expires in %d %s%s",
+							 wall_expiry, s,
+							 (wall_expiry == 1) ? "" : "s");
+				}
+
+				ircdproto->SendGlobops(s_OperServ,
+								 "%s added an SGLINE for %s (%s)", u->nick,
+								 mask, buf);
+			}
+
+			if (readonly)
+				notice_lang(s_OperServ, u, READ_ONLY_MODE);
+
+		} else {
+			syntax_error(s_OperServ, u, "SGLINE", OPER_SGLINE_SYNTAX);
+		}
+
+	} else if (!stricmp(cmd, "DEL")) {
+
+		char *mask;
+		int res = 0;
+
+		mask = strtok(NULL, "");
+
+		if (!mask) {
+			syntax_error(s_OperServ, u, "SGLINE", OPER_SGLINE_SYNTAX);
+			return MOD_CONT;
+		}
+
+		if (sglines.count == 0) {
+			notice_lang(s_OperServ, u, OPER_SGLINE_LIST_EMPTY);
+			return MOD_CONT;
+		}
+
+		if (isdigit(*mask) && strspn(mask, "1234567890,-") == strlen(mask)) {
+			/* Deleting a range */
+			res = slist_delete_range(&sglines, mask, NULL);
+			if (res == 0) {
+				notice_lang(s_OperServ, u, OPER_SGLINE_NO_MATCH);
+				return MOD_CONT;
+			} else if (res == 1) {
+				notice_lang(s_OperServ, u, OPER_SGLINE_DELETED_ONE);
+			} else {
+				notice_lang(s_OperServ, u, OPER_SGLINE_DELETED_SEVERAL,
+							res);
+			}
+		} else {
+			if ((res = slist_indexof(&sglines, mask)) == -1) {
+				notice_lang(s_OperServ, u, OPER_SGLINE_NOT_FOUND, mask);
+				return MOD_CONT;
+			}
+
+			slist_delete(&sglines, res);
+			notice_lang(s_OperServ, u, OPER_SGLINE_DELETED, mask);
+		}
+
+		if (readonly)
+			notice_lang(s_OperServ, u, READ_ONLY_MODE);
+
+	} else if (!stricmp(cmd, "LIST")) {
+		char *mask;
+		int res, sent_header = 0;
+
+		if (sglines.count == 0) {
+			notice_lang(s_OperServ, u, OPER_SGLINE_LIST_EMPTY);
+			return MOD_CONT;
+		}
+
+		mask = strtok(NULL, "");
+
+		if (!mask || (isdigit(*mask)
+					  && strspn(mask, "1234567890,-") == strlen(mask))) {
+			res =
+				slist_enum(&sglines, mask, &sgline_list_callback, u,
+						   &sent_header);
+			if (res == 0) {
+				notice_lang(s_OperServ, u, OPER_SGLINE_NO_MATCH);
+				return MOD_CONT;
+			}
+		} else {
+			int i;
+			char *amask;
+
+			for (i = 0; i < sglines.count; i++) {
+				amask = ((SXLine *) sglines.list[i])->mask;
+				if (!stricmp(mask, amask)
+					|| match_wild_nocase(mask, amask))
+					sgline_list(i + 1, (SXLine *)sglines.list[i], u, &sent_header);
+			}
+
+			if (!sent_header)
+				notice_lang(s_OperServ, u, OPER_SGLINE_NO_MATCH);
+			else {
+				notice_lang(s_OperServ, u, END_OF_ANY_LIST, "SGLine");
+			}
+		}
+	} else if (!stricmp(cmd, "VIEW")) {
+		char *mask;
+		int res, sent_header = 0;
+
+		if (sglines.count == 0) {
+			notice_lang(s_OperServ, u, OPER_SGLINE_LIST_EMPTY);
+			return MOD_CONT;
+		}
+
+		mask = strtok(NULL, "");
+
+		if (!mask || (isdigit(*mask)
+					  && strspn(mask, "1234567890,-") == strlen(mask))) {
+			res =
+				slist_enum(&sglines, mask, &sgline_view_callback, u,
+						   &sent_header);
+			if (res == 0) {
+				notice_lang(s_OperServ, u, OPER_SGLINE_NO_MATCH);
+				return MOD_CONT;
+			}
+		} else {
+			int i;
+			char *amask;
+
+			for (i = 0; i < sglines.count; i++) {
+				amask = ((SXLine *) sglines.list[i])->mask;
+				if (!stricmp(mask, amask)
+					|| match_wild_nocase(mask, amask))
+					sgline_view(i + 1, (SXLine *)sglines.list[i], u, &sent_header);
+			}
+
+			if (!sent_header)
+				notice_lang(s_OperServ, u, OPER_SGLINE_NO_MATCH);
+		}
+	} else if (!stricmp(cmd, "CLEAR")) {
+		slist_clear(&sglines, 1);
+		notice_lang(s_OperServ, u, OPER_SGLINE_CLEAR);
+	} else {
+		syntax_error(s_OperServ, u, "SGLINE", OPER_SGLINE_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 /* Lists an SGLINE entry, prefixing it with the header if needed */
 
 int sgline_view(int number, SXLine * sx, User * u, int *sent_header)
 {
-    char timebuf[32], expirebuf[256];
-    struct tm tm;
+	char timebuf[32], expirebuf[256];
+	struct tm tm;
 
-    if (!sx)
-        return 0;
+	if (!sx)
+		return 0;
 
-    if (!*sent_header) {
-        notice_lang(s_OperServ, u, OPER_SGLINE_VIEW_HEADER);
-        *sent_header = 1;
-    }
+	if (!*sent_header) {
+		notice_lang(s_OperServ, u, OPER_SGLINE_VIEW_HEADER);
+		*sent_header = 1;
+	}
 
-    tm = *localtime(&sx->seton);
-    strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_SHORT_DATE_FORMAT,
-                  &tm);
-    expire_left(u->na, expirebuf, sizeof(expirebuf), sx->expires);
-    notice_lang(s_OperServ, u, OPER_SGLINE_VIEW_FORMAT, number, sx->mask,
-                sx->by, timebuf, expirebuf, sx->reason);
+	tm = *localtime(&sx->seton);
+	strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_SHORT_DATE_FORMAT,
+				  &tm);
+	expire_left(u->na, expirebuf, sizeof(expirebuf), sx->expires);
+	notice_lang(s_OperServ, u, OPER_SGLINE_VIEW_FORMAT, number, sx->mask,
+				sx->by, timebuf, expirebuf, sx->reason);
 
-    return 1;
+	return 1;
 }
 
 /* Callback for enumeration purposes */
 
 int sgline_view_callback(SList * slist, int number, void *item,
-                         va_list args)
+						 va_list args)
 {
-    User *u = va_arg(args, User *);
-    int *sent_header = va_arg(args, int *);
+	User *u = va_arg(args, User *);
+	int *sent_header = va_arg(args, int *);
 
-    return sgline_view(number, (SXLine *)item, u, sent_header);
+	return sgline_view(number, (SXLine *)item, u, sent_header);
 }
 
 /* Lists an SGLINE entry, prefixing it with the header if needed */
 
 int sgline_list(int number, SXLine * sx, User * u, int *sent_header)
 {
-    if (!sx)
-        return 0;
+	if (!sx)
+		return 0;
 
-    if (!*sent_header) {
-        notice_lang(s_OperServ, u, OPER_SGLINE_LIST_HEADER);
-        *sent_header = 1;
-    }
+	if (!*sent_header) {
+		notice_lang(s_OperServ, u, OPER_SGLINE_LIST_HEADER);
+		*sent_header = 1;
+	}
 
-    notice_lang(s_OperServ, u, OPER_SGLINE_LIST_FORMAT, number, sx->mask,
-                sx->reason);
+	notice_lang(s_OperServ, u, OPER_SGLINE_LIST_FORMAT, number, sx->mask,
+				sx->reason);
 
-    return 1;
+	return 1;
 }
 
 /* Callback for enumeration purposes */
 
 int sgline_list_callback(SList * slist, int number, void *item,
-                         va_list args)
+						 va_list args)
 {
-    User *u = va_arg(args, User *);
-    int *sent_header = va_arg(args, int *);
+	User *u = va_arg(args, User *);
+	int *sent_header = va_arg(args, int *);
 
-    return sgline_list(number, (SXLine *)item, u, sent_header);
+	return sgline_list(number, (SXLine *)item, u, sent_header);
 }
 
 MODULE_INIT("os_sgline", OSSGLine)
diff --git a/src/core/os_shutdown.c b/src/core/os_shutdown.c
index a981d1555..03099e410 100644
--- a/src/core/os_shutdown.c
+++ b/src/core/os_shutdown.c
@@ -43,9 +43,9 @@ class OSShutdown : public Module
  **/
 void myOperServHelp(User * u)
 {
-    if (is_services_root(u)) {
-        notice_lang(s_OperServ, u, OPER_HELP_CMD_SHUTDOWN);
-    }
+	if (is_services_root(u)) {
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_SHUTDOWN);
+	}
 }
 
 /**
@@ -55,18 +55,18 @@ void myOperServHelp(User * u)
  **/
 int do_shutdown(User * u)
 {
-    quitmsg = (char *)calloc(32 + strlen(u->nick), 1);
-    if (!quitmsg)
-        quitmsg = "SHUTDOWN command received, but out of memory!";
-    else
-        sprintf((char *)quitmsg, /* XXX */ "SHUTDOWN command received from %s", u->nick);
+	quitmsg = (char *)calloc(32 + strlen(u->nick), 1);
+	if (!quitmsg)
+		quitmsg = "SHUTDOWN command received, but out of memory!";
+	else
+		sprintf((char *)quitmsg, /* XXX */ "SHUTDOWN command received from %s", u->nick);
 
-    if (GlobalOnCycle) {
-        oper_global(NULL, "%s", GlobalOnCycleMessage);
-    }
-    save_data = 1;
-    delayed_quit = 1;
-    return MOD_CONT;
+	if (GlobalOnCycle) {
+		oper_global(NULL, "%s", GlobalOnCycleMessage);
+	}
+	save_data = 1;
+	delayed_quit = 1;
+	return MOD_CONT;
 }
 
 MODULE_INIT("os_shutdown", OSShutdown)
diff --git a/src/core/os_sqline.c b/src/core/os_sqline.c
index f6cad0d78..072c224f8 100644
--- a/src/core/os_sqline.c
+++ b/src/core/os_sqline.c
@@ -17,10 +17,10 @@
 
 int do_sqline(User * u);
 int sqline_view_callback(SList * slist, int number, void *item,
-                         va_list args);
+						 va_list args);
 int sqline_view(int number, SXLine * sx, User * u, int *sent_header);
 int sqline_list_callback(SList * slist, int number, void *item,
-                         va_list args);
+						 va_list args);
 int sqline_list(int number, SXLine * sx, User * u, int *sent_header);
 
 void myOperServHelp(User * u);
@@ -53,9 +53,9 @@ class OSSQLine : public Module
  **/
 void myOperServHelp(User * u)
 {
-    if (is_services_oper(u)) {
-        notice_lang(s_OperServ, u, OPER_HELP_CMD_SQLINE);
-    }
+	if (is_services_oper(u)) {
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_SQLINE);
+	}
 }
 
 /**
@@ -65,281 +65,281 @@ void myOperServHelp(User * u)
  **/
 int do_sqline(User * u)
 {
-    char *cmd = strtok(NULL, " ");
-
-    if (!cmd)
-        cmd = "";
-
-    if (!stricmp(cmd, "ADD")) {
-        int deleted = 0;
-        char *expiry, *mask, *reason;
-        time_t expires;
-
-        mask = strtok(NULL, " ");
-        if (mask && *mask == '+') {
-            expiry = mask;
-            mask = strtok(NULL, " ");
-        } else {
-            expiry = NULL;
-        }
-
-        expires = expiry ? dotime(expiry) : SQLineExpiry;
-        /* If the expiry given does not contain a final letter, it's in days,
-         * said the doc. Ah well.
-         */
-        if (expiry && isdigit(expiry[strlen(expiry) - 1]))
-            expires *= 86400;
-        /* Do not allow less than a minute expiry time */
-        if (expires != 0 && expires < 60) {
-            notice_lang(s_OperServ, u, BAD_EXPIRY_TIME);
-            return MOD_CONT;
-        } else if (expires > 0) {
-            expires += time(NULL);
-        }
-
-        if (mask && (reason = strtok(NULL, ""))) {
-
-            /* We first do some sanity check on the proposed mask. */
-            if (strspn(mask, "*") == strlen(mask)) {
-                notice_lang(s_OperServ, u, USERHOST_MASK_TOO_WIDE, mask);
-                return MOD_CONT;
-            }
-
-            /* Channel SQLINEs are only supported on Bahamut servers */
-            if (*mask == '#' && !ircd->chansqline) {
-                notice_lang(s_OperServ, u,
-                            OPER_SQLINE_CHANNELS_UNSUPPORTED);
-                return MOD_CONT;
-            }
-
-            deleted = add_sqline(u, mask, u->nick, expires, reason);
-            if (deleted < 0)
-                return MOD_CONT;
-            else if (deleted)
-                notice_lang(s_OperServ, u, OPER_SQLINE_DELETED_SEVERAL,
-                            deleted);
-            notice_lang(s_OperServ, u, OPER_SQLINE_ADDED, mask);
-
-            if (WallOSSQLine) {
-                char buf[128];
-
-                if (!expires) {
-                    strcpy(buf, "does not expire");
-                } else {
-                    int wall_expiry = expires - time(NULL);
-                    char *s = NULL;
-
-                    if (wall_expiry >= 86400) {
-                        wall_expiry /= 86400;
-                        s = "day";
-                    } else if (wall_expiry >= 3600) {
-                        wall_expiry /= 3600;
-                        s = "hour";
-                    } else if (wall_expiry >= 60) {
-                        wall_expiry /= 60;
-                        s = "minute";
-                    }
-
-                    snprintf(buf, sizeof(buf), "expires in %d %s%s",
-                             wall_expiry, s,
-                             (wall_expiry == 1) ? "" : "s");
-                }
-
-                ircdproto->SendGlobops(s_OperServ,
-                                 "%s added an SQLINE for %s (%s)", u->nick,
-                                 mask, buf);
-            }
-
-            if (readonly)
-                notice_lang(s_OperServ, u, READ_ONLY_MODE);
-
-        } else {
-            syntax_error(s_OperServ, u, "SQLINE", OPER_SQLINE_SYNTAX);
-        }
-
-    } else if (!stricmp(cmd, "DEL")) {
-
-        char *mask;
-        int res = 0;
-
-        mask = strtok(NULL, "");
-
-        if (!mask) {
-            syntax_error(s_OperServ, u, "SQLINE", OPER_SQLINE_SYNTAX);
-            return MOD_CONT;
-        }
-
-        if (sqlines.count == 0) {
-            notice_lang(s_OperServ, u, OPER_SQLINE_LIST_EMPTY);
-            return MOD_CONT;
-        }
-
-        if (isdigit(*mask) && strspn(mask, "1234567890,-") == strlen(mask)) {
-            /* Deleting a range */
-            res = slist_delete_range(&sqlines, mask, NULL);
-            if (res == 0) {
-                notice_lang(s_OperServ, u, OPER_SQLINE_NO_MATCH);
-                return MOD_CONT;
-            } else if (res == 1) {
-                notice_lang(s_OperServ, u, OPER_SQLINE_DELETED_ONE);
-            } else {
-                notice_lang(s_OperServ, u, OPER_SQLINE_DELETED_SEVERAL,
-                            res);
-            }
-        } else {
-            if ((res = slist_indexof(&sqlines, mask)) == -1) {
-                notice_lang(s_OperServ, u, OPER_SQLINE_NOT_FOUND, mask);
-                return MOD_CONT;
-            }
-
-            slist_delete(&sqlines, res);
-            notice_lang(s_OperServ, u, OPER_SQLINE_DELETED, mask);
-        }
-
-        if (readonly)
-            notice_lang(s_OperServ, u, READ_ONLY_MODE);
-
-    } else if (!stricmp(cmd, "LIST")) {
-        char *mask;
-        int res, sent_header = 0;
-
-        if (sqlines.count == 0) {
-            notice_lang(s_OperServ, u, OPER_SQLINE_LIST_EMPTY);
-            return MOD_CONT;
-        }
-
-        mask = strtok(NULL, "");
-
-        if (!mask || (isdigit(*mask)
-                      && strspn(mask, "1234567890,-") == strlen(mask))) {
-            res =
-                slist_enum(&sqlines, mask, &sqline_list_callback, u,
-                           &sent_header);
-            if (res == 0) {
-                notice_lang(s_OperServ, u, OPER_SQLINE_NO_MATCH);
-                return MOD_CONT;
-            }
-        } else {
-            int i;
-            char *amask;
-
-            for (i = 0; i < sqlines.count; i++) {
-                amask = ((SXLine *) sqlines.list[i])->mask;
-                if (!stricmp(mask, amask)
-                    || match_wild_nocase(mask, amask))
-                    sqline_list(i + 1, (SXLine *)sqlines.list[i], u, &sent_header);
-            }
-
-            if (!sent_header)
-                notice_lang(s_OperServ, u, OPER_SQLINE_NO_MATCH);
-            else {
-                notice_lang(s_OperServ, u, END_OF_ANY_LIST, "SQLine");
-            }
-        }
-    } else if (!stricmp(cmd, "VIEW")) {
-        char *mask;
-        int res, sent_header = 0;
-
-        if (sqlines.count == 0) {
-            notice_lang(s_OperServ, u, OPER_SQLINE_LIST_EMPTY);
-            return MOD_CONT;
-        }
-
-        mask = strtok(NULL, "");
-
-        if (!mask || (isdigit(*mask)
-                      && strspn(mask, "1234567890,-") == strlen(mask))) {
-            res =
-                slist_enum(&sqlines, mask, &sqline_view_callback, u,
-                           &sent_header);
-            if (res == 0) {
-                notice_lang(s_OperServ, u, OPER_SQLINE_NO_MATCH);
-                return MOD_CONT;
-            }
-        } else {
-            int i;
-            char *amask;
-
-            for (i = 0; i < sqlines.count; i++) {
-                amask = ((SXLine *) sqlines.list[i])->mask;
-                if (!stricmp(mask, amask)
-                    || match_wild_nocase(mask, amask))
-                    sqline_view(i + 1, (SXLine *)sqlines.list[i], u, &sent_header);
-            }
-
-            if (!sent_header)
-                notice_lang(s_OperServ, u, OPER_SQLINE_NO_MATCH);
-        }
-    } else if (!stricmp(cmd, "CLEAR")) {
-        slist_clear(&sqlines, 1);
-        notice_lang(s_OperServ, u, OPER_SQLINE_CLEAR);
-    } else {
-        syntax_error(s_OperServ, u, "SQLINE", OPER_SQLINE_SYNTAX);
-    }
-    return MOD_CONT;
+	char *cmd = strtok(NULL, " ");
+
+	if (!cmd)
+		cmd = "";
+
+	if (!stricmp(cmd, "ADD")) {
+		int deleted = 0;
+		char *expiry, *mask, *reason;
+		time_t expires;
+
+		mask = strtok(NULL, " ");
+		if (mask && *mask == '+') {
+			expiry = mask;
+			mask = strtok(NULL, " ");
+		} else {
+			expiry = NULL;
+		}
+
+		expires = expiry ? dotime(expiry) : SQLineExpiry;
+		/* If the expiry given does not contain a final letter, it's in days,
+		 * said the doc. Ah well.
+		 */
+		if (expiry && isdigit(expiry[strlen(expiry) - 1]))
+			expires *= 86400;
+		/* Do not allow less than a minute expiry time */
+		if (expires != 0 && expires < 60) {
+			notice_lang(s_OperServ, u, BAD_EXPIRY_TIME);
+			return MOD_CONT;
+		} else if (expires > 0) {
+			expires += time(NULL);
+		}
+
+		if (mask && (reason = strtok(NULL, ""))) {
+
+			/* We first do some sanity check on the proposed mask. */
+			if (strspn(mask, "*") == strlen(mask)) {
+				notice_lang(s_OperServ, u, USERHOST_MASK_TOO_WIDE, mask);
+				return MOD_CONT;
+			}
+
+			/* Channel SQLINEs are only supported on Bahamut servers */
+			if (*mask == '#' && !ircd->chansqline) {
+				notice_lang(s_OperServ, u,
+							OPER_SQLINE_CHANNELS_UNSUPPORTED);
+				return MOD_CONT;
+			}
+
+			deleted = add_sqline(u, mask, u->nick, expires, reason);
+			if (deleted < 0)
+				return MOD_CONT;
+			else if (deleted)
+				notice_lang(s_OperServ, u, OPER_SQLINE_DELETED_SEVERAL,
+							deleted);
+			notice_lang(s_OperServ, u, OPER_SQLINE_ADDED, mask);
+
+			if (WallOSSQLine) {
+				char buf[128];
+
+				if (!expires) {
+					strcpy(buf, "does not expire");
+				} else {
+					int wall_expiry = expires - time(NULL);
+					char *s = NULL;
+
+					if (wall_expiry >= 86400) {
+						wall_expiry /= 86400;
+						s = "day";
+					} else if (wall_expiry >= 3600) {
+						wall_expiry /= 3600;
+						s = "hour";
+					} else if (wall_expiry >= 60) {
+						wall_expiry /= 60;
+						s = "minute";
+					}
+
+					snprintf(buf, sizeof(buf), "expires in %d %s%s",
+							 wall_expiry, s,
+							 (wall_expiry == 1) ? "" : "s");
+				}
+
+				ircdproto->SendGlobops(s_OperServ,
+								 "%s added an SQLINE for %s (%s)", u->nick,
+								 mask, buf);
+			}
+
+			if (readonly)
+				notice_lang(s_OperServ, u, READ_ONLY_MODE);
+
+		} else {
+			syntax_error(s_OperServ, u, "SQLINE", OPER_SQLINE_SYNTAX);
+		}
+
+	} else if (!stricmp(cmd, "DEL")) {
+
+		char *mask;
+		int res = 0;
+
+		mask = strtok(NULL, "");
+
+		if (!mask) {
+			syntax_error(s_OperServ, u, "SQLINE", OPER_SQLINE_SYNTAX);
+			return MOD_CONT;
+		}
+
+		if (sqlines.count == 0) {
+			notice_lang(s_OperServ, u, OPER_SQLINE_LIST_EMPTY);
+			return MOD_CONT;
+		}
+
+		if (isdigit(*mask) && strspn(mask, "1234567890,-") == strlen(mask)) {
+			/* Deleting a range */
+			res = slist_delete_range(&sqlines, mask, NULL);
+			if (res == 0) {
+				notice_lang(s_OperServ, u, OPER_SQLINE_NO_MATCH);
+				return MOD_CONT;
+			} else if (res == 1) {
+				notice_lang(s_OperServ, u, OPER_SQLINE_DELETED_ONE);
+			} else {
+				notice_lang(s_OperServ, u, OPER_SQLINE_DELETED_SEVERAL,
+							res);
+			}
+		} else {
+			if ((res = slist_indexof(&sqlines, mask)) == -1) {
+				notice_lang(s_OperServ, u, OPER_SQLINE_NOT_FOUND, mask);
+				return MOD_CONT;
+			}
+
+			slist_delete(&sqlines, res);
+			notice_lang(s_OperServ, u, OPER_SQLINE_DELETED, mask);
+		}
+
+		if (readonly)
+			notice_lang(s_OperServ, u, READ_ONLY_MODE);
+
+	} else if (!stricmp(cmd, "LIST")) {
+		char *mask;
+		int res, sent_header = 0;
+
+		if (sqlines.count == 0) {
+			notice_lang(s_OperServ, u, OPER_SQLINE_LIST_EMPTY);
+			return MOD_CONT;
+		}
+
+		mask = strtok(NULL, "");
+
+		if (!mask || (isdigit(*mask)
+					  && strspn(mask, "1234567890,-") == strlen(mask))) {
+			res =
+				slist_enum(&sqlines, mask, &sqline_list_callback, u,
+						   &sent_header);
+			if (res == 0) {
+				notice_lang(s_OperServ, u, OPER_SQLINE_NO_MATCH);
+				return MOD_CONT;
+			}
+		} else {
+			int i;
+			char *amask;
+
+			for (i = 0; i < sqlines.count; i++) {
+				amask = ((SXLine *) sqlines.list[i])->mask;
+				if (!stricmp(mask, amask)
+					|| match_wild_nocase(mask, amask))
+					sqline_list(i + 1, (SXLine *)sqlines.list[i], u, &sent_header);
+			}
+
+			if (!sent_header)
+				notice_lang(s_OperServ, u, OPER_SQLINE_NO_MATCH);
+			else {
+				notice_lang(s_OperServ, u, END_OF_ANY_LIST, "SQLine");
+			}
+		}
+	} else if (!stricmp(cmd, "VIEW")) {
+		char *mask;
+		int res, sent_header = 0;
+
+		if (sqlines.count == 0) {
+			notice_lang(s_OperServ, u, OPER_SQLINE_LIST_EMPTY);
+			return MOD_CONT;
+		}
+
+		mask = strtok(NULL, "");
+
+		if (!mask || (isdigit(*mask)
+					  && strspn(mask, "1234567890,-") == strlen(mask))) {
+			res =
+				slist_enum(&sqlines, mask, &sqline_view_callback, u,
+						   &sent_header);
+			if (res == 0) {
+				notice_lang(s_OperServ, u, OPER_SQLINE_NO_MATCH);
+				return MOD_CONT;
+			}
+		} else {
+			int i;
+			char *amask;
+
+			for (i = 0; i < sqlines.count; i++) {
+				amask = ((SXLine *) sqlines.list[i])->mask;
+				if (!stricmp(mask, amask)
+					|| match_wild_nocase(mask, amask))
+					sqline_view(i + 1, (SXLine *)sqlines.list[i], u, &sent_header);
+			}
+
+			if (!sent_header)
+				notice_lang(s_OperServ, u, OPER_SQLINE_NO_MATCH);
+		}
+	} else if (!stricmp(cmd, "CLEAR")) {
+		slist_clear(&sqlines, 1);
+		notice_lang(s_OperServ, u, OPER_SQLINE_CLEAR);
+	} else {
+		syntax_error(s_OperServ, u, "SQLINE", OPER_SQLINE_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 int sqline_view(int number, SXLine * sx, User * u, int *sent_header)
 {
-    char timebuf[32], expirebuf[256];
-    struct tm tm;
+	char timebuf[32], expirebuf[256];
+	struct tm tm;
 
-    if (!sx)
-        return 0;
+	if (!sx)
+		return 0;
 
-    if (!*sent_header) {
-        notice_lang(s_OperServ, u, OPER_SQLINE_VIEW_HEADER);
-        *sent_header = 1;
-    }
+	if (!*sent_header) {
+		notice_lang(s_OperServ, u, OPER_SQLINE_VIEW_HEADER);
+		*sent_header = 1;
+	}
 
-    tm = *localtime(&sx->seton);
-    strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_SHORT_DATE_FORMAT,
-                  &tm);
-    expire_left(u->na, expirebuf, sizeof(expirebuf), sx->expires);
-    notice_lang(s_OperServ, u, OPER_SQLINE_VIEW_FORMAT, number, sx->mask,
-                sx->by, timebuf, expirebuf, sx->reason);
+	tm = *localtime(&sx->seton);
+	strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_SHORT_DATE_FORMAT,
+				  &tm);
+	expire_left(u->na, expirebuf, sizeof(expirebuf), sx->expires);
+	notice_lang(s_OperServ, u, OPER_SQLINE_VIEW_FORMAT, number, sx->mask,
+				sx->by, timebuf, expirebuf, sx->reason);
 
-    return 1;
+	return 1;
 }
 
 /* Callback for enumeration purposes */
 
 int sqline_view_callback(SList * slist, int number, void *item,
-                         va_list args)
+						 va_list args)
 {
-    User *u = va_arg(args, User *);
-    int *sent_header = va_arg(args, int *);
+	User *u = va_arg(args, User *);
+	int *sent_header = va_arg(args, int *);
 
-    return sqline_view(number, (SXLine *)item, u, sent_header);
+	return sqline_view(number, (SXLine *)item, u, sent_header);
 }
 
 /* Lists an SQLINE entry, prefixing it with the header if needed */
 
 int sqline_list(int number, SXLine * sx, User * u, int *sent_header)
 {
-    if (!sx)
-        return 0;
+	if (!sx)
+		return 0;
 
-    if (!*sent_header) {
-        notice_lang(s_OperServ, u, OPER_SQLINE_LIST_HEADER);
-        *sent_header = 1;
-    }
+	if (!*sent_header) {
+		notice_lang(s_OperServ, u, OPER_SQLINE_LIST_HEADER);
+		*sent_header = 1;
+	}
 
-    notice_lang(s_OperServ, u, OPER_SQLINE_LIST_FORMAT, number, sx->mask,
-                sx->reason);
+	notice_lang(s_OperServ, u, OPER_SQLINE_LIST_FORMAT, number, sx->mask,
+				sx->reason);
 
-    return 1;
+	return 1;
 }
 
 /* Callback for enumeration purposes */
 
 int sqline_list_callback(SList * slist, int number, void *item,
-                         va_list args)
+						 va_list args)
 {
-    User *u = va_arg(args, User *);
-    int *sent_header = va_arg(args, int *);
+	User *u = va_arg(args, User *);
+	int *sent_header = va_arg(args, int *);
 
-    return sqline_list(number, (SXLine *)item, u, sent_header);
+	return sqline_list(number, (SXLine *)item, u, sent_header);
 }
 
 MODULE_INIT("os_sqline", OSSQLine)
diff --git a/src/core/os_staff.c b/src/core/os_staff.c
index fa29b2b7d..9e5b820b4 100644
--- a/src/core/os_staff.c
+++ b/src/core/os_staff.c
@@ -18,7 +18,7 @@
 int do_staff(User * u);
 void myOperServHelp(User * u);
 int opers_list_callback(SList * slist, int number, void *item,
-                        va_list args);
+						va_list args);
 int opers_list(int number, NickCore * nc, User * u, char *level);
 
 class OSStaff : public Module
@@ -46,7 +46,7 @@ class OSStaff : public Module
  **/
 void myOperServHelp(User * u)
 {
-    notice_lang(s_OperServ, u, OPER_HELP_CMD_STAFF);
+	notice_lang(s_OperServ, u, OPER_HELP_CMD_STAFF);
 }
 
 /**
@@ -56,53 +56,53 @@ void myOperServHelp(User * u)
  **/
 int do_staff(User * u)
 {
-    int idx = 0;
-    User *au = NULL;
-    NickCore *nc;
-    NickAlias *na;
-    int found;
-    int i;
-
-    notice_lang(s_OperServ, u, OPER_STAFF_LIST_HEADER);
-    slist_enum(&servopers, NULL, &opers_list_callback, u, "OPER");
-    slist_enum(&servadmins, NULL, &opers_list_callback, u, "ADMN");
-
-    for (idx = 0; idx < RootNumber; idx++) {
-        found = 0;
-        if ((au = finduser(ServicesRoots[idx]))) {      /* see if user is online */
-            found = 1;
-            notice_lang(s_OperServ, u, OPER_STAFF_FORMAT, '*', "ROOT",
-                        ServicesRoots[idx]);
-        } else if ((nc = findcore(ServicesRoots[idx]))) {
-            for (i = 0; i < nc->aliases.count; i++) {   /* check all aliases */
-                na = (NickAlias *)nc->aliases.list[i];
-                if ((au = finduser(na->nick))) {        /* see if user is online */
-                    found = 1;
-                    notice_lang(s_OperServ, u, OPER_STAFF_AFORMAT,
-                                '*', "ROOT", ServicesRoots[idx], na->nick);
-                }
-            }
-        }
-
-        if (!found)
-            notice_lang(s_OperServ, u, OPER_STAFF_FORMAT, ' ', "ROOT",
-                        ServicesRoots[idx]);
-
-    }
-    notice_lang(s_OperServ, u, END_OF_ANY_LIST, "Staff");
-    return MOD_CONT;
+	int idx = 0;
+	User *au = NULL;
+	NickCore *nc;
+	NickAlias *na;
+	int found;
+	int i;
+
+	notice_lang(s_OperServ, u, OPER_STAFF_LIST_HEADER);
+	slist_enum(&servopers, NULL, &opers_list_callback, u, "OPER");
+	slist_enum(&servadmins, NULL, &opers_list_callback, u, "ADMN");
+
+	for (idx = 0; idx < RootNumber; idx++) {
+		found = 0;
+		if ((au = finduser(ServicesRoots[idx]))) {	  /* see if user is online */
+			found = 1;
+			notice_lang(s_OperServ, u, OPER_STAFF_FORMAT, '*', "ROOT",
+						ServicesRoots[idx]);
+		} else if ((nc = findcore(ServicesRoots[idx]))) {
+			for (i = 0; i < nc->aliases.count; i++) {   /* check all aliases */
+				na = (NickAlias *)nc->aliases.list[i];
+				if ((au = finduser(na->nick))) {		/* see if user is online */
+					found = 1;
+					notice_lang(s_OperServ, u, OPER_STAFF_AFORMAT,
+								'*', "ROOT", ServicesRoots[idx], na->nick);
+				}
+			}
+		}
+
+		if (!found)
+			notice_lang(s_OperServ, u, OPER_STAFF_FORMAT, ' ', "ROOT",
+						ServicesRoots[idx]);
+
+	}
+	notice_lang(s_OperServ, u, END_OF_ANY_LIST, "Staff");
+	return MOD_CONT;
 }
 
 /**
  * Function for the enumerator to call
  **/
 int opers_list_callback(SList * slist, int number, void *item,
-                        va_list args)
+						va_list args)
 {
-    User *u = va_arg(args, User *);
-    char *level = va_arg(args, char *);
+	User *u = va_arg(args, User *);
+	char *level = va_arg(args, char *);
 
-    return opers_list(number, (NickCore *)item, u, level);
+	return opers_list(number, (NickCore *)item, u, level);
 }
 
 
@@ -111,35 +111,35 @@ int opers_list_callback(SList * slist, int number, void *item,
  **/
 int opers_list(int number, NickCore * nc, User * u, char *level)
 {
-    User *au = NULL;
-    NickAlias *na;
-    int found;
-    int i;
-
-    if (!nc)
-        return 0;
-
-    found = 0;
-    if ((au = finduser(nc->display))) { /* see if user is online */
-        found = 1;
-        notice_lang(s_OperServ, u, OPER_STAFF_FORMAT, '*', level,
-                    nc->display);
-    } else {
-        for (i = 0; i < nc->aliases.count; i++) {       /* check all aliases */
-            na = (NickAlias *)nc->aliases.list[i];
-            if ((au = finduser(na->nick))) {    /* see if user is online */
-                found = 1;
-                notice_lang(s_OperServ, u, OPER_STAFF_AFORMAT, '*', level,
-                            nc->display, na->nick);
-            }
-        }
-    }
-
-    if (!found)
-        notice_lang(s_OperServ, u, OPER_STAFF_FORMAT, ' ', level,
-                    nc->display);
-
-    return 1;
+	User *au = NULL;
+	NickAlias *na;
+	int found;
+	int i;
+
+	if (!nc)
+		return 0;
+
+	found = 0;
+	if ((au = finduser(nc->display))) { /* see if user is online */
+		found = 1;
+		notice_lang(s_OperServ, u, OPER_STAFF_FORMAT, '*', level,
+					nc->display);
+	} else {
+		for (i = 0; i < nc->aliases.count; i++) {	   /* check all aliases */
+			na = (NickAlias *)nc->aliases.list[i];
+			if ((au = finduser(na->nick))) {	/* see if user is online */
+				found = 1;
+				notice_lang(s_OperServ, u, OPER_STAFF_AFORMAT, '*', level,
+							nc->display, na->nick);
+			}
+		}
+	}
+
+	if (!found)
+		notice_lang(s_OperServ, u, OPER_STAFF_FORMAT, ' ', level,
+					nc->display);
+
+	return 1;
 }
 
 MODULE_INIT("os_staff", OSStaff)
diff --git a/src/core/os_stats.c b/src/core/os_stats.c
index dea85b770..35a0f03f7 100644
--- a/src/core/os_stats.c
+++ b/src/core/os_stats.c
@@ -48,7 +48,7 @@ class OSStats : public Module
  **/
 void myOperServHelp(User * u)
 {
-    notice_lang(s_OperServ, u, OPER_HELP_CMD_STATS);
+	notice_lang(s_OperServ, u, OPER_HELP_CMD_STATS);
 }
 
 /**
@@ -58,16 +58,16 @@ void myOperServHelp(User * u)
  **/
 int stats_count_servers(Server * s)
 {
-    int count = 0;
+	int count = 0;
 
-    while (s) {
-        count++;
-        if (s->links)
-            count += stats_count_servers(s->links);
-        s = s->next;
-    }
+	while (s) {
+		count++;
+		if (s->links)
+			count += stats_count_servers(s->links);
+		s = s->next;
+	}
 
-    return count;
+	return count;
 }
 
 /**
@@ -77,365 +77,365 @@ int stats_count_servers(Server * s)
  **/
 int do_stats(User * u)
 {
-    time_t uptime = time(NULL) - start_time;
-    char *extra = strtok(NULL, "");
-    int days = uptime / 86400, hours = (uptime / 3600) % 24,
-        mins = (uptime / 60) % 60, secs = uptime % 60;
-    struct tm *tm;
-    char timebuf[64];
-    char buf[512];
-    int buflen;
-    int i;
+	time_t uptime = time(NULL) - start_time;
+	char *extra = strtok(NULL, "");
+	int days = uptime / 86400, hours = (uptime / 3600) % 24,
+		mins = (uptime / 60) % 60, secs = uptime % 60;
+	struct tm *tm;
+	char timebuf[64];
+	char buf[512];
+	int buflen;
+	int i;
 
-    if (extra && stricmp(extra, "ALL") != 0) {
-        if (stricmp(extra, "AKILL") == 0) {
-            int timeout;
-            /* AKILLs */
-            notice_lang(s_OperServ, u, OPER_STATS_AKILL_COUNT,
-                        akills.count);
-            timeout = AutokillExpiry + 59;
-            if (timeout >= 172800)
-                notice_lang(s_OperServ, u, OPER_STATS_AKILL_EXPIRE_DAYS,
-                            timeout / 86400);
-            else if (timeout >= 86400)
-                notice_lang(s_OperServ, u, OPER_STATS_AKILL_EXPIRE_DAY);
-            else if (timeout >= 7200)
-                notice_lang(s_OperServ, u, OPER_STATS_AKILL_EXPIRE_HOURS,
-                            timeout / 3600);
-            else if (timeout >= 3600)
-                notice_lang(s_OperServ, u, OPER_STATS_AKILL_EXPIRE_HOUR);
-            else if (timeout >= 120)
-                notice_lang(s_OperServ, u, OPER_STATS_AKILL_EXPIRE_MINS,
-                            timeout / 60);
-            else if (timeout >= 60)
-                notice_lang(s_OperServ, u, OPER_STATS_AKILL_EXPIRE_MIN);
-            else
-                notice_lang(s_OperServ, u, OPER_STATS_AKILL_EXPIRE_NONE);
-            if (ircd->sgline) {
-                /* SGLINEs */
-                notice_lang(s_OperServ, u, OPER_STATS_SGLINE_COUNT,
-                            sglines.count);
-                timeout = SGLineExpiry + 59;
-                if (timeout >= 172800)
-                    notice_lang(s_OperServ, u,
-                                OPER_STATS_SGLINE_EXPIRE_DAYS,
-                                timeout / 86400);
-                else if (timeout >= 86400)
-                    notice_lang(s_OperServ, u,
-                                OPER_STATS_SGLINE_EXPIRE_DAY);
-                else if (timeout >= 7200)
-                    notice_lang(s_OperServ, u,
-                                OPER_STATS_SGLINE_EXPIRE_HOURS,
-                                timeout / 3600);
-                else if (timeout >= 3600)
-                    notice_lang(s_OperServ, u,
-                                OPER_STATS_SGLINE_EXPIRE_HOUR);
-                else if (timeout >= 120)
-                    notice_lang(s_OperServ, u,
-                                OPER_STATS_SGLINE_EXPIRE_MINS,
-                                timeout / 60);
-                else if (timeout >= 60)
-                    notice_lang(s_OperServ, u,
-                                OPER_STATS_SGLINE_EXPIRE_MIN);
-                else
-                    notice_lang(s_OperServ, u,
-                                OPER_STATS_SGLINE_EXPIRE_NONE);
-            }
-            if (ircd->sqline) {
-                /* SQLINEs */
-                notice_lang(s_OperServ, u, OPER_STATS_SQLINE_COUNT,
-                            sqlines.count);
-                timeout = SQLineExpiry + 59;
-                if (timeout >= 172800)
-                    notice_lang(s_OperServ, u,
-                                OPER_STATS_SQLINE_EXPIRE_DAYS,
-                                timeout / 86400);
-                else if (timeout >= 86400)
-                    notice_lang(s_OperServ, u,
-                                OPER_STATS_SQLINE_EXPIRE_DAY);
-                else if (timeout >= 7200)
-                    notice_lang(s_OperServ, u,
-                                OPER_STATS_SQLINE_EXPIRE_HOURS,
-                                timeout / 3600);
-                else if (timeout >= 3600)
-                    notice_lang(s_OperServ, u,
-                                OPER_STATS_SQLINE_EXPIRE_HOUR);
-                else if (timeout >= 120)
-                    notice_lang(s_OperServ, u,
-                                OPER_STATS_SQLINE_EXPIRE_MINS,
-                                timeout / 60);
-                else if (timeout >= 60)
-                    notice_lang(s_OperServ, u,
-                                OPER_STATS_SQLINE_EXPIRE_MIN);
-                else
-                    notice_lang(s_OperServ, u,
-                                OPER_STATS_SQLINE_EXPIRE_NONE);
-            }
-            if (ircd->szline) {
-                /* SZLINEs */
-                notice_lang(s_OperServ, u, OPER_STATS_SZLINE_COUNT,
-                            szlines.count);
-                timeout = SZLineExpiry + 59;
-                if (timeout >= 172800)
-                    notice_lang(s_OperServ, u,
-                                OPER_STATS_SZLINE_EXPIRE_DAYS,
-                                timeout / 86400);
-                else if (timeout >= 86400)
-                    notice_lang(s_OperServ, u,
-                                OPER_STATS_SZLINE_EXPIRE_DAY);
-                else if (timeout >= 7200)
-                    notice_lang(s_OperServ, u,
-                                OPER_STATS_SZLINE_EXPIRE_HOURS,
-                                timeout / 3600);
-                else if (timeout >= 3600)
-                    notice_lang(s_OperServ, u,
-                                OPER_STATS_SZLINE_EXPIRE_HOUR);
-                else if (timeout >= 120)
-                    notice_lang(s_OperServ, u,
-                                OPER_STATS_SZLINE_EXPIRE_MINS,
-                                timeout / 60);
-                else if (timeout >= 60)
-                    notice_lang(s_OperServ, u,
-                                OPER_STATS_SZLINE_EXPIRE_MIN);
-                else
-                    notice_lang(s_OperServ, u,
-                                OPER_STATS_SZLINE_EXPIRE_NONE);
-            }
-            return MOD_CONT;
-        } else if (!stricmp(extra, "RESET")) {
-            if (is_services_admin(u)) {
-                maxusercnt = usercnt;
-                notice_lang(s_OperServ, u, OPER_STATS_RESET);
-            } else {
-                notice_lang(s_OperServ, u, PERMISSION_DENIED);
-            }
-            return MOD_CONT;
-        } else if (stricmp(extra, "MEMORY") && stricmp(extra, "UPLINK")) {
-            notice_lang(s_OperServ, u, OPER_STATS_UNKNOWN_OPTION, extra);
-        }
-    }
+	if (extra && stricmp(extra, "ALL") != 0) {
+		if (stricmp(extra, "AKILL") == 0) {
+			int timeout;
+			/* AKILLs */
+			notice_lang(s_OperServ, u, OPER_STATS_AKILL_COUNT,
+						akills.count);
+			timeout = AutokillExpiry + 59;
+			if (timeout >= 172800)
+				notice_lang(s_OperServ, u, OPER_STATS_AKILL_EXPIRE_DAYS,
+							timeout / 86400);
+			else if (timeout >= 86400)
+				notice_lang(s_OperServ, u, OPER_STATS_AKILL_EXPIRE_DAY);
+			else if (timeout >= 7200)
+				notice_lang(s_OperServ, u, OPER_STATS_AKILL_EXPIRE_HOURS,
+							timeout / 3600);
+			else if (timeout >= 3600)
+				notice_lang(s_OperServ, u, OPER_STATS_AKILL_EXPIRE_HOUR);
+			else if (timeout >= 120)
+				notice_lang(s_OperServ, u, OPER_STATS_AKILL_EXPIRE_MINS,
+							timeout / 60);
+			else if (timeout >= 60)
+				notice_lang(s_OperServ, u, OPER_STATS_AKILL_EXPIRE_MIN);
+			else
+				notice_lang(s_OperServ, u, OPER_STATS_AKILL_EXPIRE_NONE);
+			if (ircd->sgline) {
+				/* SGLINEs */
+				notice_lang(s_OperServ, u, OPER_STATS_SGLINE_COUNT,
+							sglines.count);
+				timeout = SGLineExpiry + 59;
+				if (timeout >= 172800)
+					notice_lang(s_OperServ, u,
+								OPER_STATS_SGLINE_EXPIRE_DAYS,
+								timeout / 86400);
+				else if (timeout >= 86400)
+					notice_lang(s_OperServ, u,
+								OPER_STATS_SGLINE_EXPIRE_DAY);
+				else if (timeout >= 7200)
+					notice_lang(s_OperServ, u,
+								OPER_STATS_SGLINE_EXPIRE_HOURS,
+								timeout / 3600);
+				else if (timeout >= 3600)
+					notice_lang(s_OperServ, u,
+								OPER_STATS_SGLINE_EXPIRE_HOUR);
+				else if (timeout >= 120)
+					notice_lang(s_OperServ, u,
+								OPER_STATS_SGLINE_EXPIRE_MINS,
+								timeout / 60);
+				else if (timeout >= 60)
+					notice_lang(s_OperServ, u,
+								OPER_STATS_SGLINE_EXPIRE_MIN);
+				else
+					notice_lang(s_OperServ, u,
+								OPER_STATS_SGLINE_EXPIRE_NONE);
+			}
+			if (ircd->sqline) {
+				/* SQLINEs */
+				notice_lang(s_OperServ, u, OPER_STATS_SQLINE_COUNT,
+							sqlines.count);
+				timeout = SQLineExpiry + 59;
+				if (timeout >= 172800)
+					notice_lang(s_OperServ, u,
+								OPER_STATS_SQLINE_EXPIRE_DAYS,
+								timeout / 86400);
+				else if (timeout >= 86400)
+					notice_lang(s_OperServ, u,
+								OPER_STATS_SQLINE_EXPIRE_DAY);
+				else if (timeout >= 7200)
+					notice_lang(s_OperServ, u,
+								OPER_STATS_SQLINE_EXPIRE_HOURS,
+								timeout / 3600);
+				else if (timeout >= 3600)
+					notice_lang(s_OperServ, u,
+								OPER_STATS_SQLINE_EXPIRE_HOUR);
+				else if (timeout >= 120)
+					notice_lang(s_OperServ, u,
+								OPER_STATS_SQLINE_EXPIRE_MINS,
+								timeout / 60);
+				else if (timeout >= 60)
+					notice_lang(s_OperServ, u,
+								OPER_STATS_SQLINE_EXPIRE_MIN);
+				else
+					notice_lang(s_OperServ, u,
+								OPER_STATS_SQLINE_EXPIRE_NONE);
+			}
+			if (ircd->szline) {
+				/* SZLINEs */
+				notice_lang(s_OperServ, u, OPER_STATS_SZLINE_COUNT,
+							szlines.count);
+				timeout = SZLineExpiry + 59;
+				if (timeout >= 172800)
+					notice_lang(s_OperServ, u,
+								OPER_STATS_SZLINE_EXPIRE_DAYS,
+								timeout / 86400);
+				else if (timeout >= 86400)
+					notice_lang(s_OperServ, u,
+								OPER_STATS_SZLINE_EXPIRE_DAY);
+				else if (timeout >= 7200)
+					notice_lang(s_OperServ, u,
+								OPER_STATS_SZLINE_EXPIRE_HOURS,
+								timeout / 3600);
+				else if (timeout >= 3600)
+					notice_lang(s_OperServ, u,
+								OPER_STATS_SZLINE_EXPIRE_HOUR);
+				else if (timeout >= 120)
+					notice_lang(s_OperServ, u,
+								OPER_STATS_SZLINE_EXPIRE_MINS,
+								timeout / 60);
+				else if (timeout >= 60)
+					notice_lang(s_OperServ, u,
+								OPER_STATS_SZLINE_EXPIRE_MIN);
+				else
+					notice_lang(s_OperServ, u,
+								OPER_STATS_SZLINE_EXPIRE_NONE);
+			}
+			return MOD_CONT;
+		} else if (!stricmp(extra, "RESET")) {
+			if (is_services_admin(u)) {
+				maxusercnt = usercnt;
+				notice_lang(s_OperServ, u, OPER_STATS_RESET);
+			} else {
+				notice_lang(s_OperServ, u, PERMISSION_DENIED);
+			}
+			return MOD_CONT;
+		} else if (stricmp(extra, "MEMORY") && stricmp(extra, "UPLINK")) {
+			notice_lang(s_OperServ, u, OPER_STATS_UNKNOWN_OPTION, extra);
+		}
+	}
 
-    if (!extra || ((stricmp(extra, "MEMORY") != 0)
-                   && (stricmp(extra, "UPLINK") != 0))) {
-        notice_lang(s_OperServ, u, OPER_STATS_CURRENT_USERS, usercnt,
-                    opcnt);
-        tm = localtime(&maxusertime);
-        strftime_lang(timebuf, sizeof(timebuf), u,
-                      STRFTIME_DATE_TIME_FORMAT, tm);
-        notice_lang(s_OperServ, u, OPER_STATS_MAX_USERS, maxusercnt,
-                    timebuf);
-        if (days > 1) {
-            notice_lang(s_OperServ, u, OPER_STATS_UPTIME_DHMS,
-                        days, hours, mins, secs);
-        } else if (days == 1) {
-            notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1DHMS,
-                        days, hours, mins, secs);
-        } else {
-            if (hours > 1) {
-                if (mins != 1) {
-                    if (secs != 1) {
-                        notice_lang(s_OperServ, u, OPER_STATS_UPTIME_HMS,
-                                    hours, mins, secs);
-                    } else {
-                        notice_lang(s_OperServ, u, OPER_STATS_UPTIME_HM1S,
-                                    hours, mins, secs);
-                    }
-                } else {
-                    if (secs != 1) {
-                        notice_lang(s_OperServ, u, OPER_STATS_UPTIME_H1MS,
-                                    hours, mins, secs);
-                    } else {
-                        notice_lang(s_OperServ, u, OPER_STATS_UPTIME_H1M1S,
-                                    hours, mins, secs);
-                    }
-                }
-            } else if (hours == 1) {
-                if (mins != 1) {
-                    if (secs != 1) {
-                        notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1HMS,
-                                    hours, mins, secs);
-                    } else {
-                        notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1HM1S,
-                                    hours, mins, secs);
-                    }
-                } else {
-                    if (secs != 1) {
-                        notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1H1MS,
-                                    hours, mins, secs);
-                    } else {
-                        notice_lang(s_OperServ, u,
-                                    OPER_STATS_UPTIME_1H1M1S, hours, mins,
-                                    secs);
-                    }
-                }
-            } else {
-                if (mins != 1) {
-                    if (secs != 1) {
-                        notice_lang(s_OperServ, u, OPER_STATS_UPTIME_MS,
-                                    mins, secs);
-                    } else {
-                        notice_lang(s_OperServ, u, OPER_STATS_UPTIME_M1S,
-                                    mins, secs);
-                    }
-                } else {
-                    if (secs != 1) {
-                        notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1MS,
-                                    mins, secs);
-                    } else {
-                        notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1M1S,
-                                    mins, secs);
-                    }
-                }
-            }
-        }
-    }
+	if (!extra || ((stricmp(extra, "MEMORY") != 0)
+				   && (stricmp(extra, "UPLINK") != 0))) {
+		notice_lang(s_OperServ, u, OPER_STATS_CURRENT_USERS, usercnt,
+					opcnt);
+		tm = localtime(&maxusertime);
+		strftime_lang(timebuf, sizeof(timebuf), u,
+					  STRFTIME_DATE_TIME_FORMAT, tm);
+		notice_lang(s_OperServ, u, OPER_STATS_MAX_USERS, maxusercnt,
+					timebuf);
+		if (days > 1) {
+			notice_lang(s_OperServ, u, OPER_STATS_UPTIME_DHMS,
+						days, hours, mins, secs);
+		} else if (days == 1) {
+			notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1DHMS,
+						days, hours, mins, secs);
+		} else {
+			if (hours > 1) {
+				if (mins != 1) {
+					if (secs != 1) {
+						notice_lang(s_OperServ, u, OPER_STATS_UPTIME_HMS,
+									hours, mins, secs);
+					} else {
+						notice_lang(s_OperServ, u, OPER_STATS_UPTIME_HM1S,
+									hours, mins, secs);
+					}
+				} else {
+					if (secs != 1) {
+						notice_lang(s_OperServ, u, OPER_STATS_UPTIME_H1MS,
+									hours, mins, secs);
+					} else {
+						notice_lang(s_OperServ, u, OPER_STATS_UPTIME_H1M1S,
+									hours, mins, secs);
+					}
+				}
+			} else if (hours == 1) {
+				if (mins != 1) {
+					if (secs != 1) {
+						notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1HMS,
+									hours, mins, secs);
+					} else {
+						notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1HM1S,
+									hours, mins, secs);
+					}
+				} else {
+					if (secs != 1) {
+						notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1H1MS,
+									hours, mins, secs);
+					} else {
+						notice_lang(s_OperServ, u,
+									OPER_STATS_UPTIME_1H1M1S, hours, mins,
+									secs);
+					}
+				}
+			} else {
+				if (mins != 1) {
+					if (secs != 1) {
+						notice_lang(s_OperServ, u, OPER_STATS_UPTIME_MS,
+									mins, secs);
+					} else {
+						notice_lang(s_OperServ, u, OPER_STATS_UPTIME_M1S,
+									mins, secs);
+					}
+				} else {
+					if (secs != 1) {
+						notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1MS,
+									mins, secs);
+					} else {
+						notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1M1S,
+									mins, secs);
+					}
+				}
+			}
+		}
+	}
 
-    if (extra && ((stricmp(extra, "ALL") == 0)
-                  || (stricmp(extra, "UPLINK") == 0))
-        && is_services_admin(u)) {
-        buf[0] = '\0';
-        buflen = 511;           /* How confusing, this is the amount of space left! */
-        for (i = 0; capab_info[i].token; i++) {
-            if (uplink_capab & capab_info[i].flag) {
-                strncat(buf, " ", buflen);
-                buflen--;
-                strncat(buf, capab_info[i].token, buflen);
-                buflen -= strlen(capab_info[i].token);
-                /* Special cases */
-                if (capab_info[i].flag == CAPAB_CHANMODE) {
-                    strncat(buf, "=", buflen);
-                    buflen--;
-                    strncat(buf, ircd->chanmodes, buflen);
-                    buflen -= strlen(ircd->chanmodes);
-                }
-                if (capab_info[i].flag == CAPAB_NICKCHARS) {
-                    strncat(buf, "=", buflen);
-                    buflen--;
-                    if (ircd->nickchars) {
-                        strncat(buf, ircd->nickchars, buflen);
-                        buflen -= strlen(ircd->nickchars);
-                    }           /* leave blank if it was null */
-                }
-            }
-        }
-        notice_lang(s_OperServ, u, OPER_STATS_UPLINK_SERVER,
-                    serv_uplink->name);
-        notice_lang(s_OperServ, u, OPER_STATS_UPLINK_CAPAB, buf);
-        notice_lang(s_OperServ, u, OPER_STATS_UPLINK_SERVER_COUNT,
-                    stats_count_servers(serv_uplink));
-    }
+	if (extra && ((stricmp(extra, "ALL") == 0)
+				  || (stricmp(extra, "UPLINK") == 0))
+		&& is_services_admin(u)) {
+		buf[0] = '\0';
+		buflen = 511;		   /* How confusing, this is the amount of space left! */
+		for (i = 0; capab_info[i].token; i++) {
+			if (uplink_capab & capab_info[i].flag) {
+				strncat(buf, " ", buflen);
+				buflen--;
+				strncat(buf, capab_info[i].token, buflen);
+				buflen -= strlen(capab_info[i].token);
+				/* Special cases */
+				if (capab_info[i].flag == CAPAB_CHANMODE) {
+					strncat(buf, "=", buflen);
+					buflen--;
+					strncat(buf, ircd->chanmodes, buflen);
+					buflen -= strlen(ircd->chanmodes);
+				}
+				if (capab_info[i].flag == CAPAB_NICKCHARS) {
+					strncat(buf, "=", buflen);
+					buflen--;
+					if (ircd->nickchars) {
+						strncat(buf, ircd->nickchars, buflen);
+						buflen -= strlen(ircd->nickchars);
+					}		   /* leave blank if it was null */
+				}
+			}
+		}
+		notice_lang(s_OperServ, u, OPER_STATS_UPLINK_SERVER,
+					serv_uplink->name);
+		notice_lang(s_OperServ, u, OPER_STATS_UPLINK_CAPAB, buf);
+		notice_lang(s_OperServ, u, OPER_STATS_UPLINK_SERVER_COUNT,
+					stats_count_servers(serv_uplink));
+	}
 
-    if (extra && ((stricmp(extra, "ALL") == 0)
-                  || (stricmp(extra, "MEMORY") == 0))
-        && is_services_admin(u)) {
-        long count, mem;
+	if (extra && ((stricmp(extra, "ALL") == 0)
+				  || (stricmp(extra, "MEMORY") == 0))
+		&& is_services_admin(u)) {
+		long count, mem;
 
-        notice_lang(s_OperServ, u, OPER_STATS_BYTES_READ,
-                    total_read / 1024);
-        notice_lang(s_OperServ, u, OPER_STATS_BYTES_WRITTEN,
-                    total_written / 1024);
+		notice_lang(s_OperServ, u, OPER_STATS_BYTES_READ,
+					total_read / 1024);
+		notice_lang(s_OperServ, u, OPER_STATS_BYTES_WRITTEN,
+					total_written / 1024);
 
-        get_user_stats(&count, &mem);
-        notice_lang(s_OperServ, u, OPER_STATS_USER_MEM, count,
-                    (mem + 512) / 1024);
-        get_channel_stats(&count, &mem);
-        notice_lang(s_OperServ, u, OPER_STATS_CHANNEL_MEM, count,
-                    (mem + 512) / 1024);
-        get_core_stats(&count, &mem);
-        notice_lang(s_OperServ, u, OPER_STATS_GROUPS_MEM, count,
-                    (mem + 512) / 1024);
-        get_aliases_stats(&count, &mem);
-        notice_lang(s_OperServ, u, OPER_STATS_ALIASES_MEM, count,
-                    (mem + 512) / 1024);
-        get_chanserv_stats(&count, &mem);
-        notice_lang(s_OperServ, u, OPER_STATS_CHANSERV_MEM, count,
-                    (mem + 512) / 1024);
-        if (s_BotServ) {
-            get_botserv_stats(&count, &mem);
-            notice_lang(s_OperServ, u, OPER_STATS_BOTSERV_MEM, count,
-                    (mem + 512) / 1024);
-        }
-        if (s_HostServ) {
-            get_hostserv_stats(&count, &mem);
-            notice_lang(s_OperServ, u, OPER_STATS_HOSTSERV_MEM, count,
-                    (mem + 512) / 1024);
-        }
-        get_operserv_stats(&count, &mem);
-        notice_lang(s_OperServ, u, OPER_STATS_OPERSERV_MEM, count,
-                    (mem + 512) / 1024);
-        get_session_stats(&count, &mem);
-        notice_lang(s_OperServ, u, OPER_STATS_SESSIONS_MEM, count,
-                    (mem + 512) / 1024);
-    }
-    return MOD_CONT;
+		get_user_stats(&count, &mem);
+		notice_lang(s_OperServ, u, OPER_STATS_USER_MEM, count,
+					(mem + 512) / 1024);
+		get_channel_stats(&count, &mem);
+		notice_lang(s_OperServ, u, OPER_STATS_CHANNEL_MEM, count,
+					(mem + 512) / 1024);
+		get_core_stats(&count, &mem);
+		notice_lang(s_OperServ, u, OPER_STATS_GROUPS_MEM, count,
+					(mem + 512) / 1024);
+		get_aliases_stats(&count, &mem);
+		notice_lang(s_OperServ, u, OPER_STATS_ALIASES_MEM, count,
+					(mem + 512) / 1024);
+		get_chanserv_stats(&count, &mem);
+		notice_lang(s_OperServ, u, OPER_STATS_CHANSERV_MEM, count,
+					(mem + 512) / 1024);
+		if (s_BotServ) {
+			get_botserv_stats(&count, &mem);
+			notice_lang(s_OperServ, u, OPER_STATS_BOTSERV_MEM, count,
+					(mem + 512) / 1024);
+		}
+		if (s_HostServ) {
+			get_hostserv_stats(&count, &mem);
+			notice_lang(s_OperServ, u, OPER_STATS_HOSTSERV_MEM, count,
+					(mem + 512) / 1024);
+		}
+		get_operserv_stats(&count, &mem);
+		notice_lang(s_OperServ, u, OPER_STATS_OPERSERV_MEM, count,
+					(mem + 512) / 1024);
+		get_session_stats(&count, &mem);
+		notice_lang(s_OperServ, u, OPER_STATS_SESSIONS_MEM, count,
+					(mem + 512) / 1024);
+	}
+	return MOD_CONT;
 }
 
 void get_operserv_stats(long *nrec, long *memuse)
 {
-    int i;
-    long mem = 0, count = 0, mem2 = 0, count2 = 0;
-    Akill *ak;
-    SXLine *sx;
+	int i;
+	long mem = 0, count = 0, mem2 = 0, count2 = 0;
+	Akill *ak;
+	SXLine *sx;
 
-    count += akills.count;
-    mem += akills.capacity;
-    mem += akills.count * sizeof(Akill);
+	count += akills.count;
+	mem += akills.capacity;
+	mem += akills.count * sizeof(Akill);
 
-    for (i = 0; i < akills.count; i++) {
-        ak = (Akill *)akills.list[i];
-        mem += strlen(ak->user) + 1;
-        mem += strlen(ak->host) + 1;
-        mem += strlen(ak->by) + 1;
-        mem += strlen(ak->reason) + 1;
-    }
+	for (i = 0; i < akills.count; i++) {
+		ak = (Akill *)akills.list[i];
+		mem += strlen(ak->user) + 1;
+		mem += strlen(ak->host) + 1;
+		mem += strlen(ak->by) + 1;
+		mem += strlen(ak->reason) + 1;
+	}
 
-    if (ircd->sgline) {
-        count += sglines.count;
-        mem += sglines.capacity;
-        mem += sglines.count * sizeof(SXLine);
+	if (ircd->sgline) {
+		count += sglines.count;
+		mem += sglines.capacity;
+		mem += sglines.count * sizeof(SXLine);
 
-        for (i = 0; i < sglines.count; i++) {
-            sx = (SXLine *)sglines.list[i];
-            mem += strlen(sx->mask) + 1;
-            mem += strlen(sx->by) + 1;
-            mem += strlen(sx->reason) + 1;
-        }
-    }
-    if (ircd->sqline) {
-        count += sqlines.count;
-        mem += sqlines.capacity;
-        mem += sqlines.count * sizeof(SXLine);
+		for (i = 0; i < sglines.count; i++) {
+			sx = (SXLine *)sglines.list[i];
+			mem += strlen(sx->mask) + 1;
+			mem += strlen(sx->by) + 1;
+			mem += strlen(sx->reason) + 1;
+		}
+	}
+	if (ircd->sqline) {
+		count += sqlines.count;
+		mem += sqlines.capacity;
+		mem += sqlines.count * sizeof(SXLine);
 
-        for (i = 0; i < sqlines.count; i++) {
-            sx = (SXLine *)sqlines.list[i];
-            mem += strlen(sx->mask) + 1;
-            mem += strlen(sx->by) + 1;
-            mem += strlen(sx->reason) + 1;
-        }
-    }
-    if (ircd->szline) {
-        count += szlines.count;
-        mem += szlines.capacity;
-        mem += szlines.count * sizeof(SXLine);
+		for (i = 0; i < sqlines.count; i++) {
+			sx = (SXLine *)sqlines.list[i];
+			mem += strlen(sx->mask) + 1;
+			mem += strlen(sx->by) + 1;
+			mem += strlen(sx->reason) + 1;
+		}
+	}
+	if (ircd->szline) {
+		count += szlines.count;
+		mem += szlines.capacity;
+		mem += szlines.count * sizeof(SXLine);
 
-        for (i = 0; i < szlines.count; i++) {
-            sx = (SXLine *)szlines.list[i];
-            mem += strlen(sx->mask) + 1;
-            mem += strlen(sx->by) + 1;
-            mem += strlen(sx->reason) + 1;
-        }
-    }
+		for (i = 0; i < szlines.count; i++) {
+			sx = (SXLine *)szlines.list[i];
+			mem += strlen(sx->mask) + 1;
+			mem += strlen(sx->by) + 1;
+			mem += strlen(sx->reason) + 1;
+		}
+	}
 
 
-    get_news_stats(&count2, &mem2);
-    count += count2;
-    mem += mem2;
-    get_exception_stats(&count2, &mem2);
-    count += count2;
-    mem += mem2;
+	get_news_stats(&count2, &mem2);
+	count += count2;
+	mem += mem2;
+	get_exception_stats(&count2, &mem2);
+	count += count2;
+	mem += mem2;
 
-    *nrec = count;
-    *memuse = mem;
+	*nrec = count;
+	*memuse = mem;
 }
 
 MODULE_INIT("os_stats", OSStats)
diff --git a/src/core/os_svsnick.c b/src/core/os_svsnick.c
index fda5d3a58..244500b2a 100644
--- a/src/core/os_svsnick.c
+++ b/src/core/os_svsnick.c
@@ -46,9 +46,9 @@ class OSSVSNick : public Module
  **/
 void myOperServHelp(User * u)
 {
-    if (is_services_admin(u) && u->isSuperAdmin) {
-        notice_lang(s_OperServ, u, OPER_HELP_CMD_SVSNICK);
-    }
+	if (is_services_admin(u) && u->isSuperAdmin) {
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_SVSNICK);
+	}
 }
 
 /**
@@ -60,56 +60,56 @@ void myOperServHelp(User * u)
 
 int do_svsnick(User * u)
 {
-    char *nick = strtok(NULL, " ");
-    char *newnick = strtok(NULL, " ");
-
-    NickAlias *na;
-    char *c;
-
-    /* Only allow this if SuperAdmin is enabled */
-    if (!u->isSuperAdmin) {
-        notice_lang(s_OperServ, u, OPER_SUPER_ADMIN_ONLY);
-        return MOD_CONT;
-    }
-
-    if (!nick || !newnick) {
-        syntax_error(s_OperServ, u, "SVSNICK", OPER_SVSNICK_SYNTAX);
-        return MOD_CONT;
-    }
-
-    /* Truncate long nicknames to NICKMAX-2 characters */
-    if (strlen(newnick) > (NICKMAX - 2)) {
-        notice_lang(s_OperServ, u, NICK_X_TRUNCATED,
-                    newnick, NICKMAX - 2, newnick);
-        newnick[NICKMAX - 2] = '\0';
-    }
-
-    /* Check for valid characters */
-    if (*newnick == '-' || isdigit(*newnick)) {
-        notice_lang(s_OperServ, u, NICK_X_ILLEGAL, newnick);
-        return MOD_CONT;
-    }
-    for (c = newnick; *c && (c - newnick) < NICKMAX; c++) {
-        if (!isvalidnick(*c)) {
-            notice_lang(s_OperServ, u, NICK_X_ILLEGAL, newnick);
-            return MOD_CONT;
-        }
-    }
-
-    /* Check for a nick in use or a forbidden/suspended nick */
-    if (!finduser(nick)) {
-        notice_lang(s_OperServ, u, NICK_X_NOT_IN_USE, nick);
-    } else if (finduser(newnick)) {
-        notice_lang(s_OperServ, u, NICK_X_IN_USE, newnick);
-    } else if ((na = findnick(newnick)) && (na->status & NS_VERBOTEN)) {
-        notice_lang(s_OperServ, u, NICK_X_FORBIDDEN, newnick);
-    } else {
-        notice_lang(s_OperServ, u, OPER_SVSNICK_NEWNICK, nick, newnick);
-        ircdproto->SendGlobops(s_OperServ, "%s used SVSNICK to change %s to %s",
-                         u->nick, nick, newnick);
-        ircdproto->SendForceNickChange(nick, newnick, time(NULL));
-    }
-    return MOD_CONT;
+	char *nick = strtok(NULL, " ");
+	char *newnick = strtok(NULL, " ");
+
+	NickAlias *na;
+	char *c;
+
+	/* Only allow this if SuperAdmin is enabled */
+	if (!u->isSuperAdmin) {
+		notice_lang(s_OperServ, u, OPER_SUPER_ADMIN_ONLY);
+		return MOD_CONT;
+	}
+
+	if (!nick || !newnick) {
+		syntax_error(s_OperServ, u, "SVSNICK", OPER_SVSNICK_SYNTAX);
+		return MOD_CONT;
+	}
+
+	/* Truncate long nicknames to NICKMAX-2 characters */
+	if (strlen(newnick) > (NICKMAX - 2)) {
+		notice_lang(s_OperServ, u, NICK_X_TRUNCATED,
+					newnick, NICKMAX - 2, newnick);
+		newnick[NICKMAX - 2] = '\0';
+	}
+
+	/* Check for valid characters */
+	if (*newnick == '-' || isdigit(*newnick)) {
+		notice_lang(s_OperServ, u, NICK_X_ILLEGAL, newnick);
+		return MOD_CONT;
+	}
+	for (c = newnick; *c && (c - newnick) < NICKMAX; c++) {
+		if (!isvalidnick(*c)) {
+			notice_lang(s_OperServ, u, NICK_X_ILLEGAL, newnick);
+			return MOD_CONT;
+		}
+	}
+
+	/* Check for a nick in use or a forbidden/suspended nick */
+	if (!finduser(nick)) {
+		notice_lang(s_OperServ, u, NICK_X_NOT_IN_USE, nick);
+	} else if (finduser(newnick)) {
+		notice_lang(s_OperServ, u, NICK_X_IN_USE, newnick);
+	} else if ((na = findnick(newnick)) && (na->status & NS_VERBOTEN)) {
+		notice_lang(s_OperServ, u, NICK_X_FORBIDDEN, newnick);
+	} else {
+		notice_lang(s_OperServ, u, OPER_SVSNICK_NEWNICK, nick, newnick);
+		ircdproto->SendGlobops(s_OperServ, "%s used SVSNICK to change %s to %s",
+						 u->nick, nick, newnick);
+		ircdproto->SendForceNickChange(nick, newnick, time(NULL));
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("os_svsnick", OSSVSNick)
diff --git a/src/core/os_szline.c b/src/core/os_szline.c
index 7e06be601..4e324b261 100644
--- a/src/core/os_szline.c
+++ b/src/core/os_szline.c
@@ -18,9 +18,9 @@
 int do_szline(User * u);
 void myOperServHelp(User * u);
 int szline_view_callback(SList * slist, int number, void *item,
-                         va_list args);
+						 va_list args);
 int szline_list_callback(SList * slist, int number, void *item,
-                         va_list args);
+						 va_list args);
 int szline_view(int number, SXLine * sx, User * u, int *sent_header);
 int szline_list(int number, SXLine * sx, User * u, int *sent_header);
 
@@ -52,9 +52,9 @@ class OSSZLine : public Module
  **/
 void myOperServHelp(User * u)
 {
-    if (is_services_oper(u)) {
-        notice_lang(s_OperServ, u, OPER_HELP_CMD_SZLINE);
-    }
+	if (is_services_oper(u)) {
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_SZLINE);
+	}
 }
 
 /**
@@ -64,277 +64,277 @@ void myOperServHelp(User * u)
  **/
 int do_szline(User * u)
 {
-    char *cmd = strtok(NULL, " ");
-
-    if (!cmd)
-        cmd = "";
-
-    if (!stricmp(cmd, "ADD")) {
-        int deleted = 0;
-        char *expiry, *mask, *reason;
-        time_t expires;
-
-        mask = strtok(NULL, " ");
-        if (mask && *mask == '+') {
-            expiry = mask;
-            mask = strtok(NULL, " ");
-        } else {
-            expiry = NULL;
-        }
-
-        expires = expiry ? dotime(expiry) : SZLineExpiry;
-        /* If the expiry given does not contain a final letter, it's in days,
-         * said the doc. Ah well.
-         */
-        if (expiry && isdigit(expiry[strlen(expiry) - 1]))
-            expires *= 86400;
-        /* Do not allow less than a minute expiry time */
-        if (expires != 0 && expires < 60) {
-            notice_lang(s_OperServ, u, BAD_EXPIRY_TIME);
-            return MOD_CONT;
-        } else if (expires > 0) {
-            expires += time(NULL);
-        }
-
-        if (mask && (reason = strtok(NULL, ""))) {
-            /* We first do some sanity check on the proposed mask. */
-
-            if (strchr(mask, '!') || strchr(mask, '@')) {
-                notice_lang(s_OperServ, u, OPER_SZLINE_ONLY_IPS);
-                return MOD_CONT;
-            }
-
-            if (strspn(mask, "*?") == strlen(mask)) {
-                notice_lang(s_OperServ, u, USERHOST_MASK_TOO_WIDE, mask);
-                return MOD_CONT;
-            }
-
-            deleted = add_szline(u, mask, u->nick, expires, reason);
-            if (deleted < 0)
-                return MOD_CONT;
-            else if (deleted)
-                notice_lang(s_OperServ, u, OPER_SZLINE_DELETED_SEVERAL,
-                            deleted);
-            notice_lang(s_OperServ, u, OPER_SZLINE_ADDED, mask);
-
-            if (WallOSSZLine) {
-                char buf[128];
-
-                if (!expires) {
-                    strcpy(buf, "does not expire");
-                } else {
-                    int wall_expiry = expires - time(NULL);
-                    char *s = NULL;
-
-                    if (wall_expiry >= 86400) {
-                        wall_expiry /= 86400;
-                        s = "day";
-                    } else if (wall_expiry >= 3600) {
-                        wall_expiry /= 3600;
-                        s = "hour";
-                    } else if (wall_expiry >= 60) {
-                        wall_expiry /= 60;
-                        s = "minute";
-                    }
-
-                    snprintf(buf, sizeof(buf), "expires in %d %s%s",
-                             wall_expiry, s,
-                             (wall_expiry == 1) ? "" : "s");
-                }
-
-                ircdproto->SendGlobops(s_OperServ,
-                                 "%s added an SZLINE for %s (%s)", u->nick,
-                                 mask, buf);
-            }
-
-            if (readonly)
-                notice_lang(s_OperServ, u, READ_ONLY_MODE);
-
-        } else {
-            syntax_error(s_OperServ, u, "SZLINE", OPER_SZLINE_SYNTAX);
-        }
-
-    } else if (!stricmp(cmd, "DEL")) {
-
-        char *mask;
-        int res = 0;
-
-        mask = strtok(NULL, " ");
-
-        if (!mask) {
-            syntax_error(s_OperServ, u, "SZLINE", OPER_SZLINE_SYNTAX);
-            return MOD_CONT;
-        }
-
-        if (szlines.count == 0) {
-            notice_lang(s_OperServ, u, OPER_SZLINE_LIST_EMPTY);
-            return MOD_CONT;
-        }
-
-        if (isdigit(*mask) && strspn(mask, "1234567890,-") == strlen(mask)) {
-            /* Deleting a range */
-            res = slist_delete_range(&szlines, mask, NULL);
-            if (res == 0) {
-                notice_lang(s_OperServ, u, OPER_SZLINE_NO_MATCH);
-                return MOD_CONT;
-            } else if (res == 1) {
-                notice_lang(s_OperServ, u, OPER_SZLINE_DELETED_ONE);
-            } else {
-                notice_lang(s_OperServ, u, OPER_SZLINE_DELETED_SEVERAL,
-                            res);
-            }
-        } else {
-            if ((res = slist_indexof(&szlines, mask)) == -1) {
-                notice_lang(s_OperServ, u, OPER_SZLINE_NOT_FOUND, mask);
-                return MOD_CONT;
-            }
-
-            slist_delete(&szlines, res);
-            notice_lang(s_OperServ, u, OPER_SZLINE_DELETED, mask);
-        }
-
-        if (readonly)
-            notice_lang(s_OperServ, u, READ_ONLY_MODE);
-
-    } else if (!stricmp(cmd, "LIST")) {
-        char *mask;
-        int res, sent_header = 0;
-
-        if (szlines.count == 0) {
-            notice_lang(s_OperServ, u, OPER_SZLINE_LIST_EMPTY);
-            return MOD_CONT;
-        }
-
-        mask = strtok(NULL, " ");
-
-        if (!mask || (isdigit(*mask)
-                      && strspn(mask, "1234567890,-") == strlen(mask))) {
-            res =
-                slist_enum(&szlines, mask, &szline_list_callback, u,
-                           &sent_header);
-            if (res == 0) {
-                notice_lang(s_OperServ, u, OPER_SZLINE_NO_MATCH);
-                return MOD_CONT;
-            }
-        } else {
-            int i;
-            char *amask;
-
-            for (i = 0; i < szlines.count; i++) {
-                amask = ((SXLine *) szlines.list[i])->mask;
-                if (!stricmp(mask, amask)
-                    || match_wild_nocase(mask, amask))
-                    szline_list(i + 1, (SXLine *)szlines.list[i], u, &sent_header);
-            }
-
-            if (!sent_header)
-                notice_lang(s_OperServ, u, OPER_SZLINE_NO_MATCH);
-        }
-    } else if (!stricmp(cmd, "VIEW")) {
-        char *mask;
-        int res, sent_header = 0;
-
-        if (szlines.count == 0) {
-            notice_lang(s_OperServ, u, OPER_SZLINE_LIST_EMPTY);
-            return MOD_CONT;
-        }
-
-        mask = strtok(NULL, " ");
-
-        if (!mask || (isdigit(*mask)
-                      && strspn(mask, "1234567890,-") == strlen(mask))) {
-            res =
-                slist_enum(&szlines, mask, &szline_view_callback, u,
-                           &sent_header);
-            if (res == 0) {
-                notice_lang(s_OperServ, u, OPER_SZLINE_NO_MATCH);
-                return MOD_CONT;
-            }
-        } else {
-            int i;
-            char *amask;
-
-            for (i = 0; i < szlines.count; i++) {
-                amask = ((SXLine *) szlines.list[i])->mask;
-                if (!stricmp(mask, amask)
-                    || match_wild_nocase(mask, amask))
-                    szline_view(i + 1, (SXLine *)szlines.list[i], u, &sent_header);
-            }
-
-            if (!sent_header)
-                notice_lang(s_OperServ, u, OPER_SZLINE_NO_MATCH);
-        }
-    } else if (!stricmp(cmd, "CLEAR")) {
-        slist_clear(&szlines, 1);
-        notice_lang(s_OperServ, u, OPER_SZLINE_CLEAR);
-    } else {
-        syntax_error(s_OperServ, u, "SZLINE", OPER_SZLINE_SYNTAX);
-    }
-    return MOD_CONT;
+	char *cmd = strtok(NULL, " ");
+
+	if (!cmd)
+		cmd = "";
+
+	if (!stricmp(cmd, "ADD")) {
+		int deleted = 0;
+		char *expiry, *mask, *reason;
+		time_t expires;
+
+		mask = strtok(NULL, " ");
+		if (mask && *mask == '+') {
+			expiry = mask;
+			mask = strtok(NULL, " ");
+		} else {
+			expiry = NULL;
+		}
+
+		expires = expiry ? dotime(expiry) : SZLineExpiry;
+		/* If the expiry given does not contain a final letter, it's in days,
+		 * said the doc. Ah well.
+		 */
+		if (expiry && isdigit(expiry[strlen(expiry) - 1]))
+			expires *= 86400;
+		/* Do not allow less than a minute expiry time */
+		if (expires != 0 && expires < 60) {
+			notice_lang(s_OperServ, u, BAD_EXPIRY_TIME);
+			return MOD_CONT;
+		} else if (expires > 0) {
+			expires += time(NULL);
+		}
+
+		if (mask && (reason = strtok(NULL, ""))) {
+			/* We first do some sanity check on the proposed mask. */
+
+			if (strchr(mask, '!') || strchr(mask, '@')) {
+				notice_lang(s_OperServ, u, OPER_SZLINE_ONLY_IPS);
+				return MOD_CONT;
+			}
+
+			if (strspn(mask, "*?") == strlen(mask)) {
+				notice_lang(s_OperServ, u, USERHOST_MASK_TOO_WIDE, mask);
+				return MOD_CONT;
+			}
+
+			deleted = add_szline(u, mask, u->nick, expires, reason);
+			if (deleted < 0)
+				return MOD_CONT;
+			else if (deleted)
+				notice_lang(s_OperServ, u, OPER_SZLINE_DELETED_SEVERAL,
+							deleted);
+			notice_lang(s_OperServ, u, OPER_SZLINE_ADDED, mask);
+
+			if (WallOSSZLine) {
+				char buf[128];
+
+				if (!expires) {
+					strcpy(buf, "does not expire");
+				} else {
+					int wall_expiry = expires - time(NULL);
+					char *s = NULL;
+
+					if (wall_expiry >= 86400) {
+						wall_expiry /= 86400;
+						s = "day";
+					} else if (wall_expiry >= 3600) {
+						wall_expiry /= 3600;
+						s = "hour";
+					} else if (wall_expiry >= 60) {
+						wall_expiry /= 60;
+						s = "minute";
+					}
+
+					snprintf(buf, sizeof(buf), "expires in %d %s%s",
+							 wall_expiry, s,
+							 (wall_expiry == 1) ? "" : "s");
+				}
+
+				ircdproto->SendGlobops(s_OperServ,
+								 "%s added an SZLINE for %s (%s)", u->nick,
+								 mask, buf);
+			}
+
+			if (readonly)
+				notice_lang(s_OperServ, u, READ_ONLY_MODE);
+
+		} else {
+			syntax_error(s_OperServ, u, "SZLINE", OPER_SZLINE_SYNTAX);
+		}
+
+	} else if (!stricmp(cmd, "DEL")) {
+
+		char *mask;
+		int res = 0;
+
+		mask = strtok(NULL, " ");
+
+		if (!mask) {
+			syntax_error(s_OperServ, u, "SZLINE", OPER_SZLINE_SYNTAX);
+			return MOD_CONT;
+		}
+
+		if (szlines.count == 0) {
+			notice_lang(s_OperServ, u, OPER_SZLINE_LIST_EMPTY);
+			return MOD_CONT;
+		}
+
+		if (isdigit(*mask) && strspn(mask, "1234567890,-") == strlen(mask)) {
+			/* Deleting a range */
+			res = slist_delete_range(&szlines, mask, NULL);
+			if (res == 0) {
+				notice_lang(s_OperServ, u, OPER_SZLINE_NO_MATCH);
+				return MOD_CONT;
+			} else if (res == 1) {
+				notice_lang(s_OperServ, u, OPER_SZLINE_DELETED_ONE);
+			} else {
+				notice_lang(s_OperServ, u, OPER_SZLINE_DELETED_SEVERAL,
+							res);
+			}
+		} else {
+			if ((res = slist_indexof(&szlines, mask)) == -1) {
+				notice_lang(s_OperServ, u, OPER_SZLINE_NOT_FOUND, mask);
+				return MOD_CONT;
+			}
+
+			slist_delete(&szlines, res);
+			notice_lang(s_OperServ, u, OPER_SZLINE_DELETED, mask);
+		}
+
+		if (readonly)
+			notice_lang(s_OperServ, u, READ_ONLY_MODE);
+
+	} else if (!stricmp(cmd, "LIST")) {
+		char *mask;
+		int res, sent_header = 0;
+
+		if (szlines.count == 0) {
+			notice_lang(s_OperServ, u, OPER_SZLINE_LIST_EMPTY);
+			return MOD_CONT;
+		}
+
+		mask = strtok(NULL, " ");
+
+		if (!mask || (isdigit(*mask)
+					  && strspn(mask, "1234567890,-") == strlen(mask))) {
+			res =
+				slist_enum(&szlines, mask, &szline_list_callback, u,
+						   &sent_header);
+			if (res == 0) {
+				notice_lang(s_OperServ, u, OPER_SZLINE_NO_MATCH);
+				return MOD_CONT;
+			}
+		} else {
+			int i;
+			char *amask;
+
+			for (i = 0; i < szlines.count; i++) {
+				amask = ((SXLine *) szlines.list[i])->mask;
+				if (!stricmp(mask, amask)
+					|| match_wild_nocase(mask, amask))
+					szline_list(i + 1, (SXLine *)szlines.list[i], u, &sent_header);
+			}
+
+			if (!sent_header)
+				notice_lang(s_OperServ, u, OPER_SZLINE_NO_MATCH);
+		}
+	} else if (!stricmp(cmd, "VIEW")) {
+		char *mask;
+		int res, sent_header = 0;
+
+		if (szlines.count == 0) {
+			notice_lang(s_OperServ, u, OPER_SZLINE_LIST_EMPTY);
+			return MOD_CONT;
+		}
+
+		mask = strtok(NULL, " ");
+
+		if (!mask || (isdigit(*mask)
+					  && strspn(mask, "1234567890,-") == strlen(mask))) {
+			res =
+				slist_enum(&szlines, mask, &szline_view_callback, u,
+						   &sent_header);
+			if (res == 0) {
+				notice_lang(s_OperServ, u, OPER_SZLINE_NO_MATCH);
+				return MOD_CONT;
+			}
+		} else {
+			int i;
+			char *amask;
+
+			for (i = 0; i < szlines.count; i++) {
+				amask = ((SXLine *) szlines.list[i])->mask;
+				if (!stricmp(mask, amask)
+					|| match_wild_nocase(mask, amask))
+					szline_view(i + 1, (SXLine *)szlines.list[i], u, &sent_header);
+			}
+
+			if (!sent_header)
+				notice_lang(s_OperServ, u, OPER_SZLINE_NO_MATCH);
+		}
+	} else if (!stricmp(cmd, "CLEAR")) {
+		slist_clear(&szlines, 1);
+		notice_lang(s_OperServ, u, OPER_SZLINE_CLEAR);
+	} else {
+		syntax_error(s_OperServ, u, "SZLINE", OPER_SZLINE_SYNTAX);
+	}
+	return MOD_CONT;
 }
 
 
 int szline_view(int number, SXLine * sx, User * u, int *sent_header)
 {
-    char timebuf[32], expirebuf[256];
-    struct tm tm;
+	char timebuf[32], expirebuf[256];
+	struct tm tm;
 
-    if (!sx)
-        return 0;
+	if (!sx)
+		return 0;
 
-    if (!*sent_header) {
-        notice_lang(s_OperServ, u, OPER_SZLINE_VIEW_HEADER);
-        *sent_header = 1;
-    }
+	if (!*sent_header) {
+		notice_lang(s_OperServ, u, OPER_SZLINE_VIEW_HEADER);
+		*sent_header = 1;
+	}
 
-    tm = *localtime(&sx->seton);
-    strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_SHORT_DATE_FORMAT,
-                  &tm);
-    expire_left(u->na, expirebuf, sizeof(expirebuf), sx->expires);
-    notice_lang(s_OperServ, u, OPER_SZLINE_VIEW_FORMAT, number, sx->mask,
-                sx->by, timebuf, expirebuf, sx->reason);
+	tm = *localtime(&sx->seton);
+	strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_SHORT_DATE_FORMAT,
+				  &tm);
+	expire_left(u->na, expirebuf, sizeof(expirebuf), sx->expires);
+	notice_lang(s_OperServ, u, OPER_SZLINE_VIEW_FORMAT, number, sx->mask,
+				sx->by, timebuf, expirebuf, sx->reason);
 
-    return 1;
+	return 1;
 }
 
 /* Callback for enumeration purposes */
 
 int szline_view_callback(SList * slist, int number, void *item,
-                         va_list args)
+						 va_list args)
 {
-    User *u = va_arg(args, User *);
-    int *sent_header = va_arg(args, int *);
+	User *u = va_arg(args, User *);
+	int *sent_header = va_arg(args, int *);
 
-    return szline_view(number, (SXLine *)item, u, sent_header);
+	return szline_view(number, (SXLine *)item, u, sent_header);
 }
 
 /* Callback for enumeration purposes */
 
 int szline_list_callback(SList * slist, int number, void *item,
-                         va_list args)
+						 va_list args)
 {
-    User *u = va_arg(args, User *);
-    int *sent_header = va_arg(args, int *);
+	User *u = va_arg(args, User *);
+	int *sent_header = va_arg(args, int *);
 
-    return szline_list(number, (SXLine *)item, u, sent_header);
+	return szline_list(number, (SXLine *)item, u, sent_header);
 }
 
 /* Lists an SZLINE entry, prefixing it with the header if needed */
 
 int szline_list(int number, SXLine * sx, User * u, int *sent_header)
 {
-    if (!sx)
-        return 0;
+	if (!sx)
+		return 0;
 
-    if (!*sent_header) {
-        notice_lang(s_OperServ, u, OPER_SZLINE_LIST_HEADER);
-        *sent_header = 1;
-    }
+	if (!*sent_header) {
+		notice_lang(s_OperServ, u, OPER_SZLINE_LIST_HEADER);
+		*sent_header = 1;
+	}
 
-    notice_lang(s_OperServ, u, OPER_SZLINE_LIST_FORMAT, number, sx->mask,
-                sx->reason);
+	notice_lang(s_OperServ, u, OPER_SZLINE_LIST_FORMAT, number, sx->mask,
+				sx->reason);
 
-    return 1;
+	return 1;
 }
 
 MODULE_INIT("os_szline", OSSZLine)
diff --git a/src/core/os_umode.c b/src/core/os_umode.c
index d860890c0..a2420fbe4 100644
--- a/src/core/os_umode.c
+++ b/src/core/os_umode.c
@@ -54,9 +54,9 @@ void AnopeFini(void)
  **/
 void myOperServHelp(User * u)
 {
-    if (is_services_admin(u) && u->isSuperAdmin) {
-        notice_lang(s_OperServ, u, OPER_HELP_CMD_UMODE);
-    }
+	if (is_services_admin(u) && u->isSuperAdmin) {
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_UMODE);
+	}
 }
 
 /**
@@ -69,45 +69,45 @@ void myOperServHelp(User * u)
  */
 int do_operumodes(User * u)
 {
-    char *nick = strtok(NULL, " ");
-    char *modes = strtok(NULL, "");
-
-    User *u2;
-
-    /* Only allow this if SuperAdmin is enabled */
-    if (!u->isSuperAdmin) {
-        notice_lang(s_OperServ, u, OPER_SUPER_ADMIN_ONLY);
-        return MOD_CONT;
-    }
-
-    if (!nick || !modes) {
-        syntax_error(s_OperServ, u, "UMODE", OPER_UMODE_SYNTAX);
-        return MOD_CONT;
-    }
-
-    /**
-     * Only accept a +/- mode string
-     *-rob
-     **/
-    if ((modes[0] != '+') && (modes[0] != '-')) {
-        syntax_error(s_OperServ, u, "UMODE", OPER_UMODE_SYNTAX);
-        return MOD_CONT;
-    }
-    if (!(u2 = finduser(nick))) {
-        notice_lang(s_OperServ, u, NICK_X_NOT_IN_USE, nick);
-    } else {
-        ircdproto->SendMode(findbot(s_OperServ), nick, "%s", modes);
-
-        common_svsmode(u2, modes, NULL);
-
-        notice_lang(s_OperServ, u, OPER_UMODE_SUCCESS, nick);
-        notice_lang(s_OperServ, u2, OPER_UMODE_CHANGED, u->nick);
-
-        if (WallOSMode)
-            ircdproto->SendGlobops(s_OperServ, "\2%s\2 used UMODE on %s",
-                             u->nick, nick);
-    }
-    return MOD_CONT;
+	char *nick = strtok(NULL, " ");
+	char *modes = strtok(NULL, "");
+
+	User *u2;
+
+	/* Only allow this if SuperAdmin is enabled */
+	if (!u->isSuperAdmin) {
+		notice_lang(s_OperServ, u, OPER_SUPER_ADMIN_ONLY);
+		return MOD_CONT;
+	}
+
+	if (!nick || !modes) {
+		syntax_error(s_OperServ, u, "UMODE", OPER_UMODE_SYNTAX);
+		return MOD_CONT;
+	}
+
+	/**
+	 * Only accept a +/- mode string
+	 *-rob
+	 **/
+	if ((modes[0] != '+') && (modes[0] != '-')) {
+		syntax_error(s_OperServ, u, "UMODE", OPER_UMODE_SYNTAX);
+		return MOD_CONT;
+	}
+	if (!(u2 = finduser(nick))) {
+		notice_lang(s_OperServ, u, NICK_X_NOT_IN_USE, nick);
+	} else {
+		ircdproto->SendMode(findbot(s_OperServ), nick, "%s", modes);
+
+		common_svsmode(u2, modes, NULL);
+
+		notice_lang(s_OperServ, u, OPER_UMODE_SUCCESS, nick);
+		notice_lang(s_OperServ, u2, OPER_UMODE_CHANGED, u->nick);
+
+		if (WallOSMode)
+			ircdproto->SendGlobops(s_OperServ, "\2%s\2 used UMODE on %s",
+							 u->nick, nick);
+	}
+	return MOD_CONT;
 }
 
 MODULE_INIT("os_umode", OSUMode)
diff --git a/src/core/os_update.c b/src/core/os_update.c
index 88573126f..bcd20ee24 100644
--- a/src/core/os_update.c
+++ b/src/core/os_update.c
@@ -43,9 +43,9 @@ class OSUpdate : public Module
  **/
 void myOperServHelp(User * u)
 {
-    if (is_services_root(u)) {
-        notice_lang(s_OperServ, u, OPER_HELP_CMD_UPDATE);
-    }
+	if (is_services_root(u)) {
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_UPDATE);
+	}
 }
 
 /**
@@ -55,9 +55,9 @@ void myOperServHelp(User * u)
  **/
 int do_update(User * u)
 {
-    notice_lang(s_OperServ, u, OPER_UPDATING);
-    save_data = 1;
-    return MOD_CONT;
+	notice_lang(s_OperServ, u, OPER_UPDATING);
+	save_data = 1;
+	return MOD_CONT;
 }
 
 MODULE_INIT("os_update", OSUpdate)
diff --git a/src/core/os_userlist.c b/src/core/os_userlist.c
index b2ffbb3a8..318f95870 100644
--- a/src/core/os_userlist.c
+++ b/src/core/os_userlist.c
@@ -48,7 +48,7 @@ class OSUserList : public Module
  **/
 void myOperServHelp(User * u)
 {
-    notice_lang(s_OperServ, u, OPER_HELP_CMD_USERLIST);
+	notice_lang(s_OperServ, u, OPER_HELP_CMD_USERLIST);
 }
 
 /**
@@ -59,52 +59,52 @@ void myOperServHelp(User * u)
 
 int do_userlist(User * u)
 {
-    char *pattern = strtok(NULL, " ");
-    char *opt = strtok(NULL, " ");
-
-    Channel *c;
-    int modes = 0;
-
-    if (opt && !stricmp(opt, "INVISIBLE"))
-        modes |= anope_get_invis_mode();
-
-    if (pattern && (c = findchan(pattern))) {
-        struct c_userlist *cu;
-
-        notice_lang(s_OperServ, u, OPER_USERLIST_HEADER_CHAN, pattern);
-
-        for (cu = c->users; cu; cu = cu->next) {
-            if (modes && !(cu->user->mode & modes))
-                continue;
-            notice_lang(s_OperServ, u, OPER_USERLIST_RECORD,
-                        cu->user->nick, common_get_vident(cu->user),
-                        common_get_vhost(cu->user));
-        }
-    } else {
-        char mask[BUFSIZE];
-        int i;
-        User *u2;
-
-        notice_lang(s_OperServ, u, OPER_USERLIST_HEADER);
-
-        for (i = 0; i < 1024; i++) {
-            for (u2 = userlist[i]; u2; u2 = u2->next) {
-                if (pattern) {
-                    snprintf(mask, sizeof(mask), "%s!%s@%s", u2->nick,
-                             common_get_vident(u2), common_get_vhost(u2));
-                    if (!match_wild_nocase(pattern, mask))
-                        continue;
-                    if (modes && !(u2->mode & modes))
-                        continue;
-                }
-                notice_lang(s_OperServ, u, OPER_USERLIST_RECORD, u2->nick,
-                            common_get_vident(u2), common_get_vhost(u2));
-            }
-        }
-    }
-
-    notice_lang(s_OperServ, u, OPER_USERLIST_END);
-    return MOD_CONT;
+	char *pattern = strtok(NULL, " ");
+	char *opt = strtok(NULL, " ");
+
+	Channel *c;
+	int modes = 0;
+
+	if (opt && !stricmp(opt, "INVISIBLE"))
+		modes |= anope_get_invis_mode();
+
+	if (pattern && (c = findchan(pattern))) {
+		struct c_userlist *cu;
+
+		notice_lang(s_OperServ, u, OPER_USERLIST_HEADER_CHAN, pattern);
+
+		for (cu = c->users; cu; cu = cu->next) {
+			if (modes && !(cu->user->mode & modes))
+				continue;
+			notice_lang(s_OperServ, u, OPER_USERLIST_RECORD,
+						cu->user->nick, common_get_vident(cu->user),
+						common_get_vhost(cu->user));
+		}
+	} else {
+		char mask[BUFSIZE];
+		int i;
+		User *u2;
+
+		notice_lang(s_OperServ, u, OPER_USERLIST_HEADER);
+
+		for (i = 0; i < 1024; i++) {
+			for (u2 = userlist[i]; u2; u2 = u2->next) {
+				if (pattern) {
+					snprintf(mask, sizeof(mask), "%s!%s@%s", u2->nick,
+							 common_get_vident(u2), common_get_vhost(u2));
+					if (!match_wild_nocase(pattern, mask))
+						continue;
+					if (modes && !(u2->mode & modes))
+						continue;
+				}
+				notice_lang(s_OperServ, u, OPER_USERLIST_RECORD, u2->nick,
+							common_get_vident(u2), common_get_vhost(u2));
+			}
+		}
+	}
+
+	notice_lang(s_OperServ, u, OPER_USERLIST_END);
+	return MOD_CONT;
 }
 
 MODULE_INIT("os_userlist", OSUserList)