Sanity checks in SAJOIN and SAPART

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

4 files changed, 36 insertions, 17 deletions

diff --git a/src/InspIRCd.layout b/src/InspIRCd.layout
index 640e52f43..c59b52571 100644
--- a/src/InspIRCd.layout
+++ b/src/InspIRCd.layout
@@ -1,5 +1,5 @@
 [Editors]
-Focused=1
+Focused=-1
 Order=7,3,2,6,25,24,4,5,-1,1,0
 
 [Editor_0]
@@ -12,10 +12,10 @@ LeftChar=1
 
 [Editor_1]
 Open=1
-Top=1
-CursorCol=18
-CursorRow=5287
-TopLine=5278
+Top=0
+CursorCol=1
+CursorRow=1
+TopLine=1
 LeftChar=1
 
 [Editor_2]
@@ -224,9 +224,9 @@ TopLine=1
 LeftChar=1
 [Editor_28]
 Open=1
-Top=0
-CursorCol=39
-CursorRow=19
+Top=1
+CursorCol=1
+CursorRow=24
 TopLine=5
 LeftChar=1
 [Editor_29]
@@ -239,9 +239,9 @@ LeftChar=1
 [Editor_30]
 Open=1
 Top=0
-CursorCol=37
-CursorRow=19
-TopLine=3
+CursorCol=1
+CursorRow=26
+TopLine=1
 LeftChar=1
 [Editor_31]
 Open=1
@@ -259,9 +259,9 @@ Top=0
 [Editor_34]
 Open=1
 Top=0
-CursorCol=62
-CursorRow=80
-TopLine=41
+CursorCol=26
+CursorRow=155
+TopLine=113
 LeftChar=1
 [Editor_35]
 Open=1
@@ -273,8 +273,8 @@ LeftChar=1
 [Editor_36]
 Open=1
 Top=0
-CursorCol=21
-CursorRow=30
+CursorCol=1
+CursorRow=34
 TopLine=1
 LeftChar=1
 [Editor_37]
diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 9459d309f..b16039abd 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -152,7 +152,7 @@ class ModuleFilter : public Module
 		std::string filterfile = Conf->ReadValue("filter","file",0);
 		// this automatically re-reads the configuration file into the class
 		MyConf = new ConfigReader(filterfile);
-		if ((filterfile == "")|| (!MyConf->Verify()))
+		if ((filterfile == "") || (!MyConf->Verify()))
 		{
 			// bail if the user forgot to create a config file
 			printf("Error, could not find <filter file=\"\"> definition in your config file!");
diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index 94175a523..e687e474d 100644
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -15,6 +15,16 @@ void handle_sajoin(char **parameters, int pcnt, userrec *user)
 	userrec* dest = Srv->FindNick(std::string(parameters[0]));
 	if (dest)
 	{
+
+		for (int x = 0; x < strlen(parameters[0]); x++)
+		{
+				if ((parameters[0][0] != '#') || (parameters[0][x] == ' ') || (parameters[0][x]> ','))
+				{
+					Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name");
+					return;
+				}
+		}
+
 		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));
 	}
diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 266ed5a04..fdbbcc102 100644
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -15,6 +15,15 @@ void handle_sapart(char **parameters, int pcnt, userrec *user)
 	userrec* dest = Srv->FindNick(std::string(parameters[0]));
 	if (dest)
 	{
+		for (int x = 0; x < strlen(parameters[0]); x++)
+		{
+				if ((parameters[0][0] != '#') || (parameters[0][x] == ' ') || (parameters[0][x]> ','))
+				{
+					Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name");
+					return;
+				}
+		}
+
 		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));
 	}