diff options
| -rw-r--r-- | Changes.lang | 6 | ||||
| -rw-r--r-- | lang/cat.l | 13 | ||||
| -rw-r--r-- | lang/de.l | 13 | ||||
| -rw-r--r-- | lang/en_us.l | 12 | ||||
| -rw-r--r-- | lang/es.l | 12 | ||||
| -rw-r--r-- | lang/fr.l | 12 | ||||
| -rw-r--r-- | lang/gr.l | 12 | ||||
| -rw-r--r-- | lang/hun.l | 12 | ||||
| -rw-r--r-- | lang/it.l | 12 | ||||
| -rw-r--r-- | lang/nl.l | 12 | ||||
| -rw-r--r-- | lang/pl.l | 12 | ||||
| -rw-r--r-- | lang/pt.l | 12 | ||||
| -rw-r--r-- | lang/ru.l | 13 | ||||
| -rw-r--r-- | lang/tr.l | 12 | ||||
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/modules/mysql/db_mysql_write.cpp | 26 |
16 files changed, 183 insertions, 10 deletions
diff --git a/Changes.lang b/Changes.lang index fbecff107..32f3cd243 100644 --- a/Changes.lang +++ b/Changes.lang @@ -39,8 +39,10 @@ Anope Version 1.9.2 NICK_HELP_CMD_RESETPASS NICK_HELP_RESETPASS CHAN_UNBANNED_OTHER - MYSQL_SYNC_UPDATING - MYSQL_SYNC_UPDATED + OPER_HELP_SYNC + OPER_HELP_CMD_SQLSYNC + OPER_SYNC_UPDATING + OPER_SYNC_UPDATED *** Mod Strings: CHAN_HELP_SET diff --git a/lang/cat.l b/lang/cat.l index 809afb411..fb66e2586 100644 --- a/lang/cat.l +++ b/lang/cat.l @@ -6653,3 +6653,16 @@ OPER_UMODE_UNSUPPORTED OPER_SUPER_ADMIN_NOT_ENABLED SuperAdmin setting not enabled in services.conf + +OPER_HELP_SYNC + Syntax: SQLSYNC + + This command syncs your databases with SQL. You should + only have to execute this command once, when you initially + import your databases into SQL. +OPER_HELP_CMD_SQLSYNC + SQLSYNC Import your databases to SQL +OPER_SYNC_UPDATING + Updating MySQL. +OPER_SYNC_UPDATED + Finished updating MySQL. @@ -6644,3 +6644,16 @@ OPER_UMODE_UNSUPPORTED OPER_SUPER_ADMIN_NOT_ENABLED SuperAdmin muss in der services.conf eingeschaltet werden. + +OPER_HELP_SYNC + Syntax: SQLSYNC + + This command syncs your databases with SQL. You should + only have to execute this command once, when you initially + import your databases into SQL. +OPER_HELP_CMD_SQLSYNC + SQLSYNC Import your databases to SQL +OPER_SYNC_UPDATING + Updating MySQL. +OPER_SYNC_UPDATED + Finished updating MySQL. diff --git a/lang/en_us.l b/lang/en_us.l index 46e9e3cbb..b62e2d0d7 100644 --- a/lang/en_us.l +++ b/lang/en_us.l @@ -6321,7 +6321,15 @@ OPER_UMODE_UNSUPPORTED OPER_SUPER_ADMIN_NOT_ENABLED SuperAdmin setting not enabled in services.conf -MYSQL_SYNC_UPDATING +OPER_HELP_SYNC + Syntax: SQLSYNC + + This command syncs your databases with SQL. You should + only have to execute this command once, when you initially + import your databases into SQL. +OPER_HELP_CMD_SQLSYNC + SQLSYNC Import your databases to SQL +OPER_SYNC_UPDATING Updating MySQL. -MYSQL_SYNC_UPDATED +OPER_SYNC_UPDATED Finished updating MySQL. @@ -6619,3 +6619,15 @@ OPER_UMODE_UNSUPPORTED OPER_SUPER_ADMIN_NOT_ENABLED SuperAdmin setting not enabled in services.conf +OPER_HELP_SYNC + Syntax: SQLSYNC + + This command syncs your databases with SQL. You should + only have to execute this command once, when you initially + import your databases into SQL. +OPER_HELP_CMD_SQLSYNC + SQLSYNC Import your databases to SQL +OPER_SYNC_UPDATING + Updating MySQL. +OPER_SYNC_UPDATED + Finished updating MySQL. @@ -6653,3 +6653,15 @@ OPER_UMODE_UNSUPPORTED OPER_SUPER_ADMIN_NOT_ENABLED L'option Super-Admin n'est pas activée dans le services.conf +OPER_HELP_SYNC + Syntax: SQLSYNC + + This command syncs your databases with SQL. You should + only have to execute this command once, when you initially + import your databases into SQL. +OPER_HELP_CMD_SQLSYNC + SQLSYNC Import your databases to SQL +OPER_SYNC_UPDATING + Updating MySQL. +OPER_SYNC_UPDATED + Finished updating MySQL. @@ -6536,3 +6536,15 @@ OPER_UMODE_UNSUPPORTED OPER_SUPER_ADMIN_NOT_ENABLED SuperAdmin setting not enabled in services.conf +OPER_HELP_SYNC + Syntax: SQLSYNC + + This command syncs your databases with SQL. You should + only have to execute this command once, when you initially + import your databases into SQL. +OPER_HELP_CMD_SQLSYNC + SQLSYNC Import your databases to SQL +OPER_SYNC_UPDATING + Updating MySQL. +OPER_SYNC_UPDATED + Finished updating MySQL. diff --git a/lang/hun.l b/lang/hun.l index f1dde4773..d894ebe43 100644 --- a/lang/hun.l +++ b/lang/hun.l @@ -6429,3 +6429,15 @@ OPER_UMODE_UNSUPPORTED OPER_SUPER_ADMIN_NOT_ENABLED SuperAdmin setting not enabled in services.conf +OPER_HELP_SYNC + Syntax: SQLSYNC + + This command syncs your databases with SQL. You should + only have to execute this command once, when you initially + import your databases into SQL. +OPER_HELP_CMD_SQLSYNC + SQLSYNC Import your databases to SQL +OPER_SYNC_UPDATING + Updating MySQL. +OPER_SYNC_UPDATED + Finished updating MySQL. @@ -6405,3 +6405,15 @@ OPER_UMODE_UNSUPPORTED OPER_SUPER_ADMIN_NOT_ENABLED L'impostazione SuperAdmin non è abilitata in services.conf +OPER_HELP_SYNC + Syntax: SQLSYNC + + This command syncs your databases with SQL. You should + only have to execute this command once, when you initially + import your databases into SQL. +OPER_HELP_CMD_SQLSYNC + SQLSYNC Import your databases to SQL +OPER_SYNC_UPDATING + Updating MySQL. +OPER_SYNC_UPDATED + Finished updating MySQL. @@ -6491,3 +6491,15 @@ OPER_UMODE_UNSUPPORTED OPER_SUPER_ADMIN_NOT_ENABLED SuperAdmin instelling is niet ingeschakeld in services.conf +OPER_HELP_SYNC + Syntax: SQLSYNC + + This command syncs your databases with SQL. You should + only have to execute this command once, when you initially + import your databases into SQL. +OPER_HELP_CMD_SQLSYNC + SQLSYNC Import your databases to SQL +OPER_SYNC_UPDATING + Updating MySQL. +OPER_SYNC_UPDATED + Finished updating MySQL. @@ -7480,3 +7480,15 @@ OPER_UMODE_UNSUPPORTED OPER_SUPER_ADMIN_NOT_ENABLED Opcja SuperAdmin nie jest w³±czona w pliku konfiguracyjnym. +OPER_HELP_SYNC + Syntax: SQLSYNC + + This command syncs your databases with SQL. You should + only have to execute this command once, when you initially + import your databases into SQL. +OPER_HELP_CMD_SQLSYNC + SQLSYNC Import your databases to SQL +OPER_SYNC_UPDATING + Updating MySQL. +OPER_SYNC_UPDATED + Finished updating MySQL. @@ -6337,3 +6337,15 @@ OPER_UMODE_UNSUPPORTED OPER_SUPER_ADMIN_NOT_ENABLED Opção SuperAdmin não habilitada no arquivo services.conf +OPER_HELP_SYNC + Syntax: SQLSYNC + + This command syncs your databases with SQL. You should + only have to execute this command once, when you initially + import your databases into SQL. +OPER_HELP_CMD_SQLSYNC + SQLSYNC Import your databases to SQL +OPER_SYNC_UPDATING + Updating MySQL. +OPER_SYNC_UPDATED + Finished updating MySQL. @@ -6598,3 +6598,16 @@ OPER_UMODE_UNSUPPORTED OPER_SUPER_ADMIN_NOT_ENABLED Äèðåêòèâà SuperAdmin îòêëþ÷åíà â êîíôèãóðàöèîííîì ôàéëå ñåðâèñîâ. + +OPER_HELP_SYNC + Syntax: SQLSYNC + + This command syncs your databases with SQL. You should + only have to execute this command once, when you initially + import your databases into SQL. +OPER_HELP_CMD_SQLSYNC + SQLSYNC Import your databases to SQL +OPER_SYNC_UPDATING + Updating MySQL. +OPER_SYNC_UPDATED + Finished updating MySQL. @@ -6459,3 +6459,15 @@ OPER_UMODE_UNSUPPORTED OPER_SUPER_ADMIN_NOT_ENABLED SuperAdmin setting not enabled in services.conf +OPER_HELP_SYNC + Syntax: SQLSYNC + + This command syncs your databases with SQL. You should + only have to execute this command once, when you initially + import your databases into SQL. +OPER_HELP_CMD_SQLSYNC + SQLSYNC Import your databases to SQL +OPER_SYNC_UPDATING + Updating MySQL. +OPER_SYNC_UPDATED + Finished updating MySQL. 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> ¶ms) { - 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() |