Tidying of snotices (adding '***' to start of WriteOpers texts)

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

diff --git a/src/inspircd_io.cpp b/src/inspircd_io.cpp
index 88cb1438f513b10eb57f725be6727db8fe75320d..3788055a4e78a3f8e5e6178b8799b1eb1981c560 100644 (file)
--- a/src/inspircd_io.cpp
+++ b/src/inspircd_io.cpp
@@ -44,8 +44,8 @@ extern std::vector<ircd_module*> factory;
 ServerConfig::ServerConfig()
 {
        this->ClearStack();
-       *ServerName = *Network = *ServerDesc = *AdminName = '\0';
-       *AdminEmail = *AdminNick = *diepass = *restartpass = '\0';
+       *TempDir = *ServerName = *Network = *ServerDesc = *AdminName = '\0';
+       *HideWhoisServer = *AdminEmail = *AdminNick = *diepass = *restartpass = '\0';
        *CustomVersion = *motd = *rules = *PrefixQuit = *DieValue = *DNSServer = '\0';
        *OperOnlyStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = '\0';
        log_file = NULL;
@@ -227,7 +227,11 @@ void ServerConfig::Read(bool bail, userrec* user)
        ConfValue("options","customversion",0,Config->CustomVersion,&Config->config_f);
        ConfValue("options","maxtargets",0,MT,&Config->config_f);
        ConfValue("options","hidesplits",0,HS,&Config->config_f);
+       ConfValue("options","hidewhois",0,Config->HideWhoisServer,&Config->config_f);
+       ConfValue("options","tempdir",0,Config->TempDir,&Config->config_f);
 
+       if (!*Config->TempDir)
+               strlcpy(Config->TempDir,"/tmp",1024);
        Config->HideSplits = ((*HS == 'y') || (*HS == 'Y') || (*HS == '1') || (*HS == 't') || (*HS == 'T'));
         Config->SoftLimit = atoi(SLIMT);
        if (*MT)
@@ -416,12 +420,14 @@ void ServerConfig::Read(bool bail, userrec* user)
                         if (ServerInstance->UnloadModule(removing->c_str()))
                         {
                                 WriteOpers("*** REHASH UNLOADED MODULE: %s",removing->c_str());
-                                WriteServ(user->fd,"973 %s %s :Module %s successfully unloaded.",user->nick, removing->c_str(), removing->c_str());
+                                if (user)
+                                       WriteServ(user->fd,"973 %s %s :Module %s successfully unloaded.",user->nick, removing->c_str(), removing->c_str());
                                 rem++;
                         }
                         else
                         {
-                                WriteServ(user->fd,"972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->ModuleError());
+                               if (user)
+                                       WriteServ(user->fd,"972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->ModuleError());
                         }
                 }
                 if (!added_modules.empty())
@@ -430,12 +436,14 @@ void ServerConfig::Read(bool bail, userrec* user)
                         if (ServerInstance->LoadModule(adding->c_str()))
                         {
                                 WriteOpers("*** REHASH LOADED MODULE: %s",adding->c_str());
-                                WriteServ(user->fd,"975 %s %s :Module %s successfully loaded.",user->nick, adding->c_str(), adding->c_str());
+                               if (user)
+                                       WriteServ(user->fd,"975 %s %s :Module %s successfully loaded.",user->nick, adding->c_str(), adding->c_str());
                                 add++;
                         }
                         else
                         {
-                                WriteServ(user->fd,"974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->ModuleError());
+                               if (user)
+                                       WriteServ(user->fd,"974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->ModuleError());
                         }
                 }
                 log(DEFAULT,"Successfully unloaded %lu of %lu modules and loaded %lu of %lu modules.",(unsigned long)rem,(unsigned long)removed_modules.size(),
@@ -767,7 +775,7 @@ bool ServerConfig::LoadConf(const char* filename, std::stringstream *target, std
                                                                        break;
                                                                }
                                                        }
-                                                       log(DEFAULT,"Opening included file '%s'",buf);
+                                                       log(DEBUG,"Opening included file '%s'",buf);
                                                        if (*buf != '/')
                                                        {
                                                                strlcpy(confpath,CONFIG_FILE,10240);