After discussions and thought, move umode +n to +s. This increases cross-ircd compat (both charybdis and unreal use +s for snomasks, others might in the future). This also decreases complexity for new users, and removes the redundancy. This means that just +s +cC for example will be required to view connects. (files to be renamed in next commit to not confuse svn).

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

2 files changed, 3 insertions, 30 deletions

diff --git a/include/modes/umode_s.h b/include/modes/umode_s.h
deleted file mode 100644
index 4747b15d0..000000000
--- a/include/modes/umode_s.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
- *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
- *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
- *
- * ---------------------------------------------------
- */
-
-#include "mode.h"
-
-class InspIRCd;
-
-/** User mode +s
- */
-class ModeUserServerNotice : public SimpleUserModeHandler
-{
- public:
-	ModeUserServerNotice(InspIRCd* Instance);
-	unsigned int GetCount();
-};
diff --git a/include/users.h b/include/users.h
index b3de65941..ac06f75f5 100644
--- a/include/users.h
+++ b/include/users.h
@@ -44,16 +44,14 @@ enum ClassTypes {
 /** RFC1459 channel modes
  */
 enum UserModes {
-	/** +s: Server notices */
-	UM_SERVERNOTICE = 's' - 65,
+	/** +s: Server notice mask */
+	UM_SNOMASK = 's' - 65,
 	/** +w: WALLOPS */
 	UM_WALLOPS = 'w' - 65,
 	/** +i: Invisible */
 	UM_INVISIBLE = 'i' - 65,
 	/** +o: Operator */
-	UM_OPERATOR = 'o' - 65,
-	/** +n: Server notice mask */
-	UM_SNOMASK = 'n' - 65
+	UM_OPERATOR = 'o' - 65
 };
 
 /** Registration state of a user, e.g.