From: brain Date: Tue, 6 Apr 2004 20:16:43 +0000 (+0000) Subject: Updated docs X-Git-Tag: v2.0.23~11176 X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=59a2c6c2d96a4557cd885fefcbce97f490962692;p=user%2Fhenk%2Fcode%2Finspircd.git Updated docs git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@411 e03df62e-2008-0410-955e-edbf42e46eb7 --- diff --git a/docs/module-doc/annotated.html b/docs/module-doc/annotated.html index ba6a28182..8e1782cf2 100644 --- a/docs/module-doc/annotated.html +++ b/docs/module-doc/annotated.html @@ -31,7 +31,7 @@ userrecHolds all information about a user This class stores all information about a user connected to the irc server VersionHolds a module's Version information The four members (set by the constructor only) indicate details as to the version number of a module -
Generated on Tue Apr 6 11:42:36 2004 for InspIRCd by +
Generated on Tue Apr 6 21:13:39 2004 for InspIRCd by doxygen1.3-rc3
diff --git a/docs/module-doc/base_8h-source.html b/docs/module-doc/base_8h-source.html index 312037b6b..000327420 100644 --- a/docs/module-doc/base_8h-source.html +++ b/docs/module-doc/base_8h-source.html @@ -29,7 +29,7 @@ 00028 00029 #endif 00030 -
Generated on Tue Apr 6 11:42:30 2004 for InspIRCd by +
Generated on Tue Apr 6 21:13:19 2004 for InspIRCd by doxygen1.3-rc3
diff --git a/docs/module-doc/base_8h.html b/docs/module-doc/base_8h.html index 2302e4b4b..35ac0526c 100644 --- a/docs/module-doc/base_8h.html +++ b/docs/module-doc/base_8h.html @@ -34,7 +34,7 @@ This graph shows which files directly or indirectly include this file:

class  classbase  The base class for all inspircd classes. More...

-
Generated on Tue Apr 6 11:42:31 2004 for InspIRCd by +
Generated on Tue Apr 6 21:13:22 2004 for InspIRCd by doxygen1.3-rc3
diff --git a/docs/module-doc/channels_8cpp-source.html b/docs/module-doc/channels_8cpp-source.html index 794137a6f..8bb5e3ede 100644 --- a/docs/module-doc/channels_8cpp-source.html +++ b/docs/module-doc/channels_8cpp-source.html @@ -106,7 +106,7 @@ 00098 } 00099 return std::string(""); 00100 } -
Generated on Tue Apr 6 11:42:30 2004 for InspIRCd by +
Generated on Tue Apr 6 21:13:19 2004 for InspIRCd by doxygen1.3-rc3
diff --git a/docs/module-doc/channels_8cpp.html b/docs/module-doc/channels_8cpp.html index bad0744ee..6530b425c 100644 --- a/docs/module-doc/channels_8cpp.html +++ b/docs/module-doc/channels_8cpp.html @@ -55,7 +55,7 @@ Definition at line 10 Referenced by chanrec::GetModeParameter(), and chanrec::SetCustomModeParam(). -
Generated on Tue Apr 6 11:42:32 2004 for InspIRCd by +
Generated on Tue Apr 6 21:13:23 2004 for InspIRCd by doxygen1.3-rc3
diff --git a/docs/module-doc/channels_8h-source.html b/docs/module-doc/channels_8h-source.html index 2ab21ac97..9c19f3652 100644 --- a/docs/module-doc/channels_8h-source.html +++ b/docs/module-doc/channels_8h-source.html @@ -129,7 +129,7 @@ 00207 00208 #endif 00209 -
Generated on Tue Apr 6 11:42:30 2004 for InspIRCd by +
Generated on Tue Apr 6 21:13:19 2004 for InspIRCd by doxygen1.3-rc3
diff --git a/docs/module-doc/channels_8h.html b/docs/module-doc/channels_8h.html index da09cb5b8..3c0e91dbb 100644 --- a/docs/module-doc/channels_8h.html +++ b/docs/module-doc/channels_8h.html @@ -258,7 +258,7 @@ Holds a complete invite list. Definition at line 77 of file channels.h. -
Generated on Tue Apr 6 11:42:32 2004 for InspIRCd by +
Generated on Tue Apr 6 21:13:25 2004 for InspIRCd by doxygen1.3-rc3
diff --git a/docs/module-doc/classAdmin-members.html b/docs/module-doc/classAdmin-members.html index 933abdb82..b1dd27e83 100644 --- a/docs/module-doc/classAdmin-members.html +++ b/docs/module-doc/classAdmin-members.html @@ -14,7 +14,7 @@ NameAdmin NickAdmin ~classbase()classbase [inline] -
Generated on Tue Apr 6 11:42:37 2004 for InspIRCd by +
Generated on Tue Apr 6 21:13:40 2004 for InspIRCd by doxygen1.3-rc3
diff --git a/docs/module-doc/classAdmin.html b/docs/module-doc/classAdmin.html index 6162a7f9a..f9a98e2ef 100644 --- a/docs/module-doc/classAdmin.html +++ b/docs/module-doc/classAdmin.html @@ -160,7 +160,7 @@ Definition at line 81 of
The documentation for this class was generated from the following files: -
Generated on Tue Apr 6 11:42:37 2004 for InspIRCd by +
Generated on Tue Apr 6 21:13:40 2004 for InspIRCd by doxygen1.3-rc3
diff --git a/docs/module-doc/classBanItem-members.html b/docs/module-doc/classBanItem-members.html index dc5bff7ca..39cd4e14f 100644 --- a/docs/module-doc/classBanItem-members.html +++ b/docs/module-doc/classBanItem-members.html @@ -15,7 +15,7 @@ set_timeHostItem ~classbase()classbase [inline] ~HostItem()HostItem [inline, virtual] -
Generated on Tue Apr 6 11:42:37 2004 for InspIRCd by +
Generated on Tue Apr 6 21:13:42 2004 for InspIRCd by doxygen1.3-rc3
diff --git a/docs/module-doc/classBanItem.html b/docs/module-doc/classBanItem.html index 172b021bc..dc17cfeda 100644 --- a/docs/module-doc/classBanItem.html +++ b/docs/module-doc/classBanItem.html @@ -31,7 +31,7 @@ A subclass of HostItem designed to h

Definition at line 34 of file channels.h.

The documentation for this class was generated from the following file: -
Generated on Tue Apr 6 11:42:37 2004 for InspIRCd by +
Generated on Tue Apr 6 21:13:42 2004 for InspIRCd by doxygen1.3-rc3
diff --git a/docs/module-doc/classConfigReader-members.html b/docs/module-doc/classConfigReader-members.html index da85c19aa..1b86845c8 100644 --- a/docs/module-doc/classConfigReader-members.html +++ b/docs/module-doc/classConfigReader-members.html @@ -17,7 +17,7 @@ Verify()ConfigReader ~classbase()classbase [inline] ~ConfigReader()ConfigReader -
Generated on Tue Apr 6 11:42:40 2004 for InspIRCd by +
Generated on Tue Apr 6 21:13:50 2004 for InspIRCd by doxygen1.3-rc3
diff --git a/docs/module-doc/classConfigReader.html b/docs/module-doc/classConfigReader.html index c9ce89878..f19df250a 100644 --- a/docs/module-doc/classConfigReader.html +++ b/docs/module-doc/classConfigReader.html @@ -45,7 +45,7 @@ It may either be instantiated with one parameter or none. Constructing the class

-Definition at line 428 of file modules.h.

Constructor & Destructor Documentation

+Definition at line 448 of file modules.h.

Constructor & Destructor Documentation

@@ -75,13 +75,13 @@ Default constructor.

This constructor initialises the ConfigReader class to read the inspircd.conf file as specified when running ./configure.

-Definition at line 294 of file modules.cpp. +Definition at line 296 of file modules.cpp.

-References fname. +References fname.

-

00295 {
-00296         fname = CONFIG_FILE;
-00297 }
+
00297 {
+00298         fname = CONFIG_FILE;
+00299 }
@@ -115,9 +115,9 @@ Overloaded constructor.

This constructor initialises the ConfigReader class to read a user-specified config file

-Definition at line 305 of file modules.cpp. +Definition at line 307 of file modules.cpp.

-

00305 : fname(filename) { };
+
00307 : fname(filename) { };
 
    
   
 
@@ -150,10 +150,10 @@ Default destructor.
 

 This method destroys the ConfigReader class.
 

-Definition at line 300 of file modules.cpp.
+Definition at line 302 of file modules.cpp.
 

-
00301 {
-00302 }
+
00303 {
+00304 }
 
    
   
 
@@ -188,13 +188,13 @@ 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 ConfigReader::ReadValue to loop through all copies of a multiple instance tag.
 

-Definition at line 315 of file modules.cpp.
+Definition at line 317 of file modules.cpp.
 

-References fname.
+References fname.
 

-
00316 {
-00317         return EnumConf(fname.c_str(),tag.c_str());
-00318 }
+
00318 {
+00319         return EnumConf(fname.c_str(),tag.c_str());
+00320 }
 
    
   
 
@@ -243,15 +243,15 @@ 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 307 of file modules.cpp.
+Definition at line 309 of file modules.cpp.
 

-References fname.
+References fname.
 

-
00308 {
-00309         char val[MAXBUF];
-00310         ReadConf(fname.c_str(),tag.c_str(),name.c_str(),index,val);
-00311         return val;
-00312 }
+
00310 {
+00311         char val[MAXBUF];
+00312         ReadConf(fname.c_str(),tag.c_str(),name.c_str(),index,val);
+00313         return val;
+00314 }
 
    
   
 
@@ -284,11 +284,11 @@ Returns true if a config file is valid.
 

 This method is unimplemented and will always return true.
 

-Definition at line 321 of file modules.cpp.
+Definition at line 323 of file modules.cpp.
 

-
00322 {
-00323         return true;
-00324 }
+
00324 {
+00325         return true;
+00326 }
 
    
   
 
@@ -316,14 +316,14 @@ The filename of the configuration file, as set by the constructor.
 

 
 

-Definition at line 433 of file modules.h.
+Definition at line 453 of file modules.h.
 

-Referenced by ConfigReader(), Enumerate(), and ReadValue().    
+Referenced by ConfigReader(), Enumerate(), and ReadValue().    
   
 
 
The documentation for this class was generated from the following files:
-
Generated on Tue Apr 6 11:42:40 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:13:50 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classConnectClass-members.html b/docs/module-doc/classConnectClass-members.html
index eff3f7885..e52b029ec 100644
--- a/docs/module-doc/classConnectClass-members.html
+++ b/docs/module-doc/classConnectClass-members.html
@@ -15,7 +15,7 @@
   registration_timeoutConnectClass
   typeConnectClass
   ~classbase()classbase [inline]
-
Generated on Tue Apr 6 11:42:40 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:13:52 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classConnectClass.html b/docs/module-doc/classConnectClass.html
index a9c8c7ced..3a3fcfbbf 100644
--- a/docs/module-doc/classConnectClass.html
+++ b/docs/module-doc/classConnectClass.html
@@ -171,7 +171,7 @@ Definition at line 37 of fi
 
 
The documentation for this class was generated from the following file:
-
Generated on Tue Apr 6 11:42:40 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:13:52 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classExemptItem-members.html b/docs/module-doc/classExemptItem-members.html
index 50d96beef..6cd3e1510 100644
--- a/docs/module-doc/classExemptItem-members.html
+++ b/docs/module-doc/classExemptItem-members.html
@@ -15,7 +15,7 @@
   set_timeHostItem
   ~classbase()classbase [inline]
   ~HostItem()HostItem [inline, virtual]
-
Generated on Tue Apr 6 11:42:41 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:13:56 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classExemptItem.html b/docs/module-doc/classExemptItem.html
index f6e809492..23035997b 100644
--- a/docs/module-doc/classExemptItem.html
+++ b/docs/module-doc/classExemptItem.html
@@ -31,7 +31,7 @@ A subclass of HostItem designed to h
 

 Definition at line 42 of file channels.h.
The documentation for this class was generated from the following file:
-
Generated on Tue Apr 6 11:42:41 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:13:56 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classExtMode-members.html b/docs/module-doc/classExtMode-members.html
index 40bfcedda..d8120c081 100644
--- a/docs/module-doc/classExtMode-members.html
+++ b/docs/module-doc/classExtMode-members.html
@@ -13,7 +13,7 @@
   params_when_offExtMode
   params_when_onExtMode
   typeExtMode
-
Generated on Tue Apr 6 11:42:42 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:13:57 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classExtMode.html b/docs/module-doc/classExtMode.html
index 03d41e6b1..40350bd95 100644
--- a/docs/module-doc/classExtMode.html
+++ b/docs/module-doc/classExtMode.html
@@ -203,7 +203,7 @@ Definition at line 21 o
 
 
The documentation for this class was generated from the following file:
-
Generated on Tue Apr 6 11:42:42 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:13:57 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classFileReader-members.html b/docs/module-doc/classFileReader-members.html
index 7d3c9bc01..19d5078e6 100644
--- a/docs/module-doc/classFileReader-members.html
+++ b/docs/module-doc/classFileReader-members.html
@@ -18,7 +18,7 @@
   LoadFile(std::string filename)FileReader
   ~classbase()classbase [inline]
   ~FileReader()FileReader
-
Generated on Tue Apr 6 11:42:42 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:13:59 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classFileReader.html b/docs/module-doc/classFileReader.html
index f8fd1a23b..54dfd90e2 100644
--- a/docs/module-doc/classFileReader.html
+++ b/docs/module-doc/classFileReader.html
@@ -45,7 +45,7 @@ This class contains methods for read-only manipulation of a text file in memory.
 

 
 

-Definition at line 473 of file modules.h.
Constructor & Destructor Documentation

+Definition at line 493 of file modules.h.
Constructor & Destructor Documentation

 

 
@@ -75,10 +75,10 @@ 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 334 of file modules.cpp.
+Definition at line 336 of file modules.cpp.
 

-
00335 {
-00336 }
+
00337 {
+00338 }
 
    
   

   

 

@@ -112,15 +112,15 @@ 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, FileReader::FileSize returns 0.
 

-Definition at line 327 of file modules.cpp.
+Definition at line 329 of file modules.cpp.
 

-References fc, and file_cache.
+References fc, and file_cache.
 

-
00328 {
-00329         file_cache c;
-00330         readfile(c,filename.c_str());
-00331         this->fc = c;
-00332 }
+
00330 {
+00331         file_cache c;
+00332         readfile(c,filename.c_str());
+00333         this->fc = c;
+00334 }
 
    
   
 
@@ -153,10 +153,10 @@ Default destructor.
 

 This deletes the memory allocated to the file.
 

-Definition at line 346 of file modules.cpp.
+Definition at line 348 of file modules.cpp.
 

-
00347 {
-00348 }
+
00349 {
+00350 }
 
    
   
 
@@ -190,20 +190,20 @@ 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 350 of file modules.cpp.
+Definition at line 352 of file modules.cpp.
 

-References fc.
+References fc.
 

-
00351 {
-00352         if (fc.size() == 0)
-00353         {
-00354                 return(false);
-00355         }
-00356         else
-00357         {
-00358                 return(true);
-00359         }
-00360 }
+
00353 {
+00354         if (fc.size() == 0)
+00355         {
+00356                 return(false);
+00357         }
+00358         else
+00359         {
+00360                 return(true);
+00361         }
+00362 }
 
    
   
 
@@ -236,13 +236,13 @@ 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 369 of file modules.cpp.
+Definition at line 371 of file modules.cpp.
 

-References fc.
+References fc.
 

-
00370 {
-00371         return fc.size();
-00372 }
+
00372 {
+00373         return fc.size();
+00374 }
 
    
   
 
@@ -274,15 +274,15 @@ References fc.
 

 
 

-Definition at line 362 of file modules.cpp.
+Definition at line 364 of file modules.cpp.
 

-References fc.
+References fc.
 

-
00363 {
-00364         if ((x<0) || (x>fc.size()))
-00365                 return "";
-00366         return fc[x];
-00367 }
+
00365 {
+00366         if ((x<0) || (x>fc.size()))
+00367                 return "";
+00368         return fc[x];
+00369 }
 
    
   
 
@@ -316,15 +316,15 @@ 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, FileReader::FileSize returns 0.
 

-Definition at line 338 of file modules.cpp.
+Definition at line 340 of file modules.cpp.
 

-References fc, and file_cache.
+References fc, and file_cache.
 

-
00339 {
-00340         file_cache c;
-00341         readfile(c,filename.c_str());
-00342         this->fc = c;
-00343 }
+
00341 {
+00342         file_cache c;
+00343         readfile(c,filename.c_str());
+00344         this->fc = c;
+00345 }
 
    
   
 
@@ -350,14 +350,14 @@ References fc, and 
 
 

-Definition at line 475 of file modules.h.
+Definition at line 495 of file modules.h.
 

-Referenced by Exists(), FileReader(), FileSize(), GetLine(), and LoadFile().    
+Referenced by Exists(), FileReader(), FileSize(), GetLine(), and LoadFile().    
   
 
 
The documentation for this class was generated from the following files:
-
Generated on Tue Apr 6 11:42:42 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:13:59 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classHostItem-members.html b/docs/module-doc/classHostItem-members.html
index de1f43e66..c38516921 100644
--- a/docs/module-doc/classHostItem-members.html
+++ b/docs/module-doc/classHostItem-members.html
@@ -15,7 +15,7 @@
   set_timeHostItem
   ~classbase()classbase [inline]
   ~HostItem()HostItem [inline, virtual]
-
Generated on Tue Apr 6 11:42:43 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:14:01 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classHostItem.html b/docs/module-doc/classHostItem.html
index ef1efe681..c414e50ea 100644
--- a/docs/module-doc/classHostItem.html
+++ b/docs/module-doc/classHostItem.html
@@ -181,7 +181,7 @@ Definition at line 21 of
 
 
The documentation for this class was generated from the following file:
-
Generated on Tue Apr 6 11:42:43 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:14:01 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classInviteItem-members.html b/docs/module-doc/classInviteItem-members.html
index 7d804e81f..2698d97dc 100644
--- a/docs/module-doc/classInviteItem-members.html
+++ b/docs/module-doc/classInviteItem-members.html
@@ -15,7 +15,7 @@
   set_timeHostItem
   ~classbase()classbase [inline]
   ~HostItem()HostItem [inline, virtual]
-
Generated on Tue Apr 6 11:42:44 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:14:04 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classInviteItem.html b/docs/module-doc/classInviteItem.html
index 33dbef1a7..16beb7763 100644
--- a/docs/module-doc/classInviteItem.html
+++ b/docs/module-doc/classInviteItem.html
@@ -31,7 +31,7 @@ A subclass of HostItem designed to h
 

 Definition at line 50 of file channels.h.
The documentation for this class was generated from the following file:
-
Generated on Tue Apr 6 11:42:44 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:14:04 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classInvited-members.html b/docs/module-doc/classInvited-members.html
index 6c01785b1..837df1cfc 100644
--- a/docs/module-doc/classInvited-members.html
+++ b/docs/module-doc/classInvited-members.html
@@ -11,7 +11,7 @@
   channelInvited
   classbase()classbase [inline]
   ~classbase()classbase [inline]
-
Generated on Tue Apr 6 11:42:43 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:14:02 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classInvited.html b/docs/module-doc/classInvited.html
index ddf9be71d..6e276c7a6 100644
--- a/docs/module-doc/classInvited.html
+++ b/docs/module-doc/classInvited.html
@@ -58,7 +58,7 @@ Referenced by userrec::Invite
 
 
The documentation for this class was generated from the following file:
-
Generated on Tue Apr 6 11:42:43 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:14:02 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classModeParameter-members.html b/docs/module-doc/classModeParameter-members.html
index 633881fcd..f5798aeed 100644
--- a/docs/module-doc/classModeParameter-members.html
+++ b/docs/module-doc/classModeParameter-members.html
@@ -13,7 +13,7 @@
   modeModeParameter
   parameterModeParameter
   ~classbase()classbase [inline]
-
Generated on Tue Apr 6 11:42:44 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:14:06 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classModeParameter.html b/docs/module-doc/classModeParameter.html
index 94c5e0ea7..cf5fab601 100644
--- a/docs/module-doc/classModeParameter.html
+++ b/docs/module-doc/classModeParameter.html
@@ -114,7 +114,7 @@ Referenced by chanrec::Set
 
 
The documentation for this class was generated from the following file:
-
Generated on Tue Apr 6 11:42:44 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:14:06 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classModule-members.html b/docs/module-doc/classModule-members.html
index cd2923123..92f1e2261 100644
--- a/docs/module-doc/classModule-members.html
+++ b/docs/module-doc/classModule-members.html
@@ -11,7 +11,6 @@
   classbase()classbase [inline]
   GetVersion()Module [virtual]
   Module()Module
-  Module::OnWhois(userrec *source, userrec *dest)Module
   OnExtendedMode(userrec *user, void *target, char modechar, int type, bool mode_on, string_list &params)Module [virtual]
   OnInfo(userrec *user)Module [virtual]
   OnOper(userrec *user)Module [virtual]
@@ -23,10 +22,13 @@
   OnUserJoin(userrec *user, chanrec *channel)Module [virtual]
   OnUserPart(userrec *user, chanrec *channel)Module [virtual]
   OnUserPreJoin(userrec *user, chanrec *chan, const char *cname)Module [virtual]
+  OnUserPreMessage(userrec *user, void *dest, int target_type, std::string text)Module [virtual]
+  OnUserPreNotice(userrec *user, void *dest, int target_type, std::string text)Module [virtual]
   OnUserQuit(userrec *user)Module [virtual]
+  OnWhois(userrec *source, userrec *dest)Module [virtual]
   ~classbase()classbase [inline]
   ~Module()Module [virtual]
-
Generated on Tue Apr 6 11:42:45 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:14:07 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classModule.html b/docs/module-doc/classModule.html
index 5e85deac7..8520f7bbc 100644
--- a/docs/module-doc/classModule.html
+++ b/docs/module-doc/classModule.html
@@ -52,8 +52,12 @@ Inheritance diagram for Module:



 virtual void OnInfo (userrec *user)
  Called whenever a user types /INFO. 


-void Module::OnWhois (userrec *source, userrec *dest)
+virtual void OnWhois (userrec *source, userrec *dest)
  Called whenever a /WHOIS is performed on a local user. 


+virtual int OnUserPreMessage (userrec *user, void *dest, int target_type, std::string text)
+ Called whenever a user is about to PRIVMSG A user or a channel, before any processing is done. 


+virtual int OnUserPreNotice (userrec *user, void *dest, int target_type, std::string text)
+ Called whenever a user is about to NOTICE A user or a channel, before any processing is done. 


 
 
Detailed Description

 Base class for all InspIRCd modules This class is the base class for InspIRCd modules.
@@ -169,46 +173,6 @@ Definition at line 119
 
    
   
 
-

-
-  
-    
-  
-

-      
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-          
-        
-        
-          
-          
-          
-        
-
-      
 void Module::Module::OnWhois ( userrec *   source, 
userrec *   dest
) 

-    

-
-  
-    
-    
-  
-

-       
-    
-
-

-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.    

 

 
@@ -682,6 +646,120 @@ Definition at line 117

   

     
   

 

+

+
+  
+    
+  
+

+      
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+        
+
+      
 int Module::OnUserPreMessage ( userrec *   user, 
void *   dest, 
int   target_type, 
std::string   text
)  [virtual]

+    

+
+  
+    
+    
+  
+

+       
+    
+
+

+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 123 of file modules.cpp.
+

+
00123 { return 0; };
+
    

+

+
+  
+    
+  
+

+      
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+        
+
+      
 int Module::OnUserPreNotice ( userrec *   user, 
void *   dest, 
int   target_type, 
std::string   text
)  [virtual]

+    

+
+  
+    
+    
+  
+

+       
+    
+
+

+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.
+

+Definition at line 124 of file modules.cpp.
+

+
00124 { return 0; };
+
    

 

 
@@ -718,9 +796,54 @@ Definition at line 110

   

     
   

 

+

+
+  
+    
+  
+

+      
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+          
+        
+        
+          
+          
+          
+        
+
+      
 void Module::OnWhois ( userrec *   source, 
userrec *   dest
)  [virtual]

+    

+
+  
+    
+    
+  
+

+       
+    
+
+

+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 122 of file modules.cpp.
+

+
00122 { };
+
    

 
The documentation for this class was generated from the following files:
-
Generated on Tue Apr 6 11:42:45 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:14:07 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classModuleFactory-members.html b/docs/module-doc/classModuleFactory-members.html
index 0840ab551..cf9858b06 100644
--- a/docs/module-doc/classModuleFactory-members.html
+++ b/docs/module-doc/classModuleFactory-members.html
@@ -13,7 +13,7 @@
   ModuleFactory()ModuleFactory [inline]
   ~classbase()classbase [inline]
   ~ModuleFactory()ModuleFactory [inline, virtual]
-
Generated on Tue Apr 6 11:42:45 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:14:09 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classModuleFactory.html b/docs/module-doc/classModuleFactory.html
index 78c3eb526..851e1e646 100644
--- a/docs/module-doc/classModuleFactory.html
+++ b/docs/module-doc/classModuleFactory.html
@@ -34,7 +34,7 @@ This is to allow for modules to create many different variants of 
 
 

-Definition at line 519 of file modules.h.
Constructor & Destructor Documentation

+Definition at line 539 of file modules.h.
Constructor & Destructor Documentation

 

 
@@ -62,9 +62,9 @@ Definition at line 519 of
 

 
 

-Definition at line 522 of file modules.h.
+Definition at line 542 of file modules.h.
 

-
00522 { }
+
00542 { }
 
    
   

   

 

@@ -95,9 +95,9 @@ Definition at line 522 of
 

 
 

-Definition at line 523 of file modules.h.
+Definition at line 543 of file modules.h.
 

-
00523 { }
+
00543 { }
 
    
   
 
@@ -134,7 +134,7 @@ Your inherited class of ModuleFactory must return a pointer to your modules.h
-
Generated on Tue Apr 6 11:42:45 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:14:09 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classServer-members.html b/docs/module-doc/classServer-members.html
index 26fd1f03c..f00c656b2 100644
--- a/docs/module-doc/classServer-members.html
+++ b/docs/module-doc/classServer-members.html
@@ -37,7 +37,7 @@
   Server::PartUserFromChannel(userrec *user, std::string cname, std::string reason)Server [virtual]
   ~classbase()classbase [inline]
   ~Server()Server [virtual]
-
Generated on Tue Apr 6 11:42:46 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:14:13 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classServer.html b/docs/module-doc/classServer.html
index 427f273cf..a37bd6257 100644
--- a/docs/module-doc/classServer.html
+++ b/docs/module-doc/classServer.html
@@ -84,7 +84,7 @@ All modules should instantiate at least one copy of this class, and use its memb
 

 
 

-Definition at line 219 of file modules.h.
Constructor & Destructor Documentation

+Definition at line 239 of file modules.h.
Constructor & Destructor Documentation

 

 
@@ -114,10 +114,10 @@ Default constructor.
 

 Creates a Server object.
 

-Definition at line 128 of file modules.cpp.
+Definition at line 130 of file modules.cpp.
 

-
00129 {
-00130 }
+
00131 {
+00132 }
 
    
   

   

 

@@ -150,10 +150,10 @@ Default destructor.
 

 Destroys a Server object.
 

-Definition at line 132 of file modules.cpp.
+Definition at line 134 of file modules.cpp.
 

-
00133 {
-00134 }
+
00135 {
+00136 }
 
    
   
 
@@ -211,13 +211,13 @@ This allows modules to add extra commands into the command table. You must place
 typedef void (handlerfunc) (char**, int, userrec*); ... void handle_kill(char **parameters, int pcnt, userrec *user)

 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'.
 

-Definition at line 172 of file modules.cpp.
+Definition at line 174 of file modules.cpp.
 

 References createcommand().
 

-
00173 {
-00174         createcommand(cmd,f,flags,minparams);
-00175 }
+
00175 {
+00176         createcommand(cmd,f,flags,minparams);
+00177 }
 
    
   
 
@@ -278,28 +278,28 @@ Adds an extended mode letter which is parsed by a module This allows modules to
 

 +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 273 of file modules.cpp.
+Definition at line 275 of file modules.cpp.
 

 References DoAddExtendedMode(), MT_CLIENT, and MT_SERVER.
 

-
00274 {
-00275         if (type == MT_SERVER)
-00276         {
-00277                 log(DEBUG,"*** API ERROR *** Modes of type MT_SERVER are reserved for future expansion");
-00278                 return false;
-00279         }
-00280         if (((params_when_on>0) || (params_when_off>0)) && (type == MT_CLIENT))
-00281         {
-00282                 log(DEBUG,"*** API ERROR *** Parameters on MT_CLIENT modes are not supported");
-00283                 return false;
-00284         }
-00285         if ((params_when_on>1) || (params_when_off>1))
-00286         {
-00287                 log(DEBUG,"*** API ERROR *** More than one parameter for an MT_CHANNEL mode is not yet supported");
-00288                 return false;
-00289         }
-00290         return DoAddExtendedMode(modechar,type,requires_oper,params_when_on,params_when_off);
-00291 }
+
00276 {
+00277         if (type == MT_SERVER)
+00278         {
+00279                 log(DEBUG,"*** API ERROR *** Modes of type MT_SERVER are reserved for future expansion");
+00280                 return false;
+00281         }
+00282         if (((params_when_on>0) || (params_when_off>0)) && (type == MT_CLIENT))
+00283         {
+00284                 log(DEBUG,"*** API ERROR *** Parameters on MT_CLIENT modes are not supported");
+00285                 return false;
+00286         }
+00287         if ((params_when_on>1) || (params_when_off>1))
+00288         {
+00289                 log(DEBUG,"*** API ERROR *** More than one parameter for an MT_CHANNEL mode is not yet supported");
+00290                 return false;
+00291         }
+00292         return DoAddExtendedMode(modechar,type,requires_oper,params_when_on,params_when_off);
+00293 }
 
    
   
 
@@ -342,11 +342,11 @@ 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 156 of file modules.cpp.
+Definition at line 158 of file modules.cpp.
 

-
00157 {
-00158         force_nickchange(user,nickname.c_str());
-00159 }
+
00159 {
+00160         force_nickchange(user,nickname.c_str());
+00161 }
 
    
   
 
@@ -389,11 +389,11 @@ 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 251 of file modules.cpp.
+Definition at line 253 of file modules.cpp.
 

-
00252 {
-00253         return cmode(User,Chan);
-00254 }
+
00254 {
+00255         return cmode(User,Chan);
+00256 }
 
    
   
 
@@ -436,11 +436,11 @@ Returns true if two users share a common channel.
 

 This method is used internally by the NICK and QUIT commands, and the Server::SendCommon method.
 

-Definition at line 214 of file modules.cpp.
+Definition at line 216 of file modules.cpp.
 

-
00215 {
-00216         return (common_channels(u1,u2) != 0);
-00217 }
+
00217 {
+00218         return (common_channels(u1,u2) != 0);
+00219 }
 
    
   
 
@@ -474,11 +474,11 @@ 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 246 of file modules.cpp.
+Definition at line 248 of file modules.cpp.
 

-
00247 {
-00248         return FindChan(channel.c_str());
-00249 }
+
00249 {
+00250         return FindChan(channel.c_str());
+00251 }
 
    
   
 
@@ -512,11 +512,11 @@ 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 241 of file modules.cpp.
+Definition at line 243 of file modules.cpp.
 

-
00242 {
-00243         return Find(nick);
-00244 }
+
00244 {
+00245         return Find(nick);
+00246 }
 
    
   
 
@@ -549,11 +549,11 @@ Returns the information of the server as returned by the /ADMIN command.
 

 See the Admin class for further information of the return value. The members Admin::Nick, Admin::Email and Admin::Name contain the information for the server where the module is loaded.
 

-Definition at line 266 of file modules.cpp.
+Definition at line 268 of file modules.cpp.
 

-
00267 {
-00268         return Admin(getadminname(),getadminemail(),getadminnick());
-00269 }
+
00269 {
+00270         return Admin(getadminname(),getadminemail(),getadminnick());
+00271 }
 
    
   
 
@@ -586,11 +586,11 @@ Returns the network name, global to all linked servers.
 

 
 

-Definition at line 261 of file modules.cpp.
+Definition at line 263 of file modules.cpp.
 

-
00262 {
-00263         return getnetworkname();
-00264 }
+
00264 {
+00265         return getnetworkname();
+00266 }
 
    
   
 
@@ -623,11 +623,11 @@ Returns the server name of the server where the module is loaded.
 

 
 

-Definition at line 256 of file modules.cpp.
+Definition at line 258 of file modules.cpp.
 

-
00257 {
-00258         return getservername();
-00259 }
+
00259 {
+00260         return getservername();
+00261 }
 
    
   
 
@@ -661,11 +661,11 @@ Returns true if a nick is valid.
 

 Nicks for unregistered connections will return false.
 

-Definition at line 236 of file modules.cpp.
+Definition at line 238 of file modules.cpp.
 

-
00237 {
-00238         return (isnick(nick.c_str()) != 0);
-00239 }
+
00239 {
+00240         return (isnick(nick.c_str()) != 0);
+00241 }
 
    
   
 
@@ -708,11 +708,11 @@ 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 167 of file modules.cpp.
+Definition at line 169 of file modules.cpp.
 

-
00168 {
-00169         log(level,"%s",s.c_str());
-00170 }
+
00170 {
+00171         log(level,"%s",s.c_str());
+00172 }
 
    
   
 
@@ -757,11 +757,11 @@ To the user, it will appear as if they typed /QUIT themselves, except for the fa
 WARNING!

 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 161 of file modules.cpp.
+Definition at line 163 of file modules.cpp.
 

-
00162 {
-00163         kill_link(user,reason.c_str());
-00164 }
+
00164 {
+00165         kill_link(user,reason.c_str());
+00166 }
 
    
   
 
@@ -804,11 +804,11 @@ 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 182 of file modules.cpp.
+Definition at line 184 of file modules.cpp.
 

-
00183 {
-00184         Write(Socket,"%s",s.c_str());
-00185 }
+
00185 {
+00186         Write(Socket,"%s",s.c_str());
+00187 }
 
    
   
 
@@ -863,18 +863,18 @@ 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 202 of file modules.cpp.
-

-
00203 {
-00204         if (IncludeSender)
-00205         {
-00206                 WriteChannel(Channel,User,"%s",s.c_str());
-00207         }
-00208         else
-00209         {
-00210                 ChanExceptSender(Channel,User,"%s",s.c_str());
-00211         }
-00212 }
+Definition at line 204 of file modules.cpp.
+

+
00205 {
+00206         if (IncludeSender)
+00207         {
+00208                 WriteChannel(Channel,User,"%s",s.c_str());
+00209         }
+00210         else
+00211         {
+00212                 ChanExceptSender(Channel,User,"%s",s.c_str());
+00213         }
+00214 }
 
    
   
 
@@ -923,18 +923,18 @@ 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 219 of file modules.cpp.
-

-
00220 {
-00221         if (IncludeSender)
-00222         {
-00223                 WriteCommon(User,"%s",text.c_str());
-00224         }
-00225         else
-00226         {
-00227                 WriteCommonExcept(User,"%s",text.c_str());
-00228         }
-00229 }
+Definition at line 221 of file modules.cpp.
+

+
00222 {
+00223         if (IncludeSender)
+00224         {
+00225                 WriteCommon(User,"%s",text.c_str());
+00226         }
+00227         else
+00228         {
+00229                 WriteCommonExcept(User,"%s",text.c_str());
+00230         }
+00231 }
 
    
   
 
@@ -983,11 +983,11 @@ 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 192 of file modules.cpp.
+Definition at line 194 of file modules.cpp.
 

-
00193 {
-00194         WriteFrom(Socket,User,"%s",s.c_str());
-00195 }
+
00195 {
+00196         WriteFrom(Socket,User,"%s",s.c_str());
+00197 }
 
    
   
 
@@ -1043,13 +1043,13 @@ modes[2] = user->nick;

 Srv->SendMode(modes,3,user);

 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 177 of file modules.cpp.
+Definition at line 179 of file modules.cpp.
 

 References server_mode().
 

-
00178 {
-00179         server_mode(parameters,pcnt,user);
-00180 }
+
00180 {
+00181         server_mode(parameters,pcnt,user);
+00182 }
 
    
   
 
@@ -1083,11 +1083,11 @@ Sends text to all opers.
 

 This method sends a server notice to all opers with the usermode +s.
 

-Definition at line 136 of file modules.cpp.
+Definition at line 138 of file modules.cpp.
 

-
00137 {
-00138         WriteOpers("%s",s.c_str());
-00139 }
+
00139 {
+00140         WriteOpers("%s",s.c_str());
+00141 }
 
    
   
 
@@ -1130,11 +1130,11 @@ 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 187 of file modules.cpp.
+Definition at line 189 of file modules.cpp.
 

-
00188 {
-00189         WriteServ(Socket,"%s",s.c_str());
-00190 }
+
00190 {
+00191         WriteServ(Socket,"%s",s.c_str());
+00192 }
 
    
   
 
@@ -1183,11 +1183,11 @@ Sends text from a user to another user.
 

 This method writes a line of text to a user, with a user's nick/ident /host combination prepended, as used in PRIVMSG etc commands (see RFC 1459)
 

-Definition at line 197 of file modules.cpp.
+Definition at line 199 of file modules.cpp.
 

-
00198 {
-00199         WriteTo(Source,Dest,"%s",s.c_str());
-00200 }
+
00200 {
+00201         WriteTo(Source,Dest,"%s",s.c_str());
+00202 }
 
    
   
 
@@ -1238,11 +1238,11 @@ These can be RFC specified modes such as +i, or module provided modes, including
 Serv->SendToModeMask("xi", WM_OR, "m00");

 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 141 of file modules.cpp.
+Definition at line 143 of file modules.cpp.
 

-
00142 {
-00143         WriteMode(modes.c_str(),flags,"%s",text.c_str());
-00144 }
+
00144 {
+00145         WriteMode(modes.c_str(),flags,"%s",text.c_str());
+00146 }
 
    
   
 
@@ -1285,11 +1285,11 @@ 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 231 of file modules.cpp.
+Definition at line 233 of file modules.cpp.
 

-
00232 {
-00233         WriteWallOps(User,"%s",text.c_str());
-00234 }
+
00234 {
+00235         WriteWallOps(User,"%s",text.c_str());
+00236 }
 
    
   
 
@@ -1387,7 +1387,7 @@ This is similar to svspart and can be used to implement redirection, etc. Althou
 
 
The documentation for this class was generated from the following files:
-
Generated on Tue Apr 6 11:42:46 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:14:13 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classVersion-members.html b/docs/module-doc/classVersion-members.html
index 323c0a20d..30a2064df 100644
--- a/docs/module-doc/classVersion-members.html
+++ b/docs/module-doc/classVersion-members.html
@@ -15,7 +15,7 @@
   RevisionVersion
   Version(int major, int minor, int revision, int build)Version
   ~classbase()classbase [inline]
-
Generated on Tue Apr 6 11:42:49 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:14:23 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classVersion.html b/docs/module-doc/classVersion.html
index 838d5c98e..0c8dd995b 100644
--- a/docs/module-doc/classVersion.html
+++ b/docs/module-doc/classVersion.html
@@ -191,7 +191,7 @@ Definition at line 69 of
 
 
The documentation for this class was generated from the following files:
-
Generated on Tue Apr 6 11:42:49 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:14:23 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classchanrec-members.html b/docs/module-doc/classchanrec-members.html
index dee9277d6..73e1a0fe2 100644
--- a/docs/module-doc/classchanrec-members.html
+++ b/docs/module-doc/classchanrec-members.html
@@ -31,7 +31,7 @@
   topicsetchanrec
   ~chanrec()chanrec [inline, virtual]
   ~classbase()classbase [inline]
-
Generated on Tue Apr 6 11:42:38 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:13:44 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classchanrec.html b/docs/module-doc/classchanrec.html
index 72840f058..633651143 100644
--- a/docs/module-doc/classchanrec.html
+++ b/docs/module-doc/classchanrec.html
@@ -808,7 +808,7 @@ Referenced by chanrec()
 
The documentation for this class was generated from the following files:
-
Generated on Tue Apr 6 11:42:38 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:13:44 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classclassbase-members.html b/docs/module-doc/classclassbase-members.html
index 482af2c23..fa6791f1f 100644
--- a/docs/module-doc/classclassbase-members.html
+++ b/docs/module-doc/classclassbase-members.html
@@ -10,7 +10,7 @@
   ageclassbase
   classbase()classbase [inline]
   ~classbase()classbase [inline]
-
Generated on Tue Apr 6 11:42:38 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:13:46 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classclassbase.html b/docs/module-doc/classclassbase.html
index 93c304f4e..865b24b6a 100644
--- a/docs/module-doc/classclassbase.html
+++ b/docs/module-doc/classclassbase.html
@@ -144,7 +144,7 @@ Definition at line 20 of fil
 
 
The documentation for this class was generated from the following file:
-
Generated on Tue Apr 6 11:42:38 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:13:46 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classcommand__t-members.html b/docs/module-doc/classcommand__t-members.html
index 3be94d6e2..d38126a49 100644
--- a/docs/module-doc/classcommand__t-members.html
+++ b/docs/module-doc/classcommand__t-members.html
@@ -16,7 +16,7 @@
   total_bytescommand_t
   use_countcommand_t
   ~classbase()classbase [inline]
-
Generated on Tue Apr 6 11:42:39 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:13:48 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classcommand__t.html b/docs/module-doc/classcommand__t.html
index 4dd1271ae..dbd8578f7 100644
--- a/docs/module-doc/classcommand__t.html
+++ b/docs/module-doc/classcommand__t.html
@@ -199,7 +199,7 @@ Definition at line 44 of
 
 
The documentation for this class was generated from the following file:
-
Generated on Tue Apr 6 11:42:39 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:13:48 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classconnection-members.html b/docs/module-doc/classconnection-members.html
index 7039d4508..40b71002c 100644
--- a/docs/module-doc/classconnection-members.html
+++ b/docs/module-doc/classconnection-members.html
@@ -36,7 +36,7 @@
   signonconnection
   TerminateLink(char *targethost)connection
   ~classbase()classbase [inline]
-
Generated on Tue Apr 6 11:42:41 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:13:54 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classconnection.html b/docs/module-doc/classconnection.html
index af6a2f6c5..a1d100b94 100644
--- a/docs/module-doc/classconnection.html
+++ b/docs/module-doc/classconnection.html
@@ -837,7 +837,7 @@ Referenced by serverrec::se
 
 
The documentation for this class was generated from the following file:
-
Generated on Tue Apr 6 11:42:41 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:13:54 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classes.html b/docs/module-doc/classes.html
index f92d5aa1f..fa0c9e401 100644
--- a/docs/module-doc/classes.html
+++ b/docs/module-doc/classes.html
@@ -19,7 +19,7 @@
 
  P  

 userrec   chanrec   ExemptItem   Invited   packet   
  V  

 classbase   ExtMode   InviteItem   
  S  

-Version   
Generated on Tue Apr 6 11:42:36 2004 for InspIRCd by
+Version   
Generated on Tue Apr 6 21:13:39 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classpacket-members.html b/docs/module-doc/classpacket-members.html
index 9ff0ca95d..bf42c60a2 100644
--- a/docs/module-doc/classpacket-members.html
+++ b/docs/module-doc/classpacket-members.html
@@ -16,7 +16,7 @@
   typepacket
   ~classbase()classbase [inline]
   ~packet()packet
-
Generated on Tue Apr 6 11:42:46 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:14:11 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classpacket.html b/docs/module-doc/classpacket.html
index e788a94e7..0528a20d8 100644
--- a/docs/module-doc/classpacket.html
+++ b/docs/module-doc/classpacket.html
@@ -183,7 +183,7 @@ Definition at line 31
 
 
The documentation for this class was generated from the following file:
-
Generated on Tue Apr 6 11:42:46 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:14:11 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classserverrec-members.html b/docs/module-doc/classserverrec-members.html
index 9eac24a56..07f0c9586 100644
--- a/docs/module-doc/classserverrec-members.html
+++ b/docs/module-doc/classserverrec-members.html
@@ -47,7 +47,7 @@
   versionserverrec
   ~classbase()classbase [inline]
   ~serverrec()serverrec
-
Generated on Tue Apr 6 11:42:48 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:14:16 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classserverrec.html b/docs/module-doc/classserverrec.html
index 5aabed8ea..1e2a94b0a 100644
--- a/docs/module-doc/classserverrec.html
+++ b/docs/module-doc/classserverrec.html
@@ -422,7 +422,7 @@ Referenced by serverrec()
 
The documentation for this class was generated from the following files:
-
Generated on Tue Apr 6 11:42:47 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:14:16 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classucrec-members.html b/docs/module-doc/classucrec-members.html
index 1c81a6ef1..a40813d80 100644
--- a/docs/module-doc/classucrec-members.html
+++ b/docs/module-doc/classucrec-members.html
@@ -14,7 +14,7 @@
   ucrec()ucrec [inline]
   ~classbase()classbase [inline]
   ~ucrec()ucrec [inline, virtual]
-
Generated on Tue Apr 6 11:42:48 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:14:18 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classucrec.html b/docs/module-doc/classucrec.html
index 3defff9d5..92aca3453 100644
--- a/docs/module-doc/classucrec.html
+++ b/docs/module-doc/classucrec.html
@@ -162,7 +162,7 @@ Definition at line 197 o
 
 
The documentation for this class was generated from the following file:
-
Generated on Tue Apr 6 11:42:48 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:14:18 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classuserrec-members.html b/docs/module-doc/classuserrec-members.html
index b1266c912..a61e477ff 100644
--- a/docs/module-doc/classuserrec-members.html
+++ b/docs/module-doc/classuserrec-members.html
@@ -54,7 +54,7 @@
   userrec()userrec
   ~classbase()classbase [inline]
   ~userrec()userrec [inline, virtual]
-
Generated on Tue Apr 6 11:42:49 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:14:21 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/classuserrec.html b/docs/module-doc/classuserrec.html
index 6bd92e868..4bfab1cc1 100644
--- a/docs/module-doc/classuserrec.html
+++ b/docs/module-doc/classuserrec.html
@@ -675,7 +675,7 @@ Referenced by userrec().
 
 
The documentation for this class was generated from the following files:
-
Generated on Tue Apr 6 11:42:49 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:14:21 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/connection_8h-source.html b/docs/module-doc/connection_8h-source.html
index ebe235157..5f3cf8ef6 100644
--- a/docs/module-doc/connection_8h-source.html
+++ b/docs/module-doc/connection_8h-source.html
@@ -79,7 +79,7 @@
 00071 
 00072 #endif
 00073 
-
Generated on Tue Apr 6 11:42:30 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:13:19 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/connection_8h.html b/docs/module-doc/connection_8h.html
index 0d39c21ee..fb027e995 100644
--- a/docs/module-doc/connection_8h.html
+++ b/docs/module-doc/connection_8h.html
@@ -142,7 +142,7 @@ Definition at line 20
 Definition at line 22 of file connection.h.    
   
 
-
Generated on Tue Apr 6 11:42:33 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:13:27 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/ctables_8h-source.html b/docs/module-doc/ctables_8h-source.html
index d0846dfa9..89ea9bf5d 100644
--- a/docs/module-doc/ctables_8h-source.html
+++ b/docs/module-doc/ctables_8h-source.html
@@ -43,7 +43,7 @@
 00049 
 00050 #endif
 00051 
-
Generated on Tue Apr 6 11:42:30 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:13:19 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/ctables_8h.html b/docs/module-doc/ctables_8h.html
index 69b77f09a..3a19a1b8c 100644
--- a/docs/module-doc/ctables_8h.html
+++ b/docs/module-doc/ctables_8h.html
@@ -57,7 +57,7 @@ This graph shows which files directly or indirectly include this file:
23 of file ctables.h.    
   
 
-
Generated on Tue Apr 6 11:42:33 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:13:29 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/files.html b/docs/module-doc/files.html
index 62827d670..d126b7f72 100644
--- a/docs/module-doc/files.html
+++ b/docs/module-doc/files.html
@@ -19,7 +19,7 @@
   users.cpp [code]
   users.h [code]
 
-
Generated on Tue Apr 6 11:42:30 2004 for InspIRCd by
+
Generated on Tue Apr 6 21:13:19 2004 for InspIRCd by
 
 doxygen1.3-rc3 

diff --git a/docs/module-doc/functions.html b/docs/module-doc/functions.html
index b6afd0e46..6c7a2df1e 100644
--- a/docs/module-doc/functions.html
+++ b/docs/module-doc/functions.html
@@ -131,8 +131,7 @@ Here is a list of all class members with links to the classes they belong to:
ExtMode
  • moderated
 : chanrec
  • modes
 : userrec
  • Module()
-: Module
  • Module::OnWhois()
-: Module
  • ModuleFactory()
+: Module
  • ModuleFactory()
 : ModuleFactory
 
    - n -
 
      
@@ -157,8 +156,11 @@ Here is a list of all class members with links to the classes they belong to:
      Module
    • OnUserJoin()
 : Module
    • OnUserPart()
 : Module
    • OnUserPreJoin()
-: Module
    • OnUserQuit()
-: Module
    • opercount
+: Module
    • OnUserPreMessage()
+: Module
    • OnUserPreNotice()
+: Module
    • OnUserQuit()
+: Module
    • OnWhois()
+: Module
    • opercount
 : serverrec
    
 
    - p -
 
    
 
    - ~ -
 
      
 
    • ~chanrec()
@@ -252,7 +254,7 @@ Here is a list of all class members with links to the classes they belong to:
      serverrec
    • ~ucrec()
 : ucrec
    • ~userrec()
 : userrec
    
-
    Generated on Tue Apr 6 11:42:36 2004 for InspIRCd by
+
    Generated on Tue Apr 6 21:13:39 2004 for InspIRCd by
 
 doxygen1.3-rc3 
    
diff --git a/docs/module-doc/globals.html b/docs/module-doc/globals.html
index 56126f315..35ec5a0e9 100644
--- a/docs/module-doc/globals.html
+++ b/docs/module-doc/globals.html
@@ -102,7 +102,7 @@ Here is a list of all file members with links to the files they belong to:
    
-
    Generated on Tue Apr 6 11:42:49 2004 for InspIRCd by
+
    Generated on Tue Apr 6 21:14:23 2004 for InspIRCd by
 
 doxygen1.3-rc3 
    
diff --git a/docs/module-doc/graph_legend.html b/docs/module-doc/graph_legend.html
index aa9541490..d5d0cedaf 100644
--- a/docs/module-doc/graph_legend.html
+++ b/docs/module-doc/graph_legend.html
@@ -69,7 +69,7 @@ A purple dashed arrow is used if a class is contained or used by another class.
 
  • 
 A yellow dashed arrow denotes a relation between a template instance and the template class it was instantiated from. The arrow is labeled with the template parameters of the instance. 
    • 
 
-
    Generated on Tue Apr 6 11:42:50 2004 for InspIRCd by
+
    Generated on Tue Apr 6 21:14:23 2004 for InspIRCd by
 
 doxygen1.3-rc3 
    
diff --git a/docs/module-doc/hierarchy.html b/docs/module-doc/hierarchy.html
index 0319f3fa1..35b40e7d5 100644
--- a/docs/module-doc/hierarchy.html
+++ b/docs/module-doc/hierarchy.html
@@ -39,7 +39,7 @@ This inheritance list is sorted roughly, but not completely, alphabetically:
      
 
    
 
  • ExtMode
 
-
    Generated on Tue Apr 6 11:42:36 2004 for InspIRCd by
+
    Generated on Tue Apr 6 21:13:39 2004 for InspIRCd by
 
 doxygen1.3-rc3 
    
diff --git a/docs/module-doc/inherits.html b/docs/module-doc/inherits.html
index 42cbdf226..58acc7af6 100644
--- a/docs/module-doc/inherits.html
+++ b/docs/module-doc/inherits.html
@@ -39,7 +39,7 @@
 
 
 
-
    Generated on Tue Apr 6 11:42:50 2004 for InspIRCd by
+
    Generated on Tue Apr 6 21:14:26 2004 for InspIRCd by
 
 doxygen1.3-rc3 
    
diff --git a/docs/module-doc/main.html b/docs/module-doc/main.html
index 4ace16909..17778ac5c 100644
--- a/docs/module-doc/main.html
+++ b/docs/module-doc/main.html
@@ -8,7 +8,7 @@
 Main Page   Namespace List   Class Hierarchy   Alphabetical List   Compound List   File List   Compound Members   File Members   
    • 
 
    InspIRCd Documentation
    
 
    
-
    Generated on Tue Apr 6 11:42:30 2004 for InspIRCd by
+
    Generated on Tue Apr 6 21:13:19 2004 for InspIRCd by
 
 doxygen1.3-rc3 
    
diff --git a/docs/module-doc/modules_8cpp-source.html b/docs/module-doc/modules_8cpp-source.html
index 81e149e10..a6398c94a 100644
--- a/docs/module-doc/modules_8cpp-source.html
+++ b/docs/module-doc/modules_8cpp-source.html
@@ -127,266 +127,268 @@
 00119 Version Module::GetVersion() { return Version(1,0,0,0); }
 00120 void Module::OnOper(userrec* user) { };
 00121 void Module::OnInfo(userrec* user) { };
-00122 void Module::OnWhois(userrec* source, userrec* dest) { };
-00123 
-00124 // server is a wrapper class that provides methods to all of the C-style
-00125 // exports in the core
-00126 //
-00127 
-00128 Server::Server()
-00129 {
-00130 }
-00131 
-00132 Server::~Server()
-00133 {
-00134 }
-00135 
-00136 void Server::SendOpers(std::string s)
-00137 {
-00138         WriteOpers("%s",s.c_str());
-00139 }
-00140 
-00141 void Server::SendToModeMask(std::string modes, int flags, std::string text)
-00142 {
-00143         WriteMode(modes.c_str(),flags,"%s",text.c_str());
-00144 }
-00145 
-00146 chanrec* Server::JoinUserToChannel(userrec* user, std::string cname, std::string key)
-00147 {
-00148         return add_channel(user,cname.c_str(),key.c_str());
-00149 }
-00150 
-00151 chanrec* Server::PartUserFromChannel(userrec* user, std::string cname, std::string reason)
-00152 {
-00153         return del_channel(user,cname.c_str(),reason.c_str());
-00154 }
-00155 
-00156 void Server::ChangeUserNick(userrec* user, std::string nickname)
-00157 {
-00158         force_nickchange(user,nickname.c_str());
-00159 }
-00160 
-00161 void Server::QuitUser(userrec* user, std::string reason)
-00162 {
-00163         kill_link(user,reason.c_str());
-00164 }
-00165 
-00166 
-00167 void Server::Log(int level, std::string s)
-00168 {
-00169         log(level,"%s",s.c_str());
-00170 }
-00171 
-00172 void Server::AddCommand(char* cmd, handlerfunc f, char flags, int minparams)
-00173 {
-00174         createcommand(cmd,f,flags,minparams);
-00175 }
-00176 
-00177 void Server::SendMode(char **parameters, int pcnt, userrec *user)
-00178 {
-00179         server_mode(parameters,pcnt,user);
-00180 }
-00181 
-00182 void Server::Send(int Socket, std::string s)
-00183 {
-00184         Write(Socket,"%s",s.c_str());
-00185 }
-00186 
-00187 void Server::SendServ(int Socket, std::string s)
-00188 {
-00189         WriteServ(Socket,"%s",s.c_str());
-00190 }
-00191 
-00192 void Server::SendFrom(int Socket, userrec* User, std::string s)
-00193 {
-00194         WriteFrom(Socket,User,"%s",s.c_str());
-00195 }
-00196 
-00197 void Server::SendTo(userrec* Source, userrec* Dest, std::string s)
-00198 {
-00199         WriteTo(Source,Dest,"%s",s.c_str());
-00200 }
-00201 
-00202 void Server::SendChannel(userrec* User, chanrec* Channel, std::string s,bool IncludeSender)
-00203 {
-00204         if (IncludeSender)
-00205         {
-00206                 WriteChannel(Channel,User,"%s",s.c_str());
-00207         }
-00208         else
-00209         {
-00210                 ChanExceptSender(Channel,User,"%s",s.c_str());
-00211         }
-00212 }
-00213 
-00214 bool Server::CommonChannels(userrec* u1, userrec* u2)
-00215 {
-00216         return (common_channels(u1,u2) != 0);
-00217 }
-00218 
-00219 void Server::SendCommon(userrec* User, std::string text,bool IncludeSender)
-00220 {
-00221         if (IncludeSender)
-00222         {
-00223                 WriteCommon(User,"%s",text.c_str());
-00224         }
-00225         else
-00226         {
-00227                 WriteCommonExcept(User,"%s",text.c_str());
-00228         }
-00229 }
-00230 
-00231 void Server::SendWallops(userrec* User, std::string text)
-00232 {
-00233         WriteWallOps(User,"%s",text.c_str());
-00234 }
-00235 
-00236 bool Server::IsNick(std::string nick)
-00237 {
-00238         return (isnick(nick.c_str()) != 0);
-00239 }
-00240 
-00241 userrec* Server::FindNick(std::string nick)
-00242 {
-00243         return Find(nick);
-00244 }
-00245 
-00246 chanrec* Server::FindChannel(std::string channel)
-00247 {
-00248         return FindChan(channel.c_str());
-00249 }
-00250 
-00251 std::string Server::ChanMode(userrec* User, chanrec* Chan)
-00252 {
-00253         return cmode(User,Chan);
-00254 }
-00255 
-00256 std::string Server::GetServerName()
-00257 {
-00258         return getservername();
-00259 }
-00260 
-00261 std::string Server::GetNetworkName()
-00262 {
-00263         return getnetworkname();
-00264 }
-00265 
-00266 Admin Server::GetAdmin()
-00267 {
-00268         return Admin(getadminname(),getadminemail(),getadminnick());
-00269 }
-00270 
-00271 
+00122 void Module::OnWhois(userrec* source, userrec* dest) { };
+00123 int Module::OnUserPreMessage(userrec* user,void* dest,int target_type, std::string text) { return 0; };
+00124 int Module::OnUserPreNotice(userrec* user,void* dest,int target_type, std::string text) { return 0; };
+00125 
+00126 // server is a wrapper class that provides methods to all of the C-style
+00127 // exports in the core
+00128 //
+00129 
+00130 Server::Server()
+00131 {
+00132 }
+00133 
+00134 Server::~Server()
+00135 {
+00136 }
+00137 
+00138 void Server::SendOpers(std::string s)
+00139 {
+00140         WriteOpers("%s",s.c_str());
+00141 }
+00142 
+00143 void Server::SendToModeMask(std::string modes, int flags, std::string text)
+00144 {
+00145         WriteMode(modes.c_str(),flags,"%s",text.c_str());
+00146 }
+00147 
+00148 chanrec* Server::JoinUserToChannel(userrec* user, std::string cname, std::string key)
+00149 {
+00150         return add_channel(user,cname.c_str(),key.c_str());
+00151 }
+00152 
+00153 chanrec* Server::PartUserFromChannel(userrec* user, std::string cname, std::string reason)
+00154 {
+00155         return del_channel(user,cname.c_str(),reason.c_str());
+00156 }
+00157 
+00158 void Server::ChangeUserNick(userrec* user, std::string nickname)
+00159 {
+00160         force_nickchange(user,nickname.c_str());
+00161 }
+00162 
+00163 void Server::QuitUser(userrec* user, std::string reason)
+00164 {
+00165         kill_link(user,reason.c_str());
+00166 }
+00167 
+00168 
+00169 void Server::Log(int level, std::string s)
+00170 {
+00171         log(level,"%s",s.c_str());
+00172 }
+00173 
+00174 void Server::AddCommand(char* cmd, handlerfunc f, char flags, int minparams)
+00175 {
+00176         createcommand(cmd,f,flags,minparams);
+00177 }
+00178 
+00179 void Server::SendMode(char **parameters, int pcnt, userrec *user)
+00180 {
+00181         server_mode(parameters,pcnt,user);
+00182 }
+00183 
+00184 void Server::Send(int Socket, std::string s)
+00185 {
+00186         Write(Socket,"%s",s.c_str());
+00187 }
+00188 
+00189 void Server::SendServ(int Socket, std::string s)
+00190 {
+00191         WriteServ(Socket,"%s",s.c_str());
+00192 }
+00193 
+00194 void Server::SendFrom(int Socket, userrec* User, std::string s)
+00195 {
+00196         WriteFrom(Socket,User,"%s",s.c_str());
+00197 }
+00198 
+00199 void Server::SendTo(userrec* Source, userrec* Dest, std::string s)
+00200 {
+00201         WriteTo(Source,Dest,"%s",s.c_str());
+00202 }
+00203 
+00204 void Server::SendChannel(userrec* User, chanrec* Channel, std::string s,bool IncludeSender)
+00205 {
+00206         if (IncludeSender)
+00207         {
+00208                 WriteChannel(Channel,User,"%s",s.c_str());
+00209         }
+00210         else
+00211         {
+00212                 ChanExceptSender(Channel,User,"%s",s.c_str());
+00213         }
+00214 }
+00215 
+00216 bool Server::CommonChannels(userrec* u1, userrec* u2)
+00217 {
+00218         return (common_channels(u1,u2) != 0);
+00219 }
+00220 
+00221 void Server::SendCommon(userrec* User, std::string text,bool IncludeSender)
+00222 {
+00223         if (IncludeSender)
+00224         {
+00225                 WriteCommon(User,"%s",text.c_str());
+00226         }
+00227         else
+00228         {
+00229                 WriteCommonExcept(User,"%s",text.c_str());
+00230         }
+00231 }
+00232 
+00233 void Server::SendWallops(userrec* User, std::string text)
+00234 {
+00235         WriteWallOps(User,"%s",text.c_str());
+00236 }
+00237 
+00238 bool Server::IsNick(std::string nick)
+00239 {
+00240         return (isnick(nick.c_str()) != 0);
+00241 }
+00242 
+00243 userrec* Server::FindNick(std::string nick)
+00244 {
+00245         return Find(nick);
+00246 }
+00247 
+00248 chanrec* Server::FindChannel(std::string channel)
+00249 {
+00250         return FindChan(channel.c_str());
+00251 }
+00252 
+00253 std::string Server::ChanMode(userrec* User, chanrec* Chan)
+00254 {
+00255         return cmode(User,Chan);
+00256 }
+00257 
+00258 std::string Server::GetServerName()
+00259 {
+00260         return getservername();
+00261 }
+00262 
+00263 std::string Server::GetNetworkName()
+00264 {
+00265         return getnetworkname();
+00266 }
+00267 
+00268 Admin Server::GetAdmin()
+00269 {
+00270         return Admin(getadminname(),getadminemail(),getadminnick());
+00271 }
 00272 
-00273 bool Server::AddExtendedMode(char modechar, int type, bool requires_oper, int params_when_on, int params_when_off)
-00274 {
-00275         if (type == MT_SERVER)
-00276         {
-00277                 log(DEBUG,"*** API ERROR *** Modes of type MT_SERVER are reserved for future expansion");
-00278                 return false;
-00279         }
-00280         if (((params_when_on>0) || (params_when_off>0)) && (type == MT_CLIENT))
-00281         {
-00282                 log(DEBUG,"*** API ERROR *** Parameters on MT_CLIENT modes are not supported");
-00283                 return false;
-00284         }
-00285         if ((params_when_on>1) || (params_when_off>1))
-00286         {
-00287                 log(DEBUG,"*** API ERROR *** More than one parameter for an MT_CHANNEL mode is not yet supported");
-00288                 return false;
-00289         }
-00290         return DoAddExtendedMode(modechar,type,requires_oper,params_when_on,params_when_off);
-00291 }
-00292 
-00293 
-00294 ConfigReader::ConfigReader()
-00295 {
-00296         fname = CONFIG_FILE;
-00297 }
-00298 
-00299 
-00300 ConfigReader::~ConfigReader()
-00301 {
-00302 }
-00303 
-00304 
-00305 ConfigReader::ConfigReader(std::string filename) : fname(filename) { };
+00273 
+00274 
+00275 bool Server::AddExtendedMode(char modechar, int type, bool requires_oper, int params_when_on, int params_when_off)
+00276 {
+00277         if (type == MT_SERVER)
+00278         {
+00279                 log(DEBUG,"*** API ERROR *** Modes of type MT_SERVER are reserved for future expansion");
+00280                 return false;
+00281         }
+00282         if (((params_when_on>0) || (params_when_off>0)) && (type == MT_CLIENT))
+00283         {
+00284                 log(DEBUG,"*** API ERROR *** Parameters on MT_CLIENT modes are not supported");
+00285                 return false;
+00286         }
+00287         if ((params_when_on>1) || (params_when_off>1))
+00288         {
+00289                 log(DEBUG,"*** API ERROR *** More than one parameter for an MT_CHANNEL mode is not yet supported");
+00290                 return false;
+00291         }
+00292         return DoAddExtendedMode(modechar,type,requires_oper,params_when_on,params_when_off);
+00293 }
+00294 
+00295 
+00296 ConfigReader::ConfigReader()
+00297 {
+00298         fname = CONFIG_FILE;
+00299 }
+00300 
+00301 
+00302 ConfigReader::~ConfigReader()
+00303 {
+00304 }
+00305 
 00306 
-00307 std::string ConfigReader::ReadValue(std::string tag, std::string name, int index)
-00308 {
-00309         char val[MAXBUF];
-00310         ReadConf(fname.c_str(),tag.c_str(),name.c_str(),index,val);
-00311         return val;
-00312 }
-00313 
-00314 
-00315 int ConfigReader::Enumerate(std::string tag)
-00316 {
-00317         return EnumConf(fname.c_str(),tag.c_str());
-00318 }
-00319 
-00320 
-00321 bool ConfigReader::Verify()
-00322 {
-00323         return true;
-00324 }
-00325 
-00326 
-00327 FileReader::FileReader(std::string filename)
-00328 {
-00329         file_cache c;
-00330         readfile(c,filename.c_str());
-00331         this->fc = c;
-00332 }
-00333 
-00334 FileReader::FileReader()
-00335 {
-00336 }
-00337 
-00338 void FileReader::LoadFile(std::string filename)
-00339 {
-00340         file_cache c;
-00341         readfile(c,filename.c_str());
-00342         this->fc = c;
-00343 }
-00344 
-00345 
-00346 FileReader::~FileReader()
-00347 {
-00348 }
-00349 
-00350 bool FileReader::Exists()
-00351 {
-00352         if (fc.size() == 0)
-00353         {
-00354                 return(false);
-00355         }
-00356         else
-00357         {
-00358                 return(true);
-00359         }
-00360 }
-00361 
-00362 std::string FileReader::GetLine(int x)
-00363 {
-00364         if ((x<0) || (x>fc.size()))
-00365                 return "";
-00366         return fc[x];
-00367 }
-00368 
-00369 int FileReader::FileSize()
-00370 {
-00371         return fc.size();
-00372 }
-00373 
-00374 
-00375 std::vector<Module*> modules(255);
-00376 std::vector<ircd_module*> factory(255);
-00377 
-00378 int MODCOUNT  = -1;
+00307 ConfigReader::ConfigReader(std::string filename) : fname(filename) { };
+00308 
+00309 std::string ConfigReader::ReadValue(std::string tag, std::string name, int index)
+00310 {
+00311         char val[MAXBUF];
+00312         ReadConf(fname.c_str(),tag.c_str(),name.c_str(),index,val);
+00313         return val;
+00314 }
+00315 
+00316 
+00317 int ConfigReader::Enumerate(std::string tag)
+00318 {
+00319         return EnumConf(fname.c_str(),tag.c_str());
+00320 }
+00321 
+00322 
+00323 bool ConfigReader::Verify()
+00324 {
+00325         return true;
+00326 }
+00327 
+00328 
+00329 FileReader::FileReader(std::string filename)
+00330 {
+00331         file_cache c;
+00332         readfile(c,filename.c_str());
+00333         this->fc = c;
+00334 }
+00335 
+00336 FileReader::FileReader()
+00337 {
+00338 }
+00339 
+00340 void FileReader::LoadFile(std::string filename)
+00341 {
+00342         file_cache c;
+00343         readfile(c,filename.c_str());
+00344         this->fc = c;
+00345 }
+00346 
+00347 
+00348 FileReader::~FileReader()
+00349 {
+00350 }
+00351 
+00352 bool FileReader::Exists()
+00353 {
+00354         if (fc.size() == 0)
+00355         {
+00356                 return(false);
+00357         }
+00358         else
+00359         {
+00360                 return(true);
+00361         }
+00362 }
+00363 
+00364 std::string FileReader::GetLine(int x)
+00365 {
+00366         if ((x<0) || (x>fc.size()))
+00367                 return "";
+00368         return fc[x];
+00369 }
+00370 
+00371 int FileReader::FileSize()
+00372 {
+00373         return fc.size();
+00374 }
+00375 
+00376 
+00377 std::vector<Module*> modules(255);
+00378 std::vector<ircd_module*> factory(255);
 00379 
-00380 
-
    Generated on Tue Apr 6 11:42:30 2004 for InspIRCd by
+00380 int MODCOUNT  = -1;
+00381 
+00382 
+
    Generated on Tue Apr 6 21:13:19 2004 for InspIRCd by
 
 doxygen1.3-rc3 
    
diff --git a/docs/module-doc/modules_8cpp.html b/docs/module-doc/modules_8cpp.html
index a62fbeda0..dcff258df 100644
--- a/docs/module-doc/modules_8cpp.html
+++ b/docs/module-doc/modules_8cpp.html
@@ -152,7 +152,7 @@ Definition at line 89 o
 
    
 References EMode, and ModeDefined().
 
    
-Referenced by Server::AddExtendedMode().
+Referenced by Server::AddExtendedMode().
 
    
 
    00090 {
 00091         if (ModeDefined(modechar,type)) {
@@ -492,10 +492,10 @@ Referenced by DoAddExtended
 
    
 
 
    
-Definition at line 378 of file modules.cpp.    
+Definition at line 380 of file modules.cpp.    
   
 
-
    Generated on Tue Apr 6 11:42:34 2004 for InspIRCd by
+
    Generated on Tue Apr 6 21:13:31 2004 for InspIRCd by
 
 doxygen1.3-rc3 
    
diff --git a/docs/module-doc/modules_8h-source.html b/docs/module-doc/modules_8h-source.html
index 44f988d0f..d461928e2 100644
--- a/docs/module-doc/modules_8h-source.html
+++ b/docs/module-doc/modules_8h-source.html
@@ -114,93 +114,97 @@
 00195         
 00204         virtual void OnInfo(userrec* user);
 00205         
-00210         void Module::OnWhois(userrec* source, userrec* dest);
-00211 };
-00212 
-00213 
-00219 class Server : public classbase
-00220 {
-00221  public:
-00225         Server();
-00229         virtual ~Server();
-00230 
-00234         virtual void SendOpers(std::string s);
-00239         virtual void Log(int level, std::string s);
-00244         virtual void Send(int Socket, std::string s);
-00249         virtual void SendServ(int Socket, std::string s);
-00254         virtual void SendFrom(int Socket, userrec* User, std::string s);
-00259         virtual void SendTo(userrec* Source, userrec* Dest, std::string s);
-00266         virtual void SendChannel(userrec* User, chanrec* Channel, std::string s,bool IncludeSender);
-00271         virtual bool CommonChannels(userrec* u1, userrec* u2);
-00279         virtual void SendCommon(userrec* User, std::string text,bool IncludeSender);
-00284         virtual void SendWallops(userrec* User, std::string text);
-00285 
-00289         virtual bool IsNick(std::string nick);
-00293         virtual userrec* FindNick(std::string nick);
-00297         virtual chanrec* FindChannel(std::string channel);
-00302         virtual std::string ChanMode(userrec* User, chanrec* Chan);
-00305         virtual std::string GetServerName();
-00308         virtual std::string GetNetworkName();
-00314         virtual Admin GetAdmin();
-00333         virtual bool AddExtendedMode(char modechar, int type, bool requires_oper, int params_when_on, int params_when_off);
-00334 
-00349         virtual void AddCommand(char* cmd, handlerfunc f, char flags, int minparams);
-00350          
-00372         virtual void SendMode(char **parameters, int pcnt, userrec *user);
-00373         
-00386         virtual void SendToModeMask(std::string modes, int flags, std::string text);
-00387 
-00393         virtual chanrec* Server::JoinUserToChannel(userrec* user, std::string cname, std::string key);
-00394         
-00400         virtual chanrec* Server::PartUserFromChannel(userrec* user, std::string cname, std::string reason);
-00401         
-00407         virtual void ChangeUserNick(userrec* user, std::string nickname);
-00408         
-00419         virtual void QuitUser(userrec* user, std::string reason);
-00420 };
-00421 
-00428 class ConfigReader : public classbase
-00429 {
-00430   protected:
-00433         std::string fname;
-00434   public:
-00439         ConfigReader();                 // default constructor reads ircd.conf
-00443         ConfigReader(std::string filename);     // read a module-specific config
-00447         ~ConfigReader();
-00452         std::string ReadValue(std::string tag, std::string name, int index);
-00459         int Enumerate(std::string tag);
-00463         bool Verify();
-00464 };
-00465 
-00466 
-00467 
-00473 class FileReader : public classbase
-00474 {
-00475  file_cache fc;
-00476  public:
-00481          FileReader();
-00487          FileReader(std::string filename);
-00491          ~FileReader();
-00497          void LoadFile(std::string filename);
-00502          bool Exists();
-00503          std::string GetLine(int x);
-00509          int FileSize();
-00510 };
-00511 
-00512 
-00519 class ModuleFactory : public classbase
-00520 {
-00521  public:
-00522         ModuleFactory() { }
-00523         virtual ~ModuleFactory() { }
-00528         virtual Module * CreateModule() = 0;
-00529 };
-00530 
+00210         virtual void OnWhois(userrec* source, userrec* dest);
+00211         
+00220         virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string text);
+00221 
+00230         virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string text);
+00231 };
+00232 
+00233 
+00239 class Server : public classbase
+00240 {
+00241  public:
+00245         Server();
+00249         virtual ~Server();
+00250 
+00254         virtual void SendOpers(std::string s);
+00259         virtual void Log(int level, std::string s);
+00264         virtual void Send(int Socket, std::string s);
+00269         virtual void SendServ(int Socket, std::string s);
+00274         virtual void SendFrom(int Socket, userrec* User, std::string s);
+00279         virtual void SendTo(userrec* Source, userrec* Dest, std::string s);
+00286         virtual void SendChannel(userrec* User, chanrec* Channel, std::string s,bool IncludeSender);
+00291         virtual bool CommonChannels(userrec* u1, userrec* u2);
+00299         virtual void SendCommon(userrec* User, std::string text,bool IncludeSender);
+00304         virtual void SendWallops(userrec* User, std::string text);
+00305 
+00309         virtual bool IsNick(std::string nick);
+00313         virtual userrec* FindNick(std::string nick);
+00317         virtual chanrec* FindChannel(std::string channel);
+00322         virtual std::string ChanMode(userrec* User, chanrec* Chan);
+00325         virtual std::string GetServerName();
+00328         virtual std::string GetNetworkName();
+00334         virtual Admin GetAdmin();
+00353         virtual bool AddExtendedMode(char modechar, int type, bool requires_oper, int params_when_on, int params_when_off);
+00354 
+00369         virtual void AddCommand(char* cmd, handlerfunc f, char flags, int minparams);
+00370          
+00392         virtual void SendMode(char **parameters, int pcnt, userrec *user);
+00393         
+00406         virtual void SendToModeMask(std::string modes, int flags, std::string text);
+00407 
+00413         virtual chanrec* Server::JoinUserToChannel(userrec* user, std::string cname, std::string key);
+00414         
+00420         virtual chanrec* Server::PartUserFromChannel(userrec* user, std::string cname, std::string reason);
+00421         
+00427         virtual void ChangeUserNick(userrec* user, std::string nickname);
+00428         
+00439         virtual void QuitUser(userrec* user, std::string reason);
+00440 };
+00441 
+00448 class ConfigReader : public classbase
+00449 {
+00450   protected:
+00453         std::string fname;
+00454   public:
+00459         ConfigReader();                 // default constructor reads ircd.conf
+00463         ConfigReader(std::string filename);     // read a module-specific config
+00467         ~ConfigReader();
+00472         std::string ReadValue(std::string tag, std::string name, int index);
+00479         int Enumerate(std::string tag);
+00483         bool Verify();
+00484 };
+00485 
+00486 
+00487 
+00493 class FileReader : public classbase
+00494 {
+00495  file_cache fc;
+00496  public:
+00501          FileReader();
+00507          FileReader(std::string filename);
+00511          ~FileReader();
+00517          void LoadFile(std::string filename);
+00522          bool Exists();
+00523          std::string GetLine(int x);
+00529          int FileSize();
+00530 };
 00531 
-00532 typedef DLLFactory<ModuleFactory> ircd_module;
-00533 
-00534 #endif
-
    Generated on Tue Apr 6 11:42:30 2004 for InspIRCd by
+00532 
+00539 class ModuleFactory : public classbase
+00540 {
+00541  public:
+00542         ModuleFactory() { }
+00543         virtual ~ModuleFactory() { }
+00548         virtual Module * CreateModule() = 0;
+00549 };
+00550 
+00551 
+00552 typedef DLLFactory<ModuleFactory> ircd_module;
+00553 
+00554 #endif
+
    Generated on Tue Apr 6 21:13:19 2004 for InspIRCd by
 
 doxygen1.3-rc3 
    
diff --git a/docs/module-doc/modules_8h.html b/docs/module-doc/modules_8h.html
index bfa686391..e43381373 100644
--- a/docs/module-doc/modules_8h.html
+++ b/docs/module-doc/modules_8h.html
@@ -221,7 +221,7 @@ Definition at line 17 of
 
    
 Definition at line 18 of file modules.h.
 
    
-Referenced by Server::AddExtendedMode().    
+Referenced by Server::AddExtendedMode().    
   
 
 
    
@@ -247,7 +247,7 @@ Referenced by Server::AddEx
 
    
 Definition at line 19 of file modules.h.
 
    
-Referenced by Server::AddExtendedMode().    
+Referenced by Server::AddExtendedMode().    
   
 
 
    
@@ -348,7 +348,7 @@ Low level definition of a FileReader
 Definition at line 29 of file modules.h.
 
    
-Referenced by FileReader::FileReader(), and FileReader::LoadFile().    
+Referenced by FileReader::FileReader(), and FileReader::LoadFile().    
   
 
 
    
@@ -372,7 +372,7 @@ Referenced by FileReader::F
 
    
 
 
    
-Definition at line 532 of file modules.h.    
+Definition at line 552 of file modules.h.    
   
 
 
    
@@ -449,7 +449,7 @@ Definition at line 30 of
 
    
 
 
    
-Referenced by Server::AddCommand().    
+Referenced by Server::AddCommand().    
   
 
 
    
@@ -495,10 +495,10 @@ Referenced by Server::AddCo
 
    
 
 
    
-Referenced by Server::SendMode().    
+Referenced by Server::SendMode().    
   
 
-
    Generated on Tue Apr 6 11:42:34 2004 for InspIRCd by
+
    Generated on Tue Apr 6 21:13:33 2004 for InspIRCd by
 
 doxygen1.3-rc3 
    
diff --git a/docs/module-doc/namespaces.html b/docs/module-doc/namespaces.html
index 333e5f65b..909dd0d39 100644
--- a/docs/module-doc/namespaces.html
+++ b/docs/module-doc/namespaces.html
@@ -9,7 +9,7 @@
 
    InspIRCd Namespace List
    Here is a list of all namespaces with brief descriptions:
    
   
    std
    
 
    
-
    Generated on Tue Apr 6 11:42:49 2004 for InspIRCd by
+
    Generated on Tue Apr 6 21:14:23 2004 for InspIRCd by
 
 doxygen1.3-rc3 
    
diff --git a/docs/module-doc/namespacestd.html b/docs/module-doc/namespacestd.html
index c47c030a5..50b2f95e1 100644
--- a/docs/module-doc/namespacestd.html
+++ b/docs/module-doc/namespacestd.html
@@ -11,7 +11,7 @@
 
    
 
    
 
    
-
    Generated on Tue Apr 6 11:42:49 2004 for InspIRCd by
+
    Generated on Tue Apr 6 21:14:23 2004 for InspIRCd by
 
 doxygen1.3-rc3 
    
diff --git a/docs/module-doc/servers_8cpp-source.html b/docs/module-doc/servers_8cpp-source.html
index baa093388..bebb0f160 100644
--- a/docs/module-doc/servers_8cpp-source.html
+++ b/docs/module-doc/servers_8cpp-source.html
@@ -46,7 +46,7 @@
 00038         fd = 0;
 00039 }
 00040 
-
    Generated on Tue Apr 6 11:42:30 2004 for InspIRCd by
+
    Generated on Tue Apr 6 21:13:19 2004 for InspIRCd by
 
 doxygen1.3-rc3 
    
diff --git a/docs/module-doc/servers_8cpp.html b/docs/module-doc/servers_8cpp.html
index 72c0485cf..2aaff1bfc 100644
--- a/docs/module-doc/servers_8cpp.html
+++ b/docs/module-doc/servers_8cpp.html
@@ -23,7 +23,7 @@ Include dependency graph for servers.cpp:
    Go to the source code of this file.
    
 
    
 
    
-
    Generated on Tue Apr 6 11:42:35 2004 for InspIRCd by
+
    Generated on Tue Apr 6 21:13:34 2004 for InspIRCd by
 
 doxygen1.3-rc3 
    
diff --git a/docs/module-doc/servers_8h-source.html b/docs/module-doc/servers_8h-source.html
index 6d0a538af..3947cce61 100644
--- a/docs/module-doc/servers_8h-source.html
+++ b/docs/module-doc/servers_8h-source.html
@@ -44,7 +44,7 @@
 00060 
 00061 #endif
 00062 
-
    Generated on Tue Apr 6 11:42:30 2004 for InspIRCd by
+
    Generated on Tue Apr 6 21:13:19 2004 for InspIRCd by
 
 doxygen1.3-rc3 
    
diff --git a/docs/module-doc/servers_8h.html b/docs/module-doc/servers_8h.html
index 34123af62..ff0fd16ce 100644
--- a/docs/module-doc/servers_8h.html
+++ b/docs/module-doc/servers_8h.html
@@ -82,7 +82,7 @@ Definition at line 14 of
 Definition at line 15 of file servers.h.    
   
 
-
    Generated on Tue Apr 6 11:42:35 2004 for InspIRCd by
+
    Generated on Tue Apr 6 21:13:36 2004 for InspIRCd by
 
 doxygen1.3-rc3 
    
diff --git a/docs/module-doc/users_8cpp-source.html b/docs/module-doc/users_8cpp-source.html
index 2a71381c2..e4b99f245 100644
--- a/docs/module-doc/users_8cpp-source.html
+++ b/docs/module-doc/users_8cpp-source.html
@@ -93,7 +93,7 @@
 00085                 }
 00086         }
 00087 }
-
    Generated on Tue Apr 6 11:42:30 2004 for InspIRCd by
+
    Generated on Tue Apr 6 21:13:20 2004 for InspIRCd by
 
 doxygen1.3-rc3 
    
diff --git a/docs/module-doc/users_8cpp.html b/docs/module-doc/users_8cpp.html
index 789f8b105..85fe7b735 100644
--- a/docs/module-doc/users_8cpp.html
+++ b/docs/module-doc/users_8cpp.html
@@ -25,7 +25,7 @@ Include dependency graph for users.cpp:
    Go to the source code of this file.
    
 
    
 
    
-
    Generated on Tue Apr 6 11:42:36 2004 for InspIRCd by
+
    Generated on Tue Apr 6 21:13:37 2004 for InspIRCd by
 
 doxygen1.3-rc3 
    
diff --git a/docs/module-doc/users_8h-source.html b/docs/module-doc/users_8h-source.html
index dee94e172..fb6e45302 100644
--- a/docs/module-doc/users_8h-source.html
+++ b/docs/module-doc/users_8h-source.html
@@ -102,7 +102,7 @@
 00150 
 00151 
 00152 #endif
-
    Generated on Tue Apr 6 11:42:30 2004 for InspIRCd by
+
    Generated on Tue Apr 6 21:13:20 2004 for InspIRCd by
 
 doxygen1.3-rc3 
    
diff --git a/docs/module-doc/users_8h.html b/docs/module-doc/users_8h.html
index 519038f5a..027b085c8 100644
--- a/docs/module-doc/users_8h.html
+++ b/docs/module-doc/users_8h.html
@@ -245,7 +245,7 @@ Holds a complete list of all channels to which a user has been invited and has n
 Definition at line 52 of file users.h.    
   
 
-
    Generated on Tue Apr 6 11:42:36 2004 for InspIRCd by
+
    Generated on Tue Apr 6 21:13:39 2004 for InspIRCd by
 
 doxygen1.3-rc3 
    
diff --git a/include/modules.h b/include/modules.h
index 75581b98f..4e3f5368b 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -207,7 +207,7 @@ class Module : public classbase
 	 * 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.
 	 */
-	virtual void Module::OnWhois(userrec* source, userrec* dest);
+	virtual void OnWhois(userrec* source, userrec* dest);
 	
 	/** 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
diff --git a/src/InspIRCd.layout b/src/InspIRCd.layout
index df2b4d31f..60f36e9a1 100644
--- a/src/InspIRCd.layout
+++ b/src/InspIRCd.layout
@@ -1,5 +1,5 @@
 [Editors]
-Focused=4
+Focused=-1
 Order=7,3,2,6,25,24,4,5,0,-1,1
 
 [Editor_0]
@@ -36,8 +36,8 @@ LeftChar=1
 
 [Editor_4]
 Open=1
-Top=1
-CursorCol=13
+Top=0
+CursorCol=77
 CursorRow=124
 TopLine=90
 LeftChar=1
@@ -164,10 +164,10 @@ LeftChar=1
 
 [Editor_20]
 Open=1
-Top=0
-CursorCol=78
-CursorRow=230
-TopLine=189
+Top=1
+CursorCol=15
+CursorRow=210
+TopLine=176
 LeftChar=1
 
 [Editor_21]