summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Changes1
-rw-r--r--Changes.lang1
-rw-r--r--lang/cat.l3
-rw-r--r--lang/de.l3
-rw-r--r--lang/en_us.l3
-rw-r--r--lang/es.l15
-rw-r--r--lang/fr.l3
-rw-r--r--lang/gr.l3
-rw-r--r--lang/hun.l3
-rw-r--r--lang/it.l3
-rw-r--r--lang/nl.l3
-rw-r--r--lang/pl.l3
-rw-r--r--lang/pt.l3
-rw-r--r--lang/ru.l3
-rw-r--r--lang/tr.l3
-rw-r--r--src/operserv.c20
-rw-r--r--version.log6
17 files changed, 66 insertions, 13 deletions
diff --git a/Changes b/Changes
index fed6e0cfd..0e1828ccc 100644
--- a/Changes
+++ b/Changes
@@ -48,6 +48,7 @@ Provided by Trystan <trystan@nomadirc.net> - 2005
03/14 R Removed some old irc-services convertor ifdef's [#317]
Provided by DrStein <drstein@anope.org> - 2005
+03/17 A OS SET SQL ON shall warn about SQL disabled in services.conf [ #00]
03/15 A ChanServ will now include the channel name in SET's responses [#318]
03/15 F ChanServ's do_getkey() function is now using notice_lang() [#319]
03/14 F Updated docs/FAQ. [#312]
diff --git a/Changes.lang b/Changes.lang
index 96b5aae3e..db19d5e61 100644
--- a/Changes.lang
+++ b/Changes.lang
@@ -6,6 +6,7 @@ Anope Version S V N
CHAN_GETKEY_SYNTAX
CHAN_GETKEY_NOKEY
CHAN_GETKEY_KEY
+ OPER_SET_SQL_ERROR_DISABLED
*** Mod Strings:
OPER_HELP_SET
diff --git a/lang/cat.l b/lang/cat.l
index 26a749f88..8113f09c4 100644
--- a/lang/cat.l
+++ b/lang/cat.l
@@ -2702,6 +2702,9 @@ OPER_SET_SQL_ERROR
Setting for SQL must be ON or OFF.
OPER_SET_SQL_ERROR_INIT
Error during init of SQL, check your logs to correct.
+OPER_SET_SQL_ERROR_DISABLED
+ SQL is not configured for this network. Please edit the
+ configuration file (services.conf).
OPER_SET_LIST_OPTION_ON
%s is enable
OPER_SET_LIST_OPTION_OFF
diff --git a/lang/de.l b/lang/de.l
index 828066b6c..14d3e1d53 100644
--- a/lang/de.l
+++ b/lang/de.l
@@ -2694,6 +2694,9 @@ OPER_SET_SQL_ERROR
Einstellungen für SQL können nur ON oder OFF sein.
OPER_SET_SQL_ERROR_INIT
SQL FEHLER, schaue bitte in deine Logs nach um zu sehen wie du es berichtigen kannst.
+OPER_SET_SQL_ERROR_DISABLED
+ SQL is not configured for this network. Please edit the
+ configuration file (services.conf).
OPER_SET_LIST_OPTION_ON
%s ist eingeschaltet
OPER_SET_LIST_OPTION_OFF
diff --git a/lang/en_us.l b/lang/en_us.l
index cd9bd4b04..3c0fe96a6 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -2626,6 +2626,9 @@ OPER_SET_SQL_ERROR
Setting for SQL must be ON or OFF.
OPER_SET_SQL_ERROR_INIT
Error during init of SQL, check your logs to correct.
+OPER_SET_SQL_ERROR_DISABLED
+ SQL is not configured for this network. Please edit the
+ configuration file (services.conf).
OPER_SET_LIST_OPTION_ON
%s is enable
OPER_SET_LIST_OPTION_OFF
diff --git a/lang/es.l b/lang/es.l
index 05271a65c..fbc54132a 100644
--- a/lang/es.l
+++ b/lang/es.l
@@ -2667,17 +2667,20 @@ OPER_SET_NOEXPIRE_ERROR
OPER_SET_UNKNOWN_OPTION
Opcion %s desconocida.
OPER_SET_SQL_ON
- SQL code will be used.
+ El codigo SQL sera usado.
OPER_SET_SQL_OFF
- SQL code will not be used.
+ El codigo SQL no sera usado.
OPER_SET_SQL_ERROR
- Setting for SQL must be ON or OFF.
+ Opciones para SQL son ON o OFF.
OPER_SET_SQL_ERROR_INIT
- Error during init of SQL, check your logs to correct.
+ Error durante el inicio de SQL, revisa tus logs para corregir.
+OPER_SET_SQL_ERROR_DISABLED
+ SQL no esta configurado para esta red. Por favor edita
+ el archivo de configuracion (services.conf).
OPER_SET_LIST_OPTION_ON
- %s is enable
+ %s esta habilitado
OPER_SET_LIST_OPTION_OFF
- %s is disabled
+ %s esta deshabilitado
# NOOP responses
OPER_NOOP_SYNTAX
diff --git a/lang/fr.l b/lang/fr.l
index 47d03ab17..fdbdd6eeb 100644
--- a/lang/fr.l
+++ b/lang/fr.l
@@ -2714,6 +2714,9 @@ OPER_SET_SQL_ERROR
Setting for SQL must be ON or OFF.
OPER_SET_SQL_ERROR_INIT
Error during init of SQL, check your logs to correct.
+OPER_SET_SQL_ERROR_DISABLED
+ SQL is not configured for this network. Please edit the
+ configuration file (services.conf).
OPER_SET_LIST_OPTION_ON
%s is enable
OPER_SET_LIST_OPTION_OFF
diff --git a/lang/gr.l b/lang/gr.l
index d2605ac8b..cafc3db84 100644
--- a/lang/gr.l
+++ b/lang/gr.l
@@ -2692,6 +2692,9 @@ OPER_SET_SQL_ERROR
Setting for SQL must be ON or OFF.
OPER_SET_SQL_ERROR_INIT
Error during init of SQL, check your logs to correct.
+OPER_SET_SQL_ERROR_DISABLED
+ SQL is not configured for this network. Please edit the
+ configuration file (services.conf).
OPER_SET_LIST_OPTION_ON
%s is enable
OPER_SET_LIST_OPTION_OFF
diff --git a/lang/hun.l b/lang/hun.l
index 01cb285d4..0a50bd6d9 100644
--- a/lang/hun.l
+++ b/lang/hun.l
@@ -2655,6 +2655,9 @@ OPER_SET_SQL_ERROR
Setting for SQL must be ON or OFF.
OPER_SET_SQL_ERROR_INIT
Error during init of SQL, check your logs to correct.
+OPER_SET_SQL_ERROR_DISABLED
+ SQL is not configured for this network. Please edit the
+ configuration file (services.conf).
OPER_SET_LIST_OPTION_ON
%s is enable
OPER_SET_LIST_OPTION_OFF
diff --git a/lang/it.l b/lang/it.l
index 5aeadb136..35be280af 100644
--- a/lang/it.l
+++ b/lang/it.l
@@ -2699,6 +2699,9 @@ OPER_SET_SQL_ERROR
Setting for SQL must be ON or OFF.
OPER_SET_SQL_ERROR_INIT
Error during init of SQL, check your logs to correct.
+OPER_SET_SQL_ERROR_DISABLED
+ SQL is not configured for this network. Please edit the
+ configuration file (services.conf).
OPER_SET_LIST_OPTION_ON
%s is enable
OPER_SET_LIST_OPTION_OFF
diff --git a/lang/nl.l b/lang/nl.l
index efab82fa0..42bebebfd 100644
--- a/lang/nl.l
+++ b/lang/nl.l
@@ -2670,6 +2670,9 @@ OPER_SET_SQL_ERROR
Instelling voor SQL moet ON of OFF zijn.
OPER_SET_SQL_ERROR_INIT
Fout tijdens het initialiseren van SQL. Controleer de logs om dit op te lossen.
+OPER_SET_SQL_ERROR_DISABLED
+ SQL is not configured for this network. Please edit the
+ configuration file (services.conf).
OPER_SET_LIST_OPTION_ON
%s is ingeschakeld
OPER_SET_LIST_OPTION_OFF
diff --git a/lang/pl.l b/lang/pl.l
index dae14321c..91e1b562f 100644
--- a/lang/pl.l
+++ b/lang/pl.l
@@ -2877,6 +2877,9 @@ OPER_SET_SQL_ERROR
Setting for SQL must be ON or OFF.
OPER_SET_SQL_ERROR_INIT
Error during init of SQL, check your logs to correct.
+OPER_SET_SQL_ERROR_DISABLED
+ SQL is not configured for this network. Please edit the
+ configuration file (services.conf).
OPER_SET_LIST_OPTION_ON
%s is enable
OPER_SET_LIST_OPTION_OFF
diff --git a/lang/pt.l b/lang/pt.l
index 251f9e783..8f4840714 100644
--- a/lang/pt.l
+++ b/lang/pt.l
@@ -2640,6 +2640,9 @@ OPER_SET_SQL_ERROR
Ajuste para SQL deve ser ON ou OFF.
OPER_SET_SQL_ERROR_INIT
Erro durante inicialização de SQL, verifique seus logs para corrigir.
+OPER_SET_SQL_ERROR_DISABLED
+ SQL is not configured for this network. Please edit the
+ configuration file (services.conf).
OPER_SET_LIST_OPTION_ON
%s está ativada
OPER_SET_LIST_OPTION_OFF
diff --git a/lang/ru.l b/lang/ru.l
index 0846b6140..2694c9799 100644
--- a/lang/ru.l
+++ b/lang/ru.l
@@ -2666,6 +2666,9 @@ OPER_SET_SQL_ERROR
Setting for SQL must be ON or OFF.
OPER_SET_SQL_ERROR_INIT
Error during init of SQL, check your logs to correct.
+OPER_SET_SQL_ERROR_DISABLED
+ SQL is not configured for this network. Please edit the
+ configuration file (services.conf).
OPER_SET_LIST_OPTION_ON
%s is enable
OPER_SET_LIST_OPTION_OFF
diff --git a/lang/tr.l b/lang/tr.l
index edd28e24f..d91430cd1 100644
--- a/lang/tr.l
+++ b/lang/tr.l
@@ -2697,6 +2697,9 @@ OPER_SET_SQL_ERROR
Setting for SQL must be ON or OFF.
OPER_SET_SQL_ERROR_INIT
Error during init of SQL, check your logs to correct.
+OPER_SET_SQL_ERROR_DISABLED
+ SQL is not configured for this network. Please edit the
+ configuration file (services.conf).
OPER_SET_LIST_OPTION_ON
%s is enable
OPER_SET_LIST_OPTION_OFF
diff --git a/src/operserv.c b/src/operserv.c
index 2f595b038..42b1b94b5 100644
--- a/src/operserv.c
+++ b/src/operserv.c
@@ -4564,15 +4564,23 @@ static int do_set(User * u)
#ifdef USE_MYSQL
} else if (stricmp(option, "SQL") == 0) {
if (stricmp(setting, "on") == 0) {
- if (rdb_init()) {
- notice_lang(s_OperServ, u, OPER_SET_SQL_ON);
+ if (!MysqlHost) {
+ notice_lang(s_OperServ, u, OPER_SET_SQL_ERROR_DISABLED);
} else {
- notice_lang(s_OperServ, u, OPER_SET_SQL_ERROR_INIT);
+ if (rdb_init()) {
+ notice_lang(s_OperServ, u, OPER_SET_SQL_ON);
+ } else {
+ notice_lang(s_OperServ, u, OPER_SET_SQL_ERROR_INIT);
+ }
}
} else if (stricmp(setting, "off") == 0) {
- /* could call rdb_close() but that does nothing - TSL */
- do_mysql = 0;
- notice_lang(s_OperServ, u, OPER_SET_SQL_OFF);
+ if (!MysqlHost) {
+ notice_lang(s_OperServ, u, OPER_SET_SQL_ERROR_DISABLED);
+ } else {
+ /* could call rdb_close() but that does nothing - TSL */
+ do_mysql = 0;
+ notice_lang(s_OperServ, u, OPER_SET_SQL_OFF);
+ }
} else {
notice_lang(s_OperServ, u, OPER_SET_SQL_ERROR);
}
diff --git a/version.log b/version.log
index a84bc30bf..f35789909 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="8"
-VERSION_BUILD="632"
+VERSION_BUILD="633"
# $Log$
#
+# BUILD : 1.7.8 (633)
+# BUGS : none
+# NOTES : OS SET SQL ON shall warn about SQL disabled in services.conf
+#
# BUILD : 1.7.8 (632)
# BUGS : 315
# NOTES : 422 is sent if the file dosnt exist, 375 and 376 are no longer sent, if the error numeric is sent.
generated by cgit (git 2.34.1) at 2025-06-24 18:57:44 +0000