Add <options:fixedquit> and <options:suffixquit> to go along with the existing <options:prefixquit>. note that fixedquit overrides both suffix and prefix if set

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6722 e03df62e-2008-0410-955e-edbf42e46eb7

2 files changed, 12 insertions, 3 deletions

diff --git a/src/cmd_quit.cpp b/src/cmd_quit.cpp
index 5c5abf7ba..5e2c023b7 100644
--- a/src/cmd_quit.cpp
+++ b/src/cmd_quit.cpp
@@ -30,7 +30,14 @@ CmdResult cmd_quit::Handle (const char** parameters, int pcnt, userrec *user)
 	std::string quitmsg;
 
 	if (IS_LOCAL(user))
-		quitmsg = pcnt ? ServerInstance->Config->PrefixQuit + std::string(parameters[0]) : "Client exited";
+	{
+		if (*ServerInstance->Config->FixedQuit)
+			quitmsg = ServerInstance->Config->FixedQuit;
+		else
+			quitmsg = pcnt ?
+				ServerInstance->Config->PrefixQuit + std::string(parameters[0]) + ServerInstance->Config->SuffixQuit
+				: "Client exited";
+	}
 	else
 		quitmsg = pcnt ? parameters[0] : "Client exited";
 
diff --git a/src/configreader.cpp b/src/configreader.cpp
index 1d4908f7a..315c1eb08 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -25,9 +25,9 @@ ServerConfig::ServerConfig(InspIRCd* Instance) : ServerInstance(Instance)
 {
 	this->ClearStack();
 	*ServerName = *Network = *ServerDesc = *AdminName = '\0';
-	*HideWhoisServer = *AdminEmail = *AdminNick = *diepass = *restartpass = '\0';
+	*HideWhoisServer = *AdminEmail = *AdminNick = *diepass = *restartpass = *FixedQuit = '\0';
 	*CustomVersion = *motd = *rules = *PrefixQuit = *DieValue = *DNSServer = '\0';
-	*UserStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = '\0';
+	*UserStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = *SuffixQuit = '\0';
 	WhoWasGroupSize = WhoWasMaxGroups = WhoWasMaxKeep = 0;
 	log_file = NULL;
 	NoUserDns = forcedebug = OperSpyWhois = nofork = HideBans = HideSplits = UndernetMsgPrefix = false;
@@ -572,6 +572,8 @@ void ServerConfig::Read(bool bail, userrec* user)
 		{"power",	"pause",	"",			new ValueContainerInt  (&this->DieDelay),		DT_INTEGER, NoValidation},
 		{"power",	"restartpass",	"",			new ValueContainerChar (this->restartpass),		DT_CHARPTR, NoValidation},
 		{"options",	"prefixquit",	"",			new ValueContainerChar (this->PrefixQuit),		DT_CHARPTR, NoValidation},
+		{"options",	"suffixquit",	"",			new ValueContainerChar (this->SuffixQuit),		DT_CHARPTR, NoValidation},
+		{"options",	"fixedquit",	"",			new ValueContainerChar (this->FixedQuit),		DT_CHARPTR, NoValidation},
 		{"options",	"loglevel",	"default",		new ValueContainerChar (debug),				DT_CHARPTR, ValidateLogLevel},
 		{"options",	"netbuffersize","10240",		new ValueContainerInt  (&this->NetBufferSize),		DT_INTEGER, ValidateNetBufferSize},
 		{"options",	"maxwho",	"128",			new ValueContainerInt  (&this->MaxWhoResults),		DT_INTEGER, ValidateMaxWho},