* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
ModeAction SimpleUserModeHandler::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool servermode)
{
- /* Only opers can change other users modes */
- if (source != dest)
- return MODEACTION_DENY;
-
if (adding)
{
if (!dest->IsModeSet(this->GetModeChar()))
return;
}
- if ((targetuser == user) || (IS_OPER(user)))
+ if (targetuser == user || user->HasPrivPermission("users/auspex"))
{
/* Display user's current mode string */
user->WriteNumeric(RPL_UMODEIS, "%s :+%s",targetuser->nick.c_str(),targetuser->FormatModes());
seq++;
mask = MASK_CHANNEL;
-
+
while (mode && *mode)
{
unsigned char mletter = *mode;
mode++;
continue;
}
-
+
/* Ensure the user doesnt request the same mode twice,
* so they cant flood themselves off out of idiocy.
*/
continue;
}
- if (!IS_OPER(user))
+ if (!user->HasPrivPermission("channels/auspex"))
{
if (ServerInstance->Config->HideModeLists[mletter] && (targetchannel->GetStatus(user) < STATUS_HOP))
{
for(ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
{
std::string dummyparam;
-
+
if (!((*watchers)->BeforeMode(user, NULL, targetchannel, dummyparam, true, MODETYPE_CHANNEL)))
display = false;
}
{
type = MODETYPE_USER;
mask = MASK_USER;
- if ((user != targetuser) && (!ServerInstance->ULine(user->server)))
+ if (user != targetuser && IS_LOCAL(user) && !ServerInstance->ULine(user->server))
{
user->WriteNumeric(ERR_USERSDONTMATCH, "%s :Can't change mode for other users", user->nick.c_str());
return;
*/
if (needed && !prefixmode)
prefixmode = FindPrefix('%');
-
+
unsigned int neededrank = prefixmode->GetPrefixRank();
/* Compare our rank on the channel against the rank of the required prefix,
* allow if >= ours. Because mIRC and xchat throw a tizz if the modes shown
}
bool had_parameter = !parameter.empty();
-
+
for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
{
if ((*watchers)->BeforeMode(user, targetuser, targetchannel, parameter, adding, type, servermode) == false)
output_sequence.append(adding ? "+" : "-");
last_successful_state_change = adding;
}
-
+
/* Add the mode letter */
output_sequence.push_back(modechar);
for (unsigned char mode = 'A'; mode <= 'z'; mode++)
{
- if ((!ServerInstance->Config->AllowHalfop) && (mode == 'h'))
- continue;
-
unsigned char pos = (mode-65) | MASK_CHANNEL;
if (modehandlers[pos])
for (unsigned char mode = 'A'; mode <= 'z'; mode++)
{
- if ((!ServerInstance->Config->AllowHalfop) && (mode == 'h'))
- continue;
-
unsigned char pos = (mode-65) | MASK_CHANNEL;
if ((modehandlers[pos]) && (modehandlers[pos]->GetNumParams(true)))
return types;
}
-std::string ModeParser::ChanModes()
+std::string ModeParser::GiveModeList(ModeMasks m)
{
std::string type1; /* Listmodes EXCEPT those with a prefix */
std::string type2; /* Modes that take a param when adding or removing */
for (unsigned char mode = 'A'; mode <= 'z'; mode++)
{
- if ((!ServerInstance->Config->AllowHalfop) && (mode == 'h'))
- continue;
-
- unsigned char pos = (mode-65) | MASK_CHANNEL;
+ unsigned char pos = (mode-65) | m;
/* One parameter when adding */
if (modehandlers[pos])
- {
+ {
if (modehandlers[pos]->GetNumParams(true))
{
if ((modehandlers[pos]->IsListMode()) && (!modehandlers[pos]->GetPrefix()))
type4 += modehandlers[pos]->GetModeChar();
}
}
-
}
return type1 + "," + type2 + "," + type3 + "," + type4;
}
bool ModeParser::PrefixComparison(prefixtype one, prefixtype two)
-{
+{
return one.second > two.second;
}
for (unsigned char mode = 'A'; mode <= 'z'; mode++)
{
- if ((!ServerInstance->Config->AllowHalfop) && (mode == 'h'))
- continue;
-
unsigned char pos = (mode-65) | MASK_CHANNEL;
if ((modehandlers[pos]) && (modehandlers[pos]->GetPrefix()))
sprintf(moderemove,"-%c",this->GetModeChar());
parameters.push_back(user->nick);
parameters.push_back(moderemove);
- ServerInstance->Parser->CallHandler("MODE", parameters, user);
+ ServerInstance->Modes->Process(parameters, ServerInstance->FakeClient, false);
}
}
}