6 files changed, 49 insertions, 32 deletions
diff --git a/src/InspIRCd.dev b/src/InspIRCd.dev
index bdc8a2bc2..11856196d 100644
--- a/src/InspIRCd.dev
+++ b/src/InspIRCd.dev
@@ -1,7 +1,7 @@
 [Project]
 FileName=InspIRCd.dev
 Name=InspIRCd - The Inspire Internet Relay Chat Daemon
-UnitCount=48
+UnitCount=49
 Type=1
 Ver=1
 ObjFiles=
@@ -525,3 +525,13 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit49]
+FileName=modules\m_alias.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 7e3c7834a..90677110b 100644
--- a/src/InspIRCd.layout
+++ b/src/InspIRCd.layout
@@ -13,9 +13,9 @@ LeftChar=1
 [Editor_1]
 Open=1
 Top=0
-CursorCol=26
-CursorRow=1457
-TopLine=1420
+CursorCol=40
+CursorRow=2594
+TopLine=2549
 LeftChar=1
 
 [Editor_2]
@@ -37,9 +37,9 @@ LeftChar=1
 [Editor_4]
 Open=1
 Top=0
-CursorCol=1
-CursorRow=163
-TopLine=135
+CursorCol=71
+CursorRow=120
+TopLine=92
 LeftChar=1
 
 [Editor_5]
@@ -67,19 +67,19 @@ TopLine=1
 LeftChar=1
 
 [Editor_8]
-Open=0
+Open=1
 Top=0
-CursorCol=1
-CursorRow=33
-TopLine=1
+CursorCol=50
+CursorRow=31
+TopLine=7
 LeftChar=1
 
 [Editor_9]
-Open=0
+Open=1
 Top=0
 CursorCol=1
 CursorRow=113
-TopLine=58
+TopLine=26
 LeftChar=1
 
 [Editor_10]
@@ -147,7 +147,7 @@ TopLine=99
 LeftChar=1
 
 [Editor_18]
-Open=0
+Open=1
 Top=0
 CursorCol=69
 CursorRow=31
@@ -165,9 +165,9 @@ LeftChar=1
 [Editor_20]
 Open=1
 Top=0
-CursorCol=5
-CursorRow=506
-TopLine=470
+CursorCol=107
+CursorRow=164
+TopLine=140
 LeftChar=1
 
 [Editor_21]
@@ -216,7 +216,7 @@ CursorRow=13
 TopLine=23
 LeftChar=1
 [Editor_27]
-Open=0
+Open=1
 Top=0
 CursorCol=3
 CursorRow=67
@@ -288,23 +288,23 @@ LeftChar=1
 [Editor_37]
 Open=1
 Top=0
-CursorCol=3
-CursorRow=178
-TopLine=156
+CursorCol=5
+CursorRow=90
+TopLine=63
 LeftChar=1
 [Editor_38]
 Open=1
 Top=0
-CursorCol=30
-CursorRow=57
-TopLine=10
+CursorCol=72
+CursorRow=29
+TopLine=1
 LeftChar=1
 [Editor_39]
 Open=1
 Top=0
-CursorCol=25
-CursorRow=369
-TopLine=356
+CursorCol=42
+CursorRow=165
+TopLine=139
 LeftChar=1
 [Editor_40]
 Open=1
@@ -357,8 +357,15 @@ TopLine=128
 LeftChar=1
 [Editor_47]
 Open=1
-Top=1
+Top=0
 CursorCol=1
 CursorRow=52
 TopLine=4
 LeftChar=1
+[Editor_48]
+Open=1
+Top=1
+CursorCol=60
+CursorRow=87
+TopLine=53
+LeftChar=1
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 864623299..c7a7964da 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -2591,7 +2591,7 @@ void process_command(userrec *user, char* cmd)
 	for (int i = 0; i <= MODCOUNT; i++)
 	{
 		std::string oldtmp = tmp;
-		modules[i]->OnServerRaw(tmp,true);
+		modules[i]->OnServerRaw(tmp,true,user);
 		if (oldtmp != tmp)
 		{
 			log(DEBUG,"A Module changed the input string!");
diff --git a/src/message.cpp b/src/message.cpp
index eb25a672c..f7576fe47 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -162,7 +162,7 @@ void chop(char* str)
   	return;
   }
   string temp = str;
-  FOREACH_MOD OnServerRaw(temp,false);
+  FOREACH_MOD OnServerRaw(temp,false,NULL);
   const char* str2 = temp.c_str();
   sprintf(str,"%s",str2);
   
diff --git a/src/modules.cpp b/src/modules.cpp
index 7d81a9125..d2f012977 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -117,7 +117,7 @@ void Module::OnUserPart(userrec* user, chanrec* channel) { }
 void Module::OnPacketTransmit(char *p) { }
 void Module::OnPacketReceive(char *p) { }
 void Module::OnRehash() { }
-void Module::OnServerRaw(std::string &raw, bool inbound) { }
+void Module::OnServerRaw(std::string &raw, bool inbound, userrec* user) { }
 int Module::OnUserPreJoin(userrec* user, chanrec* chan, const char* cname) { return 0; }
 bool Module::OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params) { return false; }
 Version Module::GetVersion() { return Version(1,0,0,0); }
diff --git a/src/modules/m_antibottler.cpp b/src/modules/m_antibottler.cpp
index 9c6cd21c3..b8dd420cd 100644
--- a/src/modules/m_antibottler.cpp
+++ b/src/modules/m_antibottler.cpp
@@ -26,7 +26,7 @@ class ModuleAntiBottler : public Module
 	}
 
 
-	virtual void OnServerRaw(std::string &raw, bool inbound)
+	virtual void OnServerRaw(std::string &raw, bool inbound, userrec* user)
 	{
 		if (inbound)
 		{