diff options
| -rw-r--r-- | docs/TODO | 2 | ||||
| -rw-r--r-- | lang/cat.l | 18 | ||||
| -rw-r--r-- | lang/de.l | 10 | ||||
| -rw-r--r-- | lang/en_us.l | 28 | ||||
| -rw-r--r-- | lang/es.l | 10 | ||||
| -rw-r--r-- | lang/fr.l | 10 | ||||
| -rw-r--r-- | lang/gr.l | 10 | ||||
| -rw-r--r-- | lang/hun.l | 10 | ||||
| -rw-r--r-- | lang/it.l | 10 | ||||
| -rw-r--r-- | lang/nl.l | 10 | ||||
| -rw-r--r-- | lang/pl.l | 11 | ||||
| -rw-r--r-- | lang/pt.l | 12 | ||||
| -rw-r--r-- | lang/ru.l | 10 | ||||
| -rw-r--r-- | lang/tr.l | 10 | ||||
| -rw-r--r-- | src/core/cs_info.cpp | 23 | ||||
| -rw-r--r-- | src/core/ns_info.cpp | 36 |
16 files changed, 71 insertions, 149 deletions
@@ -29,7 +29,7 @@ Legend: [?] Last successful login time/ip? perhaps both of these should be a new nick setting [ ] NS INFO: seperate field for last seen realhost, shown to SRA only [ ] NS SUSPEND: show suspender and reason, probably to sopers only (see CS SUSPEND) -[ ] Merge NS INFO blah ALL with NS INFO blah, if you're requesting info, you really want the info anyway. +[x] Merge NS INFO blah ALL with NS INFO blah, if you're requesting info, you really want the info anyway. Future ------ diff --git a/lang/cat.l b/lang/cat.l index b63731df7..1fe322115 100644 --- a/lang/cat.l +++ b/lang/cat.l @@ -724,7 +724,7 @@ NICK_STATUS_REPLY # INFO responses NICK_INFO_SYNTAX - INFO nick [ALL] + INFO nick NICK_INFO_REALNAME %s es %s NICK_INFO_SERVICES_OPERTYPE @@ -772,8 +772,6 @@ NICK_INFO_OPT_NONE Cap NICK_INFO_NO_EXPIRE Aquest nickname no caducara. -NICK_INFO_FOR_MORE - Per més informació, escriu %R%s INFO %s ALL. # LIST responses NICK_INFO_SUSPENDED @@ -1615,7 +1613,7 @@ CHAN_STATUS_INFO # INFO responses CHAN_INFO_SYNTAX - INFO canal [ALL] + INFO canal CHAN_INFO_HEADER Informació pel canal %s: CHAN_INFO_FOUNDER @@ -4006,14 +4004,11 @@ NICK_HELP_GHOST per aquest nickname. NICK_HELP_INFO - Sintaxis: INFO nickname [ALL] + Sintaxis: INFO nickname Mostra informació relativa al nick que s'especifiqui, tal com el propietari del nick, l'ultima adreça utilitzada - i temps, i opcions del nick. Si estas identificat amb el - nick per el qual demanes informació i utilitzes el parametre - ALL, podras veure tota la informació; independentment de - si esta oculta o no. + i temps, i opcions del nick. NICK_HELP_LIST Sintaxis: LIST patró @@ -5051,16 +5046,13 @@ CHAN_HELP_LEVELS_DESC_FORMAT %-*s %s CHAN_HELP_INFO - Sintàxi: INFO canal [ALL] + Sintàxi: INFO canal llista informació sobre el canal registrat donat, incloent el seu fundador, temps de registració, últim cop utilitzat, descripció i fixació de Modes, si existeixen. Si ALL és especificat, el misatge d'entrada i sucsesor també seran mostrats. - - Per defecte, l'opció ALL està limitada a aquells - amb accés de fundador en el canal. CHAN_HELP_LIST Sintàxi: LIST patró @@ -741,7 +741,7 @@ NICK_STATUS_REPLY # INFO responses NICK_INFO_SYNTAX - INFO Nickname [ALL] + INFO Nickname NICK_INFO_REALNAME %s ist %s NICK_INFO_SERVICES_OPERTYPE @@ -789,8 +789,6 @@ NICK_INFO_OPT_NONE Keine NICK_INFO_NO_EXPIRE Dieser Nickname wird nicht auslaufen. -NICK_INFO_FOR_MORE - Für weitere Informationen, tippe %R%s INFO %s ALL. # LIST responses NICK_INFO_SUSPENDED @@ -1622,7 +1620,7 @@ CHAN_STATUS_INFO # INFO responses CHAN_INFO_SYNTAX - INFO Channel [ALL] + INFO Channel CHAN_INFO_HEADER Informationen über den Channel %s: CHAN_INFO_FOUNDER @@ -4036,7 +4034,7 @@ NICK_HELP_GHOST du das richtige Passwort für den Nickname haben. NICK_HELP_INFO - Syntax: INFO Nickname [ALL] + Syntax: INFO Nickname Zeigt Informationen über den angegebenen Nickname, zum Beispiel den Besitzer des Nicknamens, die letzte gesehene @@ -5080,7 +5078,7 @@ CHAN_HELP_LEVELS_DESC_FORMAT %-*s %s CHAN_HELP_INFO - Syntax: INFO Channel [ALL] + Syntax: INFO Channel Zeigt Informationen über einen registrierten Channel, seinen Gründer, das Datum der Registrierung, die diff --git a/lang/en_us.l b/lang/en_us.l index 9616558c0..c86043854 100644 --- a/lang/en_us.l +++ b/lang/en_us.l @@ -709,7 +709,7 @@ NICK_STATUS_REPLY # INFO responses NICK_INFO_SYNTAX - INFO nick [ALL] + INFO nick NICK_INFO_REALNAME %s is %s NICK_INFO_SERVICES_OPERTYPE @@ -757,8 +757,6 @@ NICK_INFO_OPT_NONE None NICK_INFO_NO_EXPIRE This nickname will not expire. -NICK_INFO_FOR_MORE - For more verbose information, type %R%s INFO %s ALL. NICK_INFO_SUSPENDED This nickname is currently suspended, reason: %s NICK_INFO_SUSPENDED_NO_REASON @@ -1585,7 +1583,7 @@ CHAN_STATUS_INFO # INFO responses CHAN_INFO_SYNTAX - INFO channel [ALL] + INFO channel CHAN_INFO_HEADER Information for channel %s: CHAN_INFO_FOUNDER @@ -3872,14 +3870,11 @@ NICK_HELP_GHOST the nickname. NICK_HELP_INFO - Syntax: INFO nickname [ALL] + Syntax: INFO nickname Displays information about the given nickname, such as the nick's owner, last seen address and time, and nick - options. If you are identified for the nick you're - getting information for and ALL is specified, you will - be shown all the information; regardless of whether - it's hidden or not. + options. NICK_HELP_LIST Syntax: LIST pattern @@ -4019,11 +4014,6 @@ NICK_SERVADMIN_HELP_DROP special privileges. Dropping any nick is limited to Services Operators. -NICK_SERVADMIN_HELP_INFO - - Services Operators with the nickserv/auspex privilege may - use the ALL parameter with any nick. - NICK_SERVADMIN_HELP_LIST Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED] @@ -4868,16 +4858,13 @@ CHAN_HELP_LEVELS_DESC_FORMAT %-*s %s CHAN_HELP_INFO - Syntax: INFO channel [ALL] + Syntax: INFO channel Lists information about the named registered channel, including its founder, time of registration, last time used, description, and mode lock, if any. If ALL is specified, the entry message and successor will also be displayed. - - By default, the ALL option is limited to those with - founder access on the channel. CHAN_HELP_LIST Syntax: LIST pattern @@ -5069,11 +5056,6 @@ CHAN_SERVADMIN_HELP_SET_NOEXPIRE Sets whether the given channel will expire. Setting this to ON prevents the channel from expiring. -CHAN_SERVADMIN_HELP_INFO - - Services Operators with the chanserv/auspex permission can - use the ALL parameter with any channel. - CHAN_SERVADMIN_HELP_LIST Syntax: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] @@ -726,7 +726,7 @@ NICK_STATUS_REPLY # INFO responses NICK_INFO_SYNTAX - INFO nick [ALL] + INFO nick NICK_INFO_REALNAME %s es %s NICK_INFO_SERVICES_OPERTYPE @@ -774,8 +774,6 @@ NICK_INFO_OPT_NONE Ninguno NICK_INFO_NO_EXPIRE Este nickname no expirara. -NICK_INFO_FOR_MORE - Para mayor informacion, tipea %R%s INFO %s ALL. # LIST responses NICK_INFO_SUSPENDED @@ -1613,7 +1611,7 @@ CHAN_STATUS_INFO # INFO responses CHAN_INFO_SYNTAX - INFO canal [ALL] + INFO canal CHAN_INFO_HEADER Informacion para el canal %s: CHAN_INFO_FOUNDER @@ -3978,7 +3976,7 @@ NICK_HELP_GHOST para ese nickname. NICK_HELP_INFO - Sintaxis: INFO nickname [ALL] + Sintaxis: INFO nickname Muestra informacion relativa al nick que especifiques, tal como el propietario del nick, la ultima direccion usada @@ -5023,7 +5021,7 @@ CHAN_HELP_LEVELS_DESC_FORMAT %-*s %s CHAN_HELP_INFO - Sintaxis: INFO canal [ALL] + Sintaxis: INFO canal Lista informacion acerca del canal registrado dado, incluyendo su fundador, tiempo de registracion, ultima @@ -733,7 +733,7 @@ NICK_STATUS_REPLY # INFO responses NICK_INFO_SYNTAX - INFO pseudo [ALL] + INFO pseudo NICK_INFO_REALNAME %s est %s NICK_INFO_SERVICES_OPERTYPE @@ -781,8 +781,6 @@ NICK_INFO_OPT_NONE Aucune NICK_INFO_NO_EXPIRE Ce pseudo n'expirera pas. -NICK_INFO_FOR_MORE - Pour plus d'informations, tapez %R%s INFO %s ALL. # LIST responses NICK_INFO_SUSPENDED @@ -1623,7 +1621,7 @@ CHAN_STATUS_INFO # INFO responses CHAN_INFO_SYNTAX - INFO canal [ALL] + INFO canal CHAN_INFO_HEADER Informations pour le canal %s: CHAN_INFO_FOUNDER @@ -4033,7 +4031,7 @@ NICK_HELP_GHOST correct pour le pseudo. NICK_HELP_INFO - Syntaxe: INFO pseudo [ALL] + Syntaxe: INFO pseudo Affiche des informations sur le pseudo donné, telles que le propriétaire du pseudo, l'adresse avec laquelle il était @@ -5080,7 +5078,7 @@ CHAN_HELP_LEVELS_DESC_FORMAT %-*s %s CHAN_HELP_INFO - Syntaxe: INFO canal [ALL] + Syntaxe: INFO canal Liste les informations concernant le canal enregistré cité, dont son propriétaire, la date d'enregistrement, @@ -722,7 +722,7 @@ NICK_STATUS_REPLY # INFO responses NICK_INFO_SYNTAX - INFO nick [ALL] + INFO nick NICK_INFO_REALNAME %s åßíáé %s NICK_INFO_SERVICES_OPERTYPE @@ -770,8 +770,6 @@ NICK_INFO_OPT_NONE ÊáíÝíá NICK_INFO_NO_EXPIRE Áõôü ôï øåõäþíõìï äåí èá ëÞîåé ðïôÝ. -NICK_INFO_FOR_MORE - Ãéá ðåñéóóüôåñåò ðëçñïöïñßåò, ãñÜøå %R%s INFO %s ALL. # LIST responses NICK_INFO_SUSPENDED @@ -1617,7 +1615,7 @@ CHAN_STATUS_INFO # INFO responses CHAN_INFO_SYNTAX - INFO channel [ALL] + INFO channel CHAN_INFO_HEADER Ðëçñïöïñßåò ãéá ôï êáíÜëé %s: CHAN_INFO_FOUNDER @@ -4008,7 +4006,7 @@ NICK_HELP_GHOST äþóåé ôïí óùóôü êùäéêü ãéá ôï øåõäþíõìï. NICK_HELP_INFO - Óýíôáîç: INFO øåõäþíõìï [ALL] + Óýíôáîç: INFO øåõäþíõìï Åìöáíßæåé ðëçñïöïñßåò ãéá ôï øåõäþíõìï ðïõ èá äþóåôå, üðùò ôïí êÜôï÷ï ôïõ øåõäùíýìïõ, ôçí ôåëåõôáßá äéåýèõíóç êáé þñá @@ -5001,7 +4999,7 @@ CHAN_HELP_LEVELS_DESC_FORMAT %-*s %s CHAN_HELP_INFO - Óýíôáîç: INFO êáíÜëé [ALL] + Óýíôáîç: INFO êáíÜëé Åìöáíßæåé ðëçñïöïñßåò ó÷åôéêÜ ìå ôï üíïìá ôïõ êáôï÷õñùìÝíïõ êáíáëéïý, ðåñéëáìâáíïìÝíïõ ôïí founder, ôçí þñá ôçò êáôï÷ýñùóçò, ðüôå ÷ñçóéìïðïéÞèçêå diff --git a/lang/hun.l b/lang/hun.l index daad32421..5bb9d7c11 100644 --- a/lang/hun.l +++ b/lang/hun.l @@ -719,7 +719,7 @@ NICK_STATUS_REPLY # INFO Válaszok NICK_INFO_SYNTAX - INFO nick [ALL] + INFO nick NICK_INFO_REALNAME %s az %s NICK_INFO_SERVICES_OPERTYPE @@ -767,8 +767,6 @@ NICK_INFO_OPT_NONE Nincs NICK_INFO_NO_EXPIRE Ez a nicknév nem fog elévülni. -NICK_INFO_FOR_MORE - Bõvebb információkért, írd be: %R%s INFO %s ALL. # LIST válaszok NICK_INFO_SUSPENDED @@ -1611,7 +1609,7 @@ CHAN_STATUS_INFO # INFO válaszok CHAN_INFO_SYNTAX - INFO #szoba [ALL] + INFO #szoba CHAN_INFO_HEADER %s információi: CHAN_INFO_FOUNDER @@ -3918,7 +3916,7 @@ NICK_HELP_GHOST A beragadt nicked killelheted, ha ismered a jelszót . NICK_HELP_INFO - Syntax: INFO nicknév [ALL] + Syntax: INFO nicknév Megmutatja a nicknévvel kapcsolatos információkat, mint a nick tulajdonosa, utoljára látott címe, regisztrálás ideje, @@ -4930,7 +4928,7 @@ CHAN_HELP_LEVELS_DESC_FORMAT %-*s %s CHAN_HELP_INFO - Syntax: INFO #szoba [ALL] + Syntax: INFO #szoba Listázza az összes információt a megnevezett regisztrált csatornáról, pl a foundert, a regisztrálás idõpontját, @@ -711,7 +711,7 @@ NICK_STATUS_REPLY # INFO responses NICK_INFO_SYNTAX - INFO nick [ALL] + INFO nick NICK_INFO_REALNAME %s è %s NICK_INFO_SERVICES_OPERTYPE @@ -759,8 +759,6 @@ NICK_INFO_OPT_NONE Nessuna NICK_INFO_NO_EXPIRE Questo nick non scadrà. -NICK_INFO_FOR_MORE - Per ottenere altre informazioni, digita %R%s INFO %s ALL. NICK_INFO_SUSPENDED Questo nickname è momentaneamente sospeso, motivo: %s NICK_INFO_SUSPENDED_NO_REASON @@ -1587,7 +1585,7 @@ CHAN_STATUS_INFO # INFO responses CHAN_INFO_SYNTAX - INFO canale [ALL] + INFO canale CHAN_INFO_HEADER Informazioni sul canale %s: CHAN_INFO_FOUNDER @@ -3881,7 +3879,7 @@ NICK_HELP_GHOST corretta per quel nick. NICK_HELP_INFO - Sintassi: INFO nick [ALL] + Sintassi: INFO nick Mostra varie informazioni sul nick specificato, come ad esempio il proprietario del nick, la data dell'ultimo @@ -4916,7 +4914,7 @@ CHAN_HELP_LEVELS_DESC_FORMAT %-*s %s CHAN_HELP_INFO - Sintassi: INFO canale [ALL] + Sintassi: INFO canale Mostra varie informazioni a proposito del canale specificato (a patto che sia registrato), tra cui il @@ -726,7 +726,7 @@ NICK_STATUS_REPLY # INFO responses NICK_INFO_SYNTAX - INFO nick [ALL] + INFO nick NICK_INFO_REALNAME %s is %s NICK_INFO_SERVICES_OPERTYPE @@ -774,8 +774,6 @@ NICK_INFO_OPT_NONE Geen NICK_INFO_NO_EXPIRE Deze nick zal niet verlopen. -NICK_INFO_FOR_MORE - Voor meer informatie, type %R%s INFO %s ALL. # LIST responses NICK_INFO_SUSPENDED @@ -1604,7 +1602,7 @@ CHAN_STATUS_INFO # INFO responses CHAN_INFO_SYNTAX - INFO kanaal [ALL] + INFO kanaal CHAN_INFO_HEADER Informatie voor kanaal %s: CHAN_INFO_FOUNDER @@ -3953,7 +3951,7 @@ NICK_HELP_GHOST die nick, of het correcte wachtwoord opgegeven zijn. NICK_HELP_INFO - Gebruik: INFO nick [ALL] + Gebruik: INFO nick Geeft informatie weer over de gegeven nick, zoals de laatste eigenaar van de nick, het laatst beekende adres, wanneer deze @@ -4986,7 +4984,7 @@ CHAN_HELP_LEVELS_DESC_FORMAT %-*s %s CHAN_HELP_INFO - Gebruik: INFO kanaal [ALL] + Gebruik: INFO kanaal Geeft informatie weer over het gegeven geregistreerde kanaal, zoals de stichter, registratietijd, tijd van @@ -903,7 +903,7 @@ NICK_STATUS_REPLY # INFO responses NICK_INFO_SYNTAX - INFO nick [ALL] + INFO nick NICK_INFO_REALNAME %s to %s @@ -975,9 +975,6 @@ NICK_INFO_OPT_NONE NICK_INFO_NO_EXPIRE Ten nick nie wyga¶nie. -NICK_INFO_FOR_MORE - Aby uzyskaæ wiêcej informacji napisz %R%s INFO %s ALL. - NICK_INFO_SUSPENDED Ten nick jest obecnie zawieszony, powód: %s @@ -2063,7 +2060,7 @@ CHAN_STATUS_INFO # INFO responses CHAN_INFO_SYNTAX - INFO kana³ [ALL] + INFO kana³ CHAN_INFO_HEADER Informacje o kanale %s: @@ -4946,7 +4943,7 @@ NICK_HELP_GHOST 3. podasz prawid³owe has³o do nicka. NICK_HELP_INFO - Sk³adnia: INFO nick [ALL] + Sk³adnia: INFO nick Wy¶wietla informacje na temat wybranego nicka: w³a¶ciciel, kiedy ostatnio widziano, z jakiego @@ -5988,7 +5985,7 @@ CHAN_HELP_LEVELS_DESC_FORMAT %-*s %s CHAN_HELP_INFO - Sk³adnia: INFO kana³ [ALL] + Sk³adnia: INFO kana³ Wy¶wietla informacje o zarejestrowanym kanale: w³a¶ciciel, data za³o¿enia, opis, blokada flag, @@ -728,7 +728,7 @@ NICK_STATUS_REPLY # INFO responses NICK_INFO_SYNTAX - INFO nick [ALL] + INFO nick NICK_INFO_REALNAME %s é %s NICK_INFO_SERVICES_OPERTYPE @@ -776,8 +776,6 @@ NICK_INFO_OPT_NONE Nenhuma NICK_INFO_NO_EXPIRE Este nick não irá expirar. -NICK_INFO_FOR_MORE - Para informações mais detalhadas, digite %R%s INFO %s ALL. # LIST responses NICK_INFO_SUSPENDED @@ -1605,7 +1603,7 @@ CHAN_STATUS_INFO # INFO responses CHAN_INFO_SYNTAX - INFO canal [ALL] + INFO canal CHAN_INFO_HEADER Informações do canal %s: CHAN_INFO_FOUNDER @@ -2630,7 +2628,7 @@ OPER_OLINE_IRCOP # CLEARMODES responses OPER_CLEARMODES_SYNTAX - CLEARMODES canal [ALL] + CLEARMODES canal [ALL] OPER_CLEARMODES_DONE Modos binários e bans removidos do canal %s. OPER_CLEARMODES_ALL_DONE @@ -3902,7 +3900,7 @@ NICK_HELP_GHOST nick, ou você deve fornecer a senha correta para o nick. NICK_HELP_INFO - Sintaxe: INFO nick [ALL] + Sintaxe: INFO nick Mostra a informação sobre o nick dado, como o dono do nick, último endereço utilizado e horário, e opções. Se você está @@ -4886,7 +4884,7 @@ CHAN_HELP_LEVELS_DESC_FORMAT %-*s %s CHAN_HELP_INFO - Sintaxe: INFO canal [ALL] + Sintaxe: INFO canal Lista as informações referentes ao canal registrado dado, incluindo seu fundador, data do registro, última vez que @@ -711,7 +711,7 @@ NICK_STATUS_REPLY # INFO responses NICK_INFO_SYNTAX - INFO íèê [ALL] + INFO íèê NICK_INFO_REALNAME %s ýòî %s NICK_INFO_SERVICES_OPERTYPE @@ -759,8 +759,6 @@ NICK_INFO_OPT_NONE îòñóòñòâóþò NICK_INFO_NO_EXPIRE Äîïîëíèòåëüíî: ðåãèñòðàöèÿ ýòîãî íèêà íèêîãäà íå èñòå÷åò. -NICK_INFO_FOR_MORE - Äëÿ áîëåå ïîäðîáíîé èíôîðìàöèè ñì. %R%s INFO %s ALL. NICK_INFO_SUSPENDED Äîïîëíèòåëüíî: ýòîò íèê íàõîäèòñÿ â ðåæèìå ñàñïåíäà ïî ïðè÷èíå: %s NICK_INFO_SUSPENDED_NO_REASON @@ -1584,7 +1582,7 @@ CHAN_STATUS_INFO # INFO responses CHAN_INFO_SYNTAX - INFO #êàíàë [ALL] + INFO #êàíàë CHAN_INFO_HEADER Èíôîðìàöèÿ î êàíàëå %s: CHAN_INFO_FOUNDER @@ -3950,7 +3948,7 @@ NICK_HELP_GHOST èäåíòèôèêàöèè ê íèêó âñåãî ëèøü ÷åðåç ñïèñîê õîñòìàñîê. NICK_HELP_INFO - Ñèíòàêñèñ: INFO íèê [ALL] + Ñèíòàêñèñ: INFO íèê Çàïðàøèâàåò ó ñåðâèñîâ èíôîðìàöèþ îá óêàçàííîì íèêå.  ÷àñòíîñòè áóäóò ïîêàçàíû: ðåàëüíîå èìÿ âëàäåëüöà (realname), åãî ïîñëåäíÿÿ @@ -4984,7 +4982,7 @@ CHAN_HELP_LEVELS_DESC_FORMAT %-*s %s CHAN_HELP_INFO - Ñèíòàêñèñ: INFO #êàíàë [ALL] + Ñèíòàêñèñ: INFO #êàíàë Ïîçâîëÿåò ïîëó÷èòü ïîäðîáíóþ èíôîðìàöèþ î çàðåãèñòðèðîâàíîì êàíàëå, â ÷àñòíîñòè òàêóþ êàê: íèê âëàäåëüöà, âðåìÿ ðåãèñòðàöèè êàíàëà, äàòó @@ -729,7 +729,7 @@ NICK_STATUS_REPLY # INFO responses NICK_INFO_SYNTAX - INFO nick [ALL] + INFO nick NICK_INFO_REALNAME %s isim: %s NICK_INFO_SERVICES_OPERTYPE @@ -777,8 +777,6 @@ NICK_INFO_OPT_NONE YOK NICK_INFO_NO_EXPIRE Bu nick zaman aþýmýna uðramayacak. -NICK_INFO_FOR_MORE - Geniþ bilgi için, %R%s INFO %s ALL yazýn. # LIST responses NICK_INFO_SUSPENDED @@ -1611,7 +1609,7 @@ CHAN_STATUS_INFO # INFO responses CHAN_INFO_SYNTAX - INFO kanaladý [ALL] + INFO kanaladý CHAN_INFO_HEADER %s kanalý için bilgi: CHAN_INFO_FOUNDER @@ -3996,7 +3994,7 @@ NICK_HELP_GHOST grubundaki baþka bir nickin tanýtýlmýþ olmasý gerekir. NICK_HELP_INFO - Kullanýmý: INFO nick [ALL] + Kullanýmý: INFO nick Belirtilen nick hakkýnda o nickin sahibi, son görüldüðü adres ve zaman, ve nickin özellikleri gibi bilgiler verir. Eðer nick @@ -4971,7 +4969,7 @@ CHAN_HELP_LEVELS_DESC_FORMAT %-*s %s CHAN_HELP_INFO - Kullanýmý: INFO kanaladý [ALL] + Kullanýmý: INFO kanaladý Belirtilen kayýtlý kanalla ilgili bilgiler sunar. Bu bilgilerin içeriðinde kanalýn founderý, kayýt zamaný, diff --git a/src/core/cs_info.cpp b/src/core/cs_info.cpp index c437d4a15..924df4ed5 100644 --- a/src/core/cs_info.cpp +++ b/src/core/cs_info.cpp @@ -28,7 +28,7 @@ class CommandCSInfo : public Command } public: - CommandCSInfo() : Command("INFO", 1, 2) + CommandCSInfo() : Command("INFO", 1, 1) { this->SetFlag(CFLAG_ALLOW_UNREGISTERED); this->SetFlag(CFLAG_ALLOW_SUSPENDED); @@ -38,15 +38,13 @@ class CommandCSInfo : public Command CommandReturn Execute(User *u, const std::vector<ci::string> ¶ms) { const char *chan = params[0].c_str(); - ci::string param = params.size() > 1 ? params[1] : ""; - ChannelInfo *ci; char buf[BUFSIZE]; struct tm *tm; bool has_auspex = u->IsIdentified() && u->Account()->HasPriv("chanserv/auspex"); bool show_all = false; time_t expt; - ci = cs_findchan(chan); + ChannelInfo *ci = cs_findchan(chan); if (ci->HasFlag(CI_FORBIDDEN)) { @@ -59,7 +57,7 @@ class CommandCSInfo : public Command } /* Should we show all fields? Only for sadmins and identified users */ - if (!param.empty() && param == "ALL" && (check_access(u, ci, CA_INFO) || has_auspex)) + if (has_auspex && check_access(u, ci, CA_INFO)) show_all = true; notice_lang(Config.s_ChanServ, u, CHAN_INFO_HEADER, chan); @@ -118,13 +116,10 @@ class CommandCSInfo : public Command notice_lang(Config.s_ChanServ, u, CHAN_INFO_NO_EXPIRE); else { - if (has_auspex) - { - expt = ci->last_used + Config.CSExpire; - tm = localtime(&expt); - strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm); - notice_lang(Config.s_ChanServ, u, CHAN_INFO_EXPIRE, buf); - } + expt = ci->last_used + Config.CSExpire; + tm = localtime(&expt); + strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm); + notice_lang(Config.s_ChanServ, u, CHAN_INFO_EXPIRE, buf); } } if (ci->HasFlag(CI_SUSPENDED)) @@ -132,16 +127,12 @@ class CommandCSInfo : public Command FOREACH_MOD(I_OnChanInfo, OnChanInfo(u, ci, show_all)); - if (!show_all && (check_access(u, ci, CA_INFO) || has_auspex)) - notice_lang(Config.s_ChanServ, u, NICK_INFO_FOR_MORE, Config.s_ChanServ, ci->name.c_str()); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { notice_lang(Config.s_ChanServ, u, CHAN_HELP_INFO); - if (u->IsIdentified() && u->Account()->HasPriv("chanserv/auspex")) - notice_lang(Config.s_ChanServ, u, CHAN_SERVADMIN_HELP_INFO); return true; } diff --git a/src/core/ns_info.cpp b/src/core/ns_info.cpp index 55e11dfce..244f8c190 100644 --- a/src/core/ns_info.cpp +++ b/src/core/ns_info.cpp @@ -29,38 +29,26 @@ class CommandNSInfo : public Command } } public: - CommandNSInfo() : Command("INFO", 1, 2) + CommandNSInfo() : Command("INFO", 1, 1) { this->SetFlag(CFLAG_ALLOW_UNREGISTERED); } CommandReturn Execute(User *u, const std::vector<ci::string> ¶ms) { - /* Show hidden info to nick owners and sadmins when the "ALL" parameter is - * supplied. If a nick is online, the "Last seen address" changes to "Is - * online from". - * Syntax: INFO <nick> {ALL} - * -TheShadow (13 Mar 1999) - */ const char *nick = params[0].c_str(); - ci::string param = params.size() > 1 ? params[1] : ""; - NickAlias *na; - NickRequest *nr = NULL; - /* Being an oper is enough from now on -GD */ + NickAlias *na = findnick(nick); + bool has_auspex = u->IsIdentified() && u->Account()->HasPriv("nickserv/auspex"); - if (!(na = findnick(nick))) + if (!na) { - if ((nr = findrequestnick(nick))) + NickRequest *nr = findrequestnick(nick); + if (nr) { notice_lang(Config.s_NickServ, u, NICK_IS_PREREG); - if (!param.empty() && param == "ALL" && u->Account() && u->Account()->IsServicesOper()) + if (has_auspex) notice_lang(Config.s_NickServ, u, NICK_INFO_EMAIL, nr->email); - else - { - if (u->Account() && u->Account()->IsServicesOper()) - notice_lang(Config.s_NickServ, u, NICK_INFO_FOR_MORE, Config.s_NickServ, nr->nick); - } } else if (nickIsServices(nick, 1)) notice_lang(Config.s_NickServ, u, NICK_X_IS_SERVICES, nick); @@ -80,16 +68,13 @@ class CommandNSInfo : public Command char buf[BUFSIZE]; bool nick_online = false, show_hidden = false; time_t expt; - bool has_auspex = u->IsIdentified() && u->Account()->HasPriv("nickserv/auspex"); /* Is the real owner of the nick we're looking up online? -TheShadow */ User *u2 = finduser(na->nick); if (u2 && u2->Account() == na->nc) nick_online = true; - /* Only show hidden fields to owner and sadmins and only when the ALL - * parameter is used. -TheShadow */ - if (!param.empty() && param == "ALL" && u->Account() && (na->nc == u->Account() || has_auspex)) + if (has_auspex || (u->Account() && na->nc == u->Account())) show_hidden = true; notice_lang(Config.s_NickServ, u, NICK_INFO_REALNAME, na->nick, na->last_realname); @@ -173,9 +158,6 @@ class CommandNSInfo : public Command } FOREACH_MOD(I_OnNickInfo, OnNickInfo(u, na, show_hidden)); - - if (!show_hidden && u->Account() && (na->nc == u->Account() || has_auspex)) - notice_lang(Config.s_NickServ, u, NICK_INFO_FOR_MORE, Config.s_NickServ, na->nick); } return MOD_CONT; } @@ -183,8 +165,6 @@ class CommandNSInfo : public Command bool OnHelp(User *u, const ci::string &subcommand) { notice_help(Config.s_NickServ, u, NICK_HELP_INFO); - if (u->IsIdentified() && u->Account()->HasPriv("nickserv/auspex")) - notice_help(Config.s_NickServ, u, NICK_SERVADMIN_HELP_INFO); return true; } |