BUILD : 1.7.7 (545) BUGS : 278 NOTES : On vhost unset show the correct vhost character

git-svn-id: svn://svn.anope.org/anope/trunk@545 31f1291d-b8d6-0310-a050-a5561fc1590b


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

29 files changed, 39 insertions, 20 deletions

diff --git a/Changes b/Changes
index 436599eaa..24c6e4179 100644
--- a/Changes
+++ b/Changes
@@ -2,6 +2,7 @@ Anope Version S V N
 -------------------
 Provided by Anope Dev. <dev@anope.org> - 2005
 01/16 A Ulines Servers are now except from NOJOIN bans                    [#281]
+01/16 F Updated language files to show the correct vhost character        [#278]
 01/16 F Disables UseRDB when MysqlSecure is enabled                       [#276]
 01/16 F BS bots no longer flood resetting modes if its the same mode.     [#263]
 01/16 F IRCops are now except from KillonSQline and KillonSGline          [#274]
diff --git a/Changes.lang b/Changes.lang
index 62447c7b0..a63103348 100644
--- a/Changes.lang
+++ b/Changes.lang
@@ -2,6 +2,7 @@ Anope Version S V N
 -------------------
 *** New Strings:
 *** Mod Strings:
+	HOST_OFF_UNREAL
 *** Del Strings:
 
 Anope Version 1.7.7
diff --git a/include/services.h b/include/services.h
index 5893d49ab..28a1df2af 100644
--- a/include/services.h
+++ b/include/services.h
@@ -263,6 +263,7 @@ struct ircdvars_ {
         int sjoinexchar;			/* use single quotes to define it */
 	int svsmode_ucmode;			/* Can remove User Channel Modes with SVSMODE */
 	int sglineenforce;
+	char *vhostchar;			/* char used for vhosting */
 };
 
 struct ircdcapab_ {
diff --git a/lang/cat.l b/lang/cat.l
index 619261a71..2746fba20 100644
--- a/lang/cat.l
+++ b/lang/cat.l
@@ -6245,7 +6245,7 @@ HOST_DEL_SYNTAX
 #
 ###########################################################################
 HOST_OFF_UNREAL
-	Your vhost was removed. To re-enable the standard host cloaking, type /mode %s +x
+	Your vhost was removed. To re-enable the standard host cloaking, type /mode %s +%s
 HOST_NO_VIDENT
 	Your IRCD does not support vIdent's, if this is incorrect, please report this as a possible bug
 
diff --git a/lang/de.l b/lang/de.l
index 15d36e0b5..e87a69b7a 100644
--- a/lang/de.l
+++ b/lang/de.l
@@ -6464,7 +6464,7 @@ HOST_DEL
 HOST_DEL_SYNTAX
 	Syntax: /msg %s DEL Nickname.
 HOST_OFF_UNREAL
-	Dein vHost wurde gelöscht. Um die normale Host-Verschlüsselung zu reaktivieren, tippe /mode %s +x
+	Dein vHost wurde gelöscht. Um die normale Host-Verschlüsselung zu reaktivieren, tippe /mode %s +%s
 HOST_NO_VIDENT
 	Dein IRCd unterstützt keine vIdents. Falls das inkorrekt sein sollte, melde das bitte als einen Bug.
 HOST_GROUP
diff --git a/lang/en_us.l b/lang/en_us.l
index 916dc4d18..5c686d99d 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -5987,7 +5987,7 @@ HOST_DEL
 HOST_DEL_SYNTAX
 	Syntax: /msg %s del <nick>.
 HOST_OFF_UNREAL
-	Your vhost was removed. To re-enable the standard host cloaking, type /mode %s +x
+	Your vhost was removed. To re-enable the standard host cloaking, type /mode %s +%s
 HOST_NO_VIDENT
 	Your IRCD does not support vIdent's, if this is incorrect, please report this as a possible bug
 HOST_GROUP
diff --git a/lang/es.l b/lang/es.l
index 51f957924..5b703da66 100644
--- a/lang/es.l
+++ b/lang/es.l
@@ -6228,7 +6228,7 @@ HOST_DEL_SYNTAX
 #
 ###########################################################################
 HOST_OFF_UNREAL
-	Tu vhost ha sido removido. Para habilitar nuevamente el enmascaramiento de hosts tipea /mode %s +x.
+	Tu vhost ha sido removido. Para habilitar nuevamente el enmascaramiento de hosts tipea /mode %s +%s
 HOST_NO_VIDENT
 	Tu IRCD no soporta vIdent's. Si esto es incorrecto, por favor reportalo como un posible bug.
 
diff --git a/lang/fr.l b/lang/fr.l
index 1a5ae6f0b..902812f80 100644
--- a/lang/fr.l
+++ b/lang/fr.l
@@ -6285,7 +6285,7 @@ HOST_DEL_SYNTAX
 #
 ###########################################################################
 HOST_OFF_UNREAL
-	Votre vhost a été enlevée. Pour réactiver la protection de votre IP, tapez /mode %s +x
+	Votre vhost a été enlevée. Pour réactiver la protection de votre IP, tapez /mode %s +%s
 HOST_NO_VIDENT
 	L'IRCD utilisé ne support par la modification de l'ident.
 
diff --git a/lang/gr.l b/lang/gr.l
index 1723c8b78..1c1d4cd21 100644
--- a/lang/gr.l
+++ b/lang/gr.l
@@ -6122,7 +6122,7 @@ HOST_DEL_SYNTAX
 #
 ###########################################################################
 HOST_OFF_UNREAL
-	Your vhost was removed. To re-enable the standard host cloaking, type /mode %s +x
+	Your vhost was removed. To re-enable the standard host cloaking, type /mode %s +%s
 HOST_NO_VIDENT
 	Your IRCD does not support vIdent's, if this is incorrect, please report this as a possible bug
 
diff --git a/lang/hun.l b/lang/hun.l
index aeca77c3f..7d71df455 100644
--- a/lang/hun.l
+++ b/lang/hun.l
@@ -6015,7 +6015,7 @@ HOST_DEL_SYNTAX
 	Szintaktika: /msg %s del <nick>.
 HOST_OFF_UNREAL
 	A vhostod kikapcsolva. Hogy újra használd az alap
-	hosztrejtést írd be /mode %s +x
+	hosztrejtést írd be /mode %s +%s
 HOST_NO_VIDENT
 	Ön ircdje nem támogatja a videnteket, ha ez nem igaz,
 	akkor kérem jelentse ezt, mint lehetséges hibát.
diff --git a/lang/it.l b/lang/it.l
index 28ae54960..a0f811efc 100644
--- a/lang/it.l
+++ b/lang/it.l
@@ -6280,7 +6280,7 @@ HOST_DEL
 HOST_DEL_SYNTAX
 	Sintassi: /msg %s del <nick>.
 HOST_OFF_UNREAL
-	Il tuo vhost è stato rimosso. Per riattivare il mascheramento standard del tuo host o IP, digita /mode %s +x
+	Il tuo vhost è stato rimosso. Per riattivare il mascheramento standard del tuo host o IP, digita /mode %s +%s
 HOST_NO_VIDENT
 	Il tuo IRCD non supporta i vIdent; se li supporta, invia un messaggio al team di sviluppo dei Services indicandolo come possibile bug.
 
diff --git a/lang/nl.l b/lang/nl.l
index dfc00a2f1..70ca76c14 100644
--- a/lang/nl.l
+++ b/lang/nl.l
@@ -6156,7 +6156,7 @@ HOST_DEL
 HOST_DEL_SYNTAX
 	Gebruik: /msg %s del <nick>.
 HOST_OFF_UNREAL
-	Je vhost is verwijderd. Om standaard host verberging weer aan te schakelen, type je /mode %s +x
+	Je vhost is verwijderd. Om standaard host verberging weer aan te schakelen, type je /mode %s +%s
 HOST_NO_VIDENT
 	Je IRCD ondersteunt geen vIdent's. Als dit niet klopt, rapporteer dit dan als een mogelijke bug
 HOST_GROUP
diff --git a/lang/pl.l b/lang/pl.l
index a596ecd7e..89f473d0b 100644
--- a/lang/pl.l
+++ b/lang/pl.l
@@ -6568,7 +6568,7 @@ HOST_DEL
 HOST_DEL_SYNTAX
 	Syntax: /msg %s del <nick>.
 HOST_OFF_UNREAL
-	Your vhost was removed. To re-enable the standard host cloaking, type /mode %s +x
+	Your vhost was removed. To re-enable the standard host cloaking, type /mode %s +%s
 HOST_NO_VIDENT
 	Your IRCD does not support vIdent's, if this is incorrect, please report this as a possible bug
 HOST_GROUP
diff --git a/lang/pt.l b/lang/pt.l
index ada696bd5..9a18109a3 100644
--- a/lang/pt.l
+++ b/lang/pt.l
@@ -5879,7 +5879,7 @@ HOST_DEL_SYNTAX
 #
 ###########################################################################
 HOST_OFF_UNREAL
-	Your vhost was removed. To re-enable the standard host cloaking, type /mode %s +x
+	Your vhost was removed. To re-enable the standard host cloaking, type /mode %s +%s
 HOST_NO_VIDENT
 	Your IRCD does not support vIdent's, if this is incorrect, please report this as a possible bug
 
diff --git a/lang/ru.l b/lang/ru.l
index fcb240f8b..87361f86b 100644
--- a/lang/ru.l
+++ b/lang/ru.l
@@ -6035,7 +6035,7 @@ HOST_DEL
 HOST_DEL_SYNTAX
 	Ñèíòàêñèñ: /msg %s del <íèê>.
 HOST_OFF_UNREAL
-	Âàø âèðòóàëüíûé õîñò óäàëåí. ÷òîáû ñíîâà óñòàíîâèòü åãî íà Âàñ, íàïèøèòå /mode %s +x
+	Âàø âèðòóàëüíûé õîñò óäàëåí. ÷òîáû ñíîâà óñòàíîâèòü åãî íà Âàñ, íàïèøèòå /mode %s +%s
 HOST_NO_VIDENT
 	Âàø IRC ñåðâåð íå ïîääåðæèâàåò âèðòóàëüíûå èäåíòû, åñëè ýòî íå òàê, ïîæàëóéñòà îáðàòèòåñü ê íàñ, ýòî ìîæåò áûòü îøèáêà â ïðîãðàììå.
 HOST_GROUP
diff --git a/lang/tr.l b/lang/tr.l
index 8a3a70fb8..c6daa9658 100644
--- a/lang/tr.l
+++ b/lang/tr.l
@@ -6055,7 +6055,7 @@ HOST_DEL_SYNTAX
 #
 ###########################################################################
 HOST_OFF_UNREAL
-	Your vhost was removed. To re-enable the standard host cloaking, type /mode %s +x
+	Your vhost was removed. To re-enable the standard host cloaking, type /mode %s +%s
 HOST_NO_VIDENT
 	Your IRCD does not support vIdent's, if this is incorrect, please report this as a possible bug
 
diff --git a/src/bahamut.c b/src/bahamut.c
index a42f84392..7cf512aa6 100644
--- a/src/bahamut.c
+++ b/src/bahamut.c
@@ -104,6 +104,7 @@ IRCDVar ircd[] = {
      0,                         /* SJOIN except char */
      0,                         /* Can remove User Channel Modes with SVSMODE */
      0,                         /* Sglines are not enforced until user reconnects */
+     NULL,                      /* vhost char */
      }
     ,
     {NULL}
diff --git a/src/dreamforge.c b/src/dreamforge.c
index 249ff79fc..b48b45a20 100644
--- a/src/dreamforge.c
+++ b/src/dreamforge.c
@@ -102,6 +102,7 @@ IRCDVar ircd[] = {
      0,                         /* SJOIN except char */
      0,                         /* Can remove User Channel Modes with SVSMODE */
      0,                         /* Sglines are not enforced until user reconnects */
+     NULL,                      /* vhost char */
      }
     ,
     {NULL}
diff --git a/src/hybrid.c b/src/hybrid.c
index 67d9b3ad2..646c4aa02 100644
--- a/src/hybrid.c
+++ b/src/hybrid.c
@@ -102,6 +102,7 @@ IRCDVar ircd[] = {
      0,                         /* SJOIN except char */
      0,                         /* Can remove User Channel Modes with SVSMODE */
      0,                         /* Sglines are not enforced until user reconnects */
+     NULL,                      /* vhost char */
      }
     ,
     {NULL}
diff --git a/src/plexus.c b/src/plexus.c
index d140c8dd9..74f0bd49c 100644
--- a/src/plexus.c
+++ b/src/plexus.c
@@ -102,6 +102,7 @@ IRCDVar ircd[] = {
      0,                         /* SJOIN except char */
      0,                         /* Can remove User Channel Modes with SVSMODE */
      0,                         /* Sglines are not enforced until user reconnects */
+     "h",                       /* vhost char */
      }
     ,
     {NULL}
diff --git a/src/ptlink.c b/src/ptlink.c
index 28d05c47e..2e7e4a436 100644
--- a/src/ptlink.c
+++ b/src/ptlink.c
@@ -102,6 +102,7 @@ IRCDVar ircd[] = {
      0,                         /* SJOIN except char */
      0,                         /* Can remove User Channel Modes with SVSMODE */
      0,                         /* Sglines are not enforced until user reconnects */
+     NULL,                      /* vhost char */
      }
     ,
     {NULL}
diff --git a/src/rageircd.c b/src/rageircd.c
index d63a71265..f901a1b39 100644
--- a/src/rageircd.c
+++ b/src/rageircd.c
@@ -103,6 +103,7 @@ IRCDVar ircd[] = {
      0,                         /* SJOIN except char */
      0,                         /* Can remove User Channel Modes with SVSMODE */
      0,                         /* Sglines are not enforced until user reconnects */
+     "x",                       /* vhost char */
      },
     {NULL}
 };
@@ -664,7 +665,7 @@ void anope_cmd_topic(char *whosets, char *chan, char *whosetit,
 void anope_cmd_vhost_off(User * u)
 {
     send_cmd(s_HostServ, "SVSMODE %s -x", u->nick);
-    notice_lang(s_HostServ, u, HOST_OFF_UNREAL, u->nick);
+    notice_lang(s_HostServ, u, HOST_OFF_UNREAL, u->nick, ircd->vhostchar);
 }
 
 void anope_cmd_vhost_on(char *nick, char *vIdent, char *vhost)
diff --git a/src/solidircd.c b/src/solidircd.c
index d536f988a..ba4e212a6 100644
--- a/src/solidircd.c
+++ b/src/solidircd.c
@@ -104,6 +104,7 @@ IRCDVar ircd[] = {
      0,                         /* SJOIN except char */
      0,                         /* Can remove User Channel Modes with SVSMODE */
      0,                         /* Sglines are not enforced until user reconnects */
+     "v",                       /* vhost char */
      }
     ,
     {NULL}
@@ -1516,7 +1517,7 @@ void anope_cmd_vhost_on(char *nick, char *vIdent, char *vhost)
 void anope_cmd_vhost_off(User * u)
 {
     send_cmd(s_HostServ, "SVSMODE %s -v", u->nick);
-    notice_lang(s_HostServ, u, HOST_OFF_UNREAL, u->nick);
+    notice_lang(s_HostServ, u, HOST_OFF_UNREAL, u->nick, ircd->vhostchar);
 }
 
 void anope_cmd_chghost(char *nick, char *vhost)
diff --git a/src/ultimate2.c b/src/ultimate2.c
index 512c17d0b..fdccb13b7 100644
--- a/src/ultimate2.c
+++ b/src/ultimate2.c
@@ -102,6 +102,7 @@ IRCDVar ircd[] = {
      0,                         /* SJOIN except char */
      0,                         /* Can remove User Channel Modes with SVSMODE */
      0,                         /* Sglines are not enforced until user reconnects */
+     "x",                       /* vhost char */
      }
     ,
     {NULL}
diff --git a/src/ultimate3.c b/src/ultimate3.c
index 62f5bbdd2..d9a64f3a5 100644
--- a/src/ultimate3.c
+++ b/src/ultimate3.c
@@ -104,6 +104,7 @@ IRCDVar ircd[] = {
      0,                         /* SJOIN except char */
      0,                         /* Can remove User Channel Modes with SVSMODE */
      1,                         /* Sglines are enforced */
+     "x",                       /* vhost char */
      },
     {NULL}
 };
@@ -708,7 +709,7 @@ void anope_cmd_remove_akill(char *user, char *host)
 void anope_cmd_vhost_off(User * u)
 {
     send_cmd(s_HostServ, "SVSMODE %s -x", u->nick);
-    notice_lang(s_HostServ, u, HOST_OFF_UNREAL, u->nick);
+    notice_lang(s_HostServ, u, HOST_OFF_UNREAL, u->nick, ircd->vhostchar);
 }
 
 void anope_cmd_vhost_on(char *nick, char *vIdent, char *vhost)
diff --git a/src/unreal31.c b/src/unreal31.c
index e0d233e2d..5f0bc8a0e 100644
--- a/src/unreal31.c
+++ b/src/unreal31.c
@@ -105,6 +105,7 @@ IRCDVar ircd[] = {
      0,                         /* SJOIN except char */
      0,                         /* Can remove User Channel Modes with SVSMODE */
      0,                         /* Sglines are not enforced until user reconnects */
+     "x",                       /* vhost char */
      },
     {NULL}
 };
@@ -507,7 +508,7 @@ void anope_cmd_topic(char *whosets, char *chan, char *whosetit,
 void anope_cmd_vhost_off(User * u)
 {
     send_cmd(s_HostServ, "SVSMODE %s -xt", u->nick);
-    notice_lang(s_HostServ, u, HOST_OFF_UNREAL, u->nick);
+    notice_lang(s_HostServ, u, HOST_OFF_UNREAL, u->nick, ircd->vhostchar);
 }
 
 void anope_cmd_akill(char *user, char *host, char *who, time_t when,
diff --git a/src/unreal32.c b/src/unreal32.c
index dd1bef746..406b46384 100644
--- a/src/unreal32.c
+++ b/src/unreal32.c
@@ -104,6 +104,7 @@ IRCDVar ircd[] = {
      '\"',                      /* SJOIN except char */
      1,                         /* Can remove User Channel Modes with SVSMODE */
      0,                         /* Sglines are not enforced until user reconnects */
+     "x",                       /* vhost char */
      },
     {NULL}
 };
@@ -752,7 +753,7 @@ void anope_cmd_vhost_off(User * u)
         send_cmd(s_HostServ, "%s %s -xt", send_token("SVSMODE", "n"),
                  u->nick);
     }
-    notice_lang(s_HostServ, u, HOST_OFF_UNREAL, u->nick);
+    notice_lang(s_HostServ, u, HOST_OFF_UNREAL, u->nick, ircd->vhostchar);
 }
 
 void anope_cmd_akill(char *user, char *host, char *who, time_t when,
diff --git a/src/viagra.c b/src/viagra.c
index 2e4a1bc03..209f8440b 100644
--- a/src/viagra.c
+++ b/src/viagra.c
@@ -102,6 +102,7 @@ IRCDVar ircd[] = {
      0,                         /* SJOIN except char */
      0,                         /* Can remove User Channel Modes with SVSMODE */
      0,                         /* Sglines are not enforced until user reconnects */
+     "x",                       /* vhost char */
      }
     ,
     {NULL}
@@ -792,7 +793,7 @@ void anope_cmd_topic(char *whosets, char *chan, char *whosetit,
 void anope_cmd_vhost_off(User * u)
 {
     send_cmd(NULL, "SVSMODE %s -x", u->nick);
-    notice_lang(s_HostServ, u, HOST_OFF_UNREAL, u->nick);
+    notice_lang(s_HostServ, u, HOST_OFF_UNREAL, u->nick, ircd->vhostcar);
 }
 
 void anope_cmd_vhost_on(char *nick, char *vIdent, char *vhost)
diff --git a/version.log b/version.log
index 4136aca89..53e51013a 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
 VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="7"
-VERSION_BUILD="544"
+VERSION_BUILD="545"
 
 # $Log$
 #
+# BUILD : 1.7.7 (545)
+# BUGS  : 278
+# NOTES : On vhost unset show the correct vhost character
+#
 # BUILD : 1.7.7 (544)
 # BUGS  : N/A
 # NOTES : Forgot the changelog