Added docs for new smaller memory footprint classes

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@1371 e03df62e-2008-0410-955e-edbf42e46eb7

31 files changed, 1262 insertions, 1258 deletions

diff --git a/docs/man/man3/Admin.3 b/docs/man/man3/Admin.3
index b9b9f25c6..1cf858686 100644
--- a/docs/man/man3/Admin.3
+++ b/docs/man/man3/Admin.3
@@ -43,10 +43,10 @@ Definition at line 123 of file modules.h.
 .PP 
 .SS "Admin::Admin (std::string name, std::string email, std::string nick)"
 .PP
-Definition at line 313 of file modules.cpp.
+Definition at line 314 of file modules.cpp.
 .PP
 .nf
-313 : Name(name), Email(email), Nick(nick) { };
+314 : Name(name), Email(email), Nick(nick) { };
 .fi
 .SH "Member Data Documentation"
 .PP 
diff --git a/docs/man/man3/BanItem.3 b/docs/man/man3/BanItem.3
index 79b82b66d..b65c53595 100644
--- a/docs/man/man3/BanItem.3
+++ b/docs/man/man3/BanItem.3
@@ -14,7 +14,7 @@ Inherits \fBHostItem\fP.
 .PP
 .SH "Detailed Description"
 .PP 
-A subclass of \fBHostItem\fP designed to hold channel bans (+b). Definition at line 45 of file channels.h.
+A subclass of \fBHostItem\fP designed to hold channel bans (+b). Definition at line 52 of file channels.h.
 
 .SH "Author"
 .PP 
diff --git a/docs/man/man3/ConfigReader.3 b/docs/man/man3/ConfigReader.3
index 6d130dd79..b9050548f 100644
--- a/docs/man/man3/ConfigReader.3
+++ b/docs/man/man3/ConfigReader.3
@@ -89,213 +89,213 @@ Definition at line 1147 of file modules.h.
 .PP 
 .SS "ConfigReader::ConfigReader ()"
 .PP
-Default constructor. This constructor initialises the ConfigReader class to read the inspircd.conf file as specified when running ./configure.Definition at line 869 of file modules.cpp.
+Default constructor. This constructor initialises the ConfigReader class to read the inspircd.conf file as specified when running ./configure.Definition at line 870 of file modules.cpp.
 .PP
 References cache, CONF_FILE_NOT_FOUND, error, errorlog, and readerror.
 .PP
 .nf
-870 {
-871         this->cache = new std::stringstream(std::stringstream::in | std::stringstream::out);
-872         this->errorlog = new std::stringstream(std::stringstream::in | std::stringstream::out);
-873         this->readerror = LoadConf(CONFIG_FILE,this->cache,this->errorlog);
-874         if (!this->readerror)
-875                 this->error = CONF_FILE_NOT_FOUND;
-876 }
+871 {
+872         this->cache = new std::stringstream(std::stringstream::in | std::stringstream::out);
+873         this->errorlog = new std::stringstream(std::stringstream::in | std::stringstream::out);
+874         this->readerror = LoadConf(CONFIG_FILE,this->cache,this->errorlog);
+875         if (!this->readerror)
+876                 this->error = CONF_FILE_NOT_FOUND;
+877 }
 .fi
 .SS "ConfigReader::ConfigReader (std::string filename)"
 .PP
-Overloaded constructor. This constructor initialises the ConfigReader class to read a user-specified config fileDefinition at line 888 of file modules.cpp.
+Overloaded constructor. This constructor initialises the ConfigReader class to read a user-specified config fileDefinition at line 889 of file modules.cpp.
 .PP
 References cache, CONF_FILE_NOT_FOUND, error, errorlog, and readerror.
 .PP
 .nf
-889 {
-890         this->cache = new std::stringstream(std::stringstream::in | std::stringstream::out);
-891         this->errorlog = new std::stringstream(std::stringstream::in | std::stringstream::out);
-892         this->readerror = LoadConf(filename.c_str(),this->cache,this->errorlog);
-893         if (!this->readerror)
-894                 this->error = CONF_FILE_NOT_FOUND;
-895 };
+890 {
+891         this->cache = new std::stringstream(std::stringstream::in | std::stringstream::out);
+892         this->errorlog = new std::stringstream(std::stringstream::in | std::stringstream::out);
+893         this->readerror = LoadConf(filename.c_str(),this->cache,this->errorlog);
+894         if (!this->readerror)
+895                 this->error = CONF_FILE_NOT_FOUND;
+896 };
 .fi
 .SS "ConfigReader::~\fBConfigReader\fP ()"
 .PP
-Default destructor. This method destroys the ConfigReader class.Definition at line 879 of file modules.cpp.
+Default destructor. This method destroys the ConfigReader class.Definition at line 880 of file modules.cpp.
 .PP
 References cache, and errorlog.
 .PP
 .nf
-880 {
-881         if (this->cache)
-882                 delete this->cache;
-883         if (this->errorlog)
-884                 delete this->errorlog;
-885 }
+881 {
+882         if (this->cache)
+883                 delete this->cache;
+884         if (this->errorlog)
+885                 delete this->errorlog;
+886 }
 .fi
 .SH "Member Function Documentation"
 .PP 
 .SS "void ConfigReader::DumpErrors (bool bail, \fBuserrec\fP * user)"
 .PP
-Dumps the list of errors in a config file to an output location. If bail is true, then the program will abort. If bail is false and user points to a valid user record, the error report will be spooled to the given user by means of NOTICE. if bool is false AND user is false, the error report will be spooled to all opers by means of a NOTICE to all opers.Definition at line 966 of file modules.cpp.
+Dumps the list of errors in a config file to an output location. If bail is true, then the program will abort. If bail is false and user points to a valid user record, the error report will be spooled to the given user by means of NOTICE. if bool is false AND user is false, the error report will be spooled to all opers by means of a NOTICE to all opers.Definition at line 967 of file modules.cpp.
 .PP
 References errorlog, connection::fd, and userrec::nick.
 .PP
 .nf
-967 {
-968         if (bail)
-969         {
-970                 printf('There were errors in your configuration:\n%s',errorlog->str().c_str());
-971                 exit(0);
-972         }
-973         else
-974         {
-975                 char dataline[1024];
-976                 if (user)
-977                 {
-978                         WriteServ(user->fd,'NOTICE %s :There were errors in the configuration file:',user->nick);
-979                         while (!errorlog->eof())
-980                         {
-981                                 errorlog->getline(dataline,1024);
-982                                 WriteServ(user->fd,'NOTICE %s :%s',user->nick,dataline);
-983                         }
-984                 }
-985                 else
-986                 {
-987                         WriteOpers('There were errors in the configuration file:',user->nick);
-988                         while (!errorlog->eof())
-989                         {
-990                                 errorlog->getline(dataline,1024);
-991                                 WriteOpers(dataline);
-992                         }
-993                 }
-994                 return;
-995         }
-996 }
+968 {
+969         if (bail)
+970         {
+971                 printf('There were errors in your configuration:\n%s',errorlog->str().c_str());
+972                 exit(0);
+973         }
+974         else
+975         {
+976                 char dataline[1024];
+977                 if (user)
+978                 {
+979                         WriteServ(user->fd,'NOTICE %s :There were errors in the configuration file:',user->nick);
+980                         while (!errorlog->eof())
+981                         {
+982                                 errorlog->getline(dataline,1024);
+983                                 WriteServ(user->fd,'NOTICE %s :%s',user->nick,dataline);
+984                         }
+985                 }
+986                 else
+987                 {
+988                         WriteOpers('There were errors in the configuration file:',user->nick);
+989                         while (!errorlog->eof())
+990                         {
+991                                 errorlog->getline(dataline,1024);
+992                                 WriteOpers(dataline);
+993                         }
+994                 }
+995                 return;
+996         }
+997 }
 .fi
 .SS "int ConfigReader::Enumerate (std::string tag)"
 .PP
-Counts the number of times a given tag appears in the config file. This method counts the number of times a tag appears in a config file, for use where there are several tags of the same kind, e.g. with opers and connect types. It can be used with the index value of \fBConfigReader::ReadValue\fP to loop through all copies of a multiple instance tag.Definition at line 999 of file modules.cpp.
+Counts the number of times a given tag appears in the config file. This method counts the number of times a tag appears in a config file, for use where there are several tags of the same kind, e.g. with opers and connect types. It can be used with the index value of \fBConfigReader::ReadValue\fP to loop through all copies of a multiple instance tag.Definition at line 1000 of file modules.cpp.
 .PP
 References cache.
 .PP
 .nf
-1000 {
-1001         return EnumConf(cache,tag.c_str());
-1002 }
+1001 {
+1002         return EnumConf(cache,tag.c_str());
+1003 }
 .fi
 .SS "int ConfigReader::EnumerateValues (std::string tag, int index)"
 .PP
-Returns the number of items within a tag. For example if the tag was <test tag='blah' data='foo'> then this function would return 2. Spaces and newlines both qualify as valid seperators between values.Definition at line 1004 of file modules.cpp.
+Returns the number of items within a tag. For example if the tag was <test tag='blah' data='foo'> then this function would return 2. Spaces and newlines both qualify as valid seperators between values.Definition at line 1005 of file modules.cpp.
 .PP
 References cache.
 .PP
 .nf
-1005 {
-1006         return EnumValues(cache, tag.c_str(), index);
-1007 }
+1006 {
+1007         return EnumValues(cache, tag.c_str(), index);
+1008 }
 .fi
 .SS "long ConfigReader::GetError ()"
 .PP
-Returns the last error to occur. Valid errors can be found by looking in \fBmodules.h\fP. Any nonzero value indicates an error condition. A call to \fBGetError()\fP resets the error flag back to 0.Definition at line 959 of file modules.cpp.
+Returns the last error to occur. Valid errors can be found by looking in \fBmodules.h\fP. Any nonzero value indicates an error condition. A call to \fBGetError()\fP resets the error flag back to 0.Definition at line 960 of file modules.cpp.
 .PP
 References error.
 .PP
 .nf
-960 {
-961         long olderr = this->error;
-962         this->error = 0;
-963         return olderr;
-964 }
+961 {
+962         long olderr = this->error;
+963         this->error = 0;
+964         return olderr;
+965 }
 .fi
 .SS "bool ConfigReader::ReadFlag (std::string tag, std::string name, int index)"
 .PP
-Retrieves a boolean value from the config file. This method retrieves a boolean value from the config file. Where multiple copies of the tag exist in the config file, index indicates which of the values to retrieve. The values '1', 'yes' and 'true' in the config file count as true to ReadFlag, and any other value counts as false.Definition at line 913 of file modules.cpp.
+Retrieves a boolean value from the config file. This method retrieves a boolean value from the config file. Where multiple copies of the tag exist in the config file, index indicates which of the values to retrieve. The values '1', 'yes' and 'true' in the config file count as true to ReadFlag, and any other value counts as false.Definition at line 914 of file modules.cpp.
 .PP
 References cache, CONF_VALUE_NOT_FOUND, and error.
 .PP
 .nf
-914 {
-915         char val[MAXBUF];
-916         char t[MAXBUF];
-917         char n[MAXBUF];
-918         strlcpy(t,tag.c_str(),MAXBUF);
-919         strlcpy(n,name.c_str(),MAXBUF);
-920         int res = ReadConf(cache,t,n,index,val);
-921         if (!res)
-922         {
-923                 this->error = CONF_VALUE_NOT_FOUND;
-924                 return false;
-925         }
-926         std::string s = val;
-927         return ((s == 'yes') || (s == 'YES') || (s == 'true') || (s == 'TRUE') || (s == '1'));
-928 }
+915 {
+916         char val[MAXBUF];
+917         char t[MAXBUF];
+918         char n[MAXBUF];
+919         strlcpy(t,tag.c_str(),MAXBUF);
+920         strlcpy(n,name.c_str(),MAXBUF);
+921         int res = ReadConf(cache,t,n,index,val);
+922         if (!res)
+923         {
+924                 this->error = CONF_VALUE_NOT_FOUND;
+925                 return false;
+926         }
+927         std::string s = val;
+928         return ((s == 'yes') || (s == 'YES') || (s == 'true') || (s == 'TRUE') || (s == '1'));
+929 }
 .fi
 .SS "long ConfigReader::ReadInteger (std::string tag, std::string name, int index, bool needs_unsigned)"
 .PP
-Retrieves an integer value from the config file. This method retrieves an integer value from the config file. Where multiple copies of the tag exist in the config file, index indicates which of the values to retrieve. Any invalid integer values in the tag will cause the objects error value to be set, and any call to \fBGetError()\fP will return CONF_INVALID_NUMBER to be returned. needs_unsigned is set if the number must be unsigned. If a signed number is placed into a tag which is specified unsigned, 0 will be returned and \fBGetError()\fP will return CONF_NOT_UNSIGNEDDefinition at line 930 of file modules.cpp.
+Retrieves an integer value from the config file. This method retrieves an integer value from the config file. Where multiple copies of the tag exist in the config file, index indicates which of the values to retrieve. Any invalid integer values in the tag will cause the objects error value to be set, and any call to \fBGetError()\fP will return CONF_INVALID_NUMBER to be returned. needs_unsigned is set if the number must be unsigned. If a signed number is placed into a tag which is specified unsigned, 0 will be returned and \fBGetError()\fP will return CONF_NOT_UNSIGNEDDefinition at line 931 of file modules.cpp.
 .PP
 References cache, CONF_NOT_A_NUMBER, CONF_NOT_UNSIGNED, CONF_VALUE_NOT_FOUND, and error.
 .PP
 .nf
-931 {
-932         char val[MAXBUF];
-933         char t[MAXBUF];
-934         char n[MAXBUF];
-935         strlcpy(t,tag.c_str(),MAXBUF);
-936         strlcpy(n,name.c_str(),MAXBUF);
-937         int res = ReadConf(cache,t,n,index,val);
-938         if (!res)
-939         {
-940                 this->error = CONF_VALUE_NOT_FOUND;
-941                 return 0;
-942         }
-943         for (int i = 0; i < strlen(val); i++)
-944         {
-945                 if (!isdigit(val[i]))
-946                 {
-947                         this->error = CONF_NOT_A_NUMBER;
-948                         return 0;
-949                 }
-950         }
-951         if ((needs_unsigned) && (atoi(val)<0))
-952         {
-953                 this->error = CONF_NOT_UNSIGNED;
-954                 return 0;
-955         }
-956         return atoi(val);
-957 }
+932 {
+933         char val[MAXBUF];
+934         char t[MAXBUF];
+935         char n[MAXBUF];
+936         strlcpy(t,tag.c_str(),MAXBUF);
+937         strlcpy(n,name.c_str(),MAXBUF);
+938         int res = ReadConf(cache,t,n,index,val);
+939         if (!res)
+940         {
+941                 this->error = CONF_VALUE_NOT_FOUND;
+942                 return 0;
+943         }
+944         for (int i = 0; i < strlen(val); i++)
+945         {
+946                 if (!isdigit(val[i]))
+947                 {
+948                         this->error = CONF_NOT_A_NUMBER;
+949                         return 0;
+950                 }
+951         }
+952         if ((needs_unsigned) && (atoi(val)<0))
+953         {
+954                 this->error = CONF_NOT_UNSIGNED;
+955                 return 0;
+956         }
+957         return atoi(val);
+958 }
 .fi
 .SS "std::string ConfigReader::ReadValue (std::string tag, std::string name, int index)"
 .PP
-Retrieves a value from the config file. This method retrieves a value from the config file. Where multiple copies of the tag exist in the config file, index indicates which of the values to retrieve.Definition at line 897 of file modules.cpp.
+Retrieves a value from the config file. This method retrieves a value from the config file. Where multiple copies of the tag exist in the config file, index indicates which of the values to retrieve.Definition at line 898 of file modules.cpp.
 .PP
 References cache, CONF_VALUE_NOT_FOUND, and error.
 .PP
 .nf
-898 {
-899         char val[MAXBUF];
-900         char t[MAXBUF];
-901         char n[MAXBUF];
-902         strlcpy(t,tag.c_str(),MAXBUF);
-903         strlcpy(n,name.c_str(),MAXBUF);
-904         int res = ReadConf(cache,t,n,index,val);
-905         if (!res)
-906         {
-907                 this->error = CONF_VALUE_NOT_FOUND;
-908                 return '';
-909         }
-910         return val;
-911 }
+899 {
+900         char val[MAXBUF];
+901         char t[MAXBUF];
+902         char n[MAXBUF];
+903         strlcpy(t,tag.c_str(),MAXBUF);
+904         strlcpy(n,name.c_str(),MAXBUF);
+905         int res = ReadConf(cache,t,n,index,val);
+906         if (!res)
+907         {
+908                 this->error = CONF_VALUE_NOT_FOUND;
+909                 return '';
+910         }
+911         return val;
+912 }
 .fi
 .SS "bool ConfigReader::Verify ()"
 .PP
-Returns true if a config file is valid. This method is partially implemented and will only return false if the config file does not exist or could not be opened.Definition at line 1009 of file modules.cpp.
+Returns true if a config file is valid. This method is partially implemented and will only return false if the config file does not exist or could not be opened.Definition at line 1010 of file modules.cpp.
 .PP
 References readerror.
 .PP
 .nf
-1010 {
-1011         return this->readerror;
-1012 }
+1011 {
+1012         return this->readerror;
+1013 }
 .fi
 .SH "Member Data Documentation"
 .PP 
diff --git a/docs/man/man3/ConnectClass.3 b/docs/man/man3/ConnectClass.3
index fd38a4afe..404e83a15 100644
--- a/docs/man/man3/ConnectClass.3
+++ b/docs/man/man3/ConnectClass.3
@@ -23,7 +23,7 @@ Inherits \fBclassbase\fP.
 
 .in +1c
 .ti -1c
-.RI "int \fBtype\fP"
+.RI "char \fBtype\fP"
 .br
 .RI "\fIType of line, either CC_ALLOW or CC_DENY. \fP"
 .ti -1c
@@ -47,7 +47,7 @@ Inherits \fBclassbase\fP.
 .br
 .RI "\fI(Optional) Password for this line \fP"
 .ti -1c
-.RI "long \fBthreshold\fP"
+.RI "int \fBthreshold\fP"
 .br
 .RI "\fIThreshold value for flood disconnect. \fP"
 .ti -1c
@@ -119,12 +119,12 @@ Referenced by ConnectClass().
 Maximum size of sendq for users in this class (bytes). Definition at line 73 of file users.h.
 .PP
 Referenced by ConnectClass().
-.SS "long \fBConnectClass::threshold\fP"
+.SS "int \fBConnectClass::threshold\fP"
 .PP
 Threshold value for flood disconnect. Definition at line 69 of file users.h.
 .PP
 Referenced by ConnectClass().
-.SS "int \fBConnectClass::type\fP"
+.SS "char \fBConnectClass::type\fP"
 .PP
 Type of line, either CC_ALLOW or CC_DENY. Definition at line 50 of file users.h.
 
diff --git a/docs/man/man3/ELine.3 b/docs/man/man3/ELine.3
index b0cec0b21..52831f67f 100644
--- a/docs/man/man3/ELine.3
+++ b/docs/man/man3/ELine.3
@@ -14,13 +14,13 @@ Inherits \fBXLine\fP.
 
 .in +1c
 .ti -1c
-.RI "char \fBhostmask\fP [MAXBUF]"
+.RI "char \fBhostmask\fP [200]"
 .br
 .RI "\fIHostmask (ident) to match against May contain wildcards. \fP"
 .in -1c
 .SH "Member Data Documentation"
 .PP 
-.SS "char \fBELine::hostmask\fP[MAXBUF]"
+.SS "char \fBELine::hostmask\fP[200]"
 .PP
 Hostmask (ident) to match against May contain wildcards. Definition at line 88 of file xline.h.
 
diff --git a/docs/man/man3/Event.3 b/docs/man/man3/Event.3
index 1f24c87ef..94d80a8ba 100644
--- a/docs/man/man3/Event.3
+++ b/docs/man/man3/Event.3
@@ -63,59 +63,59 @@ Definition at line 194 of file modules.h.
 .PP 
 .SS "Event::Event (char * anydata, \fBModule\fP * src, std::string eventid)"
 .PP
-Create a new Event. Definition at line 344 of file modules.cpp.
+Create a new Event. Definition at line 345 of file modules.cpp.
 .PP
 .nf
-344 : data(anydata), source(src), id(eventid) { };
+345 : data(anydata), source(src), id(eventid) { };
 .fi
 .SH "Member Function Documentation"
 .PP 
 .SS "char * Event::GetData ()"
 .PP
-Get the Event data. Definition at line 346 of file modules.cpp.
+Get the Event data. Definition at line 347 of file modules.cpp.
 .PP
 References data.
 .PP
 .nf
-347 {
-348         return this->data;
-349 }
+348 {
+349         return this->data;
+350 }
 .fi
 .SS "std::string Event::GetEventID ()"
 .PP
-Get the event ID. Use this to determine the event type for safe casting of the data Definition at line 362 of file modules.cpp.
+Get the event ID. Use this to determine the event type for safe casting of the data Definition at line 363 of file modules.cpp.
 .PP
 References id.
 .PP
 .nf
-363 {
-364         return this->id;
-365 }
+364 {
+365         return this->id;
+366 }
 .fi
 .SS "\fBModule\fP * Event::GetSource ()"
 .PP
-Get the event Source. Definition at line 351 of file modules.cpp.
+Get the event Source. Definition at line 352 of file modules.cpp.
 .PP
 References source.
 .PP
 .nf
-352 {
-353         return this->source;
-354 }
+353 {
+354         return this->source;
+355 }
 .fi
 .SS "char * Event::Send ()\fC [virtual]\fP"
 .PP
 Send the Event. The return result of an \fBEvent::Send()\fP will always be NULL as no replies are expected. Implements \fBModuleMessage\fP.
 .PP
-Definition at line 356 of file modules.cpp.
+Definition at line 357 of file modules.cpp.
 .PP
 References FOREACH_MOD.
 .PP
 .nf
-357 {
-358         FOREACH_MOD OnEvent(this);
-359         return NULL;
-360 }
+358 {
+359         FOREACH_MOD OnEvent(this);
+360         return NULL;
+361 }
 .fi
 .SH "Member Data Documentation"
 .PP 
diff --git a/docs/man/man3/ExemptItem.3 b/docs/man/man3/ExemptItem.3
index a0cbb2205..5681bc866 100644
--- a/docs/man/man3/ExemptItem.3
+++ b/docs/man/man3/ExemptItem.3
@@ -14,7 +14,7 @@ Inherits \fBHostItem\fP.
 .PP
 .SH "Detailed Description"
 .PP 
-A subclass of \fBHostItem\fP designed to hold channel exempts (+e). Definition at line 53 of file channels.h.
+A subclass of \fBHostItem\fP designed to hold channel exempts (+e). Definition at line 60 of file channels.h.
 
 .SH "Author"
 .PP 
diff --git a/docs/man/man3/ExtMode.3 b/docs/man/man3/ExtMode.3
index 7e19955b6..3ab0d8a73 100644
--- a/docs/man/man3/ExtMode.3
+++ b/docs/man/man3/ExtMode.3
@@ -41,41 +41,41 @@ Inherits \fBclassbase\fP.
 .PP 
 .SS "ExtMode::ExtMode (char mc, int ty, bool oper, int p_on, int p_off)\fC [inline]\fP"
 .PP
-Definition at line 211 of file modules.cpp.
+Definition at line 212 of file modules.cpp.
 .PP
 References modechar, needsoper, params_when_off, params_when_on, and type.
 .PP
 .nf
-211 : modechar(mc), type(ty), needsoper(oper), params_when_on(p_on), params_when_off(p_off) { };
+212 : modechar(mc), type(ty), needsoper(oper), params_when_on(p_on), params_when_off(p_off) { };
 .fi
 .SH "Member Data Documentation"
 .PP 
 .SS "bool \fBExtMode::list\fP"
 .PP
-Definition at line 210 of file modules.cpp.
+Definition at line 211 of file modules.cpp.
 .SS "char \fBExtMode::modechar\fP"
 .PP
-Definition at line 205 of file modules.cpp.
+Definition at line 206 of file modules.cpp.
 .PP
 Referenced by ExtMode().
 .SS "bool \fBExtMode::needsoper\fP"
 .PP
-Definition at line 209 of file modules.cpp.
+Definition at line 210 of file modules.cpp.
 .PP
 Referenced by ExtMode().
 .SS "int \fBExtMode::params_when_off\fP"
 .PP
-Definition at line 208 of file modules.cpp.
+Definition at line 209 of file modules.cpp.
 .PP
 Referenced by ExtMode().
 .SS "int \fBExtMode::params_when_on\fP"
 .PP
-Definition at line 207 of file modules.cpp.
+Definition at line 208 of file modules.cpp.
 .PP
 Referenced by ExtMode().
 .SS "int \fBExtMode::type\fP"
 .PP
-Definition at line 206 of file modules.cpp.
+Definition at line 207 of file modules.cpp.
 .PP
 Referenced by ExtMode().
 
diff --git a/docs/man/man3/FileReader.3 b/docs/man/man3/FileReader.3
index cf62c2546..afba66f52 100644
--- a/docs/man/man3/FileReader.3
+++ b/docs/man/man3/FileReader.3
@@ -62,89 +62,89 @@ Definition at line 1236 of file modules.h.
 .PP 
 .SS "FileReader::FileReader ()"
 .PP
-Default constructor. This method does not load any file into memory, you must use the LoadFile method after constructing the class this way.Definition at line 1022 of file modules.cpp.
+Default constructor. This method does not load any file into memory, you must use the LoadFile method after constructing the class this way.Definition at line 1023 of file modules.cpp.
 .PP
 .nf
-1023 {
-1024 }
+1024 {
+1025 }
 .fi
 .SS "FileReader::FileReader (std::string filename)"
 .PP
-Secondary constructor. This method initialises the class with a file loaded into it ready for GetLine and and other methods to be called. If the file could not be loaded, \fBFileReader::FileSize\fP returns 0.Definition at line 1015 of file modules.cpp.
+Secondary constructor. This method initialises the class with a file loaded into it ready for GetLine and and other methods to be called. If the file could not be loaded, \fBFileReader::FileSize\fP returns 0.Definition at line 1016 of file modules.cpp.
 .PP
 References fc, and file_cache.
 .PP
 .nf
-1016 {
-1017         file_cache c;
-1018         readfile(c,filename.c_str());
-1019         this->fc = c;
-1020 }
+1017 {
+1018         file_cache c;
+1019         readfile(c,filename.c_str());
+1020         this->fc = c;
+1021 }
 .fi
 .SS "FileReader::~\fBFileReader\fP ()"
 .PP
-Default destructor. This deletes the memory allocated to the file.Definition at line 1034 of file modules.cpp.
+Default destructor. This deletes the memory allocated to the file.Definition at line 1035 of file modules.cpp.
 .PP
 .nf
-1035 {
-1036 }
+1036 {
+1037 }
 .fi
 .SH "Member Function Documentation"
 .PP 
 .SS "bool FileReader::Exists ()"
 .PP
-Returns true if the file exists This function will return false if the file could not be opened. Definition at line 1038 of file modules.cpp.
+Returns true if the file exists This function will return false if the file could not be opened. Definition at line 1039 of file modules.cpp.
 .PP
 References fc.
 .PP
 .nf
-1039 {
-1040         if (fc.size() == 0)
-1041         {
-1042                 return(false);
-1043         }
-1044         else
-1045         {
-1046                 return(true);
-1047         }
-1048 }
+1040 {
+1041         if (fc.size() == 0)
+1042         {
+1043                 return(false);
+1044         }
+1045         else
+1046         {
+1047                 return(true);
+1048         }
+1049 }
 .fi
 .SS "int FileReader::FileSize ()"
 .PP
-Returns the size of the file in lines. This method returns the number of lines in the read file. If it is 0, no lines have been read into memory, either because the file is empty or it does not exist, or cannot be opened due to permission problems.Definition at line 1057 of file modules.cpp.
+Returns the size of the file in lines. This method returns the number of lines in the read file. If it is 0, no lines have been read into memory, either because the file is empty or it does not exist, or cannot be opened due to permission problems.Definition at line 1058 of file modules.cpp.
 .PP
 References fc.
 .PP
 .nf
-1058 {
-1059         return fc.size();
-1060 }
+1059 {
+1060         return fc.size();
+1061 }
 .fi
 .SS "std::string FileReader::GetLine (int x)"
 .PP
-Retrieve one line from the file. This method retrieves one line from the text file. If an empty non-NULL string is returned, the index was out of bounds, or the line had no data on it.Definition at line 1050 of file modules.cpp.
+Retrieve one line from the file. This method retrieves one line from the text file. If an empty non-NULL string is returned, the index was out of bounds, or the line had no data on it.Definition at line 1051 of file modules.cpp.
 .PP
 References fc.
 .PP
 .nf
-1051 {
-1052         if ((x<0) || (x>fc.size()))
-1053                 return '';
-1054         return fc[x];
-1055 }
+1052 {
+1053         if ((x<0) || (x>fc.size()))
+1054                 return '';
+1055         return fc[x];
+1056 }
 .fi
 .SS "void FileReader::LoadFile (std::string filename)"
 .PP
-Used to load a file. This method loads a file into the class ready for GetLine and and other methods to be called. If the file could not be loaded, \fBFileReader::FileSize\fP returns 0.Definition at line 1026 of file modules.cpp.
+Used to load a file. This method loads a file into the class ready for GetLine and and other methods to be called. If the file could not be loaded, \fBFileReader::FileSize\fP returns 0.Definition at line 1027 of file modules.cpp.
 .PP
 References fc, and file_cache.
 .PP
 .nf
-1027 {
-1028         file_cache c;
-1029         readfile(c,filename.c_str());
-1030         this->fc = c;
-1031 }
+1028 {
+1029         file_cache c;
+1030         readfile(c,filename.c_str());
+1031         this->fc = c;
+1032 }
 .fi
 .SH "Member Data Documentation"
 .PP 
diff --git a/docs/man/man3/GLine.3 b/docs/man/man3/GLine.3
index 6d305802e..c2930a1cf 100644
--- a/docs/man/man3/GLine.3
+++ b/docs/man/man3/GLine.3
@@ -16,7 +16,7 @@ Inherits \fBXLine\fP.
 
 .in +1c
 .ti -1c
-.RI "char \fBhostmask\fP [MAXBUF]"
+.RI "char \fBhostmask\fP [200]"
 .br
 .RI "\fIHostmask (ident) to match against May contain wildcards. \fP"
 .in -1c
@@ -25,7 +25,7 @@ Inherits \fBXLine\fP.
 GLine class. Definition at line 73 of file xline.h.
 .SH "Member Data Documentation"
 .PP 
-.SS "char \fBGLine::hostmask\fP[MAXBUF]"
+.SS "char \fBGLine::hostmask\fP[200]"
 .PP
 Hostmask (ident) to match against May contain wildcards. Definition at line 79 of file xline.h.
 
diff --git a/docs/man/man3/HostItem.3 b/docs/man/man3/HostItem.3
index 8add954a4..dbe1958fd 100644
--- a/docs/man/man3/HostItem.3
+++ b/docs/man/man3/HostItem.3
@@ -43,34 +43,34 @@ Holds an entry for a ban list, exemption list, or invite list.
 
 This class contains a single element in a channel list, such as a banlist. 
 .PP
-Definition at line 29 of file channels.h.
+Definition at line 36 of file channels.h.
 .SH "Constructor & Destructor Documentation"
 .PP 
 .SS "HostItem::HostItem ()\fC [inline]\fP"
 .PP
-Definition at line 36 of file channels.h.
+Definition at line 43 of file channels.h.
 .PP
 .nf
-36 { /* stub */ }
+43 { /* stub */ }
 .fi
 .SS "virtual HostItem::~\fBHostItem\fP ()\fC [inline, virtual]\fP"
 .PP
-Definition at line 37 of file channels.h.
+Definition at line 44 of file channels.h.
 .PP
 .nf
-37 { /* stub */ }
+44 { /* stub */ }
 .fi
 .SH "Member Data Documentation"
 .PP 
 .SS "char \fBHostItem::data\fP[MAXBUF]"
 .PP
-Definition at line 34 of file channels.h.
+Definition at line 41 of file channels.h.
 .SS "char \fBHostItem::set_by\fP[NICKMAX]"
 .PP
-Definition at line 33 of file channels.h.
+Definition at line 40 of file channels.h.
 .SS "time_t \fBHostItem::set_time\fP"
 .PP
-Definition at line 32 of file channels.h.
+Definition at line 39 of file channels.h.
 
 .SH "Author"
 .PP 
diff --git a/docs/man/man3/InviteItem.3 b/docs/man/man3/InviteItem.3
index 105d7a1b6..0f944e6e4 100644
--- a/docs/man/man3/InviteItem.3
+++ b/docs/man/man3/InviteItem.3
@@ -14,7 +14,7 @@ Inherits \fBHostItem\fP.
 .PP
 .SH "Detailed Description"
 .PP 
-A subclass of \fBHostItem\fP designed to hold channel invites (+I). Definition at line 61 of file channels.h.
+A subclass of \fBHostItem\fP designed to hold channel invites (+I). Definition at line 68 of file channels.h.
 
 .SH "Author"
 .PP 
diff --git a/docs/man/man3/KLine.3 b/docs/man/man3/KLine.3
index 9c7ef5e29..df1c3c25a 100644
--- a/docs/man/man3/KLine.3
+++ b/docs/man/man3/KLine.3
@@ -16,7 +16,7 @@ Inherits \fBXLine\fP.
 
 .in +1c
 .ti -1c
-.RI "char \fBhostmask\fP [MAXBUF]"
+.RI "char \fBhostmask\fP [200]"
 .br
 .RI "\fIHostmask (ident) to match against May contain wildcards. \fP"
 .in -1c
@@ -25,7 +25,7 @@ Inherits \fBXLine\fP.
 KLine class. Definition at line 62 of file xline.h.
 .SH "Member Data Documentation"
 .PP 
-.SS "char \fBKLine::hostmask\fP[MAXBUF]"
+.SS "char \fBKLine::hostmask\fP[200]"
 .PP
 Hostmask (ident) to match against May contain wildcards. Definition at line 68 of file xline.h.
 
diff --git a/docs/man/man3/ModeParameter.3 b/docs/man/man3/ModeParameter.3
index 89a3a3247..45a29f1eb 100644
--- a/docs/man/man3/ModeParameter.3
+++ b/docs/man/man3/ModeParameter.3
@@ -31,22 +31,22 @@ Holds a custom parameter to a module-defined channel mode e.g.
 
 for +L this would hold the channel name. 
 .PP
-Definition at line 70 of file channels.h.
+Definition at line 77 of file channels.h.
 .SH "Member Data Documentation"
 .PP 
 .SS "char \fBModeParameter::channel\fP[CHANMAX]"
 .PP
-Definition at line 75 of file channels.h.
+Definition at line 82 of file channels.h.
 .PP
 Referenced by chanrec::SetCustomModeParam().
 .SS "char \fBModeParameter::mode\fP"
 .PP
-Definition at line 73 of file channels.h.
+Definition at line 80 of file channels.h.
 .PP
 Referenced by chanrec::SetCustomModeParam().
 .SS "char \fBModeParameter::parameter\fP[MAXBUF]"
 .PP
-Definition at line 74 of file channels.h.
+Definition at line 81 of file channels.h.
 .PP
 Referenced by chanrec::SetCustomModeParam().
 
diff --git a/docs/man/man3/Module.3 b/docs/man/man3/Module.3
index d83fa9e0f..969711dcb 100644
--- a/docs/man/man3/Module.3
+++ b/docs/man/man3/Module.3
@@ -251,35 +251,35 @@ Definition at line 236 of file modules.h.
 .PP 
 .SS "Module::Module ()"
 .PP
-Default constructor creates a module class. Definition at line 369 of file modules.cpp.
+Default constructor creates a module class. Definition at line 370 of file modules.cpp.
 .PP
 .nf
-369 { }
+370 { }
 .fi
 .SS "Module::~\fBModule\fP ()\fC [virtual]\fP"
 .PP
-Default destructor destroys a module class. Definition at line 370 of file modules.cpp.
+Default destructor destroys a module class. Definition at line 371 of file modules.cpp.
 .PP
 .nf
-370 { }
+371 { }
 .fi
 .SH "Member Function Documentation"
 .PP 
 .SS "\fBVersion\fP Module::GetVersion ()\fC [virtual]\fP"
 .PP
-Returns the version number of a Module. The method should return a \fBVersion\fP object with its version information assigned via \fBVersion::Version\fPDefinition at line 382 of file modules.cpp.
+Returns the version number of a Module. The method should return a \fBVersion\fP object with its version information assigned via \fBVersion::Version\fPDefinition at line 383 of file modules.cpp.
 .PP
 References VF_VENDOR.
 .PP
 .nf
-382 { return Version(1,0,0,0,VF_VENDOR); }
+383 { return Version(1,0,0,0,VF_VENDOR); }
 .fi
 .SS "void Module::On005Numeric (std::string & output)\fC [virtual]\fP"
 .PP
-Called when a 005 numeric is about to be output. The module should modify the 005 numeric if needed to indicate its features.Definition at line 394 of file modules.cpp.
+Called when a 005 numeric is about to be output. The module should modify the 005 numeric if needed to indicate its features.Definition at line 395 of file modules.cpp.
 .PP
 .nf
-394 { };
+395 { };
 .fi
 .SS "int Module::OnAccessCheck (\fBuserrec\fP * source, \fBuserrec\fP * dest, \fBchanrec\fP * channel, int access_type)\fC [virtual]\fP"
 .PP
@@ -307,312 +307,312 @@ Called before an action which requires a channel privilage check. This function
 .br
 
 .br
- Upon returning from your function you must return either ACR_DEFAULT, to indicate the module wishes to do nothing, or ACR_DENY where approprate to deny the action, and ACR_ALLOW where appropriate to allow the action. Please note that in the case of some access checks (such as AC_GENERAL_MODE) access may be denied 'upstream' causing other checks such as AC_DEOP to not be reached. Be very careful with use of the AC_GENERAL_MODE type, as it may inadvertently override the behaviour of other modules. When the access_type is AC_GENERAL_MODE, the destination of the mode will be NULL (as it has not yet been determined).Definition at line 391 of file modules.cpp.
+ Upon returning from your function you must return either ACR_DEFAULT, to indicate the module wishes to do nothing, or ACR_DENY where approprate to deny the action, and ACR_ALLOW where appropriate to allow the action. Please note that in the case of some access checks (such as AC_GENERAL_MODE) access may be denied 'upstream' causing other checks such as AC_DEOP to not be reached. Be very careful with use of the AC_GENERAL_MODE type, as it may inadvertently override the behaviour of other modules. When the access_type is AC_GENERAL_MODE, the destination of the mode will be NULL (as it has not yet been determined).Definition at line 392 of file modules.cpp.
 .PP
 References ACR_DEFAULT.
 .PP
 .nf
-391 { return ACR_DEFAULT; };
+392 { return ACR_DEFAULT; };
 .fi
 .SS "int Module::OnAddBan (\fBuserrec\fP * source, \fBchanrec\fP * channel, std::string banmask)\fC [virtual]\fP"
 .PP
-Called whenever a ban is added to a channel's list. Return a non-zero value to 'eat' the mode change and prevent the ban from being added.Definition at line 419 of file modules.cpp.
+Called whenever a ban is added to a channel's list. Return a non-zero value to 'eat' the mode change and prevent the ban from being added.Definition at line 420 of file modules.cpp.
 .PP
 .nf
-419 { return 0; };
+420 { return 0; };
 .fi
 .SS "void Module::OnBackgroundTimer (time_t curtime)\fC [virtual]\fP"
 .PP
-Called once every five seconds for background processing. This timer can be used to control timed features. Its period is not accurate enough to be used as a clock, but it is gauranteed to be called at least once in any five second period, directly from the main loop of the server.Definition at line 397 of file modules.cpp.
+Called once every five seconds for background processing. This timer can be used to control timed features. Its period is not accurate enough to be used as a clock, but it is gauranteed to be called at least once in any five second period, directly from the main loop of the server.Definition at line 398 of file modules.cpp.
 .PP
 .nf
-397 { };
+398 { };
 .fi
 .SS "int Module::OnChangeLocalUserGECOS (\fBuserrec\fP * user, std::string newhost)\fC [virtual]\fP"
 .PP
-Called whenever a change of a local users GECOS (fullname field) is attempted. return 1 to deny the name change, or 0 to allow it.Definition at line 411 of file modules.cpp.
+Called whenever a change of a local users GECOS (fullname field) is attempted. return 1 to deny the name change, or 0 to allow it.Definition at line 412 of file modules.cpp.
 .PP
 .nf
-411 { return 0; };
+412 { return 0; };
 .fi
 .SS "int Module::OnChangeLocalUserHost (\fBuserrec\fP * user, std::string newhost)\fC [virtual]\fP"
 .PP
-Called whenever a change of a local users displayed host is attempted. Return 1 to deny the host change, or 0 to allow it.Definition at line 410 of file modules.cpp.
+Called whenever a change of a local users displayed host is attempted. Return 1 to deny the host change, or 0 to allow it.Definition at line 411 of file modules.cpp.
 .PP
 .nf
-410 { return 0; };
+411 { return 0; };
 .fi
 .SS "\fBstring_list\fP Module::OnChannelSync (\fBchanrec\fP * chan)\fC [virtual]\fP"
 .PP
-Called during a netburst to sync channel data. This is called during the netburst on a per-channel basis. You should use this call to up any special channel-related things which are implemented by your module, e.g. sending listmodes. You may return multiple commands in the string_list.Definition at line 393 of file modules.cpp.
+Called during a netburst to sync channel data. This is called during the netburst on a per-channel basis. You should use this call to up any special channel-related things which are implemented by your module, e.g. sending listmodes. You may return multiple commands in the string_list.Definition at line 394 of file modules.cpp.
 .PP
 References string_list.
 .PP
 .nf
-393 { string_list empty; return empty; }
+394 { string_list empty; return empty; }
 .fi
 .SS "int Module::OnCheckBan (\fBuserrec\fP * user, \fBchanrec\fP * chan)\fC [virtual]\fP"
 .PP
-Called whenever a user joins a channel, to determine if banlist checks should go ahead or not. This method will always be called for each join, wether or not the user actually matches a channel ban, and determines the outcome of an if statement around the whole section of ban checking code. return 1 to explicitly allow the join to go ahead or 0 to ignore the event. Definition at line 408 of file modules.cpp.
+Called whenever a user joins a channel, to determine if banlist checks should go ahead or not. This method will always be called for each join, wether or not the user actually matches a channel ban, and determines the outcome of an if statement around the whole section of ban checking code. return 1 to explicitly allow the join to go ahead or 0 to ignore the event. Definition at line 409 of file modules.cpp.
 .PP
 .nf
-408 { return 0; };
+409 { return 0; };
 .fi
 .SS "int Module::OnCheckInvite (\fBuserrec\fP * user, \fBchanrec\fP * chan)\fC [virtual]\fP"
 .PP
-Called whenever a user joins a channel, to determine if invite checks should go ahead or not. This method will always be called for each join, wether or not the channel is actually +i, and determines the outcome of an if statement around the whole section of invite checking code. return 1 to explicitly allow the join to go ahead or 0 to ignore the event.Definition at line 405 of file modules.cpp.
+Called whenever a user joins a channel, to determine if invite checks should go ahead or not. This method will always be called for each join, wether or not the channel is actually +i, and determines the outcome of an if statement around the whole section of invite checking code. return 1 to explicitly allow the join to go ahead or 0 to ignore the event.Definition at line 406 of file modules.cpp.
 .PP
 .nf
-405 { return 0; };
+406 { return 0; };
 .fi
 .SS "int Module::OnCheckKey (\fBuserrec\fP * user, \fBchanrec\fP * chan, std::string keygiven)\fC [virtual]\fP"
 .PP
-Called whenever a user joins a channel, to determine if key checks should go ahead or not. This method will always be called for each join, wether or not the channel is actually +k, and determines the outcome of an if statement around the whole section of key checking code. if the user specified no key, the keygiven string will be a valid but empty value. return 1 to explicitly allow the join to go ahead or 0 to ignore the event. Definition at line 406 of file modules.cpp.
+Called whenever a user joins a channel, to determine if key checks should go ahead or not. This method will always be called for each join, wether or not the channel is actually +k, and determines the outcome of an if statement around the whole section of key checking code. if the user specified no key, the keygiven string will be a valid but empty value. return 1 to explicitly allow the join to go ahead or 0 to ignore the event. Definition at line 407 of file modules.cpp.
 .PP
 .nf
-406 { return 0; };
+407 { return 0; };
 .fi
 .SS "int Module::OnCheckLimit (\fBuserrec\fP * user, \fBchanrec\fP * chan)\fC [virtual]\fP"
 .PP
-Called whenever a user joins a channel, to determine if channel limit checks should go ahead or not. This method will always be called for each join, wether or not the channel is actually +l, and determines the outcome of an if statement around the whole section of channel limit checking code. return 1 to explicitly allow the join to go ahead or 0 to ignore the event. Definition at line 407 of file modules.cpp.
+Called whenever a user joins a channel, to determine if channel limit checks should go ahead or not. This method will always be called for each join, wether or not the channel is actually +l, and determines the outcome of an if statement around the whole section of channel limit checking code. return 1 to explicitly allow the join to go ahead or 0 to ignore the event. Definition at line 408 of file modules.cpp.
 .PP
 .nf
-407 { return 0; };
+408 { return 0; };
 .fi
 .SS "bool Module::OnCheckReady (\fBuserrec\fP * user)\fC [virtual]\fP"
 .PP
-Called to check if a user who is connecting can now be allowed to register If any modules return false for this function, the user is held in the waiting state until all modules return true. For example a module which implements ident lookups will continue to return false for a user until their ident lookup is completed. Note that the registration timeout for a user overrides these checks, if the registration timeout is reached, the user is disconnected even if modules report that the user is not ready to connect.Definition at line 400 of file modules.cpp.
+Called to check if a user who is connecting can now be allowed to register If any modules return false for this function, the user is held in the waiting state until all modules return true. For example a module which implements ident lookups will continue to return false for a user until their ident lookup is completed. Note that the registration timeout for a user overrides these checks, if the registration timeout is reached, the user is disconnected even if modules report that the user is not ready to connect.Definition at line 401 of file modules.cpp.
 .PP
 .nf
-400 { return true; };
+401 { return true; };
 .fi
 .SS "int Module::OnDelBan (\fBuserrec\fP * source, \fBchanrec\fP * channel, std::string banmask)\fC [virtual]\fP"
 .PP
-Called whenever a ban is removed from a channel's list. Return a non-zero value to 'eat' the mode change and prevent the ban from being removed.Definition at line 420 of file modules.cpp.
+Called whenever a ban is removed from a channel's list. Return a non-zero value to 'eat' the mode change and prevent the ban from being removed.Definition at line 421 of file modules.cpp.
 .PP
 .nf
-420 { return 0; };
+421 { return 0; };
 .fi
 .SS "void Module::OnEvent (\fBEvent\fP * event)\fC [virtual]\fP"
 .PP
-Called whenever an \fBEvent\fP class is sent to all module by another module. Please see the documentation of \fBEvent::Send()\fP for further information. The \fBEvent\fP sent can always be assumed to be non-NULL, you should *always* check the value of \fBEvent::GetEventID()\fP before doing anything to the event data, and you should *not* change the event data in any way!Definition at line 414 of file modules.cpp.
+Called whenever an \fBEvent\fP class is sent to all module by another module. Please see the documentation of \fBEvent::Send()\fP for further information. The \fBEvent\fP sent can always be assumed to be non-NULL, you should *always* check the value of \fBEvent::GetEventID()\fP before doing anything to the event data, and you should *not* change the event data in any way!Definition at line 415 of file modules.cpp.
 .PP
 .nf
-414 { return; };
+415 { return; };
 .fi
 .SS "int Module::OnExtendedMode (\fBuserrec\fP * user, void * target, char modechar, int type, bool mode_on, \fBstring_list\fP & params)\fC [virtual]\fP"
 .PP
-Called whenever an extended mode is to be processed. The type parameter is MT_SERVER, MT_CLIENT or MT_CHANNEL, dependent on where the mode is being changed. mode_on is set when the mode is being set, in which case params contains a list of parameters for the mode as strings. If mode_on is false, the mode is being removed, and parameters may contain the parameters for the mode, dependent on wether they were defined when a mode handler was set up with \fBServer::AddExtendedMode\fP If the mode is a channel mode, target is a chanrec*, and if it is a user mode, target is a userrec*. You must cast this value yourself to make use of it.Definition at line 381 of file modules.cpp.
+Called whenever an extended mode is to be processed. The type parameter is MT_SERVER, MT_CLIENT or MT_CHANNEL, dependent on where the mode is being changed. mode_on is set when the mode is being set, in which case params contains a list of parameters for the mode as strings. If mode_on is false, the mode is being removed, and parameters may contain the parameters for the mode, dependent on wether they were defined when a mode handler was set up with \fBServer::AddExtendedMode\fP If the mode is a channel mode, target is a chanrec*, and if it is a user mode, target is a userrec*. You must cast this value yourself to make use of it.Definition at line 382 of file modules.cpp.
 .PP
 .nf
-381 { return false; }
+382 { return false; }
 .fi
 .SS "void Module::OnGlobalConnect (\fBuserrec\fP * user)\fC [virtual]\fP"
 .PP
-Called whenever a user connects, anywhere on the network. This event is informational only. You should not change any user information in this event. To do so, use the OnUserConnect method to change the state of local users.Definition at line 418 of file modules.cpp.
+Called whenever a user connects, anywhere on the network. This event is informational only. You should not change any user information in this event. To do so, use the OnUserConnect method to change the state of local users.Definition at line 419 of file modules.cpp.
 .PP
 .nf
-418 { };
+419 { };
 .fi
 .SS "void Module::OnGlobalOper (\fBuserrec\fP * user)\fC [virtual]\fP"
 .PP
-Called whenever a user is given usermode +o, anywhere on the network. You cannot override this and prevent it from happening as it is already happened and such a task must be performed by another server. You can however bounce modes by sending servermodes out to reverse mode changes.Definition at line 417 of file modules.cpp.
+Called whenever a user is given usermode +o, anywhere on the network. You cannot override this and prevent it from happening as it is already happened and such a task must be performed by another server. You can however bounce modes by sending servermodes out to reverse mode changes.Definition at line 418 of file modules.cpp.
 .PP
 .nf
-417 { };
+418 { };
 .fi
 .SS "void Module::OnInfo (\fBuserrec\fP * user)\fC [virtual]\fP"
 .PP
 Called whenever a user types /INFO. The userrec will contain the information of the user who typed the command. Modules may use this method to output their own credits in /INFO (which is the ircd's version of an about box). It is purposefully not possible to modify any info that has already been output, or halt the list. You must write a 371 numeric to the user, containing your info in the following format:
 .PP
-<nick> :information hereDefinition at line 384 of file modules.cpp.
+<nick> :information hereDefinition at line 385 of file modules.cpp.
 .PP
 .nf
-384 { };
+385 { };
 .fi
 .SS "int Module::OnKill (\fBuserrec\fP * source, \fBuserrec\fP * dest, std::string reason)\fC [virtual]\fP"
 .PP
-Called when a client is disconnected by KILL. If a client is killed by a server, e.g. a nickname collision or protocol error, source is NULL. Return 1 from this function to prevent the kill, and 0 from this function to allow it as normal. If you prevent the kill no output will be sent to the client, it is down to your module to generate this information. NOTE: It is NOT advisable to stop kills which originate from servers. If you do so youre risking race conditions, desyncs and worse!Definition at line 395 of file modules.cpp.
+Called when a client is disconnected by KILL. If a client is killed by a server, e.g. a nickname collision or protocol error, source is NULL. Return 1 from this function to prevent the kill, and 0 from this function to allow it as normal. If you prevent the kill no output will be sent to the client, it is down to your module to generate this information. NOTE: It is NOT advisable to stop kills which originate from servers. If you do so youre risking race conditions, desyncs and worse!Definition at line 396 of file modules.cpp.
 .PP
 .nf
-395 { return 0; };
+396 { return 0; };
 .fi
 .SS "void Module::OnLoadModule (\fBModule\fP * mod, std::string name)\fC [virtual]\fP"
 .PP
-Called whenever a module is loaded. mod will contain a pointer to the module, and string will contain its name, for example m_widgets.so. This function is primary for dependency checking, your module may decide to enable some extra features if it sees that you have for example loaded 'm_killwidgets.so' with 'm_makewidgets.so'. It is highly recommended that modules do *NOT* bail if they cannot satisfy dependencies, but instead operate under reduced functionality, unless the dependency is absolutely neccessary (e.g. a module that extends the features of another module).Definition at line 396 of file modules.cpp.
+Called whenever a module is loaded. mod will contain a pointer to the module, and string will contain its name, for example m_widgets.so. This function is primary for dependency checking, your module may decide to enable some extra features if it sees that you have for example loaded 'm_killwidgets.so' with 'm_makewidgets.so'. It is highly recommended that modules do *NOT* bail if they cannot satisfy dependencies, but instead operate under reduced functionality, unless the dependency is absolutely neccessary (e.g. a module that extends the features of another module).Definition at line 397 of file modules.cpp.
 .PP
 .nf
-396 { };
+397 { };
 .fi
 .SS "int Module::OnLocalTopicChange (\fBuserrec\fP * user, \fBchanrec\fP * chan, std::string topic)\fC [virtual]\fP"
 .PP
-Called whenever a topic is changed by a local user. Return 1 to deny the topic change, or 0 to allow it.Definition at line 412 of file modules.cpp.
+Called whenever a topic is changed by a local user. Return 1 to deny the topic change, or 0 to allow it.Definition at line 413 of file modules.cpp.
 .PP
 .nf
-412 { return 0; };
+413 { return 0; };
 .fi
 .SS "int Module::OnMeshToken (char token, \fBstring_list\fP params, \fBserverrec\fP * source, \fBserverrec\fP * reply, std::string tcp_host, std::string ipaddr, int port)\fC [virtual]\fP"
 .PP
-Called whenever an unknown token is received in a server to server link. The token value is the unknown token -- please check that no other modules are using the token that you use. Returning 1 supresses the 'unknown token type' error which is usually sent to all opers with +s. The params list is a list of parameters, and if any parameters start with a colon (:) it is treated as the whole of the last parameter, identical to how RFC messages are handled. source is the sender of the message, and reply is what should be replied to for a unicast message. Note that there are not many messages in the mesh protocol which require unicast messaging. tcp_host is the server name as a string, ipaddr is its ip address in dotted decimal notation and port is the port number it is using.Definition at line 413 of file modules.cpp.
+Called whenever an unknown token is received in a server to server link. The token value is the unknown token -- please check that no other modules are using the token that you use. Returning 1 supresses the 'unknown token type' error which is usually sent to all opers with +s. The params list is a list of parameters, and if any parameters start with a colon (:) it is treated as the whole of the last parameter, identical to how RFC messages are handled. source is the sender of the message, and reply is what should be replied to for a unicast message. Note that there are not many messages in the mesh protocol which require unicast messaging. tcp_host is the server name as a string, ipaddr is its ip address in dotted decimal notation and port is the port number it is using.Definition at line 414 of file modules.cpp.
 .PP
 .nf
-413 { return 0; };
+414 { return 0; };
 .fi
 .SS "void Module::OnOper (\fBuserrec\fP * user)\fC [virtual]\fP"
 .PP
-Called whenever a user opers locally. The userrec will contain the oper mode 'o' as this function is called after any modifications are made to the user's structure by the core.Definition at line 383 of file modules.cpp.
+Called whenever a user opers locally. The userrec will contain the oper mode 'o' as this function is called after any modifications are made to the user's structure by the core.Definition at line 384 of file modules.cpp.
 .PP
 .nf
-383 { };
+384 { };
 .fi
 .SS "int Module::OnOperCompare (std::string password, std::string input)\fC [virtual]\fP"
 .PP
-Called whenever an oper password is to be compared to what a user has input. The password field (from the config file) is in 'password' and is to be compared against 'input'. This method allows for encryption of oper passwords and much more besides. You should return a nonzero value if you want to allow the comparison or zero if you wish to do nothing.Definition at line 416 of file modules.cpp.
+Called whenever an oper password is to be compared to what a user has input. The password field (from the config file) is in 'password' and is to be compared against 'input'. This method allows for encryption of oper passwords and much more besides. You should return a nonzero value if you want to allow the comparison or zero if you wish to do nothing.Definition at line 417 of file modules.cpp.
 .PP
 .nf
-416 { return 0; };
+417 { return 0; };
 .fi
 .SS "void Module::OnPacketReceive (std::string & data, std::string serv)\fC [virtual]\fP"
 .PP
-Called after a packet is received from another irc server. This allows you to easily represent it in the correct ways to implement encryption, compression, digital signatures and anything else you may want to add. This should be regarded as a pre-processor and will be called immediately after the packet is received but before any other operations with the core of the ircd.Definition at line 377 of file modules.cpp.
+Called after a packet is received from another irc server. This allows you to easily represent it in the correct ways to implement encryption, compression, digital signatures and anything else you may want to add. This should be regarded as a pre-processor and will be called immediately after the packet is received but before any other operations with the core of the ircd.Definition at line 378 of file modules.cpp.
 .PP
 .nf
-377 { }
+378 { }
 .fi
 .SS "void Module::OnPacketTransmit (std::string & data, std::string serv)\fC [virtual]\fP"
 .PP
-Called before a packet is transmitted across the irc network between two irc servers. This allows you to easily represent it in the correct ways to implement encryption, compression, digital signatures and anything else you may want to add. This should be regarded as a pre-processor and will be called before ANY other operations within the ircd core program.Definition at line 376 of file modules.cpp.
+Called before a packet is transmitted across the irc network between two irc servers. This allows you to easily represent it in the correct ways to implement encryption, compression, digital signatures and anything else you may want to add. This should be regarded as a pre-processor and will be called before ANY other operations within the ircd core program.Definition at line 377 of file modules.cpp.
 .PP
 .nf
-376 { }
+377 { }
 .fi
 .SS "int Module::OnPreCommand (std::string command, char ** parameters, int pcnt, \fBuserrec\fP * user)\fC [virtual]\fP"
 .PP
-Called whenever any command is about to be executed. This event occurs for all registered commands, wether they are registered in the core, or another module, but it will not occur for invalid commands (e.g. ones which do not exist within the command table). By returning 1 from this method you may prevent the command being executed. If you do this, no output is created by the core, and it is down to your module to produce any output neccessary. Note that unless you return 1, you should not destroy any structures (e.g. by using \fBServer::QuitUser\fP) otherwise when the command's handler function executes after your method returns, it will be passed an invalid pointer to the user object and crash!)Definition at line 399 of file modules.cpp.
+Called whenever any command is about to be executed. This event occurs for all registered commands, wether they are registered in the core, or another module, but it will not occur for invalid commands (e.g. ones which do not exist within the command table). By returning 1 from this method you may prevent the command being executed. If you do this, no output is created by the core, and it is down to your module to produce any output neccessary. Note that unless you return 1, you should not destroy any structures (e.g. by using \fBServer::QuitUser\fP) otherwise when the command's handler function executes after your method returns, it will be passed an invalid pointer to the user object and crash!)Definition at line 400 of file modules.cpp.
 .PP
 .nf
-399 { return 0; };
+400 { return 0; };
 .fi
 .SS "int Module::OnRawMode (\fBuserrec\fP * user, \fBchanrec\fP * chan, char mode, std::string param, bool adding, int pcnt)\fC [virtual]\fP"
 .PP
-Called whenever a mode character is processed. Return 1 from this function to block the mode character from being processed entirely, so that you may perform your own code instead. Note that this method allows you to override modes defined by other modes, but this is NOT RECOMMENDED!Definition at line 404 of file modules.cpp.
+Called whenever a mode character is processed. Return 1 from this function to block the mode character from being processed entirely, so that you may perform your own code instead. Note that this method allows you to override modes defined by other modes, but this is NOT RECOMMENDED!Definition at line 405 of file modules.cpp.
 .PP
 .nf
-404 { return 0; };
+405 { return 0; };
 .fi
 .SS "void Module::OnRawSocketAccept (int fd, std::string ip, int localport)\fC [virtual]\fP"
 .PP
-Called immediately after any connection is accepted. This is intended for raw socket processing (e.g. modules which wrap the tcp connection within another library) and provides no information relating to a user record as the connection has not been assigned yet. There are no return values from this call as all modules get an opportunity if required to process the connection.Definition at line 421 of file modules.cpp.
+Called immediately after any connection is accepted. This is intended for raw socket processing (e.g. modules which wrap the tcp connection within another library) and provides no information relating to a user record as the connection has not been assigned yet. There are no return values from this call as all modules get an opportunity if required to process the connection.Definition at line 422 of file modules.cpp.
 .PP
 .nf
-421 { };
+422 { };
 .fi
 .SS "void Module::OnRawSocketClose (int fd)\fC [virtual]\fP"
 .PP
-Called immediately before any socket is closed. When this event is called, shutdown() has not yet been called on the socket.Definition at line 423 of file modules.cpp.
+Called immediately before any socket is closed. When this event is called, shutdown() has not yet been called on the socket.Definition at line 424 of file modules.cpp.
 .PP
 .nf
-423 { };
+424 { };
 .fi
 .SS "int Module::OnRawSocketRead (int fd, char * buffer, unsigned int count, int & readresult)\fC [virtual]\fP"
 .PP
-Called immediately before any read() operation on a client socket in the core. This occurs AFTER the select() or poll() so there is always data waiting to be read when this event occurs. Your event should return 1 if it has handled the reading itself, which prevents the core just using read(). You should place any data read into buffer, up to but NOT GREATER THAN the value of count. The value of readresult must be identical to an actual result that might be returned from the read() system call, for example, number of bytes read upon success, 0 upon EOF or closed socket, and -1 for error. If your function returns a nonzero value, you MUST set readresult.Definition at line 424 of file modules.cpp.
+Called immediately before any read() operation on a client socket in the core. This occurs AFTER the select() or poll() so there is always data waiting to be read when this event occurs. Your event should return 1 if it has handled the reading itself, which prevents the core just using read(). You should place any data read into buffer, up to but NOT GREATER THAN the value of count. The value of readresult must be identical to an actual result that might be returned from the read() system call, for example, number of bytes read upon success, 0 upon EOF or closed socket, and -1 for error. If your function returns a nonzero value, you MUST set readresult.Definition at line 425 of file modules.cpp.
 .PP
 .nf
-424 { return 0; };
+425 { return 0; };
 .fi
 .SS "int Module::OnRawSocketWrite (int fd, char * buffer, int count)\fC [virtual]\fP"
 .PP
-Called immediately before any write() operation on a user's socket in the core. Because this event is a low level event no user information is associated with it. It is intended for use by modules which may wrap connections within another API such as SSL for example. return a non-zero result if you have handled the write operation, in which case the core will not call write().Definition at line 422 of file modules.cpp.
+Called immediately before any write() operation on a user's socket in the core. Because this event is a low level event no user information is associated with it. It is intended for use by modules which may wrap connections within another API such as SSL for example. return a non-zero result if you have handled the write operation, in which case the core will not call write().Definition at line 423 of file modules.cpp.
 .PP
 .nf
-422 { return 0; };
+423 { return 0; };
 .fi
 .SS "void Module::OnRehash ()\fC [virtual]\fP"
 .PP
-Called on rehash. This method is called prior to a /REHASH or when a SIGHUP is received from the operating system. You should use it to reload any files so that your module keeps in step with the rest of the application.Definition at line 378 of file modules.cpp.
+Called on rehash. This method is called prior to a /REHASH or when a SIGHUP is received from the operating system. You should use it to reload any files so that your module keeps in step with the rest of the application.Definition at line 379 of file modules.cpp.
 .PP
 .nf
-378 { }
+379 { }
 .fi
 .SS "char * Module::OnRequest (\fBRequest\fP * request)\fC [virtual]\fP"
 .PP
-Called whenever a \fBRequest\fP class is sent to your module by another module. Please see the documentation of \fBRequest::Send()\fP for further information. The \fBRequest\fP sent can always be assumed to be non-NULL, you should not change the request object or its data. Your method may return arbitary data in the char* result which the requesting module may be able to use for pre-determined purposes (e.g. the results of an SQL query, etc).Definition at line 415 of file modules.cpp.
+Called whenever a \fBRequest\fP class is sent to your module by another module. Please see the documentation of \fBRequest::Send()\fP for further information. The \fBRequest\fP sent can always be assumed to be non-NULL, you should not change the request object or its data. Your method may return arbitary data in the char* result which the requesting module may be able to use for pre-determined purposes (e.g. the results of an SQL query, etc).Definition at line 416 of file modules.cpp.
 .PP
 Referenced by Request::Send().
 .PP
 .nf
-415 { return NULL; };
+416 { return NULL; };
 .fi
 .SS "void Module::OnSendList (\fBuserrec\fP * user, \fBchanrec\fP * channel, char mode)\fC [virtual]\fP"
 .PP
-Called whenever a list is needed for a listmode. For example, when a /MODE #channel +b (without any other parameters) is called, if a module was handling +b this function would be called. The function can then output any lists it wishes to. Please note that all modules will see all mode characters to provide the ability to extend each other, so please only output a list if the mode character given matches the one(s) you want to handle.Definition at line 398 of file modules.cpp.
+Called whenever a list is needed for a listmode. For example, when a /MODE #channel +b (without any other parameters) is called, if a module was handling +b this function would be called. The function can then output any lists it wishes to. Please note that all modules will see all mode characters to provide the ability to extend each other, so please only output a list if the mode character given matches the one(s) you want to handle.Definition at line 399 of file modules.cpp.
 .PP
 .nf
-398 { };
+399 { };
 .fi
 .SS "void Module::OnServerRaw (std::string & raw, bool inbound, \fBuserrec\fP * user)\fC [virtual]\fP"
 .PP
-Called when a raw command is transmitted or received. This method is the lowest level of handler available to a module. It will be called with raw data which is passing through a connected socket. If you wish, you may munge this data by changing the string parameter 'raw'. If you do this, after your function exits it will immediately be cut down to 510 characters plus a carriage return and linefeed. For INBOUND messages only (where inbound is set to true) the value of user will be the userrec of the connection sending the data. This is not possible for outbound data because the data may be being routed to multiple targets.Definition at line 379 of file modules.cpp.
+Called when a raw command is transmitted or received. This method is the lowest level of handler available to a module. It will be called with raw data which is passing through a connected socket. If you wish, you may munge this data by changing the string parameter 'raw'. If you do this, after your function exits it will immediately be cut down to 510 characters plus a carriage return and linefeed. For INBOUND messages only (where inbound is set to true) the value of user will be the userrec of the connection sending the data. This is not possible for outbound data because the data may be being routed to multiple targets.Definition at line 380 of file modules.cpp.
 .PP
 .nf
-379 { }
+380 { }
 .fi
 .SS "void Module::OnStats (char symbol)\fC [virtual]\fP"
 .PP
-Called on all /STATS commands This method is triggered for all /STATS use, including stats symbols handled by the core. Definition at line 409 of file modules.cpp.
+Called on all /STATS commands This method is triggered for all /STATS use, including stats symbols handled by the core. Definition at line 410 of file modules.cpp.
 .PP
 .nf
-409 { };
+410 { };
 .fi
 .SS "void Module::OnUserConnect (\fBuserrec\fP * user)\fC [virtual]\fP"
 .PP
-Called when a user connects. The details of the connecting user are available to you in the parameter userrec *userDefinition at line 371 of file modules.cpp.
+Called when a user connects. The details of the connecting user are available to you in the parameter userrec *userDefinition at line 372 of file modules.cpp.
 .PP
 .nf
-371 { }
+372 { }
 .fi
 .SS "void Module::OnUserDisconnect (\fBuserrec\fP * user)\fC [virtual]\fP"
 .PP
-Called whenever a user's socket is closed. The details of the exiting user are available to you in the parameter userrec *user This event is called for all users, registered or not, as a cleanup method for modules which might assign resources to user, such as dns lookups, objects and sockets.Definition at line 373 of file modules.cpp.
+Called whenever a user's socket is closed. The details of the exiting user are available to you in the parameter userrec *user This event is called for all users, registered or not, as a cleanup method for modules which might assign resources to user, such as dns lookups, objects and sockets.Definition at line 374 of file modules.cpp.
 .PP
 .nf
-373 { }
+374 { }
 .fi
 .SS "void Module::OnUserJoin (\fBuserrec\fP * user, \fBchanrec\fP * channel)\fC [virtual]\fP"
 .PP
-Called when a user joins a channel. The details of the joining user are available to you in the parameter userrec *user, and the details of the channel they have joined is available in the variable chanrec *channelDefinition at line 374 of file modules.cpp.
+Called when a user joins a channel. The details of the joining user are available to you in the parameter userrec *user, and the details of the channel they have joined is available in the variable chanrec *channelDefinition at line 375 of file modules.cpp.
 .PP
 .nf
-374 { }
+375 { }
 .fi
 .SS "void Module::OnUserKick (\fBuserrec\fP * source, \fBuserrec\fP * user, \fBchanrec\fP * chan, std::string reason)\fC [virtual]\fP"
 .PP
-Called whenever a user is kicked. If this method is called, the kick is already underway and cannot be prevented, so to prevent a kick, please use \fBModule::OnUserPreKick\fP instead of this method.Definition at line 403 of file modules.cpp.
+Called whenever a user is kicked. If this method is called, the kick is already underway and cannot be prevented, so to prevent a kick, please use \fBModule::OnUserPreKick\fP instead of this method.Definition at line 404 of file modules.cpp.
 .PP
 .nf
-403 { };
+404 { };
 .fi
 .SS "void Module::OnUserPart (\fBuserrec\fP * user, \fBchanrec\fP * channel)\fC [virtual]\fP"
 .PP
-Called when a user parts a channel. The details of the leaving user are available to you in the parameter userrec *user, and the details of the channel they have left is available in the variable chanrec *channelDefinition at line 375 of file modules.cpp.
+Called when a user parts a channel. The details of the leaving user are available to you in the parameter userrec *user, and the details of the channel they have left is available in the variable chanrec *channelDefinition at line 376 of file modules.cpp.
 .PP
 .nf
-375 { }
+376 { }
 .fi
 .SS "void Module::OnUserPostNick (\fBuserrec\fP * user, std::string oldnick)\fC [virtual]\fP"
 .PP
-Called after any nickchange, local or remote. This can be used to track users after nickchanges have been applied. Please note that although you can see remote nickchanges through this function, you should NOT make any changes to the userrec if the user is a remote user as this may cause a desnyc. check user->server before taking any action (including returning nonzero from the method). Because this method is called after the nickchange is taken place, no return values are possible to indicate forbidding of the nick change. Use OnUserPreNick for this. Definition at line 390 of file modules.cpp.
+Called after any nickchange, local or remote. This can be used to track users after nickchanges have been applied. Please note that although you can see remote nickchanges through this function, you should NOT make any changes to the userrec if the user is a remote user as this may cause a desnyc. check user->server before taking any action (including returning nonzero from the method). Because this method is called after the nickchange is taken place, no return values are possible to indicate forbidding of the nick change. Use OnUserPreNick for this. Definition at line 391 of file modules.cpp.
 .PP
 .nf
-390 { };
+391 { };
 .fi
 .SS "int Module::OnUserPreInvite (\fBuserrec\fP * source, \fBuserrec\fP * dest, \fBchanrec\fP * channel)\fC [virtual]\fP"
 .PP
-Called whenever a user is about to invite another user into a channel, before any processing is done. Returning 1 from this function stops the process immediately, causing no output to be sent to the user by the core. If you do this you must produce your own numerics, notices etc. This is useful for modules which may want to filter invites to channels.Definition at line 386 of file modules.cpp.
+Called whenever a user is about to invite another user into a channel, before any processing is done. Returning 1 from this function stops the process immediately, causing no output to be sent to the user by the core. If you do this you must produce your own numerics, notices etc. This is useful for modules which may want to filter invites to channels.Definition at line 387 of file modules.cpp.
 .PP
 .nf
-386 { return 0; };
+387 { return 0; };
 .fi
 .SS "int Module::OnUserPreJoin (\fBuserrec\fP * user, \fBchanrec\fP * chan, const char * cname)\fC [virtual]\fP"
 .PP
@@ -620,68 +620,68 @@ Called whenever a user is about to join a channel, before any processing is done
 .PP
 IMPORTANT NOTE!
 .PP
-If the user joins a NEW channel which does not exist yet, OnUserPreJoin will be called BEFORE the channel record is created. This will cause chanrec* chan to be NULL. There is very little you can do in form of processing on the actual channel record at this point, however the channel NAME will still be passed in char* cname, so that you could for example implement a channel blacklist or whitelist, etc.Definition at line 380 of file modules.cpp.
+If the user joins a NEW channel which does not exist yet, OnUserPreJoin will be called BEFORE the channel record is created. This will cause chanrec* chan to be NULL. There is very little you can do in form of processing on the actual channel record at this point, however the channel NAME will still be passed in char* cname, so that you could for example implement a channel blacklist or whitelist, etc.Definition at line 381 of file modules.cpp.
 .PP
 .nf
-380 { return 0; }
+381 { return 0; }
 .fi
 .SS "int Module::OnUserPreKick (\fBuserrec\fP * source, \fBuserrec\fP * user, \fBchanrec\fP * chan, std::string reason)\fC [virtual]\fP"
 .PP
-Called whenever a user is about to be kicked. Returning a value of 1 from this function stops the process immediately, causing no output to be sent to the user by the core. If you do this you must produce your own numerics, notices etc. Definition at line 402 of file modules.cpp.
+Called whenever a user is about to be kicked. Returning a value of 1 from this function stops the process immediately, causing no output to be sent to the user by the core. If you do this you must produce your own numerics, notices etc. Definition at line 403 of file modules.cpp.
 .PP
 .nf
-402 { return 0; };
+403 { return 0; };
 .fi
 .SS "int Module::OnUserPreMessage (\fBuserrec\fP * user, void * dest, int target_type, std::string & text)\fC [virtual]\fP"
 .PP
-Called whenever a user is about to PRIVMSG A user or a channel, before any processing is done. Returning any nonzero value from this function stops the process immediately, causing no output to be sent to the user by the core. If you do this you must produce your own numerics, notices etc. This is useful for modules which may want to filter or redirect messages. target_type can be one of TYPE_USER or TYPE_CHANNEL. If the target_type value is a user, you must cast dest to a userrec* otherwise you must cast it to a chanrec*, this is the details of where the message is destined to be sent.Definition at line 387 of file modules.cpp.
+Called whenever a user is about to PRIVMSG A user or a channel, before any processing is done. Returning any nonzero value from this function stops the process immediately, causing no output to be sent to the user by the core. If you do this you must produce your own numerics, notices etc. This is useful for modules which may want to filter or redirect messages. target_type can be one of TYPE_USER or TYPE_CHANNEL. If the target_type value is a user, you must cast dest to a userrec* otherwise you must cast it to a chanrec*, this is the details of where the message is destined to be sent.Definition at line 388 of file modules.cpp.
 .PP
 .nf
-387 { return 0; };
+388 { return 0; };
 .fi
 .SS "int Module::OnUserPreNick (\fBuserrec\fP * user, std::string newnick)\fC [virtual]\fP"
 .PP
-Called before any nickchange, local or remote. This can be used to implement Q-lines etc. Please note that although you can see remote nickchanges through this function, you should NOT make any changes to the userrec if the user is a remote user as this may cause a desnyc. check user->server before taking any action (including returning nonzero from the method). If your method returns nonzero, the nickchange is silently forbidden, and it is down to your module to generate some meaninful output.Definition at line 389 of file modules.cpp.
+Called before any nickchange, local or remote. This can be used to implement Q-lines etc. Please note that although you can see remote nickchanges through this function, you should NOT make any changes to the userrec if the user is a remote user as this may cause a desnyc. check user->server before taking any action (including returning nonzero from the method). If your method returns nonzero, the nickchange is silently forbidden, and it is down to your module to generate some meaninful output.Definition at line 390 of file modules.cpp.
 .PP
 .nf
-389 { return 0; };
+390 { return 0; };
 .fi
 .SS "int Module::OnUserPreNotice (\fBuserrec\fP * user, void * dest, int target_type, std::string & text)\fC [virtual]\fP"
 .PP
-Called whenever a user is about to NOTICE A user or a channel, before any processing is done. Returning any nonzero value from this function stops the process immediately, causing no output to be sent to the user by the core. If you do this you must produce your own numerics, notices etc. This is useful for modules which may want to filter or redirect messages. target_type can be one of TYPE_USER or TYPE_CHANNEL. If the target_type value is a user, you must cast dest to a userrec* otherwise you must cast it to a chanrec*, this is the details of where the message is destined to be sent. You may alter the message text as you wish before relinquishing control to the next module in the chain, and if no other modules block the text this altered form of the text will be sent out to the user and possibly to other servers.Definition at line 388 of file modules.cpp.
+Called whenever a user is about to NOTICE A user or a channel, before any processing is done. Returning any nonzero value from this function stops the process immediately, causing no output to be sent to the user by the core. If you do this you must produce your own numerics, notices etc. This is useful for modules which may want to filter or redirect messages. target_type can be one of TYPE_USER or TYPE_CHANNEL. If the target_type value is a user, you must cast dest to a userrec* otherwise you must cast it to a chanrec*, this is the details of where the message is destined to be sent. You may alter the message text as you wish before relinquishing control to the next module in the chain, and if no other modules block the text this altered form of the text will be sent out to the user and possibly to other servers.Definition at line 389 of file modules.cpp.
 .PP
 .nf
-388 { return 0; };
+389 { return 0; };
 .fi
 .SS "void Module::OnUserQuit (\fBuserrec\fP * user)\fC [virtual]\fP"
 .PP
-Called when a user quits. The details of the exiting user are available to you in the parameter userrec *user This event is only called when the user is fully registered when they quit. To catch raw disconnections, use the OnUserDisconnect method.Definition at line 372 of file modules.cpp.
+Called when a user quits. The details of the exiting user are available to you in the parameter userrec *user This event is only called when the user is fully registered when they quit. To catch raw disconnections, use the OnUserDisconnect method.Definition at line 373 of file modules.cpp.
 .PP
 .nf
-372 { }
+373 { }
 .fi
 .SS "void Module::OnUserRegister (\fBuserrec\fP * user)\fC [virtual]\fP"
 .PP
-Called whenever a user is about to register their connection (e.g. before the user is sent the MOTD etc). Modules can use this method if they are performing a function which must be done before the actual connection is completed (e.g. ident lookups, dnsbl lookups, etc). Note that you should NOT delete the user record here by causing a disconnection! Use OnUserConnect for that instead.Definition at line 401 of file modules.cpp.
+Called whenever a user is about to register their connection (e.g. before the user is sent the MOTD etc). Modules can use this method if they are performing a function which must be done before the actual connection is completed (e.g. ident lookups, dnsbl lookups, etc). Note that you should NOT delete the user record here by causing a disconnection! Use OnUserConnect for that instead.Definition at line 402 of file modules.cpp.
 .PP
 .nf
-401 { };
+402 { };
 .fi
 .SS "\fBstring_list\fP Module::OnUserSync (\fBuserrec\fP * user)\fC [virtual]\fP"
 .PP
-Called during a netburst to sync user data. This is called during the netburst on a per-user basis. You should use this call to up any special user-related things which are implemented by your module, e.g. sending listmodes. You may return multiple commands in the string_list.Definition at line 392 of file modules.cpp.
+Called during a netburst to sync user data. This is called during the netburst on a per-user basis. You should use this call to up any special user-related things which are implemented by your module, e.g. sending listmodes. You may return multiple commands in the string_list.Definition at line 393 of file modules.cpp.
 .PP
 References string_list.
 .PP
 .nf
-392 { string_list empty; return empty; }
+393 { string_list empty; return empty; }
 .fi
 .SS "void Module::OnWhois (\fBuserrec\fP * source, \fBuserrec\fP * dest)\fC [virtual]\fP"
 .PP
-Called whenever a /WHOIS is performed on a local user. The source parameter contains the details of the user who issued the WHOIS command, and the dest parameter contains the information of the user they are whoising.Definition at line 385 of file modules.cpp.
+Called whenever a /WHOIS is performed on a local user. The source parameter contains the details of the user who issued the WHOIS command, and the dest parameter contains the information of the user they are whoising.Definition at line 386 of file modules.cpp.
 .PP
 .nf
-385 { };
+386 { };
 .fi
 
 
diff --git a/docs/man/man3/QLine.3 b/docs/man/man3/QLine.3
index 6a299acae..a6963809c 100644
--- a/docs/man/man3/QLine.3
+++ b/docs/man/man3/QLine.3
@@ -16,7 +16,7 @@ Inherits \fBXLine\fP.
 
 .in +1c
 .ti -1c
-.RI "char \fBnick\fP [MAXBUF]"
+.RI "char \fBnick\fP [64]"
 .br
 .RI "\fINickname to match against. \fP"
 .ti -1c
@@ -32,7 +32,7 @@ QLine class. Definition at line 108 of file xline.h.
 .SS "bool \fBQLine::is_global\fP"
 .PP
 Set if this is a global Z:line (e.g. it came from another server)Definition at line 118 of file xline.h.
-.SS "char \fBQLine::nick\fP[MAXBUF]"
+.SS "char \fBQLine::nick\fP[64]"
 .PP
 Nickname to match against. May contain wildcards.Definition at line 114 of file xline.h.
 
diff --git a/docs/man/man3/Request.3 b/docs/man/man3/Request.3
index dbee6d6fc..a3a0db8b1 100644
--- a/docs/man/man3/Request.3
+++ b/docs/man/man3/Request.3
@@ -63,65 +63,65 @@ Definition at line 154 of file modules.h.
 .PP 
 .SS "Request::Request (char * anydata, \fBModule\fP * src, \fBModule\fP * dst)"
 .PP
-Create a new Request. Definition at line 315 of file modules.cpp.
+Create a new Request. Definition at line 316 of file modules.cpp.
 .PP
 .nf
-315 : data(anydata), source(src), dest(dst) { };
+316 : data(anydata), source(src), dest(dst) { };
 .fi
 .SH "Member Function Documentation"
 .PP 
 .SS "char * Request::GetData ()"
 .PP
-Fetch the Request data. Definition at line 317 of file modules.cpp.
+Fetch the Request data. Definition at line 318 of file modules.cpp.
 .PP
 References data.
 .PP
 .nf
-318 {
-319         return this->data;
-320 }
+319 {
+320         return this->data;
+321 }
 .fi
 .SS "\fBModule\fP * Request::GetDest ()"
 .PP
-Fetch the request destination (should be 'this' in the receiving module). Definition at line 327 of file modules.cpp.
+Fetch the request destination (should be 'this' in the receiving module). Definition at line 328 of file modules.cpp.
 .PP
 References dest.
 .PP
 .nf
-328 {
-329         return this->dest;
-330 }
+329 {
+330         return this->dest;
+331 }
 .fi
 .SS "\fBModule\fP * Request::GetSource ()"
 .PP
-Fetch the request source. Definition at line 322 of file modules.cpp.
+Fetch the request source. Definition at line 323 of file modules.cpp.
 .PP
 References source.
 .PP
 .nf
-323 {
-324         return this->source;
-325 }
+324 {
+325         return this->source;
+326 }
 .fi
 .SS "char * Request::Send ()\fC [virtual]\fP"
 .PP
 Send the Request. Upon returning the result will be arbitary data returned by the module you sent the request to. It is up to your module to know what this data is and how to deal with it. Implements \fBModuleMessage\fP.
 .PP
-Definition at line 332 of file modules.cpp.
+Definition at line 333 of file modules.cpp.
 .PP
 References dest, and Module::OnRequest().
 .PP
 .nf
-333 {
-334         if (this->dest)
-335         {
-336                 return dest->OnRequest(this);
-337         }
-338         else
-339         {
-340                 return NULL;
-341         }
-342 }
+334 {
+335         if (this->dest)
+336         {
+337                 return dest->OnRequest(this);
+338         }
+339         else
+340         {
+341                 return NULL;
+342         }
+343 }
 .fi
 .SH "Member Data Documentation"
 .PP 
diff --git a/docs/man/man3/Server.3 b/docs/man/man3/Server.3
index 67345f2cc..05f999fde 100644
--- a/docs/man/man3/Server.3
+++ b/docs/man/man3/Server.3
@@ -267,19 +267,19 @@ Definition at line 694 of file modules.h.
 .PP 
 .SS "Server::Server ()"
 .PP
-Default constructor. Creates a Server object.Definition at line 430 of file modules.cpp.
+Default constructor. Creates a Server object.Definition at line 431 of file modules.cpp.
 .PP
 .nf
-431 {
-432 }
+432 {
+433 }
 .fi
 .SS "Server::~\fBServer\fP ()\fC [virtual]\fP"
 .PP
-Default destructor. Destroys a Server object.Definition at line 434 of file modules.cpp.
+Default destructor. Destroys a Server object.Definition at line 435 of file modules.cpp.
 .PP
 .nf
-435 {
-436 }
+436 {
+437 }
 .fi
 .SH "Member Function Documentation"
 .PP 
@@ -289,25 +289,25 @@ Adds a command to the command table. This allows modules to add extra commands i
 .PP
 typedef void (handlerfunc) (char**, int, userrec*); ... void \fBhandle_kill(char **parameters, int pcnt, userrec *user)\fP
 .PP
-When the command is typed, the parameters will be placed into the parameters array (similar to argv) and the parameter count will be placed into pcnt (similar to argv). There will never be any less parameters than the 'minparams' value you specified when creating the command. The *user parameter is the class of the user which caused the command to trigger, who will always have the flag you specified in 'flags' when creating the initial command. For example to create an oper only command create the commands with flags='o'. The source parameter is used for resource tracking, and should contain the name of your module (with file extension) e.g. 'm_blarp.so'. If you place the wrong identifier here, you can cause crashes if your module is unloaded.Definition at line 503 of file modules.cpp.
+When the command is typed, the parameters will be placed into the parameters array (similar to argv) and the parameter count will be placed into pcnt (similar to argv). There will never be any less parameters than the 'minparams' value you specified when creating the command. The *user parameter is the class of the user which caused the command to trigger, who will always have the flag you specified in 'flags' when creating the initial command. For example to create an oper only command create the commands with flags='o'. The source parameter is used for resource tracking, and should contain the name of your module (with file extension) e.g. 'm_blarp.so'. If you place the wrong identifier here, you can cause crashes if your module is unloaded.Definition at line 504 of file modules.cpp.
 .PP
 References createcommand().
 .PP
 .nf
-504 {
-505         createcommand(cmd,f,flags,minparams,source);
-506 }
+505 {
+506         createcommand(cmd,f,flags,minparams,source);
+507 }
 .fi
 .SS "void Server::AddELine (long duration, std::string source, std::string reason, std::string hostmask)\fC [virtual]\fP"
 .PP
-Adds a E-line The E-line is enforced as soon as it is added. The duration must be in seconds, however you can use the \fBServer::CalcDuration\fP method to convert durations into the 1w2d3h3m6s format used by /GLINE etc. The source is an arbitary string used to indicate who or what sent the data, usually this is the nickname of a person, or a server name. Definition at line 749 of file modules.cpp.
+Adds a E-line The E-line is enforced as soon as it is added. The duration must be in seconds, however you can use the \fBServer::CalcDuration\fP method to convert durations into the 1w2d3h3m6s format used by /GLINE etc. The source is an arbitary string used to indicate who or what sent the data, usually this is the nickname of a person, or a server name. Definition at line 750 of file modules.cpp.
 .PP
 References add_eline(), and duration().
 .PP
 .nf
-750 {
-751         add_eline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
-752 }
+751 {
+752         add_eline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
+753 }
 .fi
 .SS "bool Server::AddExtendedListMode (char modechar)\fC [virtual]\fP"
 .PP
@@ -321,540 +321,540 @@ Adds an extended mode letter which is parsed by a module and handled in a list f
 .PP
 (4) The mode and its parameter are NOT stored in the channels modes structure
 .PP
-It is down to the module handling the mode to maintain state and determine what 'items' (e.g. users, or a banlist) have the mode set on them, and process the modes at the correct times, e.g. during access checks on channels, etc. When the extended mode is triggered the OnExtendedMode method will be triggered as above. Note that the target you are given will be a channel, if for example your mode is set 'on a user' (in for example +a) you must use Server::Find to locate the user the mode is operating on. Your mode handler may return 1 to handle the mode AND tell the core to display the mode change, e.g. '+aaa one two three' in the case of the mode for 'two', or it may return -1 to 'eat' the mode change, so the above example would become '+aa one three' after processing.Definition at line 666 of file modules.cpp.
+It is down to the module handling the mode to maintain state and determine what 'items' (e.g. users, or a banlist) have the mode set on them, and process the modes at the correct times, e.g. during access checks on channels, etc. When the extended mode is triggered the OnExtendedMode method will be triggered as above. Note that the target you are given will be a channel, if for example your mode is set 'on a user' (in for example +a) you must use Server::Find to locate the user the mode is operating on. Your mode handler may return 1 to handle the mode AND tell the core to display the mode change, e.g. '+aaa one two three' in the case of the mode for 'two', or it may return -1 to 'eat' the mode change, so the above example would become '+aa one three' after processing.Definition at line 667 of file modules.cpp.
 .PP
 References DoAddExtendedMode(), ModeMakeList(), and MT_CHANNEL.
 .PP
 .nf
-667 {
-668         bool res = DoAddExtendedMode(modechar,MT_CHANNEL,false,1,1);
-669         if (res)
-670                 ModeMakeList(modechar);
-671         return res;
-672 }
+668 {
+669         bool res = DoAddExtendedMode(modechar,MT_CHANNEL,false,1,1);
+670         if (res)
+671                 ModeMakeList(modechar);
+672         return res;
+673 }
 .fi
 .SS "bool Server::AddExtendedMode (char modechar, int type, bool requires_oper, int params_when_on, int params_when_off)\fC [virtual]\fP"
 .PP
-Adds an extended mode letter which is parsed by a module. This allows modules to add extra mode letters, e.g. +x for hostcloak. the 'type' parameter is either MT_CHANNEL, MT_CLIENT, or MT_SERVER, to indicate wether the mode is a channel mode, a client mode, or a server mode. requires_oper is used with MT_CLIENT type modes only to indicate the mode can only be set or unset by an oper. If this is used for MT_CHANNEL type modes it is ignored. params_when_on is the number of modes to expect when the mode is turned on (for type MT_CHANNEL only), e.g. with mode +k, this would have a value of 1. the params_when_off value has a similar value to params_when_on, except it indicates the number of parameters to expect when the mode is disabled. Modes which act in a similar way to channel mode +l (e.g. require a parameter to enable, but not to disable) should use this parameter. The function returns false if the mode is unavailable, and will not attempt to allocate another character, as this will confuse users. This also means that as only one module can claim a specific mode character, the core does not need to keep track of which modules own which modes, which speeds up operation of the server. In this version, a mode can have at most one parameter, attempting to use more parameters will have undefined effects.Definition at line 638 of file modules.cpp.
+Adds an extended mode letter which is parsed by a module. This allows modules to add extra mode letters, e.g. +x for hostcloak. the 'type' parameter is either MT_CHANNEL, MT_CLIENT, or MT_SERVER, to indicate wether the mode is a channel mode, a client mode, or a server mode. requires_oper is used with MT_CLIENT type modes only to indicate the mode can only be set or unset by an oper. If this is used for MT_CHANNEL type modes it is ignored. params_when_on is the number of modes to expect when the mode is turned on (for type MT_CHANNEL only), e.g. with mode +k, this would have a value of 1. the params_when_off value has a similar value to params_when_on, except it indicates the number of parameters to expect when the mode is disabled. Modes which act in a similar way to channel mode +l (e.g. require a parameter to enable, but not to disable) should use this parameter. The function returns false if the mode is unavailable, and will not attempt to allocate another character, as this will confuse users. This also means that as only one module can claim a specific mode character, the core does not need to keep track of which modules own which modes, which speeds up operation of the server. In this version, a mode can have at most one parameter, attempting to use more parameters will have undefined effects.Definition at line 639 of file modules.cpp.
 .PP
 References DEBUG, DoAddExtendedMode(), MT_CLIENT, and MT_SERVER.
 .PP
 .nf
-639 {
-640         if (((modechar >= 'A') && (modechar <= 'Z')) || ((modechar >= 'a') && (modechar <= 'z')))
-641         {
-642                 if (type == MT_SERVER)
-643                 {
-644                         log(DEBUG,'*** API ERROR *** Modes of type MT_SERVER are reserved for future expansion');
-645                         return false;
-646                 }
-647                 if (((params_when_on>0) || (params_when_off>0)) && (type == MT_CLIENT))
-648                 {
-649                         log(DEBUG,'*** API ERROR *** Parameters on MT_CLIENT modes are not supported');
-650                         return false;
-651                 }
-652                 if ((params_when_on>1) || (params_when_off>1))
-653                 {
-654                         log(DEBUG,'*** API ERROR *** More than one parameter for an MT_CHANNEL mode is not yet supported');
-655                         return false;
-656                 }
-657                 return DoAddExtendedMode(modechar,type,requires_oper,params_when_on,params_when_off);
-658         }
-659         else
-660         {
-661                 log(DEBUG,'*** API ERROR *** Muppet modechar detected.');
-662         }
-663         return false;
-664 }
+640 {
+641         if (((modechar >= 'A') && (modechar <= 'Z')) || ((modechar >= 'a') && (modechar <= 'z')))
+642         {
+643                 if (type == MT_SERVER)
+644                 {
+645                         log(DEBUG,'*** API ERROR *** Modes of type MT_SERVER are reserved for future expansion');
+646                         return false;
+647                 }
+648                 if (((params_when_on>0) || (params_when_off>0)) && (type == MT_CLIENT))
+649                 {
+650                         log(DEBUG,'*** API ERROR *** Parameters on MT_CLIENT modes are not supported');
+651                         return false;
+652                 }
+653                 if ((params_when_on>1) || (params_when_off>1))
+654                 {
+655                         log(DEBUG,'*** API ERROR *** More than one parameter for an MT_CHANNEL mode is not yet supported');
+656                         return false;
+657                 }
+658                 return DoAddExtendedMode(modechar,type,requires_oper,params_when_on,params_when_off);
+659         }
+660         else
+661         {
+662                 log(DEBUG,'*** API ERROR *** Muppet modechar detected.');
+663         }
+664         return false;
+665 }
 .fi
 .SS "void Server::AddGLine (long duration, std::string source, std::string reason, std::string hostmask)\fC [virtual]\fP"
 .PP
-Adds a G-line The G-line is propogated to all of the servers in the mesh and enforced as soon as it is added. The duration must be in seconds, however you can use the \fBServer::CalcDuration\fP method to convert durations into the 1w2d3h3m6s format used by /GLINE etc. The source is an arbitary string used to indicate who or what sent the data, usually this is the nickname of a person, or a server name.Definition at line 729 of file modules.cpp.
+Adds a G-line The G-line is propogated to all of the servers in the mesh and enforced as soon as it is added. The duration must be in seconds, however you can use the \fBServer::CalcDuration\fP method to convert durations into the 1w2d3h3m6s format used by /GLINE etc. The source is an arbitary string used to indicate who or what sent the data, usually this is the nickname of a person, or a server name.Definition at line 730 of file modules.cpp.
 .PP
 References add_gline(), and duration().
 .PP
 .nf
-730 {
-731         add_gline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
-732 }
+731 {
+732         add_gline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
+733 }
 .fi
 .SS "void Server::AddKLine (long duration, std::string source, std::string reason, std::string hostmask)\fC [virtual]\fP"
 .PP
-Adds a K-line The K-line is enforced as soon as it is added. The duration must be in seconds, however you can use the \fBServer::CalcDuration\fP method to convert durations into the 1w2d3h3m6s format used by /GLINE etc. The source is an arbitary string used to indicate who or what sent the data, usually this is the nickname of a person, or a server name. Definition at line 744 of file modules.cpp.
+Adds a K-line The K-line is enforced as soon as it is added. The duration must be in seconds, however you can use the \fBServer::CalcDuration\fP method to convert durations into the 1w2d3h3m6s format used by /GLINE etc. The source is an arbitary string used to indicate who or what sent the data, usually this is the nickname of a person, or a server name. Definition at line 745 of file modules.cpp.
 .PP
 References add_kline(), and duration().
 .PP
 .nf
-745 {
-746         add_kline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
-747 }
+746 {
+747         add_kline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
+748 }
 .fi
 .SS "void Server::AddQLine (long duration, std::string source, std::string reason, std::string nickname)\fC [virtual]\fP"
 .PP
-Adds a Q-line The Q-line is propogated to all of the servers in the mesh and enforced as soon as it is added. The duration must be in seconds, however you can use the \fBServer::CalcDuration\fP method to convert durations into the 1w2d3h3m6s format used by /GLINE etc. The source is an arbitary string used to indicate who or what sent the data, usually this is the nickname of a person, or a server name. Definition at line 734 of file modules.cpp.
+Adds a Q-line The Q-line is propogated to all of the servers in the mesh and enforced as soon as it is added. The duration must be in seconds, however you can use the \fBServer::CalcDuration\fP method to convert durations into the 1w2d3h3m6s format used by /GLINE etc. The source is an arbitary string used to indicate who or what sent the data, usually this is the nickname of a person, or a server name. Definition at line 735 of file modules.cpp.
 .PP
 References add_qline(), and duration().
 .PP
 .nf
-735 {
-736         add_qline(duration, source.c_str(), reason.c_str(), nickname.c_str());
-737 }
+736 {
+737         add_qline(duration, source.c_str(), reason.c_str(), nickname.c_str());
+738 }
 .fi
 .SS "void Server::AddZLine (long duration, std::string source, std::string reason, std::string ipaddr)\fC [virtual]\fP"
 .PP
-Adds a Z-line The Z-line is propogated to all of the servers in the mesh and enforced as soon as it is added. The duration must be in seconds, however you can use the \fBServer::CalcDuration\fP method to convert durations into the 1w2d3h3m6s format used by /GLINE etc. The source is an arbitary string used to indicate who or what sent the data, usually this is the nickname of a person, or a server name. Definition at line 739 of file modules.cpp.
+Adds a Z-line The Z-line is propogated to all of the servers in the mesh and enforced as soon as it is added. The duration must be in seconds, however you can use the \fBServer::CalcDuration\fP method to convert durations into the 1w2d3h3m6s format used by /GLINE etc. The source is an arbitary string used to indicate who or what sent the data, usually this is the nickname of a person, or a server name. Definition at line 740 of file modules.cpp.
 .PP
 References add_zline(), and duration().
 .PP
 .nf
-740 {
-741         add_zline(duration, source.c_str(), reason.c_str(), ipaddr.c_str());
-742 }
+741 {
+742         add_zline(duration, source.c_str(), reason.c_str(), ipaddr.c_str());
+743 }
 .fi
 .SS "long Server::CalcDuration (std::string duration)\fC [virtual]\fP"
 .PP
-Calculates a duration This method will take a string containing a formatted duration (e.g. '1w2d') and return its value as a total number of seconds. This is the same function used internally by /GLINE etc to set the ban times.Definition at line 779 of file modules.cpp.
+Calculates a duration This method will take a string containing a formatted duration (e.g. '1w2d') and return its value as a total number of seconds. This is the same function used internally by /GLINE etc to set the ban times.Definition at line 780 of file modules.cpp.
 .PP
 References duration().
 .PP
 .nf
-780 {
-781         return duration(delta.c_str());
-782 }
+781 {
+782         return duration(delta.c_str());
+783 }
 .fi
 .SS "void Server::CallCommandHandler (std::string commandname, char ** parameters, int pcnt, \fBuserrec\fP * user)\fC [virtual]\fP"
 .PP
 Calls the handler for a command, either implemented by the core or by another module. You can use this function to trigger other commands in the ircd, such as PRIVMSG, JOIN, KICK etc, or even as a method of callback. By defining command names that are untypeable for users on irc (e.g. those which contain a  or 
 .br
-) you may use them as callback identifiers. The first parameter to this method is the name of the command handler you wish to call, e.g. PRIVMSG. This will be a command handler previously registered by the core or wih \fBAddCommand()\fP. The second parameter is an array of parameters, and the third parameter is a count of parameters in the array. If you do not pass enough parameters to meet the minimum needed by the handler, the functiom will silently ignore it. The final parameter is the user executing the command handler, used for privilage checks, etc.Definition at line 493 of file modules.cpp.
+) you may use them as callback identifiers. The first parameter to this method is the name of the command handler you wish to call, e.g. PRIVMSG. This will be a command handler previously registered by the core or wih \fBAddCommand()\fP. The second parameter is an array of parameters, and the third parameter is a count of parameters in the array. If you do not pass enough parameters to meet the minimum needed by the handler, the functiom will silently ignore it. The final parameter is the user executing the command handler, used for privilage checks, etc.Definition at line 494 of file modules.cpp.
 .PP
 .nf
-494 {
-495         call_handler(commandname.c_str(),parameters,pcnt,user);
-496 }
+495 {
+496         call_handler(commandname.c_str(),parameters,pcnt,user);
+497 }
 .fi
 .SS "void Server::ChangeGECOS (\fBuserrec\fP * user, std::string gecos)\fC [virtual]\fP"
 .PP
-Change GECOS (fullname) of a user. You should always call this method to change a user's GECOS rather than writing directly to the fullname member of userrec, as any change applied via this method will be propogated to any linked servers.Definition at line 586 of file modules.cpp.
+Change GECOS (fullname) of a user. You should always call this method to change a user's GECOS rather than writing directly to the fullname member of userrec, as any change applied via this method will be propogated to any linked servers.Definition at line 587 of file modules.cpp.
 .PP
 References ChangeName().
 .PP
 .nf
-587 {
-588         ChangeName(user,gecos.c_str());
-589 }
+588 {
+589         ChangeName(user,gecos.c_str());
+590 }
 .fi
 .SS "void Server::ChangeHost (\fBuserrec\fP * user, std::string host)\fC [virtual]\fP"
 .PP
-Change displayed hostname of a user. You should always call this method to change a user's host rather than writing directly to the dhost member of userrec, as any change applied via this method will be propogated to any linked servers.Definition at line 581 of file modules.cpp.
+Change displayed hostname of a user. You should always call this method to change a user's host rather than writing directly to the dhost member of userrec, as any change applied via this method will be propogated to any linked servers.Definition at line 582 of file modules.cpp.
 .PP
 References ChangeDisplayedHost().
 .PP
 .nf
-582 {
-583         ChangeDisplayedHost(user,host.c_str());
-584 }
+583 {
+584         ChangeDisplayedHost(user,host.c_str());
+585 }
 .fi
 .SS "void Server::ChangeUserNick (\fBuserrec\fP * user, std::string nickname)\fC [virtual]\fP"
 .PP
-Forces a user nickchange. This command works similarly to SVSNICK, and can be used to implement Q-lines etc. If you specify an invalid nickname, the nick change will be dropped and the target user will receive the error numeric for it.Definition at line 478 of file modules.cpp.
+Forces a user nickchange. This command works similarly to SVSNICK, and can be used to implement Q-lines etc. If you specify an invalid nickname, the nick change will be dropped and the target user will receive the error numeric for it.Definition at line 479 of file modules.cpp.
 .PP
 .nf
-479 {
-480         force_nickchange(user,nickname.c_str());
-481 }
+480 {
+481         force_nickchange(user,nickname.c_str());
+482 }
 .fi
 .SS "std::string Server::ChanMode (\fBuserrec\fP * User, \fBchanrec\fP * Chan)\fC [virtual]\fP"
 .PP
-Attempts to look up a user's privilages on a channel. This function will return a string containing either @, , +, or an empty string, representing the user's privilages upon the channel you specify.Definition at line 611 of file modules.cpp.
+Attempts to look up a user's privilages on a channel. This function will return a string containing either @, , +, or an empty string, representing the user's privilages upon the channel you specify.Definition at line 612 of file modules.cpp.
 .PP
 References cmode().
 .PP
 .nf
-612 {
-613         return cmode(User,Chan);
-614 }
+613 {
+614         return cmode(User,Chan);
+615 }
 .fi
 .SS "bool Server::CommonChannels (\fBuserrec\fP * u1, \fBuserrec\fP * u2)\fC [virtual]\fP"
 .PP
-Returns true if two users share a common channel. This method is used internally by the NICK and QUIT commands, and the \fBServer::SendCommon\fP method.Definition at line 559 of file modules.cpp.
+Returns true if two users share a common channel. This method is used internally by the NICK and QUIT commands, and the \fBServer::SendCommon\fP method.Definition at line 560 of file modules.cpp.
 .PP
 References common_channels().
 .PP
 .nf
-560 {
-561         return (common_channels(u1,u2) != 0);
-562 }
+561 {
+562         return (common_channels(u1,u2) != 0);
+563 }
 .fi
 .SS "int Server::CountUsers (\fBchanrec\fP * c)\fC [virtual]\fP"
 .PP
-Returns a count of the number of users on a channel. This will NEVER be 0, as if the chanrec exists, it will have at least one user in the channel.Definition at line 674 of file modules.cpp.
+Returns a count of the number of users on a channel. This will NEVER be 0, as if the chanrec exists, it will have at least one user in the channel.Definition at line 675 of file modules.cpp.
 .PP
 .nf
-675 {
-676         return usercount(c);
-677 }
+676 {
+677         return usercount(c);
+678 }
 .fi
 .SS "bool Server::DelELine (std::string hostmask)\fC [virtual]\fP"
 .PP
-Deletes a local E-Line. Definition at line 774 of file modules.cpp.
+Deletes a local E-Line. Definition at line 775 of file modules.cpp.
 .PP
 References del_eline().
 .PP
 .nf
-775 {
-776         del_eline(hostmask.c_str());
-777 }
+776 {
+777         del_eline(hostmask.c_str());
+778 }
 .fi
 .SS "bool Server::DelGLine (std::string hostmask)\fC [virtual]\fP"
 .PP
-Deletes a G-Line from all servers on the mesh. Definition at line 754 of file modules.cpp.
+Deletes a G-Line from all servers on the mesh. Definition at line 755 of file modules.cpp.
 .PP
 References del_gline().
 .PP
 .nf
-755 {
-756         del_gline(hostmask.c_str());
-757 }
+756 {
+757         del_gline(hostmask.c_str());
+758 }
 .fi
 .SS "bool Server::DelKLine (std::string hostmask)\fC [virtual]\fP"
 .PP
-Deletes a local K-Line. Definition at line 769 of file modules.cpp.
+Deletes a local K-Line. Definition at line 770 of file modules.cpp.
 .PP
 References del_kline().
 .PP
 .nf
-770 {
-771         del_kline(hostmask.c_str());
-772 }
+771 {
+772         del_kline(hostmask.c_str());
+773 }
 .fi
 .SS "bool Server::DelQLine (std::string nickname)\fC [virtual]\fP"
 .PP
-Deletes a Q-Line from all servers on the mesh. Definition at line 759 of file modules.cpp.
+Deletes a Q-Line from all servers on the mesh. Definition at line 760 of file modules.cpp.
 .PP
 References del_qline().
 .PP
 .nf
-760 {
-761         del_qline(nickname.c_str());
-762 }
+761 {
+762         del_qline(nickname.c_str());
+763 }
 .fi
 .SS "bool Server::DelZLine (std::string ipaddr)\fC [virtual]\fP"
 .PP
-Deletes a Z-Line from all servers on the mesh. Definition at line 764 of file modules.cpp.
+Deletes a Z-Line from all servers on the mesh. Definition at line 765 of file modules.cpp.
 .PP
 References del_zline().
 .PP
 .nf
-765 {
-766         del_zline(ipaddr.c_str());
-767 }
+766 {
+767         del_zline(ipaddr.c_str());
+768 }
 .fi
 .SS "\fBchanrec\fP * Server::FindChannel (std::string channel)\fC [virtual]\fP"
 .PP
-Attempts to look up a channel and return a pointer to it. This function will return NULL if the channel does not exist.Definition at line 606 of file modules.cpp.
+Attempts to look up a channel and return a pointer to it. This function will return NULL if the channel does not exist.Definition at line 607 of file modules.cpp.
 .PP
 .nf
-607 {
-608         return FindChan(channel.c_str());
-609 }
+608 {
+609         return FindChan(channel.c_str());
+610 }
 .fi
 .SS "\fBuserrec\fP * Server::FindDescriptor (int socket)\fC [virtual]\fP"
 .PP
-Attempts to look up a nick using the file descriptor associated with that nick. This function will return NULL if the file descriptor is not associated with a valid user.Definition at line 601 of file modules.cpp.
+Attempts to look up a nick using the file descriptor associated with that nick. This function will return NULL if the file descriptor is not associated with a valid user.Definition at line 602 of file modules.cpp.
 .PP
 References fd_ref_table.
 .PP
 .nf
-602 {
-603         return (socket < 65536 ? fd_ref_table[socket] : NULL);
-604 }
+603 {
+604         return (socket < 65536 ? fd_ref_table[socket] : NULL);
+605 }
 .fi
 .SS "\fBModule\fP * Server::FindModule (std::string name)\fC [virtual]\fP"
 .PP
-This function finds a module by name. You must provide the filename of the module. If the module cannot be found (is not loaded) the function will return NULL.Definition at line 857 of file modules.cpp.
+This function finds a module by name. You must provide the filename of the module. If the module cannot be found (is not loaded) the function will return NULL.Definition at line 858 of file modules.cpp.
 .PP
 References MODCOUNT, module_names, and modules.
 .PP
 .nf
-858 {
-859         for (int i = 0; i <= MODCOUNT; i++)
-860         {
-861                 if (module_names[i] == name)
-862                 {
-863                         return modules[i];
-864                 }
-865         }
-866         return NULL;
-867 }
+859 {
+860         for (int i = 0; i <= MODCOUNT; i++)
+861         {
+862                 if (module_names[i] == name)
+863                 {
+864                         return modules[i];
+865                 }
+866         }
+867         return NULL;
+868 }
 .fi
 .SS "\fBuserrec\fP * Server::FindNick (std::string nick)\fC [virtual]\fP"
 .PP
-Attempts to look up a nick and return a pointer to it. This function will return NULL if the nick does not exist.Definition at line 596 of file modules.cpp.
+Attempts to look up a nick and return a pointer to it. This function will return NULL if the nick does not exist.Definition at line 597 of file modules.cpp.
 .PP
 .nf
-597 {
-598         return Find(nick);
-599 }
+598 {
+599         return Find(nick);
+600 }
 .fi
 .SS "\fBAdmin\fP Server::GetAdmin ()\fC [virtual]\fP"
 .PP
-Returns the information of the server as returned by the /ADMIN command. See the \fBAdmin\fP class for further information of the return value. The members \fBAdmin::Nick\fP, \fBAdmin::Email\fP and \fBAdmin::Name\fP contain the information for the server where the module is loaded.Definition at line 631 of file modules.cpp.
+Returns the information of the server as returned by the /ADMIN command. See the \fBAdmin\fP class for further information of the return value. The members \fBAdmin::Nick\fP, \fBAdmin::Email\fP and \fBAdmin::Name\fP contain the information for the server where the module is loaded.Definition at line 632 of file modules.cpp.
 .PP
 .nf
-632 {
-633         return Admin(getadminname(),getadminemail(),getadminnick());
-634 }
+633 {
+634         return Admin(getadminname(),getadminemail(),getadminnick());
+635 }
 .fi
 .SS "std::string Server::GetNetworkName ()\fC [virtual]\fP"
 .PP
-Returns the network name, global to all linked servers. Definition at line 626 of file modules.cpp.
+Returns the network name, global to all linked servers. Definition at line 627 of file modules.cpp.
 .PP
 .nf
-627 {
-628         return getnetworkname();
-629 }
+628 {
+629         return getnetworkname();
+630 }
 .fi
 .SS "std::string Server::GetServerName ()\fC [virtual]\fP"
 .PP
-Returns the server name of the server where the module is loaded. Definition at line 621 of file modules.cpp.
+Returns the server name of the server where the module is loaded. Definition at line 622 of file modules.cpp.
 .PP
 .nf
-622 {
-623         return getservername();
-624 }
+623 {
+624         return getservername();
+625 }
 .fi
 .SS "\fBchanuserlist\fP Server::GetUsers (\fBchanrec\fP * chan)\fC [virtual]\fP"
 .PP
-Fetches the userlist of a channel. This function must be here and not a member of userrec or chanrec due to include constraints.Definition at line 466 of file modules.cpp.
+Fetches the userlist of a channel. This function must be here and not a member of userrec or chanrec due to include constraints.Definition at line 467 of file modules.cpp.
 .PP
 References chanuserlist, chanrec::GetUsers(), and list.
 .PP
 .nf
-467 {
-468         chanuserlist userl;
-469         userl.clear();
-470         std::vector<char*> *list = chan->GetUsers();
-471         for (std::vector<char*>::iterator i = list->begin(); i != list->end(); i++)
-472         {
-473                 char* o = *i;
-474                 userl.push_back((userrec*)o);
-475         }
-476         return userl;
-477 }
+468 {
+469         chanuserlist userl;
+470         userl.clear();
+471         std::vector<char*> *list = chan->GetUsers();
+472         for (std::vector<char*>::iterator i = list->begin(); i != list->end(); i++)
+473         {
+474                 char* o = *i;
+475                 userl.push_back((userrec*)o);
+476         }
+477         return userl;
+478 }
 .fi
 .SS "bool Server::IsNick (std::string nick)\fC [virtual]\fP"
 .PP
-Returns true if a nick is valid. Nicks for unregistered connections will return false.Definition at line 591 of file modules.cpp.
+Returns true if a nick is valid. Nicks for unregistered connections will return false.Definition at line 592 of file modules.cpp.
 .PP
 References isnick().
 .PP
 .nf
-592 {
-593         return (isnick(nick.c_str()) != 0);
-594 }
+593 {
+594         return (isnick(nick.c_str()) != 0);
+595 }
 .fi
 .SS "bool Server::IsOnChannel (\fBuserrec\fP * User, \fBchanrec\fP * Chan)\fC [virtual]\fP"
 .PP
-Checks if a user is on a channel. This function will return true or false to indicate if user 'User' is on channel 'Chan'.Definition at line 616 of file modules.cpp.
+Checks if a user is on a channel. This function will return true or false to indicate if user 'User' is on channel 'Chan'.Definition at line 617 of file modules.cpp.
 .PP
 References has_channel().
 .PP
 .nf
-617 {
-618         return has_channel(User,Chan);
-619 }
+618 {
+619         return has_channel(User,Chan);
+620 }
 .fi
 .SS "bool Server::IsUlined (std::string server)\fC [virtual]\fP"
 .PP
-Returns true if the servername you give is ulined. ULined servers have extra privilages. They are allowed to change nicknames on remote servers, change modes of clients which are on remote servers and set modes of channels where there are no channel operators for that channel on the ulined server, amongst other things. Ulined server data is also broadcast across the mesh at all times as opposed to selectively messaged in the case of normal servers, as many ulined server types (such as services) do not support meshed links and must operate in this manner.Definition at line 488 of file modules.cpp.
+Returns true if the servername you give is ulined. ULined servers have extra privilages. They are allowed to change nicknames on remote servers, change modes of clients which are on remote servers and set modes of channels where there are no channel operators for that channel on the ulined server, amongst other things. Ulined server data is also broadcast across the mesh at all times as opposed to selectively messaged in the case of normal servers, as many ulined server types (such as services) do not support meshed links and must operate in this manner.Definition at line 489 of file modules.cpp.
 .PP
 References is_uline().
 .PP
 .nf
-489 {
-490         return is_uline(server.c_str());
-491 }
+490 {
+491         return is_uline(server.c_str());
+492 }
 .fi
 .SS "bool Server::IsValidMask (std::string mask)\fC [virtual]\fP"
 .PP
-Returns true if a nick!ident string is correctly formatted, false if otherwise. Definition at line 784 of file modules.cpp.
+Returns true if a nick!ident string is correctly formatted, false if otherwise. Definition at line 785 of file modules.cpp.
 .PP
 .nf
-785 {
-786         const char* dest = mask.c_str();
-787         if (strchr(dest,'!')==0)
-788                 return false;
-789         if (strchr(dest,'@')==0)
-790                 return false;
-791         for (int i = 0; i < strlen(dest); i++)
-792                 if (dest[i] < 32)
-793                         return false;
-794         for (int i = 0; i < strlen(dest); i++)
-795                 if (dest[i] > 126)
-796                         return false;
-797         int c = 0;
-798         for (int i = 0; i < strlen(dest); i++)
-799                 if (dest[i] == '!')
-800                         c++;
-801         if (c>1)
-802                 return false;
-803         c = 0;
-804         for (int i = 0; i < strlen(dest); i++)
-805                 if (dest[i] == '@')
-806                         c++;
-807         if (c>1)
-808                 return false;
-809 
-810         return true;
-811 }
+786 {
+787         const char* dest = mask.c_str();
+788         if (strchr(dest,'!')==0)
+789                 return false;
+790         if (strchr(dest,'@')==0)
+791                 return false;
+792         for (int i = 0; i < strlen(dest); i++)
+793                 if (dest[i] < 32)
+794                         return false;
+795         for (int i = 0; i < strlen(dest); i++)
+796                 if (dest[i] > 126)
+797                         return false;
+798         int c = 0;
+799         for (int i = 0; i < strlen(dest); i++)
+800                 if (dest[i] == '!')
+801                         c++;
+802         if (c>1)
+803                 return false;
+804         c = 0;
+805         for (int i = 0; i < strlen(dest); i++)
+806                 if (dest[i] == '@')
+807                         c++;
+808         if (c>1)
+809                 return false;
+810 
+811         return true;
+812 }
 .fi
 .SS "\fBchanrec\fP * Server::JoinUserToChannel (\fBuserrec\fP * user, std::string cname, std::string key)\fC [virtual]\fP"
 .PP
-Forces a user to join a channel. This is similar to svsjoin and can be used to implement redirection, etc. On success, the return value is a valid pointer to a chanrec* of the channel the user was joined to. On failure, the result is NULL.Definition at line 456 of file modules.cpp.
+Forces a user to join a channel. This is similar to svsjoin and can be used to implement redirection, etc. On success, the return value is a valid pointer to a chanrec* of the channel the user was joined to. On failure, the result is NULL.Definition at line 457 of file modules.cpp.
 .PP
 .nf
-457 {
-458         return add_channel(user,cname.c_str(),key.c_str(),false);
-459 }
+458 {
+459         return add_channel(user,cname.c_str(),key.c_str(),false);
+460 }
 .fi
 .SS "void Server::Log (int level, std::string s)\fC [virtual]\fP"
 .PP
-Writes a log string. This method writes a line of text to the log. If the level given is lower than the level given in the configuration, this command has no effect.Definition at line 498 of file modules.cpp.
+Writes a log string. This method writes a line of text to the log. If the level given is lower than the level given in the configuration, this command has no effect.Definition at line 499 of file modules.cpp.
 .PP
 .nf
-499 {
-500         log(level,'%s',s.c_str());
-501 }
+500 {
+501         log(level,'%s',s.c_str());
+502 }
 .fi
 .SS "bool Server::MatchText (std::string sliteral, std::string spattern)\fC [virtual]\fP"
 .PP
-Matches text against a glob pattern. Uses the ircd's internal matching function to match string against a globbing pattern, e.g. *!*@*.com Returns true if the literal successfully matches the pattern, false if otherwise.Definition at line 443 of file modules.cpp.
+Matches text against a glob pattern. Uses the ircd's internal matching function to match string against a globbing pattern, e.g. *!*@*.com Returns true if the literal successfully matches the pattern, false if otherwise.Definition at line 444 of file modules.cpp.
 .PP
 .nf
-444 {
-445         char literal[MAXBUF],pattern[MAXBUF];
-446         strlcpy(literal,sliteral.c_str(),MAXBUF);
-447         strlcpy(pattern,spattern.c_str(),MAXBUF);
-448         return match(literal,pattern);
-449 }
+445 {
+446         char literal[MAXBUF],pattern[MAXBUF];
+447         strlcpy(literal,sliteral.c_str(),MAXBUF);
+448         strlcpy(pattern,spattern.c_str(),MAXBUF);
+449         return match(literal,pattern);
+450 }
 .fi
 .SS "bool Server::MeshCheckChan (\fBchanrec\fP * c, std::string servername)\fC [virtual]\fP"
 .PP
-This function is used to check if any users on channel c are on server servername. This is used internally by PRIVMSG etc. You should not need to use it.Definition at line 839 of file modules.cpp.
+This function is used to check if any users on channel c are on server servername. This is used internally by PRIVMSG etc. You should not need to use it.Definition at line 840 of file modules.cpp.
 .PP
 .nf
-840 {
-841         if (c)
-842         {
-843                 return ChanAnyOnThisServer(c,(char*)servername.c_str());
-844         }
-845         else return false;
-846 }
+841 {
+842         if (c)
+843         {
+844                 return ChanAnyOnThisServer(c,(char*)servername.c_str());
+845         }
+846         else return false;
+847 }
 .fi
 .SS "bool Server::MeshCheckCommon (\fBuserrec\fP * u, std::string servername)\fC [virtual]\fP"
 .PP
-This function is used to check if user u has any channels in common with users on servername. This is used internally by \fBServer::MeshSendCommon\fP. You should very rarely need to use it.Definition at line 848 of file modules.cpp.
+This function is used to check if user u has any channels in common with users on servername. This is used internally by \fBServer::MeshSendCommon\fP. You should very rarely need to use it.Definition at line 849 of file modules.cpp.
 .PP
 .nf
-849 {
-850         if (u)
-851         {
-852                 return CommonOnThisServer(u,(char*)servername.c_str());
-853         }
-854         else return false;
-855 }
+850 {
+851         if (u)
+852         {
+853                 return CommonOnThisServer(u,(char*)servername.c_str());
+854         }
+855         else return false;
+856 }
 .fi
 .SS "void Server::MeshSendAll (std::string text)\fC [virtual]\fP"
 .PP
-Sends a line of text to all connected servers. If a server is not directly reachable, the core deals with routing the message, and will also deal with failures transparently.Definition at line 813 of file modules.cpp.
+Sends a line of text to all connected servers. If a server is not directly reachable, the core deals with routing the message, and will also deal with failures transparently.Definition at line 814 of file modules.cpp.
 .PP
 .nf
-814 {
-815         NetSendToAll((char*)text.c_str());
-816 }
+815 {
+816         NetSendToAll((char*)text.c_str());
+817 }
 .fi
 .SS "void Server::MeshSendAllAlive (std::string text)\fC [virtual]\fP"
 .PP
-This function is equivalent to Server::MeshSendToAll except it will only route to servers which are directly routable. Definition at line 824 of file modules.cpp.
+This function is equivalent to Server::MeshSendToAll except it will only route to servers which are directly routable. Definition at line 825 of file modules.cpp.
 .PP
 .nf
-825 {
-826         NetSendToAllAlive((char*)text.c_str());
-827 }
+826 {
+827         NetSendToAllAlive((char*)text.c_str());
+828 }
 .fi
 .SS "void Server::MeshSendAllExcept (std::string target, std::string text)\fC [virtual]\fP"
 .PP
-This function sends to all servers EXCEPT the one you specify. You should usually use this function to send messages, specifying the SENDER of your message as 'target'. This will prevent message loops.Definition at line 834 of file modules.cpp.
+This function sends to all servers EXCEPT the one you specify. You should usually use this function to send messages, specifying the SENDER of your message as 'target'. This will prevent message loops.Definition at line 835 of file modules.cpp.
 .PP
 .nf
-835 {
-836         NetSendToAllExcept(target.c_str(),(char*)text.c_str());
-837 }
+836 {
+837         NetSendToAllExcept(target.c_str(),(char*)text.c_str());
+838 }
 .fi
 .SS "void Server::MeshSendCommon (\fBuserrec\fP * user, std::string text)\fC [virtual]\fP"
 .PP
-This method sends a line of text to all servers who have users which share common channels with the user you provide. For example, if user A is on server A, and they are on channels #one and #two, and user B is on server B, and also on channel #one, but user C is on server C and on neither #one or #two, this function will cause the text to only be sent to server B. However, if server B is only reachable via C, it will route it to C (you do not have to worry about this routing, it is done transparently, but its good to know how things work!)Definition at line 818 of file modules.cpp.
+This method sends a line of text to all servers who have users which share common channels with the user you provide. For example, if user A is on server A, and they are on channels #one and #two, and user B is on server B, and also on channel #one, but user C is on server C and on neither #one or #two, this function will cause the text to only be sent to server B. However, if server B is only reachable via C, it will route it to C (you do not have to worry about this routing, it is done transparently, but its good to know how things work!)Definition at line 819 of file modules.cpp.
 .PP
 .nf
-819 {
-820         if (user)
-821                 NetSendToCommon(user,(char*)text.c_str());
-822 }
+820 {
+821         if (user)
+822                 NetSendToCommon(user,(char*)text.c_str());
+823 }
 .fi
 .SS "void Server::MeshSendUnicast (std::string destination, std::string text)\fC [virtual]\fP"
 .PP
-This function sends a line of text directly to a server. If the server is not directly routable at this time, the server attempts to route text through the mesh.Definition at line 829 of file modules.cpp.
+This function sends a line of text directly to a server. If the server is not directly routable at this time, the server attempts to route text through the mesh.Definition at line 830 of file modules.cpp.
 .PP
 .nf
-830 {
-831         NetSendToOne((char*)destination.c_str(),(char*)text.c_str());
-832 }
+831 {
+832         NetSendToOne((char*)destination.c_str(),(char*)text.c_str());
+833 }
 .fi
 .SS "\fBchanrec\fP * Server::PartUserFromChannel (\fBuserrec\fP * user, std::string cname, std::string reason)\fC [virtual]\fP"
 .PP
-Forces a user to part a channel. This is similar to svspart and can be used to implement redirection, etc. Although the return value of this function is a pointer to a channel record, the returned data is undefined and should not be read or written to. This behaviour may be changed in a future version.Definition at line 461 of file modules.cpp.
+Forces a user to part a channel. This is similar to svspart and can be used to implement redirection, etc. Although the return value of this function is a pointer to a channel record, the returned data is undefined and should not be read or written to. This behaviour may be changed in a future version.Definition at line 462 of file modules.cpp.
 .PP
 .nf
-462 {
-463         return del_channel(user,cname.c_str(),reason.c_str(),false);
-464 }
+463 {
+464         return del_channel(user,cname.c_str(),reason.c_str(),false);
+465 }
 .fi
 .SS "bool Server::PseudoToUser (\fBuserrec\fP * alive, \fBuserrec\fP * zombie, std::string message)\fC [virtual]\fP"
 .PP
-This user takes one user, and switches their file descriptor with another user, so that one user 'becomes' the other. The user in 'alive' is booted off the server with the given message. The user referred to by 'zombie' should have previously been locked with Server::ZombifyUser, otherwise stale sockets and file descriptor leaks can occur. After this call, the pointer to alive will be invalid, and the pointer to zombie will be equivalent in effect to the old pointer to alive.Definition at line 699 of file modules.cpp.
+This user takes one user, and switches their file descriptor with another user, so that one user 'becomes' the other. The user in 'alive' is booted off the server with the given message. The user referred to by 'zombie' should have previously been locked with Server::ZombifyUser, otherwise stale sockets and file descriptor leaks can occur. After this call, the pointer to alive will be invalid, and the pointer to zombie will be equivalent in effect to the old pointer to alive.Definition at line 700 of file modules.cpp.
 .PP
 References ucrec::channel, userrec::chans, userrec::ClearBuffer(), connection::fd, FD_MAGIC_NUMBER, fd_ref_table, connection::host, userrec::ident, chanrec::name, userrec::nick, chanrec::setby, chanrec::topic, and chanrec::topicset.
 .PP
 .nf
-700 {
-701         zombie->fd = alive->fd;
-702         alive->fd = FD_MAGIC_NUMBER;
-703         alive->ClearBuffer();
-704         Write(zombie->fd,':%s!%s@%s NICK %s',alive->nick,alive->ident,alive->host,zombie->nick);
-705         kill_link(alive,message.c_str());
-706         fd_ref_table[zombie->fd] = zombie;
-707         for (int i = 0; i != MAXCHANS; i++)
-708         {
-709                 if (zombie->chans[i].channel != NULL)
-710                 {
-711                         if (zombie->chans[i].channel->name)
-712                         {
-713                                 chanrec* Ptr = zombie->chans[i].channel;
-714                                 WriteFrom(zombie->fd,zombie,'JOIN %s',Ptr->name);
-715                                 if (Ptr->topicset)
-716                                 {
-717                                         WriteServ(zombie->fd,'332 %s %s :%s', zombie->nick, Ptr->name, Ptr->topic);
-718                                         WriteServ(zombie->fd,'333 %s %s %s %d', zombie->nick, Ptr->name, Ptr->setby, Ptr->topicset);
-719                                 }
-720                                 userlist(zombie,Ptr);
-721                                 WriteServ(zombie->fd,'366 %s %s :End of /NAMES list.', zombie->nick, Ptr->name);
-722 
-723                         }
-724                 }
-725         }
-726 
-727 }
+701 {
+702         zombie->fd = alive->fd;
+703         alive->fd = FD_MAGIC_NUMBER;
+704         alive->ClearBuffer();
+705         Write(zombie->fd,':%s!%s@%s NICK %s',alive->nick,alive->ident,alive->host,zombie->nick);
+706         kill_link(alive,message.c_str());
+707         fd_ref_table[zombie->fd] = zombie;
+708         for (int i = 0; i != MAXCHANS; i++)
+709         {
+710                 if (zombie->chans[i].channel != NULL)
+711                 {
+712                         if (zombie->chans[i].channel->name)
+713                         {
+714                                 chanrec* Ptr = zombie->chans[i].channel;
+715                                 WriteFrom(zombie->fd,zombie,'JOIN %s',Ptr->name);
+716                                 if (Ptr->topicset)
+717                                 {
+718                                         WriteServ(zombie->fd,'332 %s %s :%s', zombie->nick, Ptr->name, Ptr->topic);
+719                                         WriteServ(zombie->fd,'333 %s %s %s %d', zombie->nick, Ptr->name, Ptr->setby, Ptr->topicset);
+720                                 }
+721                                 userlist(zombie,Ptr);
+722                                 WriteServ(zombie->fd,'366 %s %s :End of /NAMES list.', zombie->nick, Ptr->name);
+723 
+724                         }
+725                 }
+726         }
+727 
+728 }
 .fi
 .SS "void Server::QuitUser (\fBuserrec\fP * user, std::string reason)\fC [virtual]\fP"
 .PP
@@ -862,71 +862,71 @@ Forces a user to quit with the specified reason. To the user, it will appear as
 .PP
 WARNING!
 .PP
-Once you call this function, userrec* user will immediately become INVALID. You MUST NOT write to, or read from this pointer after calling the QuitUser method UNDER ANY CIRCUMSTANCES! The best course of action after calling this method is to immediately bail from your handler.Definition at line 483 of file modules.cpp.
+Once you call this function, userrec* user will immediately become INVALID. You MUST NOT write to, or read from this pointer after calling the QuitUser method UNDER ANY CIRCUMSTANCES! The best course of action after calling this method is to immediately bail from your handler.Definition at line 484 of file modules.cpp.
 .PP
 .nf
-484 {
-485         kill_link(user,reason.c_str());
-486 }
+485 {
+486         kill_link(user,reason.c_str());
+487 }
 .fi
 .SS "void Server::Send (int Socket, std::string s)\fC [virtual]\fP"
 .PP
-Sends a line of text down a TCP/IP socket. This method writes a line of text to an established socket, cutting it to 510 characters plus a carriage return and linefeed if required.Definition at line 513 of file modules.cpp.
+Sends a line of text down a TCP/IP socket. This method writes a line of text to an established socket, cutting it to 510 characters plus a carriage return and linefeed if required.Definition at line 514 of file modules.cpp.
 .PP
 .nf
-514 {
-515         Write(Socket,'%s',s.c_str());
-516 }
+515 {
+516         Write(Socket,'%s',s.c_str());
+517 }
 .fi
 .SS "void Server::SendChannel (\fBuserrec\fP * User, \fBchanrec\fP * Channel, std::string s, bool IncludeSender)\fC [virtual]\fP"
 .PP
-Sends text from a user to a channel (mulicast). This method writes a line of text to a channel, with the given user's nick/ident /host combination prepended, as used in PRIVMSG etc commands (see RFC 1459). If the IncludeSender flag is set, then the text is also sent back to the user from which it originated, as seen in MODE (see RFC 1459).Definition at line 547 of file modules.cpp.
+Sends text from a user to a channel (mulicast). This method writes a line of text to a channel, with the given user's nick/ident /host combination prepended, as used in PRIVMSG etc commands (see RFC 1459). If the IncludeSender flag is set, then the text is also sent back to the user from which it originated, as seen in MODE (see RFC 1459).Definition at line 548 of file modules.cpp.
 .PP
 .nf
-548 {
-549         if (IncludeSender)
-550         {
-551                 WriteChannel(Channel,User,'%s',s.c_str());
-552         }
-553         else
-554         {
-555                 ChanExceptSender(Channel,User,'%s',s.c_str());
-556         }
-557 }
+549 {
+550         if (IncludeSender)
+551         {
+552                 WriteChannel(Channel,User,'%s',s.c_str());
+553         }
+554         else
+555         {
+556                 ChanExceptSender(Channel,User,'%s',s.c_str());
+557         }
+558 }
 .fi
 .SS "void Server::SendChannelServerNotice (std::string ServName, \fBchanrec\fP * Channel, std::string text)\fC [virtual]\fP"
 .PP
-Writes text to a channel, but from a server, including all. This can be used to send server notices to a group of users.Definition at line 542 of file modules.cpp.
+Writes text to a channel, but from a server, including all. This can be used to send server notices to a group of users.Definition at line 543 of file modules.cpp.
 .PP
 .nf
-543 {
-544         WriteChannelWithServ((char*)ServName.c_str(), Channel, '%s', text.c_str());
-545 }
+544 {
+545         WriteChannelWithServ((char*)ServName.c_str(), Channel, '%s', text.c_str());
+546 }
 .fi
 .SS "void Server::SendCommon (\fBuserrec\fP * User, std::string text, bool IncludeSender)\fC [virtual]\fP"
 .PP
-Sends text from a user to one or more channels (mulicast). This method writes a line of text to all users which share a common channel with a given user, with the user's nick/ident/host combination prepended, as used in PRIVMSG etc commands (see RFC 1459). If the IncludeSender flag is set, then the text is also sent back to the user from which it originated, as seen in NICK (see RFC 1459). Otherwise, it is only sent to the other recipients, as seen in QUIT.Definition at line 564 of file modules.cpp.
+Sends text from a user to one or more channels (mulicast). This method writes a line of text to all users which share a common channel with a given user, with the user's nick/ident/host combination prepended, as used in PRIVMSG etc commands (see RFC 1459). If the IncludeSender flag is set, then the text is also sent back to the user from which it originated, as seen in NICK (see RFC 1459). Otherwise, it is only sent to the other recipients, as seen in QUIT.Definition at line 565 of file modules.cpp.
 .PP
 .nf
-565 {
-566         if (IncludeSender)
-567         {
-568                 WriteCommon(User,'%s',text.c_str());
-569         }
-570         else
-571         {
-572                 WriteCommonExcept(User,'%s',text.c_str());
-573         }
-574 }
+566 {
+567         if (IncludeSender)
+568         {
+569                 WriteCommon(User,'%s',text.c_str());
+570         }
+571         else
+572         {
+573                 WriteCommonExcept(User,'%s',text.c_str());
+574         }
+575 }
 .fi
 .SS "void Server::SendFrom (int Socket, \fBuserrec\fP * User, std::string s)\fC [virtual]\fP"
 .PP
-Sends text from a user to a socket. This method writes a line of text to an established socket, with the given user's nick/ident /host combination prepended, as used in PRIVSG etc commands (see RFC 1459)Definition at line 523 of file modules.cpp.
+Sends text from a user to a socket. This method writes a line of text to an established socket, with the given user's nick/ident /host combination prepended, as used in PRIVSG etc commands (see RFC 1459)Definition at line 524 of file modules.cpp.
 .PP
 .nf
-524 {
-525         WriteFrom(Socket,User,'%s',s.c_str());
-526 }
+525 {
+526         WriteFrom(Socket,User,'%s',s.c_str());
+527 }
 .fi
 .SS "void Server::SendMode (char ** parameters, int pcnt, \fBuserrec\fP * user)\fC [virtual]\fP"
 .PP
@@ -944,32 +944,32 @@ modes[2] = user->nick;
 .PP
 Srv->SendMode(modes,3,user);
 .PP
-The modes will originate from the server where the command was issued, however responses (e.g. numerics) will be sent to the user you provide as the third parameter. You must be sure to get the number of parameters correct in the pcnt parameter otherwise you could leave your server in an unstable state!Definition at line 508 of file modules.cpp.
+The modes will originate from the server where the command was issued, however responses (e.g. numerics) will be sent to the user you provide as the third parameter. You must be sure to get the number of parameters correct in the pcnt parameter otherwise you could leave your server in an unstable state!Definition at line 509 of file modules.cpp.
 .PP
 References server_mode().
 .PP
 .nf
-509 {
-510         server_mode(parameters,pcnt,user);
-511 }
+510 {
+511         server_mode(parameters,pcnt,user);
+512 }
 .fi
 .SS "void Server::SendOpers (std::string s)\fC [virtual]\fP"
 .PP
-Sends text to all opers. This method sends a server notice to all opers with the usermode +s.Definition at line 438 of file modules.cpp.
+Sends text to all opers. This method sends a server notice to all opers with the usermode +s.Definition at line 439 of file modules.cpp.
 .PP
 .nf
-439 {
-440         WriteOpers('%s',s.c_str());
-441 }
+440 {
+441         WriteOpers('%s',s.c_str());
+442 }
 .fi
 .SS "void Server::SendServ (int Socket, std::string s)\fC [virtual]\fP"
 .PP
-Sends text from the server to a socket. This method writes a line of text to an established socket, with the servername prepended as used by numerics (see RFC 1459)Definition at line 518 of file modules.cpp.
+Sends text from the server to a socket. This method writes a line of text to an established socket, with the servername prepended as used by numerics (see RFC 1459)Definition at line 519 of file modules.cpp.
 .PP
 .nf
-519 {
-520         WriteServ(Socket,'%s',s.c_str());
-521 }
+520 {
+521         WriteServ(Socket,'%s',s.c_str());
+522 }
 .fi
 .SS "void Server::SendTo (\fBuserrec\fP * Source, \fBuserrec\fP * Dest, std::string s)\fC [virtual]\fP"
 .PP
@@ -981,23 +981,23 @@ The format will become:
 .PP
 :localserver TEXT
 .PP
-Which is useful for numerics and server notices to single users, etc.Definition at line 528 of file modules.cpp.
+Which is useful for numerics and server notices to single users, etc.Definition at line 529 of file modules.cpp.
 .PP
 References connection::fd.
 .PP
 .nf
-529 {
-530         if (!Source)
-531         {
-532                 // if source is NULL, then the message originates from the local server
-533                 Write(Dest->fd,':%s %s',this->GetServerName().c_str(),s.c_str());
-534         }
-535         else
-536         {
-537                 // otherwise it comes from the user specified
-538                 WriteTo(Source,Dest,'%s',s.c_str());
-539         }
-540 }
+530 {
+531         if (!Source)
+532         {
+533                 // if source is NULL, then the message originates from the local server
+534                 Write(Dest->fd,':%s %s',this->GetServerName().c_str(),s.c_str());
+535         }
+536         else
+537         {
+538                 // otherwise it comes from the user specified
+539                 WriteTo(Source,Dest,'%s',s.c_str());
+540         }
+541 }
 .fi
 .SS "void Server::SendToModeMask (std::string modes, int flags, std::string text)\fC [virtual]\fP"
 .PP
@@ -1005,46 +1005,46 @@ Sends to all users matching a mode mask You must specify one or more usermodes a
 .PP
 Serv->SendToModeMask('xi', WM_OR, 'm00');
 .PP
-Then the text 'm00' will be sent to all users with EITHER mode x or i. Conversely if you used WM_AND, the user must have both modes set to receive the message.Definition at line 451 of file modules.cpp.
+Then the text 'm00' will be sent to all users with EITHER mode x or i. Conversely if you used WM_AND, the user must have both modes set to receive the message.Definition at line 452 of file modules.cpp.
 .PP
 .nf
-452 {
-453         WriteMode(modes.c_str(),flags,'%s',text.c_str());
-454 }
+453 {
+454         WriteMode(modes.c_str(),flags,'%s',text.c_str());
+455 }
 .fi
 .SS "void Server::SendWallops (\fBuserrec\fP * User, std::string text)\fC [virtual]\fP"
 .PP
-Sends a WALLOPS message. This method writes a WALLOPS message to all users with the +w flag, originating from the specified user.Definition at line 576 of file modules.cpp.
+Sends a WALLOPS message. This method writes a WALLOPS message to all users with the +w flag, originating from the specified user.Definition at line 577 of file modules.cpp.
 .PP
 .nf
-577 {
-578         WriteWallOps(User,false,'%s',text.c_str());
-579 }
+578 {
+579         WriteWallOps(User,false,'%s',text.c_str());
+580 }
 .fi
 .SS "bool Server::UserToPseudo (\fBuserrec\fP * user, std::string message)\fC [virtual]\fP"
 .PP
-Remove a user's connection to the irc server, but leave their client in existence in the user hash. When you call this function, the user's file descriptor will be replaced with the value of FD_MAGIC_NUMBER and their old file descriptor will be closed. This idle client will remain until it is restored with a valid file descriptor, or is removed from IRC by an operator After this call, the pointer to user will be invalid.Definition at line 680 of file modules.cpp.
+Remove a user's connection to the irc server, but leave their client in existence in the user hash. When you call this function, the user's file descriptor will be replaced with the value of FD_MAGIC_NUMBER and their old file descriptor will be closed. This idle client will remain until it is restored with a valid file descriptor, or is removed from IRC by an operator After this call, the pointer to user will be invalid.Definition at line 681 of file modules.cpp.
 .PP
 References userrec::ClearBuffer(), DEBUG, connection::fd, FD_MAGIC_NUMBER, connection::host, and userrec::ident.
 .PP
 .nf
-681 {
-682         unsigned int old_fd = user->fd;
-683         user->fd = FD_MAGIC_NUMBER;
-684         user->ClearBuffer();
-685         Write(old_fd,'ERROR :Closing link (%s@%s) [%s]',user->ident,user->host,message.c_str());
-686 #ifdef USE_KQUEUE
-687         struct kevent ke;
-688         EV_SET(&ke, old_fd, EVFILT_READ, EV_DELETE, 0, 0, NULL);
-689         int i = kevent(kq, &ke, 1, 0, 0, NULL);
-690         if (i == -1)
-691         {
-692                 log(DEBUG,'kqueue: Failed to remove user from queue!');
-693         }
-694 #endif
-695         shutdown(old_fd,2);
-696         close(old_fd);
-697 }
+682 {
+683         unsigned int old_fd = user->fd;
+684         user->fd = FD_MAGIC_NUMBER;
+685         user->ClearBuffer();
+686         Write(old_fd,'ERROR :Closing link (%s@%s) [%s]',user->ident,user->host,message.c_str());
+687 #ifdef USE_KQUEUE
+688         struct kevent ke;
+689         EV_SET(&ke, old_fd, EVFILT_READ, EV_DELETE, 0, 0, NULL);
+690         int i = kevent(kq, &ke, 1, 0, 0, NULL);
+691         if (i == -1)
+692         {
+693                 log(DEBUG,'kqueue: Failed to remove user from queue!');
+694         }
+695 #endif
+696         shutdown(old_fd,2);
+697         close(old_fd);
+698 }
 .fi
 
 
diff --git a/docs/man/man3/Version.3 b/docs/man/man3/Version.3
index 3b845ffd7..ae3af2f56 100644
--- a/docs/man/man3/Version.3
+++ b/docs/man/man3/Version.3
@@ -49,10 +49,10 @@ Definition at line 111 of file modules.h.
 .PP 
 .SS "Version::Version (int major, int minor, int revision, int build, int flags)"
 .PP
-Definition at line 309 of file modules.cpp.
+Definition at line 310 of file modules.cpp.
 .PP
 .nf
-309 : Major(major), Minor(minor), Revision(revision), Build(build), Flags(flags) { };
+310 : Major(major), Minor(minor), Revision(revision), Build(build), Flags(flags) { };
 .fi
 .SH "Member Data Documentation"
 .PP 
diff --git a/docs/man/man3/WhoWasUser.3 b/docs/man/man3/WhoWasUser.3
new file mode 100644
index 000000000..2092f5e4d
--- /dev/null
+++ b/docs/man/man3/WhoWasUser.3
@@ -0,0 +1,67 @@
+.TH "WhoWasUser" 3 "12 May 2005" "InspIRCd" \" -*- nroff -*-
+.ad l
+.nh
+.SH NAME
+WhoWasUser \- A lightweight userrec used by WHOWAS.  
+
+.PP
+.SH SYNOPSIS
+.br
+.PP
+\fC#include <users.h>\fP
+.PP
+.SS "Public Attributes"
+
+.in +1c
+.ti -1c
+.RI "char \fBnick\fP [NICKMAX]"
+.br
+.ti -1c
+.RI "char \fBident\fP [16]"
+.br
+.ti -1c
+.RI "char \fBdhost\fP [160]"
+.br
+.ti -1c
+.RI "char \fBhost\fP [160]"
+.br
+.ti -1c
+.RI "char \fBfullname\fP [128]"
+.br
+.ti -1c
+.RI "char \fBserver\fP [256]"
+.br
+.ti -1c
+.RI "time_t \fBsignon\fP"
+.br
+.in -1c
+.SH "Detailed Description"
+.PP 
+A lightweight userrec used by WHOWAS. Definition at line 315 of file users.h.
+.SH "Member Data Documentation"
+.PP 
+.SS "char \fBWhoWasUser::dhost\fP[160]"
+.PP
+Definition at line 320 of file users.h.
+.SS "char \fBWhoWasUser::fullname\fP[128]"
+.PP
+Definition at line 322 of file users.h.
+.SS "char \fBWhoWasUser::host\fP[160]"
+.PP
+Definition at line 321 of file users.h.
+.SS "char \fBWhoWasUser::ident\fP[16]"
+.PP
+Definition at line 319 of file users.h.
+.SS "char \fBWhoWasUser::nick\fP[NICKMAX]"
+.PP
+Definition at line 318 of file users.h.
+.SS "char \fBWhoWasUser::server\fP[256]"
+.PP
+Definition at line 323 of file users.h.
+.SS "time_t \fBWhoWasUser::signon\fP"
+.PP
+Definition at line 324 of file users.h.
+
+.SH "Author"
+.PP 
+Generated automatically by Doxygen for InspIRCd from the source code.
diff --git a/docs/man/man3/XLine.3 b/docs/man/man3/XLine.3
index 17f34ffc1..75215edc6 100644
--- a/docs/man/man3/XLine.3
+++ b/docs/man/man3/XLine.3
@@ -26,7 +26,7 @@ Inherited by \fBELine\fP, \fBGLine\fP, \fBKLine\fP, \fBQLine\fP, and \fBZLine\fP
 .br
 .RI "\fIThe duration of the ban, or 0 if permenant. \fP"
 .ti -1c
-.RI "char \fBsource\fP [MAXBUF]"
+.RI "char \fBsource\fP [256]"
 .br
 .RI "\fISource of the ban. \fP"
 .ti -1c
@@ -55,7 +55,7 @@ Reason for the ban. Definition at line 52 of file xline.h.
 .SS "time_t \fBXLine::set_time\fP"
 .PP
 The time the line was added. Definition at line 40 of file xline.h.
-.SS "char \fBXLine::source\fP[MAXBUF]"
+.SS "char \fBXLine::source\fP[256]"
 .PP
 Source of the ban. This can be a servername or an oper nicknameDefinition at line 48 of file xline.h.
 
diff --git a/docs/man/man3/ZLine.3 b/docs/man/man3/ZLine.3
index 0aac4c787..48dcfc8ac 100644
--- a/docs/man/man3/ZLine.3
+++ b/docs/man/man3/ZLine.3
@@ -16,7 +16,7 @@ Inherits \fBXLine\fP.
 
 .in +1c
 .ti -1c
-.RI "char \fBipaddr\fP [MAXBUF]"
+.RI "char \fBipaddr\fP [40]"
 .br
 .RI "\fIIP Address (xx.yy.zz.aa) to match against May contain wildcards. \fP"
 .ti -1c
@@ -29,7 +29,7 @@ Inherits \fBXLine\fP.
 ZLine class. Definition at line 93 of file xline.h.
 .SH "Member Data Documentation"
 .PP 
-.SS "char \fBZLine::ipaddr\fP[MAXBUF]"
+.SS "char \fBZLine::ipaddr\fP[40]"
 .PP
 IP Address (xx.yy.zz.aa) to match against May contain wildcards. Definition at line 99 of file xline.h.
 .SS "bool \fBZLine::is_global\fP"
diff --git a/docs/man/man3/channels.cpp.3 b/docs/man/man3/channels.cpp.3
index a0eaaabdc..9a0708fb9 100644
--- a/docs/man/man3/channels.cpp.3
+++ b/docs/man/man3/channels.cpp.3
@@ -273,7 +273,7 @@ Definition at line 88 of file channels.cpp.
 Definition at line 103 of file channels.cpp.
 .SS "int \fBMODCOUNT\fP = -1"
 .PP
-Definition at line 1066 of file modules.cpp.
+Definition at line 1067 of file modules.cpp.
 .PP
 Referenced by Server::FindModule().
 .SS "std::vector<std::string> \fBmodule_names\fP"
diff --git a/docs/man/man3/channels.h.3 b/docs/man/man3/channels.h.3
index 675c0dcb8..fec80d819 100644
--- a/docs/man/man3/channels.h.3
+++ b/docs/man/man3/channels.h.3
@@ -53,6 +53,24 @@ channels.h \-
 
 .in +1c
 .ti -1c
+.RI "#define \fBCM_TOPICLOCK\fP   1"
+.br
+.ti -1c
+.RI "#define \fBCM_NOEXTERNAL\fP   2"
+.br
+.ti -1c
+.RI "#define \fBCM_INVITEONLY\fP   4"
+.br
+.ti -1c
+.RI "#define \fBCM_MODERATED\fP   8"
+.br
+.ti -1c
+.RI "#define \fBCM_SECRET\fP   16"
+.br
+.ti -1c
+.RI "#define \fBCM_PRIVATE\fP   32"
+.br
+.ti -1c
 .RI "#define \fBUCMODE_OP\fP   1"
 .br
 .ti -1c
@@ -86,32 +104,50 @@ channels.h \-
 .in -1c
 .SH "Define Documentation"
 .PP 
+.SS "#define CM_INVITEONLY   4"
+.PP
+Definition at line 28 of file channels.h.
+.SS "#define CM_MODERATED   8"
+.PP
+Definition at line 29 of file channels.h.
+.SS "#define CM_NOEXTERNAL   2"
+.PP
+Definition at line 27 of file channels.h.
+.SS "#define CM_PRIVATE   32"
+.PP
+Definition at line 31 of file channels.h.
+.SS "#define CM_SECRET   16"
+.PP
+Definition at line 30 of file channels.h.
+.SS "#define CM_TOPICLOCK   1"
+.PP
+Definition at line 26 of file channels.h.
 .SS "#define UCMODE_FOUNDER   16"
 .PP
-Definition at line 250 of file channels.h.
+Definition at line 215 of file channels.h.
 .SS "#define UCMODE_HOP   4"
 .PP
-Definition at line 248 of file channels.h.
+Definition at line 213 of file channels.h.
 .SS "#define UCMODE_OP   1"
 .PP
-Definition at line 246 of file channels.h.
+Definition at line 211 of file channels.h.
 .SS "#define UCMODE_PROTECT   8"
 .PP
-Definition at line 249 of file channels.h.
+Definition at line 214 of file channels.h.
 .SS "#define UCMODE_VOICE   2"
 .PP
-Definition at line 247 of file channels.h.
+Definition at line 212 of file channels.h.
 .SH "Typedef Documentation"
 .PP 
 .SS "typedef std::vector<\fBBanItem\fP> \fBBanList\fP"
 .PP
-Holds a complete ban list. Definition at line 80 of file channels.h.
+Holds a complete ban list. Definition at line 87 of file channels.h.
 .SS "typedef std::vector<\fBExemptItem\fP> \fBExemptList\fP"
 .PP
-Holds a complete exempt list. Definition at line 84 of file channels.h.
+Holds a complete exempt list. Definition at line 91 of file channels.h.
 .SS "typedef std::vector<\fBInviteItem\fP> \fBInviteList\fP"
 .PP
-Holds a complete invite list. Definition at line 88 of file channels.h.
+Holds a complete invite list. Definition at line 95 of file channels.h.
 .SH "Author"
 .PP 
 Generated automatically by Doxygen for InspIRCd from the source code.
diff --git a/docs/man/man3/chanrec.3 b/docs/man/man3/chanrec.3
index 532b54825..66a8cd14a 100644
--- a/docs/man/man3/chanrec.3
+++ b/docs/man/man3/chanrec.3
@@ -32,14 +32,6 @@ Inherits \fBExtensible\fP.
 .br
 .RI "\fIReturns the parameter for a custom mode on a channel. \fP"
 .ti -1c
-.RI "void \fBIncUserCounter\fP ()"
-.br
-.RI "\fIIncrement the channel 'user counter' The channel user counter is a reference counter which holds the number of users on the channel. \fP"
-.ti -1c
-.RI "void \fBDecUserCounter\fP ()"
-.br
-.RI "\fIDecrement the channel 'user counter' The channel user counter is a reference counter which holds the number of users on the channel. \fP"
-.ti -1c
 .RI "long \fBGetUserCounter\fP ()"
 .br
 .RI "\fIObtain the channel 'user counter' This returns the channel reference counter, which is initialized to 0 when the channel is created and incremented/decremented upon joins, parts quits and kicks. \fP"
@@ -75,10 +67,6 @@ Inherits \fBExtensible\fP.
 .br
 .RI "\fICustom modes for the channel. \fP"
 .ti -1c
-.RI "long \fBusers\fP"
-.br
-.RI "\fICount of users on the channel used for fast user counting. \fP"
-.ti -1c
 .RI "std::vector< char * > \fBinternal_userlist\fP"
 .br
 .RI "\fIUser list (casted to char*'s to stop forward declaration stuff) (chicken and egg scenario!). \fP"
@@ -99,7 +87,7 @@ Inherits \fBExtensible\fP.
 .br
 .RI "\fIThe last user to set the topic. \fP"
 .ti -1c
-.RI "long \fBlimit\fP"
+.RI "short int \fBlimit\fP"
 .br
 .RI "\fIContains the channel user limit. \fP"
 .ti -1c
@@ -107,29 +95,9 @@ Inherits \fBExtensible\fP.
 .br
 .RI "\fIContains the channel key. \fP"
 .ti -1c
-.RI "short int \fBtopiclock\fP"
-.br
-.RI "\fINonzero if the mode +t is set. \fP"
-.ti -1c
-.RI "short int \fBnoexternal\fP"
-.br
-.RI "\fINonzero if the mode +n is set. \fP"
-.ti -1c
-.RI "short int \fBinviteonly\fP"
-.br
-.RI "\fINonzero if the mode +i is set. \fP"
-.ti -1c
-.RI "short int \fBmoderated\fP"
-.br
-.RI "\fINonzero if the mode +m is set. \fP"
-.ti -1c
-.RI "short int \fBsecret\fP"
+.RI "char \fBbinarymodes\fP"
 .br
-.RI "\fINonzero if the mode +s is set. \fP"
-.ti -1c
-.RI "short int \fBc_private\fP"
-.br
-.RI "\fINonzero if the mode +p is set. \fP"
+.RI "\fIContains a bitmask of the CM_* builtin (RFC) binary mode symbols. \fP"
 .ti -1c
 .RI "\fBBanList\fP \fBbans\fP"
 .br
@@ -141,14 +109,14 @@ Holds all relevent information for a channel.
 
 This class represents a channel, and contains its name, modes, time created, topic, topic set time, etc, and an instance of the BanList type. 
 .PP
-Definition at line 94 of file channels.h.
+Definition at line 101 of file channels.h.
 .SH "Constructor & Destructor Documentation"
 .PP 
 .SS "chanrec::chanrec ()"
 .PP
 Creates a channel record and initialises it with default values. Definition at line 113 of file channels.cpp.
 .PP
-References c_private, created, custom_modes, internal_userlist, inviteonly, key, limit, moderated, name, noexternal, secret, setby, topic, topiclock, topicset, and users.
+References binarymodes, created, custom_modes, internal_userlist, key, limit, name, setby, topic, and topicset.
 .PP
 .nf
 114 {
@@ -157,59 +125,51 @@ References c_private, created, custom_modes, internal_userlist, inviteonly, key,
 117         strcpy(topic,'');
 118         strcpy(setby,'');
 119         strcpy(key,'');
-120         created = topicset = limit = users = 0;
-121         topiclock = noexternal = inviteonly = moderated = secret = c_private = false;
+120         created = topicset = limit = 0;
+121         binarymodes = 0;
 122         internal_userlist.clear();
 123 }
 .fi
 .SS "virtual chanrec::~\fBchanrec\fP ()\fC [inline, virtual]\fP"
 .PP
-Definition at line 240 of file channels.h.
+Definition at line 205 of file channels.h.
 .PP
 .nf
-240 { /* stub */ }
+205 { /* stub */ }
 .fi
 .SH "Member Function Documentation"
 .PP 
 .SS "void chanrec::AddUser (char * castuser)"
 .PP
-Add a user pointer to the internal reference list The data inserted into the reference list is a table as it is an arbitary pointer compared to other users by its memory address, as this is a very fast 32 or 64 bit integer comparison. Definition at line 215 of file channels.cpp.
+Add a user pointer to the internal reference list The data inserted into the reference list is a table as it is an arbitary pointer compared to other users by its memory address, as this is a very fast 32 or 64 bit integer comparison. Definition at line 207 of file channels.cpp.
 .PP
 References DEBUG, and internal_userlist.
 .PP
 .nf
-216 {
-217         internal_userlist.push_back(castuser);
-218         log(DEBUG,'Added casted user to channel's internal list');
-219 }
-.fi
-.SS "void chanrec::DecUserCounter ()"
-.PP
-Decrement the channel 'user counter' The channel user counter is a reference counter which holds the number of users on the channel. If it decremented to 0 then the channel is removed from the system. Modules may alter the reference count to hold channels open which have no users and would normally be deleted once empty.Definition at line 206 of file channels.cpp.
-.PP
-.nf
-207 {
-208 }
+208 {
+209         internal_userlist.push_back(castuser);
+210         log(DEBUG,'Added casted user to channel's internal list');
+211 }
 .fi
 .SS "void chanrec::DelUser (char * castuser)"
 .PP
-Delete a user pointer to the internal reference list The data removed from the reference list is a table as it is an arbitary pointer compared to other users by its memory address, as this is a very fast 32 or 64 bit integer comparison. Definition at line 221 of file channels.cpp.
+Delete a user pointer to the internal reference list The data removed from the reference list is a table as it is an arbitary pointer compared to other users by its memory address, as this is a very fast 32 or 64 bit integer comparison. Definition at line 213 of file channels.cpp.
 .PP
 References DEBUG, internal_userlist, and name.
 .PP
 .nf
-222 {
-223         for (std::vector<char*>::iterator a = internal_userlist.begin(); a < internal_userlist.end(); a++)
-224         {
-225                 if (*a == castuser)
-226                 {
-227                         log(DEBUG,'Removed casted user from channel's internal list');
-228                         internal_userlist.erase(a);
-229                         return;
-230                 }
-231         }
-232         log(DEBUG,'BUG BUG BUG! Attempt to remove an uncasted user from the internal list of %s!',name);
-233 }
+214 {
+215         for (std::vector<char*>::iterator a = internal_userlist.begin(); a < internal_userlist.end(); a++)
+216         {
+217                 if (*a == castuser)
+218                 {
+219                         log(DEBUG,'Removed casted user from channel's internal list');
+220                         internal_userlist.erase(a);
+221                         return;
+222                 }
+223         }
+224         log(DEBUG,'BUG BUG BUG! Attempt to remove an uncasted user from the internal list of %s!',name);
+225 }
 .fi
 .SS "std::string chanrec::GetModeParameter (char mode)"
 .PP
@@ -234,35 +194,27 @@ References custom_mode_params.
 .fi
 .SS "long chanrec::GetUserCounter ()"
 .PP
-Obtain the channel 'user counter' This returns the channel reference counter, which is initialized to 0 when the channel is created and incremented/decremented upon joins, parts quits and kicks. Definition at line 210 of file channels.cpp.
+Obtain the channel 'user counter' This returns the channel reference counter, which is initialized to 0 when the channel is created and incremented/decremented upon joins, parts quits and kicks. Definition at line 202 of file channels.cpp.
 .PP
 References internal_userlist.
 .PP
 .nf
-211 {
-212         return (this->internal_userlist.size());
-213 }
+203 {
+204         return (this->internal_userlist.size());
+205 }
 .fi
 .SS "std::vector< char * > * chanrec::GetUsers ()"
 .PP
-Obrain the internal reference list The internal reference list contains a list of userrec* cast to char*. These are used for rapid comparison to determine channel membership for PRIVMSG, NOTICE, QUIT, PART etc. The resulting pointer to the vector should be considered readonly and only modified via AddUser and DelUser.Definition at line 235 of file channels.cpp.
+Obrain the internal reference list The internal reference list contains a list of userrec* cast to char*. These are used for rapid comparison to determine channel membership for PRIVMSG, NOTICE, QUIT, PART etc. The resulting pointer to the vector should be considered readonly and only modified via AddUser and DelUser.Definition at line 227 of file channels.cpp.
 .PP
 References internal_userlist.
 .PP
 Referenced by Server::GetUsers().
 .PP
 .nf
-236 {
-237         return &internal_userlist;
-238 }
-.fi
-.SS "void chanrec::IncUserCounter ()"
-.PP
-Increment the channel 'user counter' The channel user counter is a reference counter which holds the number of users on the channel. If it decremented to 0 then the channel is removed from the system.Definition at line 202 of file channels.cpp.
-.PP
-.nf
-203 {
-204 }
+228 {
+229         return &internal_userlist;
+230 }
 .fi
 .SS "bool chanrec::IsCustomModeSet (char mode)"
 .PP
@@ -349,87 +301,57 @@ Referenced by SetCustomMode().
 .PP 
 .SS "\fBBanList\fP \fBchanrec::bans\fP"
 .PP
-The list of all bans set on the channel. Definition at line 168 of file channels.h.
-.SS "short int \fBchanrec::c_private\fP"
+The list of all bans set on the channel. Definition at line 149 of file channels.h.
+.SS "char \fBchanrec::binarymodes\fP"
 .PP
-Nonzero if the mode +p is set. This value cannot be set at the same time as \fBchanrec::secret\fPDefinition at line 164 of file channels.h.
+Contains a bitmask of the CM_* builtin (RFC) binary mode symbols. Definition at line 145 of file channels.h.
 .PP
 Referenced by chanrec().
 .SS "time_t \fBchanrec::created\fP"
 .PP
-Creation time. Definition at line 120 of file channels.h.
+Creation time. Definition at line 123 of file channels.h.
 .PP
 Referenced by chanrec().
 .SS "char \fBchanrec::custom_modes\fP[MAXMODES]"
 .PP
-Custom modes for the channel. Plugins may use this field in any way they see fit.Definition at line 103 of file channels.h.
+Custom modes for the channel. Plugins may use this field in any way they see fit.Definition at line 110 of file channels.h.
 .PP
 Referenced by chanrec(), and SetCustomMode().
 .SS "std::vector<char*> \fBchanrec::internal_userlist\fP"
 .PP
-User list (casted to char*'s to stop forward declaration stuff) (chicken and egg scenario!). Definition at line 112 of file channels.h.
+User list (casted to char*'s to stop forward declaration stuff) (chicken and egg scenario!). Definition at line 115 of file channels.h.
 .PP
 Referenced by AddUser(), chanrec(), DelUser(), GetUserCounter(), and GetUsers().
-.SS "short int \fBchanrec::inviteonly\fP"
-.PP
-Nonzero if the mode +i is set. Definition at line 150 of file channels.h.
-.PP
-Referenced by chanrec().
 .SS "char \fBchanrec::key\fP[32]"
 .PP
-Contains the channel key. If this value is an empty string, there is no channel key in place.Definition at line 138 of file channels.h.
+Contains the channel key. If this value is an empty string, there is no channel key in place.Definition at line 141 of file channels.h.
 .PP
 Referenced by chanrec().
-.SS "long \fBchanrec::limit\fP"
+.SS "short int \fBchanrec::limit\fP"
 .PP
-Contains the channel user limit. If this value is zero, there is no limit in place.Definition at line 133 of file channels.h.
-.PP
-Referenced by chanrec().
-.SS "short int \fBchanrec::moderated\fP"
-.PP
-Nonzero if the mode +m is set. Definition at line 154 of file channels.h.
+Contains the channel user limit. If this value is zero, there is no limit in place.Definition at line 136 of file channels.h.
 .PP
 Referenced by chanrec().
 .SS "char \fBchanrec::name\fP[CHANMAX]"
 .PP
-The channels name. Definition at line 99 of file channels.h.
+The channels name. Definition at line 106 of file channels.h.
 .PP
 Referenced by chanrec(), DelUser(), and Server::PseudoToUser().
-.SS "short int \fBchanrec::noexternal\fP"
-.PP
-Nonzero if the mode +n is set. Definition at line 146 of file channels.h.
-.PP
-Referenced by chanrec().
-.SS "short int \fBchanrec::secret\fP"
-.PP
-Nonzero if the mode +s is set. This value cannot be set at the same time as \fBchanrec::c_private\fPDefinition at line 159 of file channels.h.
-.PP
-Referenced by chanrec().
 .SS "char \fBchanrec::setby\fP[NICKMAX]"
 .PP
-The last user to set the topic. If this member is an empty string, no topic was ever set.Definition at line 128 of file channels.h.
+The last user to set the topic. If this member is an empty string, no topic was ever set.Definition at line 131 of file channels.h.
 .PP
 Referenced by chanrec(), and Server::PseudoToUser().
 .SS "char \fBchanrec::topic\fP[MAXBUF]"
 .PP
-Channel topic. If this is an empty string, no channel topic is set.Definition at line 117 of file channels.h.
+Channel topic. If this is an empty string, no channel topic is set.Definition at line 120 of file channels.h.
 .PP
 Referenced by chanrec(), and Server::PseudoToUser().
-.SS "short int \fBchanrec::topiclock\fP"
-.PP
-Nonzero if the mode +t is set. Definition at line 142 of file channels.h.
-.PP
-Referenced by chanrec().
 .SS "time_t \fBchanrec::topicset\fP"
 .PP
-Time topic was set. If no topic was ever set, this will be equal to \fBchanrec::created\fPDefinition at line 124 of file channels.h.
+Time topic was set. If no topic was ever set, this will be equal to \fBchanrec::created\fPDefinition at line 127 of file channels.h.
 .PP
 Referenced by chanrec(), and Server::PseudoToUser().
-.SS "long \fBchanrec::users\fP"
-.PP
-Count of users on the channel used for fast user counting. Definition at line 107 of file channels.h.
-.PP
-Referenced by chanrec().
 
 .SH "Author"
 .PP 
diff --git a/docs/man/man3/connection.3 b/docs/man/man3/connection.3
index ce72610f8..3ada34c2d 100644
--- a/docs/man/man3/connection.3
+++ b/docs/man/man3/connection.3
@@ -62,18 +62,14 @@ Inherited by \fBserverrec\fP, and \fBuserrec\fP.
 .br
 .RI "\fIFile descriptor of the connection. \fP"
 .ti -1c
-.RI "char \fBhost\fP [256]"
+.RI "char \fBhost\fP [160]"
 .br
 .RI "\fIHostname of connection. \fP"
 .ti -1c
-.RI "char \fBip\fP [32]"
+.RI "char \fBip\fP [16]"
 .br
 .RI "\fIIP of connection. \fP"
 .ti -1c
-.RI "char \fBinbuf\fP [MAXBUF]"
-.br
-.RI "\fIInbuf of connection. \fP"
-.ti -1c
 .RI "long \fBbytes_in\fP"
 .br
 .RI "\fIStats counter for bytes inbound. \fP"
@@ -98,14 +94,10 @@ Inherited by \fBserverrec\fP, and \fBuserrec\fP.
 .br
 .RI "\fIPort number For a userrec, this is the port they connected to the network on. \fP"
 .ti -1c
-.RI "int \fBregistered\fP"
+.RI "char \fBregistered\fP"
 .br
 .RI "\fIUsed by userrec to indicate the registration status of the connection. \fP"
 .ti -1c
-.RI "short int \fBstate\fP"
-.br
-.RI "\fIReserved for future use. \fP"
-.ti -1c
 .RI "time_t \fBlastping\fP"
 .br
 .RI "\fITime the connection was last pinged. \fP"
@@ -122,14 +114,6 @@ Inherited by \fBserverrec\fP, and \fBuserrec\fP.
 .br
 .RI "\fIUsed by PING checks with clients. \fP"
 .ti -1c
-.RI "char \fBinternal_addr\fP [MAXBUF]"
-.br
-.RI "\fIUnused, will be removed in a future alpha/beta. \fP"
-.ti -1c
-.RI "int \fBinternal_port\fP"
-.br
-.RI "\fIUnused, will be removed in a future alpha/beta. \fP"
-.ti -1c
 .RI "std::vector< \fBircd_connector\fP > \fBconnectors\fP"
 .br
 .RI "\fIWith a serverrec, this is a list of all established server connections. \fP"
@@ -172,27 +156,27 @@ Terminate a link to 'targethost' by calling the \fBircd_connector::CloseConnecti
 .PP 
 .SS "long \fBconnection::bytes_in\fP"
 .PP
-Stats counter for bytes inbound. Definition at line 231 of file connection.h.
+Stats counter for bytes inbound. Definition at line 227 of file connection.h.
 .PP
 Referenced by userrec::userrec().
 .SS "long \fBconnection::bytes_out\fP"
 .PP
-Stats counter for bytes outbound. Definition at line 235 of file connection.h.
+Stats counter for bytes outbound. Definition at line 231 of file connection.h.
 .PP
 Referenced by userrec::FlushWriteBuf(), and userrec::userrec().
 .SS "long \fBconnection::cmds_in\fP"
 .PP
-Stats counter for commands inbound. Definition at line 239 of file connection.h.
+Stats counter for commands inbound. Definition at line 235 of file connection.h.
 .PP
 Referenced by userrec::userrec().
 .SS "long \fBconnection::cmds_out\fP"
 .PP
-Stats counter for commands outbound. Definition at line 243 of file connection.h.
+Stats counter for commands outbound. Definition at line 239 of file connection.h.
 .PP
 Referenced by userrec::FlushWriteBuf(), and userrec::userrec().
 .SS "std::vector<\fBircd_connector\fP> \fBconnection::connectors\fP"
 .PP
-With a serverrec, this is a list of all established server connections. With a userrec this is unused.Definition at line 290 of file connection.h.
+With a serverrec, this is a list of all established server connections. With a userrec this is unused.Definition at line 274 of file connection.h.
 .SS "int \fBconnection::fd\fP"
 .PP
 File descriptor of the connection. Definition at line 215 of file connection.h.
@@ -200,63 +184,49 @@ File descriptor of the connection. Definition at line 215 of file connection.h.
 Referenced by ConfigReader::DumpErrors(), Server::PseudoToUser(), Server::SendTo(), serverrec::serverrec(), userrec::userrec(), and Server::UserToPseudo().
 .SS "bool \fBconnection::haspassed\fP"
 .PP
-True if server/user has authenticated, false if otherwise. Definition at line 247 of file connection.h.
+True if server/user has authenticated, false if otherwise. Definition at line 243 of file connection.h.
 .PP
 Referenced by userrec::userrec().
-.SS "char \fBconnection::host\fP[256]"
+.SS "char \fBconnection::host\fP[160]"
 .PP
 Hostname of connection. Not used if this is a serverrecDefinition at line 219 of file connection.h.
 .PP
 Referenced by userrec::GetFullRealHost(), Server::PseudoToUser(), userrec::userrec(), and Server::UserToPseudo().
 .SS "time_t \fBconnection::idle_lastmsg\fP"
 .PP
-Time that the connection last sent data, used to calculate idle time. Definition at line 273 of file connection.h.
+Time that the connection last sent data, used to calculate idle time. Definition at line 265 of file connection.h.
 .PP
 Referenced by userrec::userrec().
-.SS "char \fBconnection::inbuf\fP[MAXBUF]"
+.SS "char \fBconnection::ip\fP[16]"
 .PP
-Inbuf of connection. Only used for userrecDefinition at line 227 of file connection.h.
-.PP
-Referenced by userrec::userrec().
-.SS "char \fBconnection::internal_addr\fP[MAXBUF]"
-.PP
-Unused, will be removed in a future alpha/beta. Definition at line 281 of file connection.h.
-.SS "int \fBconnection::internal_port\fP"
-.PP
-Unused, will be removed in a future alpha/beta. Definition at line 285 of file connection.h.
-.SS "char \fBconnection::ip\fP[32]"
-.PP
-IP of connection. Reserved for future use.Definition at line 223 of file connection.h.
+IP of connection. Definition at line 223 of file connection.h.
 .PP
 Referenced by userrec::userrec().
 .SS "time_t \fBconnection::lastping\fP"
 .PP
-Time the connection was last pinged. Definition at line 265 of file connection.h.
+Time the connection was last pinged. Definition at line 257 of file connection.h.
 .PP
 Referenced by serverrec::serverrec(), and userrec::userrec().
 .SS "time_t \fBconnection::nping\fP"
 .PP
-Used by PING checks with clients. Definition at line 277 of file connection.h.
+Used by PING checks with clients. Definition at line 269 of file connection.h.
 .PP
 Referenced by userrec::userrec().
 .SS "int \fBconnection::port\fP"
 .PP
-Port number For a userrec, this is the port they connected to the network on. For a serverrec this is the current listening port of the serverrec object.Definition at line 253 of file connection.h.
+Port number For a userrec, this is the port they connected to the network on. For a serverrec this is the current listening port of the serverrec object.Definition at line 249 of file connection.h.
 .PP
 Referenced by userrec::userrec().
-.SS "int \fBconnection::registered\fP"
+.SS "char \fBconnection::registered\fP"
 .PP
-Used by userrec to indicate the registration status of the connection. Definition at line 257 of file connection.h.
+Used by userrec to indicate the registration status of the connection. Definition at line 253 of file connection.h.
 .PP
 Referenced by userrec::userrec().
 .SS "time_t \fBconnection::signon\fP"
 .PP
-Time the connection was created, set in the constructor. Definition at line 269 of file connection.h.
+Time the connection was created, set in the constructor. Definition at line 261 of file connection.h.
 .PP
 Referenced by serverrec::serverrec(), and userrec::userrec().
-.SS "short int \fBconnection::state\fP"
-.PP
-Reserved for future use. Definition at line 261 of file connection.h.
 
 .SH "Author"
 .PP 
diff --git a/docs/man/man3/ircd_connector.3 b/docs/man/man3/ircd_connector.3
index ba180d210..67e295c96 100644
--- a/docs/man/man3/ircd_connector.3
+++ b/docs/man/man3/ircd_connector.3
@@ -146,7 +146,7 @@ Inherits \fBExtensible\fP.
 .br
 .RI "\fI\fBServer\fP 'GECOS'. \fP"
 .ti -1c
-.RI "int \fBstate\fP"
+.RI "char \fBstate\fP"
 .br
 .RI "\fIState. \fP"
 .ti -1c
@@ -254,7 +254,7 @@ When MakeOutboundConnection is called, these public members are filled with the
 .SS "std::string \fBircd_connector::servername\fP\fC [private]\fP"
 .PP
 \fBServer\fP name. Definition at line 67 of file connection.h.
-.SS "int \fBircd_connector::state\fP\fC [private]\fP"
+.SS "char \fBircd_connector::state\fP\fC [private]\fP"
 .PP
 State. STATE_NOAUTH_INBOUND, STATE_NOAUTH_OUTBOUND STATE_SYNC, STATE_DISCONNECTED, STATE_CONNECTEDDefinition at line 76 of file connection.h.
 .SS "std::string \fBircd_connector::version\fP\fC [private]\fP"
diff --git a/docs/man/man3/modules.cpp.3 b/docs/man/man3/modules.cpp.3
index 680c95da6..b8a1f6769 100644
--- a/docs/man/man3/modules.cpp.3
+++ b/docs/man/man3/modules.cpp.3
@@ -111,6 +111,9 @@ modules.cpp \-
 .RI "typedef nspace::hash_map< in_addr, string *, nspace::hash< in_addr >, \fBInAddr_HashComp\fP > \fBaddress_cache\fP"
 .br
 .ti -1c
+.RI "typedef nspace::hash_map< std::string, \fBWhoWasUser\fP *, nspace::hash< string >, \fBStrHashComp\fP > \fBwhowas_hash\fP"
+.br
+.ti -1c
 .RI "typedef std::deque< \fBcommand_t\fP > \fBcommand_table\fP"
 .br
 .ti -1c
@@ -275,7 +278,7 @@ modules.cpp \-
 .RI "\fBchan_hash\fP \fBchanlist\fP"
 .br
 .ti -1c
-.RI "\fBuser_hash\fP \fBwhowas\fP"
+.RI "\fBwhowas_hash\fP \fBwhowas\fP"
 .br
 .ti -1c
 .RI "\fBcommand_table\fP \fBcmdlist\fP"
@@ -308,151 +311,154 @@ Definition at line 187 of file modules.cpp.
 Definition at line 186 of file modules.cpp.
 .SS "typedef std::deque<\fBcommand_t\fP> \fBcommand_table\fP"
 .PP
-Definition at line 188 of file modules.cpp.
+Definition at line 189 of file modules.cpp.
 .SS "typedef std::vector<\fBExtMode\fP> \fBExtModeList\fP"
 .PP
-Definition at line 214 of file modules.cpp.
+Definition at line 215 of file modules.cpp.
 .SS "typedef ExtModeList::iterator \fBExtModeListIter\fP"
 .PP
-Definition at line 215 of file modules.cpp.
+Definition at line 216 of file modules.cpp.
 .PP
 Referenced by ModeDefined(), ModeDefinedOff(), ModeDefinedOn(), ModeDefinedOper(), ModeIsListMode(), and ModeMakeList().
 .SS "typedef nspace::hash_map<std::string, \fBuserrec\fP*, nspace::hash<string>, \fBStrHashComp\fP> \fBuser_hash\fP"
 .PP
 Definition at line 185 of file modules.cpp.
+.SS "typedef nspace::hash_map<std::string, \fBWhoWasUser\fP*, nspace::hash<string>, \fBStrHashComp\fP> \fBwhowas_hash\fP"
+.PP
+Definition at line 188 of file modules.cpp.
 .SH "Function Documentation"
 .PP 
 .SS "bool DoAddExtendedMode (char modechar, int type, bool requires_oper, int params_on, int params_off)"
 .PP
-Definition at line 284 of file modules.cpp.
+Definition at line 285 of file modules.cpp.
 .PP
 References EMode, and ModeDefined().
 .PP
 Referenced by Server::AddExtendedListMode(), and Server::AddExtendedMode().
 .PP
 .nf
-285 {
-286         if (ModeDefined(modechar,type)) {
-287                 return false;
-288         }
-289         EMode.push_back(ExtMode(modechar,type,requires_oper,params_on,params_off));
-290         return true;
-291 }
+286 {
+287         if (ModeDefined(modechar,type)) {
+288                 return false;
+289         }
+290         EMode.push_back(ExtMode(modechar,type,requires_oper,params_on,params_off));
+291         return true;
+292 }
 .fi
 .SS "std::vector<\fBircd_module\fP*> factory (255)"
 .PP
 .SS "bool ModeDefined (char modechar, int type)"
 .PP
-Definition at line 221 of file modules.cpp.
+Definition at line 222 of file modules.cpp.
 .PP
 References EMode, and ExtModeListIter.
 .PP
 Referenced by DoAddExtendedMode().
 .PP
 .nf
-222 {
-223         for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++)
-224         {
-225                 if ((i->modechar == modechar) && (i->type == type))
-226                 {
-227                         return true;
-228                 }
-229         }
-230         return false;
-231 }
+223 {
+224         for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++)
+225         {
+226                 if ((i->modechar == modechar) && (i->type == type))
+227                 {
+228                         return true;
+229                 }
+230         }
+231         return false;
+232 }
 .fi
 .SS "int ModeDefinedOff (char modechar, int type)"
 .PP
-Definition at line 271 of file modules.cpp.
+Definition at line 272 of file modules.cpp.
 .PP
 References EMode, and ExtModeListIter.
 .PP
 .nf
-272 {
-273         for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++)
-274         {
-275                 if ((i->modechar == modechar) && (i->type == type))
-276                 {
-277                         return i->params_when_off;
-278                 }
-279         }
-280         return 0;
-281 }
+273 {
+274         for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++)
+275         {
+276                 if ((i->modechar == modechar) && (i->type == type))
+277                 {
+278                         return i->params_when_off;
+279                 }
+280         }
+281         return 0;
+282 }
 .fi
 .SS "int ModeDefinedOn (char modechar, int type)"
 .PP
-Definition at line 258 of file modules.cpp.
+Definition at line 259 of file modules.cpp.
 .PP
 References EMode, and ExtModeListIter.
 .PP
 .nf
-259 {
-260         for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++)
-261         {
-262                 if ((i->modechar == modechar) && (i->type == type))
-263                 {
-264                         return i->params_when_on;
-265                 }
-266         }
-267         return 0;
-268 }
+260 {
+261         for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++)
+262         {
+263                 if ((i->modechar == modechar) && (i->type == type))
+264                 {
+265                         return i->params_when_on;
+266                 }
+267         }
+268         return 0;
+269 }
 .fi
 .SS "bool ModeDefinedOper (char modechar, int type)"
 .PP
-Definition at line 245 of file modules.cpp.
+Definition at line 246 of file modules.cpp.
 .PP
 References EMode, and ExtModeListIter.
 .PP
 .nf
-246 {
-247         for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++)
-248         {
-249                 if ((i->modechar == modechar) && (i->type == type) && (i->needsoper == true))
-250                 {
-251                         return true;
-252                 }
-253         }
-254         return false;
-255 }
+247 {
+248         for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++)
+249         {
+250                 if ((i->modechar == modechar) && (i->type == type) && (i->needsoper == true))
+251                 {
+252                         return true;
+253                 }
+254         }
+255         return false;
+256 }
 .fi
 .SS "bool ModeIsListMode (char modechar, int type)"
 .PP
-Definition at line 233 of file modules.cpp.
+Definition at line 234 of file modules.cpp.
 .PP
 References EMode, and ExtModeListIter.
 .PP
 .nf
-234 {
-235         for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++)
-236         {
-237                 if ((i->modechar == modechar) && (i->type == type) && (i->list == true))
-238                 {
-239                         return true;
-240                 }
-241         }
-242         return false;
-243 }
+235 {
+236         for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++)
+237         {
+238                 if ((i->modechar == modechar) && (i->type == type) && (i->list == true))
+239                 {
+240                         return true;
+241                 }
+242         }
+243         return false;
+244 }
 .fi
 .SS "void ModeMakeList (char modechar)"
 .PP
-Definition at line 294 of file modules.cpp.
+Definition at line 295 of file modules.cpp.
 .PP
 References EMode, ExtModeListIter, and MT_CHANNEL.
 .PP
 Referenced by Server::AddExtendedListMode().
 .PP
 .nf
-295 {
-296         for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++)
-297         {
-298                 if ((i->modechar == modechar) && (i->type == MT_CHANNEL))
-299                 {
-300                         i->list = true;
-301                         return;
-302                 }
-303         }
-304         return;
-305 }
+296 {
+297         for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++)
+298         {
+299                 if ((i->modechar == modechar) && (i->type == MT_CHANNEL))
+300                 {
+301                         i->list = true;
+302                         return;
+303                 }
+304         }
+305         return;
+306 }
 .fi
 .SS "std::vector<\fBModule\fP*> modules (255)"
 .PP
@@ -475,13 +481,13 @@ Definition at line 112 of file modules.cpp.
 Definition at line 106 of file modules.cpp.
 .SS "\fBchan_hash\fP \fBchanlist\fP"
 .PP
-Definition at line 192 of file modules.cpp.
+Definition at line 193 of file modules.cpp.
 .SS "\fBuser_hash\fP \fBclientlist\fP"
 .PP
-Definition at line 191 of file modules.cpp.
+Definition at line 192 of file modules.cpp.
 .SS "\fBcommand_table\fP \fBcmdlist\fP"
 .PP
-Definition at line 194 of file modules.cpp.
+Definition at line 195 of file modules.cpp.
 .SS "std::stringstream \fBconfig_f\fP"
 .PP
 Definition at line 113 of file modules.cpp.
@@ -502,7 +508,7 @@ Definition at line 86 of file modules.cpp.
 Definition at line 92 of file modules.cpp.
 .SS "\fBExtModeList\fP \fBEMode\fP"
 .PP
-Definition at line 218 of file modules.cpp.
+Definition at line 219 of file modules.cpp.
 .PP
 Referenced by DoAddExtendedMode(), ModeDefined(), ModeDefinedOff(), ModeDefinedOn(), ModeDefinedOper(), ModeIsListMode(), and ModeMakeList().
 .SS "std::vector<\fBircd_module\fP*> factory"
@@ -518,7 +524,7 @@ Definition at line 119 of file modules.cpp.
 Referenced by Server::FindDescriptor(), and Server::PseudoToUser().
 .SS "\fBaddress_cache\fP \fBIP\fP"
 .PP
-Definition at line 197 of file modules.cpp.
+Definition at line 198 of file modules.cpp.
 .SS "char \fBlist\fP[MAXBUF]"
 .PP
 Definition at line 90 of file modules.cpp.
@@ -536,7 +542,7 @@ Definition at line 100 of file modules.cpp.
 Definition at line 115 of file modules.cpp.
 .SS "int \fBMODCOUNT\fP = -1"
 .PP
-Definition at line 1066 of file modules.cpp.
+Definition at line 1067 of file modules.cpp.
 .SS "std::vector<std::string> \fBmodule_names\fP"
 .PP
 Definition at line 104 of file modules.cpp.
@@ -545,7 +551,7 @@ Definition at line 104 of file modules.cpp.
 Definition at line 74 of file modules.cpp.
 .SS "\fBfile_cache\fP \fBMOTD\fP"
 .PP
-Definition at line 195 of file modules.cpp.
+Definition at line 196 of file modules.cpp.
 .SS "char \fBmotd\fP[MAXBUF]"
 .PP
 Definition at line 88 of file modules.cpp.
@@ -572,7 +578,7 @@ Definition at line 91 of file modules.cpp.
 Definition at line 87 of file modules.cpp.
 .SS "\fBfile_cache\fP \fBRULES\fP"
 .PP
-Definition at line 196 of file modules.cpp.
+Definition at line 197 of file modules.cpp.
 .SS "char \fBrules\fP[MAXBUF]"
 .PP
 Definition at line 89 of file modules.cpp.
@@ -591,9 +597,9 @@ Definition at line 98 of file modules.cpp.
 .SS "time_t \fBTIME\fP"
 .PP
 Definition at line 77 of file modules.cpp.
-.SS "\fBuser_hash\fP \fBwhowas\fP"
+.SS "\fBwhowas_hash\fP \fBwhowas\fP"
 .PP
-Definition at line 193 of file modules.cpp.
+Definition at line 194 of file modules.cpp.
 .SS "int \fBWHOWAS_MAX\fP"
 .PP
 Definition at line 96 of file modules.cpp.
diff --git a/docs/man/man3/ucrec.3 b/docs/man/man3/ucrec.3
index 941107fdd..a048470b7 100644
--- a/docs/man/man3/ucrec.3
+++ b/docs/man/man3/ucrec.3
@@ -26,7 +26,7 @@ Inherits \fBclassbase\fP.
 
 .in +1c
 .ti -1c
-.RI "long \fBuc_modes\fP"
+.RI "char \fBuc_modes\fP"
 .br
 .RI "\fIContains a bitmask of the UCMODE_OP ... \fP"
 .ti -1c
@@ -40,33 +40,33 @@ Holds a user's modes on a channel This class associates a users privilages with
 
 The uc_modes member holds a bitmask of which privilages the user has on the channel, such as op, voice, etc. 
 .PP
-Definition at line 257 of file channels.h.
+Definition at line 222 of file channels.h.
 .SH "Constructor & Destructor Documentation"
 .PP 
 .SS "ucrec::ucrec ()\fC [inline]\fP"
 .PP
-Definition at line 270 of file channels.h.
+Definition at line 235 of file channels.h.
 .PP
 .nf
-270 { /* stub */ }
+235 { /* stub */ }
 .fi
 .SS "virtual ucrec::~\fBucrec\fP ()\fC [inline, virtual]\fP"
 .PP
-Definition at line 271 of file channels.h.
+Definition at line 236 of file channels.h.
 .PP
 .nf
-271 { /* stub */ }
+236 { /* stub */ }
 .fi
 .SH "Member Data Documentation"
 .PP 
 .SS "\fBchanrec\fP* \fBucrec::channel\fP"
 .PP
-Points to the channel record where the given modes apply. If the record is not in use, this value will be NULL.Definition at line 268 of file channels.h.
+Points to the channel record where the given modes apply. If the record is not in use, this value will be NULL.Definition at line 233 of file channels.h.
 .PP
 Referenced by Server::PseudoToUser(), and userrec::userrec().
-.SS "long \fBucrec::uc_modes\fP"
+.SS "char \fBucrec::uc_modes\fP"
 .PP
-Contains a bitmask of the UCMODE_OP ... UCMODE_FOUNDER values. If this value is zero, the user has no privilages upon the channel.Definition at line 263 of file channels.h.
+Contains a bitmask of the UCMODE_OP ... UCMODE_FOUNDER values. If this value is zero, the user has no privilages upon the channel.Definition at line 228 of file channels.h.
 .PP
 Referenced by userrec::userrec().
 
diff --git a/docs/man/man3/userrec.3 b/docs/man/man3/userrec.3
index e1951f22a..c5564873a 100644
--- a/docs/man/man3/userrec.3
+++ b/docs/man/man3/userrec.3
@@ -86,11 +86,11 @@ Inherits \fBconnection\fP.
 .br
 .RI "\fIThe users nickname. \fP"
 .ti -1c
-.RI "char \fBident\fP [64]"
+.RI "char \fBident\fP [16]"
 .br
 .RI "\fIThe users ident reply. \fP"
 .ti -1c
-.RI "char \fBdhost\fP [256]"
+.RI "char \fBdhost\fP [160]"
 .br
 .RI "\fIThe host displayed to non-opers (used for cloaking etc). \fP"
 .ti -1c
@@ -121,7 +121,7 @@ Inherits \fBconnection\fP.
 .br
 .RI "\fINumber of lines the user can place into the buffer (up to the global NetBufferSize bytes) before they are disconnected for excess flood. \fP"
 .ti -1c
-.RI "unsigned long \fBtimeout\fP"
+.RI "unsigned int \fBtimeout\fP"
 .br
 .RI "\fINumber of seconds this user is given to send USER/NICK If they do not send their details in this time limit they will be disconnected. \fP"
 .ti -1c
@@ -133,7 +133,7 @@ Inherits \fBconnection\fP.
 .br
 .RI "\fITrue when \fBDNS\fP lookups are completed. \fP"
 .ti -1c
-.RI "unsigned long \fBpingmax\fP"
+.RI "unsigned int \fBpingmax\fP"
 .br
 .RI "\fINumber of seconds between PINGs for this user (set from <connect:allow> tag. \fP"
 .ti -1c
@@ -149,7 +149,7 @@ Inherits \fBconnection\fP.
 .br
 .RI "\fIUser's send queue. \fP"
 .ti -1c
-.RI "long \fBlines_in\fP"
+.RI "int \fBlines_in\fP"
 .br
 .RI "\fIFlood counters. \fP"
 .ti -1c
@@ -191,7 +191,7 @@ Definition at line 108 of file users.h.
 .PP
 Definition at line 28 of file users.cpp.
 .PP
-References awaymsg, connection::bytes_in, connection::bytes_out, ucrec::channel, chans, connection::cmds_in, connection::cmds_out, dhost, dns_done, connection::fd, flood, fullname, connection::haspassed, connection::host, ident, connection::idle_lastmsg, connection::inbuf, invites, connection::ip, connection::lastping, lines_in, modes, nick, connection::nping, oper, connection::port, recvq, connection::registered, reset_due, result, sendq, server, connection::signon, TIME, timeout, and ucrec::uc_modes.
+References awaymsg, connection::bytes_in, connection::bytes_out, ucrec::channel, chans, connection::cmds_in, connection::cmds_out, dhost, dns_done, connection::fd, flood, fullname, connection::haspassed, connection::host, ident, connection::idle_lastmsg, invites, connection::ip, connection::lastping, lines_in, modes, nick, connection::nping, oper, connection::port, recvq, connection::registered, reset_due, result, sendq, server, connection::signon, TIME, timeout, and ucrec::uc_modes.
 .PP
 .nf
 29 {
@@ -204,26 +204,25 @@ References awaymsg, connection::bytes_in, connection::bytes_out, ucrec::channel,
 36         strcpy(dhost,'');
 37         strcpy(fullname,'');
 38         strcpy(modes,'');
-39         strcpy(inbuf,'');
-40         strcpy(server,'');
-41         strcpy(awaymsg,'');
-42         strcpy(oper,'');
-43         reset_due = TIME;
-44         lines_in = 0;
-45         fd = lastping = signon = idle_lastmsg = nping = registered = 0;
-46         flood = port = bytes_in = bytes_out = cmds_in = cmds_out = 0;
-47         haspassed = false;
-48         dns_done = false;
-49         recvq = '';
-50         sendq = '';
-51         strcpy(result,'');
-52         for (int i = 0; i < MAXCHANS; i++)
-53         {
-54                 this->chans[i].channel = NULL;
-55                 this->chans[i].uc_modes = 0;
-56         }
-57         invites.clear();
-58 }
+39         strcpy(server,'');
+40         strcpy(awaymsg,'');
+41         strcpy(oper,'');
+42         reset_due = TIME;
+43         lines_in = 0;
+44         fd = lastping = signon = idle_lastmsg = nping = registered = 0;
+45         flood = port = bytes_in = bytes_out = cmds_in = cmds_out = 0;
+46         haspassed = false;
+47         dns_done = false;
+48         recvq = '';
+49         sendq = '';
+50         strcpy(result,'');
+51         for (int i = 0; i < MAXCHANS; i++)
+52         {
+53                 this->chans[i].channel = NULL;
+54                 this->chans[i].uc_modes = 0;
+55         }
+56         invites.clear();
+57 }
 .fi
 .SS "virtual userrec::~\fBuserrec\fP ()\fC [inline, virtual]\fP"
 .PP
@@ -236,305 +235,305 @@ Definition at line 222 of file users.h.
 .PP 
 .SS "bool userrec::AddBuffer (std::string a)"
 .PP
-This method adds data to the buffer of the user. The buffer can grow to any size within limits of the available memory, managed by the size of a std::string, however if any individual line in the buffer grows over 600 bytes in length (which is 88 chars over the RFC-specified limit per line) then the method will return false and the text will not be inserted.Definition at line 170 of file users.cpp.
+This method adds data to the buffer of the user. The buffer can grow to any size within limits of the available memory, managed by the size of a std::string, however if any individual line in the buffer grows over 600 bytes in length (which is 88 chars over the RFC-specified limit per line) then the method will return false and the text will not be inserted.Definition at line 169 of file users.cpp.
 .PP
 References recvq, recvqmax, and SetWriteError().
 .PP
 .nf
-171 {
-172         std::string b = '';
-173         for (int i = 0; i < a.length(); i++)
-174                 if ((a[i] != '\r') && (a[i] != '\0') && (a[i] != 7))
-175                         b = b + a[i];
-176         std::stringstream stream(recvq);
-177         stream << b;
-178         recvq = stream.str();
-179         int i = 0;
-180         // count the size of the first line in the buffer.
-181         while (i < recvq.length())
-182         {
-183                 if (recvq[i++] == '\n')
-184                         break;
-185         }
-186         if (recvq.length() > this->recvqmax)
-187         {
-188                 this->SetWriteError('RecvQ exceeded');
-189                 WriteOpers('*** User %s RecvQ of %d exceeds connect class maximum of %d',this->nick,recvq.length(),this->recvqmax);
-190         }
-191         // return false if we've had more than 600 characters WITHOUT
-192         // a carriage return (this is BAD, drop the socket)
-193         return (i < 600);
-194 }
+170 {
+171         std::string b = '';
+172         for (int i = 0; i < a.length(); i++)
+173                 if ((a[i] != '\r') && (a[i] != '\0') && (a[i] != 7))
+174                         b = b + a[i];
+175         std::stringstream stream(recvq);
+176         stream << b;
+177         recvq = stream.str();
+178         int i = 0;
+179         // count the size of the first line in the buffer.
+180         while (i < recvq.length())
+181         {
+182                 if (recvq[i++] == '\n')
+183                         break;
+184         }
+185         if (recvq.length() > this->recvqmax)
+186         {
+187                 this->SetWriteError('RecvQ exceeded');
+188                 WriteOpers('*** User %s RecvQ of %d exceeds connect class maximum of %d',this->nick,recvq.length(),this->recvqmax);
+189         }
+190         // return false if we've had more than 600 characters WITHOUT
+191         // a carriage return (this is BAD, drop the socket)
+192         return (i < 600);
+193 }
 .fi
 .SS "void userrec::AddWriteBuf (std::string data)"
 .PP
-Adds to the user's write buffer. You may add any amount of text up to this users sendq value, if you exceed the sendq value, \fBSetWriteError()\fP will be called to set the users error string to 'SendQ exceeded', and further buffer adds will be dropped.Definition at line 226 of file users.cpp.
+Adds to the user's write buffer. You may add any amount of text up to this users sendq value, if you exceed the sendq value, \fBSetWriteError()\fP will be called to set the users error string to 'SendQ exceeded', and further buffer adds will be dropped.Definition at line 225 of file users.cpp.
 .PP
 References GetWriteError(), sendq, sendqmax, and SetWriteError().
 .PP
 .nf
-227 {
-228         if (this->GetWriteError() != '')
-229                 return;
-230         if (sendq.length() + data.length() > this->sendqmax)
-231         {
-232                 WriteOpers('*** User %s SendQ of %d exceeds connect class maximum of %d',this->nick,sendq.length() + data.length(),this->sendqmax);
-233                 this->SetWriteError('SendQ exceeded');
-234                 return;
-235         }
-236         std::stringstream stream;
-237         stream << sendq << data;
-238         sendq = stream.str();
-239 }
+226 {
+227         if (this->GetWriteError() != '')
+228                 return;
+229         if (sendq.length() + data.length() > this->sendqmax)
+230         {
+231                 WriteOpers('*** User %s SendQ of %d exceeds connect class maximum of %d',this->nick,sendq.length() + data.length(),this->sendqmax);
+232                 this->SetWriteError('SendQ exceeded');
+233                 return;
+234         }
+235         std::stringstream stream;
+236         stream << sendq << data;
+237         sendq = stream.str();
+238 }
 .fi
 .SS "bool userrec::BufferIsReady ()"
 .PP
-This method returns true if the buffer contains at least one carriage return character (e.g. one complete line may be read)Definition at line 196 of file users.cpp.
+This method returns true if the buffer contains at least one carriage return character (e.g. one complete line may be read)Definition at line 195 of file users.cpp.
 .PP
 References recvq.
 .PP
 .nf
-197 {
-198         for (int i = 0; i < recvq.length(); i++)
-199                 if (recvq[i] == '\n')
-200                         return true;
-201         return false;
-202 }
+196 {
+197         for (int i = 0; i < recvq.length(); i++)
+198                 if (recvq[i] == '\n')
+199                         return true;
+200         return false;
+201 }
 .fi
 .SS "void userrec::ClearBuffer ()"
 .PP
-This function clears the entire buffer by setting it to an empty string. Definition at line 204 of file users.cpp.
+This function clears the entire buffer by setting it to an empty string. Definition at line 203 of file users.cpp.
 .PP
 References recvq.
 .PP
 Referenced by Server::PseudoToUser(), and Server::UserToPseudo().
 .PP
 .nf
-205 {
-206         recvq = '';
-207 }
+204 {
+205         recvq = '';
+206 }
 .fi
 .SS "void userrec::FlushWriteBuf ()"
 .PP
-Flushes as much of the user's buffer to the file descriptor as possible. This function may not always flush the entire buffer, rather instead as much of it as it possibly can. If the send() call fails to send the entire buffer, the buffer position is advanced forwards and the rest of the data sent at the next call to this method.Definition at line 242 of file users.cpp.
+Flushes as much of the user's buffer to the file descriptor as possible. This function may not always flush the entire buffer, rather instead as much of it as it possibly can. If the send() call fails to send the entire buffer, the buffer position is advanced forwards and the rest of the data sent at the next call to this method.Definition at line 241 of file users.cpp.
 .PP
 References connection::bytes_out, connection::cmds_out, sendq, and SetWriteError().
 .PP
 .nf
-243 {
-244         if (sendq.length())
-245         {
-246                 char* tb = (char*)this->sendq.c_str();
-247                 int n_sent = write(this->fd,tb,this->sendq.length());
-248                 if (n_sent == -1)
-249                 {
-250                         this->SetWriteError(strerror(errno));
-251                 }
-252                 else
-253                 {
-254                         // advance the queue
-255                         tb += n_sent;
-256                         this->sendq = tb;
-257                         // update the user's stats counters
-258                         this->bytes_out += n_sent;
-259                         this->cmds_out++;
-260                 }
-261         }
-262 }
+242 {
+243         if (sendq.length())
+244         {
+245                 char* tb = (char*)this->sendq.c_str();
+246                 int n_sent = write(this->fd,tb,this->sendq.length());
+247                 if (n_sent == -1)
+248                 {
+249                         this->SetWriteError(strerror(errno));
+250                 }
+251                 else
+252                 {
+253                         // advance the queue
+254                         tb += n_sent;
+255                         this->sendq = tb;
+256                         // update the user's stats counters
+257                         this->bytes_out += n_sent;
+258                         this->cmds_out++;
+259                 }
+260         }
+261 }
 .fi
 .SS "std::string userrec::GetBuffer ()"
 .PP
-This method returns the first available string at the tail end of the buffer and advances the tail end of the buffer past the string. This means it is a one way operation in a similar way to strtok(), and multiple calls return multiple lines if they are available. The results of this function if there are no lines to be read are unknown, always use \fBBufferIsReady()\fP to check if it is ok to read the buffer before calling \fBGetBuffer()\fP.Definition at line 209 of file users.cpp.
+This method returns the first available string at the tail end of the buffer and advances the tail end of the buffer past the string. This means it is a one way operation in a similar way to strtok(), and multiple calls return multiple lines if they are available. The results of this function if there are no lines to be read are unknown, always use \fBBufferIsReady()\fP to check if it is ok to read the buffer before calling \fBGetBuffer()\fP.Definition at line 208 of file users.cpp.
 .PP
 References recvq.
 .PP
 .nf
-210 {
-211         if (recvq == '')
-212                 return '';
-213         char* line = (char*)recvq.c_str();
-214         std::string ret = '';
-215         while ((*line != '\n') && (strlen(line)))
-216         {
-217                 ret = ret + *line;
-218                 line++;
-219         }
-220         if ((*line == '\n') || (*line == '\r'))
-221                 line++;
-222         recvq = line;
-223         return ret;
-224 }
+209 {
+210         if (recvq == '')
+211                 return '';
+212         char* line = (char*)recvq.c_str();
+213         std::string ret = '';
+214         while ((*line != '\n') && (strlen(line)))
+215         {
+216                 ret = ret + *line;
+217                 line++;
+218         }
+219         if ((*line == '\n') || (*line == '\r'))
+220                 line++;
+221         recvq = line;
+222         return ret;
+223 }
 .fi
 .SS "char * userrec::GetFullHost ()\fC [virtual]\fP"
 .PP
-Returns the full displayed host of the user This member function returns the hostname of the user as seen by other users on the server, in nick!identhost form. Definition at line 62 of file users.cpp.
+Returns the full displayed host of the user This member function returns the hostname of the user as seen by other users on the server, in nick!identhost form. Definition at line 61 of file users.cpp.
 .PP
 References dhost, ident, nick, and result.
 .PP
 .nf
-63 {
-64         snprintf(result,MAXBUF,'%s!%s@%s',nick,ident,dhost);
-65         return result;
-66 }
+62 {
+63         snprintf(result,MAXBUF,'%s!%s@%s',nick,ident,dhost);
+64         return result;
+65 }
 .fi
 .SS "char * userrec::GetFullRealHost ()\fC [virtual]\fP"
 .PP
-Returns the full real host of the user This member function returns the hostname of the user as seen by other users on the server, in nick!identhost form. If any form of hostname cloaking is in operation, e.g. through a module, then this method will ignore it and return the true hostname.Definition at line 69 of file users.cpp.
+Returns the full real host of the user This member function returns the hostname of the user as seen by other users on the server, in nick!identhost form. If any form of hostname cloaking is in operation, e.g. through a module, then this method will ignore it and return the true hostname.Definition at line 68 of file users.cpp.
 .PP
 References connection::host, ident, nick, and result.
 .PP
 .nf
-70 {
-71         snprintf(result,MAXBUF,'%s!%s@%s',nick,ident,host);
-72         return result;
-73 }
+69 {
+70         snprintf(result,MAXBUF,'%s!%s@%s',nick,ident,host);
+71         return result;
+72 }
 .fi
 .SS "std::string userrec::GetWriteError ()"
 .PP
-Returns the write error which last occured on this connection or an empty string if none occured. Definition at line 272 of file users.cpp.
+Returns the write error which last occured on this connection or an empty string if none occured. Definition at line 271 of file users.cpp.
 .PP
 References WriteError.
 .PP
 Referenced by AddWriteBuf().
 .PP
 .nf
-273 {
-274         return this->WriteError;
-275 }
+272 {
+273         return this->WriteError;
+274 }
 .fi
 .SS "bool userrec::HasPermission (char * command)"
 .PP
-Returns true or false for if a user can execute a privilaged oper command. This is done by looking up their oper type from \fBuserrec::oper\fP, then referencing this to their oper classes and checking the commands they can execute.Definition at line 118 of file users.cpp.
+Returns true or false for if a user can execute a privilaged oper command. This is done by looking up their oper type from \fBuserrec::oper\fP, then referencing this to their oper classes and checking the commands they can execute.Definition at line 117 of file users.cpp.
 .PP
 References config_f, and DEBUG.
 .PP
 .nf
-119 {
-120         char TypeName[MAXBUF],Classes[MAXBUF],ClassName[MAXBUF],CommandList[MAXBUF];
-121         char* mycmd;
-122         char* savept;
-123         char* savept2;
-124         
-125         // are they even an oper at all?
-126         if (strchr(this->modes,'o'))
-127         {
-128                 log(DEBUG,'*** HasPermission: %s is an oper',this->nick);
-129                 for (int j =0; j < ConfValueEnum('type',&config_f); j++)
-130                 {
-131                         ConfValue('type','name',j,TypeName,&config_f);
-132                         if (!strcmp(TypeName,this->oper))
-133                         {
-134                                 log(DEBUG,'*** HasPermission: %s is an oper of type '%s'',this->nick,this->oper);
-135                                 ConfValue('type','classes',j,Classes,&config_f);
-136                                 char* myclass = strtok_r(Classes,' ',&savept);
-137                                 while (myclass)
-138                                 {
-139                                         log(DEBUG,'*** HasPermission: checking classtype '%s'',myclass);
-140                                         for (int k =0; k < ConfValueEnum('class',&config_f); k++)
-141                                         {
-142                                                 ConfValue('class','name',k,ClassName,&config_f);
-143                                                 if (!strcmp(ClassName,myclass))
-144                                                 {
-145                                                         ConfValue('class','commands',k,CommandList,&config_f);
-146                                                         log(DEBUG,'*** HasPermission: found class named %s with commands: '%s'',ClassName,CommandList);
+118 {
+119         char TypeName[MAXBUF],Classes[MAXBUF],ClassName[MAXBUF],CommandList[MAXBUF];
+120         char* mycmd;
+121         char* savept;
+122         char* savept2;
+123         
+124         // are they even an oper at all?
+125         if (strchr(this->modes,'o'))
+126         {
+127                 log(DEBUG,'*** HasPermission: %s is an oper',this->nick);
+128                 for (int j =0; j < ConfValueEnum('type',&config_f); j++)
+129                 {
+130                         ConfValue('type','name',j,TypeName,&config_f);
+131                         if (!strcmp(TypeName,this->oper))
+132                         {
+133                                 log(DEBUG,'*** HasPermission: %s is an oper of type '%s'',this->nick,this->oper);
+134                                 ConfValue('type','classes',j,Classes,&config_f);
+135                                 char* myclass = strtok_r(Classes,' ',&savept);
+136                                 while (myclass)
+137                                 {
+138                                         log(DEBUG,'*** HasPermission: checking classtype '%s'',myclass);
+139                                         for (int k =0; k < ConfValueEnum('class',&config_f); k++)
+140                                         {
+141                                                 ConfValue('class','name',k,ClassName,&config_f);
+142                                                 if (!strcmp(ClassName,myclass))
+143                                                 {
+144                                                         ConfValue('class','commands',k,CommandList,&config_f);
+145                                                         log(DEBUG,'*** HasPermission: found class named %s with commands: '%s'',ClassName,CommandList);
+146                                                         
 147                                                         
-148                                                         
-149                                                         mycmd = strtok_r(CommandList,' ',&savept2);
-150                                                         while (mycmd)
-151                                                         {
-152                                                                 if (!strcasecmp(mycmd,command))
-153                                                                 {
-154                                                                         log(DEBUG,'*** Command %s found, returning true',command);
-155                                                                         return true;
-156                                                                 }
-157                                                                 mycmd = strtok_r(NULL,' ',&savept2);
-158                                                         }
-159                                                 }
-160                                         }
-161                                         myclass = strtok_r(NULL,' ',&savept);
-162                                 }
-163                         }
-164                 }
-165         }
-166         return false;
-167 }
+148                                                         mycmd = strtok_r(CommandList,' ',&savept2);
+149                                                         while (mycmd)
+150                                                         {
+151                                                                 if (!strcasecmp(mycmd,command))
+152                                                                 {
+153                                                                         log(DEBUG,'*** Command %s found, returning true',command);
+154                                                                         return true;
+155                                                                 }
+156                                                                 mycmd = strtok_r(NULL,' ',&savept2);
+157                                                         }
+158                                                 }
+159                                         }
+160                                         myclass = strtok_r(NULL,' ',&savept);
+161                                 }
+162                         }
+163                 }
+164         }
+165         return false;
+166 }
 .fi
 .SS "void userrec::InviteTo (char * channel)\fC [virtual]\fP"
 .PP
-Adds a channel to a users invite list (invites them to a channel). Definition at line 89 of file users.cpp.
+Adds a channel to a users invite list (invites them to a channel). Definition at line 88 of file users.cpp.
 .PP
 References Invited::channel, and invites.
 .PP
 .nf
-90 {
-91         Invited i;
-92         strlcpy(i.channel,channel,CHANMAX);
-93         invites.push_back(i);
-94 }
+89 {
+90         Invited i;
+91         strlcpy(i.channel,channel,CHANMAX);
+92         invites.push_back(i);
+93 }
 .fi
 .SS "bool userrec::IsInvited (char * channel)\fC [virtual]\fP"
 .PP
-Returns true if a user is invited to a channel. Definition at line 75 of file users.cpp.
+Returns true if a user is invited to a channel. Definition at line 74 of file users.cpp.
 .PP
 References invites.
 .PP
 .nf
-76 {
-77         for (InvitedList::iterator i = invites.begin(); i != invites.end(); i++)
-78         {
-79                 if (i->channel) {
-80                         if (!strcasecmp(i->channel,channel))
-81                         {
-82                                 return true;
-83                         }
-84                 }
-85         }
-86         return false;
-87 }
+75 {
+76         for (InvitedList::iterator i = invites.begin(); i != invites.end(); i++)
+77         {
+78                 if (i->channel) {
+79                         if (!strcasecmp(i->channel,channel))
+80                         {
+81                                 return true;
+82                         }
+83                 }
+84         }
+85         return false;
+86 }
 .fi
 .SS "void userrec::RemoveInvite (char * channel)\fC [virtual]\fP"
 .PP
-Removes a channel from a users invite list. This member function is called on successfully joining an invite only channel to which the user has previously been invited, to clear the invitation.Definition at line 96 of file users.cpp.
+Removes a channel from a users invite list. This member function is called on successfully joining an invite only channel to which the user has previously been invited, to clear the invitation.Definition at line 95 of file users.cpp.
 .PP
 References DEBUG, and invites.
 .PP
 .nf
-97 {
-98         log(DEBUG,'Removing invites');
-99         if (channel)
-100         {
-101                 if (invites.size())
-102                 {
-103                         for (InvitedList::iterator i = invites.begin(); i != invites.end(); i++)
-104                         {
-105                                 if (i->channel)
-106                                 {
-107                                         if (!strcasecmp(i->channel,channel))
-108                                         {
-109                                                 invites.erase(i);
-110                                                 return;
-111                                         }
-112                                 }
-113                         }
-114                 }
-115         }
-116 }
+96 {
+97         log(DEBUG,'Removing invites');
+98         if (channel)
+99         {
+100                 if (invites.size())
+101                 {
+102                         for (InvitedList::iterator i = invites.begin(); i != invites.end(); i++)
+103                         {
+104                                 if (i->channel)
+105                                 {
+106                                         if (!strcasecmp(i->channel,channel))
+107                                         {
+108                                                 invites.erase(i);
+109                                                 return;
+110                                         }
+111                                 }
+112                         }
+113                 }
+114         }
+115 }
 .fi
 .SS "void userrec::SetWriteError (std::string error)"
 .PP
-Sets the write error for a connection. This is done because the actual disconnect of a client may occur at an inopportune time such as half way through /LIST output. The WriteErrors of clients are checked at a more ideal time (in the mainloop) and errored clients purged.Definition at line 264 of file users.cpp.
+Sets the write error for a connection. This is done because the actual disconnect of a client may occur at an inopportune time such as half way through /LIST output. The WriteErrors of clients are checked at a more ideal time (in the mainloop) and errored clients purged.Definition at line 263 of file users.cpp.
 .PP
 References DEBUG, and WriteError.
 .PP
 Referenced by AddBuffer(), AddWriteBuf(), and FlushWriteBuf().
 .PP
 .nf
-265 {
-266         log(DEBUG,'Setting error string for %s to '%s'',this->nick,error.c_str());
-267         // don't try to set the error twice, its already set take the first string.
-268         if (this->WriteError == '')
-269                 this->WriteError = error;
-270 }
+264 {
+265         log(DEBUG,'Setting error string for %s to '%s'',this->nick,error.c_str());
+266         // don't try to set the error twice, its already set take the first string.
+267         if (this->WriteError == '')
+268                 this->WriteError = error;
+269 }
 .fi
 .SH "Member Data Documentation"
 .PP 
@@ -548,7 +547,7 @@ Referenced by userrec().
 Definition at line 142 of file users.h.
 .PP
 Referenced by Server::PseudoToUser(), and userrec().
-.SS "char \fBuserrec::dhost\fP[256]"
+.SS "char \fBuserrec::dhost\fP[160]"
 .PP
 The host displayed to non-opers (used for cloaking etc). This usually matches the value of \fBuserrec::host\fP.Definition at line 130 of file users.h.
 .PP
@@ -568,7 +567,7 @@ Referenced by userrec().
 The users full name. Definition at line 134 of file users.h.
 .PP
 Referenced by userrec().
-.SS "char \fBuserrec::ident\fP[64]"
+.SS "char \fBuserrec::ident\fP[16]"
 .PP
 The users ident reply. Definition at line 125 of file users.h.
 .PP
@@ -578,7 +577,7 @@ Referenced by GetFullHost(), GetFullRealHost(), Server::PseudoToUser(), userrec(
 A list of channels the user has a pending invite to. Definition at line 114 of file users.h.
 .PP
 Referenced by InviteTo(), IsInvited(), RemoveInvite(), and userrec().
-.SS "long \fBuserrec::lines_in\fP"
+.SS "int \fBuserrec::lines_in\fP"
 .PP
 Flood counters. Definition at line 204 of file users.h.
 .PP
@@ -601,7 +600,7 @@ Referenced by userrec().
 .SS "char \fBuserrec::password\fP[MAXBUF]"
 .PP
 Password specified by the user when they registered. This is stored even if the  block doesnt need a password, so that modules may check it.Definition at line 189 of file users.h.
-.SS "unsigned long \fBuserrec::pingmax\fP"
+.SS "unsigned int \fBuserrec::pingmax\fP"
 .PP
 Number of seconds between PINGs for this user (set from <connect:allow> tag. Definition at line 183 of file users.h.
 .SS "std::string \fBuserrec::recvq\fP"
@@ -642,7 +641,7 @@ Referenced by userrec().
 .SS "long \fBuserrec::threshold\fP"
 .PP
 Definition at line 206 of file users.h.
-.SS "unsigned long \fBuserrec::timeout\fP"
+.SS "unsigned int \fBuserrec::timeout\fP"
 .PP
 Number of seconds this user is given to send USER/NICK If they do not send their details in this time limit they will be disconnected. Definition at line 168 of file users.h.
 .PP
diff --git a/docs/man/man3/users.h.3 b/docs/man/man3/users.h.3
index ae5250157..20425922d 100644
--- a/docs/man/man3/users.h.3
+++ b/docs/man/man3/users.h.3
@@ -32,6 +32,10 @@ users.h \-
 .RI "class \fBuserrec\fP"
 .br
 .RI "\fIHolds all information about a user This class stores all information about a user connected to the irc server. \fP"
+.ti -1c
+.RI "class \fBWhoWasUser\fP"
+.br
+.RI "\fIA lightweight userrec used by WHOWAS. \fP"
 .in -1c
 .SS "Defines"