To document the use of /ms set notify mail and nomail. (Backported to 1.8 in r2289) (Adam)

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

14 files changed, 76 insertions, 37 deletions

diff --git a/lang/cat.l b/lang/cat.l
index 691ac8616..5e6a4e90d 100644
--- a/lang/cat.l
+++ b/lang/cat.l
@@ -1892,7 +1892,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
@@ -5426,7 +5426,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:
 	
@@ -5437,6 +5437,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 8110f1802..1a5ba0cac 100644
--- a/lang/de.l
+++ b/lang/de.l
@@ -1894,7 +1894,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
@@ -5449,7 +5449,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:
@@ -5462,6 +5462,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 7dada4e45..ff5119e6c 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -1857,7 +1857,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
@@ -5176,7 +5176,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:
 	
@@ -5187,6 +5187,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 5bb1d60ed..a921c2b98 100644
--- a/lang/es.l
+++ b/lang/es.l
@@ -1890,7 +1890,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
@@ -5389,7 +5389,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:
 	
@@ -5400,6 +5400,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 ffc88d9a3..ec409f9d6 100644
--- a/lang/fr.l
+++ b/lang/fr.l
@@ -1902,7 +1902,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
@@ -5467,7 +5467,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:
@@ -5480,6 +5480,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 a
+	            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 3852f9bfe..a771f369f 100644
--- a/lang/gr.l
+++ b/lang/gr.l
@@ -1894,7 +1894,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
@@ -5363,7 +5363,7 @@ MEMO_HELP_SET
 	óå ìéá óõãêåêñéìÝíç åðéëïãÞ.
 
 MEMO_HELP_SET_NOTIFY
-	Óýíôáîç: SET NOTIFY {ON | LOGON | NEW | OFF}	
+	Óýíôáîç: SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}
 	
 	ÁëëáãÝò ãéá ôï ðùò èÝëåôå íá åíçìåñþíåóôå ãéá íÝá ìçíýìáôá:
 	
@@ -5374,6 +5374,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 395baa8f5..a94c8ce18 100644
--- a/lang/hun.l
+++ b/lang/hun.l
@@ -1884,7 +1884,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
@@ -5291,7 +5291,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:
@@ -5301,6 +5301,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 6c4b102fc..39976886f 100644
--- a/lang/it.l
+++ b/lang/it.l
@@ -1867,7 +1867,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
@@ -5320,7 +5320,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:
@@ -5332,6 +5332,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 a6191da18..a6f4c3aec 100644
--- a/lang/nl.l
+++ b/lang/nl.l
@@ -1877,7 +1877,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
@@ -5311,7 +5311,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:
 	
@@ -5322,6 +5322,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 6432e8894..55535b605 100644
--- a/lang/pl.l
+++ b/lang/pl.l
@@ -2460,7 +2460,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 powiadomi Ciê o wiadomo¶ciach podczas logowania i w momencie ich nadej¶cia.
@@ -6384,20 +6384,23 @@ 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:
 	
-	   ON      Powiadomienie zostanie wys³ane po 
-	           zalogowaniu siê, kiedy nie bêdzie 
-	           ustawiony tryb /AWAY oraz w momencie
-	           otrzymania wiadomo¶ci.
-	   LOGON   Powiadomienie zostanie wys³ane jedynie 
-	           po zalogowaniu siê lub po wy³±czeniu 
-	           trybu /AWAY.
-	   NEW     Powiadomienie bêdzie wysy³ane jedynie w 
-	           momencie otrzymania wiadomo¶ci.
-	   OFF     Powiadomienia nie bêd± wysy³ane.
+		ON      Powiadomienie zostanie wys³ane po 
+				zalogowaniu siê, kiedy nie bêdzie 
+				ustawiony tryb /AWAY oraz w momencie
+				otrzymania wiadomo¶ci.
+		LOGON   Powiadomienie zostanie wys³ane jedynie 
+				po zalogowaniu siê lub po wy³±czeniu 
+				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 c4492eb78..97b90fe29 100644
--- a/lang/pt.l
+++ b/lang/pt.l
@@ -1877,7 +1877,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
@@ -5262,7 +5262,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:
 	
@@ -5273,6 +5273,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 2cf3a273f..42cb0e7e7 100644
--- a/lang/ru.l
+++ b/lang/ru.l
@@ -1856,7 +1856,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
@@ -5333,7 +5333,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}
 	
 	Äàííàÿ îïöèÿ ïîçâîëÿåò íàñòðîèòü âàø ëè÷íûé ìåòîä óâåäîìëåíèÿ î
 	íîâûõ ñîîáùåíèÿõ, ïîñëàííûõ âàì êåì-ëèáî.
@@ -5347,6 +5347,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 224cfd67c..5cdf2c3db 100644
--- a/lang/tr.l
+++ b/lang/tr.l
@@ -1889,7 +1889,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
@@ -5325,7 +5325,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:
 	
@@ -5336,6 +5336,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 4d96b355e..2368a7ce2 100644
--- a/src/core/ms_set.c
+++ b/src/core/ms_set.c
@@ -56,7 +56,7 @@ class CommandMSSet : public Command
 		}
 		else if (!stricmp(param, "OFF"))
 		{
-			u->nc->flags &= ~(NI_MEMO_SIGNON | NI_MEMO_RECEIVE);
+			u->nc->flags &= ~(NI_MEMO_SIGNON | NI_MEMO_RECEIVE | NI_MEMO_MAIL);
 			notice_lang(s_MemoServ, u, MEMO_SET_NOTIFY_OFF, s_MemoServ);
 		}
 		else