Fixed idle time

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

3 files changed, 36 insertions, 25 deletions

diff --git a/src/InspIRCd.layout b/src/InspIRCd.layout
index 00d38f213..658ada2a4 100644
--- a/src/InspIRCd.layout
+++ b/src/InspIRCd.layout
@@ -13,9 +13,9 @@ LeftChar=1
 [Editor_1]
 Open=1
 Top=1
-CursorCol=1
-CursorRow=2300
-TopLine=2255
+CursorCol=2
+CursorRow=3439
+TopLine=3410
 LeftChar=1
 
 [Editor_2]
@@ -38,8 +38,8 @@ LeftChar=1
 Open=1
 Top=0
 CursorCol=1
-CursorRow=88
-TopLine=219
+CursorRow=32
+TopLine=32
 LeftChar=1
 
 [Editor_5]
@@ -101,17 +101,17 @@ LeftChar=1
 [Editor_12]
 Open=1
 Top=0
-CursorCol=1
-CursorRow=93
-TopLine=58
+CursorCol=18
+CursorRow=10
+TopLine=1
 LeftChar=1
 
 [Editor_13]
-Open=0
+Open=1
 Top=0
 CursorCol=60
 CursorRow=64
-TopLine=20
+TopLine=16
 LeftChar=1
 
 [Editor_14]
@@ -165,8 +165,8 @@ LeftChar=1
 [Editor_20]
 Open=1
 Top=0
-CursorCol=23
-CursorRow=149
+CursorCol=28
+CursorRow=115
 TopLine=408
 LeftChar=1
 
@@ -179,11 +179,11 @@ TopLine=10
 LeftChar=1
 
 [Editor_22]
-Open=0
+Open=1
 Top=0
-CursorCol=1
-CursorRow=1
-TopLine=35
+CursorCol=51
+CursorRow=87
+TopLine=67
 LeftChar=1
 
 [Editor_23]
@@ -204,14 +204,14 @@ LeftChar=1
 [Editor_25]
 Open=1
 Top=0
-CursorCol=2
-CursorRow=62
-TopLine=17
+CursorCol=1
+CursorRow=18
+TopLine=1
 LeftChar=1
 [Editor_26]
 Open=1
 Top=0
-CursorCol=48
-CursorRow=58
-TopLine=14
+CursorCol=4
+CursorRow=73
+TopLine=44
 LeftChar=1
diff --git a/src/channels.cpp b/src/channels.cpp
index f6658db95..2b2e5963e 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -38,6 +38,7 @@ void chanrec::SetCustomMode(char mode,bool mode_on)
 		temp[count] = '\0';
 		strncpy(custom_modes,temp,MAXMODES);
 		log(DEBUG,"Custom mode %c removed",mode);
+		this->SetCustomModeParam(mode,"",false);
 	}
 }
 
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index f66f4fc74..15ce95fad 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -1061,9 +1061,16 @@ char* chanmodes(chanrec *chan)
 	}
 	if (strlen(chan->custom_modes))
 	{
-		// TODO: Tack on mode parameters here -
-		// IN ORDER OF CUSTOM_MODES!
 		strncat(scratch,chan->custom_modes,MAXMODES);
+		for (int z = 0; z < strlen(chan->custom_modes); z++)
+		{
+			std::string extparam = chan->GetModeParameter(chan->custom_modes[z]);
+			if (extparam != "")
+			{
+				strcat(sparam," ");
+				strcat(sparam,extparam.c_str());
+			}
+		}
 	}
 	log(DEBUG,"chanmodes: %s %s%s",chan->name,scratch,sparam);
 	strncat(scratch,sparam,MAXMODES);
@@ -3376,6 +3383,8 @@ void handle_privmsg(char **parameters, int pcnt, userrec *user)
 {
 	userrec *dest;
 	chanrec *chan;
+
+	user->idle_lastmsg = time(NULL);
 	
 	if (loop_call(handle_privmsg,parameters,pcnt,user,0,pcnt-2,0))
 		return;
@@ -3426,6 +3435,8 @@ void handle_notice(char **parameters, int pcnt, userrec *user)
 	userrec *dest;
 	chanrec *chan;
 
+	user->idle_lastmsg = time(NULL);
+	
 	if (loop_call(handle_notice,parameters,pcnt,user,0,pcnt-2,0))
 		return;
 	if (parameters[0][0] == '#')
@@ -4464,7 +4475,6 @@ void process_command(userrec *user, char* cmd)
 				
 				if (user)
 				{
-					user->idle_lastmsg = time(NULL);
 					/* activity resets the ping pending timer */
 					user->nping = time(NULL) + 120;
 					if ((items) < cmdlist[i].min_params)