diff options
| -rw-r--r-- | data/example.conf | 1 | ||||
| -rw-r--r-- | docs/Changes.conf | 7 | ||||
| -rw-r--r-- | docs/Changes.lang | 10 | ||||
| -rw-r--r-- | lang/cat.l | 4 | ||||
| -rw-r--r-- | lang/de.l | 4 | ||||
| -rw-r--r-- | lang/en_us.l | 3 | ||||
| -rw-r--r-- | lang/es.l | 4 | ||||
| -rw-r--r-- | lang/fr.l | 4 | ||||
| -rw-r--r-- | lang/gr.l | 6 | ||||
| -rw-r--r-- | lang/hun.l | 5 | ||||
| -rw-r--r-- | lang/it.l | 3 | ||||
| -rw-r--r-- | lang/nl.l | 3 | ||||
| -rw-r--r-- | lang/pl.l | 4 | ||||
| -rw-r--r-- | lang/pt.l | 3 | ||||
| -rw-r--r-- | lang/ru.l | 4 | ||||
| -rw-r--r-- | lang/tr.l | 4 | ||||
| -rw-r--r-- | src/core/cs_ban.c | 2 | ||||
| -rw-r--r-- | src/core/cs_info.c | 4 | ||||
| -rw-r--r-- | src/core/cs_kick.c | 2 | ||||
| -rw-r--r-- | src/core/cs_xop.c | 2 | ||||
| -rw-r--r-- | src/core/ns_identify.c | 2 | ||||
| -rw-r--r-- | src/core/ns_info.c | 18 | ||||
| -rw-r--r-- | src/core/ns_register.c | 2 | ||||
| -rw-r--r-- | src/core/os_news.c | 2 | ||||
| -rw-r--r-- | src/modules/hs_request.c | 2 |
25 files changed, 62 insertions, 43 deletions
diff --git a/data/example.conf b/data/example.conf index b9ee1fd1b..a87478017 100644 --- a/data/example.conf +++ b/data/example.conf @@ -576,6 +576,7 @@ options * chanserv/set - Can modify the settings of any channel (incl. changing of the owner and password!) * memoserv/info - Can see any information with /memoserv info * memoserv/set-limit - Can set the limit of max stored memos on any user and channel + * nickserv/auspex - Can see any information with /nickserv info * nickserv/confirm - Can confirm other users nicknames * nickserv/drop - Can drop other users nicks * diff --git a/docs/Changes.conf b/docs/Changes.conf index 5420f66fd..c07f2a5d1 100644 --- a/docs/Changes.conf +++ b/docs/Changes.conf @@ -1,6 +1,11 @@ Anope Version 1.9.3 -------------------- +------------------ +** ADDED CONFIGURATION DIRECTIVES ** +nickserv/auspex privilege added +** MODIFIED CONFIGURATION DIRECTIVES ** + +** DELETED CONFIGURATION DIRECTIVES ** Anope Version 1.9.2 -------------------- diff --git a/docs/Changes.lang b/docs/Changes.lang index ea711a609..51c418cdf 100644 --- a/docs/Changes.lang +++ b/docs/Changes.lang @@ -1,6 +1,14 @@ Anope Version 1.9.3 -------------------- +-------------------- +*** New Strings: + NICK_GLIST_REPLY_NOEXPIRE + NICK_SERVADMIN_HELP_INFO +*** Mod Strings: + NICK_GLIST_REPLY + +*** Del Strings: + NICK_GLIST_REPLY_ADMIN Anope Version 1.9.2 -------------------- diff --git a/lang/cat.l b/lang/cat.l index 4e090e340..f44bb1e9b 100644 --- a/lang/cat.l +++ b/lang/cat.l @@ -4084,8 +4084,8 @@ NICK_SERVADMIN_HELP_DROP NICK_SERVADMIN_HELP_INFO - Administradors de serveis poden utilitzar el parametre - ALL amb qualsevol nick. + Services Operators with the nickserv/auspex privilege may + use the ALL parameter with any nick. NICK_SERVADMIN_HELP_LIST Sintaxis: LIST patró [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED] @@ -4123,8 +4123,8 @@ NICK_SERVADMIN_HELP_DROP NICK_SERVADMIN_HELP_INFO - Services Administratoren können den ALL Parameter für - jeden beliebigen Nickname benutzen. + Services Operators with the nickserv/auspex privilege may + use the ALL parameter with any nick. NICK_SERVADMIN_HELP_LIST Syntax: LIST Muster [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED] diff --git a/lang/en_us.l b/lang/en_us.l index ae526f50a..581f53e7d 100644 --- a/lang/en_us.l +++ b/lang/en_us.l @@ -3947,7 +3947,8 @@ NICK_SERVADMIN_HELP_DROP NICK_SERVADMIN_HELP_INFO - Services Operators may use the ALL parameter with any nick. + 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] @@ -4056,8 +4056,8 @@ NICK_SERVADMIN_HELP_DROP NICK_SERVADMIN_HELP_INFO - Administradores de Servicios pueden usar el parametro - ALL con cualquier nick. + Services Operators with the nickserv/auspex privilege may + use the ALL parameter with any nick. NICK_SERVADMIN_HELP_LIST Sintaxis: LIST patron [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED] @@ -4118,8 +4118,8 @@ NICK_SERVADMIN_HELP_DROP NICK_SERVADMIN_HELP_INFO - Les services operators peuvent utiliser le paramètre ALL - avec n'importe quel pseudo. + Services Operators with the nickserv/auspex privilege may + use the ALL parameter with any nick. NICK_SERVADMIN_HELP_LIST Syntaxe: LIST modèle [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED] @@ -4082,11 +4082,11 @@ NICK_SERVADMIN_HELP_DROP Ìðïñåß íá óâÞóåéò êÜðïéï øåõäþíõìï ðïõ ìðïñåß íá åßíáé óôçí ïìÜäá óïõ ÷ùñßò íá Ý÷åéò îå÷ùñéóôÜ äéêáéþìáôá. Ôï óâÞóéìï ôïõ øåõäþíõìïõ Ý÷ïõí ôï äéêáßùìá íá ôï êÜíïõí ïé (åðéêåöáëåßò) Services Operators. - + NICK_SERVADMIN_HELP_INFO - Ïé Services Operators ìðïñïýí íá ÷ñçóéìïðïéïýí ôçí ALL ðáñÜìåôñï ãéá - êÜèå øåõäþíõìï. + Services Operators with the nickserv/auspex privilege may + use the ALL parameter with any nick. NICK_SERVADMIN_HELP_LIST Óýíôáîç: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED] diff --git a/lang/hun.l b/lang/hun.l index 70b8cc831..88db8b0f0 100644 --- a/lang/hun.l +++ b/lang/hun.l @@ -3993,10 +3993,11 @@ NICK_SERVADMIN_HELP_DROP különleges kiváltsága. Használat korlátozva Szervíz adminoknak. - + NICK_SERVADMIN_HELP_INFO - Szervíz adminok használhatják az ALL paramétert. + 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] @@ -3964,7 +3964,8 @@ NICK_SERVADMIN_HELP_DROP NICK_SERVADMIN_HELP_INFO - I Services Operator possono usare il parametro ALL con tutti i nick. + Services Operators with the nickserv/auspex privilege may + use the ALL parameter with any nick. NICK_SERVADMIN_HELP_LIST Sintassi: LIST pattern [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED] @@ -4030,7 +4030,8 @@ NICK_SERVADMIN_HELP_DROP NICK_SERVADMIN_HELP_INFO - Services Operators mogen het ALL parameter met elke nick gebruiken. + Services Operators with the nickserv/auspex privilege may + use the ALL parameter with any nick. NICK_SERVADMIN_HELP_LIST Gebruik: trefbeeld [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED] @@ -5029,8 +5029,8 @@ NICK_SERVADMIN_HELP_DROP NICK_SERVADMIN_HELP_INFO - Administratorzy serwisów mog± u¿ywaæ parametru - ALL dla ka¿dego nicka. + Services Operators with the nickserv/auspex privilege may + use the ALL parameter with any nick. NICK_SERVADMIN_HELP_LIST Sk³adnia: LIST wzorzec [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED] @@ -3975,7 +3975,8 @@ NICK_SERVADMIN_HELP_DROP NICK_SERVADMIN_HELP_INFO - Administradores de Services podem usar o parâmetro ALL com qualquer nick. + Services Operators with the nickserv/auspex privilege may + use the ALL parameter with any nick. NICK_SERVADMIN_HELP_LIST Sintaxe: LIST padrão [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED] @@ -4022,8 +4022,8 @@ NICK_SERVADMIN_HELP_DROP NICK_SERVADMIN_HELP_INFO - Àäìèíèñòðàòîðû ñåðâèñîâ ìîãó èñïîëüçîâàòü ïàðàìåòð ALL äëÿ ëþáîãî - íèêà. + Services Operators with the nickserv/auspex privilege may + use the ALL parameter with any nick. NICK_SERVADMIN_HELP_LIST Ñèíòàêñèñ: LIST ìàñêà [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED] @@ -4072,8 +4072,8 @@ NICK_SERVADMIN_HELP_DROP NICK_SERVADMIN_HELP_INFO - Servis adminleri ALL parametresini herhangi bir nick için - kullanabilirler. + Services Operators with the nickserv/auspex privilege may + use the ALL parameter with any nick. NICK_SERVADMIN_HELP_LIST Kullanýmý: LIST model [FORBIDDEN] [SUSPENDED] [NOEXPIRE] [UNCONFIRMED] diff --git a/src/core/cs_ban.c b/src/core/cs_ban.c index d0bbbfbb4..bacc8dff8 100644 --- a/src/core/cs_ban.c +++ b/src/core/cs_ban.c @@ -17,7 +17,7 @@ class CommandCSBan : public Command { public: - CommandCSBan(const std::string &cname) : Command(cname, 2, 3) + CommandCSBan(const ci::string &cname) : Command(cname, 2, 3) { } diff --git a/src/core/cs_info.c b/src/core/cs_info.c index 60e8ebf50..9131d1a3a 100644 --- a/src/core/cs_info.c +++ b/src/core/cs_info.c @@ -43,7 +43,7 @@ class CommandCSInfo : public Command ChannelInfo *ci; char buf[BUFSIZE]; struct tm *tm; - bool has_auspex = u->Account() && u->Account()->HasPriv("chanserv/auspex"); + bool has_auspex = u->IsIdentified() && u->Account()->HasPriv("chanserv/auspex"); int show_all = 0; time_t expt; @@ -146,7 +146,7 @@ class CommandCSInfo : public Command bool OnHelp(User *u, const ci::string &subcommand) { notice_lang(Config.s_ChanServ, u, CHAN_HELP_INFO); - if (u->Account() && u->Account()->HasPriv("chanserv/auspex")) + 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/cs_kick.c b/src/core/cs_kick.c index bce32d401..9614c8cc3 100644 --- a/src/core/cs_kick.c +++ b/src/core/cs_kick.c @@ -17,7 +17,7 @@ class CommandCSKick : public Command { public: - CommandCSKick(const std::string& cname) : Command(cname, 2, 3) + CommandCSKick(const ci::string &cname) : Command(cname, 2, 3) { } diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c index 702919d8e..a6f980ad0 100644 --- a/src/core/cs_xop.c +++ b/src/core/cs_xop.c @@ -396,7 +396,7 @@ class XOPBase : public Command return MOD_CONT; } public: - XOPBase(const std::string &command) : Command(command, 2, 3) + XOPBase(const ci::string &command) : Command(command, 2, 3) { } diff --git a/src/core/ns_identify.c b/src/core/ns_identify.c index 866497fc0..b574c1207 100644 --- a/src/core/ns_identify.c +++ b/src/core/ns_identify.c @@ -17,7 +17,7 @@ class CommandNSIdentify : public Command { public: - CommandNSIdentify(const std::string &cname) : Command(cname, 1, 1) + CommandNSIdentify(const ci::string &cname) : Command(cname, 1, 1) { this->SetFlag(CFLAG_ALLOW_UNREGISTERED); } diff --git a/src/core/ns_info.c b/src/core/ns_info.c index 421d33f97..020745008 100644 --- a/src/core/ns_info.c +++ b/src/core/ns_info.c @@ -79,19 +79,19 @@ class CommandNSInfo : public Command { struct tm *tm; char buf[BUFSIZE]; - int nick_online = 0; - int show_hidden = 0; + 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 = 1; + 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() || u->Account()->IsServicesOper())) - show_hidden = 1; + if (!param.empty() && param == "ALL" && u->Account() && (na->nc == u->Account() || has_auspex)) + show_hidden = true; notice_lang(Config.s_NickServ, u, NICK_INFO_REALNAME, na->nick, na->last_realname); @@ -100,7 +100,6 @@ class CommandNSInfo : public Command if (show_hidden || (!(na->nc->HasFlag(NI_HIDE_STATUS)))) { notice_lang(Config.s_NickServ, u, NICK_INFO_SERVICES_OPERTYPE, na->nick, na->nc->ot->GetName().c_str()); - } } @@ -111,7 +110,8 @@ class CommandNSInfo : public Command else notice_lang(Config.s_NickServ, u, NICK_INFO_ADDRESS_ONLINE_NOHOST, na->nick); } - else { + else + { if (show_hidden || !(na->nc->HasFlag(NI_HIDE_MASK))) notice_lang(Config.s_NickServ, u, NICK_INFO_ADDRESS, na->last_usermask); } @@ -178,7 +178,7 @@ class CommandNSInfo : public Command } } - if (!show_hidden && u->Account() && (na->nc == u->Account() || u->Account()->IsServicesOper())) + 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; @@ -187,7 +187,7 @@ class CommandNSInfo : public Command bool OnHelp(User *u, const ci::string &subcommand) { notice_help(Config.s_NickServ, u, NICK_HELP_INFO); - if (u->Account() && u->Account()->IsServicesOper()) + if (u->IsIdentified() && u->Account()->HasPriv("nickserv/auspex")) notice_help(Config.s_NickServ, u, NICK_SERVADMIN_HELP_INFO); return true; diff --git a/src/core/ns_register.c b/src/core/ns_register.c index 4a9bfb6fe..9074f109f 100644 --- a/src/core/ns_register.c +++ b/src/core/ns_register.c @@ -143,7 +143,7 @@ class CommandNSConfirm : public Command } public: - CommandNSConfirm(const std::string &cmdn, int min, int max) : Command(cmdn, min, max) + CommandNSConfirm(const ci::string &cmdn, int min, int max) : Command(cmdn, min, max) { this->SetFlag(CFLAG_ALLOW_UNREGISTERED); } diff --git a/src/core/os_news.c b/src/core/os_news.c index 9daf1b443..e39db8011 100644 --- a/src/core/os_news.c +++ b/src/core/os_news.c @@ -300,7 +300,7 @@ class NewsBase : public Command return MOD_CONT; } public: - NewsBase(const std::string &newstype) : Command(newstype, 1, 2, "operserv/news") + NewsBase(const ci::string &newstype) : Command(newstype, 1, 2, "operserv/news") { } diff --git a/src/modules/hs_request.c b/src/modules/hs_request.c index ebc46dfe8..0113817b7 100644 --- a/src/modules/hs_request.c +++ b/src/modules/hs_request.c @@ -339,7 +339,7 @@ class HSListBase : public Command return MOD_CONT; } public: - HSListBase(const std::string &cmd, int min, int max) : Command(cmd, min, max, "hostserv/set") + HSListBase(const ci::string &cmd, int min, int max) : Command(cmd, min, max, "hostserv/set") { } |