Make the X-line quit message format a lot more flexible.

2 files changed, 7 insertions, 5 deletions

diff --git a/include/configreader.h b/include/configreader.h
index f2d10bd05..17561e205 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -442,9 +442,6 @@ public:
 	/** The modes to set on a new channel. May contain channel prefix modes to set on the channel creator. */
 	std::string DefaultModes;
 
-	/** If non-empty then the quit message to use when killing an X-lined user. */
-	std::string HideLines;
-
 	/** If non-empty then the value to replace the server name with in public messages. */
 	std::string HideServer;
 
@@ -463,6 +460,12 @@ public:
 	/** The message to send to users when they are banned by an X-line. */
 	std::string XLineMessage;
 
+	/** The quit message to use when killing an X-lined user. */
+	std::string XLineQuit;
+
+	/** If non-empty then the public quit message to use when killing an X-lined user. */
+	std::string XLineQuitPublic;
+
 	/** The CIDR range to use when determining if IPv4 clients are from the same origin. */
 	unsigned char IPv4Range;
 
diff --git a/include/xline.h b/include/xline.h
index 53f5451c2..5a84e13ca 100644
--- a/include/xline.h
+++ b/include/xline.h
@@ -68,10 +68,9 @@ protected:
 
 	/** Default 'apply' action. Quits the user.
 	 * @param u User to apply the line against
-	 * @param line The line typed, used for display purposes in the quit message
 	 * @param bancache If true, the user will be added to the bancache if they match. Else not.
 	 */
-	void DefaultApply(User* u, const std::string& line, bool bancache);
+	void DefaultApply(User* u, bool bancache);
 
 public: