diff options
| -rw-r--r-- | lang/cat.l | 38 | ||||
| -rw-r--r-- | lang/de.l | 38 | ||||
| -rw-r--r-- | lang/es.l | 38 | ||||
| -rw-r--r-- | lang/fr.l | 38 | ||||
| -rw-r--r-- | lang/gr.l | 38 | ||||
| -rw-r--r-- | lang/it.l | 38 | ||||
| -rw-r--r-- | lang/nl.l | 38 | ||||
| -rw-r--r-- | lang/pt.l | 38 | ||||
| -rw-r--r-- | lang/ru.l | 38 | ||||
| -rw-r--r-- | lang/tr.l | 38 | ||||
| -rw-r--r-- | memoserv.c | 9 | ||||
| -rw-r--r-- | mysql.c | 1 | ||||
| -rw-r--r-- | version.log | 5 |
13 files changed, 390 insertions, 5 deletions
diff --git a/lang/cat.l b/lang/cat.l index 528a21df0..f919670d9 100644 --- a/lang/cat.l +++ b/lang/cat.l @@ -1755,6 +1755,27 @@ MEMO_MAIL_TEXT3 ########################################################################### # Standard responses +MEMO_RSEND_PLEASE_WAIT + Please wait %d seconds before using the RSEND command again. +MEMO_RSEND_DISABLED + Sorry, RSEND has been disabled on this network. +MEMO_RSEND_SYNTAX + RSEND { nick | channel } memo-text +MEMO_RSEND_NICK_MEMO_TEXT + [auto-memo] The memo you sent has been viewed. +MEMO_RSEND_CHAN_MEMO_TEXT + [auto-memo] The memo you sent to %s has been viewed. +MEMO_RSEND_USER_NOTIFICATION + A notification memo has been sent to %s informing him/her you have + read his/her memo. + +########################################################################### +# +# BotServ messages +# +########################################################################### + +# Standard responses BOT_DOES_NOT_EXIST El bot %s no existeix. BOT_NOT_ASSIGNED @@ -4983,6 +5004,23 @@ MEMO_HELP_SENDALL # ########################################################################### +MEMO_HELP_RSEND + Syntax: RSEND { nick | channel } memo-text + + Sends the named nick or channel a memo containing + memo-text . When sending to a nickname, the recipient will + receive a notice that he/she has a new memo. The target + nickname/channel must be registered. + Once the memo is read by its recepient, an automatic notification + memo will be sent to the sender informing him/her that the memo + has been read. + +########################################################################### +# +# OperServ help messages +# +########################################################################### + OPER_HELP Comandes per a %S: GLOBAL Envia un missatge a totss els usuaris @@ -1742,6 +1742,27 @@ MEMO_MAIL_TEXT3 ########################################################################### # Standard responses +MEMO_RSEND_PLEASE_WAIT + Please wait %d seconds before using the RSEND command again. +MEMO_RSEND_DISABLED + Sorry, RSEND has been disabled on this network. +MEMO_RSEND_SYNTAX + RSEND { nick | channel } memo-text +MEMO_RSEND_NICK_MEMO_TEXT + [auto-memo] The memo you sent has been viewed. +MEMO_RSEND_CHAN_MEMO_TEXT + [auto-memo] The memo you sent to %s has been viewed. +MEMO_RSEND_USER_NOTIFICATION + A notification memo has been sent to %s informing him/her you have + read his/her memo. + +########################################################################### +# +# BotServ messages +# +########################################################################### + +# Standard responses BOT_DOES_NOT_EXIST Bot %s gibt es nicht. BOT_NOT_ASSIGNED @@ -5147,6 +5168,23 @@ MEMO_HELP_SENDALL # ########################################################################### +MEMO_HELP_RSEND + Syntax: RSEND { nick | channel } memo-text + + Sends the named nick or channel a memo containing + memo-text . When sending to a nickname, the recipient will + receive a notice that he/she has a new memo. The target + nickname/channel must be registered. + Once the memo is read by its recepient, an automatic notification + memo will be sent to the sender informing him/her that the memo + has been read. + +########################################################################### +# +# OperServ help messages +# +########################################################################### + OPER_HELP Kommandos von %S: GLOBAL Eine Notice an alle User schicken @@ -1753,6 +1753,27 @@ MEMO_MAIL_TEXT3 ########################################################################### # Standard responses +MEMO_RSEND_PLEASE_WAIT + Please wait %d seconds before using the RSEND command again. +MEMO_RSEND_DISABLED + Sorry, RSEND has been disabled on this network. +MEMO_RSEND_SYNTAX + RSEND { nick | channel } memo-text +MEMO_RSEND_NICK_MEMO_TEXT + [auto-memo] The memo you sent has been viewed. +MEMO_RSEND_CHAN_MEMO_TEXT + [auto-memo] The memo you sent to %s has been viewed. +MEMO_RSEND_USER_NOTIFICATION + A notification memo has been sent to %s informing him/her you have + read his/her memo. + +########################################################################### +# +# BotServ messages +# +########################################################################### + +# Standard responses BOT_DOES_NOT_EXIST El bot %s no existe. BOT_NOT_ASSIGNED @@ -4983,6 +5004,23 @@ MEMO_HELP_SENDALL # ########################################################################### +MEMO_HELP_RSEND + Syntax: RSEND { nick | channel } memo-text + + Sends the named nick or channel a memo containing + memo-text . When sending to a nickname, the recipient will + receive a notice that he/she has a new memo. The target + nickname/channel must be registered. + Once the memo is read by its recepient, an automatic notification + memo will be sent to the sender informing him/her that the memo + has been read. + +########################################################################### +# +# OperServ help messages +# +########################################################################### + OPER_HELP Comandos para %S: GLOBAL Envia un mensaje a todos los usuarios @@ -1754,6 +1754,27 @@ MEMO_MAIL_TEXT3 ########################################################################### # Standard responses +MEMO_RSEND_PLEASE_WAIT + Please wait %d seconds before using the RSEND command again. +MEMO_RSEND_DISABLED + Sorry, RSEND has been disabled on this network. +MEMO_RSEND_SYNTAX + RSEND { nick | channel } memo-text +MEMO_RSEND_NICK_MEMO_TEXT + [auto-memo] The memo you sent has been viewed. +MEMO_RSEND_CHAN_MEMO_TEXT + [auto-memo] The memo you sent to %s has been viewed. +MEMO_RSEND_USER_NOTIFICATION + A notification memo has been sent to %s informing him/her you have + read his/her memo. + +########################################################################### +# +# BotServ messages +# +########################################################################### + +# Standard responses BOT_DOES_NOT_EXIST Le bot %s n'existe pas. BOT_NOT_ASSIGNED @@ -5025,6 +5046,23 @@ MEMO_HELP_SENDALL # ########################################################################### +MEMO_HELP_RSEND + Syntax: RSEND { nick | channel } memo-text + + Sends the named nick or channel a memo containing + memo-text . When sending to a nickname, the recipient will + receive a notice that he/she has a new memo. The target + nickname/channel must be registered. + Once the memo is read by its recepient, an automatic notification + memo will be sent to the sender informing him/her that the memo + has been read. + +########################################################################### +# +# OperServ help messages +# +########################################################################### + OPER_HELP Commandes %S: GLOBAL Envoie un message à tous les utilisateurs @@ -1744,6 +1744,27 @@ MEMO_MAIL_TEXT3 ########################################################################### # Standard responses +MEMO_RSEND_PLEASE_WAIT + Please wait %d seconds before using the RSEND command again. +MEMO_RSEND_DISABLED + Sorry, RSEND has been disabled on this network. +MEMO_RSEND_SYNTAX + RSEND { nick | channel } memo-text +MEMO_RSEND_NICK_MEMO_TEXT + [auto-memo] The memo you sent has been viewed. +MEMO_RSEND_CHAN_MEMO_TEXT + [auto-memo] The memo you sent to %s has been viewed. +MEMO_RSEND_USER_NOTIFICATION + A notification memo has been sent to %s informing him/her you have + read his/her memo. + +########################################################################### +# +# BotServ messages +# +########################################################################### + +# Standard responses BOT_DOES_NOT_EXIST Ôï Bot %s äåí õðÜñ÷åé. BOT_NOT_ASSIGNED @@ -4918,6 +4939,23 @@ MEMO_HELP_SENDALL # ########################################################################### +MEMO_HELP_RSEND + Syntax: RSEND { nick | channel } memo-text + + Sends the named nick or channel a memo containing + memo-text . When sending to a nickname, the recipient will + receive a notice that he/she has a new memo. The target + nickname/channel must be registered. + Once the memo is read by its recepient, an automatic notification + memo will be sent to the sender informing him/her that the memo + has been read. + +########################################################################### +# +# OperServ help messages +# +########################################################################### + OPER_HELP Ïé åíôïëÝò ôïõ %S åßíáé:: GLOBAL ÓôÝëíåé ìÞíõìá óå üëïõò ôïõò ÷ñÞóôåò @@ -1751,6 +1751,27 @@ MEMO_MAIL_TEXT3 ########################################################################### # Standard responses +MEMO_RSEND_PLEASE_WAIT + Please wait %d seconds before using the RSEND command again. +MEMO_RSEND_DISABLED + Sorry, RSEND has been disabled on this network. +MEMO_RSEND_SYNTAX + RSEND { nick | channel } memo-text +MEMO_RSEND_NICK_MEMO_TEXT + [auto-memo] The memo you sent has been viewed. +MEMO_RSEND_CHAN_MEMO_TEXT + [auto-memo] The memo you sent to %s has been viewed. +MEMO_RSEND_USER_NOTIFICATION + A notification memo has been sent to %s informing him/her you have + read his/her memo. + +########################################################################### +# +# BotServ messages +# +########################################################################### + +# Standard responses BOT_DOES_NOT_EXIST Il bot %s non esiste. BOT_NOT_ASSIGNED @@ -5046,6 +5067,23 @@ MEMO_HELP_SENDALL # ########################################################################### +MEMO_HELP_RSEND + Syntax: RSEND { nick | channel } memo-text + + Sends the named nick or channel a memo containing + memo-text . When sending to a nickname, the recipient will + receive a notice that he/she has a new memo. The target + nickname/channel must be registered. + Once the memo is read by its recepient, an automatic notification + memo will be sent to the sender informing him/her that the memo + has been read. + +########################################################################### +# +# OperServ help messages +# +########################################################################### + OPER_HELP Comandi di %S: GLOBAL Invia un messaggio a tutti gli utenti @@ -1738,6 +1738,27 @@ MEMO_MAIL_TEXT3 ########################################################################### # Standard responses +MEMO_RSEND_PLEASE_WAIT + Please wait %d seconds before using the RSEND command again. +MEMO_RSEND_DISABLED + Sorry, RSEND has been disabled on this network. +MEMO_RSEND_SYNTAX + RSEND { nick | channel } memo-text +MEMO_RSEND_NICK_MEMO_TEXT + [auto-memo] The memo you sent has been viewed. +MEMO_RSEND_CHAN_MEMO_TEXT + [auto-memo] The memo you sent to %s has been viewed. +MEMO_RSEND_USER_NOTIFICATION + A notification memo has been sent to %s informing him/her you have + read his/her memo. + +########################################################################### +# +# BotServ messages +# +########################################################################### + +# Standard responses BOT_DOES_NOT_EXIST Bot %s bestaat niet. BOT_NOT_ASSIGNED @@ -4915,6 +4936,23 @@ MEMO_HELP_SENDALL # ########################################################################### +MEMO_HELP_RSEND + Syntax: RSEND { nick | channel } memo-text + + Sends the named nick or channel a memo containing + memo-text . When sending to a nickname, the recipient will + receive a notice that he/she has a new memo. The target + nickname/channel must be registered. + Once the memo is read by its recepient, an automatic notification + memo will be sent to the sender informing him/her that the memo + has been read. + +########################################################################### +# +# OperServ help messages +# +########################################################################### + OPER_HELP %S commando's: GLOBAL Stuurt een bericht naar alle gebruikers @@ -1746,6 +1746,27 @@ MEMO_MAIL_TEXT3 ########################################################################### # Standard responses +MEMO_RSEND_PLEASE_WAIT + Please wait %d seconds before using the RSEND command again. +MEMO_RSEND_DISABLED + Sorry, RSEND has been disabled on this network. +MEMO_RSEND_SYNTAX + RSEND { nick | channel } memo-text +MEMO_RSEND_NICK_MEMO_TEXT + [auto-memo] The memo you sent has been viewed. +MEMO_RSEND_CHAN_MEMO_TEXT + [auto-memo] The memo you sent to %s has been viewed. +MEMO_RSEND_USER_NOTIFICATION + A notification memo has been sent to %s informing him/her you have + read his/her memo. + +########################################################################### +# +# BotServ messages +# +########################################################################### + +# Standard responses BOT_DOES_NOT_EXIST Bot %s não existe. BOT_NOT_ASSIGNED @@ -4822,6 +4843,23 @@ MEMO_HELP_SENDALL # ########################################################################### +MEMO_HELP_RSEND + Syntax: RSEND { nick | channel } memo-text + + Sends the named nick or channel a memo containing + memo-text . When sending to a nickname, the recipient will + receive a notice that he/she has a new memo. The target + nickname/channel must be registered. + Once the memo is read by its recepient, an automatic notification + memo will be sent to the sender informing him/her that the memo + has been read. + +########################################################################### +# +# OperServ help messages +# +########################################################################### + OPER_HELP Comandos do %S: GLOBAL Envia uma mensagem para todos usuários @@ -1735,6 +1735,27 @@ MEMO_MAIL_TEXT3 ########################################################################### # Standard responses +MEMO_RSEND_PLEASE_WAIT + Please wait %d seconds before using the RSEND command again. +MEMO_RSEND_DISABLED + Sorry, RSEND has been disabled on this network. +MEMO_RSEND_SYNTAX + RSEND { nick | channel } memo-text +MEMO_RSEND_NICK_MEMO_TEXT + [auto-memo] The memo you sent has been viewed. +MEMO_RSEND_CHAN_MEMO_TEXT + [auto-memo] The memo you sent to %s has been viewed. +MEMO_RSEND_USER_NOTIFICATION + A notification memo has been sent to %s informing him/her you have + read his/her memo. + +########################################################################### +# +# BotServ messages +# +########################################################################### + +# Standard responses BOT_DOES_NOT_EXIST Áîò %s íå ñóùåñòâóåò. BOT_NOT_ASSIGNED @@ -4828,6 +4849,23 @@ MEMO_HELP_SENDALL # ########################################################################### +MEMO_HELP_RSEND + Syntax: RSEND { nick | channel } memo-text + + Sends the named nick or channel a memo containing + memo-text . When sending to a nickname, the recipient will + receive a notice that he/she has a new memo. The target + nickname/channel must be registered. + Once the memo is read by its recepient, an automatic notification + memo will be sent to the sender informing him/her that the memo + has been read. + +########################################################################### +# +# OperServ help messages +# +########################################################################### + OPER_HELP %S commands: GLOBAL Ïîñëàòü ñîîáùåíèå âñåì ïîëüçîâàòåëÿì @@ -1750,6 +1750,27 @@ MEMO_MAIL_TEXT3 ########################################################################### # Standard responses +MEMO_RSEND_PLEASE_WAIT + Please wait %d seconds before using the RSEND command again. +MEMO_RSEND_DISABLED + Sorry, RSEND has been disabled on this network. +MEMO_RSEND_SYNTAX + RSEND { nick | channel } memo-text +MEMO_RSEND_NICK_MEMO_TEXT + [auto-memo] The memo you sent has been viewed. +MEMO_RSEND_CHAN_MEMO_TEXT + [auto-memo] The memo you sent to %s has been viewed. +MEMO_RSEND_USER_NOTIFICATION + A notification memo has been sent to %s informing him/her you have + read his/her memo. + +########################################################################### +# +# BotServ messages +# +########################################################################### + +# Standard responses BOT_DOES_NOT_EXIST Bot %s mevcut deðil. BOT_NOT_ASSIGNED @@ -4878,6 +4899,23 @@ MEMO_HELP_SENDALL # ########################################################################### +MEMO_HELP_RSEND + Syntax: RSEND { nick | channel } memo-text + + Sends the named nick or channel a memo containing + memo-text . When sending to a nickname, the recipient will + receive a notice that he/she has a new memo. The target + nickname/channel must be registered. + Once the memo is read by its recepient, an automatic notification + memo will be sent to the sender informing him/her that the memo + has been read. + +########################################################################### +# +# OperServ help messages +# +########################################################################### + OPER_HELP %S commands: GLOBAL Tüm kullanýcýlara mesaj gönderir diff --git a/memoserv.c b/memoserv.c index ec7ec6599..ab87c1c62 100644 --- a/memoserv.c +++ b/memoserv.c @@ -293,7 +293,8 @@ void memo_send(User * u, char *name, char *text, int z) notice_lang(s_MemoServ, u, MEMO_SEND_PLEASE_WAIT, MSSendDelay); if (z == 3) - notice_lang(s_MemoServ, u, MEMO_RSEND_PLEASE_WAIT, MSSendDelay); + notice_lang(s_MemoServ, u, MEMO_RSEND_PLEASE_WAIT, + MSSendDelay); } else if (mi->memomax == 0 && !is_servadmin) { if (z == 0 || z == 3) @@ -325,7 +326,7 @@ void memo_send(User * u, char *name, char *text, int z) m->flags = MF_UNREAD; /* Set receipt request flag */ if (z == 3) - m->flags |= MF_RECEIPT; + m->flags |= MF_RECEIPT; if (z == 0 || z == 3) notice_lang(s_MemoServ, u, MEMO_SENT, name); if (!ischan) { @@ -561,7 +562,7 @@ static int read_memo(User * u, int index, MemoInfo * mi, const char *chan) /* Check if a receipt notification was requested */ if (m->flags && MF_RECEIPT) { - rsend_notify(u, m, chan); + rsend_notify(u, m, chan); } return 1; @@ -1262,7 +1263,7 @@ static int do_rsend(User * u) /*************************************************************************/ /* Send receipt notification to sender. */ -void rsend_notify(User *u, Memo *m, const char *chan) +void rsend_notify(User * u, Memo * m, const char *chan) { NickAlias *na; NickCore *nc; @@ -58,6 +58,7 @@ int db_mysql_init() do_mysql = 1; alog("MySQL has been enabled."); } + if (!db_mysql_open()) do_mysql = 0; diff --git a/version.log b/version.log index 08fb26913..27acdd8d8 100644 --- a/version.log +++ b/version.log @@ -8,11 +8,14 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="2" -VERSION_BUILD="70" +VERSION_BUILD="71" VERSION_EXTRA="" # $Log$ # +# BUILD : 1.7.2 (71) +# NOTES : Language file normalization. Make sure distclean is made. +# # BUILD : 1.7.2 (70) # BUGS : # NOTES : Modified RSEND to send receipt memo as user instead of MemoServ |