Improved /version line and made it show optimisation level for support

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

2 files changed, 19 insertions, 13 deletions

diff --git a/src/InspIRCd.layout b/src/InspIRCd.layout
index 129bb7e4c..77d8b9262 100644
--- a/src/InspIRCd.layout
+++ b/src/InspIRCd.layout
@@ -1,5 +1,5 @@
 [Editors]
-Focused=24
+Focused=1
 Order=1,2,4,6,3,7,25,5,24,-1
 
 [Editor_0]
@@ -12,10 +12,10 @@ LeftChar=1
 
 [Editor_1]
 Open=1
-Top=0
-CursorCol=3
-CursorRow=729
-TopLine=692
+Top=1
+CursorCol=77
+CursorRow=5061
+TopLine=5029
 LeftChar=1
 
 [Editor_2]
@@ -37,9 +37,9 @@ LeftChar=1
 [Editor_4]
 Open=1
 Top=0
-CursorCol=1
-CursorRow=16
-TopLine=1
+CursorCol=3
+CursorRow=79
+TopLine=34
 LeftChar=1
 
 [Editor_5]
@@ -196,7 +196,7 @@ LeftChar=1
 
 [Editor_24]
 Open=1
-Top=1
+Top=0
 CursorCol=8
 CursorRow=283
 TopLine=245
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index e55fc502a..64686448e 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -733,7 +733,7 @@ std::string GetServerDescription(char* servername)
 				}
 			}
 		}
-		return "";
+		return ServerDesc; // not a remote server that can be found, it must be me.
 	}
 }
 
@@ -4707,8 +4707,11 @@ void handle_whois(char **parameters, int pcnt, userrec *user)
 				WriteServ(user->fd,"313 %s %s :is an IRC operator",user->nick, dest->nick);
 			}
 			FOREACH_MOD OnWhois(user,dest);
-			//WriteServ(user->fd,"310 %s %s :is available for help.",user->nick, dest->nick);
-			WriteServ(user->fd,"317 %s %s %d %d :seconds idle, signon time",user->nick, dest->nick, abs((dest->idle_lastmsg)-time(NULL)), dest->signon);
+			if (!strcasecmp(user->server,dest->server))
+			{
+				// idle time and signon line can only be sent if youre on the same server (according to RFC)
+				WriteServ(user->fd,"317 %s %s %d %d :seconds idle, signon time",user->nick, dest->nick, abs((dest->idle_lastmsg)-time(NULL)), dest->signon);
+			}
 			
 			WriteServ(user->fd,"318 %s %s :End of /WHOIS list.",user->nick, dest->nick);
 		}
@@ -5052,7 +5055,10 @@ void ConnectUser(userrec *user)
 
 void handle_version(char **parameters, int pcnt, userrec *user)
 {
-	WriteServ(user->fd,"351 %s :%s %s %s :%s",user->nick,VERSION,"$Revision$ $Date$",ServerName,SYSTEM);
+	char Revision[] = "$Revision$";
+	char *v1 = strtok(Revision," ");
+	char *v2 = strtok(NULL," ");
+	WriteServ(user->fd,"351 %s :%s Rev. %s %s :%s (O=%d)",user->nick,VERSION,v2,ServerName,SYSTEM,OPTIMISATION);
 }
 
 void handle_ping(char **parameters, int pcnt, userrec *user)