m_jumpserver Prevent OnUserRegister from running in other modules for users we quit

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

diff --git a/include/inspircd.h b/include/inspircd.h
index cb4f1558fe051b5a68f79729e07f719b5e777fe4..78348ed54c4957d411c97a6a657d0c13eee8f4c7 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -47,6 +47,7 @@
 #endif
 
 // Required system headers.
+#include <csignal>
 #include <ctime>
 #include <cstdarg>
 #include <algorithm>
@@ -169,7 +170,7 @@ inline std::string ConvToStr(const bool in)
  */
 inline std::string ConvToStr(char in)
 {
-       return std::string(in,1);
+       return std::string(1, in);
 }
 
 /** Template function to convert any input type to std::string
@@ -454,7 +455,7 @@ class CoreExport InspIRCd
 
        /** Set to the current signal recieved
         */
-       int s_signal;
+       static sig_atomic_t s_signal;
 
        /** Protocol interface, overridden by server protocol modules
         */
@@ -705,12 +706,17 @@ class CoreExport InspIRCd
         * @return True i the mask is valid
         */
        bool IsValidMask(const std::string &mask);
-       
+
        /** Strips all color codes from the given string
-        * @para sentence The string to strip from
+        * @param sentence The string to strip from
         */
        static void StripColor(std::string &sentence);
 
+       /** Parses color codes from string values to actual color codes
+        * @param input The data to process
+        */
+       static void ProcessColors(file_cache& input);
+
        /** Rehash the local server
         */
        void RehashServer();
@@ -773,9 +779,10 @@ class CoreExport InspIRCd
 
        /** Attempt to write the process id to a given file
         * @param filename The PID file to attempt to write to
+        * @param exitonfail If true and the PID fail cannot be written log to stdout and exit, otherwise only log on failure
         * @return This function may bail if the file cannot be written
         */
-       void WritePID(const std::string &filename);
+       void WritePID(const std::string& filename, bool exitonfail = true);
 
        /** This constructor initialises all the subsystems and reads the config file.
         * @param argc The argument count passed to main()