Backport from 1.9 to document the use of /ms set notify mail and nomail (Adam)

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2289 5417fbe8-f217-4b02-8779-1006273d7864

14 files changed, 66 insertions, 27 deletions

diff --git a/lang/cat.l b/lang/cat.l
index e6663ce1c..3d948e758 100644
--- a/lang/cat.l
+++ b/lang/cat.l
@@ -1891,7 +1891,7 @@ MEMO_SET_UNKNOWN_OPTION
 
 # SET NOTIFY responses
 MEMO_SET_NOTIFY_SYNTAX
-	SET NOTIFY {ON | LOGON | NEW | OFF}
+	SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 MEMO_SET_NOTIFY_ON
 	%s ara et notificara dels teus memos quant et conectis i quant et siguin enviats.
 MEMO_SET_NOTIFY_LOGON
@@ -5503,7 +5503,7 @@ MEMO_HELP_SET
 	sobre una opció específica.
 
 MEMO_HELP_SET_NOTIFY
-	Sintàxi: SET NOTIFY {ON | LOGON | NEW | OFF}
+	Sintàxi: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 	
 	Canvia quan se't notificarà de nous memos:
 	
@@ -5514,6 +5514,9 @@ MEMO_HELP_SET_NOTIFY
 	               o quan treguis /AWAY.
 	    NEW     Sols seras notificat de memos quan se't 
 	               enviin.
+	    MAIL    You will be notified of memos by email aswell as
+	               any other settings you have.
+	    NOMAIL  You will not be notified of memos by email.
 	    OFF     No rebràs cap notificació per memos.
 	
 	ON és escencialment LOGON i NEW combinats.
diff --git a/lang/de.l b/lang/de.l
index 3bb0b5b0b..df61390a8 100644
--- a/lang/de.l
+++ b/lang/de.l
@@ -1893,7 +1893,7 @@ MEMO_SET_UNKNOWN_OPTION
 
 # SET NOTIFY responses
 MEMO_SET_NOTIFY_SYNTAX
-	SET NOTIFY {ON | LOGON | NEW | OFF}
+	SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 MEMO_SET_NOTIFY_ON
 	%s wird dich beim Einloggen über eingegangene Memos informieren. 
 MEMO_SET_NOTIFY_LOGON
@@ -5535,7 +5535,7 @@ MEMO_HELP_SET
 	über eine bestimmte Option.
 
 MEMO_HELP_SET_NOTIFY
-	Syntax: SET NOTIFY {ON | LOGON | NEW | OFF}
+	Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 	
 	Ändert den Zeitpunkt, wann MemoServ dich über neue
 	eingegangene Memos informiert:
@@ -5548,6 +5548,9 @@ MEMO_HELP_SET_NOTIFY
 	            machst.
 	    NEW     Du wirst nur informiert, wenn sie an dich
 	            gesendet werden.
+	    MAIL    You will be notified of memos by email aswell as
+	            any other settings you have.
+	    NOMAIL  You will not be notified of memos by email.
 	    OFF     Es wird keine Benachrichtigung über neue
 	            Memos stattfinden.
 	
diff --git a/lang/en_us.l b/lang/en_us.l
index ff1da10b1..ed942d942 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -1854,7 +1854,7 @@ MEMO_SET_UNKNOWN_OPTION
 
 # SET NOTIFY responses
 MEMO_SET_NOTIFY_SYNTAX
-	SET NOTIFY {ON | LOGON | NEW | MAIL | OFF }
+	SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 MEMO_SET_NOTIFY_ON
 	%s will now notify you of memos when you log on and when they are sent to you.
 MEMO_SET_NOTIFY_LOGON
@@ -5249,7 +5249,7 @@ MEMO_HELP_SET
 	on a specific option.
 
 MEMO_HELP_SET_NOTIFY
-	Syntax: SET NOTIFY {ON | LOGON | NEW | OFF}
+	Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 
 	Changes when you will be notified about new memos:
 	
@@ -5260,6 +5260,9 @@ MEMO_HELP_SET_NOTIFY
 	               on or when you unset /AWAY.
 	    NEW     You will only be notified of memos when they
 	               are sent to you.
+	    MAIL    You will be notified of memos by email aswell as
+	               any other settings you have.
+	    NOMAIL  You will not be notified of memos by email.
 	    OFF     You will not receive any notification of memos.
 	
 	ON is essentially LOGON and NEW combined.
diff --git a/lang/es.l b/lang/es.l
index 200feba9c..737ac9fee 100644
--- a/lang/es.l
+++ b/lang/es.l
@@ -1891,7 +1891,7 @@ MEMO_SET_UNKNOWN_OPTION
 
 # SET NOTIFY responses
 MEMO_SET_NOTIFY_SYNTAX
-	SET NOTIFY {ON | LOGON | NEW | OFF}
+	SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 MEMO_SET_NOTIFY_ON
 	%s ahora te notificara de tus memos cuando te conectes y cuando te sean enviados.
 MEMO_SET_NOTIFY_LOGON
@@ -5469,7 +5469,7 @@ MEMO_HELP_SET
 	acerca de una opcion especifica.
 
 MEMO_HELP_SET_NOTIFY
-	Sintaxis: SET NOTIFY {ON | LOGON | NEW | OFF}
+	Sintaxis: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 	
 	Cambia cuando seras notificado acerca de nuevos memos:
 	
@@ -5480,6 +5480,9 @@ MEMO_HELP_SET_NOTIFY
 	               o cuando saques tu /AWAY.
 	    NEW     Solo seras notificado de memos cuando te sean
 	               enviados.
+	    MAIL    You will be notified of memos by email aswell as
+	               any other settings you have.
+	    NOMAIL  You will not be notified of memos by email.
 	    OFF     No recibiras ninguna notificacion por memos.
 	
 	ON es escencialmente LOGON y NEW combinados.
diff --git a/lang/fr.l b/lang/fr.l
index c57364912..ea16bded1 100644
--- a/lang/fr.l
+++ b/lang/fr.l
@@ -1900,7 +1900,7 @@ MEMO_SET_UNKNOWN_OPTION
 
 # SET NOTIFY responses
 MEMO_SET_NOTIFY_SYNTAX
-	SET NOTIFY {ON | LOGON | NEW | OFF}
+	SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 MEMO_SET_NOTIFY_ON
 	%s vous notifiera maintenant des memos quand vous vous connectez et quand ils vous sont envoyés.
 MEMO_SET_NOTIFY_LOGON
@@ -5547,7 +5547,7 @@ MEMO_HELP_SET
 	d'informations sur une option spécifique.
 
 MEMO_HELP_SET_NOTIFY
-	Syntaxe: SET NOTIFY {ON | LOGON | NEW | OFF}
+	Syntaxe: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 	
 	Change quand vous serez notifié de vos nouveaux
 	memos:
@@ -5560,6 +5560,9 @@ MEMO_HELP_SET_NOTIFY
 	           /AWAY.
 	    NEW    Vous serez uniquement notifiés des memos 
 	           lorsqu'ils vous sont envoyés.
+	    MAIL    You will be notified of memos by email aswell as
+	            any other settings you have.
+	    NOMAIL  You will not be notified of memos by email.
 	    OFF    Vous ne recevrez aucune notification.
 	
 	ON est la combination de LOGON et NEW.
diff --git a/lang/gr.l b/lang/gr.l
index 6bc9ab110..9ea99dca4 100644
--- a/lang/gr.l
+++ b/lang/gr.l
@@ -1893,7 +1893,7 @@ MEMO_SET_UNKNOWN_OPTION
 
 # SET NOTIFY responses
 MEMO_SET_NOTIFY_SYNTAX
-	SET NOTIFY {ON | LOGON | NEW | OFF}
+	SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 MEMO_SET_NOTIFY_ON
 	%s áðü ôþñá üôáí èá êÜíåéò åíôïëÞ logon èá âëÝðåéò ôá ìçíýìáôá ðïõ èá óïõ óôÝëíïõí êáèþò èáóáé óôï äßêôõï.
 MEMO_SET_NOTIFY_LOGON
@@ -5444,7 +5444,7 @@ MEMO_HELP_SET
 	óå ìéá óõãêåêñéìÝíç åðéëïãÞ.
 
 MEMO_HELP_SET_NOTIFY
-	Óýíôáîç: SET NOTIFY {ON | LOGON | NEW | OFF}	
+	Óýíôáîç: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}	
 	
 	ÁëëáãÝò ãéá ôï ðùò èÝëåôå íá åíçìåñþíåóôå ãéá íÝá ìçíýìáôá:
 	
@@ -5455,6 +5455,9 @@ MEMO_HELP_SET_NOTIFY
 	               on Þ üôáí èá åðáíÝñ÷åóôå áðü /AWAY.
 	    NEW     Èá åíçìåñþíåóôå ãéá ôá ìçíýìáôá óáò ìüíï üôáí èá óáò
 	               ôá óôÝëíïõí.
+	    MAIL    You will be notified of memos by email aswell as
+	               any other settings you have.
+	    NOMAIL  You will not be notified of memos by email.
 	    OFF     Äåí èá åíçìåñþíåóôå ðïôÝ ãéá íÝá ìçíýìáôá Þ ðáëéÜ.
 	
 	Ç åðéëïãÞ ON ðéï ïõóéþäçò,ç LOGON êáé ç NEW óõíäéáóôéêÞ.
diff --git a/lang/hun.l b/lang/hun.l
index 68f17fece..e437f49a6 100644
--- a/lang/hun.l
+++ b/lang/hun.l
@@ -1885,7 +1885,7 @@ MEMO_SET_UNKNOWN_OPTION
 
 # SET NOTIFY válaszok
 MEMO_SET_NOTIFY_SYNTAX
-	SET NOTIFY {ON | LOGON | NEW | OFF}
+	SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 MEMO_SET_NOTIFY_ON
 	%s értesíteni fog az üzenetekrõl csatlakozáskor.
 MEMO_SET_NOTIFY_LOGON
@@ -5377,7 +5377,7 @@ MEMO_HELP_SET
 	További információért írd be: %R%S HELP SET opció
 	
 MEMO_HELP_SET_NOTIFY
-	Syntax: SET NOTIFY {ON | LOGON | NEW | OFF}
+	Syntax: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 	
 	Itt tudod beállítani, ha értesítést szeretnél kapni
 	az új üzenetekrõl:
@@ -5387,6 +5387,9 @@ MEMO_HELP_SET_NOTIFY
 	    LOGON   Értesítést kapsz az új üzenetekrõl csatlakozáskor
 	            vagy ha visszajössz /AWAY-ból.
 	    NEW     Csak akkor kapsz értesítést, ha új üzenet érkezett.
+	    MAIL    You will be notified of memos by email aswell as
+	            any other settings you have.
+	    NOMAIL  You will not be notified of memos by email.
 	    OFF     Nem kapsz értesítést az üzeneteidrõl.
 	
 	Az ON ekvivalens a LOGON és a NEW kombinálásával.
diff --git a/lang/it.l b/lang/it.l
index da2f95723..25b86ab41 100644
--- a/lang/it.l
+++ b/lang/it.l
@@ -1866,7 +1866,7 @@ MEMO_SET_UNKNOWN_OPTION
 
 # SET NOTIFY responses
 MEMO_SET_NOTIFY_SYNTAX
-	SET NOTIFY {ON | LOGON | NEW | OFF}
+	SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 MEMO_SET_NOTIFY_ON
 	%s ti informerà dei nuovi memo quando ti connetti e quando li ricevi.
 MEMO_SET_NOTIFY_LOGON
@@ -5408,7 +5408,7 @@ MEMO_HELP_SET
 	maggiori informazioni su un'opzione specifica.
 
 MEMO_HELP_SET_NOTIFY
-	Sintassi: SET NOTIFY {ON | LOGON | NEW | OFF}
+	Sintassi: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 	
 	Cambia il modo in cui si verrà informati della ricezione
 	di nuovi memo:
@@ -5420,6 +5420,9 @@ MEMO_HELP_SET_NOTIFY
 	            connette o quando si torna dall'/AWAY.
 	    NEW     Si verrà informati dei nuovi memo solo quando
 	            vengono inviati (se si è online).
+	    MAIL    You will be notified of memos by email aswell as
+	               any other settings you have.
+	    NOMAIL  You will not be notified of memos by email.
 	    OFF     Non si verrà informati in nessun caso della
 	            ricezione dei nuovi memo.
 	
diff --git a/lang/nl.l b/lang/nl.l
index 6df521171..aae966ebe 100644
--- a/lang/nl.l
+++ b/lang/nl.l
@@ -1881,7 +1881,7 @@ MEMO_SET_UNKNOWN_OPTION
 
 # SET NOTIFY responses
 MEMO_SET_NOTIFY_SYNTAX
-	SET NOTIFY {ON | LOGON | NEW | OFF}
+	SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 MEMO_SET_NOTIFY_ON
 	%s zal je nu informeren over memo's zodra je inlogt en wanneer deze naar je toe gezonden worden.
 MEMO_SET_NOTIFY_LOGON
@@ -5395,7 +5395,7 @@ MEMO_HELP_SET
 	een specifieke optie.
 
 MEMO_HELP_SET_NOTIFY
-	Gebruik: SET NOTIFY {ON | LOGON | NEW | OFF}
+	Gebruik: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 	
 	Verandert wanneer je geinformeerd zal worden over nieuwe memo's:
 	
@@ -5406,6 +5406,9 @@ MEMO_HELP_SET_NOTIFY
 	               of wanneer je terugkomt van /AWAY.
 	    NEW     Je wordt alleen geinformeerd over memo's wanner ze
 	               naar je worden verstuurd.
+	    MAIL    You will be notified of memos by email aswell as
+	               any other settings you have.
+	    NOMAIL  You will not be notified of memos by email.
 	    OFF     Je zal geen informaties over memo's ontvangen.
 	
 	ON is wezenlijk LOGON en NEW gecombineerd.
diff --git a/lang/pl.l b/lang/pl.l
index 4a2d89802..218e5c1c1 100644
--- a/lang/pl.l
+++ b/lang/pl.l
@@ -2467,7 +2467,7 @@ MEMO_SET_UNKNOWN_OPTION
 
 # SET NOTIFY responses
 MEMO_SET_NOTIFY_SYNTAX
-	SET NOTIFY {ON | LOGON | NEW | MAIL | OFF }
+	SET NOTIFY {ON | LOGON | NEW | MAIL | MAIL | NOMAIL | OFF }
 
 MEMO_SET_NOTIFY_ON
 	%s powiadomi Ciê o wiadomo¶ciach podczas logowania i w momencie ich nadej¶cia.
@@ -6495,7 +6495,7 @@ MEMO_HELP_SET
 	%R%S HELP SET opcja
 
 MEMO_HELP_SET_NOTIFY
-	Sk³adnia: SET NOTIFY {ON | LOGON | NEW | OFF}
+	Sk³adnia: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 	
 	Ustala sposób wys³ania powiadomieñ o nowych wiadomo¶ciach:
 	
@@ -6508,6 +6508,9 @@ MEMO_HELP_SET_NOTIFY
 	           trybu /AWAY.
 	   NEW     Powiadomienie bêdzie wysy³ane jedynie w 
 	           momencie otrzymania wiadomo¶ci.
+	   MAIL    You will be notified of memos by email aswell as
+	           any other settings you have.
+	   NOMAIL  You will not be notified of memos by email.
 	   OFF     Powiadomienia nie bêd± wysy³ane.
 	
 	Opcja ON jest kombinacj± opcji LOGON oraz NEW.
diff --git a/lang/pt.l b/lang/pt.l
index f4847250e..44bd465a2 100644
--- a/lang/pt.l
+++ b/lang/pt.l
@@ -1876,7 +1876,7 @@ MEMO_SET_UNKNOWN_OPTION
 
 # SET NOTIFY responses
 MEMO_SET_NOTIFY_SYNTAX
-	SET NOTIFY {ON | LOGON | NEW | OFF}
+	SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 MEMO_SET_NOTIFY_ON
 	%s irá agora notificá-lo de novos memos quando você conectar, quando eles lhe forem enviados ou quando desativar o /AWAY.
 MEMO_SET_NOTIFY_LOGON
@@ -5349,7 +5349,7 @@ MEMO_HELP_SET
 	uma opção específica.
 
 MEMO_HELP_SET_NOTIFY
-	Sintaxe: SET NOTIFY {ON | LOGON | NEW | OFF}
+	Sintaxe: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 	
 	Altera quando você será notificado sobre novas mensagens:
 	
@@ -5360,6 +5360,9 @@ MEMO_HELP_SET_NOTIFY
 	                conectar ou quando voltar de um /AWAY.
 	    NEW     Você só será notificado sobre mensagens quando elas
 	                forem enviadas a você.
+	    MAIL    You will be notified of memos by email aswell as
+	                any other settings you have.
+	    NOMAIL  You will not be notified of memos by email.
 	    OFF     Você não receberá nenhuma notificação sobre mensagens.
 	
 	ON é essencialmente a combinação de LOGON e NEW.
diff --git a/lang/ru.l b/lang/ru.l
index b48922452..0d679c9b8 100644
--- a/lang/ru.l
+++ b/lang/ru.l
@@ -1854,7 +1854,7 @@ MEMO_SET_UNKNOWN_OPTION
 
 # SET NOTIFY responses
 MEMO_SET_NOTIFY_SYNTAX
-	SET NOTIFY {ON | LOGON | NEW | OFF}
+	SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 MEMO_SET_NOTIFY_ON
 	Ñ ýòîãî ìîìåíòà, %s áóäåò óâåäîìëÿòü âàñ î íîâûõ ñîîáùåíèÿõ ñðàçó ïîñëå èäåíòèôèêàöèè ê íèêó èëè ïðè ïîñòóïëåíèè íîâûõ ñîîáùåíèé.
 MEMO_SET_NOTIFY_LOGON
@@ -5413,7 +5413,7 @@ MEMO_HELP_SET
 	êîìàíäîé %R%S HELP SET îïöèÿ.
 
 MEMO_HELP_SET_NOTIFY
-	Ñèíòàêñèñ: SET NOTIFY {ON | LOGON | NEW | OFF}
+	Ñèíòàêñèñ: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 	
 	Äàííàÿ îïöèÿ ïîçâîëÿåò íàñòðîèòü âàø ëè÷íûé ìåòîä óâåäîìëåíèÿ î
 	íîâûõ ñîîáùåíèÿõ, ïîñëàííûõ âàì êåì-ëèáî.
@@ -5427,6 +5427,9 @@ MEMO_HELP_SET_NOTIFY
 	            /AWAY (îòîøåë).
 	    NEW     óâåäîìëåíèå áóäåò ïîñòóïàòü ñðàçó, êàê òîëüêî êòî-òî
 	            îòïðàâèò âàì íîâîå ñîîáùåíèå.
+	    MAIL    You will be notified of memos by email aswell as
+	               any other settings you have.
+	    NOMAIL  You will not be notified of memos by email.
 	    OFF     óâåäîìëåíèé î ïîëó÷åíèè íîâûõ ñîîáùåíèé ïîñòóïàòü
 	            íå áóäåò
 	
diff --git a/lang/tr.l b/lang/tr.l
index cc2936bb2..3673af1e9 100644
--- a/lang/tr.l
+++ b/lang/tr.l
@@ -1888,7 +1888,7 @@ MEMO_SET_UNKNOWN_OPTION
 
 # SET NOTIFY responses
 MEMO_SET_NOTIFY_SYNTAX
-	SET NOTIFY {ON | LOGON | NEW | OFF}
+	SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 MEMO_SET_NOTIFY_ON
 	%s sizi yeni mesajlar için baðlandýðýnýzda veya mesajlar size gönderildiði anda uyaracak.
 MEMO_SET_NOTIFY_LOGON
@@ -5399,7 +5399,7 @@ MEMO_HELP_SET
 	%R%S HELP SET özellik yazýn.
 
 MEMO_HELP_SET_NOTIFY
-	Kullanýmý: SET NOTIFY {ON | LOGON | NEW | OFF}
+	Kullanýmý: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 	
 	Yeni mesajlarda ne zaman uyarýlacaðýnýzý belirler:
 	
@@ -5410,6 +5410,9 @@ MEMO_HELP_SET_NOTIFY
 	               dönüþte uyarýlýrsýnýz.
 	    NEW     Yeni mesajlar için sadece size gönderildikleri 
 	               anda uyarýlýrsýnýz.
+	    MAIL    You will be notified of memos by email aswell as
+	                any other settings you have.
+	    NOMAIL  You will not be notified of memos by email.
 	    OFF     Yeni mesajlar için herhangi bir uyarý almazsýnýz.
 	
 	ON parametresi LOGON ve NEW 'in kombinasyonudur
diff --git a/src/core/ms_set.c b/src/core/ms_set.c
index cbf554002..c0f914fd3 100644
--- a/src/core/ms_set.c
+++ b/src/core/ms_set.c
@@ -132,7 +132,7 @@ int do_set_notify(User * u, MemoInfo * mi, char *param)
         u->na->nc->flags &= ~NI_MEMO_MAIL;
         notice_lang(s_MemoServ, u, MEMO_SET_NOTIFY_NOMAIL);
     } else if (stricmp(param, "OFF") == 0) {
-        u->na->nc->flags &= ~(NI_MEMO_SIGNON | NI_MEMO_RECEIVE);
+        u->na->nc->flags &= ~(NI_MEMO_SIGNON | NI_MEMO_RECEIVE | NI_MEMO_MAIL);
         notice_lang(s_MemoServ, u, MEMO_SET_NOTIFY_OFF, s_MemoServ);
     } else {
         syntax_error(s_MemoServ, u, "SET NOTIFY", MEMO_SET_NOTIFY_SYNTAX);