WriteChannel* functions and ChanExceptSender* functions are now methods of chanrec. They probably should be renamed too eventually.

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

4 files changed, 7 insertions, 32 deletions

diff --git a/include/channels.h b/include/channels.h
index effb65873..82a955069 100644
--- a/include/channels.h
+++ b/include/channels.h
@@ -327,6 +327,13 @@ class chanrec : public Extensible
 	 */
 	static chanrec* JoinUser(userrec *user, const char* cn, bool override, const char* key = "");
 
+	void WriteChannel(userrec* user, char* text, ...);
+	void WriteChannel(userrec* user, const std::string &text);
+	void WriteChannelWithServ(const char* ServName, const char* text, ...);
+	void WriteChannelWithServ(const char* ServName, const std::string &text);
+	void WriteAllExceptSender(userrec* user, char status, char* text, ...);
+	void WriteAllExceptSender(userrec* user, char status, const std::string& text);
+
 	/** Destructor for chanrec
 	 */
 	virtual ~chanrec() { /* stub */ }
diff --git a/include/globals.h b/include/globals.h
index ce6bde09f..ea09f4227 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -37,8 +37,6 @@ void Write(int sock,char *text, ...);
 void WriteServ(int sock, char* text, ...);
 void WriteFrom(int sock, userrec *user,char* text, ...);
 void WriteTo(userrec *source, userrec *dest,char *data, ...);
-void WriteChannel(chanrec* Ptr, userrec* user, char* text, ...);
-void ChanExceptSender(chanrec* Ptr, userrec* user, char* text, ...);
 int common_channels(userrec *u, userrec *u2);
 void WriteCommon(userrec *u, char* text, ...);
 void WriteCommonExcept(userrec *u, char* text, ...);
diff --git a/include/helperfuncs.h b/include/helperfuncs.h
index 2fa47bffe..0ef5d4691 100644
--- a/include/helperfuncs.h
+++ b/include/helperfuncs.h
@@ -52,10 +52,6 @@ void Write(int sock,char *text, ...);
 void WriteServ(int sock, char* text, ...);
 void WriteFrom(int sock, userrec *user,char* text, ...);
 void WriteTo(userrec *source, userrec *dest,char *data, ...);
-void WriteChannel(chanrec* Ptr, userrec* user, char* text, ...);
-void WriteChannelLocal(chanrec* Ptr, userrec* user, char* text, ...);
-void WriteChannelWithServ(const char* ServName, chanrec* Ptr, const char* text, ...);
-void ChanExceptSender(chanrec* Ptr, userrec* user, char status, char* text, ...);
 void WriteCommon(userrec *u, char* text, ...);
 void WriteCommonExcept(userrec *u, char* text, ...);
 void WriteOpers(const char* text, ...);
@@ -64,10 +60,6 @@ void Write_NoFormat(int sock,const char *text);
 void WriteServ_NoFormat(int sock, const char* text);
 void WriteFrom_NoFormat(int sock, userrec *user,const char* text);
 void WriteTo_NoFormat(userrec *source, userrec *dest,const char *data);
-void WriteChannel_NoFormat(chanrec* Ptr, userrec* user, const char* text);
-void WriteChannelLocal_NoFormat(chanrec* Ptr, userrec* user, const char* text);
-void WriteChannelWithServ_NoFormat(const char* ServName, chanrec* Ptr, const char* text);
-void ChanExceptSender_NoFormat(chanrec* Ptr, userrec* user, char status, const char* text);
 void WriteCommon_NoFormat(userrec *u, const char* text);
 void WriteCommonExcept_NoFormat(userrec *u, const char* text);
 void WriteOpers_NoFormat(const char* text);
diff --git a/include/modules.h b/include/modules.h
index ebd810c41..93d911959 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -1339,11 +1339,6 @@ class Server : public Extensible
 	 */
 	virtual void SendServ(int Socket, const std::string &s);
 
-	/** Writes text to a channel, but from a server, including all.
-	 * This can be used to send server notices to a group of users.
-	 */
-	virtual void SendChannelServerNotice(const std::string &ServName, chanrec* Channel, const std::string &text);
-
 	/** Sends text from a user to a socket.
 	 * This method writes a line of text to an established socket, with the given user's nick/ident
 	 * /host combination prepended, as used in PRIVSG etc commands (see RFC 1459)
@@ -1366,14 +1361,6 @@ class Server : public Extensible
 	 */
 	virtual void SendTo(userrec* Source, userrec* Dest, const std::string &s);
 
-	/** Sends text from a user to a channel (mulicast).
-	 * This method writes a line of text to a channel, with the given user's nick/ident
-	 * /host combination prepended, as used in PRIVMSG etc commands (see RFC 1459). If the
-	 * IncludeSender flag is set, then the text is also sent back to the user from which
-	 * it originated, as seen in MODE (see RFC 1459).
-	 */
-	virtual void SendChannel(userrec* User, chanrec* Channel, const std::string &s, bool IncludeSender);
-
 	/** Returns true if two users share a common channel.
 	 * This method is used internally by the NICK and QUIT commands, and the Server::SendCommon
 	 * method.
@@ -1531,15 +1518,6 @@ class Server : public Extensible
 	 * action after calling this method is to immediately bail from your handler.
 	 */
 	virtual void QuitUser(userrec* user, const std::string &reason);
-
-	/** Makes a user kick another user, with the specified reason.
-	 * If source is NULL, the server will peform the kick.
-	 * @param The person or server (if NULL) performing the KICK
-	 * @param target The person being kicked
-	 * @param chan The channel to kick from
-	 * @param reason The kick reason
-	 */
-	virtual void KickUser(userrec* source, userrec* target, chanrec* chan, const std::string &reason);
 	
 	/**  Matches text against a glob pattern.
 	 * Uses the ircd's internal matching function to match string against a globbing pattern, e.g. *!*@*.com