Remove InspIRCd::WriteOpers in favour of snomask O

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

diff --git a/src/configreader.cpp b/src/configreader.cpp
index b5d999f1d2e543ec519fa3de82b62c808ef085ea..46db43def4ecca18772e484909b50ef1f9c507bd 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -478,7 +478,13 @@ bool ValidateInvite(ServerConfig* conf, const char*, const char*, ValueItem &dat
 
 bool ValidateSID(ServerConfig* conf, const char*, const char*, ValueItem &data)
 {
-//     std::string  sid = data.GetString();
+       const char *sid = data.GetString();
+
+       if (*sid && !conf->GetInstance()->IsSID(sid))
+       {
+               throw CoreException(std::string(sid) + " is not a valid server ID. A server ID must be 3 characters long, with the first character a digit and the next two characters a digit or letter.");
+       }
+
        return true;
 }
 
@@ -770,10 +776,10 @@ void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail,
                }
                else
                {
-                       ServerInstance->WriteOpers("There were errors in the configuration file:");
+                       ServerInstance->SNO->WriteToSnoMask('O', "There were errors in the configuration file:");
                        while (start < errors.length())
                        {
-                               ServerInstance->WriteOpers(errors.substr(start, 360).c_str());
+                               ServerInstance->SNO->WriteToSnoMask('O', errors.substr(start, 360).c_str());
                                start += 360;
                        }
                }
@@ -1206,7 +1212,7 @@ void ServerConfig::Read(bool bail, User* user, int pass)
                {
                        if (ServerInstance->Modules->Unload(removing->c_str()))
                        {
-                               ServerInstance->WriteOpers("*** REHASH UNLOADED MODULE: %s",removing->c_str());
+                               ServerInstance->SNO->WriteToSnoMask('O', "REHASH UNLOADED MODULE: %s",removing->c_str());
                                if (user)
                                        user->WriteServ("973 %s %s :Module %s successfully unloaded.",user->nick, removing->c_str(), removing->c_str());
                                rem++;
@@ -1232,7 +1238,7 @@ void ServerConfig::Read(bool bail, User* user, int pass)
 
                        if (ServerInstance->Modules->Load(adding->c_str()))
                        {
-                               ServerInstance->WriteOpers("*** REHASH LOADED MODULE: %s",adding->c_str());
+                               ServerInstance->SNO->WriteToSnoMask('O', "REHASH LOADED MODULE: %s",adding->c_str());
                                if (user)
                                        user->WriteServ("975 %s %s :Module %s successfully loaded.",user->nick, adding->c_str(), adding->c_str());
 
@@ -1257,7 +1263,7 @@ void ServerConfig::Read(bool bail, User* user, int pass)
        if (user)
                user->WriteServ("NOTICE %s :*** Successfully rehashed server.", user->nick);
        else
-               ServerInstance->WriteOpers("*** Successfully rehashed server.");
+               ServerInstance->SNO->WriteToSnoMask('O', "Successfully rehashed server.");
 }
 
 /* XXX: This can and will block! */