diff options
| -rw-r--r-- | modules/commands/cs_access.cpp | 24 | ||||
| -rw-r--r-- | modules/commands/cs_flags.cpp | 26 |
2 files changed, 32 insertions, 18 deletions
diff --git a/modules/commands/cs_access.cpp b/modules/commands/cs_access.cpp index 9a90b7d5f..10606ca7e 100644 --- a/modules/commands/cs_access.cpp +++ b/modules/commands/cs_access.cpp @@ -89,13 +89,19 @@ class CommandCSAccess : public Command void DoAdd(CommandSource &source, ChannelInfo *ci, const std::vector<Anope::string> ¶ms) { Anope::string mask = params[2]; + Privilege *p = NULL; int level = ACCESS_INVALID; try { level = convertTo<int>(params[3]); } - catch (const ConvertException &) { } + catch (const ConvertException &) + { + p = PrivilegeManager::FindPrivilege(params[3]); + if (p != NULL && defaultLevels[p->name]) + level = defaultLevels[p->name]; + } if (!level) { @@ -209,9 +215,10 @@ class CommandCSAccess : public Command FOREACH_MOD(OnAccessAdd, (ci, source, access)); Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to add " << mask << " with level " << level; - source.Reply(_("\002%s\002 added to %s access list at level \002%d\002."), access->mask.c_str(), ci->name.c_str(), level); - - return; + if (p != NULL) + source.Reply(_("\002%s\002 added to %s access list at privilege %s (level %d)"), access->mask.c_str(), ci->name.c_str(), p->name.c_str(), level); + else + source.Reply(_("\002%s\002 added to %s access list at level \002%d\002."), access->mask.c_str(), ci->name.c_str(), level); } void DoDel(CommandSource &source, ChannelInfo *ci, const std::vector<Anope::string> ¶ms) @@ -564,12 +571,9 @@ class CommandCSAccess : public Command "access list with the given user level; if the mask is\n" "already present on the list, its access level is changed to\n" "the level specified in the command. The \037level\037 specified\n" - "must be less than that of the user giving the command, and\n" - "if the \037mask\037 is already on the access list, the current\n" - "access level of that mask must be less than the access level\n" - "of the user giving the command. When a user joins the channel\n" - "the access they receive is from the highest level entry in the\n" - "access list.")); + "may be a numerical level or the name of a privilege (eg AUTOOP).\n" + "When a user joins the channel the access they receive is from the" + "highest level entry in the access list.")); if (!Config->GetModule("chanserv")->Get<bool>("disallow_channel_access")) source.Reply(_("The given mask may also be a channel, which will use the\n" "access list from the other channel up to the given \037level\037")); diff --git a/modules/commands/cs_flags.cpp b/modules/commands/cs_flags.cpp index 50c8e6b49..9b1721648 100644 --- a/modules/commands/cs_flags.cpp +++ b/modules/commands/cs_flags.cpp @@ -150,8 +150,9 @@ class CommandCSFlags : public Command return; } + Privilege *p = NULL; bool override = false; - int add = -1; + int add = 1; for (size_t i = 0; i < flags.length(); ++i) { char f = flags[i]; @@ -164,8 +165,6 @@ class CommandCSFlags : public Command add = 0; break; case '*': - if (add == -1) - break; for (std::map<Anope::string, char>::iterator it = defaultFlags.begin(), it_end = defaultFlags.end(); it != it_end; ++it) { if (!u_access.HasPriv(it->first)) @@ -182,8 +181,13 @@ class CommandCSFlags : public Command } break; default: - if (add == -1) - break; + p = PrivilegeManager::FindPrivilege(flags.substr(i)); + if (p != NULL && defaultFlags[p->name]) + { + f = defaultFlags[p->name]; + i = flags.length(); + } + for (std::map<Anope::string, char>::iterator it = defaultFlags.begin(), it_end = defaultFlags.end(); it != it_end; ++it) { if (f != it->second) @@ -242,9 +246,15 @@ class CommandCSFlags : public Command FOREACH_MOD(OnAccessAdd, (ci, source, access)); Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to modify " << mask << "'s flags to " << access->AccessSerialize(); - source.Reply(_("Access for \002%s\002 on %s set to +\002%s\002"), access->mask.c_str(), ci->name.c_str(), access->AccessSerialize().c_str()); - - return; + if (p != NULL) + { + if (add) + source.Reply(_("Privilege \2%s\2 added to \2%s\2 on \2%s\2, new flags are +\2%s\2"), p->name.c_str(), access->mask.c_str(), ci->name.c_str(), access->AccessSerialize().c_str()); + else + source.Reply(_("Privilege \2%s\2 removed from \2%s\2 on \2%s\2, new flags are +\2%s\2"), p->name.c_str(), access->mask.c_str(), ci->name.c_str(), access->AccessSerialize().c_str()); + } + else + source.Reply(_("Access for \002%s\002 on %s set to +\002%s\002"), access->mask.c_str(), ci->name.c_str(), access->AccessSerialize().c_str()); } void DoList(CommandSource &source, ChannelInfo *ci, const std::vector<Anope::string> ¶ms) |