5 files changed, 269 insertions, 8 deletions
diff --git a/src/InspIRCd.dev b/src/InspIRCd.dev
index 410904067..ab69c2e14 100644
--- a/src/InspIRCd.dev
+++ b/src/InspIRCd.dev
@@ -1,7 +1,7 @@
 [Project]
 FileName=InspIRCd.dev
 Name=InspIRCd
-UnitCount=28
+UnitCount=31
 Type=1
 Ver=1
 ObjFiles=
@@ -325,3 +325,33 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit29]
+FileName=modules\m_sapart.cpp
+CompileCpp=1
+Folder=Modules
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit30]
+FileName=modules\m_sanick.cpp
+CompileCpp=1
+Folder=Modules
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit31]
+FileName=modules\m_sajoin.cpp
+CompileCpp=1
+Folder=Modules
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
diff --git a/src/InspIRCd.layout b/src/InspIRCd.layout
index b50480645..3287bf7cd 100644
--- a/src/InspIRCd.layout
+++ b/src/InspIRCd.layout
@@ -1,5 +1,5 @@
 [Editors]
-Focused=4
+Focused=-1
 Order=7,3,2,6,25,24,4,5,0,-1,1
 
 [Editor_0]
@@ -13,9 +13,9 @@ LeftChar=1
 [Editor_1]
 Open=1
 Top=0
-CursorCol=17
-CursorRow=1314
-TopLine=1295
+CursorCol=20
+CursorRow=1375
+TopLine=1342
 LeftChar=1
 
 [Editor_2]
@@ -36,7 +36,7 @@ LeftChar=1
 
 [Editor_4]
 Open=1
-Top=1
+Top=0
 CursorCol=63
 CursorRow=117
 TopLine=90
@@ -141,8 +141,8 @@ LeftChar=1
 [Editor_17]
 Open=1
 Top=0
-CursorCol=51
-CursorRow=105
+CursorCol=43
+CursorRow=108
 TopLine=54
 LeftChar=1
 
@@ -222,3 +222,24 @@ CursorCol=33
 CursorRow=15
 TopLine=1
 LeftChar=1
+[Editor_28]
+Open=1
+Top=1
+CursorCol=25
+CursorRow=99
+TopLine=47
+LeftChar=1
+[Editor_29]
+Open=1
+Top=0
+CursorCol=25
+CursorRow=99
+TopLine=47
+LeftChar=1
+[Editor_30]
+Open=1
+Top=0
+CursorCol=25
+CursorRow=99
+TopLine=47
+LeftChar=1
diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
new file mode 100644
index 000000000..5e7ae9786
--- /dev/null
+++ b/src/modules/m_sajoin.cpp
@@ -0,0 +1,70 @@
+// Sajoin and +g support module by C.J.Edwards
+
+#include <stdio.h>
+#include <string>
+#include "users.h"
+#include "channels.h"
+#include "modules.h"
+
+/* $ModDesc: Provides support for unreal-style GLOBOPS and umode +g */
+
+Server *Srv;
+	 
+void handle_sajoin(char **parameters, int pcnt, userrec *user)
+{
+	userrec* dest = Srv->FindNick(std::string(parameters[0]));
+	if (dest)
+	{
+		Srv->SendOpers(std::string(user->nick)+" used SAJOIN to make "+std::String(dest->nick)+" join "+parameters[1]);
+		Srv->JoinUserToChannel(dest,std::String(parameters[1]),std::string(dest->nick));
+	}
+}
+
+
+class ModuleSajoin : public Module
+{
+ public:
+	ModuleSajoin()
+	{
+		Srv = new Server;
+		Srv->AddCommand("SAJOIN",handle_sajoin,'o',2);
+	}
+	
+	virtual ~ModuleSajoin()
+	{
+		delete Srv;
+	}
+	
+	virtual Version GetVersion()
+	{
+		return Version(1,0,0,1);
+	}
+	
+};
+
+// stuff down here is the module-factory stuff. For basic modules you can ignore this.
+
+class ModuleSajoinFactory : public ModuleFactory
+{
+ public:
+	ModuleSajoinFactory()
+	{
+	}
+	
+	~ModuleSajoinFactory()
+	{
+	}
+	
+	virtual Module * CreateModule()
+	{
+		return new ModuleSajoin;
+	}
+	
+};
+
+
+extern "C" void * init_module( void )
+{
+	return new ModuleSajoinFactory;
+}
+
diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
new file mode 100644
index 000000000..d929efd4a
--- /dev/null
+++ b/src/modules/m_sanick.cpp
@@ -0,0 +1,70 @@
+// Sanick and +g support module by C.J.Edwards
+
+#include <stdio.h>
+#include <string>
+#include "users.h"
+#include "channels.h"
+#include "modules.h"
+
+/* $ModDesc: Provides support for unreal-style GLOBOPS and umode +g */
+
+Server *Srv;
+	 
+void handle_sanick(char **parameters, int pcnt, userrec *user)
+{
+	userrec* source = Srv->FindNick(std::string(parameters[0]));
+	if (source)
+	{
+		Srv->SendOpers(std::string(user->nick)+" used SANICK to change "+std::String(dest->nick)+" to "+parameters[1]);
+		Srv->ChangeUserNick(source,std::String(parameters[1]));
+	}
+}
+
+
+class ModuleSanick : public Module
+{
+ public:
+	ModuleSanick()
+	{
+		Srv = new Server;
+		Srv->AddCommand("SANICK",handle_sanick,'o',2);
+	}
+	
+	virtual ~ModuleSanick()
+	{
+		delete Srv;
+	}
+	
+	virtual Version GetVersion()
+	{
+		return Version(1,0,0,1);
+	}
+	
+};
+
+// stuff down here is the module-factory stuff. For basic modules you can ignore this.
+
+class ModuleSanickFactory : public ModuleFactory
+{
+ public:
+	ModuleSanickFactory()
+	{
+	}
+	
+	~ModuleSanickFactory()
+	{
+	}
+	
+	virtual Module * CreateModule()
+	{
+		return new ModuleSanick;
+	}
+	
+};
+
+
+extern "C" void * init_module( void )
+{
+	return new ModuleSanickFactory;
+}
+
diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
new file mode 100644
index 000000000..6b784c93b
--- /dev/null
+++ b/src/modules/m_sapart.cpp
@@ -0,0 +1,70 @@
+// Sapart and +g support module by C.J.Edwards
+
+#include <stdio.h>
+#include <string>
+#include "users.h"
+#include "channels.h"
+#include "modules.h"
+
+/* $ModDesc: Provides support for unreal-style GLOBOPS and umode +g */
+
+Server *Srv;
+	 
+void handle_sapart(char **parameters, int pcnt, userrec *user)
+{
+	userrec* dest = Srv->FindNick(std::string(parameters[0]));
+	if (dest)
+	{
+		Srv->SendOpers(std::string(user->nick)+" used SAPART to make "+std::String(dest->nick)+" part "+parameters[1]);
+		Srv->PartUserFromChannel(dest,std::String(parameters[1]),std::string(dest->nick));
+	}
+}
+
+
+class ModuleSapart : public Module
+{
+ public:
+	ModuleSapart()
+	{
+		Srv = new Server;
+		Srv->AddCommand("SAPART",handle_sapart,'o',2);
+	}
+	
+	virtual ~ModuleSapart()
+	{
+		delete Srv;
+	}
+	
+	virtual Version GetVersion()
+	{
+		return Version(1,0,0,1);
+	}
+	
+};
+
+// stuff down here is the module-factory stuff. For basic modules you can ignore this.
+
+class ModuleSapartFactory : public ModuleFactory
+{
+ public:
+	ModuleSapartFactory()
+	{
+	}
+	
+	~ModuleSapartFactory()
+	{
+	}
+	
+	virtual Module * CreateModule()
+	{
+		return new ModuleSapart;
+	}
+	
+};
+
+
+extern "C" void * init_module( void )
+{
+	return new ModuleSapartFactory;
+}
+