Add <badchan:redirect>: redirects users attempting to join a bad channel to a second...

[user/henk/code/inspircd.git] / include / inspircd.h

diff --git a/include/inspircd.h b/include/inspircd.h
index 71a809be9e12b9f5fc49f0ec4c2b13aa1fd0974e..d1e6f4005ac5234754f43a8e77efb26d3474483c 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -29,9 +29,6 @@
 #include <time.h>
 #include <stdarg.h>
 
-
-//#include <string>
-//#include <sstream>
 #include "inspircd_config.h"
 #include "uid.h"
 #include "users.h"
@@ -39,6 +36,7 @@
 #include "timer.h"
 #include "hashcomp.h"
 #include "typedefs.h"
+#include "logger.h"
 #include "usermanager.h"
 #include "socket.h"
 #include "ctables.h"
@@ -49,7 +47,6 @@
 #include "cull_list.h"
 #include "filelogger.h"
 #include "caller.h"
-//#include "inspsocket.h"
 #include "modules.h"
 #include "configreader.h"
 #include "inspstring.h"
@@ -307,10 +304,6 @@ class CoreExport InspIRCd : public classbase
         */
        socklen_t length;
 
-       /** Nonblocking file writer
-        */
-       FileLogger* Logger;
-
        /** Time offset in seconds
         * This offset is added to all calls to Time(). Use SetTimeDelta() to update
         */
@@ -392,6 +385,10 @@ class CoreExport InspIRCd : public classbase
        /** Socket engine, handles socket activity events
         */
        SocketEngine* SE;
+
+       /** LogManager handles logging.
+        */
+       LogManager *Logs;
        
        /** ModuleManager contains everything related to loading/unloading
         * modules.
@@ -561,10 +558,6 @@ class CoreExport InspIRCd : public classbase
         */
        bool OpenLog(char** argv, int argc);
 
-       /** Close the currently open log file
-        */
-       void CloseLog();
-
        /** Return true if a channel name is valid
         * @param chname A channel name to verify
         * @return True if the name is valid