From 3a2c2a916a26f4fa1844e71a9f1c2fc25337fd2b Mon Sep 17 00:00:00 2001
From: Adam <Adam@drink-coca-cola.info>
Date: Wed, 19 May 2010 16:59:16 -0400
Subject: Dont load mlock from the database until after Anope is connected, it
 doesnt know all of the available modes until then

---
 src/modules/mysql/db_mysql_read.cpp  | 60 +++++++++---------------------------
 src/modules/mysql/db_mysql_write.cpp |  4 +--
 2 files changed, 17 insertions(+), 47 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/mysql/db_mysql_read.cpp b/src/modules/mysql/db_mysql_read.cpp
index 79e59c9eb..1b4ce33fa 100644
--- a/src/modules/mysql/db_mysql_read.cpp
+++ b/src/modules/mysql/db_mysql_read.cpp
@@ -272,67 +272,37 @@ static void LoadDatabase()
 			ci->bantype = atoi(qres[i]["bantype"].c_str());
 			if (qres[i]["mlock_on"].size())
 			{
+				std::vector<std::string> modes;
 				std::string buf;
+
 				spacesepstream sep(SQLAssign(qres[i]["mlock_on"]));
 				while (sep.GetToken(buf))
-				{
-					for (std::list<Mode *>::iterator it = ModeManager::Modes.begin(); it != ModeManager::Modes.end(); ++it)
-					{
-						if ((*it)->Class == MC_CHANNEL)
-						{
-							ChannelMode *cm = dynamic_cast<ChannelMode *>(*it);
+					modes.push_back(buf);
 
-							if (buf == cm->NameAsString)
-							{
-								ci->SetMLock(cm->Name, true);
-								break;
-							}
-						}
-					}
-				}
+				ci->Extend("db_mlock_modes_on", new ExtensibleItemRegular<std::vector<std::string> >(modes));
 			}
 			if (qres[i]["mlock_off"].size())
 			{
+				std::vector<std::string> modes;
 				std::string buf;
+
 				spacesepstream sep(SQLAssign(qres[i]["mlock_off"]));
 				while (sep.GetToken(buf))
-				{
-					for (std::list<Mode *>::iterator it = ModeManager::Modes.begin(); it != ModeManager::Modes.end(); ++it)
-					{
-						if ((*it)->Class == MC_CHANNEL)
-						{
-							ChannelMode *cm = dynamic_cast<ChannelMode *>(*it);
+					modes.push_back(buf);
 
-							if (buf == cm->NameAsString)
-							{
-								ci->SetMLock(cm->Name, false);
-								break;
-							}
-						}
-					}
-				}
+				ci->Extend("db_mlock_modes_off", new ExtensibleItemRegular<std::vector<std::string> >(modes));
 			}
 			if (qres[i]["mlock_params"].size())
 			{
-				std::string buf;
+				std::vector<std::pair<std::string, std::string> > mlp;
+				std::string buf, buf2;
+
 				spacesepstream sep(SQLAssign(qres[i]["mlock_params"]));
-				while (sep.GetToken(buf))
-				{
-					for (std::list<Mode *>::iterator it = ModeManager::Modes.begin(); it != ModeManager::Modes.end(); ++it)
-					{
-						if ((*it)->Class == MC_CHANNEL)
-						{
-							ChannelMode *cm = dynamic_cast<ChannelMode *>(*it);
 
-							if (buf == cm->NameAsString)
-							{
-								sep.GetToken(buf);
-								ci->SetMLock(cm->Name, true, buf);
-								break;
-							}
-						}
-					}
-				}
+				while (sep.GetToken(buf) && sep.GetToken(buf2))
+					mlp.push_back(std::make_pair(buf, buf2));
+
+				ci->Extend("db_mlp", new ExtensibleItemRegular<std::vector<std::pair<std::string, std::string> > >(mlp));
 			}
 			if (qres[i]["entry_message"].size())
 				ci->entry_message = sstrdup(qres[i]["entry_message"].c_str());
diff --git a/src/modules/mysql/db_mysql_write.cpp b/src/modules/mysql/db_mysql_write.cpp
index 2f7a42bb3..1888195f3 100644
--- a/src/modules/mysql/db_mysql_write.cpp
+++ b/src/modules/mysql/db_mysql_write.cpp
@@ -309,7 +309,7 @@ static void SaveDatabases()
 		{
 			AutoKick *ak = ci->GetAkick(j);
 
-			me->OnAkickAdd(ci, ak);
+			me->OnAkickAdd(NULL, ci, ak);
 		}
 
 		for (int k = 0; k < CA_SIZE; ++k)
@@ -810,7 +810,7 @@ class DBMySQLWrite : public DBMySQL
 
 	void OnLevelChange(User *u, ChannelInfo *ci, int pos, int what)
 	{
-		mysqlpp::Query query(Me->Con);
+		mysqlpp::Query query(me->Con);
 
 		if (pos >= 0)
 		{
-- 
cgit