4 files changed, 91 insertions, 0 deletions
diff --git a/src/mode.cpp b/src/mode.cpp
index 320ba6195..6f212bdad 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -55,6 +55,13 @@ using namespace std;
 /* +v (channel voice) */
 #include "modes/cmode_v.h"
 
+/* +s (server notices) */
+#include "modes/umode_s.h"
+/* +w (see wallops) */
+#include "modes/umode_w.h"
+/* +i (invisible) */
+#include "modes/umode_i.h"
+
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
@@ -456,6 +463,10 @@ void ModeParser::CleanMask(std::string &mask)
 	}
 }
 
+void ModeParser::BuildModeString(userrec* user)
+{
+}
+
 bool ModeParser::AddMode(ModeHandler* mh, unsigned const char modeletter)
 {
 	unsigned char mask = 0;
@@ -505,6 +516,11 @@ ModeParser::ModeParser()
 	this->AddMode(new ModeChannelHalfOp, 'h');
 	this->AddMode(new ModeChannelVoice, 'v');
 
+	/* Now for usermodes */
+	this->AddMode(new ModeUserServerNotice, 's');
+	this->AddMode(new ModeUserWallops, 'w');
+	this->AddMode(new ModeUserInvisible, 'i');
+
 	/* TODO: User modes +swio */
 }
 
diff --git a/src/modes/umode_i.cpp b/src/modes/umode_i.cpp
new file mode 100644
index 000000000..08af105ca
--- /dev/null
+++ b/src/modes/umode_i.cpp
@@ -0,0 +1,25 @@
+#include "inspircd.h"
+#include "mode.h"
+#include "channels.h"
+#include "users.h"
+#include "modes/umode_i.h"
+
+ModeUserInvisible::ModeUserInvisible() : ModeHandler('i', 0, 0, false, MODETYPE_USER, false)
+{
+}
+
+ModeAction ModeUserInvisible::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+{
+	/* Only opers can change other users modes */
+	if ((source != dest) && (!*source->oper))
+		return MODEACTION_ALLOW;
+
+	/* Set the bitfields */
+	adding ? dest->modebits |= UM_INVISIBLE : dest->modebits &= ~UM_INVISIBLE;
+
+	/* Use the bitfields to build the user's mode string */
+	ModeParser::BuildModeString(dest);
+
+	/* Allow the change */
+	return MODEACTION_ALLOW;
+}
diff --git a/src/modes/umode_s.cpp b/src/modes/umode_s.cpp
new file mode 100644
index 000000000..a56e29034
--- /dev/null
+++ b/src/modes/umode_s.cpp
@@ -0,0 +1,25 @@
+#include "inspircd.h"
+#include "mode.h"
+#include "channels.h"
+#include "users.h"
+#include "modes/umode_s.h"
+
+ModeUserServerNotice::ModeUserServerNotice() : ModeHandler('s', 0, 0, false, MODETYPE_USER, false)
+{
+}
+
+ModeAction ModeUserServerNotice::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+{
+	/* Only opers can change other users modes */
+	if ((source != dest) && (!*source->oper))
+		return MODEACTION_ALLOW;
+
+	/* Set the bitfields */
+	adding ? dest->modebits |= UM_SERVERNOTICE : dest->modebits &= ~UM_SERVERNOTICE;
+
+	/* Use the bitfields to build the user's mode string */
+	ModeParser::BuildModeString(dest);
+
+	/* Allow the change */
+	return MODEACTION_ALLOW;
+}
diff --git a/src/modes/umode_w.cpp b/src/modes/umode_w.cpp
new file mode 100644
index 000000000..9115a6786
--- /dev/null
+++ b/src/modes/umode_w.cpp
@@ -0,0 +1,25 @@
+#include "inspircd.h"
+#include "mode.h"
+#include "channels.h"
+#include "users.h"
+#include "modes/umode_w.h"
+
+ModeUserWallops::ModeUserWallops() : ModeHandler('w', 0, 0, false, MODETYPE_USER, false)
+{
+}
+
+ModeAction ModeUserWallops::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+{
+	/* Only opers can change other users modes */
+	if ((source != dest) && (!*source->oper))
+		return MODEACTION_ALLOW;
+
+	/* Set the bitfields */
+	adding ? dest->modebits |= UM_WALLOPS : dest->modebits &= ~UM_WALLOPS;
+
+	/* Use the bitfields to build the user's mode string */
+	ModeParser::BuildModeString(dest);
+
+	/* Allow the change */
+	return MODEACTION_ALLOW;
+}