1) Fix for nickname overruled with new cullList stuff -- we have to change their nick, its not safe to quit them as it messes up the nick hash.

2) Add a mute flag for users, so we can drop commands from users who have been placed on the cullList. This is independent of the actual cullList and can be
used as a general mute flag e.g. by shun modules.
3) Fix /kill to also not quit the user immediately, remove need for CMD_USER_DELETED return anywhere in the code.
*** THIS NEEDS TESTING BY QA ***


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

2 files changed, 9 insertions, 1 deletions

diff --git a/include/modules.h b/include/modules.h
index 24a1be91f..473f84547 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -75,7 +75,7 @@ enum MessageType {
  * ipv4 servers, so this value will be ten times as
  * high on ipv6 servers.
  */
-#define NATIVE_API_VERSION 11013
+#define NATIVE_API_VERSION 11014
 #ifdef IPV6
 #define API_VERSION (NATIVE_API_VERSION * 10)
 #else
diff --git a/include/users.h b/include/users.h
index 1cdd53e80..d6d6fe0ab 100644
--- a/include/users.h
+++ b/include/users.h
@@ -414,6 +414,14 @@ class userrec : public connection
 	 */
 	long threshold;
 
+	/** If this is set to true, then all read operations for the user
+	 * are dropped into the bit-bucket.
+	 * This is used by the global CullList, but please note that setting this value
+	 * alone will NOT cause the user to quit. This means it can be used seperately,
+	 * for example by shun modules etc.
+	 */
+	bool muted;
+
 	/** IPV4 or IPV6 ip address. Use SetSockAddr to set this and GetProtocolFamily/
 	 * GetIPString/GetPort to obtain its values.
 	 */