15 files changed, 1928 insertions, 28 deletions

diff --git a/src/Makefile b/src/Makefile
index 90705ce29..b0b4c8863 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -117,6 +117,7 @@ install: services
 	test -d ${INSTDIR}/data || mkdir ${INSTDIR}/data
 	(cd ../lang ; $(MAKE) install)
 	$(CP) ../data/* $(INSTDIR)/data
+	$(INSTALL) bin/mydbgen $(INSTDIR)/data/mydbgen
 	test -d $(INSTDIR)/data/backups || mkdir $(INSTDIR)/data/backups
 	test -d $(INSTDIR)/data/logs || mkdir $(INSTDIR)/data/logs
 	@if [ "$(INSTDIR)/data/modules" ] ; then \
diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt
index 5b50147ee..7c6fe514b 100644
--- a/src/bin/CMakeLists.txt
+++ b/src/bin/CMakeLists.txt
@@ -1,7 +1,7 @@
 # If not on Windows, generate anoperc and install it along with mydbgen
 if(NOT WIN32)
   configure_file(${Anope_SOURCE_DIR}/src/bin/anoperc.in ${Anope_BINARY_DIR}/src/bin/anoperc)
-  install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/anoperc
+  install (PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/anoperc ${CMAKE_CURRENT_SOURCE_DIR}/mydbgen
     DESTINATION bin
   )
 
diff --git a/src/bin/mydbgen b/src/bin/mydbgen
new file mode 100755
index 000000000..f3599a252
--- /dev/null
+++ b/src/bin/mydbgen
@@ -0,0 +1,225 @@
+#!/bin/sh
+#
+# $Id$
+
+# Location of the .sql file with the schema
+DBSQL="tables.sql"
+
+# Schema Version
+SVER="1"
+
+# Local Version, defaults to 0
+LVER="0"
+
+TFILE="/tmp/.anopedb.$$"
+
+if [ "`eval echo -n 'a'`" = "-n a" ] ; then
+        c="\c"
+else
+        n="-n"
+fi
+
+# Fix for bug 10
+for try in HOME/services anope/data ../data data .. .
+do
+	if [ -f "$try/$DBSQL" ]; then
+		DBFILE="$try/$DBSQL"
+	fi
+done
+
+if [ ! -f "./$DBFILE" ] ; then 
+	echo "Error: Required file $DBSQL was not found!";
+	exit
+fi
+
+echo ""
+echo "This script will guide you through the process of configuring your Anope"
+echo "installation to make use of MySQL support. This script must be used for both"
+echo "new installs as well as for upgrading for users who have a previous version" 
+echo "of Anope installed"
+
+while [ -z "$SQLHOST" ] ; do
+        echo ""
+        echo "What is the hostname of your MySQL server?"
+        echo $n "-> $c"
+            read cc
+        if [ ! -z "$cc" ] ; then
+            SQLHOST=$cc
+        fi
+done
+
+while [ -z "$SQLUSER" ] ; do
+        echo ""
+        echo "What is your MySQL username?"
+        echo $n "-> $c"
+            read cc
+        if [ ! -z "$cc" ] ; then
+            SQLUSER=$cc
+        fi
+done
+
+OLD_TTY=`stty -g`
+
+echo ""
+echo "What is your MySQL password?"
+echo $n "-> $c"
+stty -echo echonl
+read cc
+SQLPASS_PREFIX=""
+if [ ! -z "$cc" ] ; then
+	SQLPASS_PREFIX="-p"
+	SQLPASS=$cc
+fi
+stty $OLD_TTY
+
+mysqlshow -h$SQLHOST -u$SQLUSER $SQLPASS_PREFIX$SQLPASS >/dev/null 2>&1
+if test "$?" = "1" ; then
+	echo "Error: Unable to login, verify your login/password and hostname"
+	exit
+fi
+
+while [ -z "$SQLDB" ] ; do
+        echo ""
+        echo "What is the name of the Anope SQL database?"
+        echo $n "-> $c"
+            read cc
+        if [ ! -z "$cc" ] ; then
+            SQLDB=$cc
+        fi
+done
+
+MYSQLDUMP="mysqldump -h$SQLHOST -u$SQLUSER $SQLPASS_PREFIX$SQLPASS $SQLDB"
+MYSQLSHOW="mysqlshow -h$SQLHOST -u$SQLUSER $SQLPASS_PREFIX$SQLPASS $SQLDB"
+MYSQL="mysql -h$SQLHOST -u$SQLUSER $SQLPASS_PREFIX$SQLPASS $SQLDB"
+
+echo ""
+
+$MYSQLSHOW | grep -q $SQLDB
+if test "$?" = "1" ; then
+	echo -n "Unable to find databse, creating... "
+	mysql -h$SQLHOST -u$SQLUSER $SQLPASS_PREFIX$SQLPASS -Bs -e "create database $SQLDB" >/dev/null 2>&1
+	if test "$?" = "0" ; then
+		echo "done!"
+	else
+		echo "failed!"
+		FAILED="$FAILED 'database creation'"
+	fi
+fi
+
+$MYSQL -Bs -e "show tables like 'anope_os_core'" | grep -q anope_os_core
+if test "$?" = "1" ; then
+	echo -n "Unable to find Anope schema, creating... "
+	$MYSQL < $DBFILE
+	if test "$?" = "0" ; then
+		echo "done!"
+	else
+		echo "failed!"
+		FAILED="$FAILED 'schema creation'"
+	fi
+else
+	# Introduced on Anope 1.6.0 -> Table anope_info
+	$MYSQL -Bs -e "show tables like 'anope_info'" | grep -q anope_info
+	if test "$?" = "1" ; then
+		echo -n "Unable to find Anope info table, creating... "
+		echo "CREATE TABLE anope_info (version int, date datetime) TYPE=MyISAM" > $TFILE
+		mysql -h$SQLHOST -u$SQLUSER $SQLPASS_PREFIX$SQLPASS $SQLDB < $TFILE >/dev/null 2>&1
+		if test "$?" = "0" ; then
+			echo "done!"
+
+		else
+			echo "failed!"
+			FAILED="$FAILED 'anope_info table'"
+		fi
+	else
+		LVER="$($MYSQL -sB -e "select version from anope_info")"
+		if test "x$LVER" = "x" ; then
+			LVER=0
+		fi
+	fi
+
+	# Introduced on Anope 1.5.14.5 -> anope_cs_info.memomax
+	$MYSQL -Bs -e "describe anope_cs_info memomax" 2> /dev/null | grep -q memomax
+	if test "$?" = "1" ; then
+		echo -n "Unable to find anope_cs_info.memomax, altering... "
+		echo "ALTER TABLE anope_cs_info ADD memomax smallint unsigned NOT NULL default 0" > $TFILE
+		mysql -h$SQLHOST -u$SQLUSER $SQLPASS_PREFIX$SQLPASS $SQLDB < $TFILE >/dev/null 2>&1
+		if test "$?" = "0" ; then
+			echo "done!"
+
+		else
+			echo "failed!"
+			FAILED="$FAILED 'anope_cs_info.memomax alter'"
+		fi
+	fi
+
+	# Introduced on Anope 1.5.14.5 -> anope_cs_info.ttb
+	$MYSQL -Bs -e "describe anope_cs_info ttb" 2> /dev/null | grep -q ttb
+	if test "$?" = "1" ; then
+		echo -n "Unable to find anope_cs_info.ttb, altering... "
+		echo "ALTER TABLE anope_cs_info ADD ttb smallint NOT NULL default 0" > $TFILE
+		mysql -h$SQLHOST -u$SQLUSER $SQLPASS_PREFIX$SQLPASS $SQLDB < $TFILE >/dev/null 2>&1
+		if test "$?" = "0" ; then
+			echo "done!"
+
+		else
+			echo "failed!"
+			FAILED="$FAILED 'anope_cs_info.ttb alter'"
+		fi
+	fi
+
+	# Introduced on Anope 1.7.7 -> status smallint to inst unsigned.
+	echo "Blindly altering status for bigger capacity... "
+	echo "ALTER TABLE anope_ns_alias CHANGE status status int(11) unsigned NOT NULL default 0" > $TFILE
+	mysql -h$SQLHOST -u$SQLUSER $SQLPASS_PREFIX$SQLPASS $SQLDB < $TFILE >/dev/null 2>&1
+
+	# Introduced on Anope 1.7.8 (620) proxy scanner removed.
+	echo "Removing proxy scanner cache... "
+	echo "DROP TABLE IF EXISTS anope_os_cache" > $TFILE
+	mysql -h$SQLHOST -u$SQLUSER $SQLPASS_PREFIX$SQLPASS $SQLDB < $TFILE >/dev/null 2>&1
+
+	echo "done!"
+
+fi
+
+echo ""
+
+# Insert initial version number. This will have to be redesigned for 1.7
+if [ $LVER -ne $SVER ]; then
+echo -n "Inserting initial version number... "
+$MYSQL -Bs -e "delete from anope_info"
+echo "INSERT INTO anope_info (version, date) VALUES ($SVER, now())" > $TFILE
+$MYSQL < $TFILE >/dev/null 2>&1
+if test "$?" = "0" ; then
+	echo "done!"
+else
+	echo "failed!"
+	FAILED="$FAILED 'version insert'"
+fi
+fi
+
+rm -f $TFILE
+if test "x$FAILED" = "x" ; then
+	# Try to find out more about this installation
+	SQLSOCK="$(mysql_config --socket 2> /dev/null)"
+	SQLPORT="$(mysql_config --port 2> /dev/null)"
+	echo ""
+	echo "Your MySQL setup is complete and your Anope schema is up to date. Make"
+	echo "sure you configure MySQL on your services.conf file prior to launching"
+	echo "Anope with MySQL support. Your configuration values are:"
+	echo ""
+	echo "mysql"
+	echo "{"
+	echo "	database = \"$SQLDB\""
+	echo "	server = \"$SQLHOST\""
+	echo "	username = \"$SQLUSER\""
+	echo "	password = \"$SQLPASS\""
+	echo "	port = \"$SQLPORT\""
+	echo "	updatedelay = \"60\""
+	echo "}"
+	echo ""
+else
+	echo "The following operations failed:"
+	echo "$FAILED"
+fi
+
+exit
diff --git a/src/core/cs_access.c b/src/core/cs_access.c
index d26891d73..bc05695a2 100644
--- a/src/core/cs_access.c
+++ b/src/core/cs_access.c
@@ -17,7 +17,6 @@
 
 static int access_del(User * u, ChannelInfo *ci, ChanAccess * access, int *perm, int uacc)
 {
-	char *nick;
 	if (!access->in_use)
 		return 0;
 	if (uacc <= access->level && !u->Account()->HasPriv("chanserv/access/modify"))
@@ -25,11 +24,11 @@ static int access_del(User * u, ChannelInfo *ci, ChanAccess * access, int *perm,
 		(*perm)++;
 		return 0;
 	}
-	nick = access->nc->display;
+	NickCore *nc = access->nc;
 	access->nc = NULL;
 	access->in_use = 0;
 
-	FOREACH_MOD(I_OnAccessDel, OnAccessDel(ci, u, nick));
+	FOREACH_MOD(I_OnAccessDel, OnAccessDel(ci, u, nc));
 
 	return 1;
 }
@@ -225,7 +224,7 @@ class CommandCSAccess : public Command
 				}
 				access->level = level;
 
-				FOREACH_MOD(I_OnAccessChange, OnAccessChange(ci, u, na->nick, level));
+				FOREACH_MOD(I_OnAccessChange, OnAccessChange(ci, u, na, level));
 
 				Alog() << Config.s_ChanServ << ": " << u->GetMask() << " (level " << ulev << ") set access level "
 					<< access->level << " to " << na->nick << " (group " << nc->display << ") on channel " << ci->name;
@@ -242,7 +241,7 @@ class CommandCSAccess : public Command
 			std::string usernick = u->nick;
 			ci->AddAccess(nc, level, usernick);
 
-			FOREACH_MOD(I_OnAccessAdd, OnAccessAdd(ci, u, na->nick, level));
+			FOREACH_MOD(I_OnAccessAdd, OnAccessAdd(ci, u, na, level));
 
 			Alog() << Config.s_ChanServ << ": " << u->GetMask() << " (level " << ulev << ") set access level "
 				<< level << " to " << na->nick << " (group " << nc->display << ") on channel " << ci->name;
@@ -326,13 +325,11 @@ class CommandCSAccess : public Command
 				/* We'll free the access entries no longer in use... */
 				ci->CleanAccess();
 
-				/* We don't know the nick if someone used numbers, so we trigger the event without
-				 * nick param. We just do this once, even if someone enters a range. -Certus */
 				/* Only call this event if na exists (if they deleted by user, not numlist).
 				 * The callback for deleting by numlist will call this event otherwise - Adam */
 				if (na)
 				{
-					FOREACH_MOD(I_OnAccessDel, OnAccessDel(ci, u, na->nick));
+					FOREACH_MOD(I_OnAccessDel, OnAccessDel(ci, u, na->nc));
 				}
 			}
 		}
diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c
index 1fa32265e..0f5f863dc 100644
--- a/src/core/cs_xop.c
+++ b/src/core/cs_xop.c
@@ -195,12 +195,12 @@ class XOPBase : public Command
 
 		if (!change)
 		{
-			FOREACH_MOD(I_OnAccessAdd, OnAccessAdd(ci, u, na->nick, level));
+			FOREACH_MOD(I_OnAccessAdd, OnAccessAdd(ci, u, na, level));
 			notice_lang(Config.s_ChanServ, u, messages[XOP_ADDED], nc->display, ci->name.c_str());
 		}
 		else
 		{
-			FOREACH_MOD(I_OnAccessChange, OnAccessChange(ci, u, na->nick, level));
+			FOREACH_MOD(I_OnAccessChange, OnAccessChange(ci, u, na, level));
 			notice_lang(Config.s_ChanServ, u, messages[XOP_MOVED], nc->display, ci->name.c_str());
 		}
 
@@ -290,7 +290,7 @@ class XOPBase : public Command
 				access->nc = NULL;
 				access->in_use = 0;
 
-				FOREACH_MOD(I_OnAccessDel, OnAccessDel(ci, u, na->nick));
+				FOREACH_MOD(I_OnAccessDel, OnAccessDel(ci, u, na->nc));
 
 				deleted = 1;
 			}
@@ -572,16 +572,16 @@ int xop_del(User *u, ChannelInfo *ci, ChanAccess *access, int *perm, int uacc, i
 {
 	if (!access->in_use || access->level != xlev)
 		return 0;
-	char *nick = access->nc->display;
 	if (uacc <= access->level && !u->Account()->HasPriv("chanserv/access/modify"))
 	{
 		++(*perm);
 		return 0;
 	}
+	NickCore *nc = access->nc;
 	access->nc = NULL;
 	access->in_use = 0;
 
-	FOREACH_MOD(I_OnAccessDel, OnAccessDel(ci, u, nick));
+	FOREACH_MOD(I_OnAccessDel, OnAccessDel(ci, u, nc));
 
 	return 1;
 }
diff --git a/src/core/db_plain.cpp b/src/core/db_plain.cpp
index c1c9cdae5..ff2a4cdf3 100644
--- a/src/core/db_plain.cpp
+++ b/src/core/db_plain.cpp
@@ -74,7 +74,7 @@ static void ReadDatabase(Module *m = NULL)
 
 		if (m)
 			MOD_RESULT = m->OnDatabaseRead(params);
-			else
+		else
 		{
 			FOREACH_RESULT(I_OnDatabaseRead, OnDatabaseRead(params));
 		}
@@ -119,7 +119,7 @@ static void ReadDatabase(Module *m = NULL)
 					try
 					{
 						if (m)
-							MOD_RESULT = m->OnDatabaseReadMetadata(nc, key, params);
+							m->OnDatabaseReadMetadata(nc, key, params);
 						else
 						{
 							FOREACH_RESULT(I_OnDatabaseReadMetadata, OnDatabaseReadMetadata(nc, key, params));
@@ -127,7 +127,7 @@ static void ReadDatabase(Module *m = NULL)
 					}
 					catch (const char *err)
 					{
-						Alog() << "[db_plain}: " << err;
+						Alog() << "[db_plain]: " << err;
 					}
 				}
 				else if (na && Type == MD_NA)
@@ -135,7 +135,7 @@ static void ReadDatabase(Module *m = NULL)
 					try
 					{
 						if (m)
-							MOD_RESULT = m->OnDatabaseReadMetadata(na, key, params);
+							m->OnDatabaseReadMetadata(na, key, params);
 						else
 						{
 							FOREACH_RESULT(I_OnDatabaseReadMetadata, OnDatabaseReadMetadata(na, key, params));
@@ -143,7 +143,7 @@ static void ReadDatabase(Module *m = NULL)
 					}
 					catch (const char *err)
 					{
-						Alog() << "[db_plain}: " << err;
+						Alog() << "[db_plain]: " << err;
 					}
 				}
 				else if (bi && Type == MD_BI)
@@ -151,7 +151,7 @@ static void ReadDatabase(Module *m = NULL)
 					try
 					{
 						if (m)
-							MOD_RESULT = m->OnDatabaseReadMetadata(bi, key, params);
+							m->OnDatabaseReadMetadata(bi, key, params);
 						else
 						{
 							FOREACH_RESULT(I_OnDatabaseReadMetadata, OnDatabaseReadMetadata(bi, key, params));
@@ -159,15 +159,15 @@ static void ReadDatabase(Module *m = NULL)
 					}
 					catch (const char *err)
 					{
-						Alog() << "[db_plain}: " << err;
-					}
+						Alog() << "[db_plain]: " << err;
 					}
+				}
 				else if (ci && Type == MD_CH)
 				{
 					try
 					{
 						if (m)
-							MOD_RESULT = m->OnDatabaseReadMetadata(ci, key, params);
+							m->OnDatabaseReadMetadata(ci, key, params);
 						else
 						{
 							FOREACH_RESULT(I_OnDatabaseReadMetadata, OnDatabaseReadMetadata(ci, key, params));
@@ -175,7 +175,7 @@ static void ReadDatabase(Module *m = NULL)
 					}
 					catch (const char *err)
 					{
-						Alog() << "[db_plain}: " << err;
+						Alog() << "[db_plain]: " << err;
 					}
 				}
 			}
diff --git a/src/core/ns_register.c b/src/core/ns_register.c
index a351711dc..fcd9c329c 100644
--- a/src/core/ns_register.c
+++ b/src/core/ns_register.c
@@ -88,6 +88,9 @@ class CommandNSConfirm : public Command
 				validate_user(user);
 			}
 		}
+		
+		FOREACH_MOD(I_OnNickRegister, OnNickRegister(na));
+
 		return MOD_CONT;
 
 	}
diff --git a/src/misc.c b/src/misc.c
index 4c786a83c..a39886ccb 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -1056,6 +1056,18 @@ std::list<ci::string> BuildStringList(const ci::string &src)
 	return Ret;
 }
 
+std::vector<std::string> BuildStringVector(const std::string &src)
+{
+	spacesepstream tokens(src);
+	std::string token;
+	std::vector<std::string> Ret;
+
+	while (tokens.GetToken(token))
+		Ret.push_back(token);
+	
+	return Ret;
+}
+
 /*************************************************************************/
 
 /**
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index 79312cb8a..6745e8a67 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -58,6 +58,7 @@ endforeach(SRC)
 file(GLOB MODULES_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*")
 remove_item_from_list(MODULES_FILES ".svn")
 remove_item_from_list(MODULES_FILES "CMakeFiles")
+remove_item_from_list(MODULES_FILES "mysql")
 
 # Iterate through this directory searching for subdirectories, and creating modules for those subdirectories
 foreach(FILE ${MODULES_FILES})
diff --git a/src/modules/Makefile b/src/modules/Makefile
index a65a497bd..b2686ae84 100644
--- a/src/modules/Makefile
+++ b/src/modules/Makefile
@@ -27,10 +27,14 @@ distclean: spotless
 .SUFFIXES: .c .cpp .so
 
 .c.so:
-	$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -o $@ $<
+	$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} \
+	$(if $(shell grep RequiredLibraries $< | grep mysqlpp),-lmysqlpp) \
+	-I../${INCLUDEDIR} -o $@ $<
 
 .cpp.so:
-	$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -o $@ $<
+	$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} \
+	$(if $(shell grep RequiredLibraries $< | grep mysqlpp),-lmysqlpp) \
+	-I../${INCLUDEDIR} -o $@ $<
 
 subs:
 	@for i in $(SUBS); do \
diff --git a/src/modules/mysql/db_mysql.h b/src/modules/mysql/db_mysql.h
new file mode 100644
index 000000000..b617b7dd5
--- /dev/null
+++ b/src/modules/mysql/db_mysql.h
@@ -0,0 +1,238 @@
+#include "module.h"
+
+struct NickAliasFlagInfo
+{
+	std::string Name;
+	NickNameFlag Flag;
+};
+
+NickAliasFlagInfo NickAliasFlags[] = {
+	{"FORBIDDEN", NS_FORBIDDEN},
+	{"NOEXPIRE", NS_NO_EXPIRE},
+	{"", static_cast<NickNameFlag>(-1)}
+};
+
+struct NickCoreFlagInfo
+{
+	std::string Name;
+	NickCoreFlag Flag;
+};
+
+NickCoreFlagInfo NickCoreFlags[] = {
+	{"KILLPROTECT", NI_KILLPROTECT},
+	{"SECURE", NI_SECURE},
+	{"MSG", NI_MSG},
+	{"MEMO_HARDMAX", NI_MEMO_HARDMAX},
+	{"MEMO_SIGNON", NI_MEMO_SIGNON},
+	{"MEMO_RECEIVE", NI_MEMO_RECEIVE},
+	{"PRIVATE", NI_PRIVATE},
+	{"HIDE_EMAIL", NI_HIDE_EMAIL},
+	{"HIDE_MASK", NI_HIDE_MASK},
+	{"HIDE_QUIT", NI_HIDE_QUIT},
+	{"KILL_QUICK", NI_KILL_QUICK},
+	{"KILL_IMMED", NI_KILL_IMMED},
+	{"MEMO_MAIL", NI_MEMO_MAIL},
+	{"HIDE_STATUS", NI_HIDE_STATUS},
+	{"SUSPENDED", NI_SUSPENDED},
+	{"AUTOOP", NI_AUTOOP},
+	{"FORBIDDEN", NI_FORBIDDEN},
+	{"", static_cast<NickCoreFlag>(-1)}
+};
+
+struct ChannelModeInfo
+{
+	std::string Name;
+	ChannelModeName Mode;
+};
+
+ChannelModeInfo ChannelModes[] = {
+	{"BLOCKCOLOR", CMODE_BLOCKCOLOR},
+	{"FLOOD", CMODE_FLOOD},
+	{"INVITE", CMODE_INVITE},
+	{"KEY", CMODE_KEY},
+	{"LIMIT", CMODE_LIMIT},
+	{"MODERATED", CMODE_MODERATED},
+	{"NOEXTERNAL", CMODE_NOEXTERNAL},
+	{"PRIVATE", CMODE_PRIVATE},
+	{"REGISTERED", CMODE_REGISTERED},
+	{"SECRET", CMODE_SECRET},
+	{"TOPIC", CMODE_TOPIC},
+	{"AUDITORIUM", CMODE_AUDITORIUM},
+	{"SSL", CMODE_SSL},
+	{"ADMINONLY", CMODE_ADMINONLY},
+	{"NOCTCP", CMODE_NOCTCP},
+	{"FILTER", CMODE_FILTER},
+	{"NOKNOCK", CMODE_NOKNOCK},
+	{"REDIRECT", CMODE_REDIRECT},
+	{"REGMODERATED", CMODE_REGMODERATED},
+	{"NONICK", CMODE_NONICK},
+	{"OPERONLY", CMODE_OPERONLY},
+	{"NONICK", CMODE_NONICK},
+	{"REGISTEREDONLY", CMODE_REGISTEREDONLY},
+	{"STRIPCOLOR", CMODE_STRIPCOLOR},
+	{"NONOTICE", CMODE_NONOTICE},
+	{"NOINVITE", CMODE_NOINVITE},
+	{"ALLINVITE", CMODE_ALLINVITE},
+	{"BLOCKCAPS", CMODE_BLOCKCAPS},
+	{"PERM", CMODE_PERM},
+	{"NICKFLOOD", CMODE_NICKFLOOD},
+	{"JOINFLOOD", CMODE_JOINFLOOD},
+	{"", static_cast<ChannelModeName>(-1)}
+};
+
+struct BotFlagInfo
+{
+	std::string Name;
+	BotServFlag Flag;
+};
+
+BotFlagInfo BotFlags[] = {
+	{"DONTKICKOPS", BS_DONTKICKOPS},
+	{"DONTKICKVOICES", BS_DONTKICKVOICES},
+	{"FANTASY", BS_FANTASY},
+	{"SYMBIOSIS", BS_SYMBIOSIS},
+	{"GREET", BS_GREET},
+	{"NOBOT", BS_NOBOT},
+	{"KICK_BOLDS", BS_KICK_BOLDS},
+	{"KICK_COLORS", BS_KICK_COLORS},
+	{"KICK_REVERSES", BS_KICK_REVERSES},
+	{"KICK_UNDERLINES", BS_KICK_UNDERLINES},
+	{"KICK_BADWORDS", BS_KICK_BADWORDS},
+	{"KICK_CAPS", BS_KICK_CAPS},
+	{"KICK_FLOOD", BS_KICK_FLOOD},
+	{"KICK_REPEAT", BS_KICK_REPEAT},
+	{"", static_cast<BotServFlag>(-1)}
+};
+
+struct ChannelFlagInfo
+{
+	std::string Name;
+	ChannelInfoFlag Flag;
+};
+
+ChannelFlagInfo ChannelFlags[] = {
+	{"KEEPTOPIC", CI_KEEPTOPIC},
+	{"SECUREOPS", CI_SECUREOPS},
+	{"PRIVATE", CI_PRIVATE},
+	{"TOPICLOCK", CI_TOPICLOCK},
+	{"RESTRICTED", CI_RESTRICTED},
+	{"PEACE", CI_PEACE},
+	{"SECURE", CI_SECURE},
+	{"FORBIDDEN", CI_FORBIDDEN},
+	{"NO_EXPIRE", CI_NO_EXPIRE},
+	{"MEMO_HARDMAX", CI_MEMO_HARDMAX},
+	{"OPNOTICE", CI_OPNOTICE},
+	{"SECUREFOUNDER", CI_SECUREFOUNDER},
+	{"SIGNKICK", CI_SIGNKICK},
+	{"SIGNKICK_LEVEL", CI_SIGNKICK_LEVEL},
+	{"XOP", CI_XOP},
+	{"SUSPENDED", CI_SUSPENDED},
+	{"PERSIST", CI_PERSIST},
+	{"", static_cast<ChannelInfoFlag>(-1)}
+};
+
+struct BotServFlagInfo
+{
+	std::string Name;
+	BotFlag Flag;
+};
+
+BotServFlagInfo BotServFlags[] = {
+	{"PRIVATE", BI_PRIVATE},
+	{"CHANSERV", BI_CHANSERV},
+	{"BOTSERV", BI_BOTSERV},
+	{"HOSTSERV", BI_HOSTSERV},
+	{"OPERSERV", BI_OPERSERV},
+	{"MEMOSERV", BI_MEMOSERV},
+	{"NICKSERV", BI_NICKSERV},
+	{"GLOBAL", BI_GLOBAL},
+	{"", static_cast<BotFlag>(-1)}
+};
+
+#define MYSQLPP_MYSQL_HEADERS_BURIED
+#include <mysql++/mysql++.h>
+
+inline std::string SQLAssign(const mysqlpp::String& s) { return s.c_str(); }
+
+class DBMySQL;
+static DBMySQL *Me;
+
+bool ExecuteQuery(mysqlpp::Query& query)
+{
+	Alog(LOG_DEBUG) << "MySQL: " << query.str();
+	
+	if (!query.execute())
+	{
+		Alog(LOG_DEBUG) << "MySQL: error executing query: " << query.error();
+		return false;
+	}
+
+	return true;
+}
+
+mysqlpp::StoreQueryResult StoreQuery(mysqlpp::Query& query)
+{
+	Alog(LOG_DEBUG) << "MySQL: " << query.str();
+
+	mysqlpp::StoreQueryResult result = query.store();
+	if (!result)
+	{
+		Alog(LOG_DEBUG) << "MySQL: error executing query: " << query.error();
+	}
+	return result;
+}
+
+class DBMySQL : public Module
+{
+ private:
+	bool LoadConfig()
+	{
+		ConfigReader config;
+
+		Database = config.ReadValue("mysql", "database", "anope", 0);
+		Server = config.ReadValue("mysql", "server", "127.0.0.1", 0);
+		SQLUser = config.ReadValue("mysql", "username", "anope", 0);
+		Password = config.ReadValue("mysql", "password", "", 0);
+		Port = config.ReadInteger("mysql", "port", "3306", 0, true);
+		Delay = config.ReadInteger("mysql", "updatedelay", "60", 0, true);
+
+		return !Password.empty();
+	}
+
+ public:
+ 	mysqlpp::Connection *Con;
+
+ 	std::string Database;
+	std::string Server;
+	std::string SQLUser;
+	std::string Password;
+	unsigned int Port;
+	unsigned int Delay;
+
+	DBMySQL(const std::string &modname, const std::string &creator) : Module(modname, creator)
+	{
+		Me = this;
+
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
+		this->SetType(SUPPORTED);
+
+		if (!LoadConfig())
+			throw ModuleException("Couldn't load config");
+
+		Con = new mysqlpp::Connection(false);
+		if (!Con->connect(Database.c_str(), Server.c_str(), SQLUser.c_str(), Password.c_str(), Port))
+		{
+			std::string Error = "MySQL: Error connecting to SQL server: ";
+			Error += Con->error();
+			delete Con;
+			throw ModuleException(Error.c_str());
+		}
+	}
+
+	virtual ~DBMySQL()
+	{
+		delete Con;
+	}
+};
+
diff --git a/src/modules/mysql/db_mysql_execute.cpp b/src/modules/mysql/db_mysql_execute.cpp
new file mode 100644
index 000000000..adeabd267
--- /dev/null
+++ b/src/modules/mysql/db_mysql_execute.cpp
@@ -0,0 +1,162 @@
+/* RequiredLibraries: mysqlpp */
+
+#include "db_mysql.h"
+#define HASH(nick)      (((nick)[0]&31)<<5 | ((nick)[1]&31))
+
+class FakeNickCore : public NickCore
+{
+ public:
+ 	FakeNickCore() : NickCore("-SQLUser")
+	{
+		if (this->next)
+			this->next->prev = this->prev;
+		if (this->prev)
+			this->prev->next = this->next;
+		else
+			nclists[HASH(this->display)] = this->next;
+	}
+
+	~FakeNickCore()
+	{
+		insert_core(this);
+	}
+
+ 	bool IsServicesOper() const { return true; }
+	bool HasCommand(const std::string &) const { return true; }
+	bool HasPriv(const std::string &) const { return true; }
+} SQLCore;
+
+class FakeUser : public User
+{
+ public:
+ 	FakeUser() : User("-SQLUser", "")
+	{
+		this->SetIdent("SQL");
+		this->host = sstrdup(Config.ServerName);
+		this->realname = sstrdup("Fake SQL User");
+		this->hostip = sstrdup("255.255.255.255");
+		this->vhost = NULL;
+
+		if (this->prev)
+			this->prev->next = this->next;
+		else
+			userlist[HASH(this->nick)] = this->next;
+		if (this->next)
+			this->next->prev = this->prev;
+		--usercnt;
+	}
+
+	~FakeUser()
+	{
+		User **list = &userlist[HASH(this->nick)];
+		this->next = *list;
+		if (*list)
+			(*list)->prev = this;
+		*list = this;
+		++usercnt;
+	}
+
+	void SetNewNick(const std::string &newnick) { this->nick = newnick; }
+
+	void SendMessage(const std::string &, const char *, ...) { }
+	void SendMessage(const std::string &, const std::string &) { }
+
+	NickCore *Account() const { return nc; }
+	const bool IsIdentified() const { return nc ? true : false; }
+} SQLUser;
+
+class SQLTimer : public Timer
+{
+ public:
+	SQLTimer() : Timer(Me->Delay, time(NULL), true) { }
+
+	void Tick(time_t)
+	{
+		mysqlpp::Query query(Me->Con);
+		mysqlpp::StoreQueryResult qres;
+
+		query << "SELECT * FROM `anope_commands`";
+		qres = StoreQuery(query);
+
+		if (qres && qres.num_rows())
+		{
+			for (size_t i = 0; i < qres.num_rows(); ++i)
+			{
+				User *u;
+				NickAlias *na = NULL;
+
+				/* If they want -SQLUser to execute the command, use it */
+				if (qres[i]["nick"] == "-SQLUser")
+				{
+					u = &SQLUser;
+					u->SetNewNick("-SQLUser");
+					SQLCore.Users.clear();
+					u->Login(&SQLCore);
+				}
+				else
+				{
+					/* See if the nick they want to execute the command is registered */
+					na = findnick(SQLAssign(qres[i]["nick"]));
+					if (na)
+					{
+						/* If it is and someone is online using that nick, use them */
+						if (!na->nc->Users.empty())
+							u = na->nc->Users.front();
+						/* Make a fake nick and use that logged in as the nick we want to use */
+						else
+						{
+							u = &SQLUser;
+							u->SetNewNick(SQLAssign(qres[i]["nick"]));
+							u->Login(na->nc);
+						}
+					}
+					else
+					{
+						/* Check if someone is online using the nick now */
+						u = finduser(SQLAssign(qres[i]["nick"]));
+						/* If they arent make a fake user, and use them */
+						if (!u)
+						{
+							u = &SQLUser;
+							u->SetNewNick(SQLAssign(qres[i]["nick"]));
+							u->Logout();
+						}
+					}
+				}
+
+				BotInfo *bi = findbot(SQLAssign(qres[i]["service"]));
+				if (!bi)
+				{
+					Alog() << "Warning: SQL command for unknown service " << qres[i]["service"];
+					continue;
+				}
+
+				// XXX this whole strtok thing needs to die
+				char *cmdbuf = sstrdup(qres[i]["command"].c_str());
+				char *cmd = strtok(cmdbuf, " ");
+				mod_run_cmd(bi->nick, u, bi->cmdTable, cmd);
+				delete [] cmdbuf;
+			}
+
+			query << "TRUNCATE TABLE `anope_commands`";
+			ExecuteQuery(query);
+		}
+	}
+};
+
+class DBMySQLExecute : public DBMySQL
+{
+	SQLTimer *_SQLTimer;
+ public:
+	DBMySQLExecute(const std::string &modname, const std::string &creator) : DBMySQL(modname, creator)
+	{
+		_SQLTimer = new SQLTimer();
+	}
+	
+	~DBMySQLExecute()
+	{
+		TimerManager::DelTimer(_SQLTimer);
+	}
+};
+
+MODULE_INIT(DBMySQLExecute)
diff --git a/src/modules/mysql/db_mysql_read.cpp b/src/modules/mysql/db_mysql_read.cpp
new file mode 100644
index 000000000..f9330270c
--- /dev/null
+++ b/src/modules/mysql/db_mysql_read.cpp
@@ -0,0 +1,515 @@
+/* RequiredLibraries: mysqlpp */
+
+#include "db_mysql.h"
+
+static std::vector<std::string> MakeVector(std::string buf)
+{
+	std::string s;
+	spacesepstream sep(buf);
+	std::vector<std::string> params;
+
+	while (sep.GetToken(s))
+	{
+		if (s[0] == ':')
+		{
+			s.erase(s.begin());
+			if (!s.empty() && !sep.StreamEnd())
+				params.push_back(s + " " + sep.GetRemaining());
+			else if (!s.empty())
+				params.push_back(s);
+		}
+		else
+			params.push_back(s);
+	}
+
+	return params;
+}
+
+static void LoadDatabase()
+{
+	mysqlpp::Query query(Me->Con);
+	mysqlpp::StoreQueryResult qres;
+
+	query << "SELECT * FROM `anope_ns_core`";
+	qres = StoreQuery(query);
+
+	if (qres)
+	{
+		for (size_t i = 0; i < qres.num_rows(); ++i)
+		{
+			NickCore *nc = new NickCore(SQLAssign(qres[i]["display"]));
+			nc->pass = SQLAssign(qres[i]["pass"]);
+			if (!qres[i]["email"].empty())
+				nc->email = sstrdup(qres[i]["email"].c_str());
+			if (!qres[i]["greet"].empty())
+				nc->greet = sstrdup(qres[i]["greet"].c_str());
+			if (!qres[i]["icq"].empty())
+				nc->icq = atol(qres[i]["icq"].c_str());
+			if (!qres[i]["url"].empty())
+				nc->url = sstrdup(qres[i]["url"].c_str());
+
+			spacesepstream sep(SQLAssign(qres[i]["flags"]));
+			std::string buf;
+			while (sep.GetToken(buf))
+			{
+				for (int j = 0; NickCoreFlags[j].Flag != -1; ++j)
+				{
+					if (NickCoreFlags[j].Name == buf)
+					{
+						nc->SetFlag(NickCoreFlags[j].Flag);
+					}
+				}
+			}
+
+			nc->language = atoi(qres[i]["language"].c_str());
+			nc->channelcount = atoi(qres[i]["channelcount"].c_str());
+			nc->memos.memomax = atoi(qres[i]["memomax"].c_str());
+		}
+	}
+
+	query << "SELECT * FROM `anope_ns_access`";
+	qres = StoreQuery(query);
+
+	if (qres)
+	{
+		for (size_t i = 0; i < qres.num_rows(); ++i)
+		{
+			NickCore *nc = findcore(qres[i]["display"].c_str());
+			if (!nc)
+			{
+				Alog() << "MySQL: Got NickCore access entry for nonexistant core " << qres[i]["display"];
+				continue;
+			}
+
+			nc->AddAccess(SQLAssign(qres[i]["access"]));
+		}
+	}
+
+	query << "SELECT * FROM `anope_ns_core_metadata`";
+	qres = StoreQuery(query);
+
+	if (qres)
+	{
+		for (size_t i = 0; i < qres.num_rows(); ++i)
+		{
+			NickCore *nc = findcore(qres[i]["display"].c_str());
+			if (!nc)
+			{
+				Alog() << "MySQL: Got NickCore access entry for nonexistant core " << qres[i]["display"];
+				continue;
+			}
+			try
+			{
+				EventReturn MOD_RESULT;
+				std::vector<std::string> Params = MakeVector(SQLAssign(qres[i]["value"]));
+				FOREACH_RESULT(I_OnDatabaseReadMetadata, OnDatabaseReadMetadata(nc, SQLAssign(qres[i]["name"]), Params));
+			}
+			catch (const char *err)
+			{
+				Alog() << "[db_mysql_read]: " << err;
+			}
+		}
+	}
+
+	query << "SELECT * FROM `anope_ns_alias`";
+	qres = StoreQuery(query);
+