* Fix ChanModes::ModeString to not try and set a key as a user mode ;)

* Tweak the way cyclehosts works, so that mode change is not echoed back to user who changes their host/ident


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

1 files changed, 6 insertions, 2 deletions

diff --git a/include/channels.h b/include/channels.h
index d0d221550..21cd8402d 100644
--- a/include/channels.h
+++ b/include/channels.h
@@ -428,18 +428,22 @@ class chanrec : public Extensible
 
 	/** Write to all users on a channel except a specific user, using va_args for text
 	 * @param user User whos details to prefix the line with, and to omit from receipt of the message
+	 * @param serversource If this parameter is true, use the local server name as the source of the text, otherwise,
+	 * use the nick!user@host of the user.
 	 * @param status The status of the users to write to, e.g. '@' or '%'. Use a value of 0 to write to everyone
 	 * @param text A printf-style format string which builds the output line without prefi
 	 * @param ... Zero or more POD type
 	 */
-	void WriteAllExceptSender(userrec* user, char status, char* text, ...);
+	void WriteAllExceptSender(userrec* user, bool serversource, char status, char* text, ...);
 
 	/** Write to all users on a channel except a specific user, using std::string for text
 	 * @param user User whos details to prefix the line with, and to omit from receipt of the message
+	 * @param serversource If this parameter is true, use the local server name as the source of the text, otherwise,
+	 * use the nick!user@host of the user.          
 	 * @param status The status of the users to write to, e.g. '@' or '%'. Use a value of 0 to write to everyone
 	 * @param text A std::string containing the output line without prefix
 	 */
-	void WriteAllExceptSender(userrec* user, char status, const std::string& text);
+	void WriteAllExceptSender(userrec* user, bool serversource, char status, const std::string& text);
 
 	/** Returns the maximum number of bans allowed to be set on this channel
 	 * @return The maximum number of bans allowed