BUILD : 1.7.12 (914) BUGS : NOTES : Anope 1.7.12-rc1 stuffs

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


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

25 files changed, 281 insertions, 233 deletions

diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c
index 45dc2d4a6..e2c845ea2 100644
--- a/src/core/bs_bot.c
+++ b/src/core/bs_bot.c
@@ -101,8 +101,8 @@ int do_bot(User * u)
             notice_lang(s_BotServ, u, BOT_BOT_ALREADY_EXISTS, nick);
         else if (strlen(nick) > NickLen)
             notice_lang(s_BotServ, u, BOT_BAD_NICK);
-		else if (strlen(user) >= USERMAX)
-			notice_lang(s_BotServ, u, BOT_BAD_IDENT);
+        else if (strlen(user) >= USERMAX)
+            notice_lang(s_BotServ, u, BOT_BAD_IDENT);
         else {
             NickAlias *na;
 
diff --git a/src/core/bs_fantasy_kickban.c b/src/core/bs_fantasy_kickban.c
index 5d978da56..83955ad55 100644
--- a/src/core/bs_fantasy_kickban.c
+++ b/src/core/bs_fantasy_kickban.c
@@ -62,7 +62,8 @@ int do_fantasy(int argc, char **argv)
     if (argc < 3)
         return MOD_CONT;
 
-    if ((stricmp(argv[0], "kickban") == 0) || (stricmp(argv[0], "kb") == 0)) {
+    if ((stricmp(argv[0], "kickban") == 0)
+        || (stricmp(argv[0], "kb") == 0)) {
         u = finduser(argv[1]);
         ci = cs_findchan(argv[2]);
         if (!u || !ci)
diff --git a/src/core/cs_access.c b/src/core/cs_access.c
index 8f348c028..1f3d30fb8 100644
--- a/src/core/cs_access.c
+++ b/src/core/cs_access.c
@@ -32,7 +32,8 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion
+        ("$Id$");
     moduleSetType(CORE);
 
     c = createCommand("ACCESS", do_access, NULL, CHAN_HELP_ACCESS, -1, -1,
@@ -220,7 +221,8 @@ int do_access(User * u)
                 }
                 access->level = level;
                 snprintf(event_access, BUFSIZE, "%d", access->level);
-                send_event(EVENT_ACCESS_CHANGE, 4, ci->name, u->nick, na->nick, event_access);
+                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);
@@ -252,7 +254,8 @@ int do_access(User * u)
         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);
+        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);
@@ -311,7 +314,8 @@ int do_access(User * u)
                 deleted = 0;
                 notice_lang(s_ChanServ, u, PERMISSION_DENIED);
             } else {
-                send_event(EVENT_ACCESS_DEL, 3, ci->name, u->nick, na->nick);
+                send_event(EVENT_ACCESS_DEL, 3, ci->name, u->nick,
+                           na->nick);
                 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);
diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c
index 5d897538b..fc5658cfa 100644
--- a/src/core/cs_xop.c
+++ b/src/core/cs_xop.c
@@ -98,10 +98,11 @@ int AnopeInit(int argc, char **argv)
 
     c = createCommand("AOP", do_aop, NULL, CHAN_HELP_AOP, -1, -1, -1, -1);
     moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-	if (ircd->halfop) {
-	    c = createCommand("HOP", do_hop, NULL, CHAN_HELP_HOP, -1, -1, -1, -1);
-    	moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-	}
+    if (ircd->halfop) {
+        c = createCommand("HOP", do_hop, NULL, CHAN_HELP_HOP, -1, -1, -1,
+                          -1);
+        moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+    }
     c = createCommand("SOP", do_sop, NULL, CHAN_HELP_SOP, -1, -1, -1, -1);
     moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
     c = createCommand("VOP", do_vop, NULL, CHAN_HELP_VOP, -1, -1, -1, -1);
@@ -330,11 +331,13 @@ int do_xop(User * u, char *xname, int xlev, int *xmsgs)
         snprintf(event_access, BUFSIZE, "%d", access->level);
 
         if (!change) {
-            send_event(EVENT_ACCESS_CHANGE, 4, ci->name, u->nick, na->nick, event_access);
+            send_event(EVENT_ACCESS_CHANGE, 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_ADD, 4, ci->name, u->nick, na->nick, event_access);
+            send_event(EVENT_ACCESS_ADD, 4, ci->name, u->nick, na->nick,
+                       event_access);
             notice_lang(s_ChanServ, u, xmsgs[4], access->nc->display,
                         ci->name);
         }
@@ -394,7 +397,8 @@ int do_xop(User * u, char *xname, int xlev, int *xmsgs)
                 deleted = 0;
                 notice_lang(s_ChanServ, u, PERMISSION_DENIED);
             } else {
-                send_event(EVENT_ACCESS_DEL, 3, ci->name, u->nick, na->nick);
+                send_event(EVENT_ACCESS_DEL, 3, ci->name, u->nick,
+                           na->nick);
                 notice_lang(s_ChanServ, u, xmsgs[8], access->nc->display,
                             ci->name);
                 access->nc = NULL;
diff --git a/src/core/ms_rsend.c b/src/core/ms_rsend.c
index b712f4af1..ff0e31379 100644
--- a/src/core/ms_rsend.c
+++ b/src/core/ms_rsend.c
@@ -29,7 +29,8 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion
+        ("$Id$");
     moduleSetType(CORE);
     c = createCommand("RSEND", do_rsend, NULL, MEMO_HELP_RSEND, -1, -1, -1,
                       -1);
diff --git a/src/core/ms_send.c b/src/core/ms_send.c
index c366072a4..7992a0972 100644
--- a/src/core/ms_send.c
+++ b/src/core/ms_send.c
@@ -29,7 +29,8 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion
+        ("$Id$");
     moduleSetType(CORE);
     c = createCommand("SEND", do_send, NULL, MEMO_HELP_SEND, -1, -1, -1,
                       -1);
diff --git a/src/core/ms_sendall.c b/src/core/ms_sendall.c
index 36eae983f..4d9752e8a 100644
--- a/src/core/ms_sendall.c
+++ b/src/core/ms_sendall.c
@@ -29,7 +29,8 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion
+        ("$Id$");
     moduleSetType(CORE);
     c = createCommand("SENDALL", do_sendall, is_services_admin, -1, -1, -1,
                       MEMO_HELP_SENDALL, MEMO_HELP_SENDALL);
diff --git a/src/core/ms_staff.c b/src/core/ms_staff.c
index 091a23ce5..f968a2209 100644
--- a/src/core/ms_staff.c
+++ b/src/core/ms_staff.c
@@ -29,7 +29,8 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion
+        ("$Id$");
     moduleSetType(CORE);
     c = createCommand("STAFF", do_staff, is_services_oper, -1, -1,
                       MEMO_HELP_STAFF, MEMO_HELP_STAFF, MEMO_HELP_STAFF);
diff --git a/src/core/ns_info.c b/src/core/ns_info.c
index 5037dd1c7..87179171b 100644
--- a/src/core/ns_info.c
+++ b/src/core/ns_info.c
@@ -29,7 +29,8 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion
+        ("$Id$");
     moduleSetType(CORE);
 
     c = createCommand("INFO", do_info, NULL, NICK_HELP_INFO, -1,
diff --git a/src/core/ns_saset.c b/src/core/ns_saset.c
index 9b4f3274d..4ae67f006 100644
--- a/src/core/ns_saset.c
+++ b/src/core/ns_saset.c
@@ -47,41 +47,41 @@ int AnopeInit(int argc, char **argv)
     c = createCommand("SASET", do_saset, is_services_admin, -1, -1, -1,
                       NICK_HELP_SASET, NICK_HELP_SASET);
     moduleAddCommand(NICKSERV, c, MOD_UNIQUE);
-    c = createCommand("SASET DISPLAY", NULL, is_services_admin, NICK_HELP_SASET_DISPLAY, -1,
-                      -1, -1, -1);
+    c = createCommand("SASET DISPLAY", NULL, is_services_admin,
+                      NICK_HELP_SASET_DISPLAY, -1, -1, -1, -1);
     moduleAddCommand(NICKSERV, c, MOD_UNIQUE);
-    c = createCommand("SASET PASSWORD", NULL, is_services_admin, NICK_HELP_SASET_PASSWORD,
-                      -1, -1, -1, -1);
+    c = createCommand("SASET PASSWORD", NULL, is_services_admin,
+                      NICK_HELP_SASET_PASSWORD, -1, -1, -1, -1);
     moduleAddCommand(NICKSERV, c, MOD_UNIQUE);
-    c = createCommand("SASET URL", NULL, is_services_admin, NICK_HELP_SASET_URL, -1, -1, -1,
-                      -1);
+    c = createCommand("SASET URL", NULL, is_services_admin,
+                      NICK_HELP_SASET_URL, -1, -1, -1, -1);
     moduleAddCommand(NICKSERV, c, MOD_UNIQUE);
-    c = createCommand("SASET EMAIL", NULL, is_services_admin, NICK_HELP_SASET_EMAIL, -1, -1,
-                      -1, -1);
+    c = createCommand("SASET EMAIL", NULL, is_services_admin,
+                      NICK_HELP_SASET_EMAIL, -1, -1, -1, -1);
     moduleAddCommand(NICKSERV, c, MOD_UNIQUE);
-    c = createCommand("SASET ICQ", NULL, is_services_admin, NICK_HELP_SASET_ICQ, -1, -1, -1,
-                      -1);
+    c = createCommand("SASET ICQ", NULL, is_services_admin,
+                      NICK_HELP_SASET_ICQ, -1, -1, -1, -1);
     moduleAddCommand(NICKSERV, c, MOD_UNIQUE);
-    c = createCommand("SASET GREET", NULL, is_services_admin, NICK_HELP_SASET_GREET, -1, -1,
-                      -1, -1);
+    c = createCommand("SASET GREET", NULL, is_services_admin,
+                      NICK_HELP_SASET_GREET, -1, -1, -1, -1);
     moduleAddCommand(NICKSERV, c, MOD_UNIQUE);
-    c = createCommand("SASET KILL", NULL, is_services_admin, NICK_HELP_SASET_KILL, -1, -1,
-                      -1, -1);
+    c = createCommand("SASET KILL", NULL, is_services_admin,
+                      NICK_HELP_SASET_KILL, -1, -1, -1, -1);
     moduleAddCommand(NICKSERV, c, MOD_UNIQUE);
-    c = createCommand("SASET SECURE", NULL, is_services_admin, NICK_HELP_SASET_SECURE, -1,
-                      -1, -1, -1);
+    c = createCommand("SASET SECURE", NULL, is_services_admin,
+                      NICK_HELP_SASET_SECURE, -1, -1, -1, -1);
     moduleAddCommand(NICKSERV, c, MOD_UNIQUE);
-    c = createCommand("SASET PRIVATE", NULL, is_services_admin, NICK_HELP_SASET_PRIVATE, -1,
-                      -1, -1, -1);
+    c = createCommand("SASET PRIVATE", NULL, is_services_admin,
+                      NICK_HELP_SASET_PRIVATE, -1, -1, -1, -1);
     moduleAddCommand(NICKSERV, c, MOD_UNIQUE);
-    c = createCommand("SASET MSG", NULL, is_services_admin, NICK_HELP_SASET_MSG, -1, -1, -1,
-                      -1);
+    c = createCommand("SASET MSG", NULL, is_services_admin,
+                      NICK_HELP_SASET_MSG, -1, -1, -1, -1);
     moduleAddCommand(NICKSERV, c, MOD_UNIQUE);
-    c = createCommand("SASET HIDE", NULL, is_services_admin, NICK_HELP_SASET_HIDE, -1, -1,
-                      -1, -1);
+    c = createCommand("SASET HIDE", NULL, is_services_admin,
+                      NICK_HELP_SASET_HIDE, -1, -1, -1, -1);
     moduleAddCommand(NICKSERV, c, MOD_UNIQUE);
-    c = createCommand("SASET NOEXPIRE", is_services_admin, NULL, -1, -1, -1,
-                      NICK_HELP_SASET_NOEXPIRE,
+    c = createCommand("SASET NOEXPIRE", is_services_admin, NULL, -1, -1,
+                      -1, NICK_HELP_SASET_NOEXPIRE,
                       NICK_HELP_SASET_NOEXPIRE);
     moduleAddCommand(NICKSERV, c, MOD_UNIQUE);
 
@@ -106,8 +106,8 @@ void AnopeFini(void)
  **/
 void myNickServHelp(User * u)
 {
-	if (is_services_admin(u))
-	    notice_lang(s_NickServ, u, NICK_HELP_CMD_SASET);
+    if (is_services_admin(u))
+        notice_lang(s_NickServ, u, NICK_HELP_CMD_SASET);
 }
 
 /**
@@ -117,7 +117,7 @@ void myNickServHelp(User * u)
  **/
 int do_saset(User * u)
 {
-	char *nick = strtok(NULL, " ");
+    char *nick = strtok(NULL, " ");
     char *cmd = strtok(NULL, " ");
     char *param = strtok(NULL, " ");
 
@@ -127,12 +127,12 @@ int do_saset(User * u)
         notice_lang(s_NickServ, u, NICK_SASET_DISABLED);
         return MOD_CONT;
     }
-	
-	if (!(na = findnick(nick))) {
+
+    if (!(na = findnick(nick))) {
         notice_lang(s_NickServ, u, NICK_SASET_BAD_NICK, nick);
-		return MOD_CONT;
-	}
-	
+        return MOD_CONT;
+    }
+
     if (!param
         && (!cmd
             || (stricmp(cmd, "URL") != 0 && stricmp(cmd, "EMAIL") != 0
@@ -190,7 +190,8 @@ int do_saset_display(User * u, NickCore * nc, char *param)
     }
 
     if (i == nc->aliases.count) {
-        notice_lang(s_NickServ, u, NICK_SASET_DISPLAY_INVALID, nc->display);
+        notice_lang(s_NickServ, u, NICK_SASET_DISPLAY_INVALID,
+                    nc->display);
         return MOD_CONT;
     }
 
@@ -228,7 +229,8 @@ int do_saset_password(User * u, NickCore * nc, char *param)
         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);
+        notice_lang(s_NickServ, u, NICK_SASET_PASSWORD_FAILED,
+                    nc->display);
         return MOD_CONT;
     }
 
@@ -236,14 +238,17 @@ int do_saset_password(User * u, NickCore * nc, char *param)
     notice_lang(s_NickServ, u, NICK_SASET_PASSWORD_CHANGED, nc->display);
 #else
     nc->pass = sstrdup(param);
-    notice_lang(s_NickServ, u, NICK_SASET_PASSWORD_CHANGED_TO, nc->display, nc->pass);
+    notice_lang(s_NickServ, u, NICK_SASET_PASSWORD_CHANGED_TO, nc->display,
+                nc->pass);
 #endif
 
-    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"));
+    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)
         anope_cmd_global(s_NickServ,
-                             "\2%s\2 used SASET PASSWORD on \2%s\2",
-                             u->nick, nc->display);
+                         "\2%s\2 used SASET PASSWORD on \2%s\2",
+                         u->nick, nc->display);
     return MOD_CONT;
 }
 
@@ -254,7 +259,8 @@ int do_saset_url(User * u, NickCore * nc, char *param)
 
     if (param) {
         nc->url = sstrdup(param);
-        notice_lang(s_NickServ, u, NICK_SASET_URL_CHANGED, nc->display, 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);
@@ -277,14 +283,17 @@ int do_saset_email(User * u, NickCore * nc, char *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"));
+    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);
+        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);
@@ -300,7 +309,8 @@ int do_saset_icq(User * u, NickCore * nc, char *param)
             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);
+            notice_lang(s_NickServ, u, NICK_SASET_ICQ_CHANGED, nc->display,
+                        param);
         }
     } else {
         nc->icq = 0;
@@ -322,7 +332,8 @@ int do_saset_greet(User * u, NickCore * nc, char *param)
                  (end ? end : ""));
 
         nc->greet = sstrdup(buf);
-        notice_lang(s_NickServ, u, NICK_SASET_GREET_CHANGED, nc->display, 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);
@@ -368,7 +379,8 @@ int do_saset_secure(User * u, NickCore * nc, char *param)
         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);
+        syntax_error(s_NickServ, u, "SASET SECURE",
+                     NICK_SASET_SECURE_SYNTAX);
     }
     return MOD_CONT;
 }
diff --git a/src/core/ns_set.c b/src/core/ns_set.c
index 8ae5446d6..ce557b79b 100644
--- a/src/core/ns_set.c
+++ b/src/core/ns_set.c
@@ -113,13 +113,13 @@ int do_set(User * u)
 {
     char *cmd = strtok(NULL, " ");
     char *param = strtok(NULL, " ");
-	NickAlias *na = u->na;
-	
+    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
@@ -197,8 +197,7 @@ int do_set_password(User * u, NickCore * nc, char *param)
 {
     int len = strlen(param);
 
-    if (stricmp(nc->display, param) == 0
-               || (StrictPasswords && len < 5)) {
+    if (stricmp(nc->display, param) == 0 || (StrictPasswords && len < 5)) {
         notice_lang(s_NickServ, u, MORE_OBSCURE_PASSWORD);
         return MOD_CONT;
     }
@@ -225,8 +224,7 @@ int do_set_password(User * u, NickCore * nc, char *param)
 #endif
 
     alog("%s: %s!%s@%s (e-mail: %s) changed its password.", s_NickServ,
-             u->nick, u->username, u->host,
-             (nc->email ? nc->email : "none"));
+         u->nick, u->username, u->host, (nc->email ? nc->email : "none"));
 
     return MOD_CONT;
 }
@@ -277,8 +275,8 @@ int do_set_email(User * u, NickCore * nc, char *param)
     }
 
     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"));
+         s_NickServ, u->nick, u->username, u->host,
+         (nc->email ? nc->email : "none"), (param ? param : "none"));
 
     if (nc->email)
         free(nc->email);
diff --git a/src/core/os_akill.c b/src/core/os_akill.c
index 1e41cb95a..c208f71d7 100644
--- a/src/core/os_akill.c
+++ b/src/core/os_akill.c
@@ -35,7 +35,8 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion
+        ("$Id$");
     moduleSetType(CORE);
     c = createCommand("AKILL", do_akill, is_services_oper, OPER_HELP_AKILL,
                       -1, -1, -1, -1);
@@ -183,7 +184,7 @@ int do_akill(User * u)
                 notice_lang(s_OperServ, u, READ_ONLY_MODE);
             }
             if (AddAkiller) {
-               free(reason);
+                free(reason);
             }
         } else {
             syntax_error(s_OperServ, u, "AKILL", OPER_AKILL_SYNTAX);
diff --git a/src/core/os_chankill.c b/src/core/os_chankill.c
index 9a7bb19af..cbae88a20 100644
--- a/src/core/os_chankill.c
+++ b/src/core/os_chankill.c
@@ -29,7 +29,8 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion
+        ("$Id$");
     moduleSetType(CORE);
 
     c = createCommand("CHANKILL", do_chankill, is_services_admin,
diff --git a/src/core/os_modload.c b/src/core/os_modload.c
index c8541bb23..9aef94948 100644
--- a/src/core/os_modload.c
+++ b/src/core/os_modload.c
@@ -36,7 +36,8 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion
+        ("$Id$");
     moduleSetType(CORE);
 
     c = createCommand("MODLOAD", do_modload, is_services_root, -1, -1, -1,
@@ -82,8 +83,8 @@ int do_modload(User * u)
         syntax_error(s_OperServ, u, "MODLOAD", OPER_MODULE_LOAD_SYNTAX);
         return MOD_CONT;
     }
-	if (!queueModuleLoad(name, u))
+    if (!queueModuleLoad(name, u))
         notice_lang(s_OperServ, u, OPER_MODULE_LOAD_FAIL, name);
-	
+
     return MOD_CONT;
 }
diff --git a/src/core/os_modunload.c b/src/core/os_modunload.c
index 6bfb00595..8724811e1 100644
--- a/src/core/os_modunload.c
+++ b/src/core/os_modunload.c
@@ -35,7 +35,8 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion
+        ("$Id$");
     moduleSetType(CORE);
 
     c = createCommand("MODUNLOAD", do_modunload, is_services_root, -1, -1,
@@ -82,8 +83,8 @@ int do_modunload(User * u)
                      OPER_MODULE_UNLOAD_SYNTAX);
         return MOD_CONT;
     }
-	if (!queueModuleUnload(name, u))
+    if (!queueModuleUnload(name, u))
         notice_lang(s_OperServ, u, OPER_MODULE_REMOVE_FAIL, name);
-	
+
     return MOD_CONT;
 }
diff --git a/src/core/os_stats.c b/src/core/os_stats.c
index 28d2a4293..030be06eb 100644
--- a/src/core/os_stats.c
+++ b/src/core/os_stats.c
@@ -35,7 +35,8 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion
+        ("$Id$");
     moduleSetType(CORE);
 
     c = createCommand("STATS", do_stats, is_services_oper, OPER_HELP_STATS,
@@ -75,17 +76,17 @@ void myOperServHelp(User * u)
  * @param s The server to start counting from
  * @return Amount of servers connected to server s
  **/
-int stats_count_servers(Server *s)
+int stats_count_servers(Server * s)
 {
-	int count = 1;
-	
-	while (s) {
-		if (s->links)
-			count += stats_count_servers(s->links);
-		s = s->next;
-	}
-	
-	return count;
+    int count = 1;
+
+    while (s) {
+        if (s->links)
+            count += stats_count_servers(s->links);
+        s = s->next;
+    }
+
+    return count;
 }
 
 /**
@@ -101,9 +102,9 @@ int do_stats(User * u)
         mins = (uptime / 60) % 60, secs = uptime % 60;
     struct tm *tm;
     char timebuf[64];
-	char buf[512];
-	int buflen;
-	int i;
+    char buf[512];
+    int buflen;
+    int i;
 
     if (extra && stricmp(extra, "ALL") != 0) {
         if (stricmp(extra, "AKILL") == 0) {
@@ -232,108 +233,119 @@ int do_stats(User * u)
             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