Move tons more stuff into class InspIRCd*, make signal handler functions static members

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

3 files changed, 3 insertions, 3 deletions

diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index 480d0b9e5..539932be4 100644
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -97,7 +97,7 @@ class cmd_cban : public command_t
 		else if (pcnt >= 2)
 		{
 			/* full form to add a CBAN */
-			if (IsValidChannelName(parameters[0]))
+			if (ServerInstance->IsChannel(parameters[0]))
 			{
 				// parameters[0] = #channel
 				// parameters[1] = 1h3m2s
diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index 643d972d1..8a917e4ba 100644
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -53,7 +53,7 @@ class Redirect : public ModeHandler
 		{
 			chanrec* c = NULL;
 
-			if (!IsValidChannelName(parameter.c_str()))
+			if (!ServerInstance->IsChannel(parameter.c_str()))
 			{
 				source->WriteServ("403 %s %s :Invalid channel name",source->nick, parameter.c_str());
 				parameter = "";
diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index 65babdfa4..8851a54ef 100644
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -48,7 +48,7 @@ class cmd_sajoin : public command_t
 				user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
 				return;
 			}
-			if (!IsValidChannelName(parameters[1]))
+			if (!ServerInstance->IsChannel(parameters[1]))
 			{
 				/* we didn't need to check this for each character ;) */
 				user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name");