3 files changed, 27 insertions, 21 deletions
diff --git a/src/InspIRCd.layout b/src/InspIRCd.layout
index 2588ce0bc..cfe4ed1d3 100644
--- a/src/InspIRCd.layout
+++ b/src/InspIRCd.layout
@@ -1,5 +1,5 @@
 [Editors]
-Focused=4
+Focused=1
 Order=2,4,6,3,7,25,5,24,39,42,43,-1,1,46,0,49
 
 [Editor_0]
@@ -12,10 +12,10 @@ LeftChar=1
 
 [Editor_1]
 Open=1
-Top=0
-CursorCol=1
-CursorRow=1
-TopLine=1
+Top=1
+CursorCol=42
+CursorRow=2883
+TopLine=2854
 LeftChar=1
 
 [Editor_2]
@@ -36,10 +36,10 @@ LeftChar=1
 
 [Editor_4]
 Open=1
-Top=1
-CursorCol=7
-CursorRow=557
-TopLine=545
+Top=0
+CursorCol=20
+CursorRow=639
+TopLine=626
 LeftChar=1
 
 [Editor_5]
@@ -165,9 +165,9 @@ LeftChar=1
 [Editor_20]
 Open=1
 Top=0
-CursorCol=13
-CursorRow=629
-TopLine=592
+CursorCol=34
+CursorRow=662
+TopLine=609
 LeftChar=1
 
 [Editor_21]
@@ -330,16 +330,16 @@ LeftChar=1
 [Editor_43]
 Open=1
 Top=0
-CursorCol=4
-CursorRow=688
-TopLine=661
+CursorCol=1
+CursorRow=638
+TopLine=614
 LeftChar=1
 [Editor_44]
 Open=1
 Top=0
-CursorCol=6
-CursorRow=98
-TopLine=44
+CursorCol=64
+CursorRow=64
+TopLine=29
 LeftChar=1
 [Editor_45]
 Open=1
@@ -379,7 +379,7 @@ LeftChar=1
 [Editor_50]
 Open=1
 Top=0
-CursorCol=2
-CursorRow=301
-TopLine=248
+CursorCol=65
+CursorRow=35
+TopLine=19
 LeftChar=1
diff --git a/src/commands.cpp b/src/commands.cpp
index 7750ea1b6..5cfd96eec 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -635,6 +635,11 @@ void handle_notice(char **parameters, int pcnt, userrec *user)
 	}
 }
 
+void handle_server(char **parameters, int pcnt, userrec *user)
+{
+	WriteServ(user->fd,"666 %s :You cannot identify as a server, you are a USER. IRC Operators informed.",user->nick);
+	WriteOpers("*** WARNING: %s attempted to issue a SERVER command and is registered as a user!",user->nick);
+}
 
 void handle_info(char **parameters, int pcnt, userrec *user)
 {
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 6fc06f0e7..dc7b7942a 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -2880,6 +2880,7 @@ void SetupCommandTable(void)
 	createcommand("GLINE",handle_gline,'o',1);
 	createcommand("ZLINE",handle_zline,'o',1);
 	createcommand("QLINE",handle_qline,'o',1);
+	createcommand("SERVER",handle_server,0,0);
 }
 
 void process_buffer(const char* cmdbuf,userrec *user)