From 023c2188f8ad4e7c0833ac6cc2e30ede4f21ce75 Mon Sep 17 00:00:00 2001
From: Adam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864>
Date: Sat, 6 Mar 2010 07:34:19 +0000
Subject: Added help for sqlsync and fixed installing mydbgen into the wrong
 directory when using configure

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2802 5417fbe8-f217-4b02-8779-1006273d7864
---
 src/Makefile                         |  2 +-
 src/modules/mysql/db_mysql_write.cpp | 26 +++++++++++++++++++++-----
 2 files changed, 22 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/Makefile b/src/Makefile
index b0b4c8863..08ca50c13 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -117,7 +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
+	$(INSTALL) bin/mydbgen $(INSTDIR)/bin/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/modules/mysql/db_mysql_write.cpp b/src/modules/mysql/db_mysql_write.cpp
index 21f2513d1..05d474603 100644
--- a/src/modules/mysql/db_mysql_write.cpp
+++ b/src/modules/mysql/db_mysql_write.cpp
@@ -313,17 +313,23 @@ static void SaveDatabases()
 class CommandSyncSQL : public Command
 {
  public:
-	CommandSyncSQL(const std::string &cname) : Command(cname, 0, 0)
+	CommandSyncSQL(const std::string &cname) : Command(cname, 0, 0, "operserv/sqlsync")
 	{
 	}
 
 	CommandReturn Execute(User *u, const std::vector<ci::string> &params)
 	{
-		notice_lang(Config.s_OperServ, u, MYSQL_SYNC_UPDATING);
+		notice_lang(Config.s_OperServ, u, OPER_SYNC_UPDATING);
 		SaveDatabases();
-		notice_lang(Config.s_OperServ, u, MYSQL_SYNC_UPDATED);
+		notice_lang(Config.s_OperServ, u, OPER_SYNC_UPDATED);
 		return MOD_CONT;
 	}
+
+	bool OnHelp(User *u, const ci::string &subcommand)
+	{
+		notice_help(Config.s_OperServ, u, OPER_HELP_SYNC);
+		return true;
+	}
 };
 
 class DBMySQLWrite : public DBMySQL
@@ -334,6 +340,9 @@ class DBMySQLWrite : public DBMySQL
 		ModuleManager::Attach(I_OnServerConnect, this);
 
 		this->AddCommand(OPERSERV, new CommandSyncSQL("SQLSYNC"));
+		
+		if (uplink_server)
+			OnServerConnect();
 	}
 
 	~DBMySQLWrite()
@@ -355,9 +364,16 @@ class DBMySQLWrite : public DBMySQL
 			I_OnChanForbidden, I_OnDelChan, I_OnChanRegistered, I_OnChanSuspend,
 			/* BotServ */
 			I_OnBotCreate, I_OnBotChange, I_OnBotDelete,
-			I_OnBotAssign, I_OnBotUnAssign
+			I_OnBotAssign, I_OnBotUnAssign,
+			/* OperServ */
+			I_OnOperServHelp
 		};
-		ModuleManager::Attach(i, this, 26);
+		ModuleManager::Attach(i, this, 27);
+	}
+
+	void OnOperServHelp(User *u)
+	{
+		notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_SQLSYNC);
 	}
 
 	EventReturn OnSaveDatabase()
-- 
cgit