Backported mooncups patch and added a message to /hs off when using inspircd12.

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

16 files changed, 34 insertions, 4 deletions

diff --git a/Changes b/Changes
index 76b9c75ad..84ab3385e 100644
--- a/Changes
+++ b/Changes
@@ -6,4 +6,7 @@ Anope Version 1.9.0
 10/12 F Move BotInfo and related methods into a class
 11/01 F Move modules into a class
 11/15 F Fixed ns resending of passcode issue
-11/15 F Modules now delete themselves
\ No newline at end of file
+11/15 F Modules now delete themselves
+
+Provided by mooncup <mooncup@anonnet.org> - 2009
+02/04 F Automatically reapply vhost on hs off for unreal32.              [  #00]
diff --git a/lang/cat.l b/lang/cat.l
index d61b7faac..4037c5c53 100644
--- a/lang/cat.l
+++ b/lang/cat.l
@@ -6752,6 +6752,8 @@ HOST_DEL_SYNTAX
 # HostServ Help messages
 #
 ###########################################################################
+HOST_OFF
+	Your vhost was removed and the normal cloaking restored.
 HOST_OFF_UNREAL
 	Your vhost was removed. To re-enable the standard host cloaking, type /mode %s +%s
 HOST_NO_VIDENT
diff --git a/lang/de.l b/lang/de.l
index 17b41cc2f..dea7ef4c1 100644
--- a/lang/de.l
+++ b/lang/de.l
@@ -6746,6 +6746,8 @@ HOST_DEL
 	vHost fьr %s wurde gelцscht.
 HOST_DEL_SYNTAX
 	Syntax: %R%s DEL Nickname.
+HOST_OFF
+	Your vhost was removed and the normal cloaking restored.
 HOST_OFF_UNREAL
 	Dein vHost wurde gelцscht. Um die normale Host-Verschlьsselung zu reaktivieren, tippe /mode %s +%s
 HOST_NO_VIDENT
diff --git a/lang/en_us.l b/lang/en_us.l
index db658020e..c0c6a28d3 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -6378,6 +6378,8 @@ HOST_DEL
 	vhost for %s removed.
 HOST_DEL_SYNTAX
 	Syntax: %R%s del <nick>.
+HOST_OFF
+	Your vhost was removed and the normal cloaking restored.
 HOST_OFF_UNREAL
 	Your vhost was removed. To re-enable the standard host cloaking, type /mode %s +%s
 HOST_NO_VIDENT
diff --git a/lang/es.l b/lang/es.l
index 5ed93b3e1..d6b526ea2 100644
--- a/lang/es.l
+++ b/lang/es.l
@@ -6721,6 +6721,8 @@ HOST_DEL_SYNTAX
 # HostServ Help messages
 #
 ###########################################################################
+HOST_OFF
+	Your vhost was removed and the normal cloaking restored.
 HOST_OFF_UNREAL
 	Tu vhost ha sido removido. Para habilitar nuevamente el enmascaramiento de hosts tipea /mode %s +%s
 HOST_NO_VIDENT
diff --git a/lang/fr.l b/lang/fr.l
index 17afdedda..527077fe9 100644
--- a/lang/fr.l
+++ b/lang/fr.l
@@ -6804,6 +6804,8 @@ HOST_DEL_SYNTAX
 # HostServ Help messages
 #
 ###########################################################################
+HOST_OFF
+	Your vhost was removed and the normal cloaking restored.
 HOST_OFF_UNREAL
 	Votre vhost a йtй enlevйe. Pour rйactiver la protection de votre IP, tapez /mode %s +%s
 HOST_NO_VIDENT
diff --git a/lang/gr.l b/lang/gr.l
index d66d40a0f..93f549b21 100644
--- a/lang/gr.l
+++ b/lang/gr.l
@@ -6635,6 +6635,8 @@ HOST_DEL_SYNTAX
 # HostServ Help messages
 #
 ###########################################################################
+HOST_OFF
+	Your vhost was removed and the normal cloaking restored.
 HOST_OFF_UNREAL
 	Your vhost was removed. To re-enable the standard host cloaking, type /mode %s +%s
 HOST_NO_VIDENT
diff --git a/lang/hun.l b/lang/hun.l
index 244c24d32..33ce1da5f 100644
--- a/lang/hun.l
+++ b/lang/hun.l
@@ -6538,6 +6538,8 @@ HOST_DEL
 	%s vhosztja tцrцlve lett.
 HOST_DEL_SYNTAX
 	Szintaktika: %R%s del <nick>.
+HOST_OFF
+	Your vhost was removed and the normal cloaking restored.
 HOST_OFF_UNREAL
 	A vhostod kikapcsolva. Hogy ъjra hasznбld az alap
 	hosztrejtйst нrd be /mode %s +%s
diff --git a/lang/it.l b/lang/it.l
index 415823114..974a1da8d 100644
--- a/lang/it.l
+++ b/lang/it.l
@@ -6602,6 +6602,8 @@ HOST_DEL
 	Il vhost di %s и stato rimosso.
 HOST_DEL_SYNTAX
 	Sintassi: %R%s del <nick>.
+HOST_OFF
+	Your vhost was removed and the normal cloaking restored.
 HOST_OFF_UNREAL
 	Il tuo vhost и stato rimosso. Per riattivare il mascheramento standard del tuo host o IP, digita /mode %s +%s
 HOST_NO_VIDENT
diff --git a/lang/nl.l b/lang/nl.l
index 2d33d1fa2..a57bb0d70 100644
--- a/lang/nl.l
+++ b/lang/nl.l
@@ -6563,6 +6563,8 @@ HOST_DEL
 	vhost voor %s verwijderd.
 HOST_DEL_SYNTAX
 	Gebruik: %R%s del <nick>.
+HOST_OFF
+	Your vhost was removed and the normal cloaking restored.
 HOST_OFF_UNREAL
 	Je vhost is verwijderd. Om standaard host verberging weer aan te schakelen, type je /mode %s +%s
 HOST_NO_VIDENT
diff --git a/lang/pl.l b/lang/pl.l
index 8116952a5..93347ea24 100644
--- a/lang/pl.l
+++ b/lang/pl.l
@@ -7624,7 +7624,8 @@ HOST_DEL
 
 HOST_DEL_SYNTAX
 	Skіadnia: %R%s DEL <nick>.
-
+HOST_OFF
+	Your vhost was removed and the normal cloaking restored.
 HOST_OFF_UNREAL
 	Twуj vhost zostaі usuniкty. Aby wі±czyж standardowe ukrywanie hosta wpisz /mode %s +%s
 
diff --git a/lang/pt.l b/lang/pt.l
index 9129429c4..4092de4aa 100644
--- a/lang/pt.l
+++ b/lang/pt.l
@@ -6527,6 +6527,8 @@ HOST_DEL
 	vhost para %s removido.
 HOST_DEL_SYNTAX
 	Sintaxe: %R%s del <nick>.
+HOST_OFF
+	Your vhost was removed and the normal cloaking restored.
 HOST_OFF_UNREAL
 	Seu vhost foi removido. Para reabilitar a encriptaзгo padrгo de host, digite /mode %s +%s
 HOST_NO_VIDENT
diff --git a/lang/ru.l b/lang/ru.l
index 50fe74b83..b3c1a3505 100644
--- a/lang/ru.l
+++ b/lang/ru.l
@@ -6665,6 +6665,8 @@ HOST_DEL
 	Виртуальный хост для %s удален.
 HOST_DEL_SYNTAX
 	Синтаксис: %R%s del <ник>.
+HOST_OFF
+	Your vhost was removed and the normal cloaking restored.
 HOST_OFF_UNREAL
 	Ваш виртуальный хост деактивирован. Для ре-активации используйте: /MODE %s +%s
 HOST_NO_VIDENT
@@ -6804,4 +6806,4 @@ OPER_UMODE_UNSUPPORTED
 	IRCd вашей сети не поддерживает возможности команды UMODE.
 
 OPER_SUPER_ADMIN_NOT_ENABLED
-	Директива SuperAdmin отключена в конфигурационном файле сервисов.
\ No newline at end of file
+	Директива SuperAdmin отключена в конфигурационном файле сервисов.
diff --git a/lang/tr.l b/lang/tr.l
index af4560c10..8fb1abf3d 100644
--- a/lang/tr.l
+++ b/lang/tr.l
@@ -6562,6 +6562,8 @@ HOST_DEL_SYNTAX
 # HostServ Help messages
 #
 ###########################################################################
+HOST_OFF
+	Your vhost was removed and the normal cloaking restored.
 HOST_OFF_UNREAL
 	Your vhost was removed. To re-enable the standard host cloaking, type /mode %s +%s
 HOST_NO_VIDENT
diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp
index 4a65bcebb..ec0646da9 100644
--- a/src/protocol/inspircd12.cpp
+++ b/src/protocol/inspircd12.cpp
@@ -499,6 +499,7 @@ class InspIRCdProto : public IRCDProto
 	void SendVhostDel(User *u)
 	{
 		inspircd_cmd_chghost(u->uid, (u->mode & umodes[static_cast<int>('x')]) ? u->chost.c_str() : u->host);
+		notice_lang(s_HostServ, u, HOST_OFF);
 	}
 
 	void SendAkill(const char *user, const char *host, const char *who, time_t when, time_t expires, const char *reason)
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 0d2414b68..d28df8c01 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -611,7 +611,8 @@ class UnrealIRCdProto : public IRCDProto
 	void SendVhostDel(User *u)
 	{
 		send_cmd(s_HostServ, "v %s -xt", u->nick);
-		notice_lang(s_HostServ, u, HOST_OFF_UNREAL, u->nick, myIrcd->vhostchar);
+		send_cmd(s_HostServ, "v %s +x", u->nick);
+		notice_lang(s_HostServ, u, HOST_OFF);
 	}
 
 	void SendAkill(const char *user, const char *host, const char *who, time_t when, time_t expires, const char *reason)