diff options
43 files changed, 55 insertions, 161 deletions
diff --git a/lang/cat.l b/lang/cat.l index 86b65bf1e..e7565cae0 100644 --- a/lang/cat.l +++ b/lang/cat.l @@ -168,16 +168,8 @@ PASSWORD_INCORRECT INVALID_TARGET "/msg %s" is no longer supported. Use "/msg %s@%s" or "/%s" instead. -# What's the difference between "Access denied" and "Permission denied"? -# Very little; you can safely make them the same message with no real loss -# of meaning. If you want to make a distinction, "Access denied" is -# usually used more generally; for example, a non-oper trying to access -# OperServ gets "Access denied", while a non-Services admin trying to use -# NickServ SET NOEXPIRE gets "Permission denied". ACCESS_DENIED accés denegat. -PERMISSION_DENIED - Permis denegat. MORE_OBSCURE_PASSWORD Per favor intenti novamente amb una clau mes oculta. Les claus han de ser de com a mínim 5 caràcters, no han de ser fàcils d'encertar (ex. Nom real o Nick), i no poden contenir el caràcter d'espai o tabulació. @@ -186,16 +186,8 @@ PASSWORD_INCORRECT INVALID_TARGET "/msg %s" wird nicht mehr unterstützt. Benutze "/msg %s@%s" oder "/%s" stattdessen. -# What's the difference between "Access denied" and "Permission denied"? -# Very little; you can safely make them the same message with no real loss -# of meaning. If you want to make a distinction, "Access denied" is -# usually used more generally; for example, a non-oper trying to access -# OperServ gets "Access denied", while a non-Services admin trying to use -# NickServ SET NOEXPIRE gets "Permission denied". ACCESS_DENIED Zugriff verweigert. -PERMISSION_DENIED - Berechtigung nicht ausreichend. MORE_OBSCURE_PASSWORD Bitte versuche es nochmal mit einem besseren Passwort. diff --git a/lang/en_us.l b/lang/en_us.l index f31121c3d..57fd27eef 100644 --- a/lang/en_us.l +++ b/lang/en_us.l @@ -167,16 +167,8 @@ PASSWORD_INCORRECT INVALID_TARGET "/msg %s" is no longer supported. Use "/msg %s@%s" or "/%s" instead. -# What's the difference between "Access denied" and "Permission denied"? -# Very little; you can safely make them the same message with no real loss -# of meaning. If you want to make a distinction, "Access denied" is -# usually used more generally; for example, a non-oper trying to access -# OperServ gets "Access denied", while a non-Services admin trying to use -# NickServ SASET NOEXPIRE gets "Permission denied". ACCESS_DENIED Access denied. -PERMISSION_DENIED - Permission denied. MORE_OBSCURE_PASSWORD Please try again with a more obscure password. Passwords should be at least five characters long, should not be something easily guessed (e.g. your real name or your nick), and cannot contain the space or tab characters. @@ -167,16 +167,8 @@ PASSWORD_INCORRECT INVALID_TARGET "/msg %s" is no longer supported. Use "/msg %s@%s" or "/%s" instead. -# What's the difference between "Access denied" and "Permission denied"? -# Very little; you can safely make them the same message with no real loss -# of meaning. If you want to make a distinction, "Access denied" is -# usually used more generally; for example, a non-oper trying to access -# OperServ gets "Access denied", while a non-Services admin trying to use -# NickServ SET NOEXPIRE gets "Permission denied". ACCESS_DENIED Acceso denegado. -PERMISSION_DENIED - Permiso denegado. MORE_OBSCURE_PASSWORD Por favor intente nuevamente con una clave mas oscura. @@ -173,16 +173,8 @@ PASSWORD_INCORRECT INVALID_TARGET "/msg %s" is no longer supported. Use "/msg %s@%s" or "/%s" instead. -# What's the difference between "Access denied" and "Permission denied"? -# Very little; you can safely make them the same message with no real loss -# of meaning. If you want to make a distinction, "Access denied" is -# usually used more generally; for example, a non-oper trying to access -# OperServ gets "Access denied", while a non-Services admin trying to use -# NickServ SET NOEXPIRE gets "Permission denied". ACCESS_DENIED Accès refusé. -PERMISSION_DENIED - Permission refusée. MORE_OBSCURE_PASSWORD Veuillez réessayer avec un mot de passe plus difficile à trouver. Les mots de passe doivent contenir au moins cinq caractères, ne doivent pas être trop facilement devinables (par exemple votre vrai nom ou votre pseudo), et ne doit pas contenir d'espaces ou de tabulations. @@ -167,16 +167,8 @@ PASSWORD_INCORRECT INVALID_TARGET "/msg %s" is no longer supported. Use "/msg %s@%s" or "/%s" instead. -# What's the difference between "Access denied" and "Permission denied"? -# Very little; you can safely make them the same message with no real loss -# of meaning. If you want to make a distinction, "Access denied" is -# usually used more generally; for example, a non-oper trying to access -# OperServ gets "Access denied", while a non-Services admin trying to use -# NickServ SET NOEXPIRE gets "Permission denied". ACCESS_DENIED Äåí Ý÷åéò ôçí åðéôñåðüìåíç Üäåéá. -PERMISSION_DENIED - Äåí Ý÷åéò Üäåéá. MORE_OBSCURE_PASSWORD Ðáñáêáëþ ðñïóðÜèçóå îáíÜ ìå Ýíáí ðéï ðïëýðëïêï êùäéêü. Ïé êùäéêïß ðñÝðåé íá åßíáé ôïõëÜ÷éóôïí Ýùò ðÝíôå ÷áñáêôÞñåò, íá ìçí åßíáé åýêïëïé íá ìáíôåõôïýí (ð.÷. ôï ðñáãìáôéêü ïíïìÜ óïõ Þ ôï øåõäþíõìï óïõ), êáé íá ìçí ðåñéÝ÷åé êåíü Þ äéÜöïðïõò Üëëïõò ÷áñáêôÞñåò. diff --git a/lang/hun.l b/lang/hun.l index 9509a8991..8497d3e2a 100644 --- a/lang/hun.l +++ b/lang/hun.l @@ -175,17 +175,8 @@ PASSWORD_INCORRECT INVALID_TARGET "/msg %s" is no longer supported. Use "/msg %s@%s" or "/%s" instead. -# Mi a különbség a "Hozzáférés megtagadva" és az "Engedély letiltva" között? -# Nagyon kicsi; ha ugyanazt az üzenetet írod mindkettõre, nem igazán veszít -# a jelentésbõl. Ha különbséget akarsz tenni, akkor a "Hozzáférés megtagadva" -# általánosabb értelemben használatos, például, ha egy nem oper próbál -# hozzáférni az OperServhez, akkor azt kapja, hogy "Hozzáférés megtagadva", -# amikor egy nem Szervíz admin próbálja használni a NickServ SET NOEXPIRE -# opciót, akkor õ azt kapja, hogy "Endegély letiltva". ACCESS_DENIED Hozzáférés megtagadva. -PERMISSION_DENIED - Engedély megtagadva. MORE_OBSCURE_PASSWORD Próbálj nehezebb jelszót használni .Jelszavad min. öt karakter legyen, és nem kitalálható legyen, (ne a @@ -169,16 +169,8 @@ PASSWORD_INCORRECT INVALID_TARGET "/msg %s" is no longer supported. Use "/msg %s@%s" or "/%s" instead. -# What's the difference between "Access denied" and "Permission denied"? -# Very little; you can safely make them the same message with no real loss -# of meaning. If you want to make a distinction, "Access denied" is -# usually used more generally; for example, a non-oper trying to access -# OperServ gets "Access denied", while a non-Services admin trying to use -# NickServ SET NOEXPIRE gets "Permission denied". ACCESS_DENIED Accesso negato. -PERMISSION_DENIED - Permesso negato. MORE_OBSCURE_PASSWORD Per favore, prova di nuovo con una password più oscura. Le password devono essere lunghe almeno 5 caratteri, non devono essere indovinate facilmente (ad es. il proprio nome o nick), e non possono contenere i caratteri di spazio e di tabulazione. @@ -169,16 +169,8 @@ PASSWORD_INCORRECT INVALID_TARGET "/msg %s" is no longer supported. Use "/msg %s@%s" or "/%s" instead. -# What's the difference between "Access denied" and "Permission denied"? -# Very little; you can safely make them the same message with no real loss -# of meaning. If you want to make a distinction, "Access denied" is -# usually used more generally; for example, a non-oper trying to access -# OperServ gets "Access denied", while a non-Services admin trying to use -# NickServ SET NOEXPIRE gets "Permission denied". ACCESS_DENIED Toegang geweigerd. -PERMISSION_DENIED - Toestemming geweigerd. MORE_OBSCURE_PASSWORD Probeer aub opnieuw met een onduidelijker wachtwoord. Wachtwoorden moeten tenminste 5 tekens lang zijn, niet iets makkelijk raadbaars (bijv. je echte naam of je nick), en kan geen tab of spatie bevatten. @@ -189,18 +189,9 @@ PASSWORD_INCORRECT INVALID_TARGET "/msg %s" nie jest ju¿ obs³ugiwane. U¿yj "/msg %s@%s" lub "/%s". -# What's the difference between "Access denied" and "Permission denied"? -# Very little; you can safely make them the same message with no real loss -# of meaning. If you want to make a distinction, "Access denied" is -# usually used more generally; for example, a non-oper trying to access -# OperServ gets "Access denied", while a non-Services admin trying to use -# NickServ SASET NOEXPIRE gets "Permission denied". ACCESS_DENIED Odmowa dostêpu. -PERMISSION_DENIED - Brak uprawnieñ. - MORE_OBSCURE_PASSWORD Proszê spróbowaæ ponownie z trudniejszym has³em. Has³o powinno mieæ minimum 5 znaków oraz powinno @@ -177,16 +177,8 @@ PASSWORD_INCORRECT INVALID_TARGET "/msg %s" is no longer supported. Use "/msg %s@%s" or "/%s" instead. -# What's the difference between "Access denied" and "Permission denied"? -# Very little; you can safely make them the same message with no real loss -# of meaning. If you want to make a distinction, "Access denied" is -# usually used more generally; for example, a non-oper trying to access -# OperServ gets "Access denied", while a non-Services admin trying to use -# NickServ SET NOEXPIRE gets "Permission denied". ACCESS_DENIED Acesso negado. -PERMISSION_DENIED - Permissão negada. MORE_OBSCURE_PASSWORD Por favor tente novamente com uma senha mais difícil. Não use TAB ou espaços. @@ -173,16 +173,8 @@ PASSWORD_INCORRECT INVALID_TARGET Àäðåñàöèÿ âèäà "/msg %s" áîëüøå íå ïîääåðæèâàåòñÿ. Èñïîëüçóéòå "/msg %s@%s" èëè "/%s". -# What's the difference between "Access denied" and "Permission denied"? -# Very little; you can safely make them the same message with no real loss -# of meaning. If you want to make a distinction, "Access denied" is -# usually used more generally; for example, a non-oper trying to access -# OperServ gets "Access denied", while a non-Services admin trying to use -# NickServ SET NOEXPIRE gets "Permission denied". ACCESS_DENIED Äîñòóï çàïðåùåí. -PERMISSION_DENIED - Íåäîñòàòî÷íî ïðàâ äëÿ äîñòóïà. MORE_OBSCURE_PASSWORD Ïîæàëóéñòà, ïîïðîáóéòå ñíîâà ñ áîëåå ñëîæíûì ïàðîëåì. Îí äîëæåí èìåòü äëèíó íå ìåíåå 5 ñèìâîëîâ, ñîñòîÿòü òîëüêî èç ëàòèíñêèõ áóêâ èëè öèôð, íå áûòü ëåãêî îòãàäûâàåìûì (ò.å. Âàøèì èìåíåì èëè Âàøèì íèêîì), è íå äîëæåí ñîäåðæàòü ïðîáåëîâ è òàáóëÿöèé. @@ -171,16 +171,8 @@ PASSWORD_INCORRECT INVALID_TARGET "/msg %s" is no longer supported. Use "/msg %s@%s" or "/%s" instead. -# What's the difference between "Access denied" and "Permission denied"? -# Very little; you can safely make them the same message with no real loss -# of meaning. If you want to make a distinction, "Access denied" is -# usually used more generally; for example, a non-oper trying to access -# OperServ gets "Access denied", while a non-Services admin trying to use -# NickServ SET NOEXPIRE gets "Permission denied". ACCESS_DENIED Bu komuta eriþiminiz yok. -PERMISSION_DENIED - Bu komutu kullanma izniniz yok. MORE_OBSCURE_PASSWORD Lütfen daha zor bir þifre deneyin. Þifreler en az 5 karakter uzunlukta, kolayca tahmin edilemeyecek birþey olmalýdýr(ör: gerçek isminiz, nickiniz v.b. olmamalýdýr), ve boþlukla tab kullanýlmamalýdýr. diff --git a/src/botserv.c b/src/botserv.c index 810768c00..617fc9039 100644 --- a/src/botserv.c +++ b/src/botserv.c @@ -846,7 +846,7 @@ void bot_raw_ban(User * requester, ChannelInfo * ci, char *nick, if (ircd->protectedumode) { if (is_protected(u) && (requester != u)) { ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", - getstring(PERMISSION_DENIED)); + getstring(ACCESS_DENIED)); return; } } @@ -922,7 +922,7 @@ void bot_raw_kick(User * requester, ChannelInfo * ci, char *nick, if (ircd->protectedumode) { if (is_protected(u) && (requester != u)) { ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", - getstring(PERMISSION_DENIED)); + getstring(ACCESS_DENIED)); return; } } @@ -976,7 +976,7 @@ void bot_raw_mode(User * requester, ChannelInfo * ci, const char *mode, if (ircd->protectedumode) { if (is_protected(u) && *mode == '-' && (requester != u)) { ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", - getstring(PERMISSION_DENIED)); + getstring(ACCESS_DENIED)); return; } } diff --git a/src/core/bs_assign.c b/src/core/bs_assign.c index 913e68224..a19f1a8dd 100644 --- a/src/core/bs_assign.c +++ b/src/core/bs_assign.c @@ -49,13 +49,13 @@ class CommandBSAssign : public Command if ((ci->botflags & BS_NOBOT) || (!check_access(u, ci, CA_ASSIGN) && !u->nc->HasPriv("botserv/administration"))) { - notice_lang(s_BotServ, u, PERMISSION_DENIED); + notice_lang(s_BotServ, u, ACCESS_DENIED); return MOD_CONT; } if (bi->flags & BI_PRIVATE && !u->nc->HasCommand("botserv/assign/private")) { - notice_lang(s_BotServ, u, PERMISSION_DENIED); + notice_lang(s_BotServ, u, ACCESS_DENIED); return MOD_CONT; } diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c index dc48cb628..eb2aa2f8b 100644 --- a/src/core/bs_bot.c +++ b/src/core/bs_bot.c @@ -366,7 +366,7 @@ class CommandBSBot : public Command // ADD nick user host real - 5 if (!u->nc->HasCommand("botserv/bot/add")) { - notice_lang(s_BotServ, u, PERMISSION_DENIED); + notice_lang(s_BotServ, u, ACCESS_DENIED); return MOD_CONT; } @@ -388,7 +388,7 @@ class CommandBSBot : public Command // but only oldn and newn are required if (!u->nc->HasCommand("botserv/bot/change")) { - notice_lang(s_BotServ, u, PERMISSION_DENIED); + notice_lang(s_BotServ, u, ACCESS_DENIED); return MOD_CONT; } @@ -405,7 +405,7 @@ class CommandBSBot : public Command // DEL nick if (!u->nc->HasCommand("botserv/bot/del")) { - notice_lang(s_BotServ, u, PERMISSION_DENIED); + notice_lang(s_BotServ, u, ACCESS_DENIED); return MOD_CONT; } diff --git a/src/core/bs_info.c b/src/core/bs_info.c index 0541d747e..d6c1c9369 100644 --- a/src/core/bs_info.c +++ b/src/core/bs_info.c @@ -85,7 +85,7 @@ class CommandBSInfo : public Command { if (!is_founder(u, ci) && !u->nc->HasPriv("botserv/administration")) { - notice_lang(s_BotServ, u, PERMISSION_DENIED); + notice_lang(s_BotServ, u, ACCESS_DENIED); return MOD_CONT; } diff --git a/src/core/cs_access.c b/src/core/cs_access.c index ac900d7e1..6a1a1f819 100644 --- a/src/core/cs_access.c +++ b/src/core/cs_access.c @@ -137,7 +137,7 @@ class CommandCSAccess : public Command if (level >= ulev && !u->nc->HasPriv("chanserv/access/modify")) { - notice_lang(s_ChanServ, u, PERMISSION_DENIED); + notice_lang(s_ChanServ, u, ACCESS_DENIED); return MOD_CONT; } @@ -171,7 +171,7 @@ class CommandCSAccess : public Command /* Don't allow lowering from a level >= ulev */ if (access->level >= ulev && !u->nc->HasPriv("chanserv/access/change")) { - notice_lang(s_ChanServ, u, PERMISSION_DENIED); + notice_lang(s_ChanServ, u, ACCESS_DENIED); return MOD_CONT; } if (access->level == level) @@ -223,7 +223,7 @@ class CommandCSAccess : public Command if (!deleted) { if (perm) - notice_lang(s_ChanServ, u, PERMISSION_DENIED); + notice_lang(s_ChanServ, u, ACCESS_DENIED); else if (count == 1) { last = atoi(nick); @@ -259,7 +259,7 @@ class CommandCSAccess : public Command if (get_access(u, ci) <= access->level && !u->nc->HasPriv("chanserv/access/change")) { deleted = 0; - notice_lang(s_ChanServ, u, PERMISSION_DENIED); + notice_lang(s_ChanServ, u, ACCESS_DENIED); } else { @@ -320,7 +320,7 @@ class CommandCSAccess : public Command if (!is_founder(u, ci) && !u->nc->HasPriv("chanserv/access/change")) { - notice_lang(s_ChanServ, u, PERMISSION_DENIED); + notice_lang(s_ChanServ, u, ACCESS_DENIED); return MOD_CONT; } diff --git a/src/core/cs_akick.c b/src/core/cs_akick.c index b3b272437..64e864dc1 100644 --- a/src/core/cs_akick.c +++ b/src/core/cs_akick.c @@ -248,7 +248,7 @@ class CommandCSAKick : public Command * or whether the mask matches a user with higher/equal access - Viper */ if ((ci->flags & CI_PEACE) && nc) { if ((nc == ci->founder) || (get_access_nc(nc, ci) >= get_access(u, ci))) { - notice_lang(s_ChanServ, u, PERMISSION_DENIED); + notice_lang(s_ChanServ, u, ACCESS_DENIED); if (freemask) delete [] mask; return MOD_CONT; @@ -261,7 +261,7 @@ class CommandCSAKick : public Command for (u2 = userlist[i]; u2; u2 = u2->next) { if (is_founder(u2, ci) || (get_access(u2, ci) >= get_access(u, ci))) { if (match_usermask(mask, u2)) { - notice_lang(s_ChanServ, u, PERMISSION_DENIED); + notice_lang(s_ChanServ, u, ACCESS_DENIED); delete [] mask; return MOD_CONT; } @@ -280,7 +280,7 @@ class CommandCSAKick : public Command >= get_access(u, ci)))) { snprintf(buf, BUFSIZE, "%s!%s", na2->nick, na2->last_usermask); if (Anope::Match(buf, mask, false)) { - notice_lang(s_ChanServ, u, PERMISSION_DENIED); + notice_lang(s_ChanServ, u, ACCESS_DENIED); delete [] mask; return MOD_CONT; } diff --git a/src/core/cs_ban.c b/src/core/cs_ban.c index 21eed2551..8f9e9c2e2 100644 --- a/src/core/cs_ban.c +++ b/src/core/cs_ban.c @@ -58,7 +58,7 @@ class CommandCSBan : public Command notice_lang(s_ChanServ, u, ACCESS_DENIED); } else if (!is_same && (ci->flags & CI_PEACE) && (get_access(u2, ci) >= get_access(u, ci))) { - notice_lang(s_ChanServ, u, PERMISSION_DENIED); + notice_lang(s_ChanServ, u, ACCESS_DENIED); /* * Dont ban/kick the user on channels where he is excepted * to prevent services <-> server wars. @@ -66,7 +66,7 @@ class CommandCSBan : public Command } else if (ircd->except && is_excepted(ci, u2)) { notice_lang(s_ChanServ, u, CHAN_EXCEPTED, u2->nick, ci->name); } else if (ircd->protectedumode && is_protected(u2)) { - notice_lang(s_ChanServ, u, PERMISSION_DENIED); + notice_lang(s_ChanServ, u, ACCESS_DENIED); } else { const char *av[3]; char mask[BUFSIZE]; @@ -141,7 +141,7 @@ class CommandCSUnban : public Command if (!check_access(u, ci, CA_UNBAN)) { - notice_lang(s_ChanServ, u, PERMISSION_DENIED); + notice_lang(s_ChanServ, u, ACCESS_DENIED); return MOD_CONT; } diff --git a/src/core/cs_clear.c b/src/core/cs_clear.c index 52505154f..5ffc33035 100644 --- a/src/core/cs_clear.c +++ b/src/core/cs_clear.c @@ -35,7 +35,7 @@ class CommandCSClear : public Command } else if (!(ci = c->ci)) { notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan); } else if (!u || !check_access(u, ci, CA_CLEAR)) { - notice_lang(s_ChanServ, u, PERMISSION_DENIED); + notice_lang(s_ChanServ, u, ACCESS_DENIED); } else if (stricmp(what, "bans") == 0) { const char *av[2]; Entry *ban, *bnext; diff --git a/src/core/cs_invite.c b/src/core/cs_invite.c index eac5d241c..09ea33f64 100644 --- a/src/core/cs_invite.c +++ b/src/core/cs_invite.c @@ -40,7 +40,7 @@ class CommandCSInvite : public Command } else if (!u || !check_access(u, ci, CA_INVITE)) { - notice_lang(s_ChanServ, u, PERMISSION_DENIED); + notice_lang(s_ChanServ, u, ACCESS_DENIED); return MOD_CONT; } diff --git a/src/core/cs_kick.c b/src/core/cs_kick.c index 5ee3c2430..be30f792f 100644 --- a/src/core/cs_kick.c +++ b/src/core/cs_kick.c @@ -60,9 +60,9 @@ class CommandCSKick : public Command notice_lang(s_ChanServ, u, ACCESS_DENIED); } else if (!is_same && (ci->flags & CI_PEACE) && (get_access(u2, ci) >= get_access(u, ci))) { - notice_lang(s_ChanServ, u, PERMISSION_DENIED); + notice_lang(s_ChanServ, u, ACCESS_DENIED); } else if (is_protected(u2)) { - notice_lang(s_ChanServ, u, PERMISSION_DENIED); + notice_lang(s_ChanServ, u, ACCESS_DENIED); } else { const char *av[3]; diff --git a/src/core/cs_modes.c b/src/core/cs_modes.c index c0beaab90..3b081e3b1 100644 --- a/src/core/cs_modes.c +++ b/src/core/cs_modes.c @@ -45,9 +45,9 @@ static CommandReturn do_util(User *u, CSModeUtil *util, const char *chan, const notice_lang(s_ChanServ, u, ACCESS_DENIED); } else if (*util->mode == '-' && !is_same && (ci->flags & CI_PEACE) && (get_access(u2, ci) >= get_access(u, ci))) { - notice_lang(s_ChanServ, u, PERMISSION_DENIED); + notice_lang(s_ChanServ, u, ACCESS_DENIED); } else if (*util->mode == '-' && is_protected(u2) && !is_same) { - notice_lang(s_ChanServ, u, PERMISSION_DENIED); + notice_lang(s_ChanServ, u, ACCESS_DENIED); } else { ircdproto->SendMode(whosends(ci), c->name, "%s %s", util->mode, u2->nick); diff --git a/src/core/cs_sendpass.c b/src/core/cs_sendpass.c index 95d723ce5..2b87e0b77 100644 --- a/src/core/cs_sendpass.c +++ b/src/core/cs_sendpass.c @@ -29,7 +29,7 @@ class CommandCSSendPass : public Command NickCore *founder; if (RestrictMail && !u->nc->HasCommand("chanserv/sendpass")) - notice_lang(s_ChanServ, u, PERMISSION_DENIED); + notice_lang(s_ChanServ, u, ACCESS_DENIED); else if (!(ci = cs_findchan(chan)) || !(founder = ci->founder)) notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan); else diff --git a/src/core/cs_set.c b/src/core/cs_set.c index 6e442d4d1..a2586e380 100644 --- a/src/core/cs_set.c +++ b/src/core/cs_set.c @@ -532,7 +532,7 @@ class CommandCSSet : public Command { if (!u->nc->HasCommand("chanserv/set/noexpire")) { - notice_lang(s_ChanServ, u, PERMISSION_DENIED); + notice_lang(s_ChanServ, u, ACCESS_DENIED); return MOD_CONT; } if (stricmp(param, "ON") == 0) { diff --git a/src/core/cs_topic.c b/src/core/cs_topic.c index 5d603bae7..86cef26eb 100644 --- a/src/core/cs_topic.c +++ b/src/core/cs_topic.c @@ -35,7 +35,7 @@ class CommandCSTopic : public Command else if (!(ci = c->ci)) notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, c->name); else if (!check_access(u, ci, CA_TOPIC) && !u->nc->HasCommand("chanserv/topic")) - notice_lang(s_ChanServ, u, PERMISSION_DENIED); + notice_lang(s_ChanServ, u, ACCESS_DENIED); else { if (ci->last_topic) diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c index fa63f60e9..e5e547aa4 100644 --- a/src/core/cs_xop.c +++ b/src/core/cs_xop.c @@ -127,7 +127,7 @@ class XOPBase : public Command if ((level >= ulev || ulev < ACCESS_AOP) && !u->nc->HasPriv("chanserv/access/modify")) { - notice_lang(s_ChanServ, u, PERMISSION_DENIED); + notice_lang(s_ChanServ, u, ACCESS_DENIED); return MOD_CONT; } @@ -152,7 +152,7 @@ class XOPBase : public Command **/ if (access->level >= ulev && !u->nc->HasPriv("chanserv/access/modify")) { - notice_lang(s_ChanServ, u, PERMISSION_DENIED); + notice_lang(s_ChanServ, u, ACCESS_DENIED); return MOD_CONT; } ++change; @@ -219,7 +219,7 @@ class XOPBase : public Command if ((level >= ulev || ulev < ACCESS_AOP) && !u->nc->HasPriv("chanserv/access/modify")) { - notice_lang(s_ChanServ, u, PERMISSION_DENIED); + notice_lang(s_ChanServ, u, ACCESS_DENIED); return MOD_CONT; } @@ -231,7 +231,7 @@ class XOPBase : public Command if (!deleted) { if (perm) - notice_lang(s_ChanServ, u, PERMISSION_DENIED); + notice_lang(s_ChanServ, u, ACCESS_DENIED); else if (count == 1) { last = atoi(nick); @@ -265,7 +265,7 @@ class XOPBase : public Command if (ulev <= access->level && !u->nc->HasPriv("chanserv/access/change")) { deleted = 0; - notice_lang(s_ChanServ, u, PERMISSION_DENIED); + notice_lang(s_ChanServ, u, ACCESS_DENIED); } else { @@ -338,7 +338,7 @@ class XOPBase : public Command if (!is_founder(u, ci) && !u->nc->HasPriv("chanserv/access/change")) { - notice_lang(s_ChanServ, u, PERMISSION_DENIED); + notice_lang(s_ChanServ, u, ACCESS_DENIED); return MOD_CONT; } diff --git a/src/core/ns_drop.c b/src/core/ns_drop.c index b67e079ff..43f66ece5 100644 --- a/src/core/ns_drop.c +++ b/src/core/ns_drop.c @@ -65,7 +65,7 @@ class CommandNSDrop : public Command else if (!is_mine && !u->nc->IsServicesOper()) notice_lang(s_NickServ, u, ACCESS_DENIED); else if (NSSecureAdmins && !is_mine && na->nc->IsServicesOper()) - notice_lang(s_NickServ, u, PERMISSION_DENIED); + notice_lang(s_NickServ, u, ACCESS_DENIED); else { if (readonly) diff --git a/src/core/ns_forbid.c b/src/core/ns_forbid.c index bf7a6298b..e8abd8dc4 100644 --- a/src/core/ns_forbid.c +++ b/src/core/ns_forbid.c @@ -47,7 +47,7 @@ class CommandNSForbid : public Command { if (NSSecureAdmins && na->nc->IsServicesOper()) { - notice_lang(s_NickServ, u, PERMISSION_DENIED); + notice_lang(s_NickServ, u, ACCESS_DENIED); return MOD_CONT; } delnick(na); diff --git a/src/core/ns_getpass.c b/src/core/ns_getpass.c index 04d7b1ba0..ebd67ea67 100644 --- a/src/core/ns_getpass.c +++ b/src/core/ns_getpass.c @@ -31,7 +31,7 @@ class CommandNSGetPass : public Command if (!u->nc->HasCommand("nickserv/getpass")) { - notice_lang(s_NickServ, u, PERMISSION_DENIED); + notice_lang(s_NickServ, u, ACCESS_DENIED); return MOD_CONT; } @@ -50,7 +50,7 @@ class CommandNSGetPass : public Command else if (na->status & NS_FORBIDDEN) notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick); else if (NSSecureAdmins && na->nc->IsServicesOper()) - notice_lang(s_NickServ, u, PERMISSION_DENIED); + notice_lang(s_NickServ, u, ACCESS_DENIED); else { if (enc_decrypt(na->nc->pass, tmp_pass, PASSMAX - 1) == 1) diff --git a/src/core/ns_saset.c b/src/core/ns_saset.c index 80a5dd917..f45946b5b 100644 --- a/src/core/ns_saset.c +++ b/src/core/ns_saset.c @@ -68,7 +68,7 @@ private: if (NSSecureAdmins && u->nc != nc && nc->IsServicesOper()) { - notice_lang(s_NickServ, u, PERMISSION_DENIED); + notice_lang(s_NickServ, u, ACCESS_DENIED); return MOD_CONT; } else if (!stricmp(nc->display, param) || (StrictPasswords && len < 5)) @@ -133,7 +133,7 @@ private: } else if (NSSecureAdmins && u->nc != nc && nc->IsServicesOper()) { - notice_lang(s_NickServ, u, PERMISSION_DENIED); + notice_lang(s_NickServ, u, ACCESS_DENIED); return MOD_CONT; } else if (param && !MailValidate(param)) diff --git a/src/core/ns_sendpass.c b/src/core/ns_sendpass.c index b60044005..71612279a 100644 --- a/src/core/ns_sendpass.c +++ b/src/core/ns_sendpass.c @@ -28,7 +28,7 @@ class CommandNSSendPass : public Command NickAlias *na; if (RestrictMail && !u->nc->HasCommand("nickserv/sendpass")) - notice_lang(s_NickServ, u, PERMISSION_DENIED); + notice_lang(s_NickServ, u, ACCESS_DENIED); else if (!(na = findnick(nick))) notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick); else if (na->status & NS_FORBIDDEN) diff --git a/src/core/ns_suspend.c b/src/core/ns_suspend.c index 884286084..a58141010 100644 --- a/src/core/ns_suspend.c +++ b/src/core/ns_suspend.c @@ -50,7 +50,7 @@ class CommandNSSuspend : public Command if (NSSecureAdmins && na->nc->IsServicesOper()) { - notice_lang(s_NickServ, u, PERMISSION_DENIED); + notice_lang(s_NickServ, u, ACCESS_DENIED); return MOD_CONT; } @@ -134,7 +134,7 @@ class CommandNSUnSuspend : public Command if (NSSecureAdmins && na->nc->IsServicesOper()) { - notice_lang(s_NickServ, u, PERMISSION_DENIED); + notice_lang(s_NickServ, u, ACCESS_DENIED); return MOD_CONT; } diff --git a/src/core/os_admin.c b/src/core/os_admin.c index 0b8cf2169..55332d2f0 100644 --- a/src/core/os_admin.c +++ b/src/core/os_admin.c @@ -35,7 +35,7 @@ class CommandOSAdmin : public Command if (!u->nc->HasCommand("operserv/admin")) { - notice_lang(s_OperServ, u, PERMISSION_DENIED); + notice_lang(s_OperServ, u, ACCESS_DENIED); return MOD_CONT; } @@ -210,7 +210,7 @@ class CommandOSAdmin : public Command if (!u->nc->HasCommand("operserv/admin")) { - notice_lang(s_OperServ, u, PERMISSION_DENIED); + notice_lang(s_OperServ, u, ACCESS_DENIED); return MOD_CONT; } diff --git a/src/core/os_news.c b/src/core/os_news.c index 8ec596e3d..42b4ab107 100644 --- a/src/core/os_news.c +++ b/src/core/os_news.c @@ -198,7 +198,7 @@ class NewsBase : public Command if (!u->nc->HasCommand("operserv/news")) { - notice_lang(s_OperServ, u, PERMISSION_DENIED); + notice_lang(s_OperServ, u, ACCESS_DENIED); return MOD_CONT; } diff --git a/src/core/os_oper.c b/src/core/os_oper.c index b94a3e1c6..9580ac5bd 100644 --- a/src/core/os_oper.c +++ b/src/core/os_oper.c @@ -142,7 +142,7 @@ class CommandOSOper : public Command if (!is_oper(u)) { - notice_lang(s_OperServ, u, PERMISSION_DENIED); + notice_lang(s_OperServ, u, ACCESS_DENIED); return MOD_CONT; } @@ -206,7 +206,7 @@ class CommandOSOper : public Command if (!u->nc->HasCommand("operserv/oper")) { - notice_lang(s_OperServ, u, PERMISSION_DENIED); + notice_lang(s_OperServ, u, ACCESS_DENIED); return MOD_CONT; } diff --git a/src/core/os_quit.c b/src/core/os_quit.c index 6bc354ef1..7b757add6 100644 --- a/src/core/os_quit.c +++ b/src/core/os_quit.c @@ -25,7 +25,7 @@ class CommandOSQuit : public Command CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { if (!u->nc->HasCommand("operserv/quit")) { - notice_lang(s_OperServ, u, PERMISSION_DENIED); + notice_lang(s_OperServ, u, ACCESS_DENIED); return MOD_STOP; } diff --git a/src/core/os_restart.c b/src/core/os_restart.c index 7afc2f20e..56b2daa3c 100644 --- a/src/core/os_restart.c +++ b/src/core/os_restart.c @@ -25,7 +25,7 @@ class CommandOSRestart : public Command CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { if (!u->nc->HasCommand("operserv/restart")) { - notice_lang(s_OperServ, u, PERMISSION_DENIED); + notice_lang(s_OperServ, u, ACCESS_DENIED); return MOD_STOP; } diff --git a/src/core/os_shutdown.c b/src/core/os_shutdown.c index d45163011..7aa3252ee 100644 --- a/src/core/os_shutdown.c +++ b/src/core/os_shutdown.c @@ -25,7 +25,7 @@ class CommandOSShutdown : public Command CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { if (!u->nc->HasCommand("operserv/shutdown")) { - notice_lang(s_OperServ, u, PERMISSION_DENIED); + notice_lang(s_OperServ, u, ACCESS_DENIED); return MOD_STOP; } diff --git a/src/modules/cs_appendtopic.c b/src/modules/cs_appendtopic.c index 5a852465f..a314e9d8c 100644 --- a/src/modules/cs_appendtopic.c +++ b/src/modules/cs_appendtopic.c @@ -72,7 +72,7 @@ class CommandCSAppendTopic : public Command else if (ci->flags & CI_FORBIDDEN) notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, ci->name); else if (!check_access(u, ci, CA_TOPIC)) - notice_lang(s_ChanServ, u, PERMISSION_DENIED); + notice_lang(s_ChanServ, u, ACCESS_DENIED); else { if (ci->last_topic) diff --git a/src/modules/cs_enforce.c b/src/modules/cs_enforce.c index ae2af3453..440366709 100644 --- a/src/modules/cs_enforce.c +++ b/src/modules/cs_enforce.c @@ -192,7 +192,7 @@ class CommandCSEnforce : public Command else if (ci->flags & CI_FORBIDDEN) notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, ci->name); else if (!check_access(u, ci, CA_AKICK)) - notice_lang(s_ChanServ, u, PERMISSION_DENIED); + notice_lang(s_ChanServ, u, ACCESS_DENIED); else { if (!what || !stricmp(what, "SET")) diff --git a/src/modules/cs_tban.c b/src/modules/cs_tban.c index 358a4718c..7dde83f09 100644 --- a/src/modules/cs_tban.c +++ b/src/modules/cs_tban.c @@ -214,7 +214,7 @@ int canBanUser(Channel * c, User * u, User * u2) else if (ircd->except && is_excepted(ci, u2)) notice_lang(s_ChanServ, u, CHAN_EXCEPTED, u2->nick, ci->name); else if (ircd->protectedumode && is_protected(u2)) - notice_lang(s_ChanServ, u, PERMISSION_DENIED); + notice_lang(s_ChanServ, u, ACCESS_DENIED); else ok = 1; |