Remove custom members for +lk storage

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

2 files changed, 27 insertions, 22 deletions

diff --git a/src/modes/cmode_k.cpp b/src/modes/cmode_k.cpp
index 4d4453d44..8e7692efc 100644
--- a/src/modes/cmode_k.cpp
+++ b/src/modes/cmode_k.cpp
@@ -23,14 +23,15 @@ ModeChannelKey::ModeChannelKey(InspIRCd* Instance) : ModeHandler(Instance, 'k',
 
 ModePair ModeChannelKey::ModeSet(User*, User*, Channel* channel, const std::string &parameter)
 {       
-        if (channel->modes[CM_KEY])
-        {
-                return std::make_pair(true, channel->key);
-        }
-        else
-        {
-                return std::make_pair(false, parameter);
-        }
+    if (channel->modes[CM_KEY])
+    {
+		std::string ckey = channel->GetModeParameter('k');
+		return std::make_pair(true, ckey);
+    }
+    else
+    {
+		return std::make_pair(false, parameter);
+    }
 }
 
 void ModeChannelKey::RemoveMode(Channel* channel, irc::modestacker* stack)
@@ -42,10 +43,12 @@ void ModeChannelKey::RemoveMode(Channel* channel, irc::modestacker* stack)
 	if (channel->IsModeSet(this->GetModeChar()))
 	{
 		if (stack)
-			stack->Push(this->GetModeChar(), channel->key);
+		{
+			stack->Push(this->GetModeChar(), channel->GetModeParameter('k'));
+		}
 		else
 		{
-			std::vector<std::string> parameters; parameters.push_back(channel->name); parameters.push_back("-k"); parameters.push_back(channel->key);
+			std::vector<std::string> parameters; parameters.push_back(channel->name); parameters.push_back("-k"); parameters.push_back(channel->GetModeParameter('k'));
 			ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
 		}
 	}
@@ -65,7 +68,7 @@ ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, s
 {
 	if ((channel->IsModeSet('k') != adding) || (!IS_LOCAL(source)))
 	{
-		if (((channel->IsModeSet('k')) && (parameter != channel->key)) && (IS_LOCAL(source)))
+		if (((channel->IsModeSet('k')) && (parameter != channel->GetModeParameter('k'))) && (IS_LOCAL(source)))
 		{
 			/* Key is currently set and the correct key wasnt given */
 			return MODEACTION_DENY;
@@ -75,18 +78,18 @@ ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, s
 			/* Key isnt currently set */
 			if ((parameter.length()) && (parameter.rfind(' ') == std::string::npos))
 			{
-				channel->key.assign(parameter, 0, 32);
-				channel->SetMode('k', adding);
-				parameter = channel->key;
+				std::string ckey;
+				ckey.assign(parameter, 0, 32);
+				channel->SetMode('k', ckey.c_str());
+				parameter = ckey;
 				return MODEACTION_ALLOW;
 			}
 			else
 				return MODEACTION_DENY;
 		}
-		else if (((channel->IsModeSet('k')) && (parameter == channel->key)) || ((!adding) && (!IS_LOCAL(source))))
+		else if (((channel->IsModeSet('k')) && (parameter == channel->GetModeParameter('k'))) || ((!adding) && (!IS_LOCAL(source))))
 		{
 			/* Key is currently set, and correct key was given */
-			channel->key.clear();
 			channel->SetMode('k', adding);
 			return MODEACTION_ALLOW;
 		}
diff --git a/src/modes/cmode_l.cpp b/src/modes/cmode_l.cpp
index 4ed95bc2c..8d6a962fb 100644
--- a/src/modes/cmode_l.cpp
+++ b/src/modes/cmode_l.cpp
@@ -23,9 +23,10 @@ ModeChannelLimit::ModeChannelLimit(InspIRCd* Instance) : ModeHandler(Instance, '
 
 ModePair ModeChannelLimit::ModeSet(User*, User*, Channel* channel, const std::string &parameter)
 {
-	if (channel->limit)
+	std::string climit = channel->GetModeParameter('l');
+	if (!climit.empty())
 	{
-		return std::make_pair(true, ConvToStr(channel->limit));
+		return std::make_pair(true, climit);
 	}
 	else
 	{
@@ -52,7 +53,8 @@ ModeAction ModeChannelLimit::OnModeChange(User*, User*, Channel* channel, std::s
 
 		/* If the new limit is the same as the old limit,
 		 * and the old limit isnt 0, disallow */
-		if ((limit == channel->limit) && (channel->limit > 0))
+		std::string oldlimit = channel->GetModeParameter('l');
+		if (limit == atoi(oldlimit.c_str()) && oldlimit != "0")
 		{
 			parameter = "";
 			return MODEACTION_DENY;
@@ -70,7 +72,7 @@ ModeAction ModeChannelLimit::OnModeChange(User*, User*, Channel* channel, std::s
 		parameter = ConvToStr(limit);
 
 		/* Set new limit */
-		channel->limit = limit;
+		channel->SetModeParam('l', parameter.c_str(), true);
 		channel->modes[CM_LIMIT] = 1;
 
 		return MODEACTION_ALLOW;
@@ -80,14 +82,14 @@ ModeAction ModeChannelLimit::OnModeChange(User*, User*, Channel* channel, std::s
 		/* Check if theres a limit here to remove.
 		 * If there isnt, dont allow the -l
 		 */
-		if (!channel->limit)
+		if (channel->GetModeParameter('l').empty())
 		{
 			parameter = "";
 			return MODEACTION_DENY;
 		}
 
 		/* Removing old limit, no checks here */
-		channel->limit = 0;
+		channel->SetModeParam('l', "", false);
 		channel->modes[CM_LIMIT] = 0;
 
 		return MODEACTION_ALLOW;