From 517b4b0629c5c28a49860e14662bd10b6cfba28f Mon Sep 17 00:00:00 2001 From: "geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b" Date: Sun, 10 Sep 2006 16:42:57 +0000 Subject: BUILD : 1.7.15 (1149) BUGS : 598 NOTES : Added HOP to the list of XOP commands in the error from ChanServ ACCESS when XOP is enabled on supported ircds (and that line is too long!) git-svn-id: svn://svn.anope.org/anope/trunk@1149 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@872 5417fbe8-f217-4b02-8779-1006273d7864 --- Changes | 1 + lang/cat.l | 4 ++++ lang/de.l | 4 ++++ lang/en_us.l | 4 ++++ lang/es.l | 4 ++++ lang/fr.l | 4 ++++ lang/gr.l | 4 ++++ lang/hun.l | 4 ++++ lang/it.l | 4 ++++ lang/nl.l | 4 ++++ lang/pl.l | 4 ++++ lang/pt.l | 4 ++++ lang/ru.l | 4 ++++ lang/tr.l | 4 ++++ src/core/cs_access.c | 5 ++++- version.log | 6 +++++- 16 files changed, 62 insertions(+), 2 deletions(-) diff --git a/Changes b/Changes index 798cb2d0d..106b58866 100644 --- a/Changes +++ b/Changes @@ -7,6 +7,7 @@ Provided by Anope Dev. - 2006 08/27 F Fixed mod_current_module being incorrect resulting in segfault. [#593] 09/10 F Issues with make strict for the src/tools dir. [#579] 09/10 F Help for NickServ SET AUTOOP was missing. [#587] +09/10 F Added HOP to the /CS ACCESS error when XOP is enabled. [#598] Provided by Trystan - 2006 08/20 F Fixed several compiler warnings. [#586] diff --git a/lang/cat.l b/lang/cat.l index c145a338b..88afec4cd 100644 --- a/lang/cat.l +++ b/lang/cat.l @@ -1401,6 +1401,10 @@ CHAN_ACCESS_XOP No pots utilitzar aquest comanda. Utilitza les comandes AOP, SOP i VOP. Escriu %R%s HELP comanda per a més informació. +CHAN_ACCESS_XOP_HOP + You can't use this command. + Use the AOP, SOP, HOP and VOP commands instead. + Type %R%s HELP command for more information. CHAN_ACCESS_DISABLED Ho sento, la modificació d'accés a canals esta temporalment inabilitada. CHAN_ACCESS_LEVEL_NONZERO diff --git a/lang/de.l b/lang/de.l index c31a2a5fc..3bc11c688 100644 --- a/lang/de.l +++ b/lang/de.l @@ -1406,6 +1406,10 @@ CHAN_ACCESS_XOP Du kannst dieses Befehl nicht nutzen. Nutze stattdessen die AOP, SOP und VOP Befehle. Tippe %R%s HELP Befehl für weitere Informationen. +CHAN_ACCESS_XOP_HOP + You can't use this command. + Use the AOP, SOP, HOP and VOP commands instead. + Type %R%s HELP command for more information. CHAN_ACCESS_DISABLED Das Ändern der Channel-Access-Liste wurde zwischenzeitig deaktiviert. CHAN_ACCESS_LEVEL_NONZERO diff --git a/lang/en_us.l b/lang/en_us.l index 022b75fe0..f53f73daa 100644 --- a/lang/en_us.l +++ b/lang/en_us.l @@ -1376,6 +1376,10 @@ CHAN_ACCESS_XOP You can't use this command. Use the AOP, SOP and VOP commands instead. Type %R%s HELP command for more information. +CHAN_ACCESS_XOP_HOP + You can't use this command. + Use the AOP, SOP, HOP and VOP commands instead. + Type %R%s HELP command for more information. CHAN_ACCESS_DISABLED Sorry, channel access list modification is temporarily disabled. CHAN_ACCESS_LEVEL_NONZERO diff --git a/lang/es.l b/lang/es.l index c907cd02f..f8bff1c1e 100644 --- a/lang/es.l +++ b/lang/es.l @@ -1401,6 +1401,10 @@ CHAN_ACCESS_XOP No puedes usar este comando. Usa los comandos AOP, SOP y VOP en vez. Tipea %R%s HELP comando para mayor informacion. +CHAN_ACCESS_XOP_HOP + You can't use this command. + Use the AOP, SOP, HOP and VOP commands instead. + Type %R%s HELP command for more information. CHAN_ACCESS_DISABLED Lo siento, la modificacion de acceso a canales esta temporalmete deshabilitada. CHAN_ACCESS_LEVEL_NONZERO diff --git a/lang/fr.l b/lang/fr.l index 01eba5779..e48369d92 100644 --- a/lang/fr.l +++ b/lang/fr.l @@ -1407,6 +1407,10 @@ CHAN_ACCESS_XOP Vous ne pouvez pas utiliser cette commande. Utilisez les commandes AOP, SOP et VOP à la place. Tapez %R%s HELP commande pour plus d'informations. +CHAN_ACCESS_XOP_HOP + You can't use this command. + Use the AOP, SOP, HOP and VOP commands instead. + Type %R%s HELP command for more information. CHAN_ACCESS_DISABLED Désolés, la modification des listes d'accès des canaux est temporairement désactivée. CHAN_ACCESS_LEVEL_NONZERO diff --git a/lang/gr.l b/lang/gr.l index a2b179d34..e8ea676c4 100644 --- a/lang/gr.l +++ b/lang/gr.l @@ -1399,6 +1399,10 @@ CHAN_ACCESS_XOP Äåí ìðïñåßò íá ÷ñçóéìïðïéÞóåéò áõôÞ ôçí åíôïëÞ. ×ñçóéìïðïßçóå AOP, SOP êáé VOP åíôïëÝò áíôß ãéá ôçí access. ÃñÜøå %R%s HELP command ãéá ðåñéóóüôåñåò ðëçñïöïñßåò. +CHAN_ACCESS_XOP_HOP + You can't use this command. + Use the AOP, SOP, HOP and VOP commands instead. + Type %R%s HELP command for more information. CHAN_ACCESS_DISABLED Óõãíþìç, ç õðçñåóßá ãéá ôçí åíôïëÞ access åßíáé åêôüò ëåéôïõñãßáò. CHAN_ACCESS_LEVEL_NONZERO diff --git a/lang/hun.l b/lang/hun.l index 4149b5336..dff28f431 100644 --- a/lang/hun.l +++ b/lang/hun.l @@ -1394,6 +1394,10 @@ CHAN_ACCESS_XOP Írd be: %R%s HELP parancs bõvebb információért. Ha ki akarod kapcsolni az xOP rendszert, akkor írd be: %RChanServ set #szobanév xop off. +CHAN_ACCESS_XOP_HOP + You can't use this command. + Use the AOP, SOP, HOP and VOP commands instead. + Type %R%s HELP command for more information. CHAN_ACCESS_DISABLED A csatorna hozzáférési listájának módosítása szünetel. CHAN_ACCESS_LEVEL_NONZERO diff --git a/lang/it.l b/lang/it.l index c812910ae..e52c4c26c 100644 --- a/lang/it.l +++ b/lang/it.l @@ -1380,6 +1380,10 @@ CHAN_ACCESS_SYNTAX CHAN_ACCESS_XOP Questo comando non è utilizzabile; usa i comandi SOP, AOP, HOP e VOP. Digita %R%s HELP comando per ottenere maggiori informazioni. +CHAN_ACCESS_XOP_HOP + You can't use this command. + Use the AOP, SOP, HOP and VOP commands instead. + Type %R%s HELP command for more information. CHAN_ACCESS_DISABLED Spiacente, la modifica della lista di accesso dei canali è temporaneamente disabilitata. CHAN_ACCESS_LEVEL_NONZERO diff --git a/lang/nl.l b/lang/nl.l index a157bac50..7560afc50 100644 --- a/lang/nl.l +++ b/lang/nl.l @@ -1390,6 +1390,10 @@ CHAN_ACCESS_XOP Je kan dit commando niet gebruiken. Gebruik de AOP, SOP en VOP commando's in plaats van deze. Type %R%s HELP command voor meer informatie. +CHAN_ACCESS_XOP_HOP + You can't use this command. + Use the AOP, SOP, HOP and VOP commands instead. + Type %R%s HELP command for more information. CHAN_ACCESS_DISABLED Sorry, kanaal toegangslijst modificatie is tijdelijk uitgeschakeld. CHAN_ACCESS_LEVEL_NONZERO diff --git a/lang/pl.l b/lang/pl.l index 612a82f5a..61c3ee64f 100644 --- a/lang/pl.l +++ b/lang/pl.l @@ -1485,6 +1485,10 @@ CHAN_ACCESS_XOP Musisz u¿yæ VOP, HOP, AOP lub SOP. Napisz %R%s HELP komenda, aby uzyskaæ wiêcej informacji. +CHAN_ACCESS_XOP_HOP + You can't use this command. + Use the AOP, SOP, HOP and VOP commands instead. + Type %R%s HELP command for more information. CHAN_ACCESS_DISABLED B³±d, modyfikacje kana³owej listy dostêpu s± tymczasowo niedostêpne. diff --git a/lang/pt.l b/lang/pt.l index b2b7826de..0fe8e692b 100644 --- a/lang/pt.l +++ b/lang/pt.l @@ -1390,6 +1390,10 @@ CHAN_ACCESS_XOP Você não pode usar este comando. Ao invés, use os comandos VOP, HOP, AOP e SOP. Digite %R%s HELP comando para mais informação. +CHAN_ACCESS_XOP_HOP + You can't use this command. + Use the AOP, SOP, HOP and VOP commands instead. + Type %R%s HELP command for more information. CHAN_ACCESS_DISABLED Desculpe, o registro de canais está temporariamente desativado. CHAN_ACCESS_LEVEL_NONZERO diff --git a/lang/ru.l b/lang/ru.l index 3f7bccf2c..39d80fb3c 100644 --- a/lang/ru.l +++ b/lang/ru.l @@ -1395,6 +1395,10 @@ CHAN_ACCESS_XOP Âû íå ìîæåòå èñïîëüçîâàòü ýòó êîìàíäó. Èñïîëüçóéòå êîìàíäû AOP, SOP è VOP âìåñòî íåå. Íàïèøèòå %R%s HELP êîìàíäà äëÿ ïîëó÷åíèÿ áîëåå ïîäðîáíîé èíôîðìàöèè. +CHAN_ACCESS_XOP_HOP + You can't use this command. + Use the AOP, SOP, HOP and VOP commands instead. + Type %R%s HELP command for more information. CHAN_ACCESS_DISABLED Èçâèíèòå, ìîäèôèêàöèÿ ñïèñêà äîñòóïà êàíàëà âðåìåííî íåäîñòóïíà. CHAN_ACCESS_LEVEL_NONZERO diff --git a/lang/tr.l b/lang/tr.l index 4c807ca24..38989db75 100644 --- a/lang/tr.l +++ b/lang/tr.l @@ -1398,6 +1398,10 @@ CHAN_ACCESS_XOP Bu komutu kullanamazsiniz. Yerine AOP, SOP veya VOP komutlarini kullanin. Daha fazla bilgi için %R%s HELP komut yazin. +CHAN_ACCESS_XOP_HOP + You can't use this command. + Use the AOP, SOP, HOP and VOP commands instead. + Type %R%s HELP command for more information. CHAN_ACCESS_DISABLED Kanal access listesinin deðiþtirilmesi geçici olarak devre dýþýdýr. CHAN_ACCESS_LEVEL_NONZERO diff --git a/src/core/cs_access.c b/src/core/cs_access.c index 7a98716ed..1669791f7 100644 --- a/src/core/cs_access.c +++ b/src/core/cs_access.c @@ -167,7 +167,10 @@ int do_access(User * u) notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan); /* We still allow LIST in xOP mode, but not others */ } else if ((ci->flags & CI_XOP) && !is_list) { - notice_lang(s_ChanServ, u, CHAN_ACCESS_XOP, s_ChanServ); + if (ircd->halfop) + notice_lang(s_ChanServ, u, CHAN_ACCESS_XOP_HOP, s_ChanServ); + else + notice_lang(s_ChanServ, u, CHAN_ACCESS_XOP, s_ChanServ); } else if (((is_list && !check_access(u, ci, CA_ACCESS_LIST)) || (!is_list && !check_access(u, ci, CA_ACCESS_CHANGE))) && !is_servadmin) { diff --git a/version.log b/version.log index bbb8a48ca..4151a6460 100644 --- a/version.log +++ b/version.log @@ -9,10 +9,14 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="15" VERSION_EXTRA="-svn" -VERSION_BUILD="1148" +VERSION_BUILD="1149" # $Log$ # +# BUILD : 1.7.15 (1149) +# BUGS : 598 +# NOTES : Added HOP to the list of XOP commands in the error from ChanServ ACCESS when XOP is enabled on supported ircds (and that line is too long!) +# # BUILD : 1.7.15 (1148) # BUGS : 588 # NOTES : Added SASET AUTOOP to NickServ to match SET AUTOOP -- cgit