BUILD : 1.7.8 (625) BUGS : 319 NOTES : Globalized do_getkey by DrStein.

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


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

17 files changed, 134 insertions, 17 deletions

diff --git a/Changes b/Changes
index aba13db11..6aad028ce 100644
--- a/Changes
+++ b/Changes
@@ -45,7 +45,8 @@ Provided by Anope Dev. <dev@anope.org> - 2005
 Provided by Trystan <trystan@nomadirc.net> - 2005
 03/14 R Removed some old irc-services convertor ifdef's                   [#317]
 
-Provided by DrStein <gacevedo@anope.org> - 2005
+Provided by DrStein <drstein@anope.org> - 2005
+03/15 F ChanServ's do_getkey() function is now using notice_lang()        [#319]
 03/14 F Updated docs/FAQ.                                                 [#312]
 03/09 F Updated Spanish language file (es.l).                             [ #00]
 
diff --git a/Changes.lang b/Changes.lang
index 7126e880e..96ee403bd 100644
--- a/Changes.lang
+++ b/Changes.lang
@@ -3,6 +3,9 @@ Anope Version S V N
 *** New Strings:
 	CHAN_HELP_IRCD_HALFOP
 	CHAN_HELP_IRCD_PROTECT
+	CHAN_GETKEY_SYNTAX
+	CHAN_GETKEY_NOKEY
+	CHAN_GETKEY_KEY
 
 *** Mod Strings:
 	OPER_HELP_SET
diff --git a/lang/cat.l b/lang/cat.l
index abceb125d..7199d6c72 100644
--- a/lang/cat.l
+++ b/lang/cat.l
@@ -692,8 +692,7 @@ NICK_GETPASS_UNAVAILABLE
 	La comanda GETPASS no esta disponible per l'us d'encriptació.
 NICK_GETPASS_PASSWORD_IS
 	La clau per %s es %s.
-	
-# SENDPASS responses
+
 NICK_GETEMAIL_SYNTAX
 	GETEMAIL user@email-host No WildCards!!
 NICK_GETEMAIL_EMAILS_ARE
@@ -1482,6 +1481,14 @@ CHAN_GETPASS_PASSWORD_IS
 	La clau pel canal %s es %s.
 	
 # SENDPASS responses
+CHAN_GETKEY_SYNTAX
+	GETKEY channel
+CHAN_GETKEY_NOKEY
+	The channel %s has no key.
+CHAN_GETKEY_KEY
+	Key for channel %s is %s.
+
+# SENDPASS responses
 CHAN_SENDPASS_SYNTAX
 	SENDPASS canal
 CHAN_SENDPASS_UNAVAILABLE
diff --git a/lang/de.l b/lang/de.l
index 266ee571f..b8abe4c2c 100644
--- a/lang/de.l
+++ b/lang/de.l
@@ -711,7 +711,7 @@ NICK_GETPASS_UNAVAILABLE
 	GETPASS nicht verfügbar, da die Verschlüsselung aktiviert ist.
 NICK_GETPASS_PASSWORD_IS
 	Passwort von %s ist %s.
-	
+
 # SENDPASS responses
 NICK_GETEMAIL_SYNTAX
 	GETEMAIL user@email-host Keine WildCards!!
@@ -1487,6 +1487,14 @@ CHAN_GETPASS_PASSWORD_IS
 	Passwort für Channel %s ist %s.
 	
 # SENDPASS responses
+CHAN_GETKEY_SYNTAX
+	GETKEY channel
+CHAN_GETKEY_NOKEY
+	The channel %s has no key.
+CHAN_GETKEY_KEY
+	Key for channel %s is %s.
+
+# SENDPASS responses
 CHAN_SENDPASS_SYNTAX
 	SENDPASS Channel
 CHAN_SENDPASS_UNAVAILABLE
diff --git a/lang/en_us.l b/lang/en_us.l
index 1772e4d43..8c139ccb8 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -1457,7 +1457,15 @@ CHAN_GETPASS_UNAVAILABLE
 	GETPASS command unavailable because encryption is in use.
 CHAN_GETPASS_PASSWORD_IS
 	Password for channel %s is %s.
-	
+
+# GETKEY responses
+CHAN_GETKEY_SYNTAX
+	GETKEY channel
+CHAN_GETKEY_NOKEY
+	The channel %s has no key.
+CHAN_GETKEY_KEY
+	Key for channel %s is %s.
+
 # SENDPASS responses
 CHAN_SENDPASS_SYNTAX
 	SENDPASS channel
diff --git a/lang/es.l b/lang/es.l
index 35fec7152..5d665839e 100644
--- a/lang/es.l
+++ b/lang/es.l
@@ -696,7 +696,7 @@ NICK_GETPASS_UNAVAILABLE
 	El comando GETPASS no esta disponible por el uso de encriptacion.
 NICK_GETPASS_PASSWORD_IS
 	La clave para %s es %s.
-	
+
 # SENDPASS responses
 NICK_GETEMAIL_SYNTAX
 	GETEMAIL user@email-host Sin comodines (WildCards)!!
@@ -1479,6 +1479,14 @@ CHAN_GETPASS_UNAVAILABLE
 CHAN_GETPASS_PASSWORD_IS
 	La clave para el canal %s es %s.
 	
+# GETKEY responses
+CHAN_GETKEY_SYNTAX
+	GETKEY canal
+CHAN_GETKEY_NOKEY
+	El canal %s no tiene clave.
+CHAN_GETKEY_KEY
+	Clave para el canal %s es %s.
+
 # SENDPASS responses
 CHAN_SENDPASS_SYNTAX
 	SENDPASS canal
diff --git a/lang/fr.l b/lang/fr.l
index 692283d42..a7054717b 100644
--- a/lang/fr.l
+++ b/lang/fr.l
@@ -1481,6 +1481,14 @@ CHAN_GETPASS_PASSWORD_IS
 	Le mot de passe du channel %s est %s.
 	
 # SENDPASS responses
+CHAN_GETKEY_SYNTAX
+	GETKEY channel
+CHAN_GETKEY_NOKEY
+	The channel %s has no key.
+CHAN_GETKEY_KEY
+	Key for channel %s is %s.
+
+# SENDPASS responses
 CHAN_SENDPASS_SYNTAX
 	SENDPASS channel
 CHAN_SENDPASS_UNAVAILABLE
diff --git a/lang/gr.l b/lang/gr.l
index 8f26a4605..f81c3db48 100644
--- a/lang/gr.l
+++ b/lang/gr.l
@@ -690,7 +690,7 @@ NICK_GETPASS_UNAVAILABLE
 	Ç GETPASS åíôïëÞ äåí åßíáé äéáèÝóéìç ãéáôß ÷ñçóéìïðïéåßôáé ç êùäéêïðïßçóç.
 NICK_GETPASS_PASSWORD_IS
 	Ï êùäéêüò ãéá ôïí %s åßíáé %s.
-	
+
 # SENDPASS responses
 NICK_GETEMAIL_SYNTAX
 	GETEMAIL user@email-host No WildCards!!
@@ -1471,6 +1471,14 @@ CHAN_GETPASS_PASSWORD_IS
 	Ï êùäéêüò ãéá ôï êáíÜëé %s åßíáé %s.
 	
 # SENDPASS responses
+CHAN_GETKEY_SYNTAX
+	GETKEY channel
+CHAN_GETKEY_NOKEY
+	The channel %s has no key.
+CHAN_GETKEY_KEY
+	Key for channel %s is %s.
+
+# SENDPASS responses
 CHAN_SENDPASS_SYNTAX
 	SENDPASS êáíÜëé
 CHAN_SENDPASS_UNAVAILABLE
diff --git a/lang/hun.l b/lang/hun.l
index 1efc6735f..0cb643474 100644
--- a/lang/hun.l
+++ b/lang/hun.l
@@ -1469,6 +1469,14 @@ CHAN_GETPASS_PASSWORD_IS
 	A (%s) csatorna  jelszava: %s.
 
 # SENDPASS válaszok
+CHAN_GETKEY_SYNTAX
+	GETKEY channel
+CHAN_GETKEY_NOKEY
+	The channel %s has no key.
+CHAN_GETKEY_KEY
+	Key for channel %s is %s.
+
+# SENDPASS responses
 CHAN_SENDPASS_SYNTAX
 	SENDPASS #szoba
 CHAN_SENDPASS_UNAVAILABLE
diff --git a/lang/it.l b/lang/it.l
index 8477fb1d5..275c7ab8d 100644
--- a/lang/it.l
+++ b/lang/it.l
@@ -1472,6 +1472,14 @@ CHAN_GETPASS_PASSWORD_IS
 	La chiave (password) del canale %s è %s.
 
 # SENDPASS responses
+CHAN_GETKEY_SYNTAX
+	GETKEY channel
+CHAN_GETKEY_NOKEY
+	The channel %s has no key.
+CHAN_GETKEY_KEY
+	Key for channel %s is %s.
+
+# SENDPASS responses
 CHAN_SENDPASS_SYNTAX
 	SENDPASS canale
 CHAN_SENDPASS_UNAVAILABLE
diff --git a/lang/nl.l b/lang/nl.l
index 9b35171c8..0dce9e6b5 100644
--- a/lang/nl.l
+++ b/lang/nl.l
@@ -693,7 +693,7 @@ NICK_GETPASS_UNAVAILABLE
 	GETPASS commando is onbeschikbaar omdat encryptie aanstaat.
 NICK_GETPASS_PASSWORD_IS
 	Wachtwoord voor %s is %s.
-	
+
 # SENDPASS responses
 NICK_GETEMAIL_SYNTAX
 	GETEMAIL user@email-host geen Wildcards!!
@@ -1469,6 +1469,14 @@ CHAN_GETPASS_PASSWORD_IS
 	Wachtwoord voor kanaal %s is %s.
 	
 # SENDPASS responses
+CHAN_GETKEY_SYNTAX
+	GETKEY channel
+CHAN_GETKEY_NOKEY
+	The channel %s has no key.
+CHAN_GETKEY_KEY
+	Key for channel %s is %s.
+
+# SENDPASS responses
 CHAN_SENDPASS_SYNTAX
 	SENDPASS kanaal
 CHAN_SENDPASS_UNAVAILABLE
diff --git a/lang/pl.l b/lang/pl.l
index 99919058d..eaec8cc47 100644
--- a/lang/pl.l
+++ b/lang/pl.l
@@ -1586,6 +1586,14 @@ CHAN_GETPASS_PASSWORD_IS
 	Has³o kana³u %s to %s.
 	
 # SENDPASS responses
+CHAN_GETKEY_SYNTAX
+	GETKEY channel
+CHAN_GETKEY_NOKEY
+	The channel %s has no key.
+CHAN_GETKEY_KEY
+	Key for channel %s is %s.
+
+# SENDPASS responses
 CHAN_SENDPASS_SYNTAX
 	SENDPASS kana³
 CHAN_SENDPASS_UNAVAILABLE
diff --git a/lang/pt.l b/lang/pt.l
index eef91e7bf..3ce7b3501 100644
--- a/lang/pt.l
+++ b/lang/pt.l
@@ -693,7 +693,7 @@ NICK_GETPASS_UNAVAILABLE
 	Comando GETPASS não disponível: modo de encriptação ativado.
 NICK_GETPASS_PASSWORD_IS
 	Senha para %s é %s.
-	
+
 # GETEMAIL responses
 NICK_GETEMAIL_SYNTAX
 	GETEMAIL user@emailhost Não use coringas!
@@ -1467,6 +1467,14 @@ CHAN_GETPASS_PASSWORD_IS
 	Senha do canal %s é %s.
 	
 # SENDPASS responses
+CHAN_GETKEY_SYNTAX
+	GETKEY channel
+CHAN_GETKEY_NOKEY
+	The channel %s has no key.
+CHAN_GETKEY_KEY
+	Key for channel %s is %s.
+
+# SENDPASS responses
 CHAN_SENDPASS_SYNTAX
 	SENDPASS canal
 CHAN_SENDPASS_UNAVAILABLE
diff --git a/lang/ru.l b/lang/ru.l
index 3e069eb82..ef3dd61a3 100644
--- a/lang/ru.l
+++ b/lang/ru.l
@@ -1467,6 +1467,14 @@ CHAN_GETPASS_PASSWORD_IS
 	Ïàðîëü íà êàíàë %s - %s.
 	
 # SENDPASS responses
+CHAN_GETKEY_SYNTAX
+	GETKEY channel
+CHAN_GETKEY_NOKEY
+	The channel %s has no key.
+CHAN_GETKEY_KEY
+	Key for channel %s is %s.
+
+# SENDPASS responses
 CHAN_SENDPASS_SYNTAX
 	SENDPASS #êàíàë
 CHAN_SENDPASS_UNAVAILABLE
diff --git a/lang/tr.l b/lang/tr.l
index d3644287c..16f289d9b 100644
--- a/lang/tr.l
+++ b/lang/tr.l
@@ -696,7 +696,7 @@ NICK_GETPASS_UNAVAILABLE
 	GETPASS komutu devre dýþý çünkü þifreleme(encryption) devrede.
 NICK_GETPASS_PASSWORD_IS
 	%s nickinin þifresi %s.
-	
+
 # SENDPASS responses
 NICK_GETEMAIL_SYNTAX
 	GETEMAIL user@email-host No WildCards!!
@@ -1477,6 +1477,14 @@ CHAN_GETPASS_PASSWORD_IS
 	%s kanalýnýn þifresi %s.
 	
 # SENDPASS responses
+CHAN_GETKEY_SYNTAX
+	GETKEY channel
+CHAN_GETKEY_NOKEY
+	The channel %s has no key.
+CHAN_GETKEY_KEY
+	Key for channel %s is %s.
+
+# SENDPASS responses
 CHAN_SENDPASS_SYNTAX
 	SENDPASS kanaladý
 CHAN_SENDPASS_UNAVAILABLE
diff --git a/src/chanserv.c b/src/chanserv.c
index 801e6c47c..d373e9f95 100644
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -6234,14 +6234,20 @@ static int do_getkey(User * u)
     char *chan = strtok(NULL, " ");
     ChannelInfo *ci;
 
-    if (chan && (ci = cs_findchan(chan)) && !(ci->flags & CI_VERBOTEN)
-        && check_access(u, ci, CA_GETKEY)) {
-        notice_user(s_ChanServ, u, "KEY %s %s", ci->name,
-                    (ci->
-                     c ? (ci->c->key ? ci->c->key : "NO KEY") : "NO KEY"));
+    if (!chan) {
+        syntax_error(s_ChanServ, u, "GETKEY", CHAN_GETKEY_SYNTAX);
+    } else if (!(ci = cs_findchan(chan))) {
+        notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
+    } else if (ci->flags & CI_VERBOTEN) {
+        notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
+    } else if (!check_access(u, ci, CA_GETKEY)) {
+        notice_lang(s_ChanServ, u, ACCESS_DENIED);
+    } else if (!ci->c || !ci->c->key) {
+        notice_lang(s_ChanServ, u, CHAN_GETKEY_NOKEY, chan);
     } else {
-        notice_user(s_ChanServ, u, "KEY %s ERROR", chan);
+        notice_lang(s_ChanServ, u, CHAN_GETKEY_KEY, chan, ci->c->key);
     }
+
     return MOD_CONT;
 }
 
diff --git a/version.log b/version.log
index 40bb454f1..e9d83789a 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
 VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="8"
-VERSION_BUILD="624"
+VERSION_BUILD="625"
 
 # $Log$
 #
+# BUILD : 1.7.8 (625)
+# BUGS  : 319
+# NOTES : Globalized do_getkey by DrStein.
+#
 # BUILD : 1.7.8 (624)
 # BUGS  : 312
 # NOTES : Revision 623 was the bugfix for bug 312, noted it in Changes now