Allow configuring whether SETNAME sends snotices and is oper-only.

[user/henk/code/inspircd.git] / src / modules / m_xline_db.cpp

diff --git a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp
index ae8b209e35f01d8b0fbd14c2b1108725a5115342..90f9de9d2958f1a98e5b489b7b709478da9f6c1d 100644 (file)
--- a/src/modules/m_xline_db.cpp
+++ b/src/modules/m_xline_db.cpp
@@ -64,11 +64,6 @@ class ModuleXLineDB : public Module
                dirty = true;
        }
 
-       void OnExpireLine(XLine *line) CXX11_OVERRIDE
-       {
-               dirty = true;
-       }
-
        void OnBackgroundTimer(time_t now) CXX11_OVERRIDE
        {
                if (dirty)
@@ -92,7 +87,7 @@ class ModuleXLineDB : public Module
                if (!stream.is_open())
                {
                        ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Cannot create database \"%s\"! %s (%d)", xlinenewdbpath.c_str(), strerror(errno), errno);
-                       ServerInstance->SNO->WriteToSnoMask('a', "database: cannot create new xline db \"%s\": %s (%d)", xlinenewdbpath.c_str(), strerror(errno), errno);
+                       ServerInstance->SNO->WriteToSnoMask('x', "database: cannot create new xline db \"%s\": %s (%d)", xlinenewdbpath.c_str(), strerror(errno), errno);
                        return false;
                }
 
@@ -119,8 +114,8 @@ class ModuleXLineDB : public Module
                        {
                                XLine* line = i->second;
                                stream << "LINE " << line->type << " " << line->Displayable() << " "
-                                       << ServerInstance->Config->ServerName << " " << line->set_time << " "
-                                       << line->duration << " " << line->reason << std::endl;
+                                       << line->source << " " << line->set_time << " "
+                                       << line->duration << " :" << line->reason << std::endl;
                        }
                }
 
@@ -129,7 +124,7 @@ class ModuleXLineDB : public Module
                if (stream.fail())
                {
                        ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Cannot write to new database \"%s\"! %s (%d)", xlinenewdbpath.c_str(), strerror(errno), errno);
-                       ServerInstance->SNO->WriteToSnoMask('a', "database: cannot write to new xline db \"%s\": %s (%d)", xlinenewdbpath.c_str(), strerror(errno), errno);
+                       ServerInstance->SNO->WriteToSnoMask('x', "database: cannot write to new xline db \"%s\": %s (%d)", xlinenewdbpath.c_str(), strerror(errno), errno);
                        return false;
                }
                stream.close();
@@ -141,7 +136,7 @@ class ModuleXLineDB : public Module
                if (rename(xlinenewdbpath.c_str(), xlinedbpath.c_str()) < 0)
                {
                        ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Cannot replace old database \"%s\" with new database \"%s\"! %s (%d)", xlinedbpath.c_str(), xlinenewdbpath.c_str(), strerror(errno), errno);
-                       ServerInstance->SNO->WriteToSnoMask('a', "database: cannot replace old xline db \"%s\" with new db \"%s\": %s (%d)", xlinedbpath.c_str(), xlinenewdbpath.c_str(), strerror(errno), errno);
+                       ServerInstance->SNO->WriteToSnoMask('x', "database: cannot replace old xline db \"%s\" with new db \"%s\": %s (%d)", xlinedbpath.c_str(), xlinenewdbpath.c_str(), strerror(errno), errno);
                        return false;
                }
 
@@ -158,7 +153,7 @@ class ModuleXLineDB : public Module
                if (!stream.is_open())
                {
                        ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Cannot read database \"%s\"! %s (%d)", xlinedbpath.c_str(), strerror(errno), errno);
-                       ServerInstance->SNO->WriteToSnoMask('a', "database: cannot read xline db \"%s\": %s (%d)", xlinedbpath.c_str(), strerror(errno), errno);
+                       ServerInstance->SNO->WriteToSnoMask('x', "database: cannot read xline db \"%s\": %s (%d)", xlinedbpath.c_str(), strerror(errno), errno);
                        return false;
                }
 
@@ -171,7 +166,7 @@ class ModuleXLineDB : public Module
                        std::string command_p[7];
                        std::string tmp;
 
-                       while (tokens.GetToken(tmp) && (items < 7))
+                       while (tokens.GetTrailing(tmp) && (items < 7))
                        {
                                command_p[items] = tmp;
                                items++;
@@ -185,7 +180,7 @@ class ModuleXLineDB : public Module
                                {
                                        stream.close();
                                        ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "I got database version %s - I don't understand it", command_p[1].c_str());
-                                       ServerInstance->SNO->WriteToSnoMask('a', "database: I got a database version (%s) I don't understand", command_p[1].c_str());
+                                       ServerInstance->SNO->WriteToSnoMask('x', "database: I got a database version (%s) I don't understand", command_p[1].c_str());
                                        return false;
                                }
                        }
@@ -196,7 +191,7 @@ class ModuleXLineDB : public Module
 
                                if (!xlf)
                                {
-                                       ServerInstance->SNO->WriteToSnoMask('a', "database: Unknown line type (%s).", command_p[1].c_str());
+                                       ServerInstance->SNO->WriteToSnoMask('x', "database: Unknown line type (%s).", command_p[1].c_str());
                                        continue;
                                }