Move DumpText into User; kill unused WriteWallOps and DecreasePenalty functions

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

2 files changed, 14 insertions, 33 deletions

diff --git a/include/inspircd.h b/include/inspircd.h
index 9f7d07f5d..f185104ae 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -714,25 +714,6 @@ class CoreExport InspIRCd
 	 */
 	void RehashServer();
 
-	/** Dump text to a user target, splitting it appropriately to fit
-	 * @param User the user to dump the text to
-	 * @param LinePrefix text to prefix each complete line with
-	 * @param TextStream the text to send to the user
-	 */
-	void DumpText(User* user, const std::string &LinePrefix, std::stringstream &TextStream);
-
-	/** Dump text to a user target (local or remote)
-	 * @param user the user to dump the text to
-	 * @param text the full line of text
-	 */
-	void DumpText(User* user, const std::string &text);
-
-	/** Dump text to a user target (local or remote)
-	 * @param user the user to dump the text to
-	 * @param format the printf format string for the text to send
-	 */
-	void DumpText(User* user, const char* format, ...) CUSTOM_PRINTF(3, 4);
-
 	/** Check if the given nickmask matches too many users, send errors to the given user
 	 * @param nick A nickmask to match against
 	 * @param user A user to send error text to
diff --git a/include/users.h b/include/users.h
index 42d04696a..5153ebdd4 100644
--- a/include/users.h
+++ b/include/users.h
@@ -666,23 +666,26 @@ class CoreExport User : public StreamSocket
 	 */
 	void UnOper();
 
-	/** Write text to this user, appending CR/LF.
+	/** Write text to this user, appending CR/LF. Works on local users only.
 	 * @param text A std::string to send to the user
 	 */
 	void Write(const std::string &text);
 
 	/** Write text to this user, appending CR/LF.
+	 * Works on local users only.
 	 * @param text The format string for text to send to the user
 	 * @param ... POD-type format arguments
 	 */
 	void Write(const char *text, ...) CUSTOM_PRINTF(2, 3);
 
 	/** Write text to this user, appending CR/LF and prepending :server.name
+	 * Works on local users only.
 	 * @param text A std::string to send to the user
 	 */
 	void WriteServ(const std::string& text);
 
 	/** Write text to this user, appending CR/LF and prepending :server.name
+	 * Works on local users only.
 	 * @param text The format string for text to send to the user
 	 * @param ... POD-type format arguments
 	 */
@@ -742,18 +745,19 @@ class CoreExport User : public StreamSocket
 	 */
 	void WriteCommonQuit(const std::string &normal_text, const std::string &oper_text);
 
-	/** Write a WALLOPS message from this user to all local opers.
-	 * If this user is not opered, the function will return without doing anything.
-	 * @param text The format string to send in the WALLOPS message
-	 * @param ... Format arguments
+	/** Dump text to a user target, splitting it appropriately to fit
+	 * @param LinePrefix text to prefix each complete line with
+	 * @param TextStream the text to send to the user
+	 */
+	void SendText(const std::string &LinePrefix, std::stringstream &TextStream);
+
+	/** Write to the user, routing the line if the user is remote.
 	 */
-	void WriteWallOps(const char* text, ...) CUSTOM_PRINTF(2, 3);
+	void SendText(const std::string& line);
 
-	/** Write a WALLOPS message from this user to all local opers.
-	 * If this user is not opered, the function will return without doing anything.
-	 * @param text The text to send in the WALLOPS message
+	/** Write to the user, routing the line if the user is remote.
 	 */
-	void WriteWallOps(const std::string &text);
+	void SendText(const char* text, ...) CUSTOM_PRINTF(2, 3);
 
 	/** Return true if the user shares at least one channel with another user
 	 * @param other The other user to compare the channel list against
@@ -849,10 +853,6 @@ class CoreExport User : public StreamSocket
 	 */
 	void IncreasePenalty(int increase);
 
-	/** Decreases a user's command penalty by a set amount.
-	 */
-	void DecreasePenalty(int decrease);
-
 	void OnDataReady();
 	void OnError(BufferedSocketError error);