parameters[0] -> parameter.c_str()

[user/henk/code/inspircd.git] / src / configreader.cpp

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 06a86a77528d8f0496ade64d256f67a9ca194d23..3767fbda9d0df1fe06cd482b10b7cbbdc567e6e0 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -12,8 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include <sstream>
 #include <fstream>
 #include "xline.h"
 #include "exitcodes.h"
@@ -361,12 +359,26 @@ bool ValidateInvite(ServerConfig* conf, const char* tag, const char* value, Valu
                conf->AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_OPS;
        else if (v == "all")
                conf->AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_ALL;
+       else if (v == "dynamic")
+               conf->AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_DYNAMIC;
        else
                conf->AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_NONE;
 
        return true;
 }
 
+bool ValidateSID(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+{
+       int sid = data.GetInteger();
+       if ((sid > 999) || (sid < 0))
+       {
+               sid = sid % 1000;
+               data.Set(sid);
+               conf->GetInstance()->Log(DEFAULT,"WARNING: Server ID is less than 0 or greater than 999. Set to %d", sid);
+       }
+       return true;
+}
+
 bool ValidateWhoWas(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
 {
        conf->WhoWasMaxKeep = conf->GetInstance()->Duration(data.GetString());
@@ -634,6 +646,7 @@ void ServerConfig::Read(bool bail, userrec* user)
                {"server",      "name",         "",                     new ValueContainerChar (this->ServerName),              DT_CHARPTR, ValidateServerName},
                {"server",      "description",  "Configure Me",         new ValueContainerChar (this->ServerDesc),              DT_CHARPTR, NoValidation},
                {"server",      "network",      "Network",              new ValueContainerChar (this->Network),                 DT_CHARPTR, NoValidation},
+               {"server",      "id",           "0",                    new ValueContainerInt  (&this->sid),                    DT_INTEGER, ValidateSID},
                {"admin",       "name",         "",                     new ValueContainerChar (this->AdminName),               DT_CHARPTR, NoValidation},
                {"admin",       "email",        "Mis@configu.red",      new ValueContainerChar (this->AdminEmail),              DT_CHARPTR, NoValidation},
                {"admin",       "nick",         "Misconfigured",        new ValueContainerChar (this->AdminNick),               DT_CHARPTR, NoValidation},
@@ -668,6 +681,7 @@ void ServerConfig::Read(bool bail, userrec* user)
                {"options",     "hostintopic",  "1",                    new ValueContainerBool (&this->FullHostInTopic),        DT_BOOLEAN, NoValidation},
                {"options",     "hidemodes",    "",                     new ValueContainerChar (hidemodes),                     DT_CHARPTR, ValidateModeLists},
                {"options",     "exemptchanops","",                     new ValueContainerChar (exemptchanops),                 DT_CHARPTR, ValidateExemptChanOps},
+               {"options",     "maxtargets",   "20",                   new ValueContainerUInt (&this->MaxTargets),             DT_INTEGER, ValidateMaxTargets},
                {"options",     "defaultmodes", "nt",                   new ValueContainerChar (this->DefaultModes),            DT_CHARPTR, NoValidation},
                {"pid",         "file",         "",                     new ValueContainerChar (this->PID),                     DT_CHARPTR, NoValidation},
                {"whowas",      "groupsize",    "10",                   new ValueContainerInt  (&this->WhoWasGroupSize),        DT_INTEGER, NoValidation},
@@ -922,7 +936,7 @@ void ServerConfig::Read(bool bail, userrec* user)
                {
                        for (std::vector<std::string>::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++)
                        {
-                               if (ServerInstance->UnloadModule(removing->c_str()))
+                               if (ServerInstance->Modules->Unload(removing->c_str()))
                                {
                                        ServerInstance->WriteOpers("*** REHASH UNLOADED MODULE: %s",removing->c_str());
 
@@ -934,7 +948,7 @@ void ServerConfig::Read(bool bail, userrec* user)
                                else
                                {
                                        if (user)
-                                               user->WriteServ("972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->ModuleError());
+                                               user->WriteServ("972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->Modules->LastError());
                                }
                        }
                }
@@ -943,7 +957,7 @@ void ServerConfig::Read(bool bail, userrec* user)
                {
                        for (std::vector<std::string>::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++)
                        {
-                               if (ServerInstance->LoadModule(adding->c_str()))
+                               if (ServerInstance->Modules->Load(adding->c_str()))
                                {
                                        ServerInstance->WriteOpers("*** REHASH LOADED MODULE: %s",adding->c_str());
 
@@ -955,7 +969,7 @@ void ServerConfig::Read(bool bail, userrec* user)
                                else
                                {
                                        if (user)
-                                               user->WriteServ("974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->ModuleError());
+                                               user->WriteServ("974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->Modules->LastError());
                                }
                        }
                }
@@ -1702,6 +1716,14 @@ InspIRCd* ServerConfig::GetInstance()
        return ServerInstance;
 }
 
+std::string ServerConfig::GetSID()
+{
+       std::string OurSID;
+       OurSID += (char)((sid / 100) + 48);
+       OurSID += (char)((sid / 10) % 10 + 48);
+       OurSID += (char)(sid % 10 + 48);
+       return OurSID;
+}
 
 ValueItem::ValueItem(int value)
 {
@@ -1755,4 +1777,3 @@ bool ValueItem::GetBool()
 {
        return (GetInteger() || v == "yes" || v == "true");
 }
-